Merge branch 'lihai' of code.jschengta.com:lihai/pad_spa into hlg/20220512

src/pages/confirmOrder/details/index.vue

@@ -82,9 +82,9 @@
       </div>
       <div class="project">
         <div class="project-title">
-          <div>共<span>{{order_data.project_num}}个</span>项目</div>
+          <div>共<span>{{order_data.project_list.length}}个</span>项目</div>
           <div class="add-project"
-               @click="isProject=true">添加</div>
+               @click="addProject">添加</div>
         </div>
         <div class="project-list">
           <div class="project-info"
@@ -101,7 +101,9 @@
                 <div> <span v-if="item.device_name">{{item.device_name}}（{{item.room}}）{{item.use_time}}分钟</span></div>
                 <div><img @click="eidt(item)"
                        src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png">
-                  <img class="delete"
+                  <img v-if="order_data.project_list.length>1"
+                       @click="deleteProject(item)"
+                       class="delete"
                        src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/delete.png"
                        alt="">
                 </div>
@@ -110,7 +112,8 @@
           </div>
         </div>
       </div>
-      <div class="cost">
+      <div class="cost"
+           v-if="!isChange">
         <div class="cost-title">
           <div>预约费用</div>
           <div>¥399</div>
@@ -134,7 +137,8 @@
           合计： <span class="price-num"><span class="min-size">￥</span>399<span class="min-size">.00</span></span>
         </div>
       </div>
-      <div class="payment">{{order_data.status==0?'立即支付':'确定订单'}}</div>
+      <div class="payment"
+           @click="determine">{{isChange?'确定订单':'立即支付'}}</div>
     </div>
     <!-- 选择优惠券 -->
     <mine-pupop :show="isCoupun">
@@ -396,6 +400,8 @@ export default {
       isTs: false,//是否展示选择时间弹窗
       isPore: false,//皮肤状态弹窗
       id: 0,//订单id
+      isChange: false,//项目是否有改变
+      isEditProject: false,//是否编辑项目
     };
   },
   computed: {
@@ -424,43 +430,104 @@ export default {
         this.productsList = res.data.list
       })
     },
-    eidt () {
-
+    eidt (item) {
+      this.projectInfo = item.id
+      this.getProducts(item.id)
+      this.isEditProject = true
+      this.isProject = true
+    },
+    deleteProject (item) {
+      this.order_data.project_list.forEach((res, index) => {
+        if (item.id == res.id) {
+          this.order_data.project_list.splice(index, 1)
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          });
+        }
+      })
+    },
+    addProject () {
+      this.projectInfo = ''
+      this.isEditProject = false
+      this.isProject = true
     },
     //新增
     orderUpdate () {
-      if (this.projectInfo.length == 0) return
-      //项目包重组
-      let projectInfo = {}, nowProjectInfo = {}, productsInfo = {}
-      this.projectList.forEach(item => {
-        if (this.projectInfo == item.id) {
-          nowProjectInfo = item
+      // 编辑
+      if (this.isEditProject) {
+        if (this.productsInfo != '') {
+          this.order_data.project_list.forEach(e => {
+            if (this.projectInfo == e.id) {
+              this.productsList.forEach(item => {
+                if (e.product_ids != '') {
+                  e.price = Number(e.price) - Number(item.price)
+                }
+                e.product_ids = this.productsInfo
+                if (item.id == e.product_ids) {
+                  this.isChange = true
+                  e.product_names = item.name
+                  e.price = Number(e.price) + Number(item.price)
+                  this.isProject = false
+                  this.isEditProject = false
+                }
+              })
+            }
+          })
+        } else {
+          this.isProject = false
+          return
         }
-      })
-      if (this.productsInfo.length != 0) {
-        this.productsList.forEach(item => {
-          if (item.id == this.productsInfo) {
-            productsInfo = item
+      } else {
+        //新增
+        let isIndexOf = false
+        if (this.projectInfo.length == 0) return
+        this.order_data.project_list.forEach(res => {
+          if (this.projectInfo == res.id) {
+            isIndexOf = true
+            this.$message.error('该项目已存在');
           }
         })
-      }
-      console.log(nowProjectInfo, 'nowProjectInfo', productsInfo);
-      projectInfo['name'] = nowProjectInfo.name
-      projectInfo['cover_url'] = nowProjectInfo.cover_url
-      projectInfo['device_name'] = ''
-      projectInfo['room'] = ''
-      projectInfo['use_time'] = ''
-      projectInfo['price'] = nowProjectInfo.price
-      projectInfo['product_names'] = ''
+        if (isIndexOf) return
+        //项目包重组
+        let projectInfo = {}, nowProjectInfo = {}, productsInfo = {}
+        this.projectList.forEach(item => {
+          if (this.projectInfo == item.id) {
+            nowProjectInfo = item
+          }
+        })
+        if (this.productsInfo.length != 0) {
+          this.productsList.forEach(item => {
+            if (item.id == this.productsInfo) {
+              productsInfo = item
+            }
+          })
+        }
+        console.log(nowProjectInfo, 'nowProjectInfo', productsInfo);
+        projectInfo['name'] = nowProjectInfo.name
+        projectInfo['id'] = nowProjectInfo.id
+        projectInfo['cover_url'] = nowProjectInfo.cover_url
+        projectInfo['device_name'] = ''
+        projectInfo['room'] = ''
+        projectInfo['use_time'] = ''
+        projectInfo['price'] = nowProjectInfo.price
+        projectInfo['product_names'] = ''
 
-      if (Object.keys(productsInfo).length > 0) {
-        projectInfo['product_id'] = productsInfo.id
-        projectInfo.product_names = productsInfo.name
-        projectInfo.price += Number(productsInfo.price)
+        if (Object.keys(productsInfo).length > 0) {
+          projectInfo['product_ids'] = productsInfo.id
+          projectInfo.product_names = productsInfo.name
+          projectInfo.price += Number(productsInfo.price)
+        }
+        this.order_data.project_list.push(projectInfo)
+        this.isChange = true
+        this.isProject = false
+      }
+    },
+    //确定订单&支付
+    determine () { 
+      if (condition) {
+        
       }
-      this.order_data.project_list.push(projectInfo)
-      this.isProject = false
-
     },
     onOperation (index) {
       if (this.programmeList[index].onSelect) {
@@ -888,7 +955,8 @@ export default {
       }
     }
     .payment {
-      position: relative;
+      position: absolute;
+      bottom: 0;
       margin-top: 18px;
       left: 50%;
       transform: translateX(-50%);