From 46279dd3d80d41de1c1c3949437ff2978d9d2e2d Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 28 Oct 2021 16:48:12 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=8A=A5=E5=8D=95=E6=A8=A1=E5=9D=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=8A=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=8A=E6=9D=83=E8=AF=81=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8A=A5=E5=8D=95=E5=85=BC=E5=AE=B9=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                              |   70 +-
 components/goods-list/goods-list.vue |  121 ++-
 pages/equity/index.vue               |   67 +-
 pages/goods/details.vue              | 1094 ++++++++++++++------------
 pages/goods/lists.vue                |   20 +-
 pages/goods/management.vue           |    2 +-
 6 files changed, 789 insertions(+), 585 deletions(-)

diff --git a/App.vue b/App.vue
index 4819380..f82f146 100644
--- a/App.vue
+++ b/App.vue
@@ -1,36 +1,44 @@
 <script>
-export default {
-	onLaunch() {
-		// if (typeof WeixinJSBridge == 'object' && typeof WeixinJSBridge.invoke == 'function') {
-		// 	handleFontSize()
-		// } else {
-		// 	document.addEventListener('WeixinJSBridgeReady', handleFontSize, false);
-		// }
-		// function handleFontSize() {
-		// 	// 设置网页字体为默认大小
-		// 	WeixinJSBridge.invoke('setFontSizeCallback', { fontSize: 0 })
-		// 	// 重写设置网页字体大小的事件
-		// 	WeixinJSBridge.on('menu:setfont', function() {
-		// 		WeixinJSBridge.invoke('setFontSizeCallback', { fontSize: 0 })
-		// 	})
-		// }
-	},
-	onShow() {
-		console.log('App Show');
-	},
-	onHide() {
-		console.log('App Hide');
-	},
-	globalData: {
-		mainColor: 'white'
-	}
-};
+	export default {
+		onLaunch() {
+			//#ifdef H5
+					if (typeof WeixinJSBridge == 'object' && typeof WeixinJSBridge.invoke == 'function') {
+						handleFontSize()
+					} else {
+						document.addEventListener('WeixinJSBridgeReady', handleFontSize, false);
+					}
+
+					function handleFontSize() {
+						// 设置网页字体为默认大小
+						WeixinJSBridge.invoke('setFontSizeCallback', {
+							fontSize: 0
+						})
+						// 重写设置网页字体大小的事件
+						WeixinJSBridge.on('menu:setfont', function() {
+							WeixinJSBridge.invoke('setFontSizeCallback', {
+								fontSize: 0
+							})
+						})
+					}
+			//#endif
+		},
+		onShow() {
+			console.log('App Show');
+		},
+		onHide() {
+			console.log('App Hide');
+		},
+		globalData: {
+			mainColor: 'white'
+		}
+	};
 </script>
 
 <style lang="scss">
-@import 'uview-ui/index.scss';
-page {
-	background: #f5f5f5;
-	-webkit-text-size-adjust: 100% !important;
-}
+	@import 'uview-ui/index.scss';
+
+	page {
+		background: #f5f5f5;
+		-webkit-text-size-adjust: 100% !important;
+	}
 </style>
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index 0f052ca..02ce89a 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -1,4 +1,3 @@
-
 <template>
 	<view class="goods--list">
 		<block v-if="list.length > 0">
@@ -6,8 +5,18 @@
 				<view class="cover">
 					<image class="cover--src" :src="item.cover" mode="aspectFill" />
 				</view>
+				<template v-if='notag === ""'>
+					<span class='is_self'
+						v-if='item.specal_tags.is_self'>{{item.specal_tags.is_self}}</span>
+				</template>
 				<view class="content">
-					<view class="title">{{item.name}}</view>
+					<view class="title">
+						<template v-if='notag === ""'>
+							<span class='is_allow_values'
+								v-if='item.specal_tags.is_allow_values'>{{item.specal_tags.is_allow_values}}</span>
+						</template>
+						{{item.name}}
+					</view>
 					<view class="content-flex">
 						<view class="price eb" v-if="priceType === 'EB'">
 							{{item.price}}<text>易币</text>
@@ -34,52 +43,73 @@
 </template>
 
 <script>
