瀏覽代碼

bug修改

wangfei 6 年之前
父節點
當前提交
afb53664e4
共有 2 個文件被更改,包括 7 次插入9 次删除
  1. 2
    6
      src/components/myCard/myCard.vue
  2. 5
    3
      src/pages/user/mainPage/coffeeIndex/index.vue

+ 2
- 6
src/components/myCard/myCard.vue 查看文件

24
       </div>
24
       </div>
25
       <div>
25
       <div>
26
         <span>用户领取</span>
26
         <span>用户领取</span>
27
-        <span>{{ismanager?data.SentCount:userGet.length}}</span>
27
+        <span>{{ismanager?data.SentCount:data.CustomerList.length}}</span>
28
       </div>
28
       </div>
29
       <div>
29
       <div>
30
         <span>用户使用</span>
30
         <span>用户使用</span>
31
-        <span>{{ismanager?data.UsedCount:userGet.filter(x => x.status===1).length}}</span>
31
+        <span>{{ismanager?data.UsedCount:data.CustomerList.filter(x => x.status===1).length}}</span>
32
       </div>
32
       </div>
33
     </div>
33
     </div>
34
     <div class="card-bottom" @click.stop="share">
34
     <div class="card-bottom" @click.stop="share">
59
       type: Boolean,
59
       type: Boolean,
60
       default: false
60
       default: false
61
     },
61
     },
62
-    userGet: {
63
-      type: Array,
64
-      default: []
65
-    },
66
     ismanager: {
62
     ismanager: {
67
       type: Boolean,
63
       type: Boolean,
68
       default: false
64
       default: false

+ 5
- 3
src/pages/user/mainPage/coffeeIndex/index.vue 查看文件

59
                   </div>
59
                   </div>
60
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
60
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
61
                 </div>
61
                 </div>
62
-                <myCard v-for="(item,index) in data[1].list" :ismanager="userInfo.customer.UserTypeId == 'manager'" :userGet="item.CustomerCoupon" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard'></myCard>
62
+                <myCard v-for="(item,index) in data[1].list" :ismanager="userInfo.customer.UserTypeId == 'manager'" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard'></myCard>
63
                 <noMore v-if="data[1].hasPic"></noMore>
63
                 <noMore v-if="data[1].hasPic"></noMore>
64
               </div>
64
               </div>
65
             </li>
65
             </li>
74
                   </div>
74
                   </div>
75
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
75
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
76
                 </div>
76
                 </div>
77
-                <myCard v-for="(item,index) in data[2].list" :ismanager="userInfo.customer.UserTypeId == 'manager'" :userGet="item.CustomerCard" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon'></myCard>
77
+                <myCard v-for="(item,index) in data[2].list" :ismanager="userInfo.customer.UserTypeId == 'manager'" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon'></myCard>
78
                 <noMore v-if="data[2].hasPic"></noMore>
78
                 <noMore v-if="data[2].hasPic"></noMore>
79
               </div>
79
               </div>
80
             </li>
80
             </li>
300
                 SentCount: res.list[n].SentCount,
300
                 SentCount: res.list[n].SentCount,
301
                 usedCount: res.list[n].UsedCount,
301
                 usedCount: res.list[n].UsedCount,
302
                 CardId: res.list[n].CouponId,
302
                 CardId: res.list[n].CouponId,
303
+                CustomerList: res.list[n].CustomerCoupon || []
303
               })
304
               })
304
             }
305
             }
305
             var count = 0
306
             var count = 0
327
                 totalCount: res.list[n].TotalCount,
328
                 totalCount: res.list[n].TotalCount,
328
                 SentCount: res.list[n].SentCount,
329
                 SentCount: res.list[n].SentCount,
329
                 usedCount: res.list[n].UsedCount,
330
                 usedCount: res.list[n].UsedCount,
330
-                CardId: res.list[n].CardId
331
+                CardId: res.list[n].CardId,
332
+                CustomerList: res.list[n].CustomerCard || []
331
               })
333
               })
332
             }
334
             }
333
             var count = 0
335
             var count = 0