feat: 修复 门店检测的问题

src/pages/confirmOrder/details/index.vue

@@ -143,25 +143,34 @@
           </div> -->
 
           <div v-if="1==1">
+            <div>
+              <div class="coupon-ps"
+                   v-for="item,index in isSelectCoup"
+                   :key="index">
+                <div>{{item.coupon_name}}</div>
+                <div class="cou-price"
+                     v-if="item.type==4?true:false">抵扣{{item.projectName}}</div>
+                <div class="cou-price"
+                     v-if="item.type==3?true:false">抵扣全部项目(除升级包)</div>
+                <div class="cou-price"
+                     v-if="item.type==2?true:false">¥{{item.price}}</div>
+                <div class="cou-price"
+                     v-if="item.type==1?true:false">¥{{item.price}}</div>
+                <!-- <div class="cou-price">-¥{{price}}</div> -->
+              </div>
+            </div>
             <div class="coupon-ps"
-                 v-for="item,index in isSelectCoup"
-                 :key="index">
-              <div>{{item.coupon_name}}</div>
-              <div class="cou-price"
-                   v-if="item.type==4?true:false">抵扣{{item.projectName}}</div>
-              <div class="cou-price"
-                   v-if="item.type==3?true:false">抵扣全部项目(除升级包)</div>
+                 v-if="discount!=0">
+              <div></div>
+              <div v-if="discount!=20"
+                   class="cou-price"> {{discount==100?'仪器免费体验':'新人5折优惠'}}</div>
               <div class="cou-price"
-                   v-if="item.type==2?true:false">¥{{item.price}}</div>
-              <div class="cou-price"
-                   v-if="item.type==1?true:false">¥{{item.price}}</div>
-              <!-- <div class="cou-price">-¥{{price}}</div> -->
+                   v-else-if=" isSelectCoup.length&&(order_data.project_list.length - isSelectCoup.length)>=3">{{'任意三个项目8折'}}</div>
             </div>
           </div>
-
         </div>
         <div class="over-price">
-          合计： <span class="price-num"><span class="min-size">￥</span>{{showMoney}}<span class="min-size"></span></span>
+          合计： <span class="price-num"><span class="min-size">￥</span>{{isSelectCoup.length>0?showMoney:discountPrice}}<span class="min-size"></span></span>
         </div>
       </div>
       <div class="payment"
@@ -339,7 +348,7 @@
              @click="choicePayType=false"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
                alt=""></div>
         <div class="pay-title">选择支付方式</div>
-        <div class="pay-price">￥<span>{{showMoney}}</span></div>
+        <div class="pay-price">￥<span>{{isSelectCoup.length>0?showMoney:discountPrice}}</span></div>
         <div class="pay-list">
           <div class="pay-info"
                v-for="item,index in payList"
@@ -369,7 +378,7 @@
                alt=""></div>
         <div v-if="isPayCode">
           <div class="pay-title">请扫码支付</div>
-          <div class="pay-price">￥<span>{{showMoney}}</span></div>
+          <div class="pay-price">￥<span>{{isSelectCoup.length>0?showMoney:discountPrice}}</span></div>
           <div class="banner">
             <div id="qrCode"
                  class="qrCode"
@@ -478,6 +487,8 @@ export default {
       isSelectCoup: [], // 选择的优惠券
       // 下面是支付的数据
       showMoney: 0, // 价值总额
+      discountPrice: 0,//活动后金额
+      discount: 0,//折扣类型
       // showRuleText: 10086,
 
     };
@@ -500,6 +511,19 @@ export default {
         this.order_data = res.data.order_data
         this.showMoney = res.data.order_data.price
         this.poreList = res.data.detail_list
+        this.order_data['discountPrice'] = 0
+        //折扣类型，0.无折扣，20.任意三个项目8折，50.新人五折活动，100.仪器免费使用权益
+        this.order_data.project_list.forEach(item => {
+          if (this.discount == 20) {
+            this.order_data.discountPrice += Number(item.price) * 0.8
+          } else if (this.discount == 50) {
+            this.order_data.discountPrice += Number(item.price) * 0.5
+          } else if (this.discount == 0) {
+            this.order_data.discountPrice = this.showMoney
+          }
+        })
+        console.log(Number(this.order_data.discountPrice).toFixed(2), 'this.order_data.discountPrice.toFixed(2)');
+        this.discountPrice = Number(this.order_data.discountPrice).toFixed(2)
         this.calculationPrice()
       })
     },