-export default {
-	name	: 'goodsList',
-	props	: {
-		// 数据列表
-		list: {
-			type	: Array,
-			default	: () => {
-				return new Array
+	export default {
+		name: 'goodsList',
+		props: {
+			notag: {
+				type: String,
+				default: ''
+			},
+			// 数据列表
+			list: {
+				type: Array,
+				default: () => {
+					return new Array
+				}
+			},
+			// 价格类型
+			priceType: {
+				type: String,
+				default: 'EB'
+			},
+			// 列表空提示
+			toast: {
+				type: String,
+				default: '暂无商品数据 -_-!'
 			}
 		},
-		// 价格类型
-		priceType: {
-			type	: String,
-			default	: 'EB'
-		},
-		// 列表空提示
-		toast	: {
-			type	: String,
-			default	: '暂无商品数据 -_-!'
+		methods: {
+			goods(e) {
+				this.$emit('on-goods', e)
+			}
 		}
-	},
-	methods:{
-		goods(e){
-			this.$emit('on-goods', e)
-		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-	.goods--list{
+	.goods--list {
 		padding: calc(#{$padding} - 10rpx);
 		display: flex;
 		flex-wrap: wrap;
-		.goods--item{
+
+		.goods--item {
 			background: white;
 			box-sizing: border-box;
 			width: calc(50% - 20rpx);
 			margin: 10rpx;
 			border-radius: $radius/2;
 			overflow: hidden;
-			.cover{
+			position: relative;
+
+			.is_self {
+				position: absolute;
+				top: 0;
+				right: 20rpx;
+				background-image: linear-gradient(to bottom, #ee4c47, #9e312f);
+				// background-color: #ee4c47;
+				box-shadow: 0 4rpx 10rpx 2rpx rgba($color: #000, $alpha: .3);
+				color: #fff;
+				font-size: 26;
+				padding: 2rpx 20rpx 10rpx 20rpx;
+				border-radius: 0 0 50rpx 50rpx;
+			}
+
+			.cover {
 				position: relative;
 				width: 100%;
 				padding-top: 100%;
-				.cover--src{
+
+				.cover--src {
 					position: absolute;
 					height: 100%;
 					width: 100%;
@@ -87,34 +117,50 @@ export default {
 					left: 0;
 				}
 			}
-			.content{
+
+			.content {
 				padding: $padding/2;
-				.title{
+
+				.title {
 					font-size: $title-size-lg;
 					line-height: 40rpx;
 					height: 80rpx;
 					text-align: justify;
 					@extend .ellipsis;
+
+					.is_allow_values {
+						color: #fff;
+						background-image: linear-gradient(to left, $main-color, $mian-color-light);
+						padding: 2rpx 14rpx;
+						font-size: 20rpx;
+						text-align: center;
+						border-radius: 30rpx;
+						margin-right: 20rpx;
+					}
 				}
-				.content-flex{
+
+				.content-flex {
 					width: 100%;
 					display: flex;
 					justify-content: space-between;
 					padding-top: $padding/2;
-					.price{
+
+					.price {
 						width: 50%;
 						color: $text-price;
 						font-weight: bold;
 						font-size: $title-size;
 						@extend .nowrap;
-						text{
+
+						text {
 							font-size: $title-size-sm;
 							font-weight: normal;
 							padding-left: $padding/4;
 							line-height: 50rpx;
 						}
 					}
-					.sales{
+
+					.sales {
 						width: 50%;
 						font-size: $title-size-sm;
 						color: $text-gray;
@@ -126,8 +172,9 @@ export default {
 			}
 		}
 	}
+
 	// 数据空
-	.goods--null{
+	.goods--null {
 		width: 100%;
 		padding: 200rpx 0;
 		text-align: center;
diff --git a/pages/equity/index.vue b/pages/equity/index.vue
index 2e48109..67b60a7 100644
--- a/pages/equity/index.vue
+++ b/pages/equity/index.vue
@@ -100,7 +100,7 @@
 					<swiper class="banner-swiper" indicator-color="#e93340" indicator-active-color="#f8f8f8"
 						indicator-dots autoplay>
 						<swiper-item v-for="(item, index) in banners" :key="index">
-							<image class="cover" :src="item.cover" mode="aspectFill"></image>
+							<image class="cover" :src="item.cover" mode="aspectFill" @click="swiperClick(item.url)" />
 						</swiper-item>
 					</swiper>
 				</view>
@@ -126,8 +126,12 @@
 			<view class="goods-push" v-if="JSON.stringify(position) != '{}'">
 				<view class="itme item-mian" @click="onGoods(position.one)">
 					<image class="cover" :src="position.one.cover" mode="aspectFill"></image>
-					<view class="title">{{position.one.name}}</view>
+					<view class="title">	
+						<span class='is_allow_values' v-if='position.one.specal_tags.is_allow_values'>{{position.one.specal_tags.is_allow_values}}</span>
+						{{position.one.name}}
+					</view>
 					<view class="price"><text>¥</text>{{position.one.original_price}}</view>
+					<span class='is_self' v-if='position.one.specal_tags.is_self'>{{position.one.specal_tags.is_self}}</span>
 				</view>
 				<view class="itme">
 					<view class="itme-list" v-for="(item, index) in position.two" :key="index" @click="onGoods(item)">
@@ -196,6 +200,9 @@
 	import goodsList from '@/components/goods-list/goods-list'
 	import industryList from '@/components/industry-list/industry-list'
 	import userAuth from '@/public/userAuth'
+	import {
+		config
+	} from '@/apis/index.js'
 	export default {
 		comments: {
 			goodsList,
@@ -236,7 +243,8 @@
 				busList: [],
 				busPage: 1,
 				// 分页
-				pageStatus: ''
+				pageStatus: '',
+				imgUrl: config.apiUrls
 			};
 		},
 		created() {
@@ -269,6 +277,14 @@
 						break
 				}
 			},
+			// 点击轮播图
+			swiperClick(url) {
+				if (url === 'goBaoDanList') {
+					uni.navigateTo({
+						url: 'pages/goods/lists?type=baodan'
+					})
+				}
+			},
 			// 领取，更多优惠券
 			onCoupons(type, id, index) {
 				let token = this.$store.getters.getToken
@@ -341,6 +357,10 @@
 				mall().then(res => {
 					this.classify = res.categories.slice(0, 9)
 					this.banners = res.banners
+					this.banners = [...this.banners, {
+						cover: config.apiUrls + 'images/baodan-banner.png',
+						url: 'goBaoDanList'
+					}]
 					this.coupons = res.coupons
 					this.position = res.positions
 				}).catch(err => {
@@ -470,6 +490,8 @@
 				margin: $margin/2;
 				width: calc(20% - #{$margin});
 				text-align: center;
+				position: relative;
+
 
 				.cover {
 					width: 98rpx;
@@ -482,6 +504,15 @@
 					line-height: 40rpx;
 					font-size: $title-size-sm;
 					color: $text-gray;
+					.is_allow_values {
+						color: #fff;
+						background-image: linear-gradient(to left,$main-color,$mian-color-light);
+						padding: 2rpx 14rpx;
+						font-size: 20rpx;
+						text-align: center;
+						border-radius: 30rpx;
+						margin-right: 20rpx;
+					}
 				}
 			}
 		}
@@ -506,12 +537,34 @@
 			text-align: center;
 			border-right: solid 1rpx $border-color;
 			@extend .vertical;
-
+			position: relative;
+			
+			.is_self {
+				position: absolute;
+				top: 14rpx;
+				right: 20rpx;
+				background-image: linear-gradient(to bottom, #ee4c47, #9e312f);
+				// background-color: #ee4c47;
+				box-shadow: 0 4rpx 10rpx 2rpx rgba($color: #000, $alpha: .3);
+				color: #fff;
+				font-size: 26;
+				padding: 2rpx 20rpx 10rpx 20rpx;
+				border-radius: 0 0 50rpx 50rpx;
+			}
 			.title {
 				font-weight: bold;
 				font-size: $title-size;
 				@extend .nowrap;
 				line-height: 50rpx;
+				.is_allow_values {
+					color: #fff;
+					background-image: linear-gradient(to left,$main-color,$mian-color-light);
+					padding: 2rpx 14rpx;
+					font-size: 20rpx;
+					text-align: center;
+					border-radius: 30rpx;
+					margin-right: 20rpx;
+				}
 			}
 
 			.price {
@@ -527,9 +580,9 @@
 			}
 
 			.cover {
-				margin-bottom: 30rpx;
-				width: 220rpx;
-				height: 280rpx;
+				margin-bottom: 20rpx;
+				width: 320rpx;
+				height: 300rpx;
 				vertical-align: top;
 			}
 		}
diff --git a/pages/goods/details.vue b/pages/goods/details.vue
index 68a214d..582889b 100644
--- a/pages/goods/details.vue
+++ b/pages/goods/details.vue
@@ -5,7 +5,7 @@
 			<swiper class="swiper" indicator-dots indicator-active-color="#c82626">
 				<block v-if="goodsObj.pictures.length > 0">
 					<swiper-item v-for="(item, index) in goodsObj.pictures" :key="index">
-						<image class="swiper-item" :src="item" mode="aspectFill"/>
+						<image class="swiper-item" :src="item" mode="aspectFill" />
 					</swiper-item>
 				</block>
 			</swiper>
@@ -13,52 +13,61 @@
 		<!-- 产品详情 -->
 		<view class="goods-content">
 			<view class="header">
-                <view class="flex-box">
-                	<view class="price"><text>￥</text>{{goodsObj.price.show}}</view>
-                	<view class="sales">累计易货{{goodsObj.sales}}次</view>
-                </view>
-                <view class="coupon" v-if="couponSee.length > 0" @click="couponsOpne">
-                    <view class="coupon-list" v-for="(item, index) in couponSee" :key="index">
-                        <view class="coupon-label">
-                            {{item.title}}
-                        </view>
-                    </view>
-                    <view class="coupon-btn">领券<image class="coupon-btn-img" src="../../static/icons/goods_row.png" mode="aspectFill"></image></view>
-                </view>
-				<view class="title"><view class="title-hot">热卖</view>{{goodsObj.name}}</view>
+				<view class="flex-box">
+					<view class="price"><text>￥</text>{{goodsObj.price.show}}</view>
+					<view class="sales">累计交易{{goodsObj.sales}}次</view>
+				</view>
+				<view class="coupon" v-if="couponSee.length > 0" @click="couponsOpne">
+					<view class="coupon-list" v-for="(item, index) in couponSee" :key="index">
+						<view class="coupon-label">
+							{{item.title}}
+						</view>
+					</view>
+					<view class="coupon-btn">领券<image class="coupon-btn-img" src="../../static/icons/goods_row.png"
+							mode="aspectFill"></image>
+					</view>
+				</view>
+				<view class="title">
+					<view class="title-hot" v-if="goodsObj.specal_tags.is_allow_values">{{goodsObj.specal_tags.is_allow_values}}</view>
+					<view class="title-hot" v-if="goodsObj.specal_tags.is_self">{{goodsObj.specal_tags.is_self}}</view>
+					{{goodsObj.name}}
+				</view>
 				<!-- <view class="sub-title">{{goodsObj.description}}</view> -->
 			</view>
-            <!-- 商家信息 -->
-            <view class="store">
-                <image class="logo" :src="goodsObj.shop.cover" mode="aspectFill"></image>
-            	<view class="store-cont">
-            	    <view class="store-title">{{goodsObj.shop.name}}</view>
-            	    <view class="rate">
-            	    	<uni-rate
-            	    		:readonly="true"
-            	    		color="#ddd"
-            	    		active-color="#c82626"
-            	    		:value="goodsObj.company.star"
-            	    		:size="14"
-            	    	/>
-            	    </view>
-                    <view class="openbtn" @click="onOpenWechat">进店<image class="openbtn-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image></view>
-            	</view>
-                <view class="tooSee">
-                    <view class="tooSee-label" @click="$Router.push({name: 'GoodsChain', params: {id: goodsObj.goods_id}})">
-                        区块链证书
-                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
-                    </view>
-                    <view class="tooSee-label" @click="$Router.push({name: 'GoodsAttestation', params: {id: goodsObj.goods_id}})">
-                        商品认证
-                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
-                    </view>
-                    <view class="tooSee-label" @click="$Router.push({name: 'GoodstracedTo', params: {id: goodsObj.goods_id}})">
-                        商品溯源
-                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
-                    </view>
-                </view>
-            </view>
+			<!-- 商家信息 -->
+			<view class="store">
+				<image class="logo" :src="goodsObj.shop.cover" mode="aspectFill"></image>
+				<view class="store-cont">
+					<view class="store-title">{{goodsObj.shop.name}}</view>
+					<view class="rate">
+						<uni-rate :readonly="true" color="#ddd" active-color="#c82626" :value="goodsObj.company.star"
+							:size="14" />
+					</view>
+					<view class="openbtn" @click="onOpenWechat">进店<image class="openbtn-img"
+							src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+					</view>
+				</view>
+				<view class="tooSee">
+					<view class="tooSee-label"
+						@click="$Router.push({name: 'GoodsChain', params: {id: goodsObj.goods_id}})">
+						区块链证书
+						<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png"
+							mode="aspectFill"></image>
+					</view>
+					<view class="tooSee-label"
+						@click="$Router.push({name: 'GoodsAttestation', params: {id: goodsObj.goods_id}})">
+						商品认证
+						<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png"
+							mode="aspectFill"></image>
+					</view>
+					<view class="tooSee-label"
+						@click="$Router.push({name: 'GoodstracedTo', params: {id: goodsObj.goods_id}})">
+						商品溯源
+						<image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png"
+							mode="aspectFill"></image>
+					</view>
+				</view>
+			</view>
 			<!-- 产品规格 -->
 			<view class="size">
 				<view class="size-item nowrap">
@@ -71,11 +80,13 @@
 				</view>
 				<view class="size-item nowrap" v-if="goodsObj.services.length > 0">
 					<label class="title">服务</label>
-                    <view class="goods-serve" @click="serveOpne">
-                        <image class="goods-serve-img" src="../../static/icons/goods_buy.png" mode="aspectFill"></image>
-                        <view class="nowrap goods-serve-name"><text v-for="(item, index) in goodsObj.services">{{item.name}}</text></view>
-                        <image class="goods-serve-img" src="../../static/icons/goods_spot.png" mode="aspectFill"></image>
-                    </view>
+					<view class="goods-serve" @click="serveOpne">
+						<image class="goods-serve-img" src="../../static/icons/goods_buy.png" mode="aspectFill"></image>
+						<view class="nowrap goods-serve-name"><text
+								v-for="(item, index) in goodsObj.services">{{item.name}}</text></view>
+						<image class="goods-serve-img" src="../../static/icons/goods_spot.png" mode="aspectFill">
+						</image>
+					</view>
 				</view>
 			</view>
 			<!-- 产品详情 -->
@@ -89,118 +100,121 @@
 		<view class="footer">
 			<button class="btn" size="default" @click="buyGoods">立即购买</button>
 		</view>
-        
-        <!-- 优惠券弹出 -->
-        <uni-popup ref="couponsPopup">
-        	<view class="coupons-popup">
-        		<view class="coupons-header">
-        			<view class="title">优惠券</view>
-                    <image @click="couponsClose" class="close" src="../../static/icons/goods_close.png" mode=""></image>
-        		</view>
-                <view class="coupons-cont">
-                    <view class="coupons-name">
-                        可领取的优惠券
-                    </view>
-                    <view class="coupons-list" v-for="(item , index) in coupons" :key="index">
-                        <view class="coupons-tips" v-if="item.type">
-                            <!-- value == 1服务券    value == 2代金券   value == 3提货券 -->
-                            <text class="coupons-tips-text" v-if="item.type.value == '1'">服务券</text>
-                            <text class="coupons-tips-text" v-else-if="item.type.value == '2'">代金券</text>
-                            <text class="coupons-tips-text" v-else>提货券</text>
-                        </view>
-                        <view class="coupons-left" v-if="item.type.value == '2'">
-                            <view class="coupons-number">
-                                <text>￥</text>{{item.price}}
-                            </view>
-                            <view class="coupons-full">
-                                满{{item.full}}可用
-                            </view>
-                        </view>
-												<view class="coupons-left" v-if="item.type.value == '1' || item.type.value =='3'">
-												    <image :src="item.cover" mode="aspectFill" class="coupon-left-img"  />
-												</view>
-                        <view class="coupons-left" v-else-if="item.type.value == '3'">
-                            <view class="coupons-number coupons-small">
-                                提货券
-                            </view>
-                        </view>
-                        <view class="coupons-center">
-                            <view class="nowrap coupons-title">
-                                {{item.title}}
-                            </view>
-                            <view class="coupons-time" v-if="item.time">
-                                {{item.time.interval}}
-                            </view>
-                        </view>
-                        
-                        <view v-if="item.can.get" class="coupons-right" @click="drawCoupons(item.coupon_id, index)">
-                            领取
-                        </view>
-                        <view v-else class="coupons-right coupons-right-active">
-                            已领取
-                        </view>
-                    </view>
-                </view>
-                <view class="coupons-true" @click="couponsClose">
-                    确定
-                </view>
-        	</view>
-        </uni-popup>
-        
-        <!-- 服务保障弹出 -->
-        <uni-popup ref="servePopup">
-        	<view class="coupons-popup">
-        		<view class="coupons-header">
-        			<view class="title">保障</view>
-                    <image @click="serveClose" class="close" src="../../static/icons/goods_close.png" mode=""></image>
-        		</view>
-                <view class="serve-cont">
-                    <view class="serve-label" v-for="(item, index) in goodsObj.services" :key="index">
-                        <view class="serve-label-name">
-                            {{item.name}}
-                        </view>
-                        <view class="serve-label-text">
-                            {{item.content}}
-                        </view>
-                    </view>
-                </view>
-                <view class="coupons-true" @click="serveClose">
-                    确定
-                </view>
-        	</view>
-        </uni-popup>
+
+		<!-- 优惠券弹出 -->
+		<uni-popup ref="couponsPopup">
+			<view class="coupons-popup">
+				<view class="coupons-header">
+					<view class="title">优惠券</view>
+					<image @click="couponsClose" class="close" src="../../static/icons/goods_close.png" mode=""></image>
+				</view>
+				<view class="coupons-cont">
+					<view class="coupons-name">
+						可领取的优惠券
+					</view>
+					<view class="coupons-list" v-for="(item , index) in coupons" :key="index">
+						<view class="coupons-tips" v-if="item.type">
+							<!-- value == 1服务券    value == 2代金券   value == 3提货券 -->
+							<text class="coupons-tips-text" v-if="item.type.value == '1'">服务券</text>
+							<text class="coupons-tips-text" v-else-if="item.type.value == '2'">代金券</text>
+							<text class="coupons-tips-text" v-else>提货券</text>
+						</view>
+						<view class="coupons-left" v-if="item.type.value == '2'">
+							<view class="coupons-number">
+								<text>￥</text>{{item.price}}
+							</view>
+							<view class="coupons-full">
+								满{{item.full}}可用
+							</view>
+						</view>
+						<view class="coupons-left" v-if="item.type.value == '1' || item.type.value =='3'">
+							<image :src="item.cover" mode="aspectFill" class="coupon-left-img" />
+						</view>
+						<view class="coupons-left" v-else-if="item.type.value == '3'">
+							<view class="coupons-number coupons-small">
+								提货券
+							</view>
+						</view>
+						<view class="coupons-center">
+							<view class="nowrap coupons-title">
+								{{item.title}}
+							</view>
+							<view class="coupons-time" v-if="item.time">
+								{{item.time.interval}}
+							</view>
+						</view>
+
+						<view v-if="item.can.get" class="coupons-right" @click="drawCoupons(item.coupon_id, index)">
+							领取
+						</view>
+						<view v-else class="coupons-right coupons-right-active">
+							已领取
+						</view>
+					</view>
+				</view>
+				<view class="coupons-true" @click="couponsClose">
+					确定
+				</view>
+			</view>
+		</uni-popup>
+
+		<!-- 服务保障弹出 -->
+		<uni-popup ref="servePopup">
+			<view class="coupons-popup">
+				<view class="coupons-header">
+					<view class="title">保障</view>
+					<image @click="serveClose" class="close" src="../../static/icons/goods_close.png" mode=""></image>
+				</view>
+				<view class="serve-cont">
+					<view class="serve-label" v-for="(item, index) in goodsObj.services" :key="index">
+						<view class="serve-label-name">
+							{{item.name}}
+						</view>
+						<view class="serve-label-text">
+							{{item.content}}
+						</view>
+					</view>
+				</view>
+				<view class="coupons-true" @click="serveClose">
+					确定
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import { goods, managesCoupons } from '@/apis/interfaces/goods'
+	import {
+		goods,
+		managesCoupons
+	} from '@/apis/interfaces/goods'
 	import userAuth from '@/public/userAuth'
 	export default {
 		data() {
 			return {
-				loding	    : true,
-				goodsObj    : {},
-				identity    : '',
-				company	    : {},
-                coupons     : {},
-                couponSee   : ""
+				loding: true,
+				goodsObj: {},
+				identity: '',
+				company: {},
+				coupons: {},
+				couponSee: ""
 			};
 		},
 		created() {
-			goods(this.$Route.query.id).then(res=>{
-				this.loding   = false
+			goods(this.$Route.query.id).then(res => {
+				this.loding = false
 				this.goodsObj = res
 				this.identity = res.identity.id || ''
-				this.company  = res.company
-			    this.couponSee= res.coupons.slice(0, 3)
-			    this.coupons  = res.coupons
+				this.company = res.company
+				this.couponSee = res.coupons.slice(0, 3)
+				this.coupons = res.coupons
 			})
 		},
-		methods:{
+		methods: {
 			// 提交购买单
-			buyGoods(){
+			buyGoods() {
 				let token = this.$store.getters.getToken
-				if(token == ''){
+				if (token == '') {
 					let userLogin = new userAuth()
 					userLogin.Login()
 					return
@@ -217,227 +231,249 @@
 				})
 			},
 			// 打开微信小程序
-			onOpenWechat(){
+			onOpenWechat() {
 				plus.share.getServices(res => {
 					let sweixin = null;
-					for(let val of res){
-						if(val.id === 'weixin'){
+					for (let val of res) {
+						if (val.id === 'weixin') {
 							sweixin = val
 						}
 					}
 					/**  以此为例子 显示跳转引导页
-					*    'index_4'
-					*     index   跳小程序企业首页
-					*     4       企业id
-					**/
-					if(sweixin != null){
+					 *    'index_4'
+					 *     index   跳小程序企业首页
+					 *     4       企业id
+					 **/
+					if (sweixin != null) {
 						sweixin.launchMiniProgram({
-							id	: this.company.original_id,
+							id: this.company.original_id,
 							path: 'pages/login/guide?scene=index_' + this.company.company_id
 						})
-					}else{
+					} else {
 						uni.showToast({
 							title: '当前环境不支持打开微信小程序',
-							icon : 'none'
+							icon: 'none'
 						})
 					}
 				})
 			},
-            
-            // 领取优惠券
-            drawCoupons(id){
+
+			// 领取优惠券
+			drawCoupons(id) {
 				let token = this.$store.getters.getToken
-				if(token == ''){
+				if (token == '') {
 					let userLogin = new userAuth()
 					userLogin.Login()
 					return
 				}
-                managesCoupons(id).then(res=>{
-                	uni.showToast({
-                	    title: '领取成功',
-                	    type: 'primary',
-                	    duration: 3000
-                	})
-                }).catch(err => {
+				managesCoupons(id).then(res => {
 					uni.showToast({
-						icon : 'none',
+						title: '领取成功',
+						type: 'primary',
+						duration: 3000
+					})
+				}).catch(err => {
+					uni.showToast({
+						icon: 'none',
 						title: err.message
 					})
 				})
-            },
-            
-            // 选择优惠券-显示
-            couponsOpne(){
-            	this.$refs.couponsPopup.open('bottom')
-            },
-            
-            // 选择优惠券-隐藏
-            couponsClose(){
-            	this.$refs.couponsPopup.close()
-            },
-            
-            // 查看保障服务-显示
-            serveOpne(){
-            	this.$refs.servePopup.open('bottom')
-            },
-            
-            // 查看保障服务-隐藏
-            serveClose() {
-                this.$refs.servePopup.close()
-            }
+			},
+
+			// 选择优惠券-显示
+			couponsOpne() {
+				this.$refs.couponsPopup.open('bottom')
+			},
+
+			// 选择优惠券-隐藏
+			couponsClose() {
+				this.$refs.couponsPopup.close()
+			},
+
+			// 查看保障服务-显示
+			serveOpne() {
+				this.$refs.servePopup.open('bottom')
+			},
+
+			// 查看保障服务-隐藏
+			serveClose() {
+				this.$refs.servePopup.close()
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.content{
+	.content {
 		position: relative;
 		padding-top: 100%;
-		
+
 	}
+
 	// 轮播图
-	.goods-covers{
+	.goods-covers {
 		position: fixed;
 		top: 0;
 		left: 0;
 		z-index: 1;
 		width: 100%;
 		padding-top: 100%;
-		.swiper{
+
+		.swiper {
 			position: absolute;
 			top: 0;
 			left: 0;
 			width: 100%;
 			height: 100%;
-			.swiper-item{
+
+			.swiper-item {
 				width: 100%;
 				height: 100%;
 			}
 		}
 	}
+
 	// 商品详情
-	.goods-content{
+	.goods-content {
 		position: relative;
 		z-index: 2;
 		background-color: white;
 		border-radius: $radius $radius 0 0;
 		padding-bottom: calc((#{$padding} * 2) + (env(safe-area-inset-bottom) / 2) + 90rpx);
 		padding-bottom: calc((#{$padding} * 2) + (constant(safe-area-inset-bottom) / 2) + 90rpx);
+
 		// 详情
-		.header{
+		.header {
 			padding: 0 $padding $padding;
-			.title{
+
+			.title {
 				font-size: $title-size;
 				font-weight: bold;
 				line-height: 50rpx;
-                .title-hot {
+
+				.title-hot {
 					display: inline-block;
-                    background-color: #fee195;
-                    font-size: 24rpx;
-                    border-radius: 50rpx;
-                    padding: 0 10rpx;
-                    height: 34rpx;
-                    line-height: 36rpx;
-                    margin: 6rpx 10rpx 0 0;
-                }
+					background-image: linear-gradient(to left,#fee195,#fee195);
+					font-size: 24rpx;
+					border-radius: 50rpx;
+					padding: 0 10rpx;
+					height: 34rpx;
+					line-height: 36rpx;
+					margin: 6rpx 10rpx 0 0;
+				}
 			}
-			.sub-title{
+
+			.sub-title {
 				line-height: 40rpx;
 				font-size: $title-size-sm;
 				color: $text-gray;
 				padding-bottom: $padding/3;
 			}
-			.flex-box{
+
+			.flex-box {
 				display: flex;
 				justify-content: space-between;
 				line-height: 90rpx;
-				.price{
+
+				.price {
 					font-weight: bold;
 					color: $text-price;
 					font-size: $title-size + 14;
-					text{
+
+					text {
 						font-size: 70%;
 					}
+
 					width: calc(60% - #{$padding});
 				}
-				.sales{
+
+				.sales {
 					font-size: $title-size-sm;
 					color: $text-gray;
 					width: 40%;
 					text-align: right;
 				}
 			}
-            
-            // 新增优惠券
-            .coupon {
-                background-color: #fef2f2;
-                color: #e1293f;
-                border-radius: 8rpx;
-                border: 1rpx solid #ffe5e5;
-                padding: $padding - 15;
-                box-sizing: border-box;
-                display: flex;
-                position: relative;
-                margin-bottom: $margin - 10;
-                .coupon-list {
-                    font-size: 22rpx;
-                    .coupon-label {
-                        display: inline-block;
-                        border: 1rpx solid #e998a1;
-                        border-radius: 50rpx;
-                        padding: 0 15rpx;
-                        height: 34rpx;
-                        line-height: 34rpx;
-                        margin-right: $margin - 10;
-                    }
-                }
-                .coupon-btn {
-                    position: absolute;
-                    right: $padding - 20;
-                    top: 0;
-                    line-height: 60rpx;
-                    font-size: 24rpx;
-                    display: flex;
-                    font-weight: 700;
-                    .coupon-btn-img {
-                        width: 22rpx;
-                        height: 22rpx;
-                        margin: 20rpx 0 0 4rpx;
-                    }
-                }
-            }
+
+			// 新增优惠券
+			.coupon {
+				background-color: #fef2f2;
+				color: #e1293f;
+				border-radius: 8rpx;
+				border: 1rpx solid #ffe5e5;
+				padding: $padding - 15;
+				box-sizing: border-box;
+				display: flex;
+				position: relative;
+				margin-bottom: $margin - 10;
+
+				.coupon-list {
+					font-size: 22rpx;
+
+					.coupon-label {
+						display: inline-block;
+						border: 1rpx solid #e998a1;
+						border-radius: 50rpx;
+						padding: 0 15rpx;
+						height: 34rpx;
+						line-height: 34rpx;
+						margin-right: $margin - 10;
+					}
+				}
+
+				.coupon-btn {
+					position: absolute;
+					right: $padding - 20;
+					top: 0;
+					line-height: 60rpx;
+					font-size: 24rpx;
+					display: flex;
+					font-weight: 700;
+
+					.coupon-btn-img {
+						width: 22rpx;
+						height: 22rpx;
+						margin: 20rpx 0 0 4rpx;
+					}
+				}
+			}
 		}
-            
-        // 新增服务
-        .goods-serve {
-            display: flex;
-            .goods-serve-img {
-                width: 36rpx;
-                height: 36rpx;
-                margin-top: 26rpx;
-            }
-            .goods-serve-name {
-                margin: 0 30rpx 0 20rpx;
-                width: calc(100% - 122rpx);
-                text {
-                    padding-right: $padding;
-                    position: relative;
-                    &:last-child {
-                        padding-right: 0;
-                    }
-                }
-            }
-        }
-        
+
+		// 新增服务
+		.goods-serve {
+			display: flex;
+
+			.goods-serve-img {
+				width: 36rpx;
+				height: 36rpx;
+				margin-top: 26rpx;
+			}
+
+			.goods-serve-name {
+				margin: 0 30rpx 0 20rpx;
+				width: calc(100% - 122rpx);
+
+				text {
+					padding-right: $padding;
+					position: relative;
+
+					&:last-child {
+						padding-right: 0;
+					}
+				}
+			}
+		}
+
 		// 店铺
-		.store{
+		.store {
 			position: relative;
 			margin: 0 $margin;
-            background: #F8F8F8;
+			background: #F8F8F8;
 			border-radius: $radius/2;
 			padding: $padding;
 			min-height: 220rpx;
-			.logo{
+
+			.logo {
 				position: absolute;
 				left: $margin;
 				top: $margin;
@@ -445,89 +481,104 @@
 				height: 98rpx;
 				border-radius: $radius/2;
 			}
-            .store-cont {
-                position: absolute;
-                width: 100%;
-                left: 0;
-                top: 0;
-                padding-left: 150rpx;
-                padding-top: 20rpx;
-                box-sizing: border-box;
-                height: 140rpx;
-            }
-            .tooSee {
-                position: absolute;
-                top: 150rpx;
-                left: 0;
-                font-size: 24rpx;
-                padding-left: $padding;
-                box-sizing: border-box;
-                .tooSee-label {
-                    background-color: #fd683e;
-                    border-radius: 8rpx 4rpx 4rpx 6rpx;
-                    color: #FFFFFF;
-                    height: 48rpx;
-                    line-height: 48rpx;
-                    padding: 0 $padding - 15;
-                    box-sizing: border-box;
-                    display: inline-block;
-                    margin-right: $margin * 2;
-                    position: relative;
-                    &::after, &::before{
-                        content: '';
-                        position: absolute;
-                    }
-                    &::after {
-                       right: -40rpx;
-                       top: 0;
-                       background-color: #f64c37;
-                       width: 40rpx;
-                       height: 100%;
-                       border-radius: 4rpx 8rpx 8rpx 4rpx;
-                    }
-                    &::before {
-                        right: -1rpx;
-                        top: 5%;
-                        border: 1rpx dashed #fb745a;
-                        height: 90%;
-                        z-index: 2;
-                        box-sizing: border-box;
-                    }
-                    &:last-child {
-                        margin: 0;
-                    }
-                    &:first-child {
-                        background-color: #f2d7aa;
-                        color: #362507;
-                    }
-                    &:first-child::after {
-                        background-color: #f1d599;
-                    }
-                    &:first-child::before {
-                        border-color: #fae2b9;
-                    }
-                    .tooSee-label-img {
-                        position: absolute;
-                        right: -34rpx;
-                        top: 12rpx;
-                        width: 28rpx;
-                        height: 28rpx;
-                        z-index: 9;
-                    }
-                    &:first-child .tooSee-label-img {
-                        filter: brightness(.2)
-                    }
-                }
-            }
-			.store-title{
+
+			.store-cont {
+				position: absolute;
+				width: 100%;
+				left: 0;
+				top: 0;
+				padding-left: 150rpx;
+				padding-top: 20rpx;
+				box-sizing: border-box;
+				height: 140rpx;
+			}
+
+			.tooSee {
+				position: absolute;
+				top: 150rpx;
+				left: 0;
+				font-size: 24rpx;
+				padding-left: $padding;
+				box-sizing: border-box;
+
+				.tooSee-label {
+					background-color: #fd683e;
+					border-radius: 8rpx 4rpx 4rpx 6rpx;
+					color: #FFFFFF;
+					height: 48rpx;
+					line-height: 48rpx;
+					padding: 0 $padding - 15;
+					box-sizing: border-box;
+					display: inline-block;
+					margin-right: $margin * 2;
+					position: relative;
+
+					&::after,
+					&::before {
+						content: '';
+						position: absolute;
+					}
+
+					&::after {
+						right: -40rpx;
+						top: 0;
+						background-color: #f64c37;
+						width: 40rpx;
+						height: 100%;
+						border-radius: 4rpx 8rpx 8rpx 4rpx;
+					}
+
+					&::before {
+						right: -1rpx;
+						top: 5%;
+						border: 1rpx dashed #fb745a;
+						height: 90%;
+						z-index: 2;
+						box-sizing: border-box;
+					}
+
+					&:last-child {
+						margin: 0;
+					}
+
+					&:first-child {
+						background-color: #f2d7aa;
+						color: #362507;
+					}
+
+					&:first-child::after {
+						background-color: #f1d599;
+					}
+
+					&:first-child::before {
+						border-color: #fae2b9;
+					}
+
+					.tooSee-label-img {
+						position: absolute;
+						right: -34rpx;
+						top: 12rpx;
+						width: 28rpx;
+						height: 28rpx;
+						z-index: 9;
+					}
+
+					&:first-child .tooSee-label-img {
+						filter: brightness(.2)
+					}
+				}
+			}
+
+			.store-title {
 				font-size: $title-size-lg;
 				font-weight: bold;
 				line-height: 60rpx;
 				color: $text-color;
-                margin-bottom: 10rpx;
+				margin-bottom: 10rpx;
 			}
+
 			// rate
-			.openbtn{
+			.openbtn {
 				position: absolute;
 				right: $margin - 10;
 				top: $margin * 3.5;
@@ -537,26 +588,30 @@
 				text-align: center;
 				font-size: $title-size-m;
 				margin-top: -30rpx;
-                display: flex;
-                .openbtn-img {
-                    width: 32rpx;
-                    height: 32rpx;
-                    filter: brightness(.5);
-                    margin-top: 14rpx;
-                }
+				display: flex;
+
+				.openbtn-img {
+					width: 32rpx;
+					height: 32rpx;
+					filter: brightness(.5);
+					margin-top: 14rpx;
+				}
 			}
 		}
+
 		// 产品规格
-		.size{
+		.size {
 			margin-top: $margin;
 			border-top: solid 20rpx #F8F8F8;
 			border-bottom: solid 20rpx #F8F8F8;
-			.size-item{
+
+			.size-item {
 				position: relative;
 				padding: 0 $padding 0 ($padding + 100);
 				line-height: 90rpx;
 				font-size: $title-size-m;
-				&::after{
+
+				&::after {
 					position: absolute;
 					left: $margin;
 					right: 0;
@@ -565,10 +620,12 @@
 					height: 1rpx;
 					background-color: $border-color;
 				}
-				&:last-child::after{
+
+				&:last-child::after {
 					display: none;
 				}
-				.title{
+
+				.title {
 					position: absolute;
 					left: $margin;
 					top: 0;
@@ -576,16 +633,18 @@
 				}
 			}
 		}
+
 		// 产品详情
-		.product{
-			image{
+		.product {
+			image {
 				vertical-align: top;
 				width: 100%;
 			}
 		}
 	}
+
 	// 立即购买
-	.footer{
+	.footer {
 		padding: $padding;
 		background: white;
 		position: fixed;
@@ -594,7 +653,8 @@
 		width: 100%;
 		z-index: 99;
 		box-sizing: border-box;
-		.btn[size='default']{
+
+		.btn[size='default'] {
 			width: 100%;
 			height: 90rpx;
 			line-height: 90rpx;
@@ -609,143 +669,163 @@
 			margin-bottom: calc(constant(safe-area-inset-bottom) / 2);
 		}
 	}
-    
-    // 优惠券弹出样式
-    .coupons-popup {
-        background-color: #FFFFFF;
-        border-radius: 40rpx 40rpx 0 0;
-        padding: $padding;
-        box-sizing: border-box;
-        .coupons-header {
-            text-align: center;
-            position: relative;
-            margin-bottom: $margin*1.5;
-            .title {
-                font-weight: 700;
-            }
-            .close {
-                position: absolute;
-                right: 0;
-                top: 0;
-                z-index: 2;
-                width: 38rpx;
-                height: 38rpx;
-            }
-        }
-        .coupons-cont {
-            .coupons-name {
-                color: #616065;
-                font-size: 30rpx;
-            }
-            .coupons-list {
-                border: 2rpx solid #d6b9be;
-                border-radius: 10rpx;
-                overflow: hidden;
-                position: relative;
-                margin-top: $margin;
-								// background-color: red;
-                .coupons-tips {
-                    // background-color: #211e17;
-					         background-image: linear-gradient(to right, #f8e5c0, #d6a46a);
-                   color: #8d4928;
-                    position: absolute;
-                    border-radius: 0 0 20rpx 0;
-                    padding: 0 8rpx;
-                    height: 34rpx;
-                    line-height: 34rpx;
-                    left: 0;
-                    top: 0;
-										z-index: 10;
-                    .coupons-tips-text {
-                        font-size: 24rpx;
-                        transform:scale(.85);
-                        display: block;
-                    }
-                }
-                .coupons-left {
-                    background-color: #fdedee;
-                    color: #e1293f;
-                    width: 190rpx;
-                    text-align: center;
-                    padding: $padding - 10 0;
-                    border-right: 2rpx dashed #eccdd4;
-										.coupon-left-img{
-											width: 180rpx;
-											height: 100rpx;
-											border-radius: 20rpx;
-										}
-                    .coupons-number {
-                        font-size: 40rpx;
-                        font-weight: 600;
-                        text {
-                            font-size: 24rpx;
-                        }
-                        &.coupons-small {
-                            font-size: 32rpx;
-                            padding: 20rpx 0;
-                        }
-                    }
-                    .coupons-full {
-                        font-size: 24rpx;
-                    }
-                }
-                .coupons-center {
-                    position: absolute;
-                    width: 100%;
-                    left: 0;
-                    top: 0;
-                    padding: $padding - 10 130rpx 0 220rpx;
-                    box-sizing: border-box;
-                    font-size: 28rpx;
-                    .coupons-time {
-                        font-size: 24rpx;
-                        margin-top: 10rpx;
-                        color: #514c51;
-                    }
-                }
-                .coupons-right {
-                    position: absolute;
-                    right: 20rpx;
-                    top: 36rpx;
-                    width: 110rpx;
-                    text-align: center;
-                    background-color: #e1293f;
-                    color: #FFFFFF;
-                    border-radius: 80rpx;
-                    font-size: 24rpx;
-                    line-height: 52rpx;
-                    &.coupons-right-active {
-                        background-color: #adadad;
-                        color: #FFFFFF;
-                    }
-                }
-            }
-        }
-        .coupons-true {
-            background-image: linear-gradient(to right, #e1293f, #fd275d);
-            color: #FFFFFF;
-            border-radius: 80rpx;
-            line-height: 84rpx;
-            text-align: center;
-            margin-top: $margin*5;
-        }
-    }
-    
-    // 新增服务保障样式
-    .serve-label {
-        margin-top: $margin + 10;
-        font-size: 28rpx;
-        .serve-label-name {
-            font-weight: 700;
-            margin-bottom: $margin - 10;
-        }
-        .serve-label-text {
-            line-height: 44rpx;
-        }
-    }
-    
-    .serve-cont {
-        height: 40vh;
-        overflow-y: scroll;
-    }
+
+	// 优惠券弹出样式
+	.coupons-popup {
+		background-color: #FFFFFF;
+		border-radius: 40rpx 40rpx 0 0;
+		padding: $padding;
+		box-sizing: border-box;
+
+		.coupons-header {
+			text-align: center;
+			position: relative;
+			margin-bottom: $margin*1.5;
+
+			.title {
+				font-weight: 700;
+			}
+
+			.close {
+				position: absolute;
+				right: 0;
+				top: 0;
+				z-index: 2;
+				width: 38rpx;
+				height: 38rpx;
+			}
+		}
+
+		.coupons-cont {
+			.coupons-name {
+				color: #616065;
+				font-size: 30rpx;
+			}
+
+			.coupons-list {
+				border: 2rpx solid #d6b9be;
+				border-radius: 10rpx;
+				overflow: hidden;
+				position: relative;
+				margin-top: $margin;
+
+				// background-color: red;
+				.coupons-tips {
+					// background-color: #211e17;
+					background-image: linear-gradient(to right, #f8e5c0, #d6a46a);
+					color: #8d4928;
+					position: absolute;
+					border-radius: 0 0 20rpx 0;
+					padding: 0 8rpx;
+					height: 34rpx;
+					line-height: 34rpx;
+					left: 0;
+					top: 0;
+					z-index: 10;
+
+					.coupons-tips-text {
+						font-size: 24rpx;
+						transform: scale(.85);
+						display: block;
+					}
+				}
+
+				.coupons-left {
+					background-color: #fdedee;
+					color: #e1293f;
+					width: 190rpx;
+					text-align: center;
+					padding: $padding - 10 0;
+					border-right: 2rpx dashed #eccdd4;
+
+					.coupon-left-img {
+						width: 180rpx;
+						height: 100rpx;
+						border-radius: 20rpx;
+					}
+
+					.coupons-number {
+						font-size: 40rpx;
+						font-weight: 600;
+
+						text {
+							font-size: 24rpx;
+						}
+
+						&.coupons-small {
+							font-size: 32rpx;
+							padding: 20rpx 0;
+						}
+					}
+
+					.coupons-full {
+						font-size: 24rpx;
+					}
+				}
+
+				.coupons-center {
+					position: absolute;
+					width: 100%;
+					left: 0;
+					top: 0;
+					padding: $padding - 10 130rpx 0 220rpx;
+					box-sizing: border-box;
+					font-size: 28rpx;
+
+					.coupons-time {
+						font-size: 24rpx;
+						margin-top: 10rpx;
+						color: #514c51;
+					}
+				}
+
+				.coupons-right {
+					position: absolute;
+					right: 20rpx;
+					top: 36rpx;
+					width: 110rpx;
+					text-align: center;
+					background-color: #e1293f;
+					color: #FFFFFF;
+					border-radius: 80rpx;
+					font-size: 24rpx;
+					line-height: 52rpx;
+
+					&.coupons-right-active {
+						background-color: #adadad;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+
+		.coupons-true {
+			background-image: linear-gradient(to right, #e1293f, #fd275d);
+			color: #FFFFFF;
+			border-radius: 80rpx;
+			line-height: 84rpx;
+			text-align: center;
+			margin-top: $margin*5;
+		}
+	}
+
+	// 新增服务保障样式
+	.serve-label {
+		margin-top: $margin + 10;
+		font-size: 28rpx;
+
+		.serve-label-name {
+			font-weight: 700;
+			margin-bottom: $margin - 10;
+		}
+
+		.serve-label-text {
+			line-height: 44rpx;
+		}
+	}
+
+	.serve-cont {
+		height: 40vh;
+		overflow-y: scroll;
+	}
 </style>
diff --git a/pages/goods/lists.vue b/pages/goods/lists.vue
index e069561..2f4faaf 100644
--- a/pages/goods/lists.vue
+++ b/pages/goods/lists.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="Goods-LISTS">
+		<!-- <image :src="`${config.apiUrls}images/baodan-banner.png`" mode="widthFix" /> -->
 		<view class="tabs">
 			<view class="tabs-item" :class="{'show': tabIndex == 0}" @click="onTabs" data-index="0">最新</view>
 			<view class="tabs-item" :class="{'show': tabIndex == 1}" @click="onTabs" data-index="1">
@@ -19,6 +20,9 @@
 		list
 	} from '@/apis/interfaces/goods'
 	import goodsList from '@/components/goods-list/goods-list'
+	import {
+		config
+	} from '@/apis/index.js'
 	export default {
 		name: 'Goods-LISTS',
 		data() {
@@ -28,6 +32,7 @@
 				goods: [],
 				page: 1,
 				has_more: true,
+				isBaoDan: false, // 是否是报单，默认有id不是报单，无id是报单
 			};
 		},
 		onReachBottom() {
@@ -44,6 +49,14 @@
 		created() {
 			this.getList()
 		},
+		onShow() {
+			if (this.$Route.query.type === 'baodan') {
+				this.isBaoDan = true
+				uni.setNavigationBarTitle({
+					title: '报单商品'
+				})
+			}
+		},
 		methods: {
 			onTabs(e) {
 				let index = e.target.dataset.index
@@ -58,7 +71,7 @@
 
 			onGoods(e) {
 				uni.navigateTo({
-					url:'/pages/goods/details?id='+e.goods_id
+					url: '/pages/goods/details?id=' + e.goods_id
 				})
 				// this.$Router.push({
 				// 	name: 'goodsDetails',
@@ -72,8 +85,11 @@
 					order_by: this.tabIndex == 1 ? this.marketType : '',
 					page: this.page
 				}
-				if (this.$Route.query.type) {
+				if (this.$Route.query.type === 'id') {
 					data.category_id = this.$Route.query.id
+				} else if (this.$Route.query.type === 'baodan') {
+					// 报单加个条件筛选
+					data.is_allow_values = 1
 				} else {
 					data.category_cid = this.$Route.query.id
 				}
diff --git a/pages/goods/management.vue b/pages/goods/management.vue
index 3a5f795..38f4f10 100644
--- a/pages/goods/management.vue
+++ b/pages/goods/management.vue
@@ -8,7 +8,7 @@
 			<view class="item" :class="{'show': status == '3'}" @click="onTabs('3')">已驳回</view>
 		</view>
 		<!-- 优选商品 -->
-		<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证">
+		<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证" notag='has'>
 			<template v-slot:statistics="goods">
 				<view>库存{{goods.value.stock}}</view>
 			</template>