单产品优惠券处理

pages/combination/combiChoose/combiChoose.vue

@@ -13,11 +13,11 @@ export default {
   },
   onLoad(option) {
     //由于之前配置了这个页面，暂时进入页面直接跳转页面
-    this.companyId=this.$commonjs.getCompanyId(option)||''
+    let companyId=this.$commonjs.getCompanyId(option)||''
     let merchantId=this.$commonjs.getKey(option,'merchantId')||''
     let channelId=this.$commonjs.getKey(option,'channelId')||''
-    this.groupId=this.$commonjs.getKey(option,'groupId')||''
-    this.groupChannelId=this.$commonjs.getKey(option,'groupChannelId')||''
+    let groupId=this.$commonjs.getKey(option,'groupId')||''
+    let groupChannelId=this.$commonjs.getKey(option,'groupChannelId')||''
     uni.navigateTo({
       url:`/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=${merchantId}&channelId=${channelId}&groupId=${groupId}&groupChannelId=${groupChannelId}&companyId=${companyId}`
     })

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -88,7 +88,7 @@
 						<u-empty text="空空如也..." mode="list" v-if="scenicList.length == 0" width="320" height="320"></u-empty>
 					</swiper-item>
 
-					<swiper-item class="swiper-item">
+					<!-- <swiper-item class="swiper-item">
 						<u-waterfall v-model="albumList" class="waterfall" style="padding-top: 8rpx;">
 							<template v-slot:left="{leftList}">
 								<view v-for="(item, index) in leftList" :key="index" class="album-left" @click="goAlbum(index)">
@@ -136,7 +136,7 @@
 					</swiper-item>
 					<swiper-item class="swiper-item">
 						<u-empty text="空空如也..." mode="list" width="320" height="320"></u-empty>
-					</swiper-item>
+					</swiper-item> -->
 				</swiper>
 			</view>
 			<view class="bottom">

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -139,7 +139,7 @@
 						</u-number-box>
 					</view>
 				</view>
-				<view class=" middle-coupon" v-if="couponData.length>0"  @click="showCoupon()">
+				<view class=" middle-coupon" v-if="couponData"  @click="showCoupon()">
 						<view>
 							券
 						</view>
@@ -451,7 +451,7 @@ export default {
       dateScroll: '', //日期滚动值
       timeScroll: '' ,//时间滚动值
       openid:uni.getStorageSync('openid') || '',//openid
-      couponData:[], //所有劵数据
+      couponData:'', //所有劵数据
       chooseCouponObj: '', //默认选中最优价格优惠券
       ableConpon: '', //没有可用优惠券时，达到一定条件可用，显示达到的条件
     }
@@ -971,7 +971,7 @@ export default {
 		  let savedMoneyList = []
 		  this.chooseCouponObj = ''
 		  this.ableConpon = ''
-      this.couponData=[]
+      this.couponData=''
 		  let data = {
 		    productId: this.productId, //产品id
 		    tickets: this.buyNum, //房间数量