@@ -626,7 +650,7 @@ export default {
       let tsTableList = []
       for (let i = 0; i < 7; i++) {
         //显示周一
-        let ShowTime = nowTime + (i + 1) * oneDayTime;
+        let ShowTime = nowTime + (i) * oneDayTime;
         //初始化日期时间
         let myDate = new Date(ShowTime);
         let year = myDate.getFullYear();
@@ -728,7 +752,8 @@ export default {
       // 卡券，项目券数据包, id：订单项目ID, coupon_id：优惠券ID, 如：[{ "id": 1220, coupon_id: 199 }]isSelectCoup
       let params = {
         id: this.id,
-        pay_way: payWayList[0].pay_way
+        pay_way: payWayList[0].pay_way,
+        discount: this.discount
       }
 
       let coupon_data = []
@@ -894,7 +919,6 @@ export default {
       let productDiscount = this.couponList // 卡券列表
       console.log(this.couponList, 'this.couponList');
       (productDiscount)
-      // debugger
       if (isSelectCoup.length > 0 && isSelectCoup[0].type && isSelectCoup[0].type == 4) {
         for (let i = 0; i < isSelectCoup.length; i++) { // 首先遍历卡券
           if (!isSelectCoup[i].projectids) { // 如果卡券没绑定项目
@@ -957,6 +981,12 @@ export default {
           }
         }
         this.showMoney = money.toFixed(2)
+        if (this.order_data.project_list.length - this.isSelectCoup.length >= 3) {
+          console.log(money, 'money');
+          money = (money * 0.8).toFixed(2)
+          console.log(money, 'money');
+
+        }
       } else if (isSelectCoup[0].type == 3) {
         for (let i = 0; i < project_list.length; i++) {
           money = money - Number(project_list[i].price)
@@ -965,10 +995,8 @@ export default {
       } else {
         money = money - Number(isSelectCoup[0].price)
       }
-
-      this.showMoney = money.toFixed(2)
-
-
+      console.log(this.showMoney, 'showMoney', money);
+      this.showMoney = money
     },
 
 
@@ -1005,10 +1033,13 @@ export default {
         this.$set(this.programmeList[index], 'onSelect', true)
       }
     },
-    onSubmit () {
-
-    },
-    submitFrequency () { },
+    //获取订单折扣类型
+    getOrderDiscount () {
+      api.getOrderDiscount({ id: this.id }).then(res => {
+        this.discount = res.data.discount
+        this.getOrderInfo()
+      })
+    }
   },
 
   created () {
@@ -1016,8 +1047,10 @@ export default {
     if (id) {
       this.id = id
     }
-    this.getOrderInfo()
+
     this.getProjectList()
+    this.getOrderDiscount()
+
   },
 
   mounted () {

src/pages/confirmOrder/index.vue

@@ -30,7 +30,7 @@ export default {
         this.ticket = res.data.ticket
         this.$nextTick(() => {
           this.bindQRCode();
-          // this.checkCode()
+          this.checkCode()
         })
       })
     },
@@ -39,13 +39,14 @@ export default {
         api.checkCode({ ticket: this.ticket }).then(res => {
           if (res.data.status == 1) {
             clearInterval(this.checkCodeInterval)
+            this.getOrderByCode()
           }
         })
       }, 1000)
       //十分钟强制清除，防止页面崩溃
       this.checkCodeTimeout = setTimeout(() => {
         clearTimeout(this.checkCodeTimeout)
-      }, 600000)
+      }, 360000)
     },
     getOrderByCode () {
       api.getOrderByCode({ ticket: this.ticket }).then(res => {
@@ -53,7 +54,7 @@ export default {
           this.$router.push({
             path: '/confirmOrder/details',
             query: {
-              id: res.order_id
+              id: res.data.order_id
             }
           })
         }

src/pages/customerMan/details/index.vue

@@ -206,7 +206,6 @@ export default {
         this.lableList = res.data.tags;
         this.order_total = res.data.order_total;
         this.programmeList = res.data.scheme_list;
-
         // this.programmeList = res.data.order_data.project_list;
         // this.coupon_list = res.data.order_data.coupon_list;
       });
@@ -238,8 +237,6 @@ export default {
         }
       });
     },
-    onSubmit () { },
-    submitFrequency () { }
   },
 
   created () {

src/pages/customerMan/myOrder/index.vue

@@ -2,6 +2,7 @@
   <div class="order">
     <div class="warp">
       <el-tabs type="border-card"
+               @tab-click="changeTab"
                v-model="activeName">
         <el-tab-pane label="项目订单"
                      name="first">
@@ -51,10 +52,9 @@
             <div class="pagin">
               <el-pagination background
                              layout="prev, pager, next"
-                             @size-change="handleSizeChange"
                              @current-change="handleCurrentChange"
                              :current-page.sync="currentPage1"
-                             :total="1000"></el-pagination>
+                             :total="total"></el-pagination>
             </div>
           </div>
         </el-tab-pane>
@@ -65,8 +65,7 @@
                       :data="couponData"
                       tooltip-effect="dark"
                       height="354"
-                      style="width: 100%;border-radius: 8px;"
-                      @row-click="handleSelectionChange">
+                      style="width: 100%;border-radius: 8px;">
 
               <!-- create_time: "2022-03-10 10:39:19"
 ex_time: "2022.03.17 23:59"
@@ -104,10 +103,9 @@ type: "全额券" -->
             <div class="pagin">
               <el-pagination background
                              layout="prev, pager, next"
-                             @size-change="handleSizeChange"
                              @current-change="handleCurrentChange"
                              :current-page.sync="currentPage1"
-                             :total="1000"></el-pagination>
+                             :total="total"></el-pagination>
             </div>
           </div>
         </el-tab-pane>
@@ -119,8 +117,7 @@ type: "全额券" -->
                       :data="goodData"
                       tooltip-effect="dark"
                       height="354"
-                      style="width: 100%;border-radius: 8px;"
-                      @row-click="handleSelectionChange">
+                      style="width: 100%;border-radius: 8px;">
 
               <!-- create_time: "2022-03-19 22:53:40"
 goods: [{order_id: 47, name: "润百颜玻尿酸屏障调理面膜", num: 1}]
@@ -164,10 +161,9 @@ status: 5 -->
             <div class="pagin">
               <el-pagination background
                              layout="prev, pager, next"
-                             @size-change="handleSizeChange"
                              @current-change="handleCurrentChange"
                              :current-page.sync="currentPage1"
-                             :total="1000"></el-pagination>
+                             :total="total"></el-pagination>
             </div>
           </div>
         </el-tab-pane>
@@ -238,7 +234,8 @@ export default {
       couponData: [],
       goodData: [],
       projectData: [],
-      total: ""
+      total: 100,
+      limit: 10
     };
   },
   computed: {},
