feat: 更改项目折扣

src/pages/confirmOrder/details/index.vue

@@ -104,9 +104,9 @@
       <div class="project">
         <div class="project-title">
           <div>共<span>{{order_data.project_list?order_data.project_list.length:0}}个</span>项目</div>
-          <div v-if="order_data.type!='one'"
+          <!-- <div v-if="order_data.type!='one'"
                class="add-project"
-               @click="addProject">添加</div>
+               @click="addProject">添加</div> -->
         </div>
         <div class="project-list"
              :style="isChange?'height:250px':''">
@@ -121,15 +121,28 @@
               </div>
               <div class="project-tips">{{item.product_names}}</div>
               <div class="project-zoom">
-                <div> <span v-if="item.device_name">{{item.device_name}}（{{item.room}}）{{item.use_time}}分钟</span></div>
-                <div v-if="order_data.type!='one'"><img @click="eidt(item)"
+                <el-select v-model="item.tot_name"
+                           v-if="item.device_name"
+                           @visible-change="openList($event,item,index)"
+                           @change="changeRoom($event,item,index)"
+                           size="mini"
+                           style="min-width: 150px;"
+                           :placeholder="item.tot_name">
+                  <el-option v-for="i in roomList"
+                             :key="i.id"
+                             :label="i.tot_name"
+                             :value="i.tot_name">
+                  </el-option>
+                </el-select>
+                <!-- <div> <span v-if="item.device_name">{{item.device_name}}（{{item.room}}）{{item.use_time}}分钟</span></div> -->
+                <!-- <div v-if="order_data.type!='one'"><img @click="eidt(item)"
                        src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png">
                   <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>
+                </div> -->
               </div>
             </div>
           </div>
@@ -139,7 +152,7 @@
            v-if="!isChange">
         <div class="cost-title">
           <div>预约费用</div>
-          <div>¥{{reservationPrice}}</div>
+          <div>¥{{order_data.original_price}}</div>
         </div>
         <!-- 次卡 -->
         <div class="cost-coupon-list">
@@ -198,18 +211,10 @@
                 <!-- <div class="cou-price">-¥{{price}}</div> -->
               </div>
             </div>
-            <div class="coupon-ps"
-                 v-if="discount!=0">
-              <div></div>
-              <div v-if="discount!=20"
-                   class="cou-price"> {{discount==100?'仪器免费体验':'新人5折优惠'}}</div>
-              <div class="cou-price"
-                   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>{{isSelectCoup.length>0?showMoney:discountPrice}}<span class="min-size"></span></span>
+          合计： <span class="price-num"><span class="min-size">￥</span>{{showMoney}}<span class="min-size"></span></span>
         </div>
       </div>
       <div class="payment"
@@ -453,7 +458,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>{{isSelectCoup.length>0?showMoney:discountPrice}}</span></div>
+        <div class="pay-price">￥<span>{{showMoney}}</span></div>
         <div class="pay-list">
           <div class="pay-info"
                v-for="item,index in payList"
@@ -483,7 +488,7 @@
                alt=""></div>
         <div v-if="isPayCode">
           <div class="pay-title">请扫码支付</div>
-          <div class="pay-price">￥<span>{{isSelectCoup.length>0?showMoney:discountPrice}}</span></div>
+          <div class="pay-price">￥<span>{{showMoney}}</span></div>
           <div class="banner">
             <div id="qrCode"
                  class="qrCode"
@@ -508,6 +513,7 @@
 import minePupop from '../../../components/minePupop/index.vue'
 import QRCode from 'qrcodejs2'
 import api from '../../../server/home'
