Browse Source

时间次卡

yuhao 2 years ago
parent
commit
bbe4dba803

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

@@ -17,7 +17,7 @@
17
         </div>
17
         </div>
18
         <div>
18
         <div>
19
           <div class="left" v-if="menuIndex == 0 && $route.path === '/home'">
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
             <div class="address">{{ userInfo.store_name }}</div>
21
             <div class="address">{{ userInfo.store_name }}</div>
22
           </div>
22
           </div>
23
         </div>
23
         </div>
@@ -782,7 +782,7 @@ export default {
782
       display: flex;
782
       display: flex;
783
       align-items: center;
783
       align-items: center;
784
     }
784
     }
785
-    img {
785
+    .localIcon {
786
       width: 24px;
786
       width: 24px;
787
       height: 24px;
787
       height: 24px;
788
     }
788
     }

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

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

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

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