xcx

src/pages/system/cardAndCouponManager/couponManager/edit.vue

@@ -492,6 +492,7 @@ export default {
     },
     sureAddItem () { // 确定添加指定商品
       var bool = true
+      this.couponInfo.Targets = this.couponInfo.Targets || []
       if (this.couponInfo.CouponType === 'goods') {
         for (var n = 0; n < this.currentSelectArr.length; n++) {
           if (this.couponInfo.Targets.length) {

src/pages/system/dashboard/index.vue

@@ -94,25 +94,31 @@ export default {
     }),
     CaseId: {
       get () {
-        return this.postData.caseid || this.defaultCaseId
+        return this.postData.caseid || this.defaultCaseId || this.cases[0].CaseId
       },
       set (val) {
         this.postData.caseid = val
       }
     }
   },
-  mounted () {
-    this.$nextTick(function () {
-      this.getDashboardData({
-        caseid: this.postData.caseid
-      }).then((res) => {
-        console.log(JSON.stringify(res))
-      })
+  created () {
+    this.postData.caseid = this.postData.caseid || this.cases[0].CaseId
+    this.getDashboardData({
+      caseid: this.postData.caseid
+    }).then((res) => {
+      console.log(JSON.stringify(res))
+    })
+    this.getDashboardBottomData({
+      caseid: this.postData.caseid,
+      statype: 'week'
+    }).then((res) => {
+      console.log(JSON.stringify(res))
     })
   },
   methods: {
     ...mapStaActions([
       'getDashboardData',
+      'getDashboardBottomData',
     ]),
   }
 }

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

@@ -176,7 +176,7 @@ export default {
       },
       currentList: [],
       typeList: [{
-        value: '不限',
+        value: '',
         id: ''
       }, {
         value: '案场',
@@ -192,7 +192,7 @@ export default {
         id: 'give'
       }],
       statusList: [{
-        value: '不限',
+        value: '',
         id: ''
       }, {
         value: '未使用',

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

@@ -139,7 +139,7 @@ export default {
         pagesize: 10, // 请求数据量
       },
       statusList: [{
-        value: '不限',
+        value: '',
         id: ''
       }, {
         value: '未使用',

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

@@ -148,7 +148,7 @@ export default {
         pagesize: 10, // 请求数据量
       },
       typeList: [{
-        value: '不限',
+        value: '',
         id: ''
       }, {
         value: '销售',
@@ -161,7 +161,7 @@ export default {
         id: 'customer'
       }],
       statusList: [{
-        value: '不限',
+        value: '',
         id: ''
       }, {
         value: '已下单',

src/pages/system/verificationManager/drawVerification/index.vue

@@ -79,6 +79,11 @@ export default {
           this.centerDialogVisible = false
           this.verificationCode = ''
         })
+      } else {
+        this.$message({
+          message: '核销码为空！',
+          type: 'error'
+        })
       }
     },
     toVerificationList () { // 定向到核销列表

src/pages/system/verificationManager/phoneVerification/index.vue

@@ -31,7 +31,14 @@ export default {
   },
   methods: {
     toVerificationList () { // 前往核销列表
-      this.$router.push({name: 'phoneVerificationList', query: {tel: this.phone}})
+      if (this.phone !== '') {
+        this.$router.push({name: 'phoneVerificationList', query: {tel: this.phone}})
+      } else {
+        this.$message({
+          message: '手机号为空！',
+          type: 'error'
+        })
+      }
     },
   }
 }

src/pages/system/verificationManager/phoneVerification/verificationList/index.vue

@@ -6,9 +6,9 @@
           <div class="flex-item">
             <div class="userInfo">
               <span>用户名：</span>
-              <b>{{(courses.customerInfo || {}).Name || (courses.customerInfo || {}).CustomerName }}</b>
+              <b>{{customerName}}</b>
               <span>手机号：</span>
-              <b>{{(courses.customerInfo || {}).Phone}}</b>
+              <b>{{phone}}</b>
             </div>
           </div>
           <el-button
@@ -86,6 +86,8 @@ export default {
   name: '',
   data () {
     return {
+      customerName: '',
+      phone: this.$route.query.tel,
       code: '',
       tel: '',
       page: 1,
@@ -93,11 +95,16 @@ export default {
     }
   },
   mounted () {
-    const { code, tel } = this.$route.query
-    this.code = code
-    this.tel = tel
     this.$nextTick(function () {
-      this.getList()
+      this.getCustomerName({
+        id: this.phone
+      }).then((res) => {
+        console.log(res)
+        const { code, tel } = this.$route.query
+        this.code = code
+        this.tel = tel
+        this.getList()
+      })
     })
   },
   computed: {
@@ -110,6 +117,7 @@ export default {
       'GetCourseVerList',
       'CourseVerifs',
       'GetCourseVerListByTel',
+      'getCustomerName'
     ]),
     check (item) { // 核销
       this.$confirm('确认核销此课程?', '提示', {

src/pages/system/verificationManager/qrcodeVerification/index.vue

@@ -62,7 +62,14 @@ export default {
   },
   methods: {
     toVerificationList () { // 定向到核销列表
-      this.$router.push({name: 'qrcodeVerificationList', query: {code: this.verificationCode}})
+      if (this.verificationCode !== '') {
+        this.$router.push({ name: 'qrcodeVerificationList', query: { code: this.verificationCode } })
+      } else {
+        this.$message({
+          message: '核销码为空！',
+          type: 'error'
+        })
+      }
     },
   }
 }

src/store/case/index.js

@@ -12,7 +12,7 @@ export default {
       label: '案场3'
     }, {
       value: '',
-      label: '不限'
+      label: ''
     }],
   },
   mutations: {},

src/store/sta/sta.js

@@ -158,8 +158,20 @@ export default {
     },
     getDashboardData ({ commit }, payload) {
       return new Promise((resolve, reject) => {
-        ajax(api.statistics.dashboardData.url, {
-          method: api.statistics.dashboardData.method,
+        ajax(api.dashboard.dashboardData.url, {
+          method: api.dashboard.dashboardData.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getDashboardBottomData ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.dashboard.dashboardBottomData.url, {
+          method: api.dashboard.dashboardBottomData.method,
           queryData: {
             ...payload,
           }

src/store/verification/verification.js

@@ -74,5 +74,17 @@ export default {
         }).catch(reject)
       })
     },
+    getCustomerName ({ commit }, { id }) {
+      return new Promise((resolve, reject) => {
+        ajax(api.verification.getCustomerName.url, {
+          method: api.verification.getCustomerName.method,
+          urlData: {
+            id,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
   },
 }

src/style/main.css

@@ -395,6 +395,10 @@ select:focus {
   height: 100%;
 }
 
+.el-table th>.cell,
+.el-table .cell{
+  text-overflow: initial !important;
+}
 
 
 

src/util/api.js

@@ -553,6 +553,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/luckdrawlist/verify/:id`
     },
+    getCustomerName: {
+      method: 'get',
+      url: `${baseUrl}${common}/customer/tel/:id`
+    },
   },
   goodsOrder: {
     getOnlineOrder: {
@@ -760,9 +764,15 @@ const $api = {
       url: `${baseUrl}${common}/statistics/cardcouponverify/excel`
     },
   },
-  dashboardData: {
-    method: 'get',
-    url: `${baseUrl}${common}/dashboard`
+  dashboard: {
+    dashboardData: {
+      method: 'get',
+      url: `${baseUrl}${common}/dashboard`
+    },
+    dashboardBottomData: {
+      method: 'get',
+      url: `${baseUrl}${common}/dashboard/charts`
+    },
   },
   health: {
     healthList: {