SpaceOfCheng
/
admin
关注 3
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 2 动态
浏览代码

xcx

许成详 6 年前
父节点
3d4520f163 0b9bbc49e3
当前提交
942100389a
共有 17 个文件被更改，包括 163 次插入 和 16 次删除
合并视图 显示文件统计
  1. 4
    0
      dist/index.html
  2. 13
    3
      src/pages/system/caseManager/caseAreaManager/add.vue
  3. 9
    1
      src/pages/system/caseManager/caseAreaManager/edit.vue
  4. 6
    1
      src/pages/system/caseManager/caseInfo/addCase/index.vue
  5. 4
    1
      src/pages/system/caseManager/caseInfo/editCase/index.vue
  6. 4
    1
      src/pages/system/cmsManager/bannerManager/add.vue
  7. 5
    1
      src/pages/system/cmsManager/bannerManager/edit.vue
  8. 14
    3
      src/pages/system/cmsManager/majorProjects/edit.vue
  9. 4
    1
      src/pages/system/cmsManager/newsManager/add.vue
  10. 5
    1
      src/pages/system/cmsManager/newsManager/edit.vue
  11. 5
    1
      src/pages/system/courseManager/courseList/add.vue
  12. 28
    0
      src/pages/system/dataStatistics/goodsOrderList/index.vue
  13. 7
    1
      src/pages/system/goodsManager/goodManager/edit.vue
  14. 1
    0
      src/pages/system/newOrder/newOrderList/index.vue
  15. 11
    1
      src/store/app.js
  16. 4
    0
      src/style/main.css
  17. 39
    0
      src/util/util.js

+ 4
- 0
dist/index.html 查看文件

1 
+<<<<<<< HEAD
2 
+=======
3 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.cc1f90c9ffc52c3f483a949e2c10acd6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.5c35c9c3aac1bbcf9f74.js></script></body></html>
4 
+>>>>>>> 0b9bbc49e3efad436d5b6723a315ca00d7060653

+ 13
- 3
src/pages/system/caseManager/caseAreaManager/add.vue 查看文件

34 
         <li class="flex-h">
34 
         <li class="flex-h">
35 
           <span>图片：<em>*</em></span>
35 
           <span>图片：<em>*</em></span>
36 
           <div class="flex-item">
36 
           <div class="flex-item">
37 
+            <div class="red-hint">建议上传30*30尺寸的图片</div>
37 
             <div>
38 
             <div>
38 
               <el-upload
39 
               <el-upload
39 
                 class="avatar-uploader"
40 
                 class="avatar-uploader"
40 
                 action='string'
41 
                 action='string'
42 
+                :before-upload="toolClass.beforeUpload"
41 
                 :http-request="toolClass.upload"
43 
                 :http-request="toolClass.upload"
42 
                 :show-file-list="false"
44 
                 :show-file-list="false"
43 
                 :on-success="handleAvatarSuccess">
45 
                 :on-success="handleAvatarSuccess">
50 
         <li class="flex-h">
52 
         <li class="flex-h">
51 
           <span>黑白图片：<em>*</em></span>
53 
           <span>黑白图片：<em>*</em></span>
52 
           <div class="flex-item">
54 
           <div class="flex-item">
55 
+            <div class="red-hint">建议上传30*30尺寸的图片</div>
53 
             <div>
56 
             <div>
54 
               <el-upload
57 
               <el-upload
55 
                 class="avatar-uploader"
58 
                 class="avatar-uploader"
56 
                 action='string'
59 
                 action='string'
60 
+                :before-upload="toolClass.beforeUpload"
57 
                 :http-request="toolClass.upload"
61 
                 :http-request="toolClass.upload"
58 
                 :show-file-list="false"
62 
                 :show-file-list="false"
59 
                 :on-success="handleAvatarSuccesser">
63 
                 :on-success="handleAvatarSuccesser">
73 
 </template>
77 
 </template>
74
78
75 
 <script>
79 
 <script>
76 
-import { mapState } from 'vuex'
80 
+import { mapState, mapActions } from 'vuex'
77
81
78 
 export default {
82 
 export default {
79 
   name: '',
83 
   name: '',
105 
     }
109 
     }
106 
   },
110 
   },
107 
   components: {},
111 
   components: {},
112 
+  created () {
113 
+    this.picSize({ w: 30, h: 30 })
114 
+  },
108 
   methods: {
115 
   methods: {
116 
+    ...mapActions([
117 
+      'picSize'
118 
+    ]),
109 
     handleAvatarSuccesser (res, file) {
119 
     handleAvatarSuccesser (res, file) {
110 
       this.postData.AreaIconWhite = res.result.url
120 
       this.postData.AreaIconWhite = res.result.url
111 
     },
121 
     },
150 
           type: 'success',
160 
           type: 'success',
151 
           message: '操作成功!'
161 
           message: '操作成功!'
152 
         })
