From a8eb90bf7eacc48e1835bee9567192bcf3304558 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 5 Dec 2023 15:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WaterfallsFlowItem/WaterfallsFlowItem.vue    |  4 ++--
 components/goodList/index.vue                    |  2 +-
 pages/activity/liveBroadcast/index.vue           |  1 +
 pages/admin/storeDiy/index.vue                   | 12 ++++++------
 pages/columnGoods/goods_coupon_list/index.vue    |  2 +-
 pages/columnGoods/goods_list/index.vue           |  2 +-
 pages/columnGoods/goods_search_con/index.vue     |  3 +--
 pages/goods_details/index.vue                    |  4 ++--
 pages/index/component/goodList.vue               |  2 +-
 pages/index/index.vue                            |  2 +-
 pages/small_page/index.vue                       |  2 +-
 pages/store/home/index.vue                       | 16 ++++++++--------
 pages/store/list/index.vue                       |  2 +-
 pages/user/index.vue                             |  8 ++++----
 pages/users/order_confirm/index.vue              | 10 ++++------
 15 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
index 131e377..1ac30be 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
@@ -20,7 +20,7 @@
 				<text v-if="item.product_type == 0 && item.merchant.type_name" class="font-bg-red b-color">{{item.merchant.type_name}}</text>
 				<text v-else-if="item.product_type == 0 && item.merchant.is_trader" class="font-bg-red b-color">自营</text>
 				<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-				<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+				<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 				<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 			</view>
 		</view>
@@ -46,7 +46,7 @@
 				<text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red b-color">{{item.merchant.type_name}}</text>
 				<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red b-color">自营</text>
 				<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-				<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+				<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 				<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 			</view>
 			<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
diff --git a/components/goodList/index.vue b/components/goodList/index.vue
index 03d4dd8..2951ca9 100644
--- a/components/goodList/index.vue
+++ b/components/goodList/index.vue
@@ -16,7 +16,7 @@
 							<text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red bt-color">{{item.merchant.type_name}}</text>
 							<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red bt-color">自营</text>
 							<text v-if="item.product_type != 0" :class="'font_bg-red bt-color type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-							<text v-if="item.issetCoupon" class="coupon">领券购买更优惠</text>
+							<!--<text v-if="item.issetCoupon" class="coupon">领券购买更优惠</text>-->
 						</view>
 						<view class='money'>￥<text class='num'>{{item.price}}</text></view>				
 				</view>
diff --git a/pages/activity/liveBroadcast/index.vue b/pages/activity/liveBroadcast/index.vue
index 6028c85..ebfb12c 100644
--- a/pages/activity/liveBroadcast/index.vue
+++ b/pages/activity/liveBroadcast/index.vue
@@ -60,6 +60,7 @@
 	import home from '@/components/home/index.vue'
 	import { HTTP_REQUEST_URL } from '@/config/app';
   import spread from "../../../libs/spread";
