commit -m 优惠券

components/cm-module/cart-components/index.vue

@@ -744,12 +744,12 @@
 									case 0:// 活动券
 										if(coupon.productType == 1){// 活动券-全商城商品
 											if(this.allPrice >= coupon.touchPrice){
-												eligibleCoupons = this.setCouponsArr(coupon)
+												eligibleCoupons.push(coupon)
 											}
 										}else if(coupon.productType == 2){// 活动券-指定商品
 											if(coupon.productIds && coupon.productIds.includes(pros.productId)){
 												if(this.allPrice >= coupon.touchPrice){
-													eligibleCoupons = this.setCouponsArr(coupon)
+													eligibleCoupons.push(coupon)
 												}
 											}
 										}
@@ -757,25 +757,25 @@
 									case 1:// 品类券适用于产品或者仪器 categoryType(commodityType) : 1 产品  2 仪器 
 										if( coupon.categoryType && coupon.categoryType == pros.commodityType){
 											if(this.allPrice >= coupon.touchPrice){
-												eligibleCoupons = this.setCouponsArr(coupon)
+												eligibleCoupons.push(coupon)
 											}
 										}
 										break;
 									case 2:// 用户专享券 适用于商城全部商品
 										if(this.allPrice >= coupon.touchPrice){
-											eligibleCoupons = this.setCouponsArr(coupon)
+											eligibleCoupons.push(coupon)
 										}
 										break;
 									case 3:// 店铺券适用于某个供应商的全部商品	
 										if(coupon.shopId && pros.supplierId == coupon.shopId){
 											if(this.allPrice >= coupon.touchPrice){
-												eligibleCoupons = this.setCouponsArr(coupon)
+												eligibleCoupons.push(coupon)
 											}
 										}
 										break;		
 									case 4://新用户券 适用于商城全部商品
 										if(this.allPrice >= coupon.touchPrice){
-											eligibleCoupons = this.setCouponsArr(coupon)
+											eligibleCoupons.push(coupon)
 										}
 										break;
 								}
@@ -788,12 +788,6 @@
 				})
 				return eligibleCoupons;
 			},