162 
         })
153 
-        this.$router.push({name: 'caseAreaManager'})
163 
+        this.$router.push({ name: 'caseAreaManager' })
154 
       })
164 
       })
155 
     },
165 
     },
156 
     cancel () {
166 
     cancel () {
157 
-      this.$router.push({name: 'caseAreaManager'})
167 
+      this.$router.push({ name: 'caseAreaManager' })
158 
     }
168 
     }
159 
   },
169 
   },
160 
   mounted () { }
170 
   mounted () { }

+ 9
- 1
src/pages/system/caseManager/caseAreaManager/edit.vue 查看文件

34 
         <li class="flex-h">
34 
         <li class="flex-h">
35 
           <span>图片：</span>
35 
           <span>图片：</span>
36 
           <div class="flex-item">
36 
           <div class="flex-item">
37 
+            <div class="red-hint">建议上传30*30尺寸的图片</div>
37 
             <div>
38 
             <div>
38 
               <el-upload
39 
               <el-upload
39 
                 class="avatar-uploader"
40 
                 class="avatar-uploader"
40 
                 action='string'
41 
                 action='string'
42 
+                :before-upload="toolClass.beforeUpload"
41 
                 :http-request="toolClass.upload"
43 
                 :http-request="toolClass.upload"
42 
                 :show-file-list="false"
44 
                 :show-file-list="false"
43 
                 :on-success="handleAvatarSuccess">
45 
                 :on-success="handleAvatarSuccess">
50 
         <li class="flex-h">
52 
         <li class="flex-h">
51 
           <span>黑白图片：</span>
53 
           <span>黑白图片：</span>
52 
           <div class="flex-item">
54 
           <div class="flex-item">
55 
+            <div class="red-hint">建议上传30*30尺寸的图片</div>
53 
             <div>
56 
             <div>
54 
               <el-upload
57 
               <el-upload
55 
                 class="avatar-uploader"
58 
                 class="avatar-uploader"
56 
                 action='string'
59 
                 action='string'
60 
+                :before-upload="toolClass.beforeUpload"
57 
                 :http-request="toolClass.upload"
61 
                 :http-request="toolClass.upload"
58 
                 :show-file-list="false"
62 
                 :show-file-list="false"
59 
                 :on-success="handleAvatarSuccesser">
63 
                 :on-success="handleAvatarSuccesser">
73 
 </template>
77 
 </template>
74
78
75 
 <script>
79 
 <script>
76 
-import { mapState } from 'vuex'
80 
+import { mapState, mapActions } from 'vuex'
77
81
78 
 export default {
82 
 export default {
79 
   name: '',
83 
   name: '',
106 
   },
110 
   },
107 
   created () {
111 
   created () {
108 
     this.getCaseAreaInfo()
112 
     this.getCaseAreaInfo()
113 
+    this.picSize({ w: 30, h: 30 })
109 
   },
114 
   },
110 
   components: {},
115 
   components: {},
