wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：隐藏优惠券相关内容

This commit is contained in:
wuhui_zzw 2023-12-05 15:10:12 +08:00
parent 786267f036
commit a8eb90bf7e
15 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/WaterfallsFlowItem/WaterfallsFlowItem.vue
View File

@ -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>

2
components/goodList/index.vue
View File

@ -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>

1
pages/activity/liveBroadcast/index.vue
View File

@ -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

12
pages/admin/storeDiy/index.vue
View File

@ -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">

2
pages/columnGoods/goods_coupon_list/index.vue
View File

@ -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>

2
pages/columnGoods/goods_list/index.vue
View File

@ -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>

3
pages/columnGoods/goods_search_con/index.vue
View File

@ -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">

4
pages/goods_details/index.vue
View File

@ -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}}：

2
pages/index/component/goodList.vue
View File

@ -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>

2
pages/index/index.vue
View File

@ -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>

2
pages/small_page/index.vue
View File

@ -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>

16
pages/store/home/index.vue
View File

@ -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>

2
pages/store/list/index.vue
View File

@ -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>

8
pages/user/index.vue
View File

@ -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>

10
pages/users/order_confirm/index.vue
View File

@ -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>