xcx

src/components/myCard/myCard.vue

@@ -3,7 +3,7 @@
     <div class="card-top flex-h">
       <div>
         <img :src="logo" class="logo">
-        <span>￥ <span> {{data.Price}} </span> 元</span>
+        <span>￥ <span> {{data.price}} </span> 元</span>
         <img :src="line3" class="line3">
       </div>
       <div>
@@ -31,7 +31,7 @@
         <span>{{data.usedCount}}</span>
       </div>
     </div>
-    <div v-if='data.invalid' class="card-bottom" @click.stop="share">
+    <div class="card-bottom" @click.stop="share">
       分享卡券
     </div>
   </div>
@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     share () {
-      if(this.data.invalid){
+      if(!this.data.invalid){
         this.$emit('share', this.data)
       }
     }
@@ -103,7 +103,7 @@ export default {
         align-items: baseline;
         span {
           color: #fc6243;
-          font-size: 0.26rem;
+          font-size: 0.22rem;
         }
       }
     }

src/pages/user/mainPage/coffeeIndex/index.vue

@@ -51,8 +51,7 @@
                   <div class="flex-item">
                     <div>
                       <span>卡券货值总额：</span>
-                      <span>￥1000</span>
-                      <span>万</span>
+                      <span>￥{{cardTotalCount}}</span>
                     </div>
                   </div>
                   <a @click="toSalesHistory">销售记录</a>
@@ -141,6 +140,11 @@ export default {
   name: '',
   data () {
     return {
+      cardTotalCount: 0,
+      postCouponData: {
+        page: 1,
+        pageSize: 10
+      },
       postCardData: {
         page: 1,
         pageSize: 10
@@ -256,30 +260,40 @@ export default {
     scroll
   },
   created () {
-    this.getMyCardList({
-      ...this.postCardData
-    }).then((res) => {
-      console.log(JSON.stringify(res))
-      for (var n = 0; n < res.list.length; n++) {
-        this.data[1].list.push({
-          invalid: '',
-          price: res.list[n].Price,
-          title: res.list[n].CardName,
-          desc: 'xxx',
-          startDate: this.toolClass.dateFormat(res.list[n].StartDate),
-          endDate: this.toolClass.dateFormat(res.list[n].EndDate),
-          totalCount: res.list[n].TotalCount,
-          SentCount: res.list[n].SentCount,
-          usedCount: res.list[n].UsedCount,
-          // title: res.list[n].CardName,
-          // desc: '描述',
-          // time: this.toolClass.dateFormat(res.list[n].EndDate),
-          // useType: '未使用',
-          // tag: '共享'
-        })
-      }
-      console.log(JSON.stringify(this.data[1].list))
-    })
+    if (this.userInfo.customer.MapUser !== '') {
+      this.getForbidInfo().then((res) => {
+        console.log(JSON.stringify(res))
+      })
+      this.getMyCouponList({
+        ...this.postCouponData
+      }).then((res) => {
+        console.log(JSON.stringify(res))
+      })
+      this.getMyCardList({
+        ...this.postCardData
+      }).then((res) => {
+        console.log(JSON.stringify(res))
+        res.list = res.list || []
+        for (var n = 0; n < res.list.length; n++) {
+          this.data[1].list.push({
+            invalid: this.returnInvalid(res.list[n]),
+            price: res.list[n].Price,
+            title: res.list[n].CardName,
+            desc: res.list[n].Share.CardUseRule,
+            startDate: this.toolClass.dateFormat(res.list[n].StartDate),
+            endDate: this.toolClass.dateFormat(res.list[n].EndDate),
+            totalCount: res.list[n].TotalCount,
+            SentCount: res.list[n].SentCount,
+            usedCount: res.list[n].UsedCount,
+          })
+        }
+        var count = 0
+        for (var n = 0; n < this.data[1].list.length; n++) {
+          count += this.data[1].list[n].price * this.data[1].list[n].totalCount - 0
+        }
+        this.cardTotalCount = count.toFixed(2)
+      })
+    }
     this.getCaseList().then((res) => {
       this.topCaseInfoData.CaseName = res.cases[0].CaseName
       this.topCaseInfoData.CaseId = res.cases[0].CaseId
@@ -297,6 +311,8 @@ export default {
   methods: {
     ...mapUserCenterActions([
       'getMyCardList',
+      'getMyCouponList',
+      'getForbidInfo',
     ]),
     ...actions([
       'getCaseList',
@@ -309,8 +325,11 @@ export default {
     ]),
     ...mapCustomerActions(['getCustomerList']),
     ...mapCardActions(['getCardList']),
+    returnInvalid (item) {
+      return false
+    },
     toSalesHistory () {
-      console.log(this.getUrl('salesRecord'))
+      //console.log(this.getUrl('salesRecord'))
       window.location.href = this.getUrl('salesRecord')
     },
     getUrl (val) {

src/store/userCenter/userCenter.js

@@ -101,6 +101,25 @@ export default {
     }
   },
   actions: {
+    getForbidInfo (context) { // 获取用户禁用信息
+      return new Promise((resolve) => {
+        Ajax(api.sales.getForbidInfo.url, {
+          method: api.sales.getForbidInfo.method,
+        }).then(res => {
+          resolve(res)
+        })
+      })
+    },
+    getMyCouponList (context, payload) { // 获取我的券列表
+      return new Promise((resolve) => {
+        Ajax(api.sales.getCouponList.url, {
+          method: api.sales.getCouponList.method,
+          queryData: { ...payload }
+        }).then(res => {
+          resolve(res)
+        })
+      })
+    },
     getMyCardList (context, payload) { // 获取我的卡列表
       return new Promise((resolve) => {
         Ajax(api.sales.getCardList.url, {

src/util/ajax.js

@@ -10,7 +10,7 @@ const token = function (headers) {
     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization
   }
-  console.log(JWT)
+  // console.log(JWT)
   return JWT ? JWT : localStorage.getItem('JWT')
 }
 
@@ -68,16 +68,16 @@ const ajax = (...args) => {
       if (code === 200) {
         resolve(result)
       } else if (code === 401) {
-        console.log(result)
+        // console.log(result)
         // reject(code)
         toolClass.getCode(result.appid)
       } else if (code === 406) {
-        console.log(router.history.current.name)
+        // console.log(router.history.current.name)
         if (router.history.current.name !== 'bindMobile') {
           router.push({ name: 'bindMobile' })
         }
       } else {
-        console.log(message)
+        // console.log(message)
         Toast.fail({
           duration: 2000, // 持续展示 toast
           forbidClick: true, // 禁用背景点击

src/util/api.js

@@ -147,7 +147,7 @@ const $api = {
     getSalesCardList: {
       method: 'get',
       url: `${baseUrl}${wechat}/user/detail/:id`
-    }
+    },
   },
   sales: {
     getCardList: { // 获取我的卡列表
@@ -158,6 +158,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/coupon`
     },
+    getForbidInfo: { // 获取用户禁用信息
+      method: 'get',
+      url: `${baseUrl}${wechat}/user/forbid`
+    },
   },
   login: { // 主管、销售端登陆
     login: {