修改优惠券为多选

pages/OrderPage/index.vue

@@ -89,11 +89,11 @@
                 选择优惠
               </view>
               <view class="item-content row col">
-                <view class="item-content-text" v-if="coupons.length === 0">
-                  <u-text text="请选择优惠券" size="28" color="#636363" @click="navTo('/pages/UserCoupons/index?type=select&order_type='+type)"></u-text>
+                <view class="item-content-text" v-if="user_coupons.length === 0 && order_coupons.length === 0">
+                  <u-text text="请选择优惠券" size="28" color="#636363" @click="navTo('/pages/UserCoupons/index?type=select&order_type='+type+'&max='+timeList.length)"></u-text>
                 </view>
                 <view class="item-content-text" v-else>
-                  <view class="item-content-tag" style="margin-bottom:10rpx;" v-for="(item,index) in coupons">
+                  <view class="item-content-tag" style="margin-bottom:10rpx;" v-for="(item,index) in (user_coupons.length > 0?user_coupons:order_coupons)">
                     <view class="tag-text">
                       {{item.title}}
                     </view>
@@ -487,7 +487,8 @@
           limit:10
         },
         addServiceChecked:[],
-        coupons:[],
+        user_coupons:[],
+        order_coupons:[],
         doTimeList:[
           {
             label:'上午',
@@ -529,7 +530,8 @@
       if(!this.isPay && this.sign === ''){
         this.getDefaultAddress();
         this.getUserCoupons();
-        this.$refs.petPage.closePop()
+        this.getOrderCoupons();
+        this.$refs?.petPage?.closePop()
       }
     },
     onShareAppMessage() {
@@ -627,7 +629,10 @@
           }
           this.isPay = true;
 
-          let coupons = this.coupons.map(item => {
+          let user_coupons = this.user_coupons.map(item => {
+            return item.id;
+          }).join(',');
+          let order_coupons = this.order_coupons.map(item => {
             return item.id;
           }).join(',');
 
@@ -644,7 +649,8 @@
             basic_service:this.basicServiceChecked,
             pet_ids: this.petChecked.map(res => res.id).join(','),
             store_id:this.store_id,
-            user_coupon_id: coupons || 0,
+            user_coupon_id: user_coupons || 0,
+            order_coupon_id: order_coupons || 0,
             add_time:this.add_time || 0,
           }).then(res => {
             console.log(res)
@@ -692,7 +698,10 @@
             &&this.petChecked.length>0
             &&this.basicServiceChecked!==''
         ){
-          let coupons = this.coupons.map(item => {
+          let user_coupons = this.user_coupons.map(item => {
+            return item.id;
+          }).join(',');
+          let order_coupons = this.order_coupons.map(item => {
             return item.id;
           }).join(',');
           getOrderPrice({
@@ -708,7 +717,8 @@
             basic_service:this.basicServiceChecked,
             pet_ids: this.petChecked.map(res => res.id).join(','),
             store_id:this.store_id,
-            user_coupon_id:coupons || 0,
+            user_coupon_id: user_coupons || 0,
+            order_coupon_id: order_coupons || 0,
             add_time:this.add_time || 0,
           }).then(res => {
             console.log('res',res)
@@ -760,14 +770,23 @@
         this.vTabCurrent = index
       },
       getUserCoupons(){
-        let cacheCoupons = uni.getStorageSync('userCoupons');
-        log(cacheCoupons);
-        if (cacheCoupons) {
-          this.coupons = cacheCoupons;
+        let cacheUserCoupons = uni.getStorageSync('userCoupons');
+        log(cacheUserCoupons);
+        if (cacheUserCoupons) {
+          this.user_coupons = cacheUserCoupons;
           uni.removeStorage({key:'userCoupons'});
         }
         this.checkOrderData();
       },
+      getOrderCoupons(){
+        let cacheOrderCoupons = uni.getStorageSync('orderCoupons');
+        log(cacheOrderCoupons);
+        if (cacheOrderCoupons) {
+          this.order_coupons = cacheOrderCoupons;
+          uni.removeStorage({key:'orderCoupons'});
+        }
+        this.checkOrderData();
+      },
       showAddServicePopup(){
         this.$refs.addServicePopup.open();
       },
@@ -790,7 +809,13 @@
         this.checkOrderData();
       },
       delCoupons(index){
-        this.coupons.splice(index,1);
+        //目前只能单选优惠券或次卡,所以两种都写,捕获异常
+        try {
+          this.user_coupons.splice(index,1);
+          this.order_coupons.splice(index,1);
+        }catch (e){
+
+        }
         this.checkOrderData();
       },
       //TODO 获取服务

pages/UserCoupons/index.vue

@@ -42,8 +42,8 @@
 							<view class="coupons-rule row col" @click="showCoupons(item)">查看使用规则 <u-icon class="arrow-right" size="24rpx" color="#999999" name="arrow-right"></u-icon></view>
 							<view class="coupons-button" v-if="type==='select'">
 								<MzButton
-                    :title="couponType===1?(item.checked?'取消选择':'选择'):'立即使用'"
-                    @click="couponType===1?item.checked = !item.checked:clickCoupons(item)"
+                    :title="(item.checked?'取消选择':'选择')"
+                    @click="selectCoupons(item)"
                     button-width="145rpx"
                     :button-color="(item.status > 0 || item.checked) ?'#CACACA':'#4DC3B8'"
                     font-color="#fff"
@@ -65,7 +65,7 @@
 								line-color="#ACB4B6"
 								marginBottom="30" marginTop="30" @loadmore="getCouponsList(++this.page)"/>
 	</view>
-  <view class="footer-menu row" v-if="couponType===1 && type === 'select'">
+  <view class="footer-menu row" v-if="type === 'select'">
     <view class="footer-button col-12">
       <MzButton
           title="确认"
@@ -107,6 +107,7 @@
   import {userCoupons} from "../../api/user";
   import {getConfig} from "@/api/other";
   import log from "@/utils/log";
+  import api from "../../utils/functions";
 	export default {
 		components: {
 			HeaderNav,
@@ -152,11 +153,14 @@
         navToUrl:'',
         couponsContent:'',
         order_type:1,
+        max:1,
+        isMax:false,
 			}
 		},
 		onLoad(option) {
       this.type = option.type||'lists'
       this.order_type = option.order_type|| 1
+      this.max = option.max|| 1
       console.log(this.type)
       this.navToUrl = option.url || ''
 		},
@@ -173,11 +177,31 @@
       }
     },
 		methods: {
+      selectCoupons(item){
+        let checkedCoupons = this.couponsList.filter(item => {
+          return item.checked
+        });
+        if(item.checked){
+          this.isMax = false;
+        }else{
+          if(this.max <= checkedCoupons.length){
+            this.isMax = true;
+            api.error('选中数量超过上限')
+            return;
+          }
+        }
+        item.checked = !item.checked
+      },
       cardCouponsConfirm(){
         let checkedCoupons = this.couponsList.filter(item => {
           return item.checked
         });
-        uni.setStorageSync('userCoupons',checkedCoupons);
+        //次卡 豪门大户卡
+        if(this.couponType === 1){
+          uni.setStorageSync('orderCoupons',checkedCoupons);
+        }else{
+          uni.setStorageSync('userCoupons',checkedCoupons);
+        }
         uni.navigateBack();
       },
       showCoupons(item){