feat: ..

package-lock.json

@@ -15911,6 +15911,11 @@
       "integrity": "sha1-J1b0bLMlgFTF9HI96K5+hzAqHM8=",
       "dev": true
     },
+    "vue-infinite-scroll": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz",
+      "integrity": "sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A=="
+    },
     "vue-jest": {
       "version": "3.0.4",
       "resolved": "https://registry.npm.taobao.org/vue-jest/download/vue-jest-3.0.4.tgz",

package.json

@@ -17,6 +17,7 @@
     "js-cookie": "^3.0.1",
     "qrcodejs2": "0.0.2",
     "vue": "^2.6.6",
+    "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },

src/components/common/layout/leftMenu.vue

@@ -88,8 +88,8 @@ export default {
   },
   watch: {
     $route (to, from) {
-      let patname = `/${window.location.pathname.split('/')[1]}`
-      console.log(patname, 'patname');
+      let patname = `/${window.location.hash.split('/')[1]}`
+      console.log(patname, 'patname', window.location);
       this.menu.forEach((item, index) => {
         if (patname == item.path) {
           this.nowIndex = index

src/main.js

@@ -7,6 +7,7 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import auth from './common/auth'
 import { injectGlobal } from './common/'
+import infiniteScroll from "vue-infinite-scroll";
 import './style/reset.less'
 import './style/common.less'
 import './assets/font/iconfont.css'
@@ -14,6 +15,8 @@ import './style/index.less'
 import './filters/filter'
 //全局注入
 Vue.use(ElementUI)
+Vue.use(infiniteScroll);
+
 injectGlobal()
 
 window.globalVue = "";

src/pages/confirmOrder/details/index.vue

@@ -154,32 +154,34 @@
              @click="isCoupun=false"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
                alt=""></div>
         <div class="coupon-pupop-title">选择优惠券</div>
-        <ul class="coupon-lists"
-            infinite-scroll-distance="10"
-            style="overflow:auto"
-            v-infinite-scroll="onCoupon">
+        <ul class="coupon-lists">
           <li class="coupon-info"
               v-for="item,index in couponList"
               :key="index">
+            <div class="coupon-tips-text">{{item.type==1?'无条件抵扣券':item.type==2?'满减券':item.type==3?'全额券':'项目全减券'}}</div>
             <div class="top">
-              <div class="discount">
-                <div class="price-num"><span class="size">￥</span>10<span class="size">.00</span></div>
-                <div class="price-tips">满100元可用</div>
+              <div v-if="item.type!=2"
+                   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>
               <div class="coupon-tip">
-                <div class="tips-title">{{item.full_price}}</div>
+                <div class="tips-title">{{item.coupon_name}}</div>
                 <div class="tips-ts">有效期至{{item.ex_time}}</div>
               </div>
-              <div class="choice-icon"><img :src="select"></div>
+              <div class="choice-icon"
+                   @click="selectPupop(item,index)"><img :src="item.Select?select:unSelect"></div>
             </div>
             <div class="bottom">
-              <div class="coupon-notes">
+              <div class="coupon-notes"
+                   @click="isOver=!isOver">
                 <div class="notes-text min-size">
                   <span v-if="!isOver">{{item.coupon_desc |ellipsis(20)}}</span>
                   <span v-else>{{item.coupon_desc}}</span>
                 </div>
-                <div class="notes-icon"
-                     @click="isOver=!isOver"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/openNotes.png"
+                <div class="notes-icon"><img :src="isOver?open:unOpen"
                        alt=""></div>
               </div>
             </div>
@@ -317,6 +319,8 @@ export default {
   components: { minePupop },
   data () {
     return {
+      open: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/openNotes.png',
+      unOpen: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/upDate.png',
       select: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/select.png',
       unSelect: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/unSelect.png',
       userInfo: {
@@ -355,7 +359,12 @@ export default {
           mini: 242
         }
       ],
+      //优惠券列表
       couponList: [],
+      //已选择的优惠券
+      selectCouponList: [],
+      //已选择优惠券的id（同一个id只能选择一张优惠券）
+      selectCouponListId: [],
       timesInfo: '',
       reservationPrice: 0,//预约费用
       projectInfo: '',
@@ -373,7 +382,7 @@ export default {
       isChange: false,//项目是否有改变
       isEditProject: false,//是否编辑项目
       page: 1,
-      limit: 10,
+      limit: 20,
     };
   },
   computed: {
@@ -569,6 +578,7 @@ export default {
         this.reservationPrice += Number(res.price)
       })
     },
+    //获取订单优惠券
     onCoupon () {
       let params = {
         id: this.id,
@@ -576,14 +586,39 @@ export default {
         limit: this.limit
       }
       api.getOrderCoupon(params).then(res => {
-        this.couponList = res.data.list
+        this.couponList = [...this.couponList, ...res.data.list]
+        this.couponList.forEach(item => {
+          this.$set(item, 'Select', false)
+        })
+        this.page++
+        if (this.couponList.length < res.data.total) {
+          this.onCoupon()
+        }
       })
       this.isCoupun = true
     },
+    //数组包含关系
+    includes (arr1, arr2) {
+      return arr2.every(val => arr1.includes(val));
+    },
+    selectPupop (item, index) {
+
+      if (item.type = 4) {
+
+      } else {
+
+      }
+      this.couponList[index].Select = !this.couponList[index].Select
+      this.selectCouponList = this.couponList.filter(res => {
+        return res.Select == true
+      })
+      this.selectCouponList.forEach(res => {
+
+      })
+
+    },
     changeActive (e) {
-      console.log(e, 'eeeeeee');
       this.active = e
-      console.log(this.active, 'this.active');
     },
     selectTime (item) {
       if (item.status == 0) return
@@ -1085,10 +1120,27 @@ export default {
       overflow: scroll;
       .coupon-info {
         width: 345px;
+        margin-bottom: 20px;
         padding: 20px 14px 10px 14px;
         position: relative;
         background: #fff4e6;
         border-radius: 12px;
+        .coupon-tips-text {
+          position: absolute;
+          left: 0;
+          top: 0;
+          padding: 0 8px;
+          height: 18px;
+          background: #875617;
+          border-radius: 12px 0px 12px 0px;
+          font-size: 12px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #ffffff;
+          line-height: 18px;
+          zoom: 0.83;
+          text-align: center;
+        }
         .top {
           display: flex;
           justify-content: space-between;
@@ -1122,6 +1174,13 @@ export default {
               line-height: 17px;
             }
           }
+          .discount-over {
+            font-size: 22px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #ff3007;
+            line-height: 30px;
+          }
           .coupon-tip {
             .tips-title {
               font-size: 16px;