111 
   methods: {
116 
   methods: {
117 
+    ...mapActions([
118 
+      'picSize'
119 
+    ]),
112 
     getCaseAreaInfo () { // 获取区域信息
120 
     getCaseAreaInfo () { // 获取区域信息
113 
       this.$ajax(this.$api.caseManager.getCaseAreaInfo.url, {
121 
       this.$ajax(this.$api.caseManager.getCaseAreaInfo.url, {
114 
         method: this.$api.caseManager.getCaseAreaInfo.method,
122 
         method: this.$api.caseManager.getCaseAreaInfo.method,

+ 6
- 1
src/pages/system/caseManager/caseInfo/addCase/index.vue 查看文件

59 
         <li class="flex-h">
59 
         <li class="flex-h">
60 
           <span>案场头像：<em>*</em></span>
60 
           <span>案场头像：<em>*</em></span>
61 
           <div class="flex-item">
61 
           <div class="flex-item">
62 
+            <div class="red-hint">建议上传480*300尺寸的图片</div>
62 
             <div>
63 
             <div>
63 
               <!-- <a class="formImg">
64 
               <!-- <a class="formImg">
64 
                 <img :src="postData.CaseIcon" class="centerLabel contain" alt="">
65 
                 <img :src="postData.CaseIcon" class="centerLabel contain" alt="">
67 
               <el-upload
68 
               <el-upload
68 
                 class="avatar-uploader"
69 
                 class="avatar-uploader"
69 
                 action='string'
70 
                 action='string'
71 
+                :before-upload="toolClass.beforeUpload"
70 
                 :http-request="toolClass.upload"
72 
                 :http-request="toolClass.upload"
71 
                 :show-file-list="false"
73 
                 :show-file-list="false"
72 
                 :on-success="handleAvatarSuccess">
74 
                 :on-success="handleAvatarSuccess">
158 
       OrgId: x => x.app.user.OrgId,
160 
       OrgId: x => x.app.user.OrgId,
159 
     }),
161 
     }),
160 
   },
162 
   },
163 
+  created () {
164 
+    this.picSize({ w: 480, h: 300 })
165 
+  },
161 
   components: {},
166 
   components: {},
162 
   methods: {
167 
   methods: {
163 
     ...mapActions([
168 
     ...mapActions([
164 
-      'updateSystemInfo'
169 
+      'updateSystemInfo', 'picSize'
165 
     ]),
170 
     ]),
166 
     handleAvatarSuccess (res, file) {
171 
     handleAvatarSuccess (res, file) {
167 
       this.postData.CaseIcon = res.result.url
172 
       this.postData.CaseIcon = res.result.url

+ 4
- 1
src/pages/system/caseManager/caseInfo/editCase/index.vue 查看文件

55 
         <li class="flex-h">
55 
         <li class="flex-h">
56 
           <span>案场头像：<em>*</em></span>
56 
           <span>案场头像：<em>*</em></span>
57 
           <div class="flex-item">
57 
           <div class="flex-item">
58 
+            <div class="red-hint">建议上传480*300尺寸的图片</div>
58 
             <div>
59 
             <div>
59 
               <!-- <a class="formImg">
60 
               <!-- <a class="formImg">
60 
                 <img :src="postData.CaseIcon" class="centerLabel contain" alt="">
61 
                 <img :src="postData.CaseIcon" class="centerLabel contain" alt="">
63 
               <el-upload
64 
               <el-upload
64 
                 class="avatar-uploader"
65 
                 class="avatar-uploader"
65 
                 action='string'
66 
                 action='string'
67 
+                :before-upload="toolClass.beforeUpload"
66 
                 :http-request="toolClass.upload"
68 
                 :http-request="toolClass.upload"
67 
                 :show-file-list="false"
69 
                 :show-file-list="false"
68 
                 :on-success="handleAvatarSuccess">
70 
                 :on-success="handleAvatarSuccess">
156 
   },
158 
   },
157 
   created () {
159 
   created () {
158 
     this.getCaseInfoById()
160 
     this.getCaseInfoById()
161 
+    this.picSize({ w: 480, h: 300 })
159 
   },
162 
   },
160 
   components: {},
163 
   components: {},
161 
   methods: {
164 
   methods: {
162 
     ...mapActions([
165 
     ...mapActions([
163 
-      'updateSystemInfo'
166 
+      'updateSystemInfo', 'picSize'
164 
     ]),
167 
     ]),
165 
     getCaseInfoById () { // 获取案场信息
168 
     getCaseInfoById () { // 获取案场信息
166 
       this.$ajax(this.$api.caseManager.getCaseInfo.url, {
169 
       this.$ajax(this.$api.caseManager.getCaseInfo.url, {

+ 4
- 1
src/pages/system/cmsManager/bannerManager/add.vue 查看文件

77 
         <li class="flex-h">
77 
         <li class="flex-h">
78 
           <span>图片：<em>*</em></span>
78 
           <span>图片：<em>*</em></span>
79 
           <div class="flex-item">
79 
           <div class="flex-item">
80 
+            <div class="red-hint">建议上650*300尺寸的图片</div>
80 
             <el-upload
81 
             <el-upload
81 
               class="avatar-uploader"
82 
               class="avatar-uploader"
82 
               action='string'
83 
               action='string'
84 
+              :before-upload="toolClass.beforeUpload"
83 
               :http-request="toolClass.upload"
85 
               :http-request="toolClass.upload"
84 
               :show-file-list="false"
86 
               :show-file-list="false"
85 
               :on-success="handleAvatarSuccess">
87 
               :on-success="handleAvatarSuccess">
131 
     // imageUploader: () => import('@/components/upload')
133 
     // imageUploader: () => import('@/components/upload')
132 
   },
134 
   },
133 
   created () {
135 
   created () {
136 
+    this.picSize({ w: 650, h: 300 })
134 
     this.GetCourseList({ page: 1, pagesize: 100 })
137 
     this.GetCourseList({ page: 1, pagesize: 100 })
135 
     this.updateLocationAllInfo()
138 
     this.updateLocationAllInfo()
136 
     this.updateSystemInfo().then(() => {
139 
     this.updateSystemInfo().then(() => {
153 
       'GetCourseList',
156 
       'GetCourseList',
154 
     ]),
157 
     ]),
155 
     ...mapCmsActions(['updateLocationAllInfo']),
158 
     ...mapCmsActions(['updateLocationAllInfo']),
156 
-    ...mapActions(['updateSystemInfo']),
159 
+    ...mapActions(['updateSystemInfo', 'picSize']),
157 
     submit () {
160 
     submit () {
158 
       if (this.postData.ForwardType === 'url') {
161 
       if (this.postData.ForwardType === 'url') {
159 
         this.postData.ForwardResourceId = ''
162 
         this.postData.ForwardResourceId = ''

+ 5
- 1
src/pages/system/cmsManager/bannerManager/edit.vue 查看文件

77 
         <li class="flex-h">
77 
         <li class="flex-h">
78 
           <span>图片：<em>*</em></span>
78 
           <span>图片：<em>*</em></span>
79 
           <div class="flex-item">
79 
           <div class="flex-item">
80 
+            <div class="red-hint">建议上传650*300尺寸的图片</div>
80 
             <el-upload
81 
             <el-upload
81 
               class="avatar-uploader"
82 
               class="avatar-uploader"
82 
               action='string'
83 
               action='string'
84 
+              :before-upload="toolClass.beforeUpload"
83 
               :http-request="toolClass.upload"
85 
               :http-request="toolClass.upload"
84 
               :show-file-list="false"
86 
               :show-file-list="false"
85 
               :on-success="handleAvatarSuccess">
87 
               :on-success="handleAvatarSuccess">
98 
 </template>
100 
 </template>
99
101
100 
 <script>
102 
 <script>
101 
-import { mapState, createNamespacedHelpers } from 'vuex'
103 
+import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
102 
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
104 
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
103 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
105 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
104
106
125 
   },
127 
   },
126 
   components: {},
128 
   components: {},
127 
   created () {
129 
   created () {
130 
+    this.picSize({ w: 650, h: 300 })
128 
     this.GetCourseList({page: 1, pagesize: 100, callback: this.getDetail})
131 
     this.GetCourseList({page: 1, pagesize: 100, callback: this.getDetail})
129 
     this.updateLocationAllInfo()
132 
     this.updateLocationAllInfo()
130 
   },
133 
   },
143 
       'GetCourseList',
146 
       'GetCourseList',
144 
     ]),
147 
     ]),
145 
     ...mapCmsActions(['updateLocationAllInfo']),
148 
     ...mapCmsActions(['updateLocationAllInfo']),
149 
+    ...mapActions(['picSize']),
146 
     submit () {
150 
     submit () {
147 
       if (this.postData.ForwardType === 'url') {
151 
       if (this.postData.ForwardType === 'url') {
148 
         this.postData.ForwardResourceId = ''
152 
         this.postData.ForwardResourceId = ''

+ 14
- 3
src/pages/system/cmsManager/majorProjects/edit.vue 查看文件

48 
         </li>
48 
         </li>
49 
         <li class="flex-h">
49 
         <li class="flex-h">
50 
           <span>图片：<em>*</em></span>
50 
           <span>图片：<em>*</em></span>
51 
-          <div class="flex-item">
51 
+          <div class="flex-item" @click="pictSize()">
52 
+            <div class="red-hint">建议上传704*208尺寸的图片</div>
52 
             <el-upload
53 
             <el-upload
53 
               class="avatar-uploader"
54 
               class="avatar-uploader"
54 
               action='string'
55 
               action='string'
56 
+              :before-upload="toolClass.beforeUpload"
55 
               :http-request="toolClass.upload"
57 
               :http-request="toolClass.upload"
56 
               :show-file-list="false"
58 
               :show-file-list="false"
57 
               :on-success="handleImgSuccess">
59 
               :on-success="handleImgSuccess">
62 
         </li>
64 
         </li>
63 
         <li class="flex-h">
65 
         <li class="flex-h">
64 
           <span>详细图片：<em>*</em></span>
66 
           <span>详细图片：<em>*</em></span>
65 
-          <div class="flex-item">
67 
+          <div class="flex-item" @click="descSize()">
68 
+            <div class="red-hint">建议上传105*64尺寸的图片</div>
66 
             <el-upload
69 
             <el-upload
67 
               class="avatar-uploader"
70 
               class="avatar-uploader"
68 
               action='string'
71 
               action='string'
72 
+              :before-upload="toolClass.beforeUpload"
69 
               :http-request="toolClass.upload"
73 
               :http-request="toolClass.upload"
70 
               :show-file-list="false"
74 
               :show-file-list="false"
71 
               :on-success="handleDetailImgSuccess">
75 
               :on-success="handleDetailImgSuccess">
203 
 </template>
207 
 </template>
204
208
205 
 <script>
209 
 <script>
206 
-import { createNamespacedHelpers, mapState } from 'vuex'
210 
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
207
211
208 
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('cmscase')
212 
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('cmscase')
209 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
213 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
276 
     ...mapCourseActions([
280 
     ...mapCourseActions([
277 
       'GetCourseList',
281 
       'GetCourseList',
278 
     ]),
282 
     ]),
283 
+    ...mapActions(['picSize']),
279 
     caseChange () {
284 
     caseChange () {
280 
       this.selCourseList = []
285 
       this.selCourseList = []
281 
       this.detail.Courses = []
286 
       this.detail.Courses = []
282 
     },
287 
     },
288 
+    pictSize () {
289 
+      this.picSize({ w: 704, h: 208 })
290 
+    },
291 
+    descSize () {
292 
+      this.picSize({ w: 105, h: 64 })
293 
+    },
283 
     checkFn (arr) {
294 
     checkFn (arr) {
284 
       for (var n = 0; n < arr.length; n++) {
295 
       for (var n = 0; n < arr.length; n++) {
285 
         if (arr[n].type === 'isNull' && !arr[n].target) {
296 
         if (arr[n].type === 'isNull' && !arr[n].target) {

+ 4
- 1
src/pages/system/cmsManager/newsManager/add.vue 查看文件

77 
         <li class="flex-h">
77 
         <li class="flex-h">
78 
           <span>图片：<em>*</em></span>
78 
           <span>图片：<em>*</em></span>
79 
           <div class="flex-item">
79 
           <div class="flex-item">
80 
+            <div class="red-hint">建议上传172*106尺寸的图片</div>
80 
             <el-upload
81 
             <el-upload
81 
               class="avatar-uploader"
82 
               class="avatar-uploader"
82 
               action='string'
83 
               action='string'
84 
+              :before-upload="toolClass.beforeUpload"
83 
               :http-request="toolClass.upload"
85 
               :http-request="toolClass.upload"
84 
               :show-file-list="false"
86 
               :show-file-list="false"
85 
               :on-success="handleAvatarSuccess">
87 
               :on-success="handleAvatarSuccess">
125 
   },
127 
   },
126 
   components: {},
128 
   components: {},
127 
   created () {
129 
   created () {
130 
+    this.picSize({ w: 172, h: 106 })
128 
     this.updateSystemInfo().then(() => {
131 
     this.updateSystemInfo().then(() => {
129 
       this.postData.OrgId = this.OrgId
132 
       this.postData.OrgId = this.OrgId
130 
       this.postData.CaseId = this.CaseId
133 
       this.postData.CaseId = this.CaseId
147 
     ...mapCourseActions([
150 
     ...mapCourseActions([
148 
       'GetCourseList',
151 
       'GetCourseList',
149 
     ]),
152 
     ]),
150 
-    ...mapActions(['updateSystemInfo']),
153 
+    ...mapActions(['updateSystemInfo', 'picSize']),
151 
     ...mapCmsActions([
154 
     ...mapCmsActions([
152 
       'updateLocationAllInfo',
155 
       'updateLocationAllInfo',
153 
     ]),
156 
     ]),

+ 5
- 1
src/pages/system/cmsManager/newsManager/edit.vue 查看文件

77 
         <li class="flex-h">
77 
         <li class="flex-h">
78 
           <span>图片：<em>*</em></span>
78 
           <span>图片：<em>*</em></span>
79 
           <div class="flex-item">
79 
           <div class="flex-item">
80 
+            <div class="red-hint">建议上传172*106尺寸的图片</div>
80 
             <el-upload
81 
             <el-upload
81 
               class="avatar-uploader"
82 
               class="avatar-uploader"
82 
               action='string'
83 
               action='string'
84 
+              :before-upload="toolClass.beforeUpload"
83 
               :http-request="toolClass.upload"
85 
               :http-request="toolClass.upload"
84 
               :show-file-list="false"
86 
               :show-file-list="false"
85 
               :on-success="handleAvatarSuccess">
87 
               :on-success="handleAvatarSuccess">
98 
 </template>
100 
 </template>
99
101
100 
 <script>
102 
 <script>
101 
-import { mapState, createNamespacedHelpers } from 'vuex'
103 
+import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
102 
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
104 
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
103 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
105 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
104 
 export default {
106 
 export default {
124 
   },
126 
   },
125 
   components: {},
127 
   components: {},
126 
   created () {
128 
   created () {
129 
+    this.picSize({ w: 172, h: 106 })
127 
     this.updateLocationAllInfo().then(() => {
130 
     this.updateLocationAllInfo().then(() => {
128 
       this.getDetail()
131 
       this.getDetail()
129 
       this.GetCourseList({ page: 1, pagesize: 10000 })
132 
       this.GetCourseList({ page: 1, pagesize: 10000 })
141 
     ...mapCourseActions([
144 
     ...mapCourseActions([
142 
       'GetCourseList',
145 
       'GetCourseList',
143 
     ]),
146 
     ]),
147 
+    ...mapActions(['picSize']),
144 
     ...mapCmsActions(['updateLocationAllInfo']),
148 
     ...mapCmsActions(['updateLocationAllInfo']),
145 
     submit () {
149 
     submit () {
146 
       if (this.postData.ForwardType === 'url') {
150 
       if (this.postData.ForwardType === 'url') {

+ 5
- 1
src/pages/system/courseManager/courseList/add.vue 查看文件

5 
         <li class="flex-h">
5 
         <li class="flex-h">
6 
           <span>课程主图：<em>*</em></span>
6 
           <span>课程主图：<em>*</em></span>
7 
           <div class="flex-item">
7 
           <div class="flex-item">
8 
+            <div class="red-hint">建议上传750*960尺寸的图片</div>
8 
             <div>
9 
             <div>
9 
               <el-upload
10 
               <el-upload
10 
                 class="avatar-uploader"
11 
                 class="avatar-uploader"
11 
                 action='string'
12 
                 action='string'
13 
+                :before-upload="toolClass.beforeUpload"
12 
                 :http-request="toolClass.upload"
14 
                 :http-request="toolClass.upload"
13 
                 :show-file-list="false"
15 
                 :show-file-list="false"
14 
                 :on-success="handleAvatarSuccess">
16 
                 :on-success="handleAvatarSuccess">
209 
 </template>
211 
 </template>
210
212
211 
 <script>
213 
 <script>
212 
-import { createNamespacedHelpers, mapState } from 'vuex'
214 
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
213
215
214 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
216 
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
215 
 const { mapState: mapLocationState, mapActions: mapLocationActions } = createNamespacedHelpers('cms')
217 
 const { mapState: mapLocationState, mapActions: mapLocationActions } = createNamespacedHelpers('cms')
288 
     ...mapTagActions([
290 
     ...mapTagActions([
289 
       'GetCourseTagList',
291 
       'GetCourseTagList',
290 
     ]),
292 
     ]),
293 
+    ...mapActions(['picSize']),
291 
     handleAvatarSuccess (res, file) {
294 
     handleAvatarSuccess (res, file) {
292 
       this.UpdateInfo({ ...this.detail, CourseImg: res.result.url })
295 
       this.UpdateInfo({ ...this.detail, CourseImg: res.result.url })
293 
     },
296 
     },
386 
     }
389 
     }
387 
   },
390 
   },
388 
   mounted () {
391 
   mounted () {
392 
+    this.picSize({ w: 750, h: 960 })
389 
     this.updateLocationInfo({issys: 0})
393 
     this.updateLocationInfo({issys: 0})
390 
     this.GetCourseTagList({ pagesize: 100 })
394 
     this.GetCourseTagList({ pagesize: 100 })
391 
     const { id } = this.$route.query
395 
     const { id } = this.$route.query

+ 28
- 0
src/pages/system/dataStatistics/goodsOrderList/index.vue 查看文件

23 
               </el-option>
23 
               </el-option>
24 
             </el-select>
24 
             </el-select>
25 
           </li>
25 
           </li>
26 
+          <li>
27 
+            <el-select v-model="postData.paytype" placeholder="请选择下单支付方式">
28 
+              <el-option
29 
+                v-for="item in paytype"
30 
+                :key="item.id"
31 
+                :label="item.value"
32 
+                :value="item.id">
33 
+              </el-option>
34 
+            </el-select>
35 
+          </li>
26 
           <li>
36 
           <li>
27 
             <el-select v-model="postData.status" placeholder="请选择订单状态">
37 
             <el-select v-model="postData.status" placeholder="请选择订单状态">
28 
               <el-option
38 
               <el-option
71 
               <span>案场：{{returnListItem(goodsOrderList, index).CaseName}}</span>
81 
               <span>案场：{{returnListItem(goodsOrderList, index).CaseName}}</span>
72 
               <span>用户类型：{{returnListItem(goodsOrderList, index).UserType === 'sales' ? '销售' : returnListItem(goodsOrderList, index).UserType === 'manager' ? '主管' : '用户'}}</span>
82 
               <span>用户类型：{{returnListItem(goodsOrderList, index).UserType === 'sales' ? '销售' : returnListItem(goodsOrderList, index).UserType === 'manager' ? '主管' : '用户'}}</span>
73 
               <span>下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
83 
               <span>下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
84 
+              <span>支付方式：{{returnListItem(goodsOrderList, index).PayTypeStr}}</span>
74 
             </div>
85 
             </div>
75 
             <span>{{returnStatus(returnListItem(goodsOrderList, index).MakeStatus)}}</span>
86 
             <span>{{returnStatus(returnListItem(goodsOrderList, index).MakeStatus)}}</span>
76 
           </div>
87 
           </div>
146 
         usertype: '', // 用户类型
157 
         usertype: '', // 用户类型
147 
         begindate: '', // 起始日期
158 
         begindate: '', // 起始日期
148 
         enddate: '', // 截止日期
159 
         enddate: '', // 截止日期
160 
+        paytype: '', // 支付方式
149 
         page: 1, // 当前页码
161 
         page: 1, // 当前页码
150 
         pagesize: 10, // 请求数据量
162 
         pagesize: 10, // 请求数据量
151 
       },
163 
       },
162 
         value: '用户',
174 
         value: '用户',
163 
         id: 'customer'
175 
         id: 'customer'
164 
       }],
176 
       }],
177 
+      paytype: [{
178 
+        value: '',
179 
+        id: ''
180 
+      }, {
181 
+        value: '城币',
182 
+        id: 'cheng-coin'
183 
+      }, {
184 
+        value: '优惠券',
185 
+        id: 'coupon'
186 
+      }, {
187 
+        value: '案场',
188 
+        id: 'sys user'
189 
+      }, {
190 
+        value: '积分',
191 
+        id: 'points'
192 
+      }],
165 
       statusList: [{
193 
       statusList: [{
166 
         value: '',
194 
         value: '',
167 
         id: ''
195 
         id: ''

+ 7
- 1
src/pages/system/goodsManager/goodManager/edit.vue 查看文件

32 
         <li class="flex-h">
 32 
         <li class="flex-h">
33 
           <span>商品图片：<em>*</em></span>
 33 
           <span>商品图片：<em>*</em></span>
34 
           <div class="flex-item">
 34 
           <div class="flex-item">
35 
+            <div class="red-hint">建议上传150*150尺寸的图片</div>
35 
             <div style="width:50%">
 36 
             <div style="width:50%">
36 
               <el-upload
 37 
               <el-upload
37 
                 class="avatar-uploader"
 38 
                 class="avatar-uploader"
38 
                 action='string'
 39 
                 action='string'
40 
+                :before-upload="toolClass.beforeUpload"
39 
                 :http-request="toolClass.upload"
 41 
                 :http-request="toolClass.upload"
40 
                 :show-file-list="false"
 42 
                 :show-file-list="false"
41 
                 :on-success="handleAvatarSuccess">
 43 
                 :on-success="handleAvatarSuccess">
97 
 </template>
 99 
 </template>
98
100
99 
 <script>
 101 
 <script>
100 
-import { createNamespacedHelpers, mapState } from 'vuex'
102 
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
101
103
102 
 const { mapState: mapGoodsState, mapActions: mapGoodsActions } = createNamespacedHelpers('goods')
 104 
 const { mapState: mapGoodsState, mapActions: mapGoodsActions } = createNamespacedHelpers('goods')
103 
 export default {
 105 
 export default {
163 
       'UpdateInfo',
 165 
       'UpdateInfo',
164 
       'GetGoodSpecs',
 166 
       'GetGoodSpecs',
165 
     ]),
 167 
     ]),
168 
+    ...mapActions([
169 
+      'picSize'
170 
+    ]),
166 
     submit () {
 171 
     submit () {
167 
       this.detail.specs = JSON.stringify(this.detailSpecs.map(x => ({ SpecId: x, GoodsPrice: this.detail.Price })))
 172 
       this.detail.specs = JSON.stringify(this.detailSpecs.map(x => ({ SpecId: x, GoodsPrice: this.detail.Price })))
168 
       this.detail.images = (this.detail.Images || []).map(x => {
 173 
       this.detail.images = (this.detail.Images || []).map(x => {
234 
     },
 239 
     },
235 
   },
 240 
   },
236 
   created () {
 241 
   created () {
242 
+    this.picSize({ w: 150, h: 150 })
237 
     const { id } = this.$route.query
 243 
     const { id } = this.$route.query
238 
     if (id && id !== '') {
 244 
     if (id && id !== '') {
239 
       this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
 245 
       this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })

+ 1
- 0
src/pages/system/newOrder/newOrderList/index.vue 查看文件

313 
         this.websockets[wsRealPath].onopen = console.log
313 
         this.websockets[wsRealPath].onopen = console.log
314 
         this.websockets[wsRealPath].onmessage = this.websocketonmessage
314 
         this.websockets[wsRealPath].onmessage = this.websocketonmessage
315 
         this.websockets[wsRealPath].onclose = this.reloadWebSocket
315 
         this.websockets[wsRealPath].onclose = this.reloadWebSocket
316 
+        this.websockets[wsRealPath].onerror = this.reloadWebSocket
316 
         this.websockets[wsRealPath].interval = setInterval(() => this.websockets[wsRealPath].send(10), 120000)
317 
         this.websockets[wsRealPath].interval = setInterval(() => this.websockets[wsRealPath].send(10), 120000)
317 
       }
318 
       }
318 
     },
319 
     },

+ 11
- 1
src/store/app.js 查看文件

59 
     roles: [],
59 
     roles: [],
60 
     user: {},
60 
     user: {},
61 
     clientUrl: '',
61 
     clientUrl: '',
62 
+    picSize: {
63 
+      w: 0,
64 
+      height: 0
65 
+    }
62 
   },
66 
   },
63 
   mutations: {
67 
   mutations: {
64 
     init (state, data) { // 这里的state对应着上面这个state
68 
     init (state, data) { // 这里的state对应着上面这个state
94 
       // 获取 面包屑
98 
       // 获取 面包屑
95 
       if (currentRoute) state.breadcrumb = currentRoute.parent.slice(1).concat(currentRoute)
99 
       if (currentRoute) state.breadcrumb = currentRoute.parent.slice(1).concat(currentRoute)
96 
       // console.log(state.breadcrumb)
100 
       // console.log(state.breadcrumb)
97 
-    }
101 
+    },
102 
+    setPicSize (state, data) { // 设置图片尺寸限制
103 
+      state.picSize = data
104 
+    },
98 
   },
105 
   },
99 
   actions: {
106 
   actions: {
100 
     updateSystemInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
107 
     updateSystemInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
106 
           resolve()
113 
           resolve()
107 
         })
114 
         })
108 
       })
115 
       })
116 
+    },
117 
+    picSize (context, data) {
118 
+      context.commit('setPicSize', data)
109 
     }
119 
     }
110 
   }
120 
   }
111 
 }
121 
 }

+ 4
- 0
src/style/main.css 查看文件

409 
   color: #ccc;
409 
   color: #ccc;
410 
 }
410 
 }
411
411
412 
+.red-hint{
413 
+  min-height: 25px !important;
414 
+  color: red;
415 
+}
412
416
413
417
414
418

+ 39
- 0
src/util/util.js 查看文件

1 
 import Ajax from './ajax'
1 
 import Ajax from './ajax'
2 
 import api from './api'
2 
 import api from './api'
3 
+// import { Message } from 'element-ui'
4 
+// import store from '../store'
3 
 const toolClass = {
5 
 const toolClass = {
4 
   dateFormat: (timestamp, fmt) => {
6 
   dateFormat: (timestamp, fmt) => {
5 
     if (!fmt) {
7 
     if (!fmt) {
43 
         resolve(result)
45 
         resolve(result)
44 
       }).catch(reject)
46 
       }).catch(reject)
45 
     })
47 
     })
48 
+  },
49 
+  beforeUpload (file) {
50 
+    return true
51 
+    // return new Promise((resolve, reject) => {
52 
+    //   let w = store.state.app.picSize.w
53 
+    //   let h = store.state.app.picSize.h
54 
+    //   if ('image'.indexOf(file.type) > -1) {
55 
+    //     Message({
56 
+    //       type: 'error',
57 
+    //       message: `请上传${w}像素*${h}像素尺寸的图片`
58 
+    //     })
59 
+    //     reject(new Error('error'))
60 
+    //   }
61 
+    //   var reader = new FileReader()
62 
+    //   reader.onload = function (e) {
63 
+    //     var data = e.target.result
64 
+    //     // 加载图片获取图片真实宽度和高度
65 
+    //     var image = new Image()
66 
+    //     image.onload = function () {
67 
+    //       var width = image.width
68 
+    //       var height = image.height
69 
+    //       console.log(width)
70 
+    //       console.log(height)
71 
+    //       if (width === w && height === h) {
72 
+    //         resolve()
73 
+    //       } else {
74 
+    //         Message({
75 
+    //           type: 'error',
76 
+    //           message: `请上传${w}像素*${h}像素尺寸的图片`
77 
+    //         })
78 
+    //         reject(new Error('error'))
79 
+    //       }
80 
+    //     }
81 
+    //     image.src = data
82 
+    //   }
83 
+    //   reader.readAsDataURL(file)
84 
+    // })
46 
   }
85 
   }
47 
 }
86 
 }
48
87