yuhao před 2 roky
rodič
revize
bbe4dba803

+ 2 - 2
src/components/common/layout/layout.vue

@@ -17,7 +17,7 @@
17 17
         </div>
18 18
         <div>
19 19
           <div class="left" v-if="menuIndex == 0 && $route.path === '/home'">
20
-          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/%E5%AE%9A%E4%BD%8D%402x%20%281%29.png" alt="">
20
+          <img class="localIcon" src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/%E5%AE%9A%E4%BD%8D%402x%20%281%29.png" alt="">
21 21
             <div class="address">{{ userInfo.store_name }}</div>
22 22
           </div>
23 23
         </div>
@@ -782,7 +782,7 @@ export default {
782 782
       display: flex;
783 783
       align-items: center;
784 784
     }
785
-    img {
785
+    .localIcon {
786 786
       width: 24px;
787 787
       height: 24px;
788 788
     }

+ 14 - 6
src/pages/customerMan/myOrder/index.vue

@@ -96,13 +96,20 @@
96 96
                 show-overflow-tooltip
97 97
                 align="center"
98 98
               >
99
+                <template slot-scope="{ row }" v-if="row.card_type == 1">
100
+                  {{ row.total_num }}
101
+                </template>
99 102
               </el-table-column>
100 103
               <el-table-column
101 104
                 prop="num"
102 105
                 label="剩余次数"
103 106
                 show-overflow-tooltip
104 107
                 align="center"
105
-              ></el-table-column>
108
+              >
109
+                <template slot-scope="{ row }" v-if="row.card_type == 1">
110
+                  {{ row.num }}
111
+                </template>
112
+              </el-table-column>
106 113
               <el-table-column
107 114
                 prop="used_num"
108 115
                 label="已用次数"
@@ -311,7 +318,7 @@ type: "全额券" -->
311 318
                 :key="index"
312 319
               >
313 320
                 <div class="name-text">{{ item.project_name }}</div>
314
-                <div class="change-num">
321
+                <div class="change-num" v-if="cardInfo.card_type==1">
315 322
                   <div class="num-content">
316 323
                     <div class="content-left" @click="reduce(index)">-</div>
317 324
                     <div class="content-num">{{ item.num || 0 }}</div>
@@ -519,6 +526,7 @@ export default {
519 526
       this.isPore = true;
520 527
       api.cardInfo({ id: row.id }).then((res) => {
521 528
         if (res.code == 200) {
529
+          res.data.card_type = row.card_type
522 530
           this.cardInfo = res.data;
523 531
         }
524 532
       });
@@ -549,7 +557,7 @@ export default {
549 557
             this.$message.success("更改成功!");
550 558
             this.isPore = false;
551 559
             // 刷新次卡列表
552
-            this.getCardList()
560
+            this.getCardList();
553 561
           }
554 562
         });
555 563
     },
@@ -702,13 +710,13 @@ export default {
702 710
 .color-3 {
703 711
   color: #fc3019;
704 712
 }
705
-.colorA1{
713
+.colorA1 {
706 714
   color: #333;
707 715
 }
708
-.colorA2{
716
+.colorA2 {
709 717
   color: #fc3019;
710 718
 }
711
-.colorA0{
719
+.colorA0 {
712 720
   color: #61d09d;
713 721
 }
714 722
 .priceColor {

+ 0 - 1
src/pages/home/index.vue

@@ -358,7 +358,6 @@ export default {
358 358
       this.loading = false;
359 359
       this.finished = false;
360 360
       this.page = 1;
361
-      this.getToday();
362 361
     },
363 362
     //搜索订单
364 363
     searchOrder() {