Browse Source

bug修改

wangfei 6 years ago
parent
commit
917b02e596

+ 5
- 5
src/components/myCard/myCard.vue View File

24
       </div>
24
       </div>
25
       <div>
25
       <div>
26
         <span>用户领取</span>
26
         <span>用户领取</span>
27
-        <span>{{ismanger?data.SentCount:userGet.length}}</span>
27
+        <span>{{userInfo.UserTypeId==='manager'?data.SentCount:userGet.length}}</span>
28
       </div>
28
       </div>
29
       <div>
29
       <div>
30
         <span>用户使用</span>
30
         <span>用户使用</span>
31
-        <span>{{ismanger?data.UsedCount:userGet.filter(x => x.status===1).length}}</span>
31
+        <span>{{userInfo.UserTypeId==='manager'?data.UsedCount:userGet.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">
63
       type: Array,
63
       type: Array,
64
       default: []
64
       default: []
65
     },
65
     },
66
-    ismanger: {
67
-      type: Boolean,
68
-      default: false
66
+    userInfo: {
67
+      type: Object,
68
+      default: () => { }
69
     }
69
     }
70
   },
70
   },
71
   methods: {
71
   methods: {

+ 2
- 5
src/pages/user/mainPage/coffeeIndex/index.vue View File

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" :ismanger="ismanger" :userGet="item.CustomerCoupon" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard'></myCard>
62
+                <myCard v-for="(item,index) in data[1].list" :user="userInfo" :userGet="item.CustomerCoupon" :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" :ismanger="ismanger" :userGet="item.CustomerCard" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon'></myCard>
77
+                <myCard v-for="(item,index) in data[2].list" :user="userInfo.customer" :userGet="item.CustomerCard" :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>
251
     ...mapCardState({
251
     ...mapCardState({
252
       cardList: x => x.cardList
252
       cardList: x => x.cardList
253
     }),
253
     }),
254
-    ismanger () {
255
-      return this.userInfo.UserTypeId == "manager" ? true : false
256
-    },
257
   },
254
   },
258
   components: {
255
   components: {
259
     topCaseInfo,
256
     topCaseInfo,