Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/components/myCard/myCard.vue

@@ -24,11 +24,11 @@
       </div>
       <div>
         <span>用户领取</span>
-        <span>{{data.SentCount}}</span>
+        <span>{{ismanger?data.SentCount:userGet.length}}</span>
       </div>
       <div>
         <span>用户使用</span>
-        <span>{{data.usedCount}}</span>
+        <span>{{ismanger?data.UsedCount:userGet.filter(x => x.status===1).length}}</span>
       </div>
     </div>
     <div class="card-bottom" @click.stop="share">
@@ -58,6 +58,14 @@ export default {
     isgrey: {
       type: Boolean,
       default: false
+    },
+    userGet: {
+      type: Array,
+      default: []
+    },
+    ismanger: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {

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

@@ -59,7 +59,7 @@
                   </div>
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[1].list" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard'></myCard>
+                <myCard v-for="(item,index) in data[1].list" :ismanger="ismanger" :userGet="item.CustomerCoupon" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard'></myCard>
                 <noMore v-if="data[1].hasPic"></noMore>
               </div>
             </li>
@@ -74,7 +74,7 @@
                   </div>
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[2].list" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon'></myCard>
+                <myCard v-for="(item,index) in data[2].list" :ismanger="ismanger" :userGet="item.CustomerCard" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon'></myCard>
                 <noMore v-if="data[2].hasPic"></noMore>
               </div>
             </li>
@@ -250,7 +250,10 @@ export default {
     }),
     ...mapCardState({
       cardList: x => x.cardList
-    })
+    }),
+    ismanger () {
+      return this.userInfo.UserTypeId == "manager" ? true : false
+    },
   },
   components: {
     topCaseInfo,