+  import { mapGetters } from 'vuex';
 	export default {
 		components: {
 			home
diff --git a/pages/admin/storeDiy/index.vue b/pages/admin/storeDiy/index.vue
index 9f3cc4a..9aa033b 100644
--- a/pages/admin/storeDiy/index.vue
+++ b/pages/admin/storeDiy/index.vue
@@ -63,9 +63,9 @@
 				<view class="item">
 					<view class="cont">活动</view>
 				</view>
-				<view class="item">
-					<view class="cont">领券</view>
-				</view>
+				<!--<view class="item">-->
+				<!--	<view class="cont">领券</view>-->
+				<!--</view>-->
 			</view>
 		</view>
 		<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
@@ -150,9 +150,9 @@
 					<view class="item">
 						<view class="cont">活动</view>
 					</view>
-					<view class="item">
-						<view class="cont">领券</view>
-					</view>
+					<!--<view class="item">-->
+					<!--	<view class="cont">领券</view>-->
+					<!--</view>-->
 				</view>
 				<view v-show="select.show && !navShow" class="select">
 					<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item">
diff --git a/pages/columnGoods/goods_coupon_list/index.vue b/pages/columnGoods/goods_coupon_list/index.vue
index 52a5c58..3ba2248 100644
--- a/pages/columnGoods/goods_coupon_list/index.vue
+++ b/pages/columnGoods/goods_coupon_list/index.vue
@@ -69,7 +69,7 @@
 										<text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red">{{item.merchant.type_name}}</text>
 										<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red">自营</text>
 										<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-										<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+										<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 										<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 									</view>
 									<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
diff --git a/pages/columnGoods/goods_list/index.vue b/pages/columnGoods/goods_list/index.vue
index 0f46316..c6627bf 100644
--- a/pages/columnGoods/goods_list/index.vue
+++ b/pages/columnGoods/goods_list/index.vue
@@ -54,7 +54,7 @@
 								<text v-if="item.merchant&&item.merchant.type_name && item.product_type == 0" class="font-bg-red bt-color">{{item.merchant.type_name}}</text>
 								<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red bt-color">自营</text>
 								<text v-if="item.product_type != 0" :class="'font_bg-red bt-color type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-								<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+								<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 								<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 							</view>
 							<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index 61a34c9..8cad8f1 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -88,9 +88,8 @@
 									<text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red bt-color line1">{{item.merchant.type_name}}</text>
 									<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red bt-color line1">自营</text>
 									<text v-if="item.product_type != 0" :class="'font_bg-red bt-color type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-									<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+									<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 									<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
-									<!-- <view class="ticket-big" v-if="!is_switch && item.issetCoupon">领券满{{item.issetCoupon.use_min_price}}减{{item.issetCoupon.coupon_price}}</view> -->
 								</view>
 								<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
 								<view class="company" v-if="item.merchant && hide_mer_status==0">
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 826ce66..e79dbe5 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -102,13 +102,13 @@
 									<text class="iconfont icon-xiala1"></text>
 								</view>
 							</navigator>
-							<view class='coupon acea-row row-between-wrapper skeleton-rect' @click='couponTap' style="margin-top: 20rpx;" v-if="coupon.list.length > 0">
+				<!--			<view class='coupon acea-row row-between-wrapper skeleton-rect' @click='couponTap' style="margin-top: 20rpx;" v-if="coupon.list.length > 0">
 								<view class='hide line1 acea-row'>
 									优惠券：
 									<view class='activity' v-for="(item,index) in coupon.list" :key="index">满{{item.use_min_price}}减{{item.coupon_price}}</view>
 								</view>
 								<view class='iconfont icon-jiantou'></view>
-							</view>
+							</view>-->
 						</view>
 						<view class='attribute acea-row row-between-wrapper skeleton-rect' @click="selecAttr">
 							<view class="acea-row row-between-wrapper">{{attrTxt}}：
diff --git a/pages/index/component/goodList.vue b/pages/index/component/goodList.vue
index 96ee948..b97b7d6 100644
--- a/pages/index/component/goodList.vue
+++ b/pages/index/component/goodList.vue
@@ -15,7 +15,7 @@
 								<view v-if="titleShow" class="title line2">{{ item.store_name }}</view>
 								<view class="merchant_info">
 									<view v-if="item.merchant && item.merchant.type_name" :style="'background:'+labelColor" class="font-bg-red">{{item.merchant.type_name}}</view>
-									<view class="txt" :style="'border-color:'+priceColor+';color:'+priceColor+';'" v-if="item.issetCoupon && couponShow">领券</view>
+									<!--<view class="txt" :style="'border-color:'+priceColor+';color:'+priceColor+';'" v-if="item.issetCoupon && couponShow">领券</view>-->
 									<view class="txt delivery" v-if="item.delivery_free">包邮</view>
 								</view>
 							</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bd07924..16c9743 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -149,7 +149,7 @@
 										<text v-if="item.product_type != 0" :class="'font_bg-red type' + item.product_type">
 											{{ item.product_type == 1 ? '秒杀' : item.product_type == 2 ? '预售' : item.product_type == 3 ? '助力' : item.product_type == 4 ? '拼团' : '' }}
 										</text>
-										<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+										<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 										<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 									</view>
 								</view>
diff --git a/pages/small_page/index.vue b/pages/small_page/index.vue
index 9620438..4cf1164 100644
--- a/pages/small_page/index.vue
+++ b/pages/small_page/index.vue
@@ -135,7 +135,7 @@
 											<text v-if="item.product_type != 0" :class="'font_bg-red type' + item.product_type">
 												{{ item.product_type == 1 ? '秒杀' : item.product_type == 2 ? '预售' : item.product_type == 3 ? '助力' : item.product_type == 4 ? '拼团' : '' }}
 											</text>
-											<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+											<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 											<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 										</view>
 									</view>
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 6bfc20d..8426894 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -64,9 +64,9 @@
 				<view :class="{ active: diyActive ===2 }" class="item" @click="set_where(5,2)">
 					<view class="cont">活动</view>
 				</view>
-				<view :class="{ active: diyActive == 3 }" class="item" @click="getCoupon">
-					<view class="cont">领券</view>
-				</view>
+				<!--<view :class="{ active: diyActive == 3 }" class="item" @click="getCoupon">-->
+				<!--	<view class="cont">领券</view>-->
+				<!--</view>-->
 			</view>
 		</view>
 		<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
@@ -152,9 +152,9 @@
 					<view :class="{ active: diyActive == 2 }" class="item" @click="set_where(5,2)">
 						<view class="cont">活动</view>
 					</view>
-					<view :class="{ active: diyActive == 3 }" class="item" @click="getCoupon">
-						<view class="cont">领券</view>
-					</view>
+					<!--<view :class="{ active: diyActive == 3 }" class="item" @click="getCoupon">-->
+					<!--	<view class="cont">领券</view>-->
+					<!--</view>-->
 				</view>
 				<view v-show="select.show && !navShow" class="select">
 					<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item"
@@ -234,7 +234,7 @@
 										</view>
 										<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1" class="item_tags">
 											<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-											<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+											<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 											<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 										</view>
 										<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
@@ -307,7 +307,7 @@
 									</view>
 									<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1" class="item_tags">
 										<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-										<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+										<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 										<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 									</view>
 									<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
diff --git a/pages/store/list/index.vue b/pages/store/list/index.vue
index ef57224..cf6a58a 100644
--- a/pages/store/list/index.vue
+++ b/pages/store/list/index.vue
@@ -59,7 +59,7 @@
 								</view>
 								<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1" class="item_tags">
 									<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
-									<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+									<!--<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>-->
 									<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 								</view>
 								<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index e2967bf..ab893d7 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -72,10 +72,10 @@
 							<text class="num">{{userInfo.total_visit_product || 0}}</text>
 							<view class="txt">浏览记录</view>
 						</view>
-						<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
-							<text class="num">{{userInfo.total_coupon || 0}}</text>
-							<view class="txt">优惠券</view>
-						</view>
+						<!--<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">-->
+						<!--	<text class="num">{{userInfo.total_coupon || 0}}</text>-->
+						<!--	<view class="txt">优惠券</view>-->
+						<!--</view>-->
 					</view>
 					<navigator hover-class="none" :url="userInfo.is_svip > 0 ? '/pages/annex/vip_center/index' : '/pages/annex/vip_paid/index'" class="cardVipA acea-row row-between-wrapper" v-if="svip_switch_status == 1">
 						<image class="svip_user" src="/static/images/svip_user.png"></image>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 8cbf8a0..eebc2d0 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -152,8 +152,7 @@
 							</view>
 							<view class='discount' v-else>免运费</view>
 						</view>
-						<view class='item acea-row row-between-wrapper'
-							v-if="!seckillId && order_type != 3 && order_type != 4 && item.order.enabledCoupon">
+						<!--<view class='item acea-row row-between-wrapper' v-if="!seckillId && order_type != 3 && order_type != 4 && item.order.enabledCoupon">
 							<view>店铺优惠券</view>
 							<block v-if="item.coupon.length>0">
 								<view class='discount' @tap='couponTap(item,index)'>
@@ -165,7 +164,7 @@
 							<block v-else>
 								<view class='discount'>暂无优惠券</view>
 							</block>
-						</view>
+						</view>-->
 						<view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
 							<view>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
 							<view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
@@ -368,8 +367,7 @@
 						</view>
 					</view>-->
 				</view>
-				<view class='item acea-row row-between-wrapper'
-					v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
+				<!--<view class='item acea-row row-between-wrapper' v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
 					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
 					<block v-if="platformCoupon.length > 0">
 						<view class='discount money' @tap='couponTap2(platformCoupon,0)'>
@@ -381,7 +379,7 @@
 					<block v-else>
 						<view class='discount'>暂无优惠券</view>
 					</block>
-				</view>
+				</view>-->
 				<view class='item acea-row row-between-wrapper' v-if="priceGroup.storePostage > 0">
 					<view>运费：</view>
 					<view class='money'>+￥{{priceGroup.storePostage}}</view>