+import internal from 'assert';
 
 export default {
   components: { minePupop },
@@ -519,6 +525,7 @@ export default {
       unSelect: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/unSelect.png',
       userInfo: {
       },
+      value: '',
       // 问题标签
       problem: '',
       //面部标签
@@ -624,9 +631,10 @@ export default {
       // 下面是支付的数据
       showMoney: 0, // 价值总额
       discountPrice: 0,//活动后金额
-      discount: 0,//折扣类型
+      discountList: [],//折扣类型
       device_name: '',//支付成功后的设备
       room: '',//设备房间
+      roomList: [],//设备房间列表
       user_id: '',
       // showRuleText: 10086,
 
@@ -665,6 +673,7 @@ export default {
         res.data.order_data.project_list.forEach(e => {
           e["isCard"] = false
           e["isCoupon"] = false
+          e["tot_name"] = `${e.device_name}（${e.room}）`
         })
         this.order_data = res.data.order_data
         if (this.order_data.coupon_list.length > 0) {
@@ -672,18 +681,9 @@ export default {
         }
         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
-          }
-        })
-        this.discountPrice = Number(this.order_data.discountPrice).toFixed(2)
+        this.order_data['discountPrice'] = this.order_data.price
+        this.discountPrice = this.order_data.price
+        this.calculateMoney()
         this.calculationPrice()
       })
     },
@@ -698,18 +698,51 @@ export default {
         }
       })
     },
