ytj

config/index.js

@@ -15,7 +15,7 @@ module.exports = {
         // target: 'http://192.168.0.62:8080', //wf
         // target: 'http://127.0.0.1:8080', 
         // target: 'http://192.168.0.11:8080', //ys
-        // target: 'http://192.168.0.125:8080', //hyq
+        // target: 'http://192.168.0.102:8080', //hyq
         target: 'http://dev.ycjcjy.com', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/pages/system/caseManager/caseAreaManager/add.vue

@@ -38,6 +38,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
@@ -54,6 +55,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccesser">
@@ -73,7 +75,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 
 export default {
   name: '',
@@ -105,7 +107,13 @@ export default {
     }
   },
   components: {},
+  created () {
+    this.picSize({ w: 30, h: 30 })
+  },
   methods: {
+    ...mapActions([
+      'picSize'
+    ]),
     handleAvatarSuccesser (res, file) {
       this.postData.AreaIconWhite = res.result.url
     },
@@ -150,11 +158,11 @@ export default {
           type: 'success',
           message: '操作成功!'
         })
-        this.$router.push({name: 'caseAreaManager'})
+        this.$router.push({ name: 'caseAreaManager' })
       })
     },
     cancel () {
-      this.$router.push({name: 'caseAreaManager'})
+      this.$router.push({ name: 'caseAreaManager' })
     }
   },
   mounted () { }

src/pages/system/caseManager/caseAreaManager/edit.vue