-			setCouponsArr(coupon){//处理
-				const list = []
-				list.push(coupon)
-				list.sort((a,b)=> b.couponAmount - a.couponAmount )
-				return list
-			},
 			changeCountAdd(item,pros){//商品数量加加
 				if(pros.step === 2){
 					pros.isStep = false

components/cm-module/listTemplate/buyagainList.vue

@@ -25,7 +25,6 @@
 						</view>
 						<view class="list-details-price">
 							<view class="floor-item-act" v-if="item.actStatus==1">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<template v-if="item.actStatus==1">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 										{{item.promotions.name}}<text>:￥{{ item.price | NumFormat }}</text>
@@ -34,7 +33,6 @@
 								</template>
 							</view>
 							<view class="floor-item-act" v-if="item.actStatus==0">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 							</view>
 						</view>	

components/cm-module/listTemplate/classifyProductList.vue

@@ -12,7 +12,6 @@
 					<view class="list-details-price">
 						<template v-if="userIdentity == 3">
 							<view class="floor-item-act" v-if="item.actStatus==1">>
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<template>
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 										{{item.promotions.name}}
@@ -22,13 +21,11 @@
 								</template>
 							</view>
 							<view class="floor-item-act" v-if="item.actStatus ==0">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 							</view>
 						</template>
 						<template v-else>
 							<view class="floor-item-act" v-if="item.actStatus==1">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<template>
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 										{{item.promotions.name}}
@@ -38,7 +35,6 @@
 								</template>
 							</view>
 							<view class="floor-item-act" v-if="item.actStatus ==0">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 							</view>
 						</template>

components/cm-module/listTemplate/immediatelyList.vue

@@ -57,7 +57,6 @@
 							</view>
 							<view class="list-details-price"> 
 								<view class="floor-item-act" v-if="pros.actStatus==1">
-									<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
 									<template>
 										<view class="floor-tags" v-if="PromotionsFormat(pros.promotions)">
 											{{pros.promotions.name}}<text>:￥{{ pros.price | NumFormat }}</text>
@@ -66,7 +65,6 @@
 									</template>
 								</view>
 								<view class="floor-item-act" v-if="pros.actStatus == 0">
-									<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
 									<view class="floor-tags" v-if="pros.actStatus ==0  &&  pros.ladderPriceFlag==1">阶梯价格</view>	
 								</view>
 							</view>	
@@ -99,7 +97,6 @@
 											</view>
 											<view class="zuhe_price-larger zuhe_list_text" >
 												<view class="floor-item-act" v-if="pros.actStatus==1">
-													<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
 													<template>
 														<view class="floor-tags" v-if="PromotionsFormat(pros.promotions)">
 															{{pros.promotions.name}}<text>:￥{{ pros.price | NumFormat }}</text>
@@ -108,7 +105,6 @@
 													</template>
 												</view>
 												<view class="floor-item-act" v-if="pros.actStatus==0">
-													<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
 													<view class="floor-tags" v-if="pros.actStatus ==0  &&  pros.ladderPriceFlag==1">阶梯价格</view>	
 												</view>
 												<view class="count">

components/cm-module/listTemplate/productList.vue

@@ -28,7 +28,6 @@
 						</view>
 						<view class="list-details-price">
 							<view class="floor-item-act" v-if="item.actStatus==1">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<template v-if="item.actStatus==0">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 										{{item.promotions.name}}
@@ -38,7 +37,6 @@
 								</template>
 							</view>
 							<view class="floor-item-act" v-if="item.actStatus==0">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 							</view>
 						</view>	

components/cm-module/pageFloorTemplate/templateA.vue

@@ -24,7 +24,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageFloorTemplate/templateB.vue

@@ -36,7 +36,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageFloorTemplate/templateC.vue

@@ -36,7 +36,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageFloorTemplate/templateD.vue

@@ -48,7 +48,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageFloorTemplate/templateE.vue

@@ -24,7 +24,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageFloorTemplate/templateF.vue

@@ -12,7 +12,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageFloorTemplate/templateG.vue

@@ -12,7 +12,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageFloorTemplate/templateI.vue

@@ -79,7 +79,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view

components/cm-module/pageFloorTemplate/templateJ.vue

@@ -80,7 +80,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view

components/cm-module/pageFloorTemplate/templateK.vue

@@ -119,7 +119,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view

components/cm-module/pageTemplate/templateA.vue

@@ -24,7 +24,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateB.vue

@@ -36,7 +36,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateC.vue

@@ -36,7 +36,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateD.vue

@@ -48,7 +48,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateE.vue

@@ -24,7 +24,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateF.vue

@@ -12,7 +12,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateG.vue

@@ -12,7 +12,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateH.vue

@@ -15,7 +15,6 @@
 							</view>
 							<view class="floor-item-price" v-if="item.listType == 1">
 								<view class="floor-item-act">
-									<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 									<template v-if="userIdentity === 3">
 										<template v-if="item.product.actStatus===1">
 											<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">

components/cm-module/pageTemplate/templateI.vue

@@ -80,7 +80,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view

components/cm-module/pageTemplate/templateJ.vue

@@ -81,7 +81,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view

components/cm-module/pageTemplate/templateK.vue

@@ -120,7 +120,6 @@
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
-						<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view

pages/goods/goods-classify.vue

@@ -53,7 +53,6 @@
 							<view class="list-details-price">
 								<template v-if="userIdentity == 3">
 									<view class="floor-item-act" v-if="item.actStatus==1">
-										<view class="coupon-tags" v-if="item.couponsLogo">>优惠券</view>
 										<template>
 											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 												{{item.promotions.name}}<text v-if="item.priceFlag != 1 && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
@@ -62,13 +61,11 @@
 										</template>
 									</view>
 									<view class="floor-item-act" v-if="item.actStatus ==0">
-										<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 										<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 									</view>
 								</template>
 								<template v-else>
 									<view class="floor-item-act" v-if="item.actStatus==1">
-										<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 										<template>
 											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 												{{item.promotions.name}}
@@ -78,7 +75,6 @@
 										</template>
 									</view>
 									<view class="floor-item-act" v-if="item.actStatus ==0">
-										<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 										<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 									</view>
 								</template>

pages/goods/product.vue

@@ -109,7 +109,7 @@
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<!-- 优惠券 -->
-					<view class="product-parameter coupon" v-if="isShowButton" @click="showPopup(2)">
+					<view class="product-parameter coupon" v-if="isShowButton && productCoupon.length>0" @click="showPopup(2)">
 						<text class="title">优惠券：</text>
 						<view class="coupon">
 							<text class="tags"  v-for="(coupon, index) in productCoupon.slice(0,3)" :key="index"> 

pages/search/search.vue

@@ -69,20 +69,17 @@
 						<view class="list-details-price">
 							<template v-if="userIdentity == 3">
 								<view class="floor-item-act" v-if="item.actStatus==1">
-									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<template v-if="item.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)"></view>
 										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 									</template>
 								</view>
 								<view class="floor-item-act" v-if="item.actStatus ==0">
-									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 								</view>
 							</template>
 							<template v-else>
 								<view class="floor-item-act" v-if="item.actStatus==1">
-									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<template v-if="item.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 											{{item.promotions.name}}
@@ -92,7 +89,6 @@
 									</template>	
 								</view>
 								<view class="floor-item-act" v-if="item.actStatus ==0">
-									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 								</view>
 							</template>

pages/supplier/user/my-shop.vue

@@ -45,7 +45,6 @@
 								<text class="mclap" :class="prop.beautyActFlag =='1' ? 'indent' : ''">{{ prop.name }}</text>
 							</view>
 							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="prop.couponsLogo">优惠券</view>
 								<template v-if="userIdentity === 3">
 									<template v-if="prop.actStatus===1">
 										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
@@ -147,7 +146,6 @@
 								<text class="mclap" :class="prop.priceFlag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(prop.name)}}</text>
 							</view>
 							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="prop.couponsLogo">优惠券</view>
 								<template v-if="userIdentity === 3">
 									<template v-if="prop.actStatus===1">
 										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">

pages/tabBar/home/index.vue

@@ -126,12 +126,8 @@
 					this.logout()
 					uni.setStorageSync('unionId',error.data.unionId)
 					this.$store.commit('updateStatus',error.data)
-					if(uni.getStorageSync('isActivitySwitch')){
-						this.$store.commit('setActivity',false)
-					}else{
-						this.$store.commit('setActivity',true)
-					}
 					this.getHomeInformation()
+					
 				})
 			},		
 			GetHomeInit(){//金刚区分类
@@ -139,6 +135,13 @@
 					let data = response.data
 					this.navBarsList = data.topMenuList
 					this.couponEntry = data.couponEntry
+					if(!this.hasLogin && this.couponEntry == 1){
+						if(uni.getStorageSync('isActivitySwitch')){
+							this.$store.commit('setActivity',false)
+						}else{
+							this.$store.commit('setActivity',true)
+						}
+					}
 					this.isNavRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -189,7 +192,7 @@
 			},
 			handleClick(data){
 				const pageId = 306
-				this.$api.navigateTo(`/pages/login/register`)
+				this.$api.navigateTo(`/pages/user/coupon/coupon-collection`)
 				this.$store.commit('setActivity',data)
 				uni.setStorageSync('lockTime',Date.now())	
 				uni.setStorageSync('isActivitySwitch',true)