feat: 更改优惠券逻辑

package.json

@@ -108,4 +108,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

src/App.vue

@@ -1,26 +1,28 @@
 <template>
-    <div id="app">
-        <router-view></router-view>
-    </div>
+  <div id="app">
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view>
+  </div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {
-            list:[]
-        }
-    },
-    mounted: function () {
-        
-    },
-    created: function () {
-
-    },
-    methods: {
+  data () {
+    return {
+      list: []
     }
+  },
+  mounted: function () {
+
+  },
+  created: function () {
+
+  },
+  methods: {
+  }
 }
 </script>
 <style scoped>
-	
 </style>

src/components/common/layout/leftMenu.vue

@@ -90,9 +90,9 @@ export default {
   },
   watch: {
     $route (to, from) {
+      console.log(to, 'tootototo');
       let patname = `/${to.path.split('/')[1]}`
       console.log(window.location, 'window.location.pathname', to);
-
       this.$emit('changeIsBack', to.meta.isback)
       this.menu.forEach((item, index) => {
         if (patname == item.path) {

src/pages/confirmOrder/addOrder/index.vue

@@ -234,6 +234,7 @@
           <el-select v-model="classifyInfo"
                      placeholder="请选择分类"
                      style="width: 295px;"
+                     :disabled="isEdit?true:false"
                      @change="getClassify"
                      size="mini">
             <el-option v-for="item in classifyList"
@@ -251,7 +252,7 @@
           <el-select v-model="projectInfo"
                      placeholder="请选择项目"
                      style="width: 295px;"
-                     :disabled="classifyInfo.length==0?true:false"
+                     :disabled="classifyInfo.length==0||isEdit?true:false"
                      @change="getProducts"
                      size="mini">
             <el-option v-for="item in projectList"
@@ -397,6 +398,7 @@ export default {
       projectList: [],
       //项目分类列表
       classifyList: [],
+      isEdit: false,
       //升级包列表
       productsList: [],
       //时间列表（头部）
@@ -486,9 +488,10 @@ export default {
       });
     },
     eidt (item) {
+      console.log(item, '==========');
       this.projectInfo = item.id;
-      this.productsInfo =
-        item.product_ids == "" ? "" : Number(item.product_ids);
+      // this.productsInfo =
+      //   item.product_ids == "" ? "" : Number(item.product_ids);
       this.getProducts(item.id);
       this.isEditProject = true;
       this.isProject = true;
@@ -497,6 +500,7 @@ export default {
       this.order_data.project_list.forEach((res, index) => {
         if (item.id == res.id) {
           this.order_data.project_list.splice(index, 1);
+          this.calculationPrice()
           this.$message({
             message: "删除成功",
             type: "success"
@@ -515,6 +519,7 @@ export default {
     orderUpdate () {
       // 编辑
       if (this.isEditProject) {
+        this.isEdit = true
         if (this.productsInfo != "") {
           this.order_data.project_list.forEach(e => {
             console.log(this.projectInfo)
@@ -535,6 +540,7 @@ export default {
                   );
                   e.price = Number(e.price) + Number(item.price);
                   this.isProject = false;
+                  this.isEdit = false
                   this.isEditProject = false;
                   this.calculationPrice();
                 }
@@ -543,6 +549,7 @@ export default {
           });
         } else {
           this.isProject = false;
+          this.isEdit = false
           return;
         }
       } else {
@@ -648,8 +655,8 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)'
       })
       api.padOrderAdd(params).then(res => {
+        this.$loading().close()
         if (res.code == 200) {
-          this.$loading().close()
           // 关闭当前页面并且跳转
           that.$router.push({
             path: "/confirmOrder/details",
@@ -707,8 +714,11 @@ export default {
     },
     //计算预约费用
     calculationPrice () {
+      console.log(this.reservationPrice);
       this.reservationPrice = 0;
       this.order_data.project_list.forEach(res => {
+        console.log(this.reservationPrice);
+
         this.reservationPrice += Number(res.price);
       });
     },

src/pages/confirmOrder/details/index.vue

@@ -108,7 +108,8 @@
                class="add-project"
                @click="addProject">添加</div>
         </div>
-        <div class="project-list">
+        <div class="project-list"
+             :style="isChange?'height:250px':''">
           <div class="project-info"
                v-for="(item,index) in order_data.project_list"
                :key="index">
@@ -146,7 +147,7 @@
             <div class="coupon-tips">
               <div class="coupon-icon"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/couponIcon.png"
                      alt=""></div>
-              <div class="coupon-title">优惠卷</div>
+              <div class="coupon-title">优惠券</div>
               <div class="coupon-tip"
                    v-if="order_data.coupon_list&&order_data.coupon_list.length>0">已选推荐优惠</div>
             </div>
@@ -227,8 +228,8 @@
                    class="discount-over">全免</div>
               <div v-else
                    class="discount">
-                <div class="price-num"><span class="size">￥</span>{{item.price}}</div>
-                <div class="price-tips">{{item.full_price}}</div>
+                <div class="coupon-price-num"><span class="size">￥</span>{{Number(item.price)}}</div>
+                <!-- <div class="price-tips">{{item.full_price}}</div> -->
               </div>
               <div class="coupon-tip">
                 <div class="tips-title">{{item.coupon_name | ellipsis(14)}}</div>
@@ -260,10 +261,12 @@
              @click="isProject=false"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
                alt=""></div>
         <div class="project-pupop-title">选择项目</div>
-        <div class="project-select">
+        <div class="project-select"
+             v-if="!isEditProject">
           <el-select v-model="classifyInfo"
                      placeholder="请选择分类"
                      style="width: 295px;"
+                     :disabled="isEdit?true:false"
                      @change="getClassify"
                      size="mini">
             <el-option v-for="item in classifyList"
@@ -277,11 +280,12 @@
             </el-option>
           </el-select>
         </div>
-        <div class="project-select">
+        <div class="project-select"
+             v-if="!isEditProject">
           <el-select v-model="projectInfo"
                      placeholder="请选择项目"
                      style="width: 295px;"
-                     :disabled="classifyInfo.length==0?true:false"
+                     :disabled="isEdit||classifyInfo.length==0?true:false"
                      @change="getProducts"
                      size="mini">
             <el-option v-for="item in projectList"
@@ -490,6 +494,7 @@ export default {
       //皮肤状态列表
       poreList: [
       ],
+      isEdit: false,
       //优惠券列表
       couponList: [],
       //已选择的优惠券
@@ -604,6 +609,9 @@ export default {
         this.remarks = res.data.remark
         this.programmeList = res.data.scheme_list
         this.order_data = res.data.order_data
+        if (this.order_data.coupon_list.length > 0) {
+          this.isSelectCoup = this.order_data.coupon_list
+        }
         this.showMoney = res.data.order_data.price
         this.poreList = res.data.detail_list
         this.order_data['discountPrice'] = 0
@@ -639,24 +647,31 @@ export default {
     getProducts (e) {
       api.getProducts({ id: e }).then(res => {
         this.productsList = res.data.list
-        this.productsList.forEach(item => {
-          if (this.productsInfo == item.id) {
-            this.lastProjectPrice = Number(item.price)
-          }
-        })
+        if (this.productsList.length > 0) {
+          this.productsList.forEach(item => {
+            if (this.productsInfo == item.id) {
+              this.lastProjectPrice = Number(item.price) || ''
+            }
+          })
+        }
       })
     },
     eidt (item) {
-      this.projectInfo = item.id
-      this.productsInfo = item.product_ids == '' ? '' : Number(item.product_ids)
+      console.log(item, '============');
+      this.projectInfo = Number(item.id)
+      // this.productsInfo = item.product_ids == '' ? '' : Number(item.product_ids)
       this.getProducts(item.id)
       this.isEditProject = true
       this.isProject = true
     },
     deleteProject (item) {
+      console.log(item, 'item========');
       this.order_data.project_list.forEach((res, index) => {
         if (item.id == res.id) {
           this.order_data.project_list.splice(index, 1)
+          this.reservationPrice = 0
+          this.confirmOrder("delete")
+          this.isSelectCoup = []
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -675,8 +690,8 @@ export default {
     orderUpdate () {
       // 编辑
       if (this.isEditProject) {
+        this.isEdit = true
         if (this.productsInfo != '') {
-
           this.order_data.project_list.forEach(e => {
             if (this.projectInfo == e.id) {
               this.productsList.forEach(item => {
@@ -690,6 +705,7 @@ export default {
                   console.log(Number(e.price), Number(item.price), 'Number(e.price) + Number(item.price)');
                   e.price = Number(e.price) + Number(item.price)
                   this.isProject = false
+                  this.isEdit = false
                   this.isEditProject = false
                   this.calculationPrice()
                 }
@@ -698,6 +714,7 @@ export default {
           })
         } else {
           this.isProject = false
+          this.isEdit = false
           return
         }
       } else {
@@ -769,38 +786,42 @@ export default {
       }
       this.tsTableList = tsTableList
     },
+    confirmOrder () {
+      let order_data = []
+      this.order_data.project_list.forEach(item => {
+        let order_data_info = {}
+        order_data_info['id'] = item.id
+        if (item.product_ids != "") {
+          order_data_info['product_id'] = item.product_ids
+        }
+        order_data.push(order_data_info)
+      })
+      let params = {
+        id: this.id,
+        order_data: JSON.stringify(order_data),
+        // order_day: this.tsTableList[this.tsTableIndex].order_day,
+        // order_time: this.timeIndexText
+      }
+      this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      api.setOrderUpdate(params).then(res => {
+        this.$loading().close()
+        if (res.code == 200) {
+          this.reservationPrice = 0
+          this.getOrderInfo()
+          this.isTs = false
+          this.isChange = false
+        }
+      })
+    },
     //确定订单&支付
     determine () {
       if (this.isChange) {
-        let order_data = []
-        this.order_data.project_list.forEach(item => {
-          let order_data_info = {}
-          order_data_info['id'] = item.id
-          if (item.product_ids != "") {
-            order_data_info['product_id'] = item.product_ids
-          }
-          order_data.push(order_data_info)
-        })
-        let params = {
-          id: this.id,
-          order_data: JSON.stringify(order_data),
-          // order_day: this.tsTableList[this.tsTableIndex].order_day,
-          // order_time: this.timeIndexText
-        }
-        this.$loading({
-          lock: true,
-          text: '加载中',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        api.setOrderUpdate(params).then(res => {
-          this.$loading().close()
-          if (res.code == 200) {
-            this.getOrderInfo()
-            this.isTs = false
-            this.isChange = false
-          }
-        })
+        this.confirmOrder()
         // this.getWeekDate()
         // this.getOrderTime()
         // this.order_time = ''
@@ -867,6 +888,10 @@ export default {
     //获取订单优惠券
 
     onCoupon () {
+      if (this.order_data.coupon_list && this.order_data.coupon_list.length > 0) {
+        this.$message.error('该订单已选择优惠券，不可更改');
+        return
+      }
       if (this.couponList.length > 0) {
         this.isCoupun = true
         return
@@ -934,6 +959,9 @@ export default {
         if (res.code == 200) {
           this.choicePayType = false
           this.PayStatus = true
+          this.payStatusInterval = setInterval(e => {
+            this.payStatus()
+          }, 1000)
           if (res.data.pay_status == 1) {
             this.isPayCode = false
           } else {
@@ -947,14 +975,17 @@ export default {
                 correctLevel: QRCode.CorrectLevel.L//容错率，L/M/H
               })
             })
-            this.payStatusInterval = setInterval(e => {
-              this.payStatus()
-            }, 1000)
+
           }
         }
       })
     },
     changePayStatus () {
+      if (this.isPayCode) {
+        this.reservationPrice = 0
+        this.getProjectClassify()
+        this.getOrderDiscount()
+      }
       this.PayStatus = false
       if (this.payStatusInterval) { //如果定时器在运行则关闭
         clearInterval(this.payStatusInterval)
@@ -976,25 +1007,6 @@ export default {
       return arr2.every(val => arr1.includes(val));
     },
     //选中优惠券
-    // selectPupop (item, index) {
-    //   this.couponList[index].Select = !this.couponList[index].Select
-    //   this.selectCouponList = this.couponList.filter(res => {
-    //     return res.Select == true
-    //   })
-    //   this.selectCouponList.forEach(res => {
-    //   })
-
-    // },
-
-
-    // 不可以用的不显示，如果同时有项目劵、抵扣劵、满减劵，只能用一种类型，其他劵不显示
-    // 1、针对单个项目，项目劵可以多选
-    // 2、抵扣劵、满减劵针对的是整个订单，当用户已使用了单个项目劵时，抵扣劵、满减劵就不能使用
-    // 3、优惠劵可以给多个项目抵扣,
-    // 4、默认抵扣金额最高的
-    // 5、优惠劵排序，到期时间倒叙
-
-
     /**
        * 点击使用按钮、勾选按钮
        */
@@ -1046,7 +1058,6 @@ export default {
       let orderDetails1 = this.order_data
       orderDetails1.project_list = project_list
 
-
       this.order_data = orderDetails1
       this.couponList = CouPonIndex
       this.coupSelectType = this.couponList[selectIndex].type
@@ -1076,6 +1087,7 @@ export default {
       let that = this
       let project_list = this.order_data.project_list //这里是项目列表
       let isSelectCoup = this.isSelectCoup //这里选择了的卡券列表
+      console.log(this.isSelectCoup, 'this.isSelectCoup');
       let selectProjectList = [] // 适合的卡券列表
       // let CouPonIndex = this.CouPonIndex // 卡券选择的Id\
       let productDiscount = this.couponList // 卡券列表
@@ -1103,9 +1115,15 @@ export default {
             } else {
               for (let k = 0; k < productDiscount.length; k++) {
                 if (productDiscount[k].id == isSelectCoup[i].id) {
+                  console.log(productDiscount[k].id, 'productDiscount[k].id', productDiscount[k]);
                   // isSelectCoup.
                   productDiscount[k].isSelect = false
                   // isSelectCoup.splice(isSelectCoup.length-1,1);
+                  this.isSelectCoup.forEach((items, index) => {
+                    if (items.id == productDiscount[k].id) {
+                      this.isSelectCoup.splice(index, 1)
+                    }
+                  })
                   this.$message.error('没有适合的项目!');
                 }
               }
@@ -1117,6 +1135,8 @@ export default {
         orderDetails1.project_list = project_list
         this.couponList = productDiscount
         this.isSelectCoup = isSelectCoup
+        console.log(this.isSelectCoup, 'this.isSelectCoup2222');
+
         this.order_data = orderDetails1
       }
 
@@ -1126,7 +1146,7 @@ export default {
     // 计算总额
     calculateMoney () {
       let that = this
-      let money = Number(this.order_data.price)
+      let money = Number(this.order_data.original_price)
       let isSelectCoup = this.isSelectCoup
       let project_list = this.order_data.project_list //这里是项目列表
 
@@ -1143,6 +1163,7 @@ export default {
           }
         }
         this.showMoney = money.toFixed(2)
+        console.log(this.showMoney, 'this.showMoney');
         if (this.order_data.project_list.length - this.isSelectCoup.length >= 3) {
           console.log(money, 'money');
           money = (money * 0.8).toFixed(2)
@@ -1158,7 +1179,7 @@ export default {
         money = money - Number(isSelectCoup[0].price)
       }
       console.log(this.showMoney, 'showMoney', money);
-      this.showMoney = money
+      this.showMoney = money < 0 ? 0 : money
     },
 
 
@@ -1619,6 +1640,7 @@ export default {
       }
     }
     .cost {
+      height: 120px;
       overflow: scroll;
       background: #ffffff;
       border-radius: 8px;
@@ -1801,7 +1823,6 @@ export default {
         }
         .top {
           display: flex;
-          justify-content: space-between;
           align-items: end;
           padding-bottom: 10px;
           // border-bottom: 1px dashed #ffdfb6;
@@ -1813,12 +1834,12 @@ export default {
             line-height: 30px;
           }
           .discount {
-            .price-num {
-              font-size: 28px;
+            .coupon-price-num {
+              width: 53px;
+              font-size: 16px;
               font-family: PingFangSC-Medium, PingFang SC;
               font-weight: 500;
               color: #ff3007;
-              line-height: 40px;
               .size {
                 font-size: 14px;
                 line-height: 20px;
@@ -1833,7 +1854,7 @@ export default {
             }
           }
           .discount-over {
-            width: 50px;
+            width: 53px;
             font-size: 22px;
             font-family: PingFangSC-Medium, PingFang SC;
             font-weight: 500;
@@ -1841,8 +1862,9 @@ export default {
             line-height: 30px;
           }
           .coupon-tip {
+            flex: 1;
             .tips-title {
-              width: 126px;
+              // width: 126px;
               font-size: 14px;
               font-family: PingFangSC-Medium, PingFang SC;
               font-weight: 500;

src/router/map/home.js

@@ -23,91 +23,91 @@ export default {
   name: '首页',
   component: layout,
   children: [{
-      path: '/home',
-      component: Home
+    path: '/home',
+    component: Home
+  },
+  {
+    name: '客户预约表',
+    path: '/home/detailList',
+    meta: {
+      isback: true,
     },
-    {
-      name: '客户预约表',
-      path: '/home/detailList',
-      meta: {
-        isback: true,
-      },
-      component: HomeDetailList
+    component: HomeDetailList
+  },
+  {
+    path: '/testSkin',
+    component: TestSkin
+  },
+  {
+    path: '/testSkin/details',
+    meta: {
+      isback: true,
     },
-    {
-      path: '/testSkin',
-      component: TestSkin
+    component: TestSkinDetails
+  },
+  {
+    path: '/testSkin/updates',
+    meta: {
+      isback: true,
     },
-    {
-      path: '/testSkin/details',
-      meta: {
-        isback: true,
-      },
-      component: TestSkinDetails
+    component: TestSkinUpdate
+  },
+  {
+    path: '/customerMan',
+    component: CustomerMan
+  },
+  {
+    path: '/customerMan/details',
+    meta: {
+      isback: true,
     },
-    {
-      path: '/testSkin/updates',
-      meta: {
-        isback: true,
-      },
-      component: TestSkinUpdate
+    component: CustomerManDetails
+  },
+  {
+    path: '/customerMan/projectOrder',
+    meta: {
+      isback: true,
     },
-    {
-      path: '/customerMan',
-      component: CustomerMan
+    component: projectOrder
+  },
+  {
+    path: '/historicalOrder',
+    component: HistoricalOrder
+  },
+  {
+    path: '/historicalOrder/details',
+    meta: {
+      isback: true,
     },
-    {
-      path: '/customerMan/details',
-      meta: {
-        isback: true,
-      },
-      component: CustomerManDetails
+    component: HistoricalOrderDetails
+  },
+  {
+    path: '/confirmOrder',
+    component: ConfirmOrder
+  },
+  {
+    path: '/confirmOrder/details',
+    meta: {
+      isback: true,
     },
-    {
-      path: '/customerMan/projectOrder',
-      meta: {
-        isback: true,
-      },
-      component: projectOrder
-    },
-    {
-      path: '/historicalOrder',
-      component: HistoricalOrder
-    },
-    {
-      path: '/historicalOrder/details',
-      meta: {
-        isback: true,
-      },
-      component: HistoricalOrderDetails
-    },
-    {
-      path: '/confirmOrder',
-      component: ConfirmOrder
-    },
-    {
-      path: '/confirmOrder/details',
-      meta: {
-        isback: true,
-      },
-      component: ConfirmOrderDetails
-    },
-    {
-      path: '/confirmOrder/addOrder',
-      meta: {
-        isback: true,
-      },
-      component: ConfirmOrderAddOrder
+    component: ConfirmOrderDetails
+  },
+  {
+    path: '/confirmOrder/addOrder',
+    meta: {
+      isback: true,
     },
+    component: ConfirmOrderAddOrder
+  },
 
-    {
-      path: '/storeDetection',
-      component: StoreDetection
-    },
-    {
-      path: '/coupon',
-      component: Coupon
-    },
+  {
+    path: '/storeDetection',
+    component: StoreDetection
+  },
+  {
+    path: '/coupon',
+    component: Coupon
+  },
 
   ]
 }

vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
     host: "0.0.0.0",
     port: 8083, // 端口号
     https: false, // https:{type:Boolean}
-    open: true, //配置自动启动浏览器
+    open: false, //配置自动启动浏览器
     proxy: '' // 配置跨域处理
   },
   configureWebpack: {