@@ -38,6 +38,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
@@ -54,6 +55,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccesser">
@@ -73,7 +75,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 
 export default {
   name: '',
@@ -106,9 +108,13 @@ export default {
   },
   created () {
     this.getCaseAreaInfo()
+    this.picSize({ w: 30, h: 30 })
   },
   components: {},
   methods: {
+    ...mapActions([
+      'picSize'
+    ]),
     getCaseAreaInfo () { // 获取区域信息
       this.$ajax(this.$api.caseManager.getCaseAreaInfo.url, {
         method: this.$api.caseManager.getCaseAreaInfo.method,

src/pages/system/caseManager/caseInfo/addCase/index.vue

@@ -67,6 +67,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
@@ -158,10 +159,13 @@ export default {
       OrgId: x => x.app.user.OrgId,
     }),
   },
+  created () {
+    this.picSize({ w: 480, h: 300 })
+  },
   components: {},
   methods: {
     ...mapActions([
-      'updateSystemInfo'
+      'updateSystemInfo', 'picSize'
     ]),
     handleAvatarSuccess (res, file) {
       this.postData.CaseIcon = res.result.url

src/pages/system/caseManager/caseInfo/editCase/index.vue

@@ -63,6 +63,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
@@ -156,11 +157,12 @@ export default {
   },
   created () {
     this.getCaseInfoById()
+    this.picSize({ w: 480, h: 300 })
   },
   components: {},
   methods: {
     ...mapActions([
-      'updateSystemInfo'
+      'updateSystemInfo', 'picSize'
     ]),
     getCaseInfoById () { // 获取案场信息
       this.$ajax(this.$api.caseManager.getCaseInfo.url, {

src/pages/system/cmsManager/bannerManager/add.vue

@@ -80,6 +80,7 @@
             <el-upload
               class="avatar-uploader"
               action='string'
+              :before-upload="toolClass.beforeUpload"
               :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleAvatarSuccess">
@@ -131,6 +132,7 @@ export default {
     // imageUploader: () => import('@/components/upload')
   },
   created () {
+    this.picSize({ w: 650, h: 300 })
     this.GetCourseList({ page: 1, pagesize: 100 })
     this.updateLocationAllInfo()
     this.updateSystemInfo().then(() => {
@@ -153,7 +155,7 @@ export default {
       'GetCourseList',
     ]),
     ...mapCmsActions(['updateLocationAllInfo']),
-    ...mapActions(['updateSystemInfo']),
+    ...mapActions(['updateSystemInfo', 'picSize']),
     submit () {
       if (this.postData.ForwardType === 'url') {
         this.postData.ForwardResourceId = ''

src/pages/system/cmsManager/bannerManager/edit.vue

@@ -80,6 +80,7 @@
             <el-upload
               class="avatar-uploader"
               action='string'
+              :before-upload="toolClass.beforeUpload"
               :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleAvatarSuccess">
@@ -98,7 +99,7 @@
 </template>
 
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex'
+import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
 
@@ -125,6 +126,7 @@ export default {
   },
   components: {},
   created () {
+    this.picSize({ w: 650, h: 300 })
     this.GetCourseList({page: 1, pagesize: 100, callback: this.getDetail})
     this.updateLocationAllInfo()
   },
@@ -143,6 +145,7 @@ export default {
       'GetCourseList',
     ]),
     ...mapCmsActions(['updateLocationAllInfo']),
+    ...mapActions(['picSize']),
     submit () {
       if (this.postData.ForwardType === 'url') {
         this.postData.ForwardResourceId = ''

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -48,10 +48,11 @@
         </li>
         <li class="flex-h">
           <span>图片：<em>*</em></span>
-          <div class="flex-item">
+          <div class="flex-item" @click="pictSize()">
             <el-upload
               class="avatar-uploader"
               action='string'
+              :before-upload="toolClass.beforeUpload"
               :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleImgSuccess">
@@ -62,10 +63,11 @@
         </li>
         <li class="flex-h">
           <span>详细图片：<em>*</em></span>
-          <div class="flex-item">
+          <div class="flex-item" @click="descSize()">
             <el-upload
               class="avatar-uploader"
               action='string'
+              :before-upload="toolClass.beforeUpload"
               :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleDetailImgSuccess">
@@ -203,7 +205,7 @@
 </template>
 
 <script>
-import { createNamespacedHelpers, mapState } from 'vuex'
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
 
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('cmscase')
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
@@ -276,10 +278,17 @@ export default {
     ...mapCourseActions([
       'GetCourseList',
     ]),
+    ...mapActions(['picSize']),
     caseChange () {
       this.selCourseList = []
       this.detail.Courses = []
     },
+    pictSize () {
+      this.picSize({ w: 704, h: 208 })
+    },
+    descSize () {
+      this.picSize({ w: 105, h: 64 })
+    },
     checkFn (arr) {
       for (var n = 0; n < arr.length; n++) {
         if (arr[n].type === 'isNull' && !arr[n].target) {

src/pages/system/cmsManager/newsManager/add.vue

@@ -80,6 +80,7 @@
             <el-upload
               class="avatar-uploader"
               action='string'
+              :before-upload="toolClass.beforeUpload"
               :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleAvatarSuccess">
@@ -125,6 +126,7 @@ export default {
   },
   components: {},
   created () {
+    this.picSize({ w: 172, h: 106 })
     this.updateSystemInfo().then(() => {
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId
@@ -147,7 +149,7 @@ export default {
     ...mapCourseActions([
       'GetCourseList',
     ]),
-    ...mapActions(['updateSystemInfo']),
+    ...mapActions(['updateSystemInfo', 'picSize']),
     ...mapCmsActions([
       'updateLocationAllInfo',
     ]),

src/pages/system/cmsManager/newsManager/edit.vue

@@ -80,6 +80,7 @@
             <el-upload
               class="avatar-uploader"
               action='string'
+              :before-upload="toolClass.beforeUpload"
               :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleAvatarSuccess">
@@ -98,7 +99,7 @@
 </template>
 
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex'
+import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
 export default {
@@ -124,6 +125,7 @@ export default {
   },
   components: {},
   created () {
+    this.picSize({ w: 172, h: 106 })
     this.updateLocationAllInfo().then(() => {
       this.getDetail()
       this.GetCourseList({ page: 1, pagesize: 10000 })
@@ -141,6 +143,7 @@ export default {
     ...mapCourseActions([
       'GetCourseList',
     ]),
+    ...mapActions(['picSize']),
     ...mapCmsActions(['updateLocationAllInfo']),
     submit () {
       if (this.postData.ForwardType === 'url') {

src/pages/system/courseManager/courseList/add.vue

@@ -9,6 +9,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
@@ -209,7 +210,7 @@
 </template>
 
 <script>
-import { createNamespacedHelpers, mapState } from 'vuex'
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
 const { mapState: mapLocationState, mapActions: mapLocationActions } = createNamespacedHelpers('cms')
@@ -288,6 +289,7 @@ export default {
     ...mapTagActions([
       'GetCourseTagList',
     ]),
+    ...mapActions(['picSize']),
     handleAvatarSuccess (res, file) {
       this.UpdateInfo({ ...this.detail, CourseImg: res.result.url })
     },
@@ -386,6 +388,7 @@ export default {
     }
   },
   mounted () {
+    this.picSize({ w: 750, h: 960 })
     this.updateLocationInfo({issys: 0})
     this.GetCourseTagList({ pagesize: 100 })
     const { id } = this.$route.query

src/pages/system/dataStatistics/goodsOrderList/index.vue

@@ -23,6 +23,16 @@
               </el-option>
             </el-select>
           </li>
+          <li>
+            <el-select v-model="postData.paytype" placeholder="请选择下单支付方式">
+              <el-option
+                v-for="item in paytype"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </li>
           <li>
             <el-select v-model="postData.status" placeholder="请选择订单状态">
               <el-option
@@ -71,6 +81,7 @@
               <span>案场：{{returnListItem(goodsOrderList, index).CaseName}}</span>
               <span>用户类型：{{returnListItem(goodsOrderList, index).UserType === 'sales' ? '销售' : returnListItem(goodsOrderList, index).UserType === 'manager' ? '主管' : '用户'}}</span>
               <span>下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
+              <span>支付方式：{{returnListItem(goodsOrderList, index).PayTypeStr}}</span>
             </div>
             <span>{{returnStatus(returnListItem(goodsOrderList, index).MakeStatus)}}</span>
           </div>
@@ -146,6 +157,7 @@ export default {
         usertype: '', // 用户类型
         begindate: '', // 起始日期
         enddate: '', // 截止日期
+        paytype: '', // 支付方式
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
@@ -162,6 +174,22 @@ export default {
         value: '用户',
         id: 'customer'
       }],
+      paytype: [{
+        value: '',
+        id: ''
+      }, {
+        value: '城币',
+        id: 'cheng-coin'
+      }, {
+        value: '优惠券',
+        id: 'coupon'
+      }, {
+        value: '案场',
+        id: 'sys user'
+      }, {
+        value: '积分',
+        id: 'points'
+      }],
       statusList: [{
         value: '',
         id: ''

src/pages/system/goodsManager/goodManager/edit.vue

@@ -36,6 +36,7 @@
               <el-upload
                 class="avatar-uploader"
                 action='string'
+                :before-upload="toolClass.beforeUpload"
                 :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
@@ -97,7 +98,7 @@
 </template>
 
 <script>
-import { createNamespacedHelpers, mapState } from 'vuex'
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
 
 const { mapState: mapGoodsState, mapActions: mapGoodsActions } = createNamespacedHelpers('goods')
 export default {
@@ -163,6 +164,9 @@ export default {
       'UpdateInfo',
       'GetGoodSpecs',
     ]),
+    ...mapActions([
+      'picSize'
+    ]),
     submit () {
       this.detail.specs = JSON.stringify(this.detailSpecs.map(x => ({ SpecId: x, GoodsPrice: this.detail.Price })))
       this.detail.images = (this.detail.Images || []).map(x => {
@@ -234,6 +238,7 @@ export default {
     },
   },
   created () {
+    this.picSize({ w: 150, h: 150 })
     const { id } = this.$route.query
     if (id && id !== '') {
       this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })

src/store/app.js

@@ -59,6 +59,10 @@ export default {
     roles: [],
     user: {},
     clientUrl: '',
+    picSize: {
+      w: 0,
+      height: 0
+    }
   },
   mutations: {
     init (state, data) { // 这里的state对应着上面这个state
@@ -94,7 +98,10 @@ export default {
       // 获取 面包屑
       if (currentRoute) state.breadcrumb = currentRoute.parent.slice(1).concat(currentRoute)
       // console.log(state.breadcrumb)
-    }
+    },
+    setPicSize (state, data) { // 设置图片尺寸限制
+      state.picSize = data
+    },
   },
   actions: {
     updateSystemInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
@@ -106,6 +113,9 @@ export default {
           resolve()
         })
       })
+    },
+    picSize (context, data) {
+      context.commit('setPicSize', data)
     }
   }
 }

src/util/util.js

@@ -1,5 +1,7 @@
 import Ajax from './ajax'
 import api from './api'
+import { Message } from 'element-ui'
+import store from '../store'
 const toolClass = {
   dateFormat: (timestamp, fmt) => {
     if (!fmt) {
@@ -43,6 +45,42 @@ const toolClass = {
         resolve(result)
       }).catch(reject)
     })
+  },
+  beforeUpload (file) {
+    return new Promise((resolve, reject) => {
+      let w = store.state.app.picSize.w
+      let h = store.state.app.picSize.h
+      if ('image'.indexOf(file.type) > -1) {
+        Message({
+          type: 'error',
+          message: `请上传${w}像素*${h}像素尺寸的图片`
+        })
+        reject(new Error('error'))
+      }
+      var reader = new FileReader()
+      reader.onload = function (e) {
+        var data = e.target.result
+        // 加载图片获取图片真实宽度和高度
+        var image = new Image()
+        image.onload = function () {
+          var width = image.width
+          var height = image.height
+          console.log(width)
+          console.log(height)
+          if (width === w && height === h) {
+            resolve()
+          } else {
+            Message({
+              type: 'error',
+              message: `请上传${w}像素*${h}像素尺寸的图片`
+            })
+            reject(new Error('error'))
+          }
+        }
+        image.src = data
+      }
+      reader.readAsDataURL(file)
+    })
   }
 }