@@ -283,14 +280,36 @@ export default {
         this.total = res.data.total;
       });
     },
-
-    handleSizeChange (val) {
-    },
     handleCurrentChange (val) {
+      this.currentPage1 = val
+      if (this.activeName == 'first') {
+        this.getUserProject();
+      } else if (this.activeName == 'second') {
+        this.getUserCoupon();
+      } else if (this.activeName == 'third') {
+        this.getUserGoods();
+      }
+    },
+    handleSelectionChange (row, column, event) {
+      this.$router.push({
+        path: "/historicalOrder/details",
+        query: {
+          id: row.id
+        }
+      });
     },
-    handleSelectionChange (row, column, event) { },
     onSubmit () { },
-    submitFrequency () { }
+    submitFrequency () { },
+    changeTab (e) {
+      this.currentPage1 = 1
+      if (e.index == 0) {
+        this.getUserProject();
+      } else if (e.index == 1) {
+        this.getUserCoupon();
+      } else if (e.index == 2) {
+        this.getUserGoods();
+      }
+    }
   },
 
   created () {
@@ -298,9 +317,13 @@ export default {
     let activeName = this.$route.query.activeName
     this.activeName = activeName
     this.id = id;
-    this.getUserCoupon();
-    this.getUserGoods();
-    this.getUserProject();
+    if (this.activeName == 'first') {
+      this.getUserProject();
+    } else if (this.activeName == 'second') {
+      this.getUserCoupon();
+    } else if (this.activeName == 'third') {
+      this.getUserGoods();
+    }
   },
 
   mounted () { }

src/pages/historicalOrder/index.vue

@@ -61,7 +61,7 @@
                          label="状态"
                          show-overflow-tooltip>
           <template slot-scope="scope">
-            <div :class="'color'+scope.row.status">{{statusStr[scope.row.status]}}</div>
+            <div :style="scope.row.status==0?'color: #FC3019':scope.row.status==5?'color: #A999EA':'color: #61D09D;'">{{ scope.row.status==0?'未支付':scope.row.status==5?'已取消':'待使用' }}</div>
           </template>
         </el-table-column>
       </el-table>
@@ -92,15 +92,6 @@ export default {
       total: 0,
       product: "",
       coupon: "",
-      statusStr: [
-        "已预约",
-        "未支付",
-        "已支付",
-        "待使用",
-        "正在使用",
-        "已结算",
-        "已取消"
-      ],
       couponList: [
         {
           value: "选项1",

src/pages/home/index.vue

@@ -72,7 +72,7 @@ export default {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
           num: 0,
           name: '预约订单',
-          type: 1,
+          type: 0,
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
@@ -138,13 +138,21 @@ export default {
 
     },
     toOrderDetails (e) {
-      if (e.status != 0) return
-      this.$router.push({
-        path: '/confirmOrder/details',
-        query: {
-          id: e.id
-        }
-      })
+      if (e.status == 0) {
+        this.$router.push({
+          path: '/confirmOrder/details',
+          query: {
+            id: e.id
+          }
+        })
+      } else {
+        this.$router.push({
+          path: "/historicalOrder/details",
+          query: {
+            id: e.id
+          }
+        });
+      }
     },
     initData () {
 

src/server/home.js

@@ -66,6 +66,9 @@ export default class Home {
   static payStatus (parms) {
     return $http.get(url.payStatus, parms);
   }
+  static getOrderDiscount (parms) {
+    return $http.get(url.getOrderDiscount, parms);
+  }
 
   // 获取历史订单
   static getOrderList (parms) {

src/server/urls.js

@@ -37,6 +37,8 @@ export default {
   orderPay: '/v2/pad/order/pay',
   //支付状态
   payStatus: '/v2/pad/order/pay_status',
+  //活动折扣
+  getOrderDiscount: '/v2/pad/order/discount',
 
   /**
    *  by ListKer