-    isSelectCard (item, index) {
-      let isSelect = false
-      let isRepeat = false
-      this.cardList.forEach(res => {
-        if (res.isSelect && item.id != res.id && item.name == res.name) {
-          isRepeat = true
+    openList (e, item, index) {
+      console.log(e, item, index, 'e,item,index');
+      if (e) {
+        this.value = ''
+        this.roomList = []
+        let params = {
+          id: this.id,
+          project_id: item.id
+        }
+        api.getDevice_list(params).then(res => {
+          if (res.code == 200) {
+            res.data.list.forEach(item => {
+              item['tot_name'] = `${item.name}（${item.room}）`
+            })
+            this.roomList = res.data.list
+          }
+        })
+      }
+    },
+    changeRoom (e, item, index) {
+      let _id = 0
+      this.roomList.forEach(res => {
+        if (res.tot_name == e) {
+          _id = res.id
         }
       })
-      if (isRepeat) {
-        this.$message.error("不能选择相同的次卡");
-        return
+      console.log(e, item, index, 'e,item,index');
+      let params = {
+        id: this.id,
+        project_id: item.id,
+        device_id: _id
       }
+      api.device_change(params).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            message: `${res.msg}`,
+            type: "success"
+          });
+          this.getOrderInfo()
+        }
+      })
+    },
+    isSelectCard (item, index) {
+      let isSelect = false
+      let isRepeat = false
       this.isSelectCoup.forEach(e => {
         if (item.project_ids.indexOf(e.projectids) > -1) {
           isSelect = true
@@ -720,15 +753,27 @@ export default {
         return
       }
       console.log(item);
+      this.cardList.forEach(res => {
+        if (res.isSelect && item.id != res.id && JSON.stringify(item.project_ids) == JSON.stringify(res.project_ids)) {
+          isRepeat = true
+          return
+        }
+      })
+      if (isRepeat) {
+        this.$message.error("不能选择相同的次卡");
+        return
+      }
       this.cardList[index].isSelect = !this.cardList[index].isSelect
+
     },
     //确定选择的次卡
     isCardAdd () {
       let isSelectCardList = []
       let project_list = this.order_data.project_list
+      let price = this.order_data.price
       let card_data = []
-       let price =this.order_data.price
-        console.log(price,'price');
+      let card_data_info = {}
+      console.log(price, 'price');
       if (this.isSelectCoup.length > 0) {
         this.isSelectCoup.forEach(res => {
           this.order_data.project_list.forEach(item => {
@@ -738,42 +783,43 @@ export default {
           })
         })
       }
-      project_list.forEach(res => {
+      console.log(price, 'pricepriceprice3');
+
+      project_list.forEach((res,index) => {
         this.cardList.forEach(e => {
           if (e.isSelect && e.project_ids.indexOf(res.id) > -1) {
             price = price - res.price
+            console.log(price);
             price = price.toFixed(2)
             isSelectCardList.push(res)
-          }
-        })
-      })
-      isSelectCardList.forEach(e => {
-        this.cardList.forEach(res => {
-          let card_data_info = {}
-          if (res.isSelect, res.project_ids.indexOf(e.id) > -1) {
             card_data_info = {
-              id: e.id,
-              card_id: res.id
+              id: res.id,
+              card_id: e.id
             }
             card_data.push(card_data_info)
           }
         })
       })
-       if (isSelectCardList.length==0&&this.isSelectCoup.length==0) {
-        price = price- this.order_data.discountPrice
-       }
 
-      this.card_data = card_data
+
+      if (isSelectCardList.length == 0 && this.isSelectCoup.length == 0 && this.order_data.project_list.length > 2) {
+        price = price - this.order_data.discountPrice
+      }
+
+      console.log(price, 'pricepriceprice');
       if (price < 0) {
         price = 0
       }
       // if (this.isSelectCoup.length > 0) {
-        this.showMoney = price
+      this.showMoney = price
+      this.discountPrice = price
+      this.card_data = card_data
       // } else {
       //   this.discountPrice = price
       // }
       this.isSelectCardList = isSelectCardList
       this.isCard = false
+      this.calculateMoney()
     },
     getProjectClassify () {
       api.projectClassify({ user_id: this.userInfo.user_id }).then(res => {
@@ -956,12 +1002,12 @@ export default {
           this.getOrderInfo()
           this.isTs = false
           this.isChange = false
-          if (type&&type=='delete') {
+          if (type && type == 'delete') {
             this.order_data.project_list.splice(index, 1)
-           this.$message({
-            message: '删除成功',
-            type: 'success'
-          });
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            });
           }
         }
       })
@@ -1079,11 +1125,11 @@ export default {
         return res.isSelect == true
       })
       // 卡券，项目券数据包, id：订单项目ID, coupon_id：优惠券ID, 如：[{ "id": 1220, coupon_id: 199 }]isSelectCoup
-      this.discount = this.card_data.length>0?0:this.discount
+      this.discountList = this.card_data.length > 0 ? 0 : this.discountList
       let params = {
         id: this.id,
         pay_way: payWayList[0].pay_way,
-        discount: this.discount
+        discountList: this.discountList
       }
 
       let coupon_data = []
@@ -1174,10 +1220,12 @@ export default {
       })
       let isReturn = false
       this.isSelectCardList.forEach(value => {
-        if (item.project_ids.indexOf(value.id) > -1) {
+        console.log(value, 'value');
+        if (value.id && item.project_ids.indexOf(value.id) > -1) {
           isReturn = true
         }
       })
+      console.log(isReturn, item.type, this.card_data.length);
       if (isReturn || (item.type != 4 && this.card_data.length != 0)) {
         this.$message.error('该项目已选择次卡');
         return
@@ -1290,11 +1338,12 @@ export default {
                   // 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.isSelectCoup.forEach((items, index) => {
+                  //   if (items.id == productDiscount[k].id) {
+                  //     console.log(items.id,'items.id');
+                  //     this.isSelectCoup.splice(index, 1)
+                  //   }
+                  // })
                   this.$message.error('没有适合的项目!');
                 }
               }
@@ -1323,45 +1372,141 @@ export default {
           _price = _price + Number(res.price)
         })
       }
-      console.log(this.order_data.original_price,_price,'_price_price');
+      console.log(this.order_data.original_price, _price, '_price_price');
       let money = this.isSelectCardList.length > 0 ? this.order_data.original_price - _price : Number(this.order_data.original_price)
-      console.log(money,'========');
+      console.log(money, '========');
       let isSelectCoup = this.isSelectCoup
       let project_list = this.order_data.project_list //这里是项目列表
 
-      if (isSelectCoup.length == 0) {
-        this.showMoney = money.toFixed(2)
-        return
-      }
 
       // 如果是项目
-      if (isSelectCoup[0].type == 4) {
-        for (let i = 0; i < project_list.length; i++) {
-          if (project_list[i].cardId) {
+      if (this.isSelectCoup.length > 0) {
+
+        if (isSelectCoup[0].type == 4) {
+          for (let i = 0; i < project_list.length; i++) {
+            if (project_list[i].cardId) {
+              money = money - Number(project_list[i].price)
+            }
+          }
+          this.showMoney = money.toFixed(2)
+          console.log(this.showMoney, 'this.showMoney');
+        } else if (isSelectCoup[0].type == 3) {
+          for (let i = 0; i < project_list.length; i++) {
             money = money - Number(project_list[i].price)
           }
+        } else {
+          money = money - Number(isSelectCoup[0].price)
         }
-        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)
-          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)
-        }
+      console.log(this.showMoney, 'showMoney', money);
 
-      } else {
-        money = money - Number(isSelectCoup[0].price)
+
+      /**
+     * type:1项目，2设备分类，3耗材
+     * discount_type:折扣条件，1数量/类型，2金额
+     */
+      let notSelectId = []
+      this.isSelectCoup.forEach(item => {
+        notSelectId.push(item.projectids)
+      })
+      let cardIdList = []
+      this.isSelectCardList.forEach(res=>{
+        cardIdList.push(res.id)
+      })
+      //去除选择优惠券或者次卡的项目
+      let _project_list = project_list.filter(res => {
+
+        return notSelectId.toString().indexOf(res.id)<0 && cardIdList.toString().indexOf(res.id)<0
+      })
+      console.log(_project_list,'_project_list');
+      let devicePrice = 0 //满足折扣设备的项目总金额
+      let productPrice = 0 //耗材总金额
+      //满足折扣设备的项目
+      let deviceList = _project_list.filter(item => {
+        return item.device_type_id == item.device_id
+      })
+      if (deviceList.length > 0) {
+        deviceList.forEach(item => {
+          devicePrice = devicePrice + Number(item.price)
+        })
       }
-      console.log(this.showMoney, 'showMoney', money);
-      this.showMoney = money < 0 ? 0 : money
-    },
+      //拥有耗材的项目
+      let productList = _project_list.filter(item => {
+        return item.product_name != ""
+      })
+      if (productList.length > 0) {
+        productList.forEach(item => {
+          productPrice = productPrice + Number(item.product_price)
+        })
+      }
+      if (this.discountList.length > 0) {
+        let discountList = this.discountList
+        //计算所有的折扣金额
+        discountList.forEach(item => {
+          let priceSet = 0,
+            initmoney = money,
+            _initmoney = money
+          if (item.type == 1 && item.discount_type == 1 && _project_list.length >= item.num) {
+            initmoney = initmoney * item.discount_rate / 10
+            priceSet = _initmoney - initmoney
+            item["priceSet"] = priceSet
+          } else if (item.type == 1 && item.discount_type == 2 && money > Number(item.amount)) {
+            initmoney = initmoney * item.discount_rate / 10
+            priceSet = _initmoney - initmoney
+            item["priceSet"] = priceSet
+          } else if (item.type == 2 && item.discount_type == 2 && devicePrice > Number(item.amount)) {
+            //满足条件的项目折扣
+            initmoney = (initmoney - devicePrice) + devicePrice * item.discount_rate / 10
+            priceSet = _initmoney - initmoney
+            item["priceSet"] = priceSet
 
+          } else if (item.type == 3 && item.discount_type == 1 && productList.length >= item.num) {
+            //满足条件的项目折扣
+            initmoney = (initmoney - productPrice) + productPrice * item.discount_rate / 10
+            priceSet = _initmoney - initmoney
+            item["priceSet"] = priceSet
 
+          } else if (item.type == 3 && item.discount_type == 2 && productPrice >= item.amount) {
+            //满足条件的项目折扣
+            initmoney = (initmoney - productPrice) + productPrice * item.discount_rate / 10
+            priceSet = _initmoney - initmoney
+            item["priceSet"] = priceSet
+          }
+        })
+        console.log(discountList, 'discountList');
+        //排序，最优折扣放第一位
+        discountList = discountList.sort(this.compare("priceSet"))
+
+        let discountInfo = discountList[0]
+
+        if (discountInfo.type == 1 && discountInfo.discount_type == 1 && _project_list.length >= discountInfo.num) {
+          money = money * discountInfo.discount_rate / 10
+        } else if (discountInfo.type == 1 && discountInfo.discount_type == 2 && money > Number(discountInfo.amount)) {
+          money = money * discountInfo.discount_rate / 10
+        } else if (discountInfo.type == 2 && discountInfo.discount_type == 2 && devicePrice > Number(discountInfo.amount)) {
+          //满足条件的项目折扣
+          money = (money - devicePrice) + devicePrice * discountInfo.discount_rate / 10
+        } else if (discountInfo.type == 3 && discountInfo.discount_type == 1 && productList.length >= discountInfo.num) {
+          //满足条件的项目折扣
+          money = (money - productPrice) + productPrice * discountInfo.discount_rate / 10
+        } else if (discountInfo.type == 3 && discountInfo.discount_type == 2 && productPrice >= discountInfo.amount) {
+          //满足条件的项目折扣
+          money = (money - productPrice) + productPrice * discountInfo.discount_rate / 10
+        }
+      }
+
+      this.showMoney = money.toFixed(2) < 0 ? 0.00 : money.toFixed(2)
+    },
+
+    //排序
+    compare (property) {
+      return function (obj1, obj2) {
+        var value1 = obj1[property];
+        var value2 = obj2[property];
+        return value2 - value1; // 降序
+      }
+    },
     changeActive (e) {
       this.active = e
     },
@@ -1398,7 +1543,7 @@ export default {
     //获取订单折扣类型
     getOrderDiscount () {
       api.getOrderDiscount({ id: this.id }).then(res => {
-        this.discount = res.data.discount
+        this.discountList = res.data.list
         this.getOrderInfo()
       })
     },
@@ -1803,6 +1948,7 @@ export default {
               line-height: 18px;
             }
             .project-zoom {
+              margin-top: 8px;
               font-size: 14px;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
@@ -1817,6 +1963,9 @@ export default {
               .delete {
                 margin-left: 10px;
               }
+              /deep/ .el-input__inner {
+                color: #fa7d22;
+              }
             }
           }
         }

src/pages/customerMan/details/index.vue

@@ -4,33 +4,49 @@
       <div class="user-info">
         <div class="title">
           <div class="txt">个人信息</div>
-          <div class="test-record" @click="toTestRecord" v-if="userInfo.analysis_id">测肤记录</div>
+          <div class="test-record"
+               @click="toTestRecord"
+               v-if="userInfo.analysis_id">测肤记录</div>
         </div>
         <div class="detail-info">
           <div class="user-img">
-            <img :src="userInfo.avatar_url" alt="">
+            <img :src="userInfo.avatar_url"
+                 alt="">
           </div>
           <div class="user-span">
             <div class="info">
-              <div class="name"><span>{{userInfo.nickname}}</span></div>
+              <div class="name"><span>{{userInfo.nickname | ellipsis(3)}}</span></div>
               <div class="sex"><img :src="gender"
-                    alt=""></div>
-              <div class="age"><span>{{userInfo.skin_age}}</span><span>肤龄</span></div>
+                     alt=""></div>
+              <div class="age"><span>{{userInfo.skin_age}}</span><span class="min-size">肤龄</span></div>
             </div>
             <div class="real-name">姓名：
               <span v-show="!nameInpVisible">{{userInfo.real_name}}</span>
-              <el-input size="mini" ref="realNameInp" v-show="nameInpVisible" @change="updateRealName" v-model="userInfo.real_name" type="text"></el-input>
-              <img class="edit-name" @click="editName" src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png" alt="" srcset="">
+              <el-input size="mini"
+                        ref="realNameInp"
+                        v-show="nameInpVisible"
+                        @change="updateRealName"
+                        v-model="userInfo.real_name"
+                        type="text"></el-input>
+              <img class="edit-name"
+                   @click="editName"
+                   src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png"
+                   alt=""
+                   srcset="">
             </div>
             <div class="skin-type">肤质：<span>{{userInfo.skin_type}}</span></div>
             <div class="skin-color">肤色：<span>{{userInfo.skin_color}}</span></div>
-            <div class="skin-color">上传报告时间：<span>{{userInfo.check_time}}</span></div>
+
           </div>
         </div>
       </div>
 
       <div class="personage-data">
         <div class="myDataList">
+          上传报告时间：
+          <span>{{userInfo.check_time}}</span>
+        </div>
+        <div class="myDataList">
           出生日期：
           <span>{{userInfo.birthday}}</span>
         </div>
@@ -49,6 +65,11 @@
           <span>{{userInfo.store_name}}</span>
         </div>
 
+         <div class="myDataList coupon-num">
+          次卡数量：
+          <span>{{order_total.card_order}}</span>
+        </div>
+
         <div class="myDataList coupon-num">
           优惠券数量：
           <span>{{userInfo.card_num}}</span>
@@ -66,7 +87,8 @@
           积分：
           <span>{{userInfo.coin}}</span>
         </div>
-        <div class="myDataList" @click="remarkPupopVisible=true">
+        <div class="myDataList"
+             @click="remarkPupopVisible=true">
           备注：
           <span>{{userInfo.remark | ellipsis(20)}}</span>
         </div>
@@ -169,7 +191,7 @@
         </div>
       </div>
     </div>
-        <!-- 备注 -->
+    <!-- 备注 -->
     <mine-pupop :show="remarkPupopVisible">
       <div class="block">
         <div class="delete-pupop"
@@ -183,7 +205,8 @@
                   placeholder="备注"
                   v-model="userInfo.remark"></textarea>
         <div class="noticeSubmit">
-          <div class="submit-notice" @click="submitRemark">确定</div>
+          <div class="submit-notice"
+               @click="submitRemark">确定</div>
         </div>
       </div>
     </mine-pupop>
@@ -332,7 +355,7 @@ export default {
       this.nameInpVisible = true
       this.$refs.realNameInp.focus()
     },
-    async updateRealName() {
+    async updateRealName () {
       let resp = await api.updateUserProfile({
         id: this.id,
         real_name: this.userInfo.real_name
@@ -396,7 +419,7 @@ export default {
         }
         .test-record {
           font-size: 12px;
-          color: #FA7D22;
+          color: #fa7d22;
         }
       }
       .detail-info {
@@ -410,6 +433,7 @@ export default {
           }
         }
         .user-span {
+          flex: 1;
           margin-left: 12px;
 
           span {
@@ -420,7 +444,7 @@ export default {
             justify-content: space-between;
 
             .name {
-              font-size: 16px;
+              font-size: 14px;
             }
             .sex {
               img {
@@ -429,9 +453,9 @@ export default {
               }
             }
             .age {
-              margin-left: 13px;
+              margin-left: 4px;
               span:nth-child(1) {
-                font-size: 22px;
+                font-size: 14px;
               }
               span:nth-child(2) {
                 margin-left: 4px;
@@ -460,7 +484,7 @@ export default {
       }
     }
     .personage-data {
-      margin-top: 30px;
+      margin-top: 14px;
       .myDataList {
         margin-top: 15px;
         .bigSixe {
@@ -476,7 +500,7 @@ export default {
       }
       .coupon-num {
         span {
-          color: #FA7D22;
+          color: #fa7d22;
           font-size: 16px;
           font-weight: 500;
         }
@@ -911,7 +935,6 @@ export default {
       justify-content: center;
     }
 
-
     .submit-notice {
       width: 100px;
       height: 29px;

src/pages/historicalOrder/details/index.vue

@@ -80,7 +80,22 @@
                 </div>
               </div>
               <div class="project-tips">{{item.product_names}}</div>
-              <div class="project-zoom">{{item.room}}{{item.use_time}}分钟</div>
+              <div class="project-zoom">
+                <el-select v-model="item.tot_name"
+                           v-if="order_data.status<3"
+                           @visible-change="openList($event,item,index)"
+                           @change="changeRoom($event,item,index)"
+                           size="mini"
+                           style="min-width: 150px;"
+                           :placeholder="item.tot_name">
+                  <el-option v-for="i in roomList"
+                             :key="i.id"
+                             :label="i.tot_name"
+                             :value="i.tot_name">
+                  </el-option>
+                </el-select>
+                <div v-else>{{item.tot_name}}</div>
+              </div>
             </div>
           </div>
         </div>
@@ -99,7 +114,8 @@
                      alt />
               </div>
               <div class="coupon-title">次卡</div>
-              <div class="coupon-tip" v-if="coupon_list.length>0">已选择次卡</div>
+              <div class="coupon-tip"
+                   v-if="coupon_list.length>0">已选择次卡</div>
             </div>
             <div class="on-icon">></div>
           </div>
@@ -117,7 +133,8 @@
                      alt />
               </div>
               <div class="coupon-title">优惠卷</div>
-              <div class="coupon-tip" v-if="coupon_list.length>0">已选推荐优惠</div>
+              <div class="coupon-tip"
+                   v-if="coupon_list.length>0">已选推荐优惠</div>
             </div>
             <div class="on-icon">></div>
           </div>
@@ -139,7 +156,6 @@
     </div>
   </div>
 </template>
-
 <script>
 import api from "../../../server/home";
 export default {
@@ -160,6 +176,7 @@ export default {
       isPupop: false,
       id: "",
       problem: '',
+      roomList: [],//设备房间列表
     };
   },
   computed: {
@@ -176,6 +193,9 @@ export default {
     getOrderInfo () {
       api.getOrderInfo({ id: this.id }).then(res => {
         this.userInfo = res.data.user;
+        res.data.order_data.project_list.forEach(e => {
+          e["tot_name"] = `${e.device_name}（${e.room}）`
+        })
         this.order_data = res.data.order_data;
         this.problem = res.data.skin_name
         let _problem = []
@@ -193,6 +213,48 @@ export default {
       });
     },
 
+    openList (e, item, index) {
+      console.log(e, item, index, 'e,item,index');
+      if (e) {
+        this.value = ''
+        this.roomList = []
+        let params = {
+          id: this.id,
+          project_id: item.id
+        }
+        api.getDevice_list(params).then(res => {
+          if (res.code == 200) {
+            res.data.list.forEach(item => {
+              item['tot_name'] = `${item.name}（${item.room}）`
+            })
+            this.roomList = res.data.list
+          }
+        })
+      }
+    },
+    changeRoom (e, item, index) {
+      let _id = 0
+      this.roomList.forEach(res => {
+        if (res.tot_name == e) {
+          _id = res.id
+        }
+      })
+      console.log(e, item, index, 'e,item,index');
+      let params = {
+        id: this.id,
+        project_id: item.id,
+        device_id: _id
+      }
+      api.device_change(params).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            message: `${res.msg}`,
+            type: "success"
+          });
+          this.getOrderInfo()
+        }
+      })
+    },
     onOperation (index) {
       if (this.programmeList[index].onSelect) {
         this.$set(
@@ -579,6 +641,9 @@ export default {
               font-weight: 400;
               color: #fa7d22;
               line-height: 18px;
+              /deep/ .el-input__inner {
+                color: #fa7d22;
+              }
             }
           }
         }

src/pages/home/detailList/index.vue

@@ -138,6 +138,7 @@ export default {
         border-bottom: 2px #f5f5f5 solid;
       }
       .project-wrapper {
+        flex: 1;
         display: flex;
         flex-wrap: wrap;
         .project {

src/server/home.js

@@ -81,6 +81,12 @@ export default class Home {
   static addUpdate (parms) {
     return $http.post(url.addUpdate, parms);
   }
+  static getDevice_list (parms) {
+    return $http.get(url.getDevice_list, parms);
+  }
+  static device_change (parms) {
+    return $http.post(url.device_change, parms);
+  }
 
   // 获取历史订单
   static getOrderList (parms) {

src/server/urls.js

@@ -38,7 +38,7 @@ export default {
   //支付状态
   payStatus: '/v2/pad/order/pay_status',
   //活动折扣
-  getOrderDiscount: '/v2/pad/order/discount',
+  getOrderDiscount: '/v3/pad/order/discount',
   //获取项目分类
   projectClassify: '/v2/pad/project/classify',
   //删除项目和耗材
@@ -55,6 +55,10 @@ export default {
   cardUpdate:'/v2/pad/card/update',
   //获取项目可用的次卡
   getOrderCard:'/v2/pad/order/card',
+  //获取可更换的设备
+  getDevice_list:'/v2/pad/order/device_list',
+  //更改设备
+  device_change:'/v2/pad/order/device_change',
 
   /**
    *  by ListKer

vue.config.js

@@ -4,11 +4,11 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
   // 测试
-  publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/test_pad/dist' :
-    process.env.env_config === 'test' ? '/vapps/calory/' : '/dist/',
-  // 正式
-  // publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/dist' :
+  // publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/test_pad/dist' :
   //   process.env.env_config === 'test' ? '/vapps/calory/' : '/dist/',
+  // 正式
+  publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/dist' :
+    process.env.env_config === 'test' ? '/vapps/calory/' : '/dist/',
   // 设置跨域
   crossorigin: 'anonymous',
   /**