diff --git a/App.vue b/App.vue
index 384552d..4e0936f 100644
--- a/App.vue
+++ b/App.vue
@@ -148,7 +148,7 @@
 			that.getConfigData()
 
 			//#ifdef APP-PLUS
-		
+
 
 			jpushModule.setLoggerEnable(true);
 			jpushModule.initJPushService()
@@ -209,7 +209,11 @@
 			//#endif
 
 
-
+			// if (info.referrerInfo?.extraData?.uniMP) {
+			// 	uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP);
+			// 	uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token);
+			
+			// }
 
 
 		},
@@ -247,7 +251,7 @@
 		},
 
 		methods: {
-			
+
 
 
 
@@ -391,7 +395,7 @@
 		font-size: 24rpx;
 
 		&_icon {
-			background-image: url('static/tabbar_icon/d.png');
+			// background-image: url('static/tabbar_icon/d.png');
 			background-repeat: no-repeat;
 			background-size: cover;
 			font-size: 80rpx;
diff --git a/api/api.js b/api/api.js
index 6877e42..7d9d20c 100644
--- a/api/api.js
+++ b/api/api.js
@@ -290,4 +290,18 @@ export function village(data) {
  */
 export function brigade(data) {
  return request.get('v2/system/brigade', data, { noAuth: true });
-}
\ No newline at end of file
+}
+
+/*
+	生产 -- 获取商户保证金信息支付接口
+*/
+export function paymerchant() {
+  return request.post(`user/margin`,{});
+}
+
+/*
+	生产 -- 获取商户保证金信息接口
+*/
+export function merchant(data) {
+  return request.get(`store/merchant/margin`, data);
+}
diff --git a/api/product.js b/api/product.js
index 8bfa886..28dcaf2 100644
--- a/api/product.js
+++ b/api/product.js
@@ -303,8 +303,8 @@ export function getDeliveryType(merId) {
 /*
 	商品 -- 获取交易协议内容
 */
-export function business() {
-	return request.get(`business/agree?type=business_apply_agree`, {}, {
+export function business(data) {
+	return request.get(`business/agree`, data, {
 		noAuth: true
 	});
 }
@@ -319,5 +319,5 @@ export function intention(data) {
 	商品 -- 同意提交申请
 */
 export function intentionbus(data) {
-	return request.post(`intention/business`, {});
+	return request.post(`intention/business`, data);
 }
\ No newline at end of file
diff --git a/api/store.js b/api/store.js
index 399e35a..2a8ae0f 100644
--- a/api/store.js
+++ b/api/store.js
@@ -577,6 +577,6 @@ export function vicinityStoreApi(data) {
 /*
 	商家入驻 -- 获取商户入驻申请协议内容
 */
-export function agreeiness() {
-  return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true });
+export function agreeiness(data) {
+  return request.get(`business/agree`, data, { noAuth: true });
 }
\ No newline at end of file
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
index 09a9e07..7549749 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
@@ -1,55 +1,82 @@
 <template>
-    <view v-if="type == 0" class="wf-item-page wf-page0" :style="viewColor">
+	<view v-if="type == 0" class="wf-item-page wf-page0" :style="viewColor">
 		<view class='pictrue'>
 			<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
 			<view v-if="item.stock == 0" class="sell_out">已售罄</view>
-			<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
-		</view> 
-		<view class="text">
-			<view class='name line2'>{{item.store_name}}</view>			
-			<view class="acea-row row-middle">
-				<view class='money'>￥<text class='num'>{{item.price}}</text></view>				
+			<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture">
 			</view>
-			<view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle svip">
+		</view>
+
+		<view class="text">
+			<view class='name line2'>{{item.store_name}}</view>
+			<view class="acea-row row-middle">
+				<view class='money'>￥<text class='num'>{{item.price}}</text></view>
+			</view>
+			<view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
+				class="acea-row row-middle svip">
 				<text class='vip-money'>￥{{item.svip_price}}</text>
 				<view class="vipImg">
 					<image src="/static/images/svip.png"></image>
 				</view>
 			</view>
+			
 			<view class="item_tags">
-				<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 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 delivery" v-if="item.delivery_free == 1">包邮</text>
 			</view>
 		</view>
-    </view>
+	</view>
 	<view v-else-if="type == 1" class="wf-page1" :style="viewColor">
+
 		<view class='pictrue'>
 			<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
 			<view v-if="item.stock == 0" class="sell_out">已售罄</view>
-			<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
+			<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture">
+			</view>
 		</view>
 		<view class='text'>
 			<view class='name line2'>{{item.store_name}}</view>
-			<view class='money'>
-				￥<text class='num'>{{item.price}}</text>	
+			<view class="score"><span
+					style="font-size: 23rpx;font-family: PingFang SC-Semibold, PingFang SC;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
+				{{item.reply_count}}条评论</view>
+			<view class="" style="display: flex;justify-content: space-between;">
+				<view class='money'>
+					<span style="font-size:30rpx;">￥</span>
+					<text class='num'><span style="font-size: 35rpx;">{{item.price.split('.')[0]}}.</span><span
+							style="font-size: 20rpx;">{{item.price.split('.')[1]}}</span></text>
+				</view>
+				<view class="items-img">
+					<image src="@/static/images/LHYC/J.png" mode="aspectFit"></image>
+				</view>
 			</view>
-			<view v-if="item.show_svip_info.show_svip && item.show_svip_info.show_svip_price" class="acea-row row-middle svip">
+			<view v-if="item.show_svip_info.show_svip && item.show_svip_info.show_svip_price"
+				class="acea-row row-middle svip">
 				<text class='vip-money'>￥{{item.svip_price}}</text>
+				
 				<view class="vipImg">
 					<image src="/static/images/svip.png"></image>
 				</view>
 			</view>
+
 			<view class="item_tags acea-row">
-				<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 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 delivery" v-if="item.delivery_free == 1">包邮</text>
 			</view>
-			<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
+			
 			<view class="company" v-if="item.merchant" @click.stop="goShop(item.merchant.mer_id)">
 				<text class="line1">{{item.merchant.mer_name}}</text>
 				<view class="flex" v-if="isStore != '1'">
@@ -65,283 +92,334 @@
 				最高赚 ¥{{item.max_extension}}
 			</view>
 		</block>
-	</view>	
+	</view>
 </template>
 
 <script>
-import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
-import {mapGetters} from "vuex";
-export default {
-	components:{easyLoadimage},
-	computed: mapGetters(['viewColor']),
-    props: {
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
+	import {
+		mapGetters
+	} from "vuex";
+	export default {
+		components: {
+			easyLoadimage
+		},
+		computed: mapGetters(['viewColor']),
+		props: {
 			item: {
 				type: Object,
 				require: true
 			},
-		type: {
-			type: Number|String,
-			default: 0
+			type: {
+				type: Number | String,
+				default: 0
+			},
+			isStore: {
+				type: [String, Number],
+				default: '1'
+			},
+			isLogin: {
+				type: Boolean,
+				require: false
+			}
 		},
-		isStore: {
-			type: [String, Number],
-			default: '1'
+		data() {
+			return {}
 		},
-		isLogin: {
-			type: Boolean,
-			require: false
+		methods: {
+			goShop(id) {
+				this.$emit('goShop', id);
+			},
+			authOpen() {
+				this.$emit('authOpen');
+			},
+			followToggle(item) {
+				this.$emit('followToggle', item);
+			}
 		}
-  },
-	data(){
-		return {
-		}
-	},
-	methods: {
-		goShop(id) {
-			this.$emit('goShop', id);
-		},
-		authOpen(){
-			this.$emit('authOpen');
-		},
-		followToggle(item){
-			this.$emit('followToggle', item);
-		}
-	}	
-}
-
+	}
 </script>
 <style lang="scss" scoped>
-.wf-item-page {
-	background: #fff;
-	overflow: hidden;
-	border-radius: 16rpx;
-	padding-bottom: 20rpx;
-}
-.wf-page0 .coupon{
-	background:rgba(255,248,247,1);
-	border:1px solid rgba(233,51,35,1);
-	border-radius:4rpx;
-	font-size:20rpx;
-	margin-left: 18rpx;
-	padding: 1rpx 4rpx;
-}
-.wf-page0 .pictrue{
-	width: 100%!important;
-	height: 345rpx;
-	position: relative;
-	/deep/image,/deep/.easy-loadimage,uni-image{
+	.items-img {
+		width: 44rpx;
+		height: 44rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.wf-item-page {
+		background: #fff;
+		overflow: hidden;
+		border-radius: 16rpx;
+		padding-bottom: 20rpx;
+	}
+
+	.wf-page0 .coupon {
+		background: rgba(255, 248, 247, 1);
+		border: 1px solid rgba(233, 51, 35, 1);
+		border-radius: 4rpx;
+		font-size: 20rpx;
+		margin-left: 18rpx;
+		padding: 1rpx 4rpx;
+	}
+
+	.wf-page0 .pictrue {
+		width: 100% !important;
 		height: 345rpx;
-		border-radius: 16rpx 16rpx 0 0;
+		position: relative;
+
+		/deep/image,
+		/deep/.easy-loadimage,
+		uni-image {
+			height: 345rpx;
+			border-radius: 16rpx 16rpx 0 0;
+		}
+
+		.border-picture {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			border-radius: 16rpx 16rpx 0 0;
+			background: center/cover no-repeat;
+		}
 	}
-	.border-picture {
-		position: absolute;
-		top: 0;
-		left: 0;
+
+	.loadfail-img {
 		width: 100%;
-		height: 100%;
-		border-radius: 16rpx 16rpx 0 0;
-		background: center/cover no-repeat;
+		height: 360rpx;
 	}
-}
- .loadfail-img{
-		width: 100%;
-    height: 360rpx;
-}
-.svip{
-	margin: 5rpx 0 15rpx;
-}
-.vip-money {
-	color: #282828;
-	font-size: 22rpx;
-	margin-left: 6rpx;
-	font-weight: bold;
-}
-.vipImg {
-	width: 65rpx;
-	height: 28rpx;
-	margin-left: 4rpx;
-	image {
-		width: 100%;
-		height: 100%;
-		display: block;
+
+	.svip {
+		margin: 5rpx 0 15rpx;
 	}
-}
-.wf-page0 .name {
-	color: #282828;
-	margin: 20rpx 0 10rpx 0;
-	font-size: 13px;
-	overflow:hidden; 
-	text-overflow: ellipsis; 
-	display: -webkit-box; 
-	-webkit-line-clamp: 2; 
-	-webkit-box-orient: vertical;
-	text-align: left;
-}
-.wf-page0 .text{
-	padding: 0 20rpx;
-}	
-.wf-page0 .money {
-	font-size: 20rpx;
-	font-weight: bold;
-	color: var(--view-priceColor);
-}
-.b-color {
-	background-color: var(--view-theme);
-	border: 1px solid var(--view-theme);
-}
-.wf-page0 .money .num {
-	font-size: 34rpx;
-}
-.wf-page1 .wf-item{
-	.name{
+
+	.vip-money {
+		color: #282828;
+		font-size: 22rpx;
+		margin-left: 6rpx;
+		font-weight: bold;
+	}
+
+	.vipImg {
+		width: 65rpx;
+		height: 28rpx;
+		margin-left: 4rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+			display: block;
+		}
+	}
+
+	.wf-page0 .name {
+		color: #282828;
+		margin: 20rpx 0 10rpx 0;
 		font-size: 13px;
-		overflow:hidden; 
-		text-overflow: ellipsis; 
-		display: -webkit-box; 
-		-webkit-line-clamp: 2; 
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
 		-webkit-box-orient: vertical;
 		text-align: left;
 	}
-}
-.wf-page1 .pictrue {
-	position: relative;
-	height: 345rpx;
-	width: 100%!important;
-	/deep/image,/deep/.easy-loadimage,uni-image{
-		height: 345rpx;
-		border-radius: 20rpx 20rpx 0 0;
+
+	.wf-page0 .text {
+		padding: 0 20rpx;
 	}
-	.border-picture {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		border-radius: 20rpx 20rpx 0 0;
-		background: center/cover no-repeat;
+
+	.wf-page0 .money {
+		font-size: 20rpx;
+		color: var(--view-priceColor);
 	}
-	
-}
-.sell_out {
-	display: flex;
-	width: 150rpx;
-	height: 150rpx;
-	align-items: center;
-	justify-content: center;
-	border-radius: 100%;
-	background: rgba(0,0,0,.6);
-	color: #fff;
-	font-size: 30rpx;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin: -75rpx 0 0 -75rpx;
-	&::before{
-		content: "";
-		display: block;
-		width: 140rpx;
-		height: 140rpx;
-		border-radius: 100%;
-		border: 1px dashed #fff;
-		position: absolute;
-		top: 5rpx;
-		left: 5rpx;
+
+	.b-color {
+		background-color: var(--view-theme);
+		border: 1px solid var(--view-theme);
 	}
-}
-.loading-img{
-	height: 345rpx;
-  max-height: 360rpx;
-}
-.wf-page1 .text {
-	padding: 20rpx 17rpx 26rpx 17rpx;
-	font-size: 30rpx;
-	color: #222;
-}
-.wf-page1 .text .money {
-	display: flex;
-	align-items: center;
-	font-size: 26rpx;
-	font-weight: bold;
-	margin-top: 8rpx;
-	color: var(--view-priceColor);
-}
-.wf-page1 .text .money .num {
-	font-size: 34rpx;
-}
-.item_tags{
-	margin-top: 8rpx;
-	display: flex;
-}
-.item_tags .tags_item {
-	display: flex;
-	font-size: 20rpx;
-	text-align: center;
-	border-radius: 5rpx;
-	padding: 0 4rpx;
-	height: 28rpx;
-	align-items: center;
-	justify-content: center;
-	margin-right: 8rpx;
-}
-.item_tags .tags_item.ticket{
-	color: var(--view-theme);
-	border: 1px solid var(--view-theme);
-}
-.item_tags .tags_item.delivery{
-	color: #FF9000;
-	border: 1px solid #FF9000;
-}
-.wf-page1 .text .money .ticket-big {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	max-width: 163rpx;
-	padding: 0 6rpx;
-	height: 28rpx;
-	margin-left: 10rpx;
-	background-image: url(~static/images/yh.png);
-	background-size: 100% 100%;
-	font-size: 20rpx;
-	font-weight: normal;
-}
-.wf-page1 .text .score {
-	margin-top: 10rpx;
-	color: #737373;
-	font-size: 20rpx;
-}
-.wf-page1 .text .company {
-	display: flex;
-	align-items: center;
-	color: #737373;
-	font-size: 20rpx;
-	margin-top: 10rpx;
-	.line1{
-		max-width: 200rpx;
+
+	.wf-page0 .money .num {
+		font-size: 34rpx;
 	}
-	.flex {
-		display: flex;
-		align-items: center;
-		margin-left: 10rpx;
-		color: #282828;
-		.iconfont {
-			font-size: 16rpx;
-			margin-top: 4rpx;
+
+	.wf-page1 .wf-item {
+		.name {
+			font-size: 13px;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			text-align: left;
 		}
 	}
-}
-.foot-bar {
-	width: 100%;
-	height: 52rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-	border-radius: 0px 0px 16rpx 16rpx;
-	color: #fff;
-	font-size: 24rpx;
-	.icon-fenxiang {
-		font-size: 24rpx;
-		margin-right: 10rpx;
+
+	.wf-page1 .pictrue {
+		position: relative;
+		height: 345rpx;
+		width: 100% !important;
+
+		/deep/image,
+		/deep/.easy-loadimage,
+		uni-image {
+			height: 345rpx;
+			border-radius: 20rpx 20rpx 0 0;
+		}
+
+		.border-picture {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			border-radius: 20rpx 20rpx 0 0;
+			background: center/cover no-repeat;
+		}
+
 	}
-}
-</style>
+
+	.sell_out {
+		display: flex;
+		width: 150rpx;
+		height: 150rpx;
+		align-items: center;
+		justify-content: center;
+		border-radius: 100%;
+		background: rgba(0, 0, 0, .6);
+		color: #fff;
+		font-size: 30rpx;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin: -75rpx 0 0 -75rpx;
+
+		&::before {
+			content: "";
+			display: block;
+			width: 140rpx;
+			height: 140rpx;
+			border-radius: 100%;
+			border: 1px dashed #fff;
+			position: absolute;
+			top: 5rpx;
+			left: 5rpx;
+		}
+	}
+
+	.loading-img {
+		height: 345rpx;
+		max-height: 360rpx;
+	}
+
+	.wf-page1 .text {
+		padding: 20rpx 17rpx 26rpx 17rpx;
+		font-size: 30rpx;
+		color: #222;
+	}
+
+	.wf-page1 .text .money {
+		display: flex;
+		align-items: center;
+		font-size: 26rpx;
+		font-weight: bold;
+		margin-top: 8rpx;
+		color: var(--view-priceColor);
+	}
+
+	.wf-page1 .text .money .num {
+		font-size: 34rpx;
+	}
+
+	.item_tags {
+		margin-top: 8rpx;
+		display: flex;
+	}
+
+	.item_tags .tags_item {
+		display: flex;
+		font-size: 20rpx;
+		text-align: center;
+		border-radius: 5rpx;
+		padding: 0 4rpx;
+		height: 28rpx;
+		align-items: center;
+		justify-content: center;
+		margin-right: 8rpx;
+	}
+
+	.item_tags .tags_item.ticket {
+		color: var(--view-theme);
+		border: 1px solid var(--view-theme);
+	}
+
+	.item_tags .tags_item.delivery {
+		color: #FF9000;
+		border: 1px solid #FF9000;
+	}
+
+	.wf-page1 .text .money .ticket-big {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		max-width: 163rpx;
+		padding: 0 6rpx;
+		height: 28rpx;
+		margin-left: 10rpx;
+		background-image: url(~static/images/yh.png);
+		background-size: 100% 100%;
+		font-size: 20rpx;
+		font-weight: normal;
+	}
+
+	.wf-page1 .text .score {
+		margin-top: 10rpx;
+		color: #B3B3B3;
+		font-size: 20rpx;
+	}
+
+	.wf-page1 .text .company {
+		display: flex;
+		align-items: center;
+		color: #737373;
+		font-size: 20rpx;
+		margin-top: 10rpx;
+
+		.line1 {
+			max-width: 200rpx;
+		}
+
+		.flex {
+			display: flex;
+			align-items: center;
+			margin-left: 10rpx;
+			color: #282828;
+
+			.iconfont {
+				font-size: 16rpx;
+				margin-top: 4rpx;
+			}
+		}
+	}
+
+	.foot-bar {
+		width: 100%;
+		height: 52rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+		border-radius: 0px 0px 16rpx 16rpx;
+		color: #fff;
+		font-size: 24rpx;
+
+		.icon-fenxiang {
+			font-size: 24rpx;
+			margin-right: 10rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 52de672..5ddca50 100644
--- a/pages.json
+++ b/pages.json
@@ -28,15 +28,15 @@
 		// },
 		// // #endif
 		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/moreProject/moreProject",
-			"style": {
-				"navigationBarTitleText": "更多功能",
-				"enablePullDownRefresh": false
-			}
-		
-		},
-		
+		// {
+		// 	"path": "pages/moreProject/moreProject",
+		// 	"style": {
+		// 		"navigationBarTitleText": "更多功能",	
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -52,20 +52,40 @@
 			}
 		},
 		{
-			"path": "pages/gather/gather",
+			"path": "pages/chat/customer_list/index",
 			"style": {
-				"navigationBarTitleText": "工作台",
+				"navigationBarTitleText": "消息",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				// #ifdef APP-PLUS
+				"enablePullDownRefresh": true,
+				// #endif
+				"app-plus": {
+					"scrollIndicator": false //禁用原生导航栏
+				}
 			}
 		},
 		{
-			"path": "pages/plant_release/index",
+			"path": "pages/product/list/index",
 			"style": {
-				"navigationBarTitleText": "常用",
+				"navigationBarTitleText": "商品管理",
 				"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
+				// #ifdef APP-PLUS
+				"enablePullDownRefresh": true,
+				// #endif
+				"app-plus": {
+					"scrollIndicator": false //禁用原生导航栏
+				}
+			}
+		},
+		{
+			"path": "pages/moreProject/moreProject",
+			"style": {
+				"navigationBarTitleText": "更多功能",
 				"enablePullDownRefresh": false
 			}
+
 		},
 		{
 			"path": "pages/order_addcart/order_addcart",
@@ -74,90 +94,120 @@
 			}
 		},
 		{
-			"path": "pages/plant_grass/index",
+			"path": "pages/product/list/index",
 			"style": {
-				// "navigationStyle": "custom",
-				"navigationBarTitleText": "种草社区"
-			}
-		},
-		{
-			"path": "pages/user/index",
-			"style": {
-				"navigationBarTitleText": "个人中心",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/news_list/index",
-			"style": {
-				"navigationBarTitleText": "资讯"
-			}
-		},
-		{
-			"path": "pages/news_details/index",
-			"style": {
-				"navigationBarTitleText": "资讯详情"
-			}
-		},
-		{
-			"path": "pages/auth/index",
-			"style": {
-				"navigationBarTitleText": "加载中"
-			}
-		},
-		{
-			"path": "pages/order_pay_status/index",
-			"style": {
-				"navigationBarTitleText": "支付状态"
-			}
-		},
-		{
-			"path": "pages/error/index",
-			"style": {
-				"navigationBarTitleText": "网站已关闭"
-			}
-		},
-		{
-			"path": "pages/order_pay_back/index",
-			"style": {
-				"navigationBarTitleText": "支付提示"
-			}
-		}, {
-			"path": "pages/supply_chains/supply_chains",
-			"style": {
-				"navigationBarTitleText": "供应",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/moreProject/moreProject",
-			"style": {
-				"navigationBarTitleText": "更多功能",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "uni_modules/guyue-updater/pages/updater",
-			"style": {
-				"app-plus": {
-					"animationDuration": 200,
-					"animationType": "fade-in",
-					"background": "transparent",
-					"backgroundColorTop": "transparent",
-					"bounce": "none",
-					"popGesture": "none",
-					"scrollIndicator": false,
-					"titleNView": false
-				},
-				"backgroundColor": "transparent",
-				"disableScroll": true,
+				"navigationBarTitleText": "商品管理",
 				"navigationStyle": "custom"
 			}
 		}
+		
+		// {
+		// 	"path": "pages/gather/gather",
+		// 	"style": {
+		// 		"navigationBarTitleText": "工作台",
+		// 		"navigationStyle": "custom",
+		// 		"enablePullDownRefresh": true
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/plant_release/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "常用",
+		// 		"navigationStyle": "custom",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/order_addcart/order_addcart",
+		// 	"style": {
+		// 		"navigationBarTitleText": "购物车"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/plant_grass/index",
+		// 	"style": {
+		// 		// "navigationStyle": "custom",
+		// 		"navigationBarTitleText": "种草社区"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/user/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "个人中心",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/news_list/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "资讯"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/news_details/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "资讯详情"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/auth/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "加载中"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/order_pay_status/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "支付状态"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/error/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "网站已关闭"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/order_pay_back/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "支付提示"
+		// 	}
+		// }, {
+		// 	"path": "pages/supply_chains/supply_chains",
+		// 	"style": {
+		// 		"navigationBarTitleText": "供应",
+		// 		"enablePullDownRefresh": true,
+		// 		"navigationStyle": "custom"
+		// 	}
+
+		// }, {
+		// 	"path": "pages/moreProject/moreProject",
+		// 	"style": {
+		// 		"navigationBarTitleText": "更多功能",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, {
+		// 	"path": "uni_modules/guyue-updater/pages/updater",
+		// 	"style": {
+		// 		"app-plus": {
+		// 			"animationDuration": 200,
+		// 			"animationType": "fade-in",
+		// 			"background": "transparent",
+		// 			"backgroundColorTop": "transparent",
+		// 			"bounce": "none",
+		// 			"popGesture": "none",
+		// 			"scrollIndicator": false,
+		// 			"titleNView": false
+		// 		},
+		// 		"backgroundColor": "transparent",
+		// 		"disableScroll": true,
+		// 		"navigationStyle": "custom"
+		// 	}
+		
+		// }
 	],
-	"subPackages": [
-		{
+	"subPackages": [{
 			"root": "pages/goods_cate",
 			"name": "goods_cate",
 			"pages": [{
@@ -949,26 +999,14 @@
 
 			]
 		},
-
 		{
 			"root": "pages/store",
 			"name": "store",
 			"pages": [{
-					"path": "index",
-					"style": {
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "店铺diy首页"
-							// #ifdef MP
-							,
-						"navigationBarTextStyle": "#FFFFFF"
-						// #endif
-					}
-				}, {
 					"path": "home/index",
 					"style": {
 						"navigationStyle": "custom",
-						"navigationBarTitleText": "店铺首页"
+						"navigationBarTitleText": "我的店铺"
 							// #ifdef MP
 							,
 						"navigationBarTextStyle": "#FFFFFF"
@@ -1132,19 +1170,7 @@
 						"navigationBarTitleText": "商品管理",
 						"enablePullDownRefresh": true
 					}
-				},{
-					"path": "transactionApplication/index",
-					"style": {
-						"navigationBarTitleText": "交易申请",
-						"enablePullDownRefresh": false
-					}
-				},{
-					"path": "transactionApplication/application",
-					"style": {
-						"navigationBarTitleText": "申请记录",
-						"enablePullDownRefresh": false
-					}
-				},
+				}, 
 				{
 					"path": "goodsOnSale/index",
 					"style": {
@@ -1627,40 +1653,36 @@
 		"selectedColor": "#E93323",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-
 		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar_icon/a.png",
 				"selectedIconPath": "static/tabbar_icon/a-a.png",
-				"text": "泸州"
-
+				"text": "首页"
 			},
 			{
-				"pagePath": "pages/gather/gather",
+				"pagePath": "pages/chat/customer_list/index",
 				"iconPath": "static/tabbar_icon/b.png",
 				"selectedIconPath": "static/tabbar_icon/b-a.png",
-				"text": "生产"
+				"text": "消息"
 			},
 			{
-				"pagePath": "pages/plant_release/index",
+				"pagePath": "pages/product/list/index",
 				"iconPath": "static/tabbar_icon/c.png",
 				"selectedIconPath": "static/tabbar_icon/c-a.png",
-				"text": "发布"
-
-			},
-			{
-				"pagePath": "pages/supply_chains/supply_chains",
-
-				"iconPath": "static/tabbar_icon/d.png",
-				"selectedIconPath": "static/tabbar_icon/d-a.png",
-				"text": "供销"
-			},
-			{
-				"pagePath": "pages/user/index",
-				"iconPath": "static/tabbar_icon/e.png",
-				"selectedIconPath": "static/tabbar_icon/e-a.png",
-				"text": "我的"
+				"text": "商品"
 			}
+			// {
+			// 	"pagePath": "pages/supply_chains/supply_chains",
+			// 	"iconPath": "static/tabbar_icon/d.png",
+			// 	"selectedIconPath": "static/tabbar_icon/d-a.png",
+			// 	"text": "供销"
+			// },
+			// {
+			// 	"pagePath": "pages/user/index",
+			// 	"iconPath": "static/tabbar_icon/e.png",
+			// 	"selectedIconPath": "static/tabbar_icon/e-a.png",
+			// 	"text": "我的"
+			// }
 		]
 
 
diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue
index da48440..517c85c 100644
--- a/pages/chat/customer_list/index.vue
+++ b/pages/chat/customer_list/index.vue
@@ -62,6 +62,9 @@
 		serviceList,
 		serviceUserList
 	} from "@/api/user";
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import { mapGetters } from "vuex";
 	export default {
 		name: "CustomerList",
@@ -88,13 +91,9 @@
 		computed: mapGetters(['isLogin','viewColor']),
 		onLoad(optios) {
 			this.type = optios.type;
-			this.mer_id = optios.mer_id;
-			if(this.isLogin){
-				this.getList(this.mer_id)
-			} else {
-				this.isAuto = true;
-				this.isShowAuth = true
-			}
+			
+			
+			this.getindex()
 		},
 		onShow(option) {
 			if(this.isLogin){
@@ -119,6 +118,21 @@
 			this.clear = true;
 		},
 		methods: {
+			//获取商户信息
+			getindex(){
+				getUserInfo().then(res => {
+					
+					this.mer_id = res.data.service.mer_id;
+					if(this.isLogin){
+						this.getList(this.mer_id)
+					} else {
+						this.isAuto = true;
+						this.isShowAuth = true
+					}
+						// this.getList(this.mer_id)
+					// this.getList(res.data.service.mer_id, true);
+				});
+			},
 			onLoadFun() {
 				this.isShowAuth = false;
 				this.getList(this.mer_id);
@@ -217,7 +231,7 @@
 		},
 	};
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 	.CustomerList {
 		.spin {
 			display: block;
diff --git a/pages/guide/guide.vue b/pages/guide/guide.vue
deleted file mode 100644
index 63cdbba..0000000
--- a/pages/guide/guide.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-	<view>
-		<view class="swiper-css zqui-rel" :style="{ height: hpx }">
-			<swiper class="swiper" :style="{ height: hpx }" :indicator-dots="indicatorDots" :autoplay="autoplay"
-				disable-touch='true' :interval="interval" :duration="duration" @change="guideAction">
-				<swiper-item v-for="(item, index) in imageList" :key="index" catchtouchmove="stopChange">
-					<image class="image-size" mode="widthFix" :src="item.src" />
-				</swiper-item>
-			</swiper>
-
-			<!-- 按钮样式切换 -->
-			<template v-if="cur != 2">
-				<view class=" flex-column dots">
-					<block v-for="(item,index) in imageList" :key="index">
-						<view class="dot" :class="{'active':  index == cur}"></view>
-					</block>
-				</view>
-			</template>
-
-			<!-- 第三张图使用按钮《立即进入》 -->
-			<template v-if="cur == 1">
-				<button class="flex-column cu-btn footer" @click="launchApp">立即体验</button>
-			</template>
-			<!-- 右上角跳过按钮 -->
-			<view class="btn-box" @click="launchApp"><text class="passbtn">{{num}}跳过</text></view>
-		</view>
-
-
-	</view>
-</template>
-
-<script>
-	const animation = weex.requireModule('animation');
-	export default {
-		data() {
-			return {
-				//修改图片,文字描述
-				imageList: [{
-
-						src: '/static/images/guide.png'
-					}
-
-				],
-				indicatorDots: false,
-				autoplay: false,
-				interval: 10000,
-				duration: 500,
-				iStatusBarHeight: '0px',
-				hpx: '100%',
-				cur: 0,
-				dotsStyles: '',
-				num: 3
-			};
-		},
-		onLoad() {
-			let that = this;
-			plus.navigator.closeSplashscreen();
-			uni.getSystemInfo({
-				success: function(res) {
-					that.hpx = res.windowHeight + 'px';
-				}
-			});
-		},
-		onReady() {
-			// this.move(0, 1);
-		},
-		mounted() {
-
-			this.countDown()
-
-		},
-		methods: {
-			countDown() {
-				let {
-					num
-				} = this;
-				// if (num === 3) this.nums = true;
-				num = num > 0 ? num - 1 : "GO";
-				setTimeout(() => {
-					this.num = num;
-					if (num == 'GO') {
-						this.launchApp()
-						return
-					}
-					this.countDown();
-				}, 1000);
-
-
-			},
-
-			stopTouchMove: function() {
-				return false;
-			},
-
-			launchApp() {
-
-				//跳过引导页,储存本地值,下次进入直接跳过
-				uni.setStorage({
-					key: 'launchFlag',
-					data: true,
-					success() {
-
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-					}
-				});
-			},
-			guideAction(event) {
-				let that = this,
-					index = event.detail.current;
-				that.cur = index;
-				// if (index == 0) {
-				// 	that.move(0, 1);
-				// 	that.moveTwo(150, 0.1);
-				// 	that.moveThree(150, 0.1);
-				// 	that.lefMainAction(0);
-				// }
-				// if (index == 1) {
-				// 	that.moveTwo(0, 1);
-				// 	that.move(150, 0.1);
-				// 	that.moveThree(150, 0.1);
-				// 	that.lefMainAction(uni.upx2px(80) + 'px');
-				// }
-				// if (index == 2) {
-				// 	that.moveThree(0, 1);
-				// 	that.moveTwo(150, 0.1);
-				// 	that.move(150, 0.1);
-				// 	that.lefMainAction(uni.upx2px(160) + 'px');
-				// }
-			},
-			lefMainAction(mum) {
-				var testLM = this.$refs.lefMain;
-				animation.transition(
-					testLM, {
-						styles: {
-							transform: 'translate(' + mum + ',0px)'
-						},
-						duration: 400, //ms
-						timingFunction: 'ease',
-						delay: 0 //ms
-					},
-					function() {}
-				);
-			},
-			move(tran, opa) {
-				var testEl = this.$refs.box1;
-				animation.transition(
-					testEl, {
-						styles: {
-							transform: 'translate(' + tran + 'px,0px)',
-							transformOrigin: 'center center',
-							opacity: opa
-						},
-						duration: 800, //ms
-						timingFunction: 'ease',
-						delay: 0 //ms
-					},
-					function() {}
-				);
-				var textE2 = this.$refs.box2;
-				animation.transition(
-					textE2, {
-						styles: {
-							transform: 'translate(0px,' + tran + 'px) scale(' + opa + ')',
-							transformOrigin: 'center center',
-							opacity: opa
-						},
-						duration: 800, //ms
-						timingFunction: 'ease',
-						delay: 0 //ms
-					},
-					function() {}
-				);
-			},
-			moveTwo(tran, opa) {
-				var testEl = this.$refs.box3;
-				animation.transition(
-					testEl, {
-						styles: {
-							transform: 'translate(' + tran + 'px,0px)',
-							transformOrigin: 'center center',
-							opacity: opa
-						},
-						duration: 800, //ms
-						timingFunction: 'ease',
-						delay: 0 //ms
-					},
-					function() {}
-				);
-				var textE2 = this.$refs.box4;
-				animation.transition(
-					textE2, {
-						styles: {
-							transform: 'translate(0px,' + tran + 'px) scale(' + opa + ')',
-							transformOrigin: 'center center',
-							opacity: opa
-						},
-						duration: 800, //ms
-						timingFunction: 'ease',
-						delay: 0 //ms
-					},
-					function() {}
-				);
-			},
-			moveThree(tran, opa) {
-				var testEl = this.$refs.box5;
-				animation.transition(
-					testEl, {
-						styles: {
-							transform: 'translate(' + tran + 'px,0px)',
-							transformOrigin: 'center center',
-							opacity: opa
-						},
-						duration: 800, //ms
-						timingFunction: 'ease',
-						delay: 0 //ms
-					},
-					function() {}
-				);
-				var textE2 = this.$refs.box6;
-				animation.transition(
-					textE2, {
-						styles: {
-							transform: 'translate(0px,' + tran + 'px) scale(' + opa + ')',
-							transformOrigin: 'center center',
-							opacity: opa
-						},
-						duration: 800, //ms
-						timingFunction: 'ease',
-						delay: 0 //ms
-					},
-					function() {}
-				);
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-
-		min-height: 100%;
-		height: 100%;
-	}
-
-	.guide {
-		width: 100%;
-		height: 100%;
-	}
-
-
-
-	.image-size {
-		width: 750rpx;
-		height: 100%;
-		border: 1px solid red;
-	}
-
-	.title-box {
-		padding: 250rpx 0 120rpx 64rpx;
-	}
-
-	.guide-title {
-		font-size: 48rpx;
-		font-weight: bold;
-		color: rgba(58, 61, 68, 1);
-	}
-
-	.guide-subtitle {
-		margin-top: 20rpx;
-		font-size: 35rpx;
-		color: rgba(131, 136, 146, 1);
-		line-height: 50rpx;
-	}
-
-	.footer {
-		width: 231rpx;
-		height: 80rpx;
-		text-align: center;
-		position: fixed;
-		bottom: 116rpx;
-		left: 37%;
-		font-size: 30rpx;
-		color: #FFFFFF;
-		background-color: #2B9939;
-	}
-
-	.btn-box {
-		position: absolute;
-		z-index: 999;
-		right: 40rpx;
-		top: 120rpx;
-	}
-
-	.dots {
-		display: flex;
-		justify-content: center;
-		position: absolute;
-		z-index: 999;
-		height: 151rpx;
-		left: 0;
-		right: 0;
-		bottom: 20rpx;
-	}
-
-	.passbtn {
-		color: #ffffff;
-		text-align: center;
-		border-width: 1rpx;
-		border-color: rgba(255, 255, 255, 0.5);
-		border-style: solid;
-		border-radius: 30rpx;
-		font-size: 28rpx;
-		padding-top: 10rpx;
-		padding-bottom: 10rpx;
-		padding-left: 25rpx;
-		padding-right: 25rpx;
-	}
-
-	.dot {
-		margin: 0 4rpx;
-		width: 15rpx;
-		height: 15rpx;
-		background: #CDD2DD;
-		border-radius: 8rpx;
-		transition: all .6s;
-	}
-
-	.dot.active {
-		width: 40rpx;
-		background: #838892 !important;
-	}
-
-	/* 相对定位 */
-	.zqui-rel {
-		position: relative;
-	}
-
-	.swiper-css {
-		width: 750rpx;
-	}
-
-	.swiper-item {
-		width: 750rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/guide/judge.vue b/pages/guide/judge.vue
deleted file mode 100644
index 3bc1292..0000000
--- a/pages/guide/judge.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-	<view class="content"></view>
-</template>
-
-<script>
-	export default {
-		onLoad() {
-			this.checkGuide();
-		},
-		methods: {
-			checkGuide() {
-				console.log("进入checkGuide判断页");
-				// 思路： 检测是否有启动缓存，如果没有，就是第一次启动，第一次启动就去 启动介绍页面
-				try {
-					var launchFlag = uni.getStorageSync('launchFlag');
-					// console.log("launchFlag:" + launchFlag);
-					if (launchFlag) { //判断本地缓存跳转首页
-						
-						uni.switchTab({
-							url:'/pages/index/index'
-						})
-					} else { //没有缓存进入启动页引导页
-						console.log('去引导页');
-						uni.redirectTo({
-							url: '/pages/guide/guide'
-						});
-					}
-				} catch (e) {
-					console.log(e.message);
-				}
-			}
-		}
-	};
-</script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6d5d98e..b6877c2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,243 +1,318 @@
 <template>
-	<view class="Circle_friends">
-		<view class="circle_friends_wrapper">
-			<view v-if="isFshow">
-				<view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}">
-					<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
-						<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
-							style=" margin-left: 20rpx">
-						</view>
-						<view class="town_name">{{ street }}</view>
+	<view class="content">
+
+		<view class="content-top">
+			<view class="content-tops">
+				<view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
+					<image :src="userInfoData.avatar" mode="aspectFill"></image>
+				</view>
+				<view class="content-top_img" v-else @click="login">
+					<image src="@/static/test/KH.png" mode="aspectFit"></image>
+				</view>
+				<view class="content-top-title" @click="shopp" v-if="Object.keys(userInfoData).length>0">
+					<view class="top-titlea">
+						{{userInfoData.mer_info.mer_name}}
 					</view>
-					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-						<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
-					</navigator>
-				</view>
-				<!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
-					<view class="bg-img">
-						<img :src="bgColor" alt="">
+					<view class="top-titleb">
+						<image src="@/static/images/you.png" mode=""></image>
 					</view>
-				</view> -->
-			</view>
-			<view class="" v-if="!isFshow">
-				<view class="site-box1 flex_a_c_j_sb">
-				
-				<view class="place_wrapper flex_a_c" @click="selectLocation">
-					<view class="iconfont icon-weizhi"></view>
-					<view class="town_name">{{street}}</view>
 				</view>
-				<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none" >
-					<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
-				</navigator>
+				<view class="content-top-title" @click="shopp" v-else>
+					<view class="top-titlea">
+						请登录
+					</view>
+					<view class="top-titleb">
+						<image src="@/static/images/you.png" mode=""></image>
+					</view>
 				</view>
 			</view>
-
-
-			<zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr"
-				@change="dchange">
-			</zbpSwiper>
-
-
-
-			<view class="tabs_wrapper">
-				<!-- 	<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
-					:activeStyle="activeStyle" itemStyle="padding-left: 0px;  height: 33px;"></u-tabs>
-					<view class="tabs_wrapper-img">
-						<image src="@/static/images/zk.png" mode=""></image>
-					</view> -->
-
-				<view class="" style="width: 670rpx;">
-					<u-tabs :list="tabsData.list" @click="tabsChange" itemStyle=" height: 33px;" lineColor="#F84221"
-						:current="current" keyName="cate_name" :activeStyle="activeStyle"></u-tabs>
-				</view>
-				<view class="tabs_wrapper-img" @click="open">
-					<image src="@/static/images/zk.png" mode=""></image>
-				</view>
-			</view>
-			<view class=""> </view>
-			<view class="goodslist">
-				<WaterfallsFlow :wfList="productList" @itemTap='itemTap' :type="1" />
-			</view>
-			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
-				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-			</view>
-			<view class="empty_wrapper" v-if="emptyShow">
-				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
-			</view>
+			<retuntop style="margin-top: 20rpx; margin-right: 50rpx;" />
 		</view>
 
-		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-
-		<!-- <view class="bg_color"></view> -->
-
-		<!--<m-tabbar native>
-      <template v-slot:tabbar_index_2>
-        <view class="custom_style">
-          <view class="custom_style_icon"></view>
-		  <view class="custom_style-txt"  style="color: #282828;">
-		      发布
-		  </view>
-        </view>
-      </template>
-    </m-tabbar> -->
-
-		<uni-popup ref="popup" type="bottom">
-
-			<view class="classpage">
-				<view class="classpage-one">
-					全部分类
-					<image src="@/static/images/cuo.png" mode="" @click="cuo"></image>
+		<view class="content-middle">
+			<view class="content-middlea" v-for="(item,index) in  list" :key='index'>
+				<view class="content-middlea-one">
+					{{item.name}}
 				</view>
-				<view class="classpage-two">
-					点击进入分类
+				<view class="content-middlea-two">
+					{{item.value}}
 				</view>
-				<view class="classpage-three">
-					<view class="" v-for="(item,i) in tabsData.list" :key='i' @click="tabsChange2(item,i)">
-						{{item.cate_name}}
+			</view>
+
+		</view>
+		<view class="content-open" v-if='!isshow' @click="open">
+			<image src="@/static/images/zk.png" mode="aspectFit"></image>
+		</view>
+
+		<div v-if='isshow' style="margin-top: 80rpx;">
+			<!-- // type=price&time=today&merId=1 -->
+			<view class="tools-one"
+				style="font-size: 33rpx;font-family: PingFang SC-Medium, PingFang SC;font-weight: 500;color: #333333; margin-left: 30rpx;margin-bottom: 30rpx;">
+				订单数据统计
+
+			</view>
+			<ordertime ref='test' type='price' timetype='today' :merid='userInfoData.service.mer_id'></ordertime>
+		</div>
+
+		<view class="content-bottom" v-else>
+			<view class="content-order">
+				<view class="" v-for="(item,i) in order" :key='i'>
+					<view class="content-order-two">
+						{{item.value}}
+					</view>
+					<view class="content-order-one">
+						{{item.name}}
+					</view>
+
+				</view>
+			</view>
+
+			<view class="content-tools">
+				<view class="tools-one">
+					常用工具
+					<view class=""></view>
+				</view>
+				<view class="tools-two">
+					<view class="" v-for="(item,k) in typelist" :key='k' @click="navation(item)">
+						<view class="tools-two-img">
+							<image :src="item.image" mode=""></image>
+						</view>
+						<view class="tools-two-title"> {{item.name}}</view>
 					</view>
 				</view>
 			</view>
-		</uni-popup>
+
+
+			<view class="content-list">
+				<view class="tools-one">
+					订单列表
+					<view class=""></view>
+				</view>
+
+				<view class="content-list-one" v-for="(item,u) in productList" :key="u" @click="shopdetail(item)">
+					<view class="list-one">
+						<view class="list-one_left">
+							<view class="list-one_left-a">
+								<image src="@/static/images/f.png" mode="aspectFit"></image>
+
+							</view>
+							<view class="list-one_left-b">{{item.real_name}}</view>
+							<view class="list-one_left-c">
+								<image src="@/static/images/you.png" mode="aspectFit"></image>
+							</view>
+						</view>
+
+						<view class="list-one_right">
+							<view class="list-one_right-a">{{item.pay_time}}拍下 </view>
+							<view class="list-one_right-c">
+
+							</view>
+							<view class="list-one_right-b">待发货</view>
+						</view>
+					</view>
+
+					<view class="" v-for="(g,h) in item.orderProduct">
+
+
+						<view class="list-two">
+							<view class="list-two_left">
+								<image :src="g.cart_info.product.image" mode=""></image>
+							</view>
+							<view class="list-two_middle">
+								<view class="two_middle-title-a">
+									<view class="two_middle-title-a-left">{{ g.cart_info.product.store_name }}</view>
+									<view class="two_middle-title-a-right">
+										<view class="title-price">￥<span
+												style="font-size: 37rpx;font-weight: 600;">{{g.product_price.split('.')[0]}}.</span>
+											<span>{{g.product_price.split('.')[1]}}</span><strong></strong>
+										</view>
+										<view class="title-number">X{{g.product_num}}</view>
+									</view>
+								</view>
+								<view class="two_middle-title-b">
+									<view class="title-number">共{{g.product_num}}件 </view>
+									<view class="title-price">实收: <span style="color: #F84221;">￥</span><span
+											style="font-size: 37rpx;	color: #F84221;">{{g.cart_info.productAttr.price.split('.')[0] }}.</span><span
+											style="color: #F84221;">{{g.cart_info.productAttr.price.split('.')[1] }}</span>(含快递:￥0.00）
+									</view>
+								</view>
+
+							</view>
+
+						</view>
+
+						<view class="list-three">
+							<view class="list-three-one">
+								<view class="title-img">
+									<image src="@/static/images/dz.png" mode="aspectFit"></image>
+								</view>
+								<view class="order_id">
+									订单编号{{item.order_sn}}
+								</view>
+							</view>
+							<view class="list-three-one">
+								<view class="title-img">
+									<image src="@/static/images/zb.png" mode="aspectFit"></image>
+								</view>
+								<view class="adress">{{item.real_name}} {{ item.user_phone}} {{item.user_address}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="list-four">
+						<view class="btn">去发货 </view>
+					</view>
+
+				</view>
+
+				<view class="conter-img" v-if='productList.length == 0'>
+					<image src="@/static/images/noCart.png" mode="aspectFit"></image>
+				</view>
+
+				<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
+
+			</view>
+
+
+		</view>
+
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"
 			:isGoIndex="false"></authorize>
-		<view class="location" v-if="isshow">
-			<view class="locationa"> 位置权限使用说明 </view>
-			<view class="locationb"> 用于向你推荐最近门店 </view>
-		</view>
 	</view>
 </template>
 
 <script>
-	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import zbpSwiper from '@/components/zbpSwiper'
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlows.vue'
 	import authorize from '@/components/Authorize';
+	import ordertime from './component/timelist.vue'
+	import retuntop from '@/components/content-top/index.vue';
 	import {
 		getUserInfo
 	} from '@/api/user.js';
+	import image from '../../uni_modules/uview-ui/libs/config/props/image';
 	import {
-		getSlideAPI
-	} from '@/api/lihai.js'
-	import {
-		graphicLstApi,
-		getTopicList,
-		graphicStartApi
-	} from '@/api/community.js'
-	import {
-		getIndexData,
-		getDiy,
-		getArticleList,
-		getArticleCategoryLists
-	} from '@/api/api.js'
-	import {
-		getGeocoder,
-		merClassifly
-	} from '@/api/store.js';
-	import {
-		getArea,
-		getStreet
-	} from '@/api/article.js';
-	import {
-		Toast
-	} from '@/libs/uniApi'
+		orderStatistics,
+		getOrderList
+
+	} from "@/api/admin";
+
 	export default {
 		components: {
-			mTabbar,
-			zbpSwiper,
-			easyLoadimage,
-			WaterfallsFlow,
-			authorize
+			authorize,
+			ordertime,
+			retuntop
+
 		},
 		data() {
 			return {
-
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				activeStyle: {
-					color: '#333333',
-					fontWeight: 'bold',
-					transform: 'scale(1.04)'
-				},
-				isshow: false,
-				locationArr: ({}),
-				bgColor: '',
-				showPicker: false,
-				columnData: [],
+				list: [{
+					name: '今日成交额',
+					value: 0
+				}, {
+					name: '今日订单数',
+					value: 0
+				}, {
+					name: '本月订单数',
+					value: 0
+				}],
+				order: [{
+					name: '待付款',
+					value: 0
+				}, {
+					name: '待发货',
+					value: 0
+				}, {
+					name: '待收货',
+					value: 0
+				}, {
+					name: '待评价',
+					value: 0
+				}, {
+					name: '退款',
+					value: 0
+				}],
+
+				typelist: [{
+						name: '商品管理',
+						type: 1,
+						image: require('@/static/images/index7.png')
+					}, {
+						name: '订单管理',
+						type: 2,
+						image: require('@/static/images/index1.png')
+					}, {
+						name: '供货采购',
+						type: 3,
+						image: require('@/static/images/index4.png')
+					},
+					{
+						name: '进货管理',
+						type: 4,
+						image: require('@/static/images/index5.png')
+					}, {
+						name: '提现管理',
+						type: 5,
+						image: require('@/static/images/index8.png')
+					}, {
+						name: '客服记录',
+						type: 6,
+						image: require('@/static/images/index6.png')
+					}, {
+						name: '订单核销',
+						type: 7,
+						image: require('@/static/images/index2.png')
+					}, {
+						name: '全部',
+						type: 8,
+						image: require('@/static/images/index3.png')
+					}
+				],
+
+
+
 				show: false,
-				tabsData: {
-					list: [],
-					tabsActive: 0
-				},
-				tabsData1: {
-					list: [],
-					tabsActive: 0
-				},
+
 				where: {
-					category_id: 0,
+
 					page: 1,
-					limit: 10
+					limit: 3,
+					status: 2
 				},
 				loadend: false,
 				loading: false,
 				loadTitle: '加载更多',
-				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
-				keyword: '',
-				location: '',
+
 				emptyShow: false,
-				street: '',
 				productList: [],
-				recoList: [],
-				articleList: [],
-				streeta_id: '',
-				street: '',
-				bgColor: '',
-				backColor: 0,
-				isFshow: false,
-				scrollTop: 0,
-				show: true,
 				userid: '',
-				current: 0
+				userInfoData: {},
+
+				isshow: false,
+				where1: {
+					product_type: 0
+				}
 			}
 		},
 
 		onPullDownRefresh() {
-			this.getCateList()
 			this.getGoods(true)
-			this.Area()
 			uni.stopPullDownRefresh()
 		},
 
 		onLoad() {
 			this.selfLocation()
-			this.getCateList()
-			//this.getArticle()
-			this.getGoods(true)
-			this.Area()
-			//this.setPermissions()
-			// this.openTongZhi()
+			this.getUserInfo()
+
+
+
 
 		},
 
-		onTabItemTap(e) {
-			uni.pageScrollTo({
-				selector: ".Circle_friends",
-				scrollTop: 0
-			})
 
-		},
-		onHide() {
-			
-			uni.setTabBarItem({
-				index: 0,
-				text: "泸州",
-				iconPath: '/static/tabbar_icon/a.png',
-				selectedIconPath: '/static/tabbar_icon/a-a.png'
-			});
-			this.isFshow = false
 
-		},
 		onReachBottom() {
 
 			if (this.productList.length > 0) {
@@ -249,72 +324,75 @@
 		},
 
 		mounted() {
-			this.getUserInfo()
 
-		
 			this.selfLocation()
-			// #ifdef  H5
-			// 监听页面滚动事件
-			window.addEventListener("scroll", this.scrolling);
-			// #endif
-
-			this.$bus.$on('value-updated', (newValue) => {
-				// 更新父组件的值 
-				this.street = newValue.split(',')[0]
-			});
-
-		},
-
-		// #ifdef APP-PLUS
-		onPageScroll(e) {
-
-			const scrollTop = e.scrollTop;
-
-			// 导航条颜色透明渐变
-
-			if (scrollTop <= 20) {
-				this.backColor = 0
-				this.isFshow = false
-				this.show = true
-				uni.setTabBarItem({
-					index: 0,
-					text: "泸州",
-					iconPath: '/static/tabbar_icon/a.png',
-					selectedIconPath: '/static/tabbar_icon/a-a.png'
-				});
-			} else if (20 < scrollTop && scrollTop <= 100) {
-				this.backColor = 0.5
-				this.isFshow = true
-				this.show = false
-			} else if (scrollTop > 100) {
-				this.backColor = 1
-				this.isFshow = true
-				this.show = false
-				this.$nextTick(() => {
-					uni.setTabBarItem({
-						index: 0,
-						text: '返回顶部',
-						iconPath: '/static/tabbar_icon/top.png',
-						selectedIconPath: '/static/tabbar_icon/top.png'
-					});
-				})
-			}
 
 
 		},
-		// #endif
+		onShow() {
+			this.getUserInfo()
+		},
+
 		beforeDestroy() {
 			// 销毁监听事件
 			this.$bus.$off('value-updated')
 		},
 		methods: {
-			//弹出
-			open() {
-				this.$refs.popup.open()
+
+			login() {
+				uni.redirectTo({
+					url: '/pages/users/login/login_copy'
+				})
 			},
-			//隐藏
-			cuo() {
-				this.$refs.popup.close()
+			shopp() {
+				if (this.userInfoData.mer_info.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${this.userInfoData.service.mer_id}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pages/store/home/index?id=` + this.userInfoData.service.mer_id + `&type=7`
+					})
+
+				}
+			},
+			//界面跳转
+			shopdetail(item) {
+				uni.navigateTo({
+					url: '/pages/admin/orderDetail/index?id=' + item.order_id + '&mer_id=' + this.userInfoData
+						.service.mer_id
+				})
+			},
+			//获取订单数据
+			getindex() {
+				const data = {
+					product_type: this.where1.product_type
+				}
+				orderStatistics(this.userInfoData.service.mer_id, data).then(
+					res => {
+						this.order[0].value = res.data.order.unpaid
+						this.order[1].value = res.data.order.unshipped
+						this.order[2].value = res.data.order.untake
+						this.order[3].value = res.data.order.unevaluate
+						this.order[4].value = res.data.order.refund
+						this.list[0].value = res.data.data.today.payPrice
+						this.list[1].value = res.data.data.today.orderNum
+						this.list[2].value = res.data.data.month.orderNum
+					},
+					err => {
+						that.$util.Tips({
+							title: err.msg
+						})
+					}
+				);
+			},
+			open() {
+				this.isshow = !this.isshow
+				if (this.isshow) {
+					setTimeout((res) => {
+						this.$refs.test.timelist()
+					}, 1000)
+				}
 			},
 			// 授权回调
 			onLoadFun(data) {
@@ -326,218 +404,80 @@
 			 */
 			getUserInfo() {
 				getUserInfo().then(res => {
+					console.log(res)
 					this.userid = res.data.uid
+					this.userInfoData = res.data
+					this.getGoods(true)
+					this.getindex()
 				});
 			},
-			//分栏视频 图文查看
-			itemTap(item) {
 
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			//路由跳转
+			navation(item) {
 				if (this.userid) {
-					if (item.video_link.length > 0) {
-						uni.navigateTo({
-							// #ifdef MP || H5
-							url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
-							// #endif
-							// #ifdef APP
-							url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
-							// #endif
-						})
-					} else {
-						uni.navigateTo({
-							url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
-						})
+
+					switch (item.type) {
+						case 1:
+
+							uni.switchTab({
+								url: '/pages/product/list/index'
+							})
+							break;
+						case 2:
+							uni.navigateTo({
+								url: '/pages/admin/order/index?mer_id=' + this.userInfoData.service.mer_id +
+									'&type_id=' + this.userInfoData.mer_info.type_id
+
+							})
+							break;
+						case 3:
+							uni.navigateTo({
+								url: '/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=' +
+									this.userInfoData.mer_info.category_id
+							})
+							break;
+						case 4:
+							uni.navigateTo({
+								url: '/pages/users/order_list/index?status=-1'
+
+							})
+							break;
+						case 5:
+							uni.navigateTo({
+								url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id
+
+							})
+							break;
+						case 6:
+							uni.switchTab({
+								url: '/pages/chat/customer_list/index?type=1&mer_id=' + this.userInfoData.service
+									.mer_id
+							})
+							break;
+						case 7:
+							uni.navigateTo({
+								url: '/pages/admin/order_cancellation/index?mer_id=' + this.userInfoData.service
+									.mer_id
+
+							})
+							break;
+						case 8:
+							uni.navigateTo({
+								url: '/pages/moreProject/moreProject'
+							})
+							break;
 					}
 				} else {
 					this.isAuto = true;
 					this.isShowAuth = true
 				}
-
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			scrolling() {
-				// 滚动条距文档顶部的距离
-				let scrollTop =
-					window.pageYOffset ||
-					document.documentElement.scrollTop ||
-					document.body.scrollTop;
-				// 滚动条滚动的距离
-				let scrollStep = scrollTop - this.oldScrollTop;
-				// console.log("header 滚动距离 ", scrollTop);
-				// 更新——滚动前，滚动条距文档顶部的距离
-				this.oldScrollTop = scrollTop;
-				//变量windowHeight是可视区的高度
-				let windowHeight =
-					document.documentElement.clientHeight || document.body.clientHeight;
-				//变量scrollHeight是滚动条的总高度
-				let scrollHeight =
-					document.documentElement.scrollHeight || document.body.scrollHeight;
-
-				//滚动条到底部的条件
-				if (scrollTop + windowHeight == scrollHeight) {
-					//你想做的事情
-					// console.log("header  你已经到底部了");
-				}
-				if (scrollTop <= 20) {
-					this.backColor = 0
-					this.isFshow = false
-					uni.setTabBarItem({
-						index: 0,
-						text: "泸州",
-						iconPath: '/static/tabbar_icon/a.png',
-						selectedIconPath: '/static/tabbar_icon/a-a.png'
-					});
-				} else if (20 < scrollTop && scrollTop <= 100) {
-					this.backColor = 0.5
-					this.isFshow = true
-				} else if (scrollTop > 100) {
-					this.backColor = 1
-					this.isFshow = true
-
-					uni.setTabBarItem({
-						index: 0,
-						text: '返回顶部',
-						iconPath: '/static/tabbar_icon/top.png',
-						selectedIconPath: '/static/tabbar_icon/top.png'
-					});
-				}
-
-
 			},
 
-			tabsChange1(item) {
 
-				this.getArticleList(item.article_category_id)
-				this.streeta_id = item.id
-				this.tabsData1.tabsActive = item.index
-			},
-			async getArticle() {
-				let list = []
-
-				const {
-					data
-				} = await getArticleCategoryLists()
-				data.map((item, index) => {
-					if (item.title !== '首页推荐') {
-						list.push(item)
-					} else {
-						getArticleList(item.article_category_id).then(res => {
-							this.recoList = res.data.list
-						})
-					}
-				})
-
-				this.tabsData1.list = list
-				this.getArticleList(list[0].article_category_id)
-			},
-			async getArticleList(id) {
-				let obj = {
-					is_home: 1
-				}
-				const {
-					data
-				} = await getArticleList(id)
-				this.articleList = data.list
-			},
-			article(item) {
-				uni.navigateTo({
-					url: '/pages/news_details/index?id=' + item.article_id
-				})
-			},
-			selectPlce(e) {
-				this.street_id = e.value[1].code
-				this.town = e.value[1].name
-				this.getCloudShopMerId(e.value[1].code)
-			},
-			getCloudShopMerId(id) {
-				get_cloud_shop(id).then(res => {
-					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
-				})
-			},
-			selectLocation() {
-				this.showPicker = true
-			},
-			confirm(e) {
-
-				this.street = e.value[1].name
-
-				this.$nextTick(() => {
-					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
-
-				})
-				this.showPicker = false
-			},
-			changeHandler(e) {
-				const {
-					columnIndex,
-					value,
-					values,
-					index,
-					picker = this.$refs.uPicker
-				} = e;
-				if (columnIndex === 0) {
-					getStreet({
-						area_code: value[0]['code']
-					}).then(res => {
-						this.$refs.uPicker.setColumnValues(1, res.data);
-					});
-				}
-			},
-			Area() {
-				getArea({
-					city_code: 510500
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(0, res.data);
-					this.Street(res.data[0]['code']);
-				});
-			},
-			Street(code) {
-				getStreet({
-					area_code: code
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(1, res.data);
-				});
-			},
-			dchange(e) {
-
-				this.$refs.list.street = e.value[1].name
-				this.street = e.value[1].name
-			},
-			gogogo(item) {
-				if (item.video_link.length > 0) {
-					uni.navigateTo({
-						// #ifdef MP || H5
-						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
-						// #endif
-						// #ifdef APP
-						url: `/pages/short_video/appSwiper/index?id=${item.community_id}`
-						// #endif
-					})
-
-				} else {
-					uni.navigateTo({
-
-						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
-					})
-				}
-			},
-			giveStart(item) {
-				let status = item.relevance_id ? 0 : 1
-				graphicStartApi(item.community_id, {
-					status: status
-				}).then(res => {
-					if (item.relevance_id) {
-						item.count_start--;
-						item.count_start = item.count_start == 0 ? 0 : item.count_start
-						item.relevance_id = false
-					} else {
-						item.count_start++;
-						item.relevance_id = true
-					}
-				})
-			},
 			getGoods: function(isPage) {
 				let that = this;
 				if (that.loadend) return;
@@ -547,7 +487,7 @@
 
 				that.loading = true;
 				that.loadTitle = '';
-				graphicLstApi(that.where).then(res => {
+				getOrderList(that.where, this.userInfoData.service.mer_id).then(res => {
 					let list = res.data.list;
 					let productList = that.$util.SplitArray(list, that.productList);
 					let loadend = list.length < that.where.limit;
@@ -566,51 +506,10 @@
 					that.loadTitle = '加载更多';
 				});
 			},
-			/*获取分类列表*/
-			async getCateList() {
-				const {
-					data
-				} = await getTopicList()
-				this.tabsData.list = [{
-					cate_name: "热门推荐",
-					category_id: 0
-				}, ...data]
-			},
-			tabsChange(item) {
 
-				this.productList = []
-				this.where.category_id = item.category_id
-				this.emptyShow = false
-				this.loadend = false;
-				this.$set(this.where, 'page', 1)
-				this.getGoods(true)
-				this.street_id = item.id
-				this.tabsData.tabsActive = item.index
-				this.current = item.index
-
-			},
-			tabsChange2(item, index) {
-				// console.log(item,index)
-
-				this.productList = []
-				this.where.category_id = item.category_id
-				this.$refs.popup.close()
-				this.emptyShow = false
-				this.loadend = false;
-				this.$set(this.where, 'page', 1)
-				this.getGoods(true)
-				this.tabsData.tabsActive = index
-				this.current = index
-
-			},
 			selfLocation() {
 
-				if (uni.getStorageSync('loction') == true) {
-					this.isshow = false
-				} else {
-					this.isshow = true
-					uni.setStorageSync('loction', true);
-				}
+
 				uni.getLocation({
 					type: 'wgs84',
 					timeout: '1000',
@@ -620,120 +519,17 @@
 						let latitude, longitude;
 						latitude = res.latitude.toString();
 						longitude = res.longitude.toString();
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
 
-							let town = res.data.address_reference.town.title
-							let street_id = res.data.address_reference.town.id
-							this.street = res.data.address_component.street
-
-							this.$nextTick(() => {
-								this.$bus.$emit('value-updated', this.street + ',' +
-									street_id);
-
-							})
-						}).catch(err => {
-							this.isshow = false
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						})
 					},
 					fail: (err) => {
-						this.isshow = false
+
 
 					}
 				});
-			},
-
-			/**
-			 * 设置手机通知权限
-			 */
-			setPermissions() {
-				// #ifdef APP-PLUS  
-				if (plus.os.name == 'Android') { // 判断是Android
-					var main = plus.android.runtimeMainActivity();
-					var pkName = main.getPackageName();
-					var uid = main.getApplicationInfo().plusGetAttribute("uid");
-					var NotificationManagerCompat = plus.android.importClass(
-						"android.support.v4.app.NotificationManagerCompat");
-					//android.support.v4升级为androidx
-					if (NotificationManagerCompat == null) {
-						NotificationManagerCompat = plus.android.importClass(
-							"androidx.core.app.NotificationManagerCompat");
-					}
-					var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled();
-					// 未开通‘允许通知’权限，则弹窗提醒开通，并点击确认后，跳转到系统设置页面进行设置  
-					if (!areNotificationsEnabled) {
-						uni.showModal({
-							title: '通知权限开启提醒',
-							content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
-							showCancel: false,
-							confirmText: '去设置',
-							success: function(res) {
-								if (res.confirm) {
-									var Intent = plus.android.importClass('android.content.Intent');
-									var Build = plus.android.importClass("android.os.Build");
-									//android 8.0引导  
-									if (Build.VERSION.SDK_INT >= 26) {
-										var intent = new Intent(
-											'android.settings.APP_NOTIFICATION_SETTINGS');
-										intent.putExtra('android.provider.extra.APP_PACKAGE', pkName);
-									} else if (Build.VERSION.SDK_INT >= 21) { //android 5.0-7.0  
-										var intent = new Intent(
-											'android.settings.APP_NOTIFICATION_SETTINGS');
-										intent.putExtra("app_package", pkName);
-										intent.putExtra("app_uid", uid);
-									} else { //(<21)其他--跳转到该应用管理的详情页  
-										intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-										var uri = Uri.fromParts("package", mainActivity
-											.getPackageName(),
-											null);
-										intent.setData(uri);
-									}
-									// 跳转到该应用的系统通知设置页  
-									main.startActivity(intent);
-								}
-							}
-						});
-					}
-				} else if (plus.os.name == 'iOS') { // 判断是ISO
-					var isOn = undefined;
-					var types = 0;
-					var app = plus.ios.invoke('UIApplication', 'sharedApplication');
-					var settings = plus.ios.invoke(app, 'currentUserNotificationSettings');
-					if (settings) {
-						types = settings.plusGetAttribute('types');
-						plus.ios.deleteObject(settings);
-					} else {
-						types = plus.ios.invoke(app, 'enabledRemoteNotificationTypes');
-					}
-					plus.ios.deleteObject(app);
-					isOn = (0 != types);
-					if (isOn == false) {
-						uni.showModal({
-							title: '通知权限开启提醒',
-							content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
-							showCancel: false,
-							confirmText: '去设置',
-							success: function(res) {
-								if (res.confirm) {
-									var app = plus.ios.invoke('UIApplication', 'sharedApplication');
-									var setting = plus.ios.invoke('NSURL', 'URLWithString:',
-										'app-settings:');
-									plus.ios.invoke(app, 'openURL:', setting);
-									plus.ios.deleteObject(setting);
-									plus.ios.deleteObject(app);
-								}
-							}
-						});
-					}
-				}
-				// #endif  
 			}
+
+
+
 		}
 	}
 </script>
@@ -741,564 +537,393 @@
 <style lang="scss" scoped>
 	page {
 		background-color: #f4f7fe;
-
 		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
 
-	.location {
-		background-color: #f6f6f6;
-		width: 680rpx;
-		height: 150rpx;
-		position: absolute;
-		top: 0;
-		z-index: 9999;
-		border-radius: 20rpx;
-		left: 50%;
-		margin-left: -340rpx;
-		margin-top: 80rpx;
-		padding-left: 20rpx;
-
-		.locationa {
-			font-size: 28rpx;
-			color: #000;
-			font-weight: 500;
-			margin-top: 30rpx;
-			margin-bottom: 15rpx;
-		}
-
-		.locationb {
-			font-size: 20rpx;
-			color: #5a5a5a;
-		}
+	/deep/.statistical-page .navs {
+		top: 400rpx !important;
 	}
 
-	.Circle_friends {
-		position: relative;
-		padding: 0 0 87.72rpx 0;
-
-		background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
-	}
-
-	.classpage {
-		width: 100%;
-		height: calc(100vh - 50px);
-		background-color: #fff;
-		position: relative;
-		padding-top: 40rpx;
-		padding-left: 40rpx;
-		padding-right: 10rpx;
-
-		.classpage-one {
-
-			text-align: center;
-
-			image {
-				position: absolute;
-				right: 25rpx;
-				width: 42rpx;
-				height: 42rpx;
-			}
-		}
-
-		.classpage-two {
-			font-size: 26rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
-			font-weight: 400;
-			color: #333333;
-			margin-top: 77rpx;
-		}
-
-		.classpage-three {
-			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
-			margin-top: 35rpx;
-
-			view {
-				margin-right: 20rpx;
-				margin-bottom: 14rpx;
-				width: 210rpx;
-				height: 81rpx;
-				line-height: 81rpx;
-				text-align: center;
-				background: #FFFFFF;
-				border-radius: 11rpx 11rpx 11rpx 11rpx;
-				opacity: 1;
-				border: 2rpx solid #707070;
-			}
-
-		}
-	}
-
-	// .bg-img {
-	// 	position: absolute;
-	// 	width: 100%;
-	// 	height: 100%;
-
-	// 	top: 0;
-	// 	/* #ifdef MP || APP-PLUS */
-	// 	z-index: -100;
-	// 	/* #endif */
-	// 	/* #ifdef H5 */
-	// 	z-index: -100;
-	// 	/* #endif */
-	// 	z-index: -100;
-	// 	filter: blur(0);
-	// 	overflow: hidden;
-
-	// 	img {
-	// 		width: 100%;
-	// 		height: 100%;
-	// 		filter: blur(30rpx);
-	// 		transform: scale(1.5);
-	// 	}
-	// }
-
-	.sitebox {
-		animation-name: fadeIn;
-		animation-duration: 3s;
-		animation-fill-mode: forwards;
-	}
-
-	@keyframes fadeIn {
-		from {
-			opacity: 0;
-		}
-
-		to {
-			opacity: 1;
-		}
-	}
-
-	.site-box1 {
-		width: 706rpx;
-		/* #ifdef MP || APP-PLUS */
-		height: 160rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 120rpx;
-		/* #endif */
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 45rpx;
-		left: 20rpx;
-	
-		z-index: 999;
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 0rpx;
-			
-			font-size: 30rpx;
-		
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
-		
-		.iconfont {
-			font-size: 35.09rpx;
-		}
-
-	}
-
-	.site-box {
-		width: 100%;
-		/* #ifdef MP || APP-PLUS */
-		height: 160rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 120rpx;
-		/* #endif */
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 0rpx;
-		position: fixed;
-		z-index: 999;
-		/* #ifdef MP || APP-PLUS */
-		padding-top: 75rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		padding-top: 25rpx;
-		/* #endif */
-		// background-color: #e5e5e5;
-		background: url('@/static/images/bg2.png') no-repeat;
-		background-size: 100% 100%;
-
-		padding-right: 20rpx;
-
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 24.56rpx;
-			font-size: 30rpx;
-
-			opacity: 0;
-
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
-
-		.iconfont {
-			opacity: 0;
-			color: #fff;
-			font-size: 30rpx;
-			font-size: 35.09rpx;
-		}
-	}
-
-	.circle_friends_wrapper {
-		position: relative;
-
-		z-index: 2;
-	}
-
-	/deep/.u-tabs__wrapper__nav__line {
-		width: 46rpx;
-		margin-left: -2rpx;
-	}
-
-	/deep/.u-tabs__wrapper__nav__item {
-		// padding: 0 0px;
-		padding-left: 0rpx;
-		padding-right: 20rpx;
-	}
-
-	.search_wrapper {
-		width: 694.74rpx;
+	.conter-img {
+		width: 650rpx;
+		height: 400rpx;
 		margin: 0 auto;
-	}
+		margin-top: 60rpx;
 
-	.tabs_wrapper {
-		width: 720rpx;
-
-		margin: 0 auto;
-		margin-bottom: 21.05rpx;
-		// margin-left: -20rpx;
-		position: relative;
-	}
-
-	.tabs_wrapper-img {
-		width: 40rpx;
-		height: 60rpx;
-		position: absolute;
-		z-index: 888;
-
-		background-color: #fff;
-		right: 0rpx;
-		top: 0;
 
 		image {
-			width: 40rpx;
-			height: 40rpx;
-			margin-top: 10rpx;
-
-		}
-	}
-
-	.empty_wrapper {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.article_box {
-		height: 100%;
-		width: 694.74rpx;
-		margin: 0 auto;
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 0 24.56rpx;
-		box-sizing: border-box;
-
-		.title-box {
-			height: 87.72rpx;
-
-			text {
-				font-size: 28.07rpx;
-			}
+			width: 100%;
+			height: 100%;
 		}
 
-		.article-item {
+	}
+
+	.content {
+		padding-top: 80rpx;
+
+		.content-top {
 			display: flex;
-			// height: 175.44rpx;
 			justify-content: space-between;
-			border-bottom: 1px solid #f0f0f0;
-			padding: 21.05rpx 0;
 
-			.text {
-				flex: 1;
-				height: 122.81rpx;
-				margin-right: 17.54rpx;
-				font-size: 24rpx;
-				color: #999;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.name {
-					font-size: 26.32rpx;
-					color: #282828;
-				}
-			}
-
-			.pictrue {
-				width: 175.44rpx;
-				height: 122.81rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 8px;
-				}
-			}
 		}
-	}
 
-	.tabs_wrapper {
-		width: 723rpx;
-		margin: 0rpx auto;
-		margin-bottom: 21.05rpx;
-
-		.title {
-			font-size: 31.58rpx;
-			font-weight: bold;
-
-			&::before {
-				content: "";
-				display: inline-block;
-				width: 3px;
-				height: 31.58rpx;
-				background-color: #f84221;
-				margin-right: 7.02rpx;
-			}
-		}
-	}
-
-	.goodslist {
-		// display: flex;
-		margin: 0 auto;
-		width: 725rpx;
-	}
-
-	.goods {
-		margin: 0 auto;
-		width: 725rpx;
-
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-
-		.goods_item {
-			width: 356rpx;
-			border: 1px solid;
-			border-radius: 8px;
-			overflow: hidden;
-			background-color: #fff;
+		.content-tops {
 			display: flex;
-			flex-direction: column;
-			margin-bottom: 10.53rpx;
-			position: relative;
-			margin-top: -40rpx;
-
-			.kk {
-				width: 365rpx;
-				height: 251rpx;
-			}
-
-			.goods_item_img {
-				position: absolute;
-				top: 18rpx;
-				right: 18rpx;
-				width: 52rpx;
-				height: 52rpx;
+			height: 96rpx;
+			line-height: 96rpx;
 
+			.content-top_img {
+				margin-left: 16rpx;
+				width: 96rpx;
+				height: 96rpx;
+				border-radius: 50%;
 				image {
+					border-radius: 50%;
 					width: 100%;
 					height: 100%;
 				}
+
+
 			}
 
-			.goods_img {
-				width: 100%;
-				height: 294.74rpx;
+			.content-top-title {
+				margin-left: 11rpx;
+				display: flex;
+				font-size: 33rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #333333;
 
-				/deep/.easy-loadimage {
-					width: 100%;
-					height: 294.74rpx;
-					// border-radius: 8rpx;
-					position: relative;
+				.top-titleb {
+					width: 30rpx;
+					height: 30rpx;
+					margin-top: 5rpx;
+					margin-left: 10rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+
+				}
+			}
+		}
+
+		.content-middle {
+			padding: 0 60rpx;
+			display: flex;
+			justify-content: space-around;
+			margin-top: 61rpx;
+
+			.content-middlea {
+				width: 161rpx;
+				text-align: center;
+
+				.content-middlea-one {
+					font-size: 26rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+				}
+
+				.content-middlea-two {
+					font-size: 42rpx;
+					font-family: SF Pro Display-Semibold, SF Pro Display;
+					font-weight: 600;
+					color: #333333;
+					margin-top: 11rpx;
+				}
+			}
+		}
+
+		.content-open {
+			width: 70rpx;
+			height: 15rpx;
+			margin: 0 auto;
+			margin-top: 53rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.content-bottom {
+			background-color: #ffffff;
+			border-radius: 32rpx 32rpx 0px 0px;
+			margin-top: 41rpx;
+			padding-top: 46rpx;
+
+			.content-order {
+
+				display: flex;
+				justify-content: space-around;
+
+
+				view {
+					width: 100rpx;
+
+					text-align: center;
+
+					.content-order-one {
+						margin-top: 11rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #333333;
+					}
+
+					.content-order-two {
+						font-size: 42rpx;
+						font-family: SF Pro Display-Semibold, SF Pro Display;
+						font-weight: 600;
+						color: #333333;
+
+					}
 				}
 			}
 
-			.botm {
-				flex: 1;
-				padding: 0 14.04rpx;
-				padding-bottom: 21.05rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
+			.content-tools {
+				margin-top: 70rpx;
 
-				.title {
-					font-size: 30rpx;
+				.tools-one {
+					width: 133rpx;
+					line-height: 50rpx;
+					font-size: 33rpx;
 					font-family: PingFang SC-Medium, PingFang SC;
 					font-weight: 500;
 					color: #333333;
-					margin: 12px 0;
-					width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
+					margin-left: 16rpx;
 
-				.goods_info {
-					justify-content: space-between;
-
-					.g_img {
-						width: 49rpx;
-						height: 49rpx;
-						border-radius: 50%;
-					}
-
-					.g_name {
-						margin-left: 8.77rpx;
-						width: 100.63rpx;
-						text-overflow: ellipsis;
-						/* 溢出显示省略号 */
-						overflow: hidden;
-						/* 溢出隐藏 */
-						white-space: nowrap;
-						/* 强制不换行 */
-					}
-
-					.nice_box {
-						display: flex;
-						align-items: center;
-
-						.isshow {
-							color: #fe3530 !important;
-						}
-
-						.iconfont {
-							font-size: 30rpx;
-						}
-
-						.icon-shoucang1 {
-							color: #f84221;
-						}
-
-						.collect {
-							font-size: 24rpx;
-							margin-left: 5rpx;
-						}
+					view {
+						width: 46rpx;
+						height: 5rpx;
+						background: #F84221;
+						margin: 0 auto;
 					}
 				}
-			}
-		}
 
-		.goods_items {
-			width: 356rpx;
+				.tools-two {
 
-			border-radius: 8px;
-			overflow: hidden;
-			background-color: #fff;
-			display: flex;
-			flex-direction: column;
-			margin-bottom: 10.53rpx;
-			position: relative;
+					display: grid;
+					grid-template-columns: repeat(4, 1fr);
+					padding: 0 44rpx;
 
-			.goods_item_img {
-				position: absolute;
-				top: 18rpx;
-				right: 18rpx;
-				width: 52rpx;
-				height: 52rpx;
+					view {
+						margin-top: 24rpx;
+						text-align: center;
+
+						.tools-two-img {
+							width: 120rpx;
+							height: 120rpx;
+							margin-left: 20rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+					}
 
-				image {
-					width: 100%;
-					height: 100%;
 				}
 			}
 
-			.goods_img {
-				width: 100%;
-				height: 294.74rpx;
+			.content-list {
+				margin-top: 70rpx;
 
-				/deep/.easy-loadimage {
-					width: 100%;
-					height: 294.74rpx;
-					// border-radius: 8rpx;
-					position: relative;
-				}
-			}
-
-			.botm {
-				flex: 1;
-				padding: 0 14.04rpx;
-				padding-bottom: 21.05rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.title {
-					font-size: 30rpx;
+				.tools-one {
+					width: 133rpx;
+					line-height: 50rpx;
+					font-size: 33rpx;
 					font-family: PingFang SC-Medium, PingFang SC;
 					font-weight: 500;
 					color: #333333;
-					margin: 12px 0;
-					width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
+					margin-left: 16rpx;
+
+					view {
+						width: 46rpx;
+						height: 5rpx;
+						background: #F84221;
+
+						margin: 0 auto;
+					}
 				}
 
-				.goods_info {
-					justify-content: space-between;
 
-					.g_img {
-						width: 49rpx;
-						height: 49rpx;
-						border-radius: 50%;
-					}
+				.content-list-one {
+					padding: 25rpx 25rpx;
 
-					.g_name {
-						margin-left: 8.77rpx;
-						width: 100.63rpx;
-						text-overflow: ellipsis;
-						/* 溢出显示省略号 */
-						overflow: hidden;
-						/* 溢出隐藏 */
-						white-space: nowrap;
-						/* 强制不换行 */
-					}
-
-					.nice_box {
+					.list-one {
 						display: flex;
-						align-items: center;
+						justify-content: space-between;
 
-						.isshow {
-							color: #fe3530 !important;
+						.list-one_left {
+							display: flex;
+							height: 49rpx;
+							line-height: 49rpx;
+
+
+							.list-one_left-a {
+								width: 49rpx;
+								height: 49rpx;
+								margin-right: 20rpx;
+
+								image {
+									width: 100%;
+									height: 100%;
+								}
+							}
+
+							.list-one_left-c {
+								width: 26rpx;
+								height: 26rpx;
+
+								margin-top: 5rpx;
+
+								image {
+									width: 100%;
+									height: 100%;
+								}
+							}
 						}
 
-						.iconfont {
-							font-size: 30rpx;
+						.list-one_right {
+							display: flex;
+
+							font-size: 26rpx;
+							font-family: PingFang SC-Regular, PingFang SC;
+							font-weight: 400;
+
+							.list-one_right-a {
+
+								color: #333333;
+							}
+
+							.list-one_right-c {
+								height: 27rpx;
+								width: 2px;
+								margin-top: 5rpx;
+								background-color: #000;
+								margin-left: 15rpx;
+								margin-right: 15rpx;
+							}
+
+							.list-one_right-b {
+
+								color: #F84221;
+							}
+						}
+					}
+
+					.list-two {
+
+						display: flex;
+
+
+						margin-top: 26rpx;
+
+						.list-two_left {
+							width: 175rpx;
+							height: 175rpx;
+
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
 						}
 
-						.icon-shoucang1 {
-							color: #f84221;
+						.list-two_middle {
+							margin-left: 20rpx;
+
+							.two_middle-title-a {
+
+								display: flex;
+								justify-content: space-between;
+
+								.two_middle-title-a-left {
+									width: 387rpx;
+									font-size: 30rpx;
+									font-family: PingFang SC-Medium, PingFang SC;
+									font-weight: 500;
+									color: #333333;
+								}
+
+								.two_middle-title-a-right {
+									text-align: right;
+
+									.title-number {
+										font-size: 26rpx;
+										font-family: PingFang SC-Regular, PingFang SC;
+										font-weight: 400;
+										color: #737373;
+									}
+
+									.title-price {
+										font-size: 26rpx;
+										font-family: PingFang SC-Regular, PingFang SC;
+										font-weight: 400;
+										color: #F84221;
+										margin-top: -10rpx;
+
+
+									}
+								}
+							}
+
+							.two_middle-title-b {
+								display: flex;
+
+								.title-number {
+									font-size: 26rpx;
+									font-family: PingFang SC-Regular, PingFang SC;
+									font-weight: 400;
+									color: #737373;
+								}
+
+								.title-price {
+									font-size: 26rpx;
+									font-family: PingFang SC-Regular, PingFang SC;
+									font-weight: 400;
+									margin-top: -10rpx;
+
+								}
+							}
 						}
 
-						.collect {
-							font-size: 24rpx;
-							margin-left: 5rpx;
+
+					}
+
+					.list-three {
+						margin-top: 46rpx;
+
+						.list-three-one {
+							display: flex;
+							margin-top: 20rpx;
+
+							.title-img {
+								width: 28rpx;
+								height: 28rpx;
+
+								margin-top: 5rpx;
+								margin-right: 10rpx;
+
+								image {
+									width: 100%;
+									height: 100%;
+								}
+							}
+
+							font-size: 26rpx;
+							font-family: PingFang SC-Regular,
+							PingFang SC;
+							font-weight: 400;
+							color: #333333;
+
 						}
 					}
 				}
+
 			}
 		}
 	}
diff --git a/pages/index/index_two.vue b/pages/index/index_two.vue
deleted file mode 100644
index ea59e7b..0000000
--- a/pages/index/index_two.vue
+++ /dev/null
@@ -1,1757 +0,0 @@
-<template>
-	<view :class="bgTabVal==2?'fullsize noRepeat':bgTabVal==1?'repeat ysize':'noRepeat ysize'"
-		:style="'background-color:'+bgColor+';background-image: url('+bgPic+');min-height:'+windowHeight+'px;'" id="home">
-		<skeleton :show="showSkeleton" :isNodes="isNodes" ref="skeleton" loading="chiaroscuro" selector="skeleton" bgcolor="transparent"></skeleton>
-		<view v-if="!errorNetwork" :style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
-			<view class="page-index skeleton" :class="{ bgf: navIndex > 0 }">
-				<block>
-					<!-- #ifdef H5 -->
-					<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled" @changeDiy="changeDiy"></homeComb>
-					<view v-for="(item, index) in styleConfig" :key="index">
-						<block v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
-							<component
-								:is="item.name"
-								:index="index"
-								:isFixed="isFixed"
-								:dataConfig="item"
-								:tempArr="tempArr"
-								:userInfo="userInfo"
-								:tabTitle="navTop"
-								:navIndex="navIndex"
-								@changeTab="changeTab"
-								@detail="goDetail"
-								v-show="navIndex == 0"
-							></component>
-						</block>
-						<block v-if="item.name == 'headerSerch'">
-							<headerSerch
-								:dataConfig="item"
-								:tempArr="tempArr"
-								:userInfo="userInfo"
-								:tabTitle="navTop"
-								@changeTab="changeTab"
-								@detail="goDetail"
-							></headerSerch>
-						</block>
-						<block v-if="item.name == 'shopList' && hide_mer_status != 1 && navIndex == 0">
-							<shopList :dataConfig="item"></shopList>
-						</block>
-						<block v-if="item.name == 'tabNav'">
-							<tabNav
-								:isFixed="isFixed"
-								:dataConfig="item"
-								:tempArr="tempArr"
-								:userInfo="userInfo"
-								:tabTitle="navTop"
-								@changeTab="changeTab"
-								@detail="goDetail"
-							></tabNav>
-						</block>
-						<block v-if="item.name == 'homeComb' && !smallPage">
-							<homeComb :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy"></homeComb>
-						</block>
-						<block v-if="item.name == 'hotRanking' && hot_ranking_switch != 0 && navIndex == 0">
-							<hotRanking :dataConfig="item"></hotRanking>
-						</block>
-					</view>				
-					<!-- #endif -->
-					<!-- #ifdef MP || APP-PLUS -->
-					<homeComb class="home-comb" v-if="smallPage" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy"	@bindHeight="bindHeighta"></homeComb>
-					<block v-for="(item, index) in styleConfig" :key="index" >
-						<view v-show="navIndex == 0">
-							<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
-							<activeParty v-if="item.name == 'activeParty'" :dataConfig="item"></activeParty>
-							<bargain v-if="item.name == 'bargain'" :dataConfig="item"></bargain>
-							<blankPage v-if="item.name == 'blankPage'" :dataConfig="item"></blankPage>
-							<combination v-if="item.name == 'combination'" :dataConfig="item"></combination>
-							<topic v-if="item.name == 'topic'" :dataConfig="item"></topic>
-							<coupon v-if="item.name == 'coupon'" :dataConfig="item"></coupon>
-							<customerService v-if="item.name == 'customerService'" :dataConfig="item"></customerService>
-							<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
-							<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
-							<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast>
-							<menus :class="isMenu ? 'transform-view' : ''" v-if="item.name == 'menus'" :dataConfig="item"></menus>
-							<news v-if="item.name == 'news'" :dataConfig="item"></news>
-							<presellList v-if="item.name == 'presellList'" :dataConfig="item"></presellList>
-							<plantList v-if="item.name == 'plantList'" :dataConfig="item"></plantList>
-							<hotRanking v-if="item.name == 'hotRanking' && hot_ranking_switch != 0" :dataConfig="item"></hotRanking>
-							<promotionList v-if="item.name == 'promotionList'" :dataConfig="item" @changeTab="changeTab" :tempArr="tempArr" @detail="goDetail"></promotionList>
-							<richText v-if="item.name == 'richText'" :dataConfig="item"></richText>
-							<seckill v-if="item.name == 'seckill'" :dataConfig="item"></seckill>
-							<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
-							<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube>
-							<titles v-if="item.name == 'titles'" :dataConfig="item"></titles>
-							<shopList v-if="item.name == 'shopList' && hide_mer_status != 1" :dataConfig="item"></shopList>
-						</view>
-						<headerSerch v-if="item.name == 'headerSerch'" :dataConfig="item" :userInfo="userInfo"></headerSerch>
-						<tabNav v-if="item.name == 'tabNav'" :dataConfig="item" class="tabNav" :tabTitle="navTop"
-						@bindHeight="bindHeighta" @changeTab="changeTab" :isFixed="isFixed"></tabNav>
-					</block>
-					<!-- #endif -->
-					<view class="main" v-show="navIndex == 0">
-						<!-- 首页推荐 -->
-						<view class="index-product-wrapper">
-							<!-- 首发新品 -->
-							<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :indexP="true" :isLogin="isLogin"></recommend>
-							<view class="loadingicon acea-row row-center-wrapper" v-if="hostProduct.length > 0">
-								<text class="loading iconfont icon-jiazai" :hidden="hotLoading == false"></text>
-								{{ hotTitle }}
-							</view>
-						</view>
-					</view>
-					<view v-show="navIndex == 0" class="loadingicon acea-row row-center-wrapper" v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
-						<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
-						{{ loadTitle }}
-					</view>
-				</block>
-				<!-- 分类页 -->
-				<view class="productList" v-if="navIndex > 0">
-					<view class="sort acea-row" v-if="sortList.length>0"  :style="{ marginTop: sortMarTop + 'px' }">
-						<navigator
-							hover-class="none"
-							v-if="index < 9"
-							:url="'/pages/columnGoods/goods_list/index?id=' + item.store_category_id + '&title=' + item.cate_name"
-							class="item"
-							v-for="(item, index) in sortList"
-							:key="item.store_category_id"
-						>
-							<view class="pictrue cate_pictrue">
-								<easy-loadimage :image-src="item.pic"></easy-loadimage>
-								<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
-							</view>
-							<view class="text">{{ item.cate_name }}</view>
-						</navigator>
-						<view class="item" @click="bindMore" v-if="sortList.length >= 9">
-							<view class="pictrues acea-row row-center-wrapper"><text class="iconfont icon-gengduo1"></text></view>
-							<view class="text" style="margin-top: 22rpx;">更多</view>
-						</view>
-					</view>	
-					<block v-if="sortProduct.length > 0">
-						<view class="list acea-row row-between-wrapper">
-							<navigator @tap="goDetails(item)" class="item" v-for="(item, index) in sortProduct" :key="item.product_id">
-								<view class="pictrue">
-									<easy-loadimage :image-src="item.image"></easy-loadimage>
-									<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
-								</view>
-								<view class="text">
-									<view class="name line1">
-										<text class="name_text line2">{{ item.store_name }}</text>
-									</view>
-									<view class="acea-row row-middle">
-										<view class="money font-color-red">
-											￥
-											<text class="num">{{ item.price }}</text>
-										</view>
-									</view>
-									<view class="item_tags acea-row">
-										<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 delivery" v-if="item.delivery_free == 1">包邮</text>
-									</view>
-								</view>
-							</navigator>
-							<view class="loadingicon acea-row row-center-wrapper" v-if="sortProduct.length > 0 || sortProductLoading">
-								<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
-								{{ loadTitle }}
-							</view>
-						</view>
-					</block>		
-					<block v-if="sortProduct.length == 0">
-						<view class="noCommodity">
-							<view class="pictrue" style="margin: 0 auto;">
-								<image src="/static/images/noCart.png"></image>
-								<view>暂无商品，去看点什么吧</view>
-							</view>
-							<recommend :hostProduct="hostProduct"></recommend>
-						</view>
-					</block>
-				</view>
-				<!-- #ifdef H5 -->
-				<a v-if="beian_sn" href="https://beian.miit.gov.cn/#/Integrated/index" class="copyRight">{{beian_sn}}</a>
-				<!-- #endif -->
-				<!-- #ifndef H5 -->
-				<view v-if="beian_sn" class="copyRight">{{beian_sn}}</view>
-				<!-- #endif -->
-				<view v-if="newData.status && newData.status.status" class="diyheight"></view>
-			</view>
-		</view>
-		<view v-else>
-			<view class="error-network">
-				<image src="/static/images/error-network.png"></image>
-				<view class="title">网络连接断开</view>
-				<view class="con">
-					<view class="label">请检查情况：</view>
-					<view class="item">· 在设置中是否已开启网络权限</view>
-					<view class="item">· 当前是否处于弱网环境</view>
-					<view class="item">· 版本是否过低，升级试试吧</view>
-				</view>
-				<view class="btn" @click="reconnect">重新连接</view>
-			</view>
-		</view>
-		<!-- #ifdef APP-PLUS -->
-		<view class="privacy-wrapper" v-if="privacyStatus">
-			<view class="privacy-box">
-				<view class="title">用户协议与隐私政策</view>
-				<view class="content">
-					请务必审慎阅读、充分理解“用户协议 与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个
-					人信息。你可以在“设置”中查看、变更、 删除个人信息并管理你的授权。
-					<br />
-					你可以阅读
-					<navigator url="/pages/users/user_about/index?from=sys_user_agree">《用户协议》</navigator>与<navigator url="/pages/users/user_about/index?from=sys_userr_privacy">《隐私政策》</navigator>
-					了解 详细信息。如你同意，请点击“我同意”开始接受我们的服务。
-				</view>
-				<view class="btn-box">
-					<view class="btn-item" @click="confirmApp">我同意</view>
-					<view class="btn" @click="closeModel">随便逛逛</view>
-				</view>
-			</view>
-		</view>
-		<!-- #endif -->
-		<!-- 发送给朋友图片 -->
-		<view class="share-box" v-if="isIntegral">
-			<!-- #ifndef H5 -->
-			<image src="/static/images/share-info.png" @click="closeShare"></image>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<image src="/static/images/share-info-wechat.png" @click="closeShare"></image>
-			<!-- #endif -->
-		</view>
-		<!-- 优惠券弹窗 -->
-		<view class="coupon_popups" v-if="showCoupon">
-			<view class="bg"></view>
-			<view class="con" :style="{ 'background-image': `url(${domain}/static/diy/couponWindow${keyColor}.png)` }">
-				<scroll-view scroll-y="true" >
-					<view v-for="(item, index) in couponArray" class="item">
-						<view class="left">
-							<view class="price">￥ <text>{{item.coupon_price}}</text></view>
-							<view class="max_price" v-if="item.use_min_price > 0">满{{item.use_min_price}}可用</view>
-							<view class="max_price" v-else>无门槛</view>
-						</view>
-						<view class="right">
-							<view class="time line1" v-if="item.coupon_type">有效期{{item.use_start_time}} - {{item.use_end_time}}</view>
-							<text class="coupon_type">{{couponTypeMsg[item.type] || '店铺券'}}</text>
-							<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='bnt1 b-color' hover-class="none"><text class="title titleSize">{{item.title}}</text>
-							<view class="title titleColor">
-								有效期:{{item.use_start_time}}-{{item.use_end_time}}
-							</view>
-							</navigator>
-						</view>
-					</view>
-				</scroll-view>
-				<view class="text">优惠券已放入您的账户中，点击“优惠券”去使用</view>
-				<view class='iconfont icon-guanbi3' @click="showCoupon = false"></view>
-			</view>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #endif -->
-		<view class="foot" v-if="newData.status && newData.status.status">
-			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
-				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
-					@click="goRouter(item)">
-					<block v-if="item.link == activeRouter">
-						<image :src="item.imgList[0]"></image>
-						<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
-						</view>
-					</block>
-					<block v-else>
-						<image :src="item.imgList[1]"></image>
-						<view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
-					</block>
-				</view>
-			</view>
-		</view>
-		<view v-if="overflow" class="overflow-mask" @touchmove.stop.prevent="() => {}"></view>
-	</view>
-</template>
-<script>
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-let app = getApp();
-import { getUserInfo } from '@/api/user.js';
-import { getDiy, getPageDiy, getIndexData, getAppVersion ,getUserCoupons} from '@/api/api.js';
-import { getNavigation } from '@/api/public.js';
-// #ifdef MP-WEIXIN
-import { getTemlIds } from '@/api/api.js';
-import { SUBSCRIBE_MESSAGE, TIPS_KEY } from '@/config/cache';
-// #endif
-import { getShare, getconfig } from '@/api/public.js';
-import { goShopDetail } from '@/libs/order.js';
-import { mapGetters } from 'vuex';
-import { getProductslist, getProductHot, storeCategory } from '@/api/store.js';
-import { initiateAssistApi } from '@/api/activity.js';
-import { setVisit, spread } from '@/api/user.js';
-import recommend from '@/components/recommend';
-// #ifndef H5
-import passwordPopup from '@/components/passwordPopup';
-// #endif
-// #ifdef H5
-import mConfig from './component/index.js';
-// #endif
-import authorize from '@/components/Authorize';
-// #ifdef MP || APP-PLUS
-import activeParty from './component/activeParty';
-import headerSerch from './component/headerSerch';
-import homeComb from './component/homeComb';
-import coupon from './component/coupon';
-import bargain from './component/bargain';
-import blankPage from './component/blankPage';
-import combination from './component/combination';
-import customerService from './component/customerService';
-import goodList from './component/goodList';
-import guide from './component/guide';
-import liveBroadcast from './component/liveBroadcast';
-import menus from './component/menus';
-import news from './component/news';
-import topic from './component/topic';
-import presellList from './component/presellList';
-import plantList from './component/plantList';
-import pictureCube from './component/pictureCube'
-import shopList from './component/shopList';
-import richText from './component/richText';
-import seckill from './component/seckill';
-import swiperBg from './component/swiperBg';
-import tabNav from './component/tabNav';
-import titles from './component/titles';
-import hotRanking from "./component/hotRanking.vue";
-// #endif
-import { silenceBindingSpread, configMap, isWeixin } from '@/utils/index';
-import history from '@/mixins/history';
-import shareScence from '@/libs/spread';
-import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-import {getNewPeopleCouponLst} from '@/api/activity.js'
-import { HTTP_REQUEST_URL } from '@/config/app';
-export default {
-	computed: configMap({hide_mer_status:0,recommend_switch:0,beian_sn:'',share_title:'',site_name:'',hot_ranking_switch:0,navigation: {}},
-	mapGetters(['isLogin','uid','keyColor'])),
-	mixins: [history],
-	components: {
-		easyLoadimage,
-		recommend,
-		authorize,
-		// #ifndef H5
-		passwordPopup,
-		// #endif
-		// #ifdef H5
-		...mConfig,
-		// #endif
-		// #ifdef MP || APP-PLUS
-		activeParty,
-		headerSerch,
-		homeComb,
-		bargain,
-		coupon,
-		blankPage,
-		combination,
-		customerService,
-		goodList,
-		guide,
-		liveBroadcast,
-		menus,
-		news,
-		topic,
-		presellList,
-		plantList,
-		pictureCube,
-		shopList,
-		richText,
-		seckill,
-		swiperBg,
-		tabNav,
-		titles,
-		hotRanking
-		// #endif
-	},
-	data() {
-		return {
-			domain: HTTP_REQUEST_URL,
-			couponTypeMsg:{
-				10: '通用券',
-				11: '品类券',
-				12: '跨店券'
-			},
-			styleConfig: [],
-			showSkeleton: true, //骨架屏显示隐藏
-			isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-			privacyStatus: false,
-			errorNetwork: false,
-			userInfo: {},
-			loading: false,
-			isAuto: false, //没有授权的不会自动授权
-			isShowAuth: false, //是否隐藏授权
-			statusBarHeight: statusBarHeight,
-			navIndex: 0,
-			navTop: [],
-			subscribe: false,
-			followUrl: '',
-			followHid: true,
-			followCode: false,
-			sortList: [],
-			window: false,
-			navH: '',
-			couponList: [],
-			marTop: 0,
-			loadend: false,
-			loading: false,
-			loadTitle: '加载更多',
-			sortProduct: [],
-			where: {
-				pid: 0,
-				page: 1,
-				limit: 6
-			},
-			is_switch: true,
-			hostProduct: [],
-			hotPage: 1,
-			hotLimit: 30,
-			hotScroll: true,
-			hotLoading: false,
-			hotTitle: '加载更多',
-			explosiveMoney: [],
-			domOffsetTop: 50,
-			// #ifdef MP || APP-PLUS
-			isFixed: true,
-			// #endif
-			// #ifdef H5
-			isFixed: false,
-			// #endif
-			isScrolled: false,
-			scrolled: false,
-			goodScroll: true, //精品推荐开关
-			params: {
-				//精品推荐分页
-				page: 1,
-				limit: 10
-			},
-			tempArr: [], //精品推荐临时数组
-			numConfig: 0,
-			pageInfo: '', // 精品推荐全数据
-			swiperCur: 0,
-			d: '',
-			h: '',
-			m: '',
-			s: '',
-			sum_h: '',
-			sortMarTop: 0,
-			globalDatas: {},
-			// #ifdef MP || APP-PLUS
-			mpHeight: 108,
-			// #endif
-			// #ifndef MP || APP-PLUS
-			mpHeight: 0,
-			// #endif
-			currSpid: '',
-			_options:{},
-			isIntegral: false,
-			appUpdate: {},
-			sortMpTop: 0,
-			bgColor: '',
-			bgPic: '',
-			bgTabVal: '',
-			windowHeight: 0,
-			domHeight: 0,
-			isHeaderSerch: false,
-			showCoupon: false,
-			couponArray: [],
-			smallPage: false,
-			isMenu: false,
-			isScale: false,
-			homeCombData: {},
-			appScroll: 0,
-			footerStatus: false,
-			newData: {},
-			activeRouter: '',
-			countNum: 0,
-			overflow: false
-		};
-	},
-	/**
-	 * 用户点击右上角分享
-	 */
-	// #ifdef MP
-	onShareAppMessage: function() {
-		let that = this;
-		wx.showShareMenu({
-			withShareTicket: true,
-			menus: ['shareAppMessage', 'shareTimeline']
-		});
-		return {
-			title: that.share_title,
-			path: '/pages/index/index?spid=' + that.uid
-		};
-	},
-	onShareTimeline: function() {
-		let that = this;
-		return {
-			title: that.share_title,
-			query: {
-				spid: that.uid
-			},
-			imageUrl: ''
-		};
-	},
-	// #endif
-	onLoad(options) {
-		let that = this
-		this._options = options;
-		// #ifdef APP-PLUS
-		const pages = getCurrentPages();
-		const page = pages[pages.length - 1];
-		const currentWebview = page.$getAppWebview();
-		currentWebview.setStyle({
-		  pullToRefresh: {
-		    support: !that.isSupport,
-		    style: plus.os.name === 'Android' ? 'circle' : 'default'
-		  }
-		});
-		that.isSupport = !that.isSupport;
-		that.appVersionConfig(); //APP版本检测
-		// #endif
-		that.$nextTick(function() {
-			uni.getSystemInfo({
-				success: function(res) {
-					that.windowHeight = res.windowHeight;
-				}
-			});
-		})
-		that.pageLoad(options);
-	},
-	created(options) {
-		let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-		let curRoute = routes[routes.length - 1].route //获取当前页面路由
-		this.activeRouter = '/' + curRoute
-	},
-	onShow() {
-		let that = this
-		that.getConfig();
-		that.isIntegral = uni.getStorageSync('isIntegral')
-		// #ifdef APP-PLUS
-		if(that.appUpdate.openUpgrade == '1'){
-			that.alertAppUpdate();
-		}
-		// #endif
-		that.getNav()
-		that.loadCoupon()
-	},
-	onHide() {
-		uni.setStorageSync('isIntegral',false)
-	},
-	onReady() {
-
-	},
-	watch: {
-		globalDatas(nVal, oVal) {
-			// #ifdef H5
-			this.ShareInfo(nVal);
-			// #endif
-		},
-	},
-	onPullDownRefresh(){
-		this.overflow = true;
-		this.reconnect();
-	},
-	methods: {
-		loadCoupon(){
-			if(!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')){
-				getNewPeopleCouponLst().then(res => {
-					this.couponArray = res.data;
-					setTimeout(() => {
-						this.showCoupon = this.couponArray.length > 0;
-						uni.setStorageSync('show_coupon', '1')
-					}, 1500);
-				})
-			}
-		},	
-		pageLoad(options){
-			let that = this;
-			if (options.spid) {
-				that.currSpid = options.spid;
-				app.globalData.spid = options.spid;
-			}
-			// #ifdef APP-PLUS
-			try {
-				let val = uni.getStorageSync('privacyStatus') || true;
-				if (!val) {
-					this.privacyStatus = true;
-				}
-			} catch (e) {}
-			this.snycNetWork();
-			// #endif
-			// #ifdef MP
-			if (options.scene) {
-				let value = that.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) options.id = value.id;
-				//记录推广人uid
-				if (value.spid) {
-					that.currSpid = value.spid;
-					app.globalData.spid = value.spid;
-				}
-			}
-			// #endif
-			shareScence(that.currSpid, that.isLogin);
-			this.isLogin && silenceBindingSpread();
-			this.getIndexConfig()
-			Promise.all([
-				this.diyData(0),
-			]);
-			if (this.isLogin) {
-				this.getUserInfo();
-				// #ifdef MP
-				this.getHistory();
-				// #endif
-			}
-		},
-		closeShare(){
-			uni.setStorageSync('isIntegral',false);
-			this.isIntegral = uni.getStorageSync('isIntegral');
-		},
-		bindHeighta(data) {
-			// #ifdef APP-PLUS
-			this.sortMpTop = data.top + data.height;
-			// #endif
-		},
-		// 重新链接
-		reconnect() {
-			uni.getNetworkType({
-				success: res => {
-					this.errorNetwork = res.networkType === 'none';
-					if(!this.errorNetwork){
-						this.pageLoad(this._options);
-					}else{
-						uni.stopPullDownRefresh();
-						that.overflow = false;
-					}
-				}
-			});
-		},
-		getNav(){
-			getNavigation().then(res => {
-				this.newData = res.data
-				if (this.newData.status && this.newData.status.status) {
-					uni.hideTabBar()
-				} else {
-					uni.showTabBar()
-				}
-			})
-		},
-		// #ifdef APP-PLUS
-		snycNetWork() {
-			uni.getNetworkType({
-				success: res => {
-					this.errorNetwork = res.networkType === 'none';
-				}
-			});
-		},
-		// 同意隐私协议
-		confirmApp() {
-			uni.setStorageSync('privacyStatus', true);
-			this.privacyStatus = false;
-		},
-		// 关闭 Model
-		closeModel() {
-			this.privacyStatus = false;
-		},
-		// #endif
-		// 对象转数组
-		objToArr(data) {
-			let obj = Object.keys(data).sort();
-			let m = obj.map(key => data[key]);
-			return m;
-		},
-		goRouter(item) {
-			var pages = getCurrentPages();
-			var page = (pages[pages.length - 1]).$page.fullPath;
-			if (item.link == page) return
-			uni.switchTab({
-				url: item.link,
-				fail(err) {
-					uni.redirectTo({
-						url: item.link
-					})
-				}
-			})
-		},
-		diyData(id) {
-			let that = this;
-			let data = {
-				id: id
-			}
-			that.styleConfig = []
-			getDiy(data).then(res => {
-				setTimeout(() => {
-					that.isNodes++;
-				}, 0);
-				that.errorNetwork = false
-				uni.setNavigationBarTitle({
-					title: res.data.title
-				});
-				let data = res.data;
-				if (data.is_bg_color) {
-					that.bgColor = data.color_picker
-				}
-				if (data.is_bg_pic) {
-					that.bgPic = data.bg_pic
-					that.bgTabVal = data.bg_tab_val
-				}
-				that.styleConfig = that.objToArr(res.data.value);
-				that.styleConfig.forEach((item, index, arr) => {
-					if (item.name == 'headerSerch' || item.name == 'homeComb') {
-						that.isHeaderSerch = true
-						if(item.name == 'homeComb'){
-							that.homeCombData = item
-							that.smallPage = true;
-						}
-					}
-					if (item.name == 'pageFoot') {
-						if (item.status && item.status.status) {
-							this.newData = item
-							setTimeout((e) => {
-								that.$set(that, 'footerStatus', true);
-							}, 50)
-						}
-						uni.setStorageSync('FOOTER_BAR', item.status && item.status.status ? true : false)
-						item.menuList.map((path, index) => {
-							if (path.link === '/pages/order_addcart/order_addcart') {
-								uni.setStorageSync('FOOTER_ADDCART', index)
-							}
-						})
-						arr.splice(index, 1);
-					}
-					if(item.name == 'menus'){
-						that.isMenu = true;
-					}
-					that.get_host_product()
-					uni.pageScrollTo({
-						scrollTop: 0,
-					})
-					uni.stopPullDownRefresh();
-					that.overflow = false;
-				});
-			});
-		},
-		changeDiy(id) {
-			let that = this;
-			if(id){
-				that.styleConfig = []
-				getPageDiy({id: id}).then(res => {
-					uni.setNavigationBarTitle({
-						title: res.data.title
-					});
-					that.isScale = true
-					let data = res.data;
-					if (data.is_bg_color) {
-						that.bgColor = data.color_picker
-					}
-					if (data.is_bg_pic) {
-						that.bgPic = data.bg_pic
-						that.bgTabVal = data.bg_tab_val
-					}
-					that.styleConfig = that.objToArr(res.data.value);
-					that.styleConfig.forEach((item, index, arr) => {
-						if (item.name == 'headerSerch' || item.name == 'homeComb' ||  item.name == 'tabNav') {
-							that.styleConfig.splice(index, 1);
-						}
-						if(item.name == 'menus'){
-							that.isMenu = true;
-						}
-					});
-					that.isHeaderSerch = true
-					that.isScale = true
-					uni.pageScrollTo({
-						scrollTop: 0,
-					})
-				}).catch(err => {
-					that.styleConfig = []
-				});
-			}else{
-				that.diyData(0)
-				that.isScale = false
-			}
-		},
-		// 微信登录回调
-		onLoadFun: function(e) {
-			this.isShowAuth = false;
-		},
-		// #ifdef APP-PLUS
-		appVersionConfig() {
-			var that = this;
-			//app升级
-			// 获取本地应用资源版本号
-			getAppVersion().then(res => {
-				that.$set(that.appUpdate, 'androidAddress', res.data.androidAddress);
-				that.$set(that.appUpdate, 'appVersion', res.data.appVersion);
-				that.$set(that.appUpdate, 'iosAddress', res.data.iosAddress);
-				that.$set(that.appUpdate, 'openUpgrade', res.data.openUpgrade);
-				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-					let nowVersion = (inf.version).split('.').join('');
-					let appVersion = (res.data.appVersion).split('.').join('');
-					that.$set(that.appUpdate, 'alert', appVersion > nowVersion);
-					that.alertAppUpdate();
-				});
-			})
-		},
-		alertAppUpdate(){
-			if(this.appUpdate.alert) {
-				uni.getSystemInfo({
-					success: (res) => {
-						uni.showModal({
-							title: '更新提示',
-							content: '发现新版本，是否前去下载?',
-							showCancel: this.appUpdate.openUpgrade != '1',
-							cancelColor: '#eeeeee',
-							confirmColor: '#FF0000',
-							success:(response)=> {
-								if (response.confirm) {
-									switch (res.platform) {
-										case "android":
-											plus.runtime.openURL(this
-												.appUpdate
-												.androidAddress);
-											break;
-										case "ios":
-											plus.runtime.openURL(encodeURI(
-												this.appUpdate
-												.iosAddress));
-											break;
-									}
-								}
-							}
-						});
-					}
-				})
-			}
-		},
-		// #endif
-		getConfig() {
-			// 获取配置
-			getconfig()
-				.then(res => {
-					let self = this;
-					this.globalDatas = res.data;
-					uni.$emit('configData', res.data);
-				})
-				.catch(err => {});
-		},
-		// 分类页更多
-		bindMore() {
-			try {
-				uni.setStorageSync('storeIndex', this.navTop[this.navIndex].pid);
-				uni.switchTab({
-					url: '/pages/goods_cate/goods_cate'
-				});
-			} catch (e) {}
-		},
-		goDetails(item) {
-			goShopDetail(item, this.uid).then(res => {
-				if (this.isLogin) {
-					initiateAssistApi(item.activity_id)
-						.then(res => {
-							let id = res.data.product_assist_set_id;
-							uni.hideLoading();
-							uni.navigateTo({
-								url: '/pages/activity/assist_detail/index?id=' + id
-							});
-						})
-						.catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							});
-						});
-				} else {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			});
-		},
-		/**
-		 * 获取个人用户信息
-		 */
-		getUserInfo: function() {
-			let that = this;
-			getUserInfo().then(res => {
-				that.userInfo = res.data;
-			});
-		},
-		// 记录会员访问
-		setVisit() {
-			setVisit({
-				url: '/pages/index/index'
-			}).then(res => {
-				// console.log(res);
-			});
-		},
-		// 导航分类切换
-		changeTab(e) {
-			let self = this;
-			if (this.navIndex == e.index) return;
-			this.navIndex = e.index;
-			if (e.index > 0) {
-				storeCategory({
-					pid: e.pid
-				}).then(res => {
-					this.sortList = res.data.length > 9 ? res.data.splice(0, 9) : res.data;
-					if (this.sortList.length > 0) {
-						this.where.pid = e.pid;
-						this.where.page = 1;
-						this.loadend = false;
-						this.loading = false;
-						this.sortProduct = [];
-						this.get_product_list();
-						uni.pageScrollTo({
-							scrollTop: 0,
-						})
-					}
-				});
-				self.sortMarTop = 10;
-			}
-		},
-		//分类产品
-		get_product_list: function() {
-			let that = this;
-			if (that.loading) return;
-			that.loading = true;
-			that.loadTitle = '';
-			getProductslist(that.where)
-				.then(res => {
-					let list = res.data.list;
-					let productList = that.$util.SplitArray(list, that.sortProduct);
-					let loadend = list.length < that.where.limit;
-					that.loadend = loadend;
-					that.loading = false;
-					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					that.$set(that, 'sortProduct', productList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				})
-				.catch(err => {
-					that.loading = false;
-					that.loadTitle = '加载更多';
-				});
-		},
-		/**
-		 * 获取我的推荐
-		 */
-		get_host_product: function() {
-			let that = this;
-			let num = that.hotLimit;
-			if (!that.hotScroll) return;
-			if (that.hotLoading) return;
-			that.hotLoading = true;
-			that.hotTitle = '';
-			getProductHot(that.hotPage, that.hotLimit).then(res => {
-				let list = res.data.list;
-				let productList = that.$util.SplitArray(list, that.hostProduct);
-				let hotScroll = list.length <= num && list.length != 0;
-				that.hotScroll = hotScroll;
-				that.hotLoading = false;
-				that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
-				that.$set(that, 'hostProduct', productList);
-				that.$set(that, 'hotPage', that.hotPage + 1);
-			});
-		},
-		// 首页数据
-		getIndexConfig: function() {
-			let that = this;
-			getIndexData().then(res => {
-				res.data.category.unshift({
-					cate_name: '首页'
-				});
-				that.$set(that, 'navTop', res.data.category);
-				// #ifdef H5
-				that.subscribe = res.data.subscribe;
-				// #endif
-				// 小程序判断用户是否授权；
-				// #ifdef MP
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.userInfo']) {
-							that.window = that.couponList.length ? true : false;
-						} else {
-							that.window = false;
-						}
-					}
-				});
-				// #endif
-				// #ifndef MP
-				if (that.isLogin) {
-					that.window = false;
-				} else {
-					that.window = that.couponList.length ? true : false;
-				}
-				// #endif
-				that.reloadData();
-			});
-		},
-		reloadData() {
-			setTimeout(() => {
-				this.showSkeleton = false
-			}, 500)
-		},
-		// 授权关闭
-		authColse: function(e) {
-			this.isShowAuth = e;
-		},
-		// 首发新品详情
-		goDetail(item) {
-			if (item.activity && item.activity.type === '2' && !this.isLogin) {
-				// #ifdef H5
-				uni.showModal({
-					title: '提示',
-					content: '您未登录，请登录！',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '/pages/users/login/index'
-							});
-						} else if (res.cancel) {
-						}
-					}
-				});
-				// #endif
-				// #ifdef MP
-				this.$set(this, 'isAuto', true);
-				this.$set(this, 'isShowAuth', true);
-				// #endif
-				return;
-			} else {
-				goShopDetail(item, this.uid).then(res => {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.id}`
-					});
-				});
-			}
-		},
-		//#ifdef H5
-		ShareInfo(datas) {
-			let data = this.storeInfo;
-			let href = location.href;
-			if (this.$wechat.isWeixin()) {
-				if (this.isLogin) {
-					href = href.indexOf('?') === -1 ? href + '?spid=' + this.uid : href + '&spid=' + this.uid;
-				} else {
-					href = href;
-				}
-				let configAppMessage = {
-					desc: datas.share_info,
-					title: datas.share_title,
-					link: href,
-					imgUrl: datas.share_pic
-				};
-				this.$wechat
-					.wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareAppMessage', 'onMenuShareTimeline'], configAppMessage)
-					.then(res => {
-						// console.log(res, '=============================>>WXAPI');
-					})
-					.catch(err => {
-						// console.log(err);
-					});
-			}
-		},
-		//#endif
-	},
-	mounted() {
-		let query = uni.createSelectorQuery().in(this);
-		query.select("#home").boundingClientRect();
-		query.exec(res => {
-			this.domHeight = res[0].height;
-		})
-	},
-	// 滚动到底部
-	onReachBottom() {
-		if (this.navIndex == 0) {
-			// 首页加载更多
-			this.get_host_product();
-		} else {
-			// 分类栏目加载更多
-			if (this.sortProduct.length > 0) {
-				this.get_product_list();
-			} else {
-				this.get_host_product();
-			}
-		}
-	},
-	// 滚动监听
-	onPageScroll(e) {
-		if (this.isHeaderSerch) {
-			let isScroll = false
-			this.appScroll = e.scrollTop
-			// #ifdef APP-PLUS
-			// isScroll = e.scrollTop > 50
-			// #endif
-			// #ifdef MP || H5
-			// isScroll = e.scrollTop > 50 && this.windowHeight - this.domHeight >= 50
-			// #endif
-			isScroll = e.scrollTop > 50
-			this.isScrolled = isScroll;
-		} else {
-			this.isScrolled = false
-		}
-		// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-		uni.$emit('scroll');
-	}
-};
-</script>
-<style>
-
-</style>
-<style lang="scss" scoped>
-.bnt1{
-	color: red;
-}
-.overflow-mask{
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 1001;
-	width: 100%;
-	height: 100vh;
-	background: transparent;
-	transition: all .5s;
-}
-page {
-	display: flex;
-	flex-direction: column;
-}
-/deep/ .home-comb .my-main{
-	left: 0;
-	position: fixed;
-	top: 0;
-	width: 100%;
-	z-index: 30;
-}
-.main {
-	padding: 0 20rpx;
-}
-.colum0{
-	white-space: nowrap; 
-	display: flex;
-}
-.ysize {
-	background-size: 100%;
-}
-.fullsize {
-	background-size: 100% 100%;
-}
-.repeat {
-	background-repeat: repeat;
-}
-.noRepeat {
-	background-repeat: no-repeat;
-}
-.privacy-wrapper {
-	z-index: 999;
-	position: fixed;
-	left: 0;
-	top: 0;
-	bottom: 0;
-	right: 0;
-	width: 100%;
-	height: 100%;
-	background: #7f7f7f;
-	.privacy-box {
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		width: 560rpx;
-		padding: 50rpx 45rpx 0;
-		background: #fff;
-		border-radius: 20rpx;
-		.title {
-			text-align: center;
-			font-size: 32rpx;
-			text-align: center;
-			color: #333;
-			font-weight: 700;
-		}
-		.content {
-			margin-top: 20rpx;
-			line-height: 1.5;
-			font-size: 26rpx;
-			color: #666;
-			navigator {
-				display: inline-block;
-				color: #e93323;
-			}
-		}
-		.btn-box {
-			margin-top: 40rpx;
-			text-align: center;
-			font-size: 30rpx;
-			.btn-item {
-				height: 82rpx;
-				line-height: 82rpx;
-				background: linear-gradient(90deg, #f67a38 0%, #f11b09 100%);
-				color: #fff;
-				border-radius: 41rpx;
-			}
-			.btn {
-				padding: 30rpx 0;
-			}
-		}
-	}
-}
-.coupon_popups{
-	z-index: 999;
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	text-align: center;
-	.bg{
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0,0,0,.5);
-	}
-	.con{
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%,-50%);
-		width: 680rpx;
-		height:900rpx;
-		background-size: 100% 700rpx;
-		background-repeat: no-repeat;
-		scroll-view{
-			width: 610rpx;
-			height: 306rpx;
-			padding-top: 20rpx;
-			margin: 300rpx auto 0;
-		}
-		.item{
-			display: flex;
-			align-items: center;
-			width: 100%;
-			height: 164rpx;
-			background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABDgAAAFICAMAAACC1L7bAAAAilBMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////2N2iNAAAALXRSTlMA9xnrZyf0790ev4d1Egr7cl9TI+XNbVpAtKSUjX0NB6ucgnpDMdjRxUw7LdTK5bIiAAAF40lEQVR42uzcWW7CMBSF4UNImAIBEcpUKJQixt79b68qD1VLgNi8VHL+bxHH9tH1VUE+SeedVs1QkMmNAYGotTrzdNJWiSRtGe7J5aRnQFh2m1z3ndeGB05ycjYgOPNct2WLvuGRoZxMDAhPbbnSDQmPlDKpnCwMCNE+UsGxYSixl5MXA4JUP+lKbCgXyUHbgED1J/pjbHAwloONAcGKqfP8jVYqlTUNCNdQPxKDmw+V6hoQsEZOm+et0VOJHiUzwnbgjPQ3Uwlm6BC6WBcRZ6SHpa7QMqNimj19ezd42OqBLcO3CF/K2IG/5lR3Tbm8oQIuVd/S4CfmnYJqiyXtDJ5eM92QdAyohI6UG7zVB7qWpQZUxRufVJ4z6kb65dytG1AZR80NzzkMTkkkKY/XpAaqJWVqFICvmfiSBcDTp1hnDsDTiFX+AHzVCA4A3ggOAAQHgAKCA8D/Izi+2KmDAQAAAAZC/tYDGMB9CiJAHMARB9ATByAO4IgD6IkDEAdwxAH0xAGIAzjiAHriAMQBHHEAPXEA4gCOOICeOABxAEccQE8cgDiAIw6gJw5AHMARB9ATByAOxk4dDAAAADAQ8rcewADuUxDBEQfQEwcgDuCIA+iJAxAHcMQB9MQBiAM44gB64gDEARxxAD1xAOIAjjiAnjgAcQBHHEBPHIA4gCMOoCcOQBzAEQfQEwcgDuCIA+iJAxAHcMQB9MQBiAM44gB64gDEARxxAD1xAOIAjjiAnjgAcQBHHEBPHIA4gCMOoCcOQBzAEQfQEwcgDuCIA+iJAxAHcMQB9MQBjJ06GAAAAGAg5G89gAHcpyASB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cTB26mAAAACAgZC/9QAOYJ+CCMQBhDiAP3EA4gBCHMCfOABxACEO4E8cgDiAEAfwJw5AHECIA/gTByAOIMQB/IkDEAcQ4gD+xAGIAwhxAH/iAMQBhDiAP3EA4gBCHMCfOABxACEO4E8cgDiAEAfwJw5AHECIA/gTByAOIMQB/IkDEAcQ4gD+xAGIAwhxAH/iAMQBhDiAP3EA4gBCHMCfOABxACEOYOzUwQAAAAADIX/rAQzgPgVRTxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giIOxU4cEAIBAEMBAIUny/esR4BTqzBZi0CcOQBxAEAfQJw5AHEAQB9AnDkAcQBAH0CcOQBxAEAfQJw5AHEAQB9AnDkAcQBAH0CcOQBxAEAfQt+4AfNnrDK+dO8tNGIaiMHwSoBAKlERAQ4FQhnSQeve/vaoPRVWayTza/7cI2/ecKwNwMtDEAMDJRFMDACdb7Qz3WZ3SRJqX2fJ1YEBI9no23GGyGemP8sLZgYBkig3uLqpaLDk6EIy5tDY42iaqsTgZEISppJnBSZSqwdKAEAwlZhVHg1KNcrZiEICHQhK9ipOoVIucRVz476wfcWToLVOroQGeG8wlkXI42akF7zeE4BbyvRv6WS3UoaCVhd+m+jUy9JPqhmoFQRrHukkNfUzU7bgywF+fXJPONmpFZATvDSttAD1it6hQMwY/+O8pVcWV3aVOW/XBFyfw1TjXP8mXod1MvewN8NE6Vo3jmU2wdrlaEDXDb9HhqHqjF0OLWL1cDfDOKVGz5PBmaCKJdBQhWl9idUiy/QczSy31UxjgjYfpYxar6hufchGebA48QgAAAABJRU5ErkJggg==');
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			margin-bottom: 20rpx;
-			border-radius: 20rpx;
-			position: relative;
-			.left{
-				width: 160rpx;
-				text-align: center;
-				&::after{
-					content: "";
-					display: block;
-					height: 110rpx;
-					border-right: 1px dashed #E6E6E6;
-					position: absolute;
-					left: 178rpx;
-					top: 25rpx;
-				}
-				.price{
-					color: #E93323;
-					font-size: 26rpx;
-					font-weight: bold;
-					text{
-						font-size: 46rpx;
-					}
-				}
-				.max_price{
-					color: #999999;
-					font-size: 18rpx;
-					margin-top: 8rpx;
-				}
-			}
-			.right{
-				width: 440rpx;
-				padding: 0 20rpx;
-				.title{
-					color: #333333;
-					font-size: 26rpx;
-				}
-				.time{
-					color: #999999;
-					font-size: 22rpx;
-					margin-top: 20rpx;
-				}
-				.bnt1{
-					.titleSize{
-						font-weight: 700;
-						font-size: 33rpx;
-					}
-					.titleColor{
-						margin-top: 20rpx;
-						color: #999999;
-					}
-				}
-				.coupon_type{
-					position: absolute;
-					color: #fff;
-					font-size: 15rpx;
-					width: 30rpx;
-					text-align: center;
-					height: auto;
-					background: #E93323;
-					top: 0;
-					right: 20rpx;
-					line-height: 26rpx;
-					padding: 5rpx 0 15rpx;
-					&::after{
-						content: "";
-						width: 0;
-						height: 0;
-						border-left: 14rpx solid transparent;
-						border-right: 14rpx solid transparent;
-						border-bottom: 14rpx solid #fff;
-						position: absolute;
-						bottom: -4rpx;
-						left: 2rpx;
-					}
-				}
-			}
-		}
-		.text{
-			width: 600rpx;
-			margin: 30rpx auto 0;
-			font-size: 20rpx;
-			color: #ffffff;
-		}
-		.icon-guanbi3{
-			color: #ffffff;
-			font-size: 70rpx;
-			position: absolute;
-			bottom: -80rpx;
-			left: 320rpx;
-		}
-	}
-}
-.item_tags{
-	margin-top: 8rpx;
-	display: flex;
-}
-.item_tags .tags_item {
-	display: inline-block;
-	font-size: 20rpx;
-	text-align: center;
-	border-radius: 5rpx;
-	padding: 0 4rpx;
-	line-height: 28rpx;
-	margin-right: 8rpx;
-}
-.item_tags .tags_item.ticket{
-	color: var(--view-theme);
-	border: 1px solid var(--view-theme);
-}
-.item_tags .tags_item.delivery{
-	color: #FF9000;
-	border: 1px solid #FF9000;
-}
-.copyRight{
-	margin: 60rpx auto 20rpx;
-	max-width: 690rpx;
-	font-size: 20rpx;
-	color: #707070;
-	text-decoration: none;
-}
-.share-box {
-	z-index: 1000;
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-.error-network {
-	position: fixed;
-	left: 0;
-	top: 0;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	width: 100%;
-	height: 100%;
-	padding-top: 40rpx;
-	background: #fff;
-	padding-top: 30%;
-	image {
-		width: 414rpx;
-		height: 336rpx;
-	}
-	.title {
-		position: relative;
-		top: -40rpx;
-		font-size: 32rpx;
-		color: #666;
-	}
-	.con {
-		font-size: 24rpx;
-		color: #999;
-		.label {
-			margin-bottom: 20rpx;
-		}
-		.item {
-			margin-bottom: 20rpx;
-		}
-	}
-	.btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 508rpx;
-		height: 86rpx;
-		margin-top: 100rpx;
-		border: 1px solid #d74432;
-		color: #e93323;
-		font-size: 30rpx;
-		border-radius: 120rpx;
-	}
-}
-.area-row {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	display: block;
-	width: 100%;
-	text-align: center;
-}
-.page-index {
-	display: flex;
-	flex-direction: column;
-	min-height: 100%;
-	.page_content {
-		/* #ifdef MP || APP-PLUS */
-		padding-top: 270rpx;
-		/* #endif */
-		.page_bg{
-			background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
-		}
-		.nav {
-			padding: 0 0rpx 30rpx;
-			flex-wrap: wrap;
-			/* #ifdef MP */
-			margin-top: 0;
-			/* #endif */
-			/* #ifdef H5 */
-			margin-top: 0;
-			/* #endif */
-			.item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				width: 20%;
-				margin-top: 30rpx;
-				image {
-					width: 82rpx;
-					height: 82rpx;
-				}
-			}
-		}
-		.index-product-wrapper {
-			.nav-bd {
-				display: flex;
-				align-items: center;
-				.item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					width: 25%;
-					.txt {
-						font-size: 32rpx;
-						color: #282828;
-					}
-					.label {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						width: 124rpx;
-						height: 32rpx;
-						margin-top: 5rpx;
-						font-size: 24rpx;
-						color: #999;
-					}
-					&.active {
-						color: $theme-color;
-						.label {
-							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-							border-radius: 16rpx;
-							color: #fff;
-						}
-					}
-				}
-			}
-			.list-box {
-				display: flex;
-				flex-wrap: wrap;
-				justify-content: space-between;
-				.item {
-					width: 345rpx;
-					margin-bottom: 20rpx;
-					background-color: #fff;
-					border-radius: 10px;
-					overflow: hidden;
-					image {
-						width: 100%;
-						height: 345rpx;
-					}
-					.text-info {
-						padding: 10rpx 20rpx 15rpx;
-						.title {
-							color: #222222;
-						}
-						.old-price {
-							margin-top: 8rpx;
-							font-size: 26rpx;
-							color: #aaaaaa;
-							text-decoration: line-through;
-							text {
-								margin-right: 2px;
-								font-size: 20rpx;
-							}
-						}
-						.price {
-							display: flex;
-							align-items: flex-end;
-							color: $theme-color;
-							font-size: 34rpx;
-							font-weight: 800;
-							text {
-								padding-bottom: 4rpx;
-								font-size: 24rpx;
-								font-weight: normal;
-							}
-							.txt {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								width: 28rpx;
-								height: 28rpx;
-								margin-left: 15rpx;
-								margin-bottom: 10rpx;
-								border: 1px solid $theme-color;
-								border-radius: 4rpx;
-								font-size: 22rpx;
-								font-weight: normal;
-							}
-						}
-					}
-				}
-				&.on {
-					display: flex;
-				}
-			}
-		}
-	}
-}
-.productList {
-	background-color: #f1f1f1;
-	min-height: 70vh;
-	.sort {
-		width: 710rpx;
-		max-height: 380rpx;
-		background: rgba(255, 255, 255, 1);
-		border-radius: 16rpx;
-		padding: 8rpx 0rpx 30rpx;
-		flex-wrap: wrap;
-		margin: 25rpx auto 0 auto;
-		.item {
-			width: 20%;
-			margin-top: 30rpx;
-			text-align: center;
-			.pictrues {
-				width: 90rpx;
-				height: 90rpx;
-				background: rgba(248, 248, 248, 1);
-				border-radius: 50%;
-				margin: 0 auto;
-			}
-			.easy-loadimage {
-				width: 90rpx;
-				height: 90rpx;
-				display: inline-block;
-			}
-			.text {
-				color: #272727;
-				font-size: 24rpx;
-				margin-top: 10rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-		}
-	}
-}
-.productList .list {
-	padding: 0 20rpx;
-}
-.productList .list.on {
-	background-color: #fff;
-	border-top: 1px solid #f6f6f6;
-}
-.productList .list .item {
-	width: 345rpx;
-	margin-top: 20rpx;
-	background-color: #fff;
-	border-radius: 10rpx;
-	.name{
-		display: flex;
-		align-items: center;
-	}
-}
-.productList .list .item.on {
-	width: 100%;
-	display: flex;
-	border-bottom: 1px solid #f6f6f6;
-	padding: 30rpx 0;
-	margin: 0;
-}
-.productList .list .item .pictrue {
-	position: relative;
-	width: 100%;
-	height: 345rpx;
-}
-.productList .list .item .pictrue.on {
-	width: 180rpx;
-	height: 180rpx;
-}
-/deep/.productList .list .item .pictrue image,
-/deep/.productList .list .item .pictrue uni-image,
-/deep/.productList .list .item .pictrue .easy-loadimage{
-	width: 100%;
-	height: 100%;
-	border-radius: 10rpx 10rpx 0 0;
-}
-/deep/.productList .list .item .pictrue uni-image.origin-img{
-	border-radius: 10rpx 10rpx 0 0;
-}
-.productList .list .item .pictrue image.on {
-	border-radius: 6rpx;
-}
-.productList .list .item .text {
-	padding: 14rpx 17rpx 26rpx 17rpx;
-	font-size: 28rpx;
-	color: #212121;
-}
-.productList .list .item .text.on {
-	width: 508rpx;
-	padding: 0 0 0 22rpx;
-}
-.productList .list .item .text .money {
-	font-size: 26rpx;
-	font-weight: bold;
-	margin-top: 8rpx;
-}
-.productList .list .item .text .coupon {
-	background: rgba(255, 248, 247, 1);
-	border: 1px solid rgba(233, 51, 35, 1);
-	border-radius: 4rpx;
-	font-size: 20rpx;
-	margin-left: 18rpx;
-	padding: 1rpx 4rpx;
-}
-.productList .list .item .text .money.on {
-	margin-top: 50rpx;
-}
-.productList .list .item .text .money .num {
-	font-size: 34rpx;
-}
-.pictrue {
-	position: relative;
-	
-	.border-picture {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		border-radius: 10rpx 10rpx 0 0;
-		background: center/cover no-repeat;
-	}
-}
-.cate_pictrue,/deep/.cate_pictrue image,/deep/.cate_pictrue .easy-loadimage,/deep/.cate_pictrue uni-image{
-	width: 82rpx;
-	height: 82rpx;
-	margin: 0 auto;
-}
-.fixed {
-	z-index: 100;
-	position: fixed;
-	left: 0;
-	top: 0;
-	background-color: #fff;
-	box-shadow: 0 10rpx 20rpx -5rpx rgba(0, 0, 0, 0.06);
-}
-.diyheight{
-	height: 98rpx;
-	height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-	height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-}
-.page-footer {
-	position: fixed;
-	bottom: 0;
-	z-index: 30;
-	display: flex;
-	align-items: center;
-	justify-content: space-around;
-	width: 100%;
-	height: 98rpx;
-	height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-	height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	box-sizing: border-box;
-	border-top: 1px solid #F3F3F3;
-	background-color: #fff;
-	box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
-	padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
-	padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
-	&.filter{
-		filter: blur(2rpx);
-	}
-	.foot-item {
-		display: flex;
-		width: max-content;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		position: relative;
-		.count-num {
-			position: absolute;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 40rpx;
-			height: 40rpx;
-			top: 0rpx;
-			right: -15rpx;
-			color: #fff;
-			font-size: 20rpx;
-			background-color: #FD502F;
-			border-radius: 50%;
-			padding: 4rpx;
-		}
-	}
-	.foot-item image {
-		height: 50rpx;
-		width: 50rpx;
-		text-align: center;
-		margin: 0 auto;
-	}
-	.foot-item .txt {
-		font-size: 24rpx;
-	}
-}
-</style>
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 0cd8bba..5988551 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,89 +1,105 @@
 <template>
 	<view class="gather">
+
 		<block v-if="isShow&&userInfoData.mer_info.mer_name">
-			<view class="" v-if="userInfoData.mer_info.business_status==2">
+			<view class="" v-if="userInfoData.mer_info.setting_status==1">
 				<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
 					<view class="special_work com" v-if="true">
 						<view class="title">市级供应链</view>
+						<view class="special_work-title" v-if='codenote.length>0'>
+							<view class="special_work-titlea">
+								<image src="@/static/images/de1.png" mode="aspectFit" v-if='codenote[0].status==0'>
+								</image>
+								<image src="@/static/images/de2.png" mode="aspectFit" v-if='codenote[0].status==1'>
+								</image>
+								<image src="@/static/images/de3.png" mode="aspectFit" v-if='codenote[0].status==2'>
+								</image>
+							</view>
+							<view class="special_work-titlec" v-if='codenote[0].status==1'>交易申请状态：已通过</view>
+							<view class="special_work-titled" v-if='codenote[0].status==2'>交易申请状态：已拒绝</view>
+							<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
+						</view>
 						<view class="content">
 							<view class="examine"
 								@click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
-								<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
+								<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFit"></image>
 								<text class="text">在售管理</text>
 							</view>
 							<view class="examine"
 								@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
-								<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
-								<text class="text">财务管理</text>
+								<image class="icon_img" src="@/static/images/index18.png" mode="aspectFit">
+									<text class="text">财务管理</text>
 							</view>
 							<!-- 	<view class="examine"
 							@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
-							<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
+								<image class="icon_img" src="@/static/images/index18.png"  mode="aspectFit">
 							<text class="text">财务管理</text>
 						</view>
 						<view class="examine"
 							@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
-							<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
+								<image class="icon_img" src="@/static/images/index1.png"  mode="aspectFit">
 							<text class="text">订单管理</text>
 						</view> -->
 							<view class="examine"
 								@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
-								<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
+								<image class="icon_img" src="@/static/images/index9.png" mode="aspectFit">
 								</image>
 								<text class="text">入库管理</text>
 							</view>
 							<view class="examine"
 								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
-								<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
-								<text class="text">商户设置</text>
+								<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
+									<text class="text">商户设置</text>
 							</view>
+
 							<view class="examine"
-								@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
-								<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
-								</image>
-								<text class="text">交易申请</text>
-							</view>
-							<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
-								<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
+								@click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,'商品管理')">
+								<image class="icon_img" src="@/static/images/index7.png" mode="aspectFit">
 								</image>
 								<text class="text">商品管理</text>
 							</view>
 							<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
-								<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
+								<image class="icon_img" src="@/static/images/index8.png" mode="aspectFit">
 								</image>
 								<text class="text">提现管理</text>
 							</view>
 							<view class="examine"
 								@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
-								<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
+								<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
 								</image>
 								<text class="text">订单核销</text>
 							</view>
+							<view class="examine" @click="paydecimal">
+								<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
+								</image>
+								<text class="text">保证缴纳金</text>
+							</view>
+							
 							<!-- <view class="examine"
 								@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
-								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
+							<image class="icon_img" src="@/static/images/index13.png"  mode="aspectFit">
 								</image>
 								<text class="text">委托销售</text>
 							</view>
 							<view class="examine"
 								@click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
-								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
+							<image class="icon_img" src="@/static/images/index17png"  mode="aspectFit">
 								</image>
 								<text class="text">委托订单</text>
 							</view> -->
 							<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
 							<image class="icon_img"
-								src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
+								src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png"  mode="aspectFit">
 							</image>
 							<text class="text">视频教学</text>
 						</view> -->
 							<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
-						<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
+						<image class="icon_img" src="@/static/images/cwgk.png"  mode="aspectFit">
 						</image>
 						<text class="text">财务公开</text>
 					</view> -->
 							<!-- <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
-						<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
+						<image class="icon_img" :src="`${prefix}ddgl.png`"  mode="aspectFit">
 						</image>
 						<text class="text">订单管理</text>
 					</view> -->
@@ -96,100 +112,114 @@
 					<view class="business com" v-if="true">
 						<view class="special_work com">
 							<view class="title">我的店铺</view>
+							<view class="special_work-title" v-if='codenote.length>0'>
+								<view class="special_work-titlea">
+									<image src="@/static/images/de1.png" mode="aspectFit" v-if='codenote[0].status==0'>
+									</image>
+									<image src="@/static/images/de2.png" mode="aspectFit" v-if='codenote[0].status==1'>
+									</image>
+									<image src="@/static/images/de3.png" mode="aspectFit" v-if='codenote[0].status==2'>
+									</image>
+								</view>
+								<view class="special_work-titlec" v-if='codenote[0].status==1'>交易申请状态：已通过</view>
+								<view class="special_work-titled" v-if='codenote[0].status==2'>交易申请状态：已拒绝</view>
+								<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
+							</view>
 							<view class="content ">
 								<!-- 	<view class="examine"
 								
 								
 									@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
 									
-									<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
+									<image class="icon_img" src="@/static/images/index4.png"  mode="aspectFit"></image>
 									<text class="text">供货采购</text>
 								</view>
 								<view class="examine"
 									@click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
-									<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
+										<image class="icon_img" src="@/static/images/index5.png"  mode="aspectFit"></image>
 									<text class="text">进货管理</text>
 								</view> -->
 								<view class="examine"
 									@click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
 									</image>
 									<text class="text">扫码出库</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)">
-									<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index9.png" mode="aspectFit">
 									</image>
 									<text class="text">入库管理</text>
 								</view>
 								<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index8.png" mode="aspectFit">
 									</image>
 									<text class="text">提现管理</text>
 								</view>
 
 								<view class="examine"
-									@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
+									@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,'客服记录')">
+									<image class="icon_img" src="@/static/images/index6.png" mode="aspectFit">
 									</image>
 									<text class="text">客服记录</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
 									</image>
 									<text class="text">订单核销</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
-									<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index1.png" mode="aspectFit">
 									</image>
 									<text class="text">订单管理</text>
 								</view>
-								<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
+								<view class="examine"
+									@click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,'商品管理')">
+									<image class="icon_img" src="@/static/images/index7.png" mode="aspectFit">
 									</image>
 									<text class="text">商品管理</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
-									<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-								<view class="examine"
-									@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
-									<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
-									</image>
-									<text class="text">交易申请</text>
-								</view>
+<view class="examine" @click="paydecimal">
+								<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
+								</image>
+								<text class="text">保证缴纳金</text>
+							</view>
+
 								<!-- <view class="examine"
 									@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
-									<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/diaohuo.png"  mode="aspectFit">
 									</image>
 									<text class="text">交易大厅</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
-									<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
+								<image class="icon_img" src="@/static/images/index13.png"  mode="aspectFit">
 									</image>
 									<text class="text">委托销售</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
-									<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
+						<image class="icon_img" src="@/static/images/index17png"  mode="aspectFit">
 									</image>
 									<text class="text">委托订单</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)">
-									<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/fabu.png"  mode="aspectFit">
 									</image>
 									<text class="text">发布管理</text>
 								</view> -->
 
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
-							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
+							<image class="icon_img" src="@/static/images/cwgk.png"  mode="aspectFit">
 							</image>
 							<text class="text">财务公开</text>
 						</view> -->
@@ -206,71 +236,83 @@
 					<view class="business com" v-if="true">
 						<view class="special_work com">
 							<view class="title">里海云仓</view>
+							<view class="special_work-title" v-if='codenote.length>0'>
+								<view class="special_work-titlea">
+									<image src="@/static/images/de1.png" mode="aspectFit" v-if='codenote[0].status==0'>
+									</image>
+									<image src="@/static/images/de2.png" mode="aspectFit" v-if='codenote[0].status==1'>
+									</image>
+									<image src="@/static/images/de3.png" mode="aspectFit" v-if='codenote[0].status==2'>
+									</image>
+								</view>
+								<view class="special_work-titlec" v-if='codenote[0].status==1'>交易申请状态：已通过</view>
+								<view class="special_work-titled" v-if='codenote[0].status==2'>交易申请状态：已拒绝</view>
+								<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
+							</view>
 							<view class="content ">
 								<view class="examine"
 									@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
-									<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
+									<image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image>
 									<text class="text">供货采购</text>
 								</view>
 								<view class="examine" @click="navigator('/pages/users/order_list/index?status=-1')">
-									<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
+									<image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image>
 									<text class="text">进货管理</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
 									</image>
 									<text class="text">扫码出库</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)">
-									<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index9.png" mode="aspectFit">
 									</image>
 									<text class="text">入库管理</text>
 								</view>
 								<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index8.png" mode="aspectFit">
 									</image>
 									<text class="text">提现管理</text>
 								</view>
 
 								<view class="examine"
-									@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
+									@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,'客服记录')">
+									<image class="icon_img" src="@/static/images/index6.png" mode="aspectFit">
 									</image>
 									<text class="text">客服记录</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
 									</image>
 									<text class="text">订单核销</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
-									<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index1.png" mode="aspectFit">
 									</image>
 									<text class="text">订单管理</text>
 								</view>
 								<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index7.png" mode="aspectFit">
 									</image>
-									<text class="text">商品管理</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
-									<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-								<view class="examine"
-									@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
-									<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
-									</image>
-									<text class="text">交易申请</text>
-								</view>
+<view class="examine" @click="paydecimal">
+								<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
+								</image>
+								<text class="text">保证缴纳金</text>
+							</view>
+
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
-							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
+							<image class="icon_img" src="@/static/images/cwgk.png"  mode="aspectFit">
 							</image>
 							<text class="text">财务公开</text>
 						</view> -->
@@ -285,49 +327,63 @@
 					<view class="business com" v-if="true">
 						<view class="special_work com">
 							<view class="title">我的店铺</view>
+							<view class="special_work-title" v-if='codenote.length>0'>
+								<view class="special_work-titlea">
+									<image src="@/static/images/de1.png" mode="aspectFit" v-if='codenote[0].status==0'>
+									</image>
+									<image src="@/static/images/de2.png" mode="aspectFit" v-if='codenote[0].status==1'>
+									</image>
+									<image src="@/static/images/de3.png" mode="aspectFit" v-if='codenote[0].status==2'>
+									</image>
+								</view>
+								<view class="special_work-titlec" v-if='codenote[0].status==1'>交易申请状态：已通过</view>
+								<view class="special_work-titled" v-if='codenote[0].status==2'>交易申请状态：已拒绝</view>
+								<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
+							</view>
 							<view class="content ">
 
 								<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index8.png" mode="aspectFit">
 									</image>
 									<text class="text">提现管理</text>
 								</view>
 
 								<view class="examine"
-									@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
+									@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,'客服记录')">
+									<image class="icon_img" src="@/static/images/index6.png" mode="aspectFit">
 									</image>
 									<text class="text">客服记录</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index2.png" mode="aspectFit">
 									</image>
 									<text class="text">订单核销</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
-									<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index1.png" mode="aspectFit">
 									</image>
 									<text class="text">订单管理</text>
 								</view>
-								<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
-									<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
+								<view class="examine"
+									@click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,'商品管理')">
+									<image class="icon_img" src="@/static/images/index7.png" mode="aspectFit">
 									</image>
 									<text class="text">商品管理</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
-									<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
+									<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-								<view class="examine"
-									@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}`, '交易申请')">
-									<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
-									</image>
-									<text class="text">交易申请</text>
-								</view>
+<view class="examine" @click="paydecimal">
+								<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
+								</image>
+								<text class="text">保证缴纳金</text>
+							</view>
+
 							</view>
 						</view>
 					</view>
@@ -345,17 +401,17 @@
 
 							<view class="examine"
 								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
-								<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
+								<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 								</image>
 								<text class="text">商户设置</text>
 							</view>
 
-
-							<view class="examine" v-if="userInfoData.mer_info.setting_status==1"	@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
-								<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
+							<view class="examine" @click="paydecimal">
+								<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
 								</image>
-								<text class="text">交易申请</text>
+								<text class="text">保证缴纳金</text>
 							</view>
+
 						</view>
 					</view>
 				</view>
@@ -366,7 +422,119 @@
 		<view class="" style="padding-top: 1px;" v-else>
 			<emptyPage title="暂无信息"></emptyPage>
 		</view>
+		<view class="settlementAgreement" v-if="isFshow">
+			<view class="setAgCount" style="width: 100%;height: 100%;">
+				<i class="icon iconfont icon-cha" @click="recuo"></i>
+				<div class="title">{{detail.title}}</div>
 
+				<view class="contenta">
+					<jyf-parser :html="detail.mer_settlement_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+
+				</view>
+				<view class="setAgCountbtn">
+					<button class="setAgCountbtna" @click="refuse">
+						拒绝
+					</button>
+					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
+						<text v-if="num>0">请仔细阅读协议{{num}}S</text>
+						<text v-else>同意</text>
+
+					</button>
+				</view>
+			</view>
+		</view>
+
+
+		<uni-popup ref="popup" type="bottom">
+
+			<view class="userpage">
+				<view class="userpage-icon" @click="close">
+					<image src="@/static/images/close.png" mode=""></image>
+				</view>
+				<form report-submit='true'>
+					<view class='merchantsSettled'>
+						<view class="title">填写信息</view>
+						<view class='list'>
+							<view class="item">
+								<view class="acea-row row-middle">
+									<text class="item-name">开户行名称:</text>
+									<input type="text" maxlength="30" placeholder="请输入开户行名称"
+										v-model="merchantData.bank_username" @input="validateBtn"
+										placeholder-class='placeholder' />
+								</view>
+							</view>
+
+
+							<view class="item">
+								<view class="acea-row row-middle">
+									<text class="item-name">联系电话:</text>
+									<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
+										@input="validateBtn" placeholder-class='placeholder' />
+								</view>
+							</view>
+
+							<view class="item">
+								<view class="acea-row row-middle">
+									<text class="item-name">开户行:</text>
+									<input type="text" placeholder="请输入开户行" v-model="merchantData.bank_opening"
+										@input="validateBtn" placeholder-class='placeholder' />
+								</view>
+							</view>
+							<view class="item">
+								<view class="acea-row row-middle">
+									<text class="item-name">身份证正面:</text>
+								</view>
+								<view class="item-card">
+
+									<view class="item-carda" @click='uploadpic({type:1})'
+										v-if='merchantData.cardno_front.length==0'>
+										<image src="@/static/images/SFZZ.png" mode="aspectFit"></image>
+									</view>
+									<view class="item-carda" @click='DelPic({type:1})' v-else>
+										<image :src="merchantData.cardno_front" mode="aspectFit"></image>
+									</view>
+									<view class="item-cardb" @click='uploadpic({type:2})'
+										v-if='merchantData.cardno_back.length==0'>
+										<image src="@/static/images/SFFF.png" mode="aspectFit"></image>
+									</view>
+									<view class="item-cardb" @click='DelPic({type:2})' v-else>
+										<image :src="merchantData.cardno_back" mode="aspectFit"></image>
+									</view>
+								</view>
+
+							</view>
+							<view class="item">
+								<view class="acea-row row-middle">
+									<text class="item-name">银行卡反面:</text>
+								</view>
+								<view class="item-card">
+									<view class="item-carda" @click='uploadpic({type:3})'
+										v-if='merchantData.bank_front.length==0'>
+										<image src="@/static/images/YHKZ.png" mode="aspectFit"></image>
+									</view>
+									<view class="item-carda" @click='DelPic({type:3})' v-else>
+										<image :src="merchantData.bank_front" mode="aspectFit"></image>
+									</view>
+									<view class="item-cardb" @click='uploadpic({type:4})'
+										v-if='merchantData.bank_back.length==0'>
+										<image src="@/static/images/YHKF.png" mode="aspectFit"></image>
+									</view>
+
+									<view class="item-cardb" @click='DelPic({type:4})' v-else>
+										<image :src="merchantData.bank_back" mode="aspectFit"></image>
+									</view>
+								</view>
+							</view>
+
+
+							<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
+								提交申请
+							</button>
+						</view>
+					</view>
+				</form>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -375,15 +543,16 @@
 	import emptyPage from '@/components/emptyPage.vue';
 	import zbpSwiper from '@/components/zbpSwiper'
 	import {
-		mapState,
+
 		mapGetters
 	} from 'vuex'
 	import {
-		getWorkArticleCount,
-		getSlideAPI
-	} from '@/api/article.js'
+		business,
+		intention,
+		intentionbus
+	} from "@/api/product"
 	import {
-		getStoreList,
+
 		getUserInfo
 	} from '@/api/user.js'
 	import {
@@ -395,7 +564,9 @@
 		Toast
 	} from '@/libs/uniApi';
 	import {
-		getDiy
+		getDiy,
+		merchant,
+		paymerchant
 	} from '@/api/api.js'
 
 	export default {
@@ -419,11 +590,32 @@
 				isShow: false,
 				bgColor: '',
 				isFshow: false,
-				street: ''
+				street: '',
+				detail: {},
+				tagStyle: {
+					img: 'width:100%;display:block;'
+				},
+				num: 15,
+				where: {
+					type: 2,
+					page: 1,
+					limit: 10
+				},
+				codenote: [],
+				validate: false,
+				merchantData: {
+					bank_username: '',
+					bank_opening: '',
+					bank_front: '',
+					bank_back: '',
+					cardno_front: '',
+					cardno_back: ''
+				},
+
 			};
 		},
 		computed: {
-			...mapGetters(['userInfo', 'location', 'isLogin'])
+			...mapGetters(['userInfo', 'isLogin'])
 		},
 		created() {},
 		onLoad() {},
@@ -432,122 +624,314 @@
 				this.emptyText = '暂无可用应用'
 				this.jurisdiction = false
 			} else {
-				// this.emptyText = '请登录'
-				uni.navigateTo({
-					url:'/pages/users/login/login_copy'
-				})
+				this.emptyText = '请登录'
 				this.jurisdiction = true
 			}
 			this.getUserInfo()
-			this.appLocation()
-		},
-		onPullDownRefresh() {
-			this.getUserInfo()
-			uni.stopPullDownRefresh()
-		},
-		mounted() {
-			this.appLocation()
+			this.list()
+			this.codelist()
+
 
 		},
 
+
+
 		methods: {
+			//关闭弹窗
+			close() {
+				this.$refs.popup.close()
+				this.num = 15
+			},
+			//获取交易信息
+			codelist() {
+				intention(this.where).then(res => {
+					this.codenote = res.data.list
+				})
+			},
 
-
-
-			//获取定位
-			appLocation() {
-				uni.getLocation({
-					type: 'wgs84',
-					timeout: '10',
-					success: (res) => {
-						// console.log(res)
-
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							this.street = res.data.address_component.street
-							Cache.set('ADRESS_LOCATION', this.street)
-						}).catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						})
-					},
-					fail: (err) => {
-
-						// uni.showToast({
-						// 	title: "获取定位超时",
-						// 	icon: 'none',
-						// 	duration: 2000
-						// });
-					}
+			decimal() {
+				merchant({
+					id: this.mer_id
+				}).then((res) => {
+					this.merchant_Data = res.data
 				});
 			},
-
-			scrolling() {
-				// 滚动条距文档顶部的距离
-				let scrollTop =
-					window.pageYOffset ||
-					document.documentElement.scrollTop ||
-					document.body.scrollTop;
-				// 滚动条滚动的距离
-				let scrollStep = scrollTop - this.oldScrollTop;
-				console.log("header 滚动距离 ", scrollTop);
-				// 更新——滚动前，滚动条距文档顶部的距离
-				this.oldScrollTop = scrollTop;
-
-				//变量windowHeight是可视区的高度
-				let windowHeight =
-					document.documentElement.clientHeight || document.body.clientHeight;
-				//变量scrollHeight是滚动条的总高度
-				let scrollHeight =
-					document.documentElement.scrollHeight || document.body.scrollHeight;
-
-				//滚动条到底部的条件
-				if (scrollTop + windowHeight == scrollHeight) {
-					//你想做的事情
-					console.log("header  你已经到底部了");
-				}
-				if (scrollStep < 0) {
-					this.isFshow = false
-					console.log("header 滚动条向上滚动了！");
+			//缴纳保证金
+			paydecimal() {
+				if (this.merchant_Data.is_margin != 1) {
+					this.$util.Tips({
+						title: '暂时无需缴纳保证金'
+					});
 				} else {
-					this.isFshow = true
-					console.log("header  滚动条向下滚动了！");
+
+
+					uni.showModal({
+						title: '提示',
+						content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
+						success: function(res) {
+							if (res.confirm) {
+								// console.log('用户点击确定');
+								paymerchant().then((res) => {
+									console.log(res.data)
+									uni.requestPayment({
+										provider: 'wxpay',
+										orderInfo: res.data
+											.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+										success: function(res) {
+											console.log('success:' + JSON.stringify(res));
+										},
+										fail: function(err) {
+											console.log('fail:' + JSON.stringify(err));
+										}
+									});
+								}).catch((err) => {
+									console.log(err)
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+
 				}
-				// 判断是否到了最顶部
-				if (scrollTop <= 0) {
+
+			},
+			//提交
+			formSubmit: function(e) {
+				let that = this;
+				if (that.validateForm() && that.validate) {
+
+					that.validate = false;
+
+					intentionbus(that.merchantData).then(res => {
+						if (res.status == 200) {
+							this.$refs.popup.close()
+							that.$util.Tips({
+								title: '提交成功'
+							});
+							this.codelist()
+							that.timer = setTimeout(() => {
+								that.successful = true;
+								that.validate = true;
+							}, 1000)
+
+						}
+					}).catch(res => {
+						that.validate = true;
+						this.num = 15
+						this.$refs.popup.close()
+						that.$util.Tips({
+							title: res
+						});
+					})
+
+
+				}
+
+			},
+			//同意
+			agree() {
+				this.$refs.popup.open()
+				this.isFshow = false
+
+				// intentionbus({
+				// 	"status": 1
+				// }).then((res) => {
+				// 	if (res.status == 200) {
+				// 		this.$util.Tips({
+				// 			title: res.message,
+				// 			icon: 'success',
+				// 		})
+				// 		this.getUserInfo()
+				// 		this.isFshow = false
+				// 	}
+				// }).catch((err) => {
+				// 	this.isFshow = false
+				// 	this.$util.Tips({
+				// 		title: err,
+				// 		icon: 'error',
+				// 	})
+				// })
+			},
+			//拒绝
+			refuse() {
+				uni.switchTab({
+					url: '/pages/gather/gather'
+				})
+			},
+			//关闭弹窗
+			recuo() {
+
+				if (this.num > 0) {
+					this.num = 15
+					this.isFshow = false
+				} else {
+					this.num = 15
 					this.isFshow = false
-					console.log("header 到了最顶部")
 				}
 			},
 
-			kkchange(e) {
-				this.bgColor = e
+			countDown() {
+				let {
+					num
+				} = this;
+				// if (num === 3) this.nums = true;
+				num = num > 0 ? num - 1 : "0";
+				setTimeout(() => {
+
+					this.num = num;
+					if (num == '0') {
+						// this.launchApp()
+						return
+					}
+
+					if (this.isFshow == false && this.num > 0) {
+						this.num = 15
+						return
+					}
+					this.countDown();
+				}, 1000);
+
+
+			},
+			//验证
+			validateBtn: function() {
+				let that = this,
+					value = that.merchantData;
+				if (value.bank_username && value.bank_opening) {
+					if (!that.isShowCode) {
+						that.validate = true;
+					} else {
+						if (that.codeVal) {
+							that.validate = true;
+						} else {
+							that.validate = false;
+						}
+					}
+				} else {
+					that.validate = false;
+				}
+			},
+			validateForm: function() {
+				let that = this,
+					value = that.merchantData;
+
+				if (!value.bank_username) return that.$util.Tips({
+					title: '请输入银行账户姓名'
+				});
+				if (!value.bank_opening) return that.$util.Tips({
+					title: '请输入开户行'
+				});
+
+				if (value.bank_front.length == 0) return that.$util.Tips({
+					title: '请上传一张或者多张图片'
+				});
+
+				if (value.bank_back.length == 0) return that.$util.Tips({
+					title: '请上传一张或者多张图片'
+				});
+				if (value.cardno_front.length == 0) return that.$util.Tips({
+					title: '请上传一张或者多张图片'
+				});
+				if (value.cardno_back.length == 0) return that.$util.Tips({
+					title: '请上传一张或者多张图片'
+				});
+				that.validate = true;
+				return true;
+			},
+			/**
+			 * 上传文件
+			 *
+			 */
+			uploadpic(data) {
+				let that = this;
+				if (data.type == 1) {
+					that.$util.uploadImageOne('upload/image', function(res) {
+						that.merchantData.cardno_front = res.data.path
+
+					});
+				} else if (data.type == 2) {
+					that.$util.uploadImageOne('upload/image', function(res) {
+						that.merchantData.cardno_back = res.data.path
+
+					});
+				} else if (data.type == 3) {
+					that.$util.uploadImageOne('upload/image', function(res) {
+						that.merchantData.bank_front = res.data.path
+
+					});
+				} else {
+					that.$util.uploadImageOne('upload/image', function(res) {
+						that.merchantData.bank_back = res.data.path
+
+					});
+				}
+
+			},
+			//删除图片
+			DelPic(data) {
+				let that = this;
+				if (data.type == 1) {
+
+					that.merchantData.cardno_front = ''
+
+
+				} else if (data.type == 2) {
+
+					that.merchantData.cardno_back = ''
+
+
+				} else if (data.type == 3) {
+
+					that.merchantData.bank_front = ''
+
+
+				} else {
+
+					that.merchantData.bank_back = ''
+
+
+				}
+
+			},
+			//商户设置
+			buyserset() {
+				uni.navigateTo({
+					url: `/pages/product/basicSet?mer_id=` + this.mer_id
+				})
+			},
+			//获取协议内容
+			list() {
+				business({
+					type: 'mer_settlement_agree'
+				}).then(res => {
+					this.detail = res.data
+				})
 			},
 
 			navigator(url, t) {
-				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
-				uni.navigateTo({
-					url: url
-				})
+				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
+					this.isFshow = true
+					this.countDown()
+				} else {
+					uni.navigateTo({
+						url: url
+					})
+				}
 			},
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
 					that.userInfoData = res.data;
-					// console.log(res.data.service);
+					this.merchantData.phone = res.data.phone
+
 					if (res.data.service == null) {
 						// console.log('123');
 						this.isShow = false
 					} else {
 						this.isShow = true
 						this.mer_id = res.data.service.mer_id
+						this.decimal()
 					}
 
 					if (!res.data.mer_info) {
@@ -565,6 +949,379 @@
 		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
 
+	.userpage {
+		width: 100%;
+		height: 1368rpx;
+		padding-top: 150rpx;
+		background-color: #fff;
+		position: relative;
+	}
+
+	.userpage-icon {
+		width: 60rpx;
+		height: 60rpx;
+		position: absolute;
+		top: 60rpx;
+		right: 60rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.item-name {
+		width: 190rpx;
+	}
+
+	.merchantsSettled {
+		height: 1368rpx;
+	}
+
+	.merchantsSettled .title {
+		font-size: 35rpx;
+		font-family: Microsoft YaHei;
+		font-weight: 400;
+		text-align: center;
+	}
+
+	.merchantsSettled .list {
+		background-color: #fff;
+		border-radius: 12px;
+
+		margin: 0 15px;
+		position: absolute;
+
+		width: calc(100% - 30px);
+
+	}
+
+	.application-record {
+		position: absolute;
+		display: flex;
+		align-items: center;
+		top: 240rpx;
+		right: 0;
+		color: #fff;
+		font-size: 22rpx;
+		background-color: rgba(0, 0, 0, 0.3);
+		padding: 8rpx 18rpx;
+		border-radius: 20px 0px 0px 20px;
+	}
+
+	.item-card {
+		display: flex;
+		margin-top: 20rpx;
+
+		.item-carda {
+			width: 298rpx;
+			height: 175rpx;
+			margin-right: 20rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.item-cardb {
+			width: 298rpx;
+			height: 175rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.merchantsSettled .list .item {
+		padding: 50rpx 0 20rpx;
+
+		position: relative;
+		margin: 0 20px;
+
+		&.no-border {
+			border-bottom: none;
+			padding-left: 0;
+			padding-right: 0;
+		}
+
+		.item-title {
+			color: #666666;
+			font-size: 28rpx;
+			display: block;
+		}
+
+		.item-desc {
+			color: #B2B2B2;
+			font-size: 22rpx;
+			display: block;
+			margin-top: 9rpx;
+			line-height: 36rpx;
+		}
+	}
+
+	.acea-row,
+	.upload {
+		display: -webkit-box;
+		display: -moz-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-lines: multiple;
+		-moz-box-lines: multiple;
+		-o-box-lines: multiple;
+		-webkit-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		flex-wrap: wrap;
+	}
+
+	.upload {
+		margin-top: 20rpx;
+	}
+
+	.acea-row.row-middle {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding-left: 2px;
+	}
+
+	.acea-row.row-column {
+		-webkit-box-orient: vertical;
+		-moz-box-orient: vertical;
+		-o-box-orient: vertical;
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+	}
+
+	.acea-row.row-center-wrapper {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		-webkit-box-pack: center;
+		-moz-box-pack: center;
+		-o-box-pack: center;
+		-ms-flex-pack: center;
+		-webkit-justify-content: center;
+		justify-content: center;
+	}
+
+	.merchantsSettled .list .item .pictrue {
+		width: 130rpx;
+		height: 130rpx;
+		margin: 24rpx 22rpx 0 0;
+		position: relative;
+		font-size: 11px;
+		color: #bbb;
+
+		&:nth-child(4n) {
+			margin-right: 0;
+		}
+
+		&:nth-last-child(1) {
+			border: 0.5px solid #ddd;
+			box-sizing: border-box;
+		}
+
+		uni-image,
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 1px;
+
+			img {
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-moz-user-select: none;
+				display: block;
+				position: absolute;
+				top: 0;
+				left: 0;
+				opacity: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.icon-guanbi1 {
+			font-size: 33rpx;
+			position: absolute;
+			top: -10px;
+			right: -10px;
+		}
+	}
+
+	.uni-list-cell-db {
+		position: relative;
+	}
+
+	.merchantsSettled .submitBtn {
+		width: 588rpx;
+		margin: 0 auto;
+		height: 86rpx;
+		border-radius: 25px;
+		text-align: center;
+		line-height: 86rpx;
+		font-size: 15px;
+		color: #fff;
+		background: #E3E3E3;
+		margin-top: 25px;
+		pointer-events: none;
+	}
+
+	.merchantsSettled .submitBtn.on {
+		background: red;
+		pointer-events: all;
+	}
+
+
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, .5);
+		z-index: 10;
+	}
+
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 656rpx;
+		// height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+
+		-webkit-border-radius: 12rpx;
+		padding: 52rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+
+	.settlementAgreement .setAgCount .content {
+		margin-top: 32rpx;
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		height: 1050rpx;
+		overflow-y: scroll;
+	}
+
+
+	.settlementAgreement .setAgCount .contenta {
+		margin-top: 32rpx;
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+
+		height: 1050rpx;
+
+		overflow-y: scroll;
+
+
+	}
+
+	.setAgCountbtn {
+		display: flex;
+		justify-content: space-around;
+
+		.setAgCountbtna {
+			margin-top: 40rpx;
+			width: 200rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			border: 2rpx solid #B3B3B3;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #737373;
+
+		}
+
+		.setAgCountbtnb {
+			margin-top: 40rpx;
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+
+			text-align: center;
+			line-height: 74rpx;
+			background: #cecece;
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+
+		.setAgCountbtnc {
+			margin-top: 40rpx;
+			width: 200rpx;
+			height: 74rpx;
+			text-align: center;
+			line-height: 74rpx;
+			background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
+			border-radius: 46rpx 46rpx;
+			opacity: 1;
+			font-size: 25rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #fff;
+
+		}
+	}
+
+
+
 	.bg-img {
 		position: absolute;
 		width: 100%;
@@ -638,7 +1395,48 @@
 		// margin-top: 52.63rpx;
 		padding-top: 32rpx;
 		border-radius: 17.54rpx;
+
 		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+		.special_work-title {
+			display: flex;
+			margin-bottom: 50rpx;
+
+			background-color: #efefef;
+			padding: 10rpx 10rpx;
+
+			.special_work-titlea {
+				width: 40rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.special_work-titleb {
+				font-size: 23rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #737373;
+				margin-top: 5rpx;
+			}
+
+			.special_work-titlec {
+				font-size: 23rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #16C295;
+				margin-top: 5rpx;
+			}
+
+			.special_work-titled {
+				font-size: 23rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				margin-top: 5rpx;
+			}
+		}
 
 		.title {
 			font-size: 31.58rpx;
@@ -662,8 +1460,8 @@
 				// margin: 0 0 33.33rpx 33.33rpx !important;
 
 				.icon_img {
-					width: 63.16rpx;
-					height: 63.16rpx;
+					width: 120rpx;
+					height: 120rpx;
 				}
 
 				.text {
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 3dade8f..2adaa5d 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -149,6 +149,10 @@
 						</view>
 					</view>
 				</view>
+				
+				<view class="conter-img" v-if='productList.length == 0'>
+					<image src="@/static/images/noCart.png" mode="aspectFit"></image>
+				</view>
 			</view>
 			<Loading :loaded="loaded" :loading="loading"></Loading>
 		</view>
@@ -199,6 +203,9 @@
 		productRecommendApi,
 		postImport
 	} from "@/api/product";
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import Loading from '@/components/Loading/index.vue';
 	import {
 		navigateTo,
@@ -248,9 +255,9 @@
 				ll: 0
 			}
 		},
-		onLoad(options) {
-			this.mer_id = options.mer_id;
-			this.getList(this.mer_id, true);
+		onLoad() {
+		this.getindex()
+		
 		},
 		onPullDownRefresh() {
 			this.where.page = 1
@@ -269,6 +276,15 @@
 		},
 
 		methods: {
+			
+			//获取商户信息
+			getindex(){
+				getUserInfo().then(res => {
+					
+					this.mer_id = res.data.service.mer_id;
+					this.getList(res.data.service.mer_id, true);
+				});
+			},
 			menuActiona(item, index) {
 				if (item.is_good) {
 					this.options = [{
@@ -697,6 +713,19 @@
 	swiper {
 		height: 200rpx;
 	}
+.conter-img {
+		width: 650rpx;
+		height: 400rpx;
+		margin: 0 auto;
+		margin-top: 360rpx;
+		
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+
+	}
 
 	.header {
 		padding-top: 40rpx;
diff --git a/pages/product/transactionApplication/application.vue b/pages/product/transactionApplication/application.vue
deleted file mode 100644
index 76ab2c2..0000000
--- a/pages/product/transactionApplication/application.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-
-	<view class="content">
-		<view class="">
-
-
-			<view class="content_con" v-for="(item,index) in datalist" :key='index'>
-				<view class="content_title">
-					<view class="content_title_a" v-if="item.status==1">
-						已通过
-					</view>
-
-					<view class="content_title_c" v-else-if="item.status==2">
-						已拒绝
-					</view>
-					<view class="content_title_b" v-else-if="item.status==0">
-						审核中
-					</view>
-
-					<view class="content_title_d">
-						{{item.mer_name}}
-					</view>
-				</view>
-                 <view class="" v-if="item.fail_msg" style="margin-top: -50rpx;color: red;">
-                 	拒绝原因：{{item.fail_msg}}
-                 </view>
-				<view class="content_detail">
-					<view class="" style="display: flex;">
-						<view style="width:150rpx;"> 申请人：</view>
-						<span>{{item.name}}</span><text style="margin-left: 20rpx;">{{item.phone}}</text>
-					</view>
-					<view class="" style="display: flex;">
-
-						<view style="width:150rpx;"> 申请时间：</view>
-						<span>{{item.create_time}}</span>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="" style="padding-top: 1px;" v-if='datalist.length==0'>
-			<emptyPage title="暂无申请信息"></emptyPage>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import emptyPage from '@/components/emptyPage.vue';
-	import {
-		intention
-	} from "@/api/product"
-	export default {
-		components: {
-			emptyPage
-		},
-		data() {
-			return {
-				datalist: [],
-				where: {
-					type: 2,
-					page: 1,
-					limit: 10
-				},
-			}
-		},
-		onLoad() {
-			this.list()
-		},
-		methods: {
-			list() {
-				intention(this.where).then(res => {
-					this.datalist = res.data.list
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content {
-		padding: 12rpx 12rpx;
-	}
-
-	.content_con {
-		padding: 42rpx 32rpx;
-		height: 294rpx;
-		background: #FFFFFF;
-		border-radius: 21rpx 21rpx;
-		margin-top: 20rpx;
-	}
-
-	.content_title {
-		display: flex;
-		margin-bottom: 70rpx;
-
-	}
-	.content_title_a {
-		width: 89rpx;
-		height: 37rpx;
-		line-height: 37rpx;
-		text-align: center;
-		background: #16C295;
-		font-size: 23rpx;
-		font-family: DingTalk JinBuTi-Regular, DingTalk JinBuTi;
-		font-weight: 400;
-		color: #FFFFFF;
-		border-radius: 15rpx 0 15rpx 0;
-
-	}
-
-
-	.content_title_b {
-		width: 89rpx;
-		height: 37rpx;
-		line-height: 37rpx;
-		text-align: center;
-		background: #3274F9;
-		font-size: 23rpx;
-		font-family: DingTalk JinBuTi-Regular, DingTalk JinBuTi;
-		font-weight: 400;
-		color: #FFFFFF;
-		border-radius: 15rpx 0 15rpx 0;
-
-	}
-
-	.content_title_c {
-		width: 89rpx;
-		height: 37rpx;
-		line-height: 37rpx;
-		text-align: center;
-		background: #ff0000;
-		font-size: 23rpx;
-		font-family: DingTalk JinBuTi-Regular, DingTalk JinBuTi;
-		font-weight: 400;
-		color: #FFFFFF;
-		border-radius: 15rpx 0 15rpx 0;
-
-	}
-
-	.content_title_d {
-		font-size: 33rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #333333;
-		margin-left: 20rpx;
-		margin-top: -7rpx;
-
-	}
-
-	.content_detail {
-
-		font-size: 30rpx;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #333333;
-
-		view {
-			margin-bottom: 10rpx;
-		}
-	}
-
-
-</style>
\ No newline at end of file
diff --git a/pages/product/transactionApplication/index.vue b/pages/product/transactionApplication/index.vue
deleted file mode 100644
index 84da1c1..0000000
--- a/pages/product/transactionApplication/index.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-<template>
-	<view v-if="!successful" class="content">
-
-		<view class="content-detail">
-			<view class="content-title">
-				<view class="content-title-a">
-					交易申请协议
-				</view>
-				<view class="content-title-b" @click="navation">
-					申请记录
-				</view>
-			</view>
-			<view class="">
-
-				<view v-html="detail.business_apply_agree">
-
-				</view>
-
-			</view>
-
-		</view>
-
-		<view class="content-bottom" v-if="type==0">
-			<view class="bottombtn_no" @click="noagree">拒绝</view>
-			<view class="bottom_agree" @click="agree">同意</view>
-		</view>
-		<view class="content-bottom" v-if="type==1||type==3">
-			<view class="bottom_agree" @click="agree">重新申请</view>
-		</view>
-	</view>
-
-	<view class="settledSuccessMain" v-else>
-		<view class="settledSuccessful">
-
-			<image class="image" src="@/pages/store/static/images/settledSuccessful.svg">
-				<view class="title">恭喜，您的资料提交成功！</view>
-				<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
-				<view class="goHome" hover-class="none" @click="goHome">
-					返回首页
-				</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		business,
-		intentionbus
-	} from "@/api/product"
-	export default {
-		data() {
-			return {
-				detail: {},
-				type: 0,
-				successful: false
-			}
-		},
-		onLoad(e) {
-			this.type = e.business_status
-			
-			this.list()
-		},
-		methods: {
-			//获取协议内容
-			list() {
-				business().then(res => {
-					this.detail = res.data
-				})
-			},
-			
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			//跳转
-			navation() {
-
-				uni.navigateTo({
-					url: '/pages/product/transactionApplication/application'
-				})
-			},
-			//拒绝申请
-			noagree() {
-				uni.navigateTo({
-					url: '/pages/moreProject/moreProject'
-				})
-				
-			},
-			//同意申请
-			agree() {
-				intentionbus().then(res => {
-					if (res.status == 200) {
-						this.$util.Tips({
-							title: res.message,
-							icon: 'success',
-						})
-						this.successful=true
-						
-					}
-
-
-				}).catch((err) => {
-
-					this.$util.Tips({
-						title: err,
-						icon: 'error',
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.content {
-		position: relative;
-	}
-
-	.content-detail {
-		padding: 20rpx 20rpx;
-		color: #333333;
-		font-size: 28rpx;
-		margin-bottom: 155rpx;
-
-		.content-title {
-			color: #333333;
-			font-size: 32rpx;
-			text-align: center;
-			margin-top: 40rpx;
-			margin-bottom: 40rpx;
-
-			.content-title-b {
-				width: 165rpx;
-				height: 70rpx;
-				font-size: 26rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
-				font-weight: 400;
-				color: #FFFFFF;
-				text-align: center;
-				line-height: 70rpx;
-				background: linear-gradient(90deg, #F84221 0%, #FF6D20 100%);
-				box-shadow: 0px 4rpx 11rpx 2rpx rgba(252, 89, 32, 0.49);
-				border-radius: 37rpx 0px 0px 37rpx;
-				opacity: 1;
-				position: absolute;
-				top: 40rpx;
-				right: 0;
-			}
-		}
-	}
-
-	.content-bottom {
-		position: absolute;
-		width: 100%;
-		bottom: 0;
-		position: fixed;
-		height: 175rpx;
-		background: #FFFFFF;
-		display: flex;
-		justify-content: space-around;
-
-
-		.bottombtn_no {
-			margin-top: 42rpx;
-			width: 249rpx;
-			height: 84rpx;
-			text-align: center;
-			line-height: 84rpx;
-			border-radius: 46rpx 46rpx;
-			opacity: 1;
-			border: 2rpx solid #B3B3B3;
-			font-size: 33rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 500;
-			color: #737373;
-
-		}
-
-		.bottom_agree {
-			margin-top: 42rpx;
-			width: 249rpx;
-			height: 84rpx;
-			text-align: center;
-			line-height: 84rpx;
-			background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
-			border-radius: 46rpx 46rpx;
-			opacity: 1;
-
-			font-size: 33rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 500;
-			color: #fff;
-		}
-
-	}
-	.settledSuccessMain {
-		height: 100vh;
-		display: flex;
-		flex-direction: column;
-		background: #fff;
-	}
-	
-	.settledSuccessful {
-		flex: 1;
-		width: 100%;
-		padding: 0 56px;
-		height: auto;
-		background: #fff;
-		text-align: center;
-	}
-	
-	.settledSuccessful .image {
-		width: 189px;
-		height: 157px;
-		margin-top: 66px;
-	}
-	
-	.settledSuccessful .title {
-		color: #333333;
-		font-size: 16px;
-		font-weight: bold;
-		margin-top: 35px;
-	}
-	
-	.settledSuccessful .info {
-		color: #A0A0A0;
-		font-size: 13px;
-		margin-top: 12px;
-	}
-	
-	.settledSuccessful .goHome {
-		margin: 60px auto 0;
-		line-height: 43px;
-		color: #282828;
-		font-size: 15px;
-		border: 1px solid #B4B4B4;
-		border-radius: 60px;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/store/detail/index.vue b/pages/store/detail/index.vue
index 51d0552..f71a4dc 100644
--- a/pages/store/detail/index.vue
+++ b/pages/store/detail/index.vue
@@ -1,46 +1,69 @@
 <template>
 	<view :style="viewColor">
-		<view :style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 1) 40%),url(${store.mer_banner})` }" class="store-detail">
-			<view class="section head">
-				<image :src="store.mer_avatar"></image>
-				<view class="text-wrap">
-					<view class="name line1">
-						<text class="name_store">{{ store.mer_name }}</text>
-						<image v-if="margin_ico_switch==1 && margin_ico && store.is_margin == 10" :src="margin_ico" class="store-margin"></image>
-						<text v-if="store.type_name" class="font-bg-red ml8">{{ store.type_name }}</text>
-						<text v-else-if="store.is_trader" class="font-bg-red ml8">自营</text>
+		<view class="store-detail">
+			<view class="section">
+				<view class="head">
+
+
+					<image class="head-image" :src="store.mer_avatar"></image>
+					<view class="text-wrap">
+						<view class="name line1">
+							<text class="name_store">{{ store.mer_name }}</text>
+							<image v-if="margin_ico_switch==1 && margin_ico && store.is_margin == 10" :src="margin_ico"
+								class="store-margin"></image>
+							<text v-if="store.type_name" class="font-bg-red ml8">{{ store.type_name }}</text>
+							<text v-else-if="store.is_trader" class="font-bg-red ml8">自营</text>
+						</view>
+						<view class="fans">粉丝数量
+							{{ store.care_count < 10000 ? store.care_count : (store.care_count / 10000).toFixed(2) + '万' }}
+						</view>
+					</view>
+					<!-- <button :class="{ followed: store.care }" hover-class="none" @click="followToggle">
+						<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
+						{{ store.care ? '已关注' : '关注' }}
+					</button> -->
+					<view class="carebtn" @click="followToggle">
+						
+						<image src="@/static/images/gz.png" v-if=" store.care" mode="aspectFit"></image>
+						<image src="@/static/images/gz1.png" v-else mode="aspectFit"></image>
 					</view>
-					<view class="fans">{{ store.care_count < 10000 ? store.care_count : (store.care_count / 10000).toFixed(2) + '万' }}人关注</view>
 				</view>
-				<button :class="{ followed: store.care }" hover-class="none" @click="followToggle">
-					<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
-					{{ store.care ? '已关注' : '关注' }}
-				</button>
-			</view>
-			<view class="section wrap">
-				<view class="name">店铺评级</view>
-				<view class="score-wrap">
-					<view class="star" :class="'star' + keyColor"><view :style="{ width: `${star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)` }"></view></view>
-					<view>{{ score.toFixed(1) }}</view>
+				<view class="section wrap">
+					<view class="name">店铺评级</view>
+					<view class="score-wrap">
+						<view class="star" :class="'star' + keyColor">
+							<view
+								:style="{ width: `${star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)` }">
+							</view>
+						</view>
+						<view>{{ score.toFixed(1) }}</view>
+					</view>
 				</view>
 			</view>
-			<view class="section wrap" @click="popupShow = true">
-				<view class="name">店铺二维码</view>
-				<view><text class="iconfont icon-erweima1"></text></view>
+
+
+			<view class="section info">
+				<view class="item very" @click="popupShow = true">
+					<view class="name">店铺二维码</view>
+					<view><text class="iconfont icon-erweima1"></text></view>
+				</view>
+				<view class="item very">
+					<navigator v-if="store.isset_certificate" style="display: flex;"
+						:url="`/pages/store/qualifications/index?mer_id=${store.mer_id}&uid=${this.uid}&storeName=${store.mer_name}`">
+						<view class="name">店铺资质信息</view>
+						<view><text class="iconfont">&#xe743;</text></view>
+					</navigator>
+				</view>
 			</view>
-			<navigator v-if="store.isset_certificate" :url="`/pages/store/qualifications/index?mer_id=${store.mer_id}&uid=${this.uid}&storeName=${store.mer_name}`" class="section wrap">
-				<view class="name">店铺资质信息</view>
-				<view><text class="iconfont">&#xe743;</text></view>
-			</navigator>		
-			
 			<view v-if="store.services_type == 1" class="section wrap" @click="call">
 				<view class="name">联系客服</view>
-				<view><text class="iconfont icon-kefu1"></text></view>					
+				<view><text class="iconfont icon-kefu1"></text></view>
 			</view>
-			<navigator v-else :url="`/pages/chat/customer_list/chat?mer_id=${store.mer_id}&uid=${this.uid}`" class="section wrap">
+			<navigator v-else :url="`/pages/chat/customer_list/chat?mer_id=${store.mer_id}&uid=${this.uid}`"
+				class="section wrap">
 				<view class="name">联系客服</view>
 				<view><text class="iconfont icon-kefu1"></text></view>
-			</navigator>		
+			</navigator>
 			<view class="section info">
 				<view class="item very">
 					<view class="name">店铺简介</view>
@@ -49,7 +72,8 @@
 				<view class="item very">
 					<view class="name">店铺地址</view>
 					<view class="value">{{ store.mer_address }}</view>
-					<view v-if="store.lat && store.long && mer_location == 1" class="iconfont icon-dingwei" @click="showMaoLocation(store.lat, store.long)"></view>
+					<view v-if="store.lat && store.long && mer_location == 1" class="iconfont icon-dingwei"
+						@click="showMaoLocation(store.lat, store.long)"></view>
 				</view>
 				<view v-if="store.service_phone" class="item">
 					<view class="name">联系电话</view>
@@ -76,428 +100,494 @@
 </template>
 
 <script>
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-import { mapGetters } from 'vuex';
-import { configMap } from "@/utils";
-import { getStoreDetail, followStore, unfollowStore, merchantQrcode } from '@/api/store.js';
-import { HTTP_REQUEST_URL } from '@/config/app';
-let app = getApp();
-export default {
-	computed: {
-		...configMap({margin_ico_switch: 0,margin_ico: ''}, mapGetters(['isLogin','uid','viewColor','keyColor'])),
-	},
-	filters: {
-		dateFormat: function(value) {
-			if (!value) {
-				return '';
-			}
-			return value.split(' ')[0];
-		}
-	},
-	data() {
-		return {
-			domain: HTTP_REQUEST_URL,
-			id: 0,
-			store: {},
-			score: 0,
-			star: 0,
-			popupShow: false,
-			storeCode: '',
-			openSettingBtnHidden: true, //是否授权
-			mer_location: '',
-		};
-	},
-	onLoad: function(options) {
-		uni.getStorage({
-			key: 'GLOBAL_DATA',
-			success: res => {
-				this.mer_location = res.data.mer_location;
-				// console.log(this.mer_location);
-			}
-		});
-		this.id = options.mer_id || options.id;
-		this.getStore();
-		this.getStoreCode();
-	},
-	onReady: function() {},
-	mounted: function() {},
-	methods: {
-		call: function(){
-			uni.makePhoneCall({
-				phoneNumber: this.store.service_phone,
-			})
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		mapGetters
+	} from 'vuex';
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		getStoreDetail,
+		followStore,
+		unfollowStore,
+		merchantQrcode
+	} from '@/api/store.js';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	let app = getApp();
+	export default {
+		computed: {
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: ''
+			}, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
 		},
-		getStore: function() {
-			getStoreDetail(this.id).then(res => {
-				let store = res.data;
-				this.store = store;
-				this.score = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(store.service_score)) / 3;
-				this.star = (this.score / 5) * 100;
-			});
-		},
-		follow: function() {
-			followStore(this.id).then(res => {
-				if (res.status === 200) {
-					this.store.care = true;
+		filters: {
+			dateFormat: function(value) {
+				if (!value) {
+					return '';
 				}
-				this.$util.Tips({
-					title: res.message
-				});
-			});
-		},
-		//查看地图
-		showMaoLocation(lat, long) {
-			// console.log(lat, long);
-			if (!lat || !long)
-				return this.$util.Tips({
-					title: '请设置允许商城访问您的位置！'
-				});
-			//#ifdef H5
-			if (this.$wechat.isWeixin() === true) {
-				this.$wechat
-					.seeLocation({
-						latitude: Number(lat),
-						longitude: Number(long),
-						name: this.store.mer_name,
-						address: this.store.mer_address ? this.store.mer_address : ''
-					})
-					.then(res => {
-						// console.log('success');
-					});
-			} else {
-				//#endif
-				uni.openLocation({
-					latitude: parseFloat(lat),
-					longitude: parseFloat(long),
-					scale: 8,
-					geocode: true,
-					name: this.store.mer_name,
-					address: this.store.mer_address ? this.store.mer_address : '',
-					success: function(res) {
-						// console.log(res);
-					}
-				});
-				// #ifdef H5
+				return value.split(' ')[0];
 			}
-			//#endif
 		},
-		unfollow: function() {
-			unfollowStore(this.id).then(res => {
-				if (res.status === 200) {
-					this.store.care = false;
-				}
-				this.$util.Tips({
-					title: res.message
-				});
-			});
-		},
-		followToggle: function() {
-			this.store.care ? this.unfollow() : this.follow();
-		},
-		// 店铺二维码
-		getStoreCode() {
-			let params = {};
-			// #ifdef MP
-			params = {
-				type: 'routine'
+		data() {
+			return {
+				domain: HTTP_REQUEST_URL,
+				id: 0,
+				store: {},
+				score: 0,
+				star: 0,
+				popupShow: false,
+				storeCode: '',
+				openSettingBtnHidden: true, //是否授权
+				mer_location: '',
 			};
-			//#endif
-			merchantQrcode(this.id, params)
-				.then(res => {
-					this.storeCode = res.data.url;
-				})
-				.catch(err => {});
 		},
-		// #ifdef MP
-		// 小程序保存图片
-		savePosterPath(url) {
-			uni.downloadFile({
-				url,
-				success: resFile => {
-					if (resFile.statusCode === 200) {
-						uni.getSetting({
-							success: res => {
-								if (!res.authSetting['scope.writePhotosAlbum']) {
-									uni.authorize({
-										scope: 'scope.writePhotosAlbum',
-										success: () => {
-											uni.saveImageToPhotosAlbum({
-												filePath: resFile.tempFilePath,
-												success: res => {
-													return uni.showToast({
-														title: '保存成功！'
-													});
-												},
-												fail: res => {
-													return uni.showToast({
-														title: res.errMsg
-													});
-												},
-												complete: res => {}
-											});
-										},
-										fail: () => {
-											uni.showModal({
-												title: '您已拒绝获取相册权限',
-												content: '是否进入权限管理，调整授权？',
-												success: res => {
-													if (res.confirm) {
-														uni.openSetting({
-															success: res => {
-																// console.log(res.authSetting);
-															}
-														});
-													} else if (res.cancel) {
-														return uni.showToast({
-															title: '已取消！'
-														});
-													}
-												}
-											});
-										}
-									});
-								} else {
-									uni.saveImageToPhotosAlbum({
-										filePath: resFile.tempFilePath,
-										success: res => {
-											return uni.showToast({
-												title: '保存成功！'
-											});
-										},
-										fail: res => {
-											return uni.showToast({
-												title: res.errMsg
-											});
-										},
-										complete: res => {}
-									});
-								}
-							},
-							fail: res => {}
-						});
-					} else {
-						return uni.showToast({
-							title: resFile.errMsg
-						});
-					}
-				},
-				fail: res => {
-					return uni.showToast({
-						title: res.errMsg
-					});
+		onLoad: function(options) {
+			uni.getStorage({
+				key: 'GLOBAL_DATA',
+				success: res => {
+					this.mer_location = res.data.mer_location;
+					// console.log(this.mer_location);
 				}
 			});
+			this.id = options.mer_id || options.id;
+			this.getStore();
+			this.getStoreCode();
+		},
+		onReady: function() {},
+		mounted: function() {},
+		methods: {
+			call: function() {
+				uni.makePhoneCall({
+					phoneNumber: this.store.service_phone,
+				})
+			},
+			getStore: function() {
+				getStoreDetail(this.id).then(res => {
+					let store = res.data;
+					this.store = store;
+					this.score = (parseFloat(store.postage_score) + parseFloat(store.product_score) +
+						parseFloat(store.service_score)) / 3;
+					this.star = (this.score / 5) * 100;
+				});
+			},
+			follow: function() {
+				followStore(this.id).then(res => {
+					if (res.status === 200) {
+						this.store.care = true;
+					}
+					this.$util.Tips({
+						title: res.message
+					});
+				});
+			},
+			//查看地图
+			showMaoLocation(lat, long) {
+				// console.log(lat, long);
+				if (!lat || !long)
+					return this.$util.Tips({
+						title: '请设置允许商城访问您的位置！'
+					});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat
+						.seeLocation({
+							latitude: Number(lat),
+							longitude: Number(long),
+							name: this.store.mer_name,
+							address: this.store.mer_address ? this.store.mer_address : ''
+						})
+						.then(res => {
+							// console.log('success');
+						});
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						scale: 8,
+						geocode: true,
+						name: this.store.mer_name,
+						address: this.store.mer_address ? this.store.mer_address : '',
+						success: function(res) {
+							// console.log(res);
+						}
+					});
+					// #ifdef H5
+				}
+				//#endif
+			},
+			unfollow: function() {
+				unfollowStore(this.id).then(res => {
+					if (res.status === 200) {
+						this.store.care = false;
+					}
+					this.$util.Tips({
+						title: res.message
+					});
+				});
+			},
+			followToggle: function() {
+				this.store.care ? this.unfollow() : this.follow();
+			},
+			// 店铺二维码
+			getStoreCode() {
+				let params = {};
+				// #ifdef MP
+				params = {
+					type: 'routine'
+				};
+				//#endif
+				merchantQrcode(this.id, params)
+					.then(res => {
+						this.storeCode = res.data.url;
+					})
+					.catch(err => {});
+			},
+			// #ifdef MP
+			// 小程序保存图片
+			savePosterPath(url) {
+				uni.downloadFile({
+					url,
+					success: resFile => {
+						if (resFile.statusCode === 200) {
+							uni.getSetting({
+								success: res => {
+									if (!res.authSetting['scope.writePhotosAlbum']) {
+										uni.authorize({
+											scope: 'scope.writePhotosAlbum',
+											success: () => {
+												uni.saveImageToPhotosAlbum({
+													filePath: resFile
+														.tempFilePath,
+													success: res => {
+														return uni
+															.showToast({
+																title: '保存成功！'
+															});
+													},
+													fail: res => {
+														return uni
+															.showToast({
+																title: res
+																	.errMsg
+															});
+													},
+													complete: res => {}
+												});
+											},
+											fail: () => {
+												uni.showModal({
+													title: '您已拒绝获取相册权限',
+													content: '是否进入权限管理，调整授权？',
+													success: res => {
+														if (res.confirm) {
+															uni.openSetting({
+																success: res => {
+																	// console.log(res.authSetting);
+																}
+															});
+														} else if (res
+															.cancel) {
+															return uni
+																.showToast({
+																	title: '已取消！'
+																});
+														}
+													}
+												});
+											}
+										});
+									} else {
+										uni.saveImageToPhotosAlbum({
+											filePath: resFile.tempFilePath,
+											success: res => {
+												return uni.showToast({
+													title: '保存成功！'
+												});
+											},
+											fail: res => {
+												return uni.showToast({
+													title: res.errMsg
+												});
+											},
+											complete: res => {}
+										});
+									}
+								},
+								fail: res => {}
+							});
+						} else {
+							return uni.showToast({
+								title: resFile.errMsg
+							});
+						}
+					},
+					fail: res => {
+						return uni.showToast({
+							title: res.errMsg
+						});
+					}
+				});
+			}
+			// #endif
 		}
-		// #endif
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.font-bg-red {
-	display: flex;
-	align-items: center;
-	background: var(--view-theme);
-	border-color: var(--view-theme);
-	color: #fff;
-	font-size: 20rpx;
-	text-align: center;
-	line-height: 30rpx;
-	height: 28rpx;
-	border-radius: 5rpx;
-	margin-right: 8rpx;
-	&.ml8 {
-		margin-left: 8rpx;
-		margin-right: 0;
-	}
-}
-.store-detail {
-	padding-top: 80rpx;
-	padding-right: 20rpx;
-	padding-left: 20rpx;
-	background: left top/750rpx 360rpx no-repeat fixed;
-	.section {
-		border-radius: 10rpx;
-		margin-bottom: 20rpx;
-		background-color: #ffffff;
-	}
-	.head {
+	.font-bg-red {
 		display: flex;
 		align-items: center;
-		padding: 20rpx;
+		background: var(--view-theme);
+		border-color: var(--view-theme);
+		color: #fff;
+		font-size: 20rpx;
+		text-align: center;
+		line-height: 30rpx;
+		height: 28rpx;
+		border-radius: 5rpx;
+		margin-right: 8rpx;
+
+		&.ml8 {
+			margin-left: 8rpx;
+			margin-right: 0;
+		}
+	}
+
+	.carebtn {
+		width: 136rpx;
+		height: 52rpx;
+		
+		margin-top: -35rpx;
+		margin-right: 30rpx;
 		image {
-			width: 90rpx;
-			height: 90rpx;
-			border-radius: 6rpx;
-		}
-		.text-wrap {
-			flex: 1;
-			min-width: 0;
-			margin-right: 20rpx;
-			margin-left: 20rpx;
-			line-height: 1;
-			.store-margin{
-				width: 28rpx;
-				height: 30rpx;
-				margin-left: 10rpx;
-			}
-			.name {
-				display: flex;
-				align-items: center;
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #282828;
-				.name_store {
-					display: inline-block;
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					max-width: 140px;
-				}
-			}
-			.fans {
-				margin-top: 15rpx;
-				font-weight: 500;
-				font-size: 22rpx;
-				color: #666666;
-			}
-		}
-		button {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 113rpx;
-			height: 48rpx;
-			border-radius: 24rpx;
-			background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-			font-weight: 500;
-			font-size: 22rpx;
-			color: #ffffff;
-			.iconfont {
-				margin-right: 6rpx;
-				font-size: 22rpx;
-			}
-		}
-		.followed {
-			border: 1px solid #bfbfbf;
-			background: none;
-			color: #999999;
+			width: 100%;
+			height: 100%;
 		}
 	}
-	.wrap {
-		display: flex;
-		align-items: center;
-		padding: 32rpx 20rpx;
-		.name {
-			flex: 1;
-			min-width: 0;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #282828;
+
+	.store-detail {
+		padding-top: 80rpx;
+		padding-right: 20rpx;
+		padding-left: 20rpx;
+		background: left top/750rpx 360rpx no-repeat fixed;
+
+		.section {
+			border-radius: 10rpx;
+			margin-bottom: 20rpx;
+			background-color: #ffffff;
+			border-radius: 21rpx 21rpx ;
 		}
-		.score-wrap {
+
+		.head {
 			display: flex;
 			align-items: center;
-			font-weight: 500;
-			font-size: 28rpx;
-			color: var(--view-theme);
-			.star {
-				position: relative;
-				width: 111rpx;
-				height: 19rpx;
-				margin-right: 10rpx;
-				background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
-				overflow: hidden;
-				view {
-					position: absolute;
-					top: 0;
-					left: 0;
-					height: 100%;
-					background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
-				}
+			padding: 20rpx;
+			border-bottom: 1px solid #e1e1e1;
+
+
+			.head-image {
+				width: 90rpx;
+				height: 90rpx;
+				border-radius: 6rpx;
 			}
-		}	
-		.iconfont {
-			font-size: 36rpx;
-		}
-		.icon-pingfen {
-			margin-right: 6rpx;
-			font-size: 23rpx;
-			color: #666666;
-		}
-		.active {
-			color: $theme-color;
-		}
-	}
-	.info {
-		.item {
-			display: flex;
-			align-items: center;
-			padding: 30rpx 20rpx;
-			border: 1px solid #f5f5f5;
-			font-weight: normal;
-			font-size: 28rpx;
-			line-height: 30rpx;
-			color: #282828;
-			.name {
-				margin-right: 18rpx;
-			}
-			.value {
+
+			.text-wrap {
 				flex: 1;
 				min-width: 0;
+				margin-right: 20rpx;
+				margin-left: 20rpx;
+				line-height: 1;
+
+				.store-margin {
+					width: 28rpx;
+					height: 30rpx;
+					margin-left: 10rpx;
+				}
+
+				.name {
+					display: flex;
+					align-items: center;
+					font-weight: bold;
+					font-size: 28rpx;
+					color: #282828;
+
+					.name_store {
+						display: inline-block;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						max-width: 140px;
+					}
+				}
+
+				.fans {
+					margin-top: 15rpx;
+					font-weight: 500;
+					font-size: 22rpx;
+					color: #666666;
+				}
+			}
+
+			button {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 113rpx;
+				height: 48rpx;
+				border-radius: 24rpx;
+				background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+				font-weight: 500;
+				font-size: 22rpx;
+				color: #ffffff;
+
+				.iconfont {
+					margin-right: 6rpx;
+					font-size: 22rpx;
+				}
+			}
+
+			.followed {
+				border: 1px solid #bfbfbf;
+				background: none;
+				color: #999999;
 			}
 		}
-		.very {
+
+		.wrap {
+			display: flex;
+			align-items: center;
+			padding: 32rpx 20rpx;
+
 			.name {
-				align-self: flex-start;
+				flex: 1;
+				min-width: 0;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #282828;
+			}
+
+			.score-wrap {
+				display: flex;
+				align-items: center;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: var(--view-theme);
+
+				.star {
+					position: relative;
+					width: 111rpx;
+					height: 19rpx;
+					margin-right: 10rpx;
+					background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
+					overflow: hidden;
+
+					view {
+						position: absolute;
+						top: 0;
+						left: 0;
+						height: 100%;
+						background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+					}
+				}
+			}
+
+			.iconfont {
+				font-size: 36rpx;
+			}
+
+			.icon-pingfen {
+				margin-right: 6rpx;
+				font-size: 23rpx;
+				color: #666666;
+			}
+
+			.active {
+				color: $theme-color;
 			}
 		}
-	}
-	.popup-qrcode {
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		z-index: 99;
-		width: 544rpx;
-		padding-top: 48rpx;
-		padding-bottom: 36rpx;
-		border-radius: 24rpx;
-		background-color: #ffffff;
-		transform: translate(-50%, -50%) scale(0);
-		opacity: 0;
-		transition: 0.3s;
-		line-height: 1;
-		text-align: center;
-		color: #282828;
-		.name {
-			max-width: 90%;
-			margin-right: auto;
-			margin-left: auto;
-			font-weight: bold;
-			font-size: 32rpx;
-		}
+
 		.info {
-			margin-top: 24rpx;
-			font-weight: 500;
-			font-size: 24rpx;
+			.item {
+				display: flex;
+				align-items: center;
+				padding: 30rpx 20rpx;
+
+				font-weight: normal;
+				font-size: 28rpx;
+				line-height: 30rpx;
+				color: #282828;
+
+				.name {
+					margin-right: 18rpx;
+				}
+
+				.value {
+					flex: 1;
+					min-width: 0;
+				}
+			}
+
+			.very {
+				.name {
+					align-self: flex-start;
+				}
+			}
 		}
-		image {
-			width: 384rpx;
-			height: 384rpx;
-			margin-top: 18rpx;
+
+		.popup-qrcode {
+			position: fixed;
+			top: 50%;
+			left: 50%;
+			z-index: 99;
+			width: 544rpx;
+			padding-top: 48rpx;
+			padding-bottom: 36rpx;
+			border-radius: 24rpx;
+			background-color: #ffffff;
+			transform: translate(-50%, -50%) scale(0);
+			opacity: 0;
+			transition: 0.3s;
+			line-height: 1;
+			text-align: center;
+			color: #282828;
+
+			.name {
+				max-width: 90%;
+				margin-right: auto;
+				margin-left: auto;
+				font-weight: bold;
+				font-size: 32rpx;
+			}
+
+			.info {
+				margin-top: 24rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+			}
+
+			image {
+				width: 384rpx;
+				height: 384rpx;
+				margin-top: 18rpx;
+			}
+		}
+
+		.popup-active {
+			transform: translate(-50%, -50%) scale(1);
+			opacity: 1;
 		}
 	}
-	.popup-active {
-		transform: translate(-50%, -50%) scale(1);
-		opacity: 1;
-	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 072b5da..a7ea511 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1,2100 +1,2403 @@
 <template>
-  <view
-    :style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
-    class="store-home">
-    <!-- 搜索 -->
-    <!-- #ifdef MP || APP-PLUS -->
-    <view :style="{ height: statusBarHeight }"></view>
-    <view class="header">
-      <view class="head-menu">
-        <view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
-        <view class="iconfont icon-shouye4" @click="goHome" style="color: #fff;"></view>
-      </view>
-      <navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text
-          class="iconfont icon-xiazai5"></text>搜索商品</navigator>
-    </view>
-    <!-- #endif -->
-    <!-- #ifdef H5 -->
-    <view class="header">
-      <view class="head-menu">
-        <view class="iconfont icon-xiangzuo" @click="goback"></view>
-        <view class="iconfont icon-shouye4" @click="goHome"></view>
-      </view>
-      <navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text
-          class="iconfont icon-xiazai5"></text>搜索商品</navigator>
-    </view>
-    <!-- #endif -->
-    <view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
-      <view class="nav-cont">
-        <view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
-          <view class="cont">
-            {{ select.selected ? '评分' : '默认' }}
-            <text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
-          </view>
-        </view>
-        <view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
-          <view class="cont">销量</view>
-        </view>
-        <view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
-          <view class="cont">
-            价格
-            <image
-              :src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
-            </image>
-          </view>
-        </view>
-        <view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
-          <view class="cont">
-            <text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
-          </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" @click="set_where(item.id,0)">
-          {{ item.name }}
-          <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-        </view>
-      </view>
-    </view>
-    <!--diy页面的导航-->
-    <view v-show="navShow && tabActive == 1" class="nav" :style="viewColor">
-      <view class="nav-cont">
-        <view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
-          <view class="cont">精选</view>
-        </view>
-        <view :class="{ active: diyActive == 1 }" class="item" @click="set_where(4,1)">
-          <view class="cont">新品</view>
-        </view>
-        <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>
-    </view>
-    <scroll-view  @refresherrefresh="onRefresh" refresher-enabled="true" :refresher-triggered="isTriggered" class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
-      <!-- 店铺信息 -->
-      <view id="store" class="store">
-        <image :src="store.mer_avatar"></image>
-        <view class="text">
-          <navigator :url="`/pages/store/detail/index?id=${id}`" hover-class="none">
-            <text v-if="store.type_name" class="font-bg-red">{{store.type_name}}</text>
-            <text v-else-if="store.is_trader" class="font-bg-red">自营</text>
-            <text class="name">{{ store.mer_name }}</text>
-            <image v-if="margin_ico_switch==1 && margin_ico && store.is_margin == 10" :src="margin_ico"
-              class="store-margin"></image>
-            <text class="iconfont icon-xiangyou"></text>
-          </navigator>
-          <view class="score">
-            <view class="star">
-              <view
-                :style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
-              </view>
-            </view>
-            <view>{{ score.number.toFixed(1) }}</view>
-          </view>
-        </view>
-        <!-- #ifdef H5 -->
-        <view v-if="store.services_type == 1" class="kefu">
-          <a :href="'tel:'+store.service_phone" style="color: #fff; text-decoration: none;"
-            class="iconfont icon-kefu3"></a>
-        </view>
-        <!-- #endif -->
-        <!-- #ifndef H5 -->
-        <view v-if="store.services_type == 1" class="kefu" @click="call">
-          <text class="iconfont icon-kefu3"></text>
-        </view>
-        <!-- #endif -->
-        <view v-else class="kefu" @click="goService">
-          <text class="iconfont icon-kefu3"></text>
-        </view>
-        <button hover-class="none" :class="store.care ? 'care' : ''" v-if="!isLogin" @click="authOpen">
-          <text v-show="!store.care" class="iconfont icon-guanzhu"></text>
-          {{ store.care ? '已关注' : '关注' }}
-        </button>
-        <button v-else hover-class="none" :class="store.care ? 'care' : ''" @click="followToggle">
-          <text v-show="!store.care" class="iconfont icon-guanzhu"></text>
-          {{ store.care ? '已关注' : '关注' }}
-        </button>
-      </view>
-      <view v-show="!navShow && tabActive === 3 || tabActive === 7" class="nav">
-        <view class="nav-cont">
-          <view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
-            <view class="cont">
-              {{ select.selected ? '评分' : '默认' }}
-              <text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
-            </view>
-          </view>
-          <view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
-            <view class="cont">
-              销量
-            </view>
-          </view>
-          <view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
-            <view class="cont">
-              价格
-              <image v-if="navActive === 2 && where.order == 'price_asc'"
-                :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
-              <image v-if="navActive === 2 && where.order == 'price_desc'"
-                :src="domain+'/static/diy/down'+keyColor+'.png'"></image>
-            </view>
-          </view>
-          <view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
-            <view class="cont">
-              <text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
-            </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" @click="set_where(item.id,0)">{{ item.name }}
-            <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-          </view>
-        </view>
-      </view>
-      <!--diy导航-->
-      <view v-show="!navShow && tabActive === 1" class="nav">
-        <view class="nav-cont">
-          <view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
-            <view class="cont">精选</view>
-          </view>
-          <view :class="{ active: diyActive == 1 }" class="item" @click="set_where(4,1)">
-            <view class="cont">新品</view>
-          </view>
-          <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>
-        <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" @click="set_where(item.id)">{{ item.name }}
-            <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-          </view>
-        </view>
-      </view>
-      <view class="tab-cont" :style="viewColor">
-        <!-- diy组件 -->
-        <!-- <view v-show="diyActive == 0 && tabActive == 1"> -->
-        <view v-show="false">
-          <!-- #ifdef H5 -->
-          <view v-for="(item, index) in styleConfig" :key="index">
-            <block v-if="item.name != 'headerSerch' && item.name != 'tabNav'">
-              <component :is="item.name" :index="index" :dataConfig="item" :merId="id" @detail="goGoodsDetail">
-              </component>
-            </block>
-            </block>
-          </view>
-          <!-- #endif -->
-          <!-- #ifdef MP  || APP-PLUS-->
-          <block v-for="(item, index) in styleConfig" :key="index">
-            <view>
-              <activeParty v-if="item.name == 'activeParty'" :merId="id" :dataConfig="item"></activeParty>
-              <articleList v-if="item.name == 'articleList'" :merId="id" :dataConfig="item"></articleList>
-              <bargain v-if="item.name == 'bargain'" :merId="id" :dataConfig="item"></bargain>
-              <blankPage v-if="item.name == 'blankPage'" :merId="id" :dataConfig="item"></blankPage>
-              <combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
-              <topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
-              <coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
-              <goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item" @detail="goGoodsDetail">
-              </goodList>
-              <guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide>
-              <liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item"></liveBroadcast>
-              <menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
-              <presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
-              <richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
-              <seckill v-if="item.name == 'seckill'" :merId="id" :dataConfig="item"></seckill>
-              <swiperBg v-if="item.name == 'swiperBg'" :merId="id" :dataConfig="item"></swiperBg>
-              <pictureCube v-if="item.name == 'pictureCube'" :merId="id" :dataConfig="item"></pictureCube>
-              <swipers v-if="item.name == 'swipers'" :merId="id" :dataConfig="item"></swipers>
-              <titles v-if="item.name == 'titles'" :merId="id" :dataConfig="item"></titles>
-            </view>
-          </block>
-          <!-- #endif -->
-        </view>
-        <!-- 首页 -->
-        <view v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5">
-          <!-- 商品 -->
-          <view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
-            <view v-if="isColumn" class="goods column">
-              <view v-for="item in goods" :key="item.product_id" class="item" @click="goGoodsDetail(item)">
-                <view class="image">
-                  <easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
-                  <view v-if="item.stock == 0" class="sell_out">已售罄</view>
-                  <view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }"
-                    class="border-picture"></view>
-                </view>
-                <view class="text on acea-row row-between-wrapper">
-                  <view class="name line2">
-                    <text class="name_text line1">{{ item.store_name }}</text>
-                  </view>
-                  <view class="item_bot">
-                    <view class="money-wrap acea-row">
-                      <view class="money">
-                        ¥<text>{{ item.price }}</text>
-                      </view>
-                      <view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
-                        class="acea-row row-middle">
-                        <text class='vip-money'>￥{{item.svip_price}}</text>
-                        <view class="vipImg">
-                          <image class="image" src="/static/images/svip.png"></image>
-                        </view>
-                      </view>
-                    </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 delivery" v-if="item.delivery_free == 1">包邮</text>
-                    </view>
-                    <view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
-                  </view>
-                </view>
-                <view v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)" class="foot">
-                  <text v-show="!isColumn" class="iconfont"></text>
-                  最高赚 ¥{{ item.max_extension }}
-                </view>
-              </view>
-            </view>
-            <view v-else class="goods">
-              <WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1" />
-            </view>
-            <view class="acea-row row-center-wrapper loadingicon">
-              <text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
-              {{loadTitle}}
-            </view>
-            <emptyPage v-if="goods.length == 0 && !goodsLoading" title="暂无商品~"></emptyPage>
-          </view>
-        </view>
-        <!-- 分类 -->
-        <view v-show="tabActive === 2">
-          <view class="category">
-            <view class="section">
-              <view class="head" @click="goCategoryGoods('')">
-                <view class="title">全部</view>
-                <view class="iconfont icon-xiangyou"></view>
-              </view>
-            </view>
-            <view v-for="item in category" :key="item.store_category_id" class="section">
-              <view class="head" @click="goCategoryGoods(item.store_category_id)">
-                <view class="title">{{ item.cate_name }}</view>
-                <view class="iconfont icon-xiangyou"></view>
-              </view>
-              <view v-if="item.children" class="body">
-                <view v-for="value in item.children" :key="value.store_category_id" class="item"
-                  @click="goCategoryGoods(value.store_category_id)">{{ value.cate_name }}</view>
-              </view>
-            </view>
-          </view>
-          <view class="acea-row row-center-wrapper loadingicon">
-            <text :hidden="!categoryLoading" class="iconfont icon-jiazai loading"></text>
-            {{loadTitle}}
-          </view>
-        </view>
-        <!--生活服务-->
-        <view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
-          <view v-if="productList.length" class="goods column">
-            <view v-for="item in productList" :key="item.product_id" class="item" @click="goGoodsDetail(item)">
-              <view class="image">
-                <easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
-              </view>
-              <view class="text acea-row row-between-wrapper">
-                <view class="name line2">
-                  <text class="name_text line1">{{ item.store_name }}</text>
-                </view>
-                <view class="item_bot">
-                  <view class="money-wrap acea-row">
-                    <view class="money">
-                      ¥
-                      <text>{{ item.price }}</text>
-                    </view>
-                    <view v-if="item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle">
-                      <text class='vip-money'>￥{{item.svip_price}}</text>
-                      <view class="vipImg">
-                        <image class="image" src="/static/images/svip.png"></image>
-                      </view>
-                    </view>
-                  </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 delivery" v-if="item.delivery_free == 1">包邮</text>
-                  </view>
-                  <view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
-                </view>
-              </view>
-              <view v-if="item.max_extension && (item.product_type == 0 || item.product_type == 2)" class="foot">
-                <text v-show="!isColumn" class="iconfont"></text>
-                最高赚 ¥{{ item.max_extension }}
-              </view>
-            </view>
-          </view>
-          <view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon">
-            <text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
-            {{loadTitle}}
-          </view>
-          <emptyPage v-if="productList.length == 0 && !goodsLoading" title="暂无商品~"></emptyPage>
-        </view>
-        <!-- 优惠券 -->
-        <view v-show="diyActive == 3 && tabActive == 1">
-          <view v-if="coupon.length" class="coupon">
-            <view v-for="item in coupon" :key="item.coupon_id" class="item">
-              <view class="left gary" v-if="item.issue">
-                <view class="money">
-                  ¥
-                  <text>{{ item.coupon_price }}</text>
-                </view>
-                <view>满{{ item.use_min_price }}元可用</view>
-              </view>
-              <view class="left" v-else
-                :style="{ 'background-image': `url(${domain}/static/diy/couponBg${keyColor}.png)` }">
-                <view class="money">
-                  ¥
-                  <text>{{ item.coupon_price }}</text>
-                </view>
-                <view>满{{ item.use_min_price }}元可用</view>
-              </view>
-              <view class="right">
-                <view class="name">
-                  <text :class="{gary:item.issue}">{{item.type===0?'店铺券':'商品券'}}</text>
-                  {{ item.title }}
-                </view>
-                <view class="time-wrap" style="justify-content: space-between;">
-                  <block v-if="item.coupon_type == 1">
-                    <view class="time">{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}
-                    </view>
-                  </block>
-                  <block v-if="item.coupon_type == 0">
-                    <view>领取后{{ item.coupon_time}}天内可用</view>
-                  </block>
-                  <block v-if="item.issue">
-                    <view class="gary iconfont icon-yilingqu2"></view>
-                  </block>
-                  <block v-else>
-                    <view class="button" @click="receiveCoupon(item)">立即领取</view>
-                  </block>
-                </view>
-              </view>
-            </view>
-          </view>
-          <emptyPage v-if="coupon.length == 0" title="暂无优惠券~"></emptyPage>
-        </view>
-        <!--活动专场-->
-        <view v-show="tabActive === 4">
-          <block v-if="topicList.length>0">
-            <view class="main_count">
-              <navigator v-for="(item,index) in topicList" :key='item.group_data_id'
-                :url="`/pages/activity/topic_detail/index?id=${item.group_data_id}`" hover-class="none">
-                <view class='list'>
-                  <image :src="item.pic" class="picture"></image>
-                </view>
-              </navigator>
-            </view>
-          </block>
-          <block v-else>
-            <view class='empty-box' v-cloak>
-              <image src='../static/images/no-topic.png'></image>
-              <view class="txt">暂无活动专场哦~</view>
-            </view>
-          </block>
-        </view>
-      </view>
-    </scroll-view>
-    <view class="footer" :style="viewColor">
-      <view v-for="(item, index) in tabs" :key="index" :class="{ active: tabActive === item.value }" class="item"
-        @click="tab(item.value)">
-        <view :class="['iconfont', item.icon]"></view>
-        <view>{{ item.name }}</view>
-      </view>
-    </view>
-    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-  </view>
+	<view>
+
+		<view class="content-top">
+			<view
+				:style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
+				class="store-home">
+
+			</view>
+			<!-- 搜索 -->
+			<!-- #ifdef MP || APP-PLUS -->
+			<view :style="{ height: statusBarHeight }"></view>
+			<view class="header">
+				<view class="head-menu" style="width: 30rpx;">
+					<view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
+					
+				</view>
+				<navigator  style="width:403rpx ;margin-right: 56rpx;" :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text
+						class="iconfont icon-xiazai5"></text>搜索商品</navigator>
+					<retuntop/>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="header">
+				<view class="head-menu">
+					<view class="iconfont icon-xiangzuo" @click="goback"></view>
+					<view class="iconfont icon-shouye4" @click="goHome"></view>
+				</view>
+				<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text
+						class="iconfont icon-xiazai5"></text>搜索商品</navigator>
+			</view>
+			<!-- #endif -->
+			<!-- 店铺信息 -->
+			<view id="store" class="store">
+				<image class="store-image" :src="store.mer_avatar"></image>
+				<view class="text">
+					<view class="" style="display: flex;justify-content: space-between;">
+						<view class="" style="display: flex;">
+							<navigator :url="`/pages/store/detail/index?id=${id}`" hover-class="none">
+								<text class="name">{{ store.mer_name }}</text>
+								<image v-if="margin_ico_switch==1 && margin_ico && store.is_margin == 10"
+									:src="margin_ico" class="store-margin"></image>
+								<text class="iconfont icon-xiangyou"></text>
+							</navigator>
+							<!-- #ifdef H5 -->
+							<view v-if="store.services_type == 1" class="kefu">
+								<a :href="'tel:'+store.service_phone" style="color: #fff; text-decoration: none;"
+									class="iconfont icon-kefu3"></a>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view v-if="store.services_type == 1" class="kefu" @click="call">
+								<text class="iconfont icon-kefu3"></text>
+							</view>
+							<!-- #endif -->
+							<view v-else class="kefu" @click="goService">
+								<text class="iconfont icon-kefu3"></text>
+							</view>
+						</view>
+						<view class="">
+							<view class="carebtn" v-if="!isLogin" @click="authOpen">
+								<image src="@/static/images/gz.png" v-if=" store.care" mode="aspectFit"></image>
+								<image src="@/static/images/gz1.png" v-else mode="aspectFit"></image>
+							</view>
+
+							<view class="carebtn" @click="followToggle" v-else>
+								<image src="@/static/images/gz.png" v-if=" store.care" mode="aspectFit"></image>
+								<image src="@/static/images/gz1.png" v-else mode="aspectFit"></image>
+							</view>
+
+						</view>
+					</view>
+					<view class="store-dp">
+						<view v-if="store.type_name" class="font-bg-reda" style='margin-top: 15rpx;'>{{store.type_name}}
+						</view>
+						<view v-else-if="store.is_trader" class="font-bg-red" style='margin-top: 15rpx;'>自营</view>
+						<view class="score">
+							<view class="score-title">店铺评分</view>
+							<view class="star">
+								<view
+									:style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
+								</view>
+							</view>
+							<!-- <view>{{ score.number.toFixed(1) }}</view> -->
+						</view>
+						<view class="store-dp-t">
+							{{ care_conut < 10000 ? care_conut : (care_conut / 10000).toFixed(2) + '万' }}人关注
+						</view>
+
+					</view>
+
+				</view>
+
+
+				<!-- <button hover-class="none" :class="store.care ? 'care' : ''" v-if="!isLogin" @click="authOpen">
+					<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
+					{{ store.care ? '已关注' : '关注' }}
+
+				</button> -->
+				<!-- <button v-else hover-class="none" :class="store.care ? 'care' : ''" @click="followToggle"
+					style="background-color: red;">
+					<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
+					{{ store.care ? '已关注' : '关注' }}
+				</button> -->
+
+			</view>
+			<view v-show="!navShow && tabActive === 3 || tabActive === 7" class="nav">
+				<view class="nav-cont1">
+					<view class="nav-cont1-item">
+						<view :class="{ active: navActive === 0 }" class="item"
+							@click="navActive = 0;select.show = !select.show">
+							<view class="cont">
+								{{ select.selected ? '评分' : '默认' }}
+								<text
+									:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
+							</view>
+						</view>
+						<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
+							<view class="cont">
+								销量
+							</view>
+						</view>
+						<view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
+							<view class="cont">
+								价格
+								<image v-if="navActive === 2 && where.order == 'price_asc'"
+									:src="domain+'/static/diy/up'+keyColor+'.png'"></image>
+								<image v-if="navActive === 2 && where.order == 'price_desc'"
+									:src="domain+'/static/diy/down'+keyColor+'.png'"></image>
+							</view>
+						</view>
+
+					</view>
+
+					<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
+						<view class="cont">
+
+							<view class="dp-img">
+
+								<image src="@/static/images/dp1.png" v-if="isColumn " mode="aspectFit"></image>
+								<image src="@/static/images/dp2.png" v-else mode="aspectFit"></image>
+							</view>
+							<!-- <text
+								:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text> -->
+						</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" @click="set_where(item.id,0)">{{ item.name }}
+						<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
+					</view>
+				</view>
+			</view>
+			<!--diy导航-->
+			<view v-show="!navShow && tabActive === 1" class="nav">
+				<view class="nav-cont">
+					<view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
+						<view class="cont">精选</view>
+					</view>
+					<view :class="{ active: diyActive == 1 }" class="item" @click="set_where(4,1)">
+						<view class="cont">新品</view>
+					</view>
+					<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>
+				<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" @click="set_where(item.id)">{{ item.name }}
+						<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+
+		<view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
+			<view class="nav-cont">
+				<view :class="{ active: navActive === 0 }" class="item"
+					@click="navActive = 0;select.show = !select.show">
+					<view class="cont">
+						{{ select.selected ? '评分' : '默认' }}
+						<text
+							:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
+					</view>
+				</view>
+				<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
+					<view class="cont">销量</view>
+				</view>
+				<view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
+					<view class="cont">
+						价格
+						<image
+							:src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
+						</image>
+					</view>
+				</view>
+				<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
+					<view class="cont">
+						<text
+							:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
+					</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" @click="set_where(item.id,0)">
+					{{ item.name }}
+					<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
+				</view>
+			</view>
+		</view>
+		<!--diy页面的导航-->
+		<view v-show="navShow && tabActive == 1" class="nav" :style="viewColor">
+			<view class="nav-cont">
+				<view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
+					<view class="cont">精选</view>
+				</view>
+				<view :class="{ active: diyActive == 1 }" class="item" @click="set_where(4,1)">
+					<view class="cont">新品</view>
+				</view>
+				<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>
+		</view>
+		<scroll-view @refresherrefresh="onRefresh" refresher-enabled="true" :refresher-triggered="isTriggered"
+			class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
+
+
+			<view class="tab-cont" :style="viewColor">
+				<!-- diy组件 -->
+				<!-- <view v-show="diyActive == 0 && tabActive == 1"> -->
+				<view v-show="false">
+					<!-- #ifdef H5 -->
+					<view v-for="(item, index) in styleConfig" :key="index">
+						<block v-if="item.name != 'headerSerch' && item.name != 'tabNav'">
+							<component :is="item.name" :index="index" :dataConfig="item" :merId="id"
+								@detail="goGoodsDetail">
+							</component>
+						</block>
+						</block>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef MP  || APP-PLUS-->
+					<block v-for="(item, index) in styleConfig" :key="index">
+						<view>
+							<activeParty v-if="item.name == 'activeParty'" :merId="id" :dataConfig="item"></activeParty>
+							<articleList v-if="item.name == 'articleList'" :merId="id" :dataConfig="item"></articleList>
+							<bargain v-if="item.name == 'bargain'" :merId="id" :dataConfig="item"></bargain>
+							<blankPage v-if="item.name == 'blankPage'" :merId="id" :dataConfig="item"></blankPage>
+							<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
+							<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
+							<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
+							<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
+								@detail="goGoodsDetail">
+							</goodList>
+							<guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide>
+							<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
+							</liveBroadcast>
+							<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
+							<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
+							<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
+							<seckill v-if="item.name == 'seckill'" :merId="id" :dataConfig="item"></seckill>
+							<swiperBg v-if="item.name == 'swiperBg'" :merId="id" :dataConfig="item"></swiperBg>
+							<pictureCube v-if="item.name == 'pictureCube'" :merId="id" :dataConfig="item"></pictureCube>
+							<swipers v-if="item.name == 'swipers'" :merId="id" :dataConfig="item"></swipers>
+							<titles v-if="item.name == 'titles'" :merId="id" :dataConfig="item"></titles>
+						</view>
+					</block>
+					<!-- #endif -->
+				</view>
+				<!-- 首页 -->
+				<view v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5">
+					<!-- 商品 -->
+
+					<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
+						<view v-if="isColumn" class="goods column">
+							<view v-for="item in goods" :key="item.product_id" class="item"
+								@click="goGoodsDetail(item)">
+
+								<view class="image">
+									<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
+									<view v-if="item.stock == 0" class="sell_out">已售罄</view>
+									<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }"
+										class="border-picture"></view>
+								</view>
+								<view class="text on acea-row row-between-wrapper">
+									<view class="name line2">
+										<text class="name_text line1">{{ item.store_name }}</text>
+									</view>
+									<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
+									<view class="item_bot">
+										<view class="money-wrap">
+											<view class="" style="width: 500rpx;display: flex;justify-content: space-between;">
+												<view class="money">
+
+													¥<text>{{ item.price }}</text>
+												</view>
+												<view class="items-img"  style='width: 58rpx;height: 58rpx;'>
+													<image src="@/static/images/LHYC/J.png" mode="aspectFit" style='width: 44rpx;height: 44rpx;'></image>
+												</view>
+											</view>
+											<view
+												v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
+												class="acea-row row-middle">
+												<text class='vip-money'>￥{{item.svip_price}}</text>
+												<view class="vipImg">
+													<image class="image" src="/static/images/svip.png"></image>
+												</view>
+											</view>
+										</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 delivery" v-if="item.delivery_free == 1">包邮</text>
+										</view>
+										
+									</view>
+								</view>
+								<view v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)"
+									class="foot">
+									<text v-show="!isColumn" class="iconfont"></text>
+									最高赚 ¥{{ item.max_extension }}
+								</view>
+							</view>
+						</view>
+						<view v-else class="goods">
+							<WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1" />
+						</view>
+						<view class="acea-row row-center-wrapper loadingicon">
+							<text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
+							{{loadTitle}}
+						</view>
+						<emptyPage v-if="goods.length == 0 && !goodsLoading" title="暂无商品~"></emptyPage>
+					</view>
+				</view>
+				<!-- 分类 -->
+				<view v-show="tabActive === 2">
+					<view class="category">
+						<view class="section">
+							<view class="head" @click="goCategoryGoods('')">
+								<view class="title">全部</view>
+								<view class="iconfont icon-xiangyou"></view>
+							</view>
+						</view>
+						<view v-for="item in category" :key="item.store_category_id" class="section">
+							<view class="head" @click="goCategoryGoods(item.store_category_id)">
+								<view class="title">{{ item.cate_name }}</view>
+								<view class="iconfont icon-xiangyou"></view>
+							</view>
+							<view v-if="item.children" class="body">
+								<view v-for="value in item.children" :key="value.store_category_id" class="item"
+									@click="goCategoryGoods(value.store_category_id)">{{ value.cate_name }}</view>
+							</view>
+						</view>
+					</view>
+					<view class="acea-row row-center-wrapper loadingicon">
+						<text :hidden="!categoryLoading" class="iconfont icon-jiazai loading"></text>
+						{{loadTitle}}
+					</view>
+				</view>
+				<!--生活服务-->
+				<view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
+					<view v-if="productList.length" class="goods column">
+						<view v-for="item in productList" :key="item.product_id" class="item"
+							@click="goGoodsDetail(item)">
+							<view class="image">
+								<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
+							</view>
+							<view class="text acea-row row-between-wrapper">
+								<view class="name line2">
+									<text class="name_text line1">{{ item.store_name }}</text>
+								</view>
+								<view class="item_bot">
+									<view class="money-wrap acea-row">
+										<view class="money">
+											¥
+											<text>{{ item.price }}</text>
+										</view>
+										<view v-if="item.show_svip_info.show_svip_price && item.svip_price"
+											class="acea-row row-middle">
+											<text class='vip-money'>￥{{item.svip_price}}</text>
+											<view class="vipImg">
+												<image class="image" src="/static/images/svip.png"></image>
+											</view>
+										</view>
+									</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 delivery" v-if="item.delivery_free == 1">包邮</text>
+									</view>
+									<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
+								</view>
+							</view>
+							<view v-if="item.max_extension && (item.product_type == 0 || item.product_type == 2)"
+								class="foot">
+								<text v-show="!isColumn" class="iconfont"></text>
+								最高赚 ¥{{ item.max_extension }}
+							</view>
+						</view>
+					</view>
+					<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon">
+						<text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
+						{{loadTitle}}
+					</view>
+					<emptyPage v-if="productList.length == 0 && !goodsLoading" title="暂无商品~"></emptyPage>
+				</view>
+				<!-- 优惠券 -->
+				<view v-show="diyActive == 3 && tabActive == 1">
+					<view v-if="coupon.length" class="coupon">
+						<view v-for="item in coupon" :key="item.coupon_id" class="item">
+							<view class="left gary" v-if="item.issue">
+								<view class="money">
+									¥
+									<text>{{ item.coupon_price }}</text>
+								</view>
+								<view>满{{ item.use_min_price }}元可用</view>
+							</view>
+							<view class="left" v-else
+								:style="{ 'background-image': `url(${domain}/static/diy/couponBg${keyColor}.png)` }">
+								<view class="money">
+									¥
+									<text>{{ item.coupon_price }}</text>
+								</view>
+								<view>满{{ item.use_min_price }}元可用</view>
+							</view>
+							<view class="right">
+								<view class="name">
+									<text :class="{gary:item.issue}">{{item.type===0?'店铺券':'商品券'}}</text>
+									{{ item.title }}
+								</view>
+								<view class="time-wrap" style="justify-content: space-between;">
+									<block v-if="item.coupon_type == 1">
+										<view class="time">
+											{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}
+										</view>
+									</block>
+									<block v-if="item.coupon_type == 0">
+										<view>领取后{{ item.coupon_time}}天内可用</view>
+									</block>
+									<block v-if="item.issue">
+										<view class="gary iconfont icon-yilingqu2"></view>
+									</block>
+									<block v-else>
+										<view class="button" @click="receiveCoupon(item)">立即领取</view>
+									</block>
+								</view>
+							</view>
+						</view>
+					</view>
+					<emptyPage v-if="coupon.length == 0" title="暂无优惠券~"></emptyPage>
+				</view>
+				<!--活动专场-->
+				<view v-show="tabActive === 4">
+					<block v-if="topicList.length>0">
+						<view class="main_count">
+							<navigator v-for="(item,index) in topicList" :key='item.group_data_id'
+								:url="`/pages/activity/topic_detail/index?id=${item.group_data_id}`" hover-class="none">
+								<view class='list'>
+									<image :src="item.pic" class="picture"></image>
+								</view>
+							</navigator>
+						</view>
+					</block>
+					<block v-else>
+						<view class='empty-box' v-cloak>
+							<image src='../static/images/no-topic.png'></image>
+							<view class="txt">暂无活动专场哦~</view>
+						</view>
+					</block>
+				</view>
+			</view>
+		</scroll-view>
+		<view class="footer" :style="viewColor">
+			<view v-for="(item, index) in tabs" :key="index" :class="{ active: tabActive === item.value }" class="item"
+				@click="tab(item.value)">
+				<view :class="['iconfont', item.icon]"></view>
+				<view>{{ item.name }}</view>
+			</view>
+		</view>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+	</view>
 </template>
 
 <script>
-  import request from "@/utils/request.js";
-  import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
-  import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
-  import {
-    getStoreDetail,
-    getStoreGoods,
-    getStoreCategory,
-    followStore,
-    unfollowStore,
-    storeServiceList
-  } from '@/api/store.js';
-  import { initiateAssistApi, getTopicList } from '@/api/activity.js';
-  import { getShopCoupons, setCouponReceive, getDiy, getProductSpuAPI } from '@/api/api.js';
-  import { getUserInfo } from '@/api/user.js';
-  import { configMap } from "@/utils";
-  import { mapGetters } from "vuex";
-  import { goShopDetail } from '@/libs/order.js';
-  import authorize from '@/components/Authorize';
-  import history from "@/mixins/history";
-  import emptyPage from '@/components/emptyPage.vue'
-  import shareScence from "@/libs/spread";
-  import { HTTP_REQUEST_URL } from '@/config/app';
-  import mConfig from '../component/index.js';
-  // #ifdef MP || APP-PLUS
-  import activeParty from '@/pages/index/component/activeParty';
-  import coupon from '../../index/component/coupon';
-  import bargain from '../../index/component/bargain';
-  import blankPage from '../../index/component/blankPage';
-  import combination from '../../index/component/combination';
-  import goodList from '../../index/component/goodList';
-  import guide from '../../index/component/guide';
-  import liveBroadcast from '../../index/component/liveBroadcast';
-  import menus from '../../index/component/menus';
-  import topic from '../../index/component/topic';
-  import presellList from '../../index/component/presellList';
-  import richText from '../../index/component/richText';
-  import seckill from '../../index/component/seckill';
-  import swiperBg from '../../index/component/swiperBg';
-  import pictureCube from '../../index/component/pictureCube'
-  import titles from '../../index/component/titles';
-  // #endif
-  const app = getApp();
-  export default {
-    components: {
-      ...mConfig,
-      authorize,
-      emptyPage,
-      WaterfallsFlow,
-      easyLoadimage,
-      // #ifdef MP || APP-PLUS
-      activeParty,
-      bargain,
-      coupon,
-      blankPage,
-      combination,
-      goodList,
-      liveBroadcast,
-      menus,
-      topic,
-      presellList,
-      richText,
-      seckill,
-      swiperBg,
-      pictureCube,
-      titles
-      // #endif
-    },
-    mixins: [history],
-    filters: {
-      dateFormat: function(value) {
-        if (!value) {
-          return '';
-        }
-        return value.split(' ')[0].replace('-', '.');
-      }
-    },
-    data() {
-      return {
-		  //下拉
-		  isTriggered:false,
-        domain: HTTP_REQUEST_URL,
-        // #ifdef MP
-        menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
-        // #endif
-        id: 0, // 商铺id
-        store: {}, // 商铺详情
-        goods: [], // 商铺商品
-        category: [], // 商铺分类
-        coupon: [], // 优惠券
-        productList: [], //本地服务商品
-        styleConfig: [],
-        isColumn: false, // 商品列表排列方式
-        navShow: false,
-        navActive: 0,
-        diyActive: 1,
-        tabActive: 0, // 底部切换
-        isCoupon: 0,
-        keyword: '',
-        order: '',
-        sortPrice: true, // 价格排序
-        goodsLoading: false,
-        categoryLoading: false,
-        loadTitle: '加载更多',
-        isShowAuth: false, //是否隐藏授权
-        isAuto: false, //没有授权的不会自动授权
-        where: {
-          order: '',
-          keyword: '',
-          page: 1,
-          limit: 10
-        },
-        // 下拉菜单
-        select: {
-          show: false,
-          selected: 0,
-          options: [{
-              id: 0,
-              name: '默认'
-            },
-            {
-              id: 1,
-              name: '评分'
-            }
-          ]
-        },
-        // 底部菜单
-        tabs1: [{
-            icon: 'icon-yizhan_o',
-            name: '首页',
-            value: 1,
-          },
-          {
-            icon: 'icon-gouwu_o',
-            name: '商品',
-            value: 3,
-          },
-          {
-            icon: 'icon-baoguo_huanbaohe_o',
-            name: '生活服务',
-            value: 5,
-          },
-          {
-            icon: 'icon-yingyongAPP_o',
-            name: '分类',
-            value: 2,
-          },
-          {
-            icon: 'icon-liwu_o',
-            name: '专场',
-            value: 4,
-          }
-        ],
-        // 底部菜单
-        tabs2: [{
-            icon: 'icon-yizhan_o',
-            name: '首页',
-            value: 1,
-          },
-          {
-            icon: 'icon-gouwu_o',
-            name: '商品',
-            value: 3,
-          },
-          {
-            icon: 'icon-yingyongAPP_o',
-            name: '分类',
-            value: 2,
-          },
-          {
-            icon: 'icon-zhuanti',
-            name: '专场',
-            value: 4,
-          }
-        ],
-        tabs3: [{
-            icon: 'icon-yizhan_o',
-            name: '云商品',
-            value: 7,
-          }, {
-            icon: 'icon-gouwu_o',
-            name: '商品',
-            value: 3,
-          },
-          {
-            icon: 'icon-yingyongAPP_o',
-            name: '分类',
-            value: 2,
-          }
-        ],
-        tabs4: [{
-            icon: 'icon-gouwu_o',
-            name: '商品',
-            value: 3,
-          },
-          {
-            icon: 'icon-yingyongAPP_o',
-            name: '分类',
-            value: 2,
-          }
-        ],
-        tabs: [],
-        storeScroll: true,
-        storeTop: 0,
-        navHeight: 0,
-        currSpid: "",
-        topicList: [],
-        service_open: false,
-        type: 3,
-        statusBarHeight: 0,
-        isLihaiYun: ''
-      }
-    },
-    computed: {
-      score: function() {
-        let store = this.store,
-          score = {
-            star: 0,
-            number: 0
-          };
-        if ('postage_score' in store) {
-          score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(store
-              .service_score)) /
-            3;
-          score.star = score.number / 5 * 100;
-        }
-        return score;
-      },
-      ...configMap({
-        margin_ico_switch: 0,
-        margin_ico: '',
-      }, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
-    },
-    watch: {
-      tabActive: function(value, old) {
-        switch (value) {
-          case 1:
-            if (this.goods.length == 0 && this.isCoupon == 0) {
-              this.resetParmas();
-              this.where.order = this.order == 1 ? 'is_new' : '';
-              this.where.action = this.order == 2 ? 1 : '';
-              this.getGoods();
-            } else if (this.isCoupon == 1) {
-              this.getCoupon();
-            }
-            break;
-          case 2:
-            this.getCategory();
-            break;
-          case 3:
-            this.where = {
-              order: '',
-              keyword: '',
-              page: 1,
-              limit: 10
-            };
-            this.getGoods();
-            break;
-          case 4:
-            this.getTopic();
-            break;
-          case 5:
-            if (this.productList.length == 0) {
-              this.resetParmas();
-              this.get_service_list();
-            }
-            break;
-          case 6:
-            this.getCoupon();
-            break;
-          case 7:
-            this.getProductSpu()
-            break;
-        }
-      },
-    },
-    onLoad: function(options) {
-      this.isLihaiYun = options.LihaiYun // 是否是里海云仓
-      this.type = parseInt(options.type) || 3
-      this.id = options.mer_id || options.id || 0;
-      this.isCoupon = options.coupon || 0;
-      this.diyActive = options.order || 0;
-      this.order = options.order;
-      if (options.spid) {
-        this.currSpid = options.spid
-        app.globalData.spid = options.spid;
-      }
-      // #ifdef MP
-      if (options.scene) {
-        let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-        // console.log(value)
-        if (value.id) this.id = value.id || 0;
-        //记录推广人uid
-        if (value.spid) {
-          this.currSpid = value.spid
-          app.globalData.spid = value.spid;
-        }
-      }
-      // #endif
-      this.getStore();
-      this.diyData();
-      shareScence(this.currSpid, this.isLogin)
-      if (this.isLogin) {
-        // #ifdef MP
-        this.getHistory()
-        // #endif
-      }
-      this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-	 
-    },
-    onShow() {
+	import request from "@/utils/request.js";
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
+		import retuntop from '@/components/content-top/index.vue';
+	import {
+		getStoreDetail,
+		getStoreGoods,
+		getStoreCategory,
+		followStore,
+		unfollowStore,
+		storeServiceList
+	} from '@/api/store.js';
+	import {
+		initiateAssistApi,
+		getTopicList
+	} from '@/api/activity.js';
+	import {
+		getShopCoupons,
+		setCouponReceive,
+		getDiy,
+		getProductSpuAPI
+	} from '@/api/api.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js';
+	import authorize from '@/components/Authorize';
+	import history from "@/mixins/history";
+	import emptyPage from '@/components/emptyPage.vue'
+	import shareScence from "@/libs/spread";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import mConfig from '../component/index.js';
+	// #ifdef MP || APP-PLUS
+	import activeParty from '@/pages/index/component/activeParty';
+	import coupon from '../../index/component/coupon';
+	import bargain from '../../index/component/bargain';
+	import blankPage from '../../index/component/blankPage';
+	import combination from '../../index/component/combination';
+	import goodList from '../../index/component/goodList';
+	import guide from '../../index/component/guide';
+	import liveBroadcast from '../../index/component/liveBroadcast';
+	import menus from '../../index/component/menus';
+	import topic from '../../index/component/topic';
+	import presellList from '../../index/component/presellList';
+	import richText from '../../index/component/richText';
+	import seckill from '../../index/component/seckill';
+	import swiperBg from '../../index/component/swiperBg';
+	import pictureCube from '../../index/component/pictureCube'
+	import titles from '../../index/component/titles';
+	// #endif
+	const app = getApp();
+	export default {
+		components: {
+			...mConfig,
+			authorize,
+			emptyPage,
+			WaterfallsFlow,
+			easyLoadimage,
+			// #ifdef MP || APP-PLUS
+			activeParty,
+			bargain,
+			coupon,
+			blankPage,
+			combination,
+			goodList,
+			liveBroadcast,
+			menus,
+			topic,
+			presellList,
+			richText,
+			seckill,
+			swiperBg,
+			pictureCube,
+			titles,
+			retuntop
+			// #endif
+			
+		},
+		mixins: [history],
+		filters: {
+			dateFormat: function(value) {
+				if (!value) {
+					return '';
+				}
+				return value.split(' ')[0].replace('-', '.');
+			}
+		},
+		data() {
+			return {
+				//下拉
+				isTriggered: false,
+				domain: HTTP_REQUEST_URL,
+				// #ifdef MP
+				menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
+				// #endif
+				id: 0, // 商铺id
+				store: {}, // 商铺详情
+				goods: [], // 商铺商品
+				category: [], // 商铺分类
+				coupon: [], // 优惠券
+				productList: [], //本地服务商品
+				styleConfig: [],
+				isColumn: false, // 商品列表排列方式
+				navShow: false,
+				navActive: 0,
+				diyActive: 1,
+				tabActive: 0, // 底部切换
+				isCoupon: 0,
+				keyword: '',
+				order: '',
+				sortPrice: true, // 价格排序
+				goodsLoading: false,
+				categoryLoading: false,
+				loadTitle: '加载更多',
+				isShowAuth: false, //是否隐藏授权
+				isAuto: false, //没有授权的不会自动授权
+				where: {
+					order: '',
+					keyword: '',
+					page: 1,
+					limit: 10
+				},
+				// 下拉菜单
+				select: {
+					show: false,
+					selected: 0,
+					options: [{
+							id: 0,
+							name: '默认'
+						},
+						{
+							id: 1,
+							name: '评分'
+						}
+					]
+				},
+				// 底部菜单
+				tabs1: [{
+						icon: 'icon-yizhan_o',
+						name: '首页',
+						value: 1,
+					},
+					{
+						icon: 'icon-gouwu_o',
+						name: '商品',
+						value: 3,
+					},
+					{
+						icon: 'icon-baoguo_huanbaohe_o',
+						name: '生活服务',
+						value: 5,
+					},
+					{
+						icon: 'icon-yingyongAPP_o',
+						name: '分类',
+						value: 2,
+					},
+					{
+						icon: 'icon-liwu_o',
+						name: '专场',
+						value: 4,
+					}
+				],
+				// 底部菜单
+				tabs2: [{
+						icon: 'icon-yizhan_o',
+						name: '首页',
+						value: 1,
+					},
+					{
+						icon: 'icon-gouwu_o',
+						name: '商品',
+						value: 3,
+					},
+					{
+						icon: 'icon-yingyongAPP_o',
+						name: '分类',
+						value: 2,
+					},
+					{
+						icon: 'icon-zhuanti',
+						name: '专场',
+						value: 4,
+					}
+				],
+				tabs3: [{
+						icon: 'icon-yizhan_o',
+						name: '云商品',
+						value: 7,
+					}, {
+						icon: 'icon-gouwu_o',
+						name: '商品',
+						value: 3,
+					},
+					{
+						icon: 'icon-yingyongAPP_o',
+						name: '分类',
+						value: 2,
+					}
+				],
+				tabs4: [{
+						icon: 'icon-gouwu_o',
+						name: '商品',
+						value: 3,
+					},
+					{
+						icon: 'icon-yingyongAPP_o',
+						name: '分类',
+						value: 2,
+					}
+				],
+				tabs5: [{
+					icon: 'icon-yizhan_o',
+					name: '云商品',
+					value: 7,
+				}],
+				tabs: [],
+				storeScroll: true,
+				storeTop: 0,
+				navHeight: 0,
+				currSpid: "",
+				topicList: [],
+				service_open: false,
+				type: 3,
+				statusBarHeight: 0,
+				isLihaiYun: '',
+				business_status: 0,
+				care_conut: 0,
+			}
+		},
+		computed: {
+			score: function() {
+				let store = this.store,
+					score = {
+						star: 0,
+						number: 0,
 
-    },
-    onReady: function() {
+					};
+				if ('postage_score' in store) {
+					score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(
+							store
+							.service_score)) /
+						3;
+					score.star = score.number / 5 * 100;
 
-    },
+				}
+				return score;
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+			}, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
+		},
+		watch: {
+			tabActive: function(value, old) {
+				switch (value) {
+					case 1:
+						if (this.goods.length == 0 && this.isCoupon == 0) {
+							this.resetParmas();
+							this.where.order = this.order == 1 ? 'is_new' : '';
+							this.where.action = this.order == 2 ? 1 : '';
+							this.getGoods();
+						} else if (this.isCoupon == 1) {
+							this.getCoupon();
+						}
+						break;
+					case 2:
+						this.getCategory();
+						break;
+					case 3:
+						this.where = {
+							order: '',
+							keyword: '',
+							page: 1,
+							limit: 10
+						};
+						this.getGoods();
+						break;
+					case 4:
+						this.getTopic();
+						break;
+					case 5:
+						if (this.productList.length == 0) {
+							this.resetParmas();
+							this.get_service_list();
+						}
+						break;
+					case 6:
+						this.getCoupon();
+						break;
+					case 7:
+						this.getProductSpu()
+						break;
+				}
+			},
+		},
+		onLoad: function(options) {
+			this.isLihaiYun = options.LihaiYun // 是否是里海云仓
+			this.type = parseInt(options.type) || 3
+			this.id = options.mer_id || options.id || 0;
+			this.isCoupon = options.coupon || 0;
+			this.diyActive = options.order || 0;
+			this.order = options.order;
+			if (options.spid) {
+				this.currSpid = options.spid
+				app.globalData.spid = options.spid;
+			}
+			// #ifdef MP
+			if (options.scene) {
+				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
+				// console.log(value)
+				if (value.id) this.id = value.id || 0;
+				//记录推广人uid
+				if (value.spid) {
+					this.currSpid = value.spid
+					app.globalData.spid = value.spid;
+				}
+			}
+			// #endif
+			this.getStore();
+			this.diyData();
+			shareScence(this.currSpid, this.isLogin)
+			if (this.isLogin) {
+				// #ifdef MP
+				this.getHistory()
+				// #endif
+			}
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 
-    /**
-     * 用户点击右上角分享
-     */
-    // #ifdef MP
-    onShareAppMessage: function() {
-      wx.showShareMenu({
-        withShareTicket: true,
-        menus: ['shareAppMessage', 'shareTimeline']
-      })
-      let that = this;
-      return {
-        title: that.store.mer_name || '',
-        imageUrl: that.store.mer_avatar || '',
-        path: '/pages/store/home/index?id=' + that.id + '&spid=' + that.uid,
-      }
-    },
-    onShareTimeline: function() {
-      let that = this;
-      return {
-        title: that.store.mer_name || '',
-        query: {
-          id: that.id,
-          spid: that.uid
-        },
-        imageUrl: that.store.mer_avatar || ''
-      }
-    },
-    // #endif
-    mounted: function() {
-      const query = uni.createSelectorQuery().in(this);
-      query.select('#store').boundingClientRect(data => {
-        this.storeHeight = data.height;
-        this.storeTop = data.top;
-      }).exec();
-    },
-    methods: {
-      getProductSpu() {
-		let that = this;
-		if (that.loadend) return;
-		if (that.loading) return;
-		if (that.goodsLoading) return;
-		that.goodsLoading = true;
-		that.loadTitle = '';
-		getProductSpuAPI(that.id, that.where).then(res => {
-		  that.goodsLoading = false;
-		  let list = res.data.list;
-		  let goodsList = that.$util.SplitArray(list, that.goods);
-		  let loadend = list.length < that.where.limit;
-		  // console.log(list.length);
-		  // console.log(that.where.limit);
-		  that.loadend = loadend;
-		  that.loading = false;
-		  that.loadTitle = loadend ? '已全部加载' : '加载更多';
-		  that.$set(that, 'goods', goodsList);
-		  that.$set(that.where, 'page', that.where.page + 1);
-		  // console.log(loadend);
-		  // console.log(that.loadTitle);
-		  // console.log(that.loadend);
-		}).catch(err => {
-		  that.loading = false;
-		  that.goodsLoading = false;
-		  uni.showToast({
-			title: err,
-			icon: 'none'
-		  })
-		  setTimeout(function() {
-			uni.navigateBack()
-		  }, 1000);
-		});
-      },
-      //#ifndef H5
-      call: function() {
-        wx.makePhoneCall({
-          phoneNumber: this.store.service_phone,
-        })
-      },
-      //#endif
-      onTouchmove(e) {
-        if (this.loadend) return;
-        if (this.loading) return;
-        if (this.goodsLoading) return;
-        const query = uni.createSelectorQuery().in(this);
-        query.select('#goods').boundingClientRect(data => {
-          if (data.bottom < 1500 && data.top < 0) {
-			  if (this.loadend == false) {
-				  this.getProductSpu()
-			  } else {
-				  this.getGoods();
-			  }
-          }
-        }).exec();
-        // 模拟触底刷新
-      },
-      onTouchmoves(e) {
-        if (this.loadend) return;
-        if (this.loading) return;
-        if (this.goodsLoading) return;
-        const query = uni.createSelectorQuery().in(this);
-        query.select('#product').boundingClientRect(data => {
-          if (data.bottom < 1500 && data.top < 0) {
-            this.get_service_list();
-          }
-        }).exec();
-      },
-      // 授权回调
-      onLoadFun() {
-        this.isShowAuth = false
-      },
-      // 授权关闭
-      authColse: function(e) {
-        this.isShowAuth = e
-      },
-      // 打开授权
-      authOpen: function() {
-        let that = this;
-        if (that.isLogin === false) {
-          this.isAuto = true;
-          this.isShowAuth = true
-        }
-      },
-      setDiy() {
-        this.diyActive = 0;
-      },
-      // 获取diy模板数据
-      diyData() {
-        let that = this;
-        getDiy({ id: that.id }).then(res => {
-          let data = res.data;
-          that.styleConfig = that.objToArr(res.data.value);
-          uni.setNavigationBarTitle({
-            title: res.data.title
-          });
-        }).catch(err => {
-          uni.showToast({
-            title: err,
-            icon: 'none'
-          });
-        });
-      },
-      // 对象转数组
-      objToArr(data) {
-        let obj = Object.keys(data).sort();
-        let m = obj.map(key => data[key]);
-        return m;
-      },
-      goService() {
-        let that = this;
-        if (that.isLogin === false) {
-          this.isAuto = true;
-          this.isShowAuth = true
-        } else {
-          uni.navigateTo({
-            url: `/pages/chat/customer_list/chat?mer_id=${this.store.mer_id}&uid=${this.uid}`,
-          });
-        }
-      },
-      // 本地生活服务商品
-      get_service_list: function(isPage) {
-        let that = this;
-        if (that.loadend) return;
-        if (that.loading) return;
-        if (that.goodsLoading) return;
-        that.goodsLoading = true;
-        that.loadTitle = '';
-        that.where.product_type = ''
-        storeServiceList(that.id, that.where).then(res => {
-          that.goodsLoading = false;
-          let list = res.data.list;
-          let productList = that.$util.SplitArray(list, that.productList);
-          let loadend = list.length < that.where.limit;
-          that.loadend = loadend;
-          that.loading = false;
-          that.loadTitle = loadend ? '加载更多' : '已全部加载';
-          that.$set(that, 'productList', productList);
-          that.$set(that.where, 'page', that.where.page + 1);
-        }).catch(err => {
-          that.loading = false;
-          that.goodsLoading = false;
-          uni.showToast({
-            title: err,
-            icon: 'none'
-          })
-          setTimeout(function() {
-            uni.navigateBack()
-          }, 1000);
-        });
-      },
-      // 领取优惠券
-      receiveCoupon(item) {
-        let that = this;
-        if (that.isLogin === false) {
-          this.isAuto = true;
-          this.isShowAuth = true
-        } else {
-          setCouponReceive(item.coupon_id).then(res => {
-            item.issue = 1
-            uni.showToast({
-              title: res.message,
-              icon: 'none'
-            })
-          }).catch(err => {
-            uni.showToast({
-              title: err,
-              icon: 'none'
-            })
-          })
-        }
-      },
-      // 获取商品详情
-      getStore: function() {
-        getStoreDetail(this.id).then(res => {
-          this.store = res.data;
-          // if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way
-          //   .length == 2) {
-          //   this.tabs = this.tabs1
-          //   this.service_open = true
-          // } else {
-          //   this.tabs = this.tabs2
-          //   this.service_open = false
-          // }
-          this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
-          this.tab(this.type)
-          // #ifdef H5
-          this.ShareInfo();
-          // #endif
-        }).catch(err => {
-          this.loading = false;
-          uni.showToast({
-            title: err,
-            icon: 'none'
-          })
-          setTimeout(function() {
-            uni.navigateBack()
-          }, 1000);
-        })
-      },
-      // 获取商铺商品
-      getGoods: function() {
-        let that = this;
-        if (that.loadend) return;
-        if (that.loading) return;
-        if (that.goodsLoading) return;
-        that.goodsLoading = true;
-        that.loadTitle = '';
-        getStoreGoods(that.id, that.where).then(res => {
-          that.goodsLoading = false;
-          let list = res.data.list;
-          let goodsList = that.$util.SplitArray(list, that.goods);
-          let loadend = list.length < that.where.limit;
-          that.loadend = loadend;
-          that.loading = false;
-          that.loadTitle = loadend ? '已全部加载' : '加载更多';
-          that.$set(that, 'goods', goodsList);
-          that.$set(that.where, 'page', that.where.page + 1);
-        }).catch(err => {
-          that.loading = false;
-          that.goodsLoading = false;
-          uni.showToast({
-            title: err,
-            icon: 'none'
-          })
-          setTimeout(function() {
-            uni.navigateBack()
-          }, 1000);
-        });
-      },
-      // 获取商铺分类
-      getCategory: function() {
-        if (this.category.length) {
-          return;
-        }
-        this.categoryLoading = true;
-        getStoreCategory(this.id).then(res => {
-          this.categoryLoading = false;
-          this.category = res.data;
-          this.loadTitle = '已全部加载';
-        });
-      },
-      // 获取商铺优惠券
-      getCoupon: function() {
-        this.diyActive = 3
-        if (this.coupon.length) {
-          return;
-        }
-        getShopCoupons(this.id).then(res => {
-          this.coupon = res.data;
-        });
-      },
-      // 获取商铺活动专题
-      getTopic() {
-        if (this.topicList.length) {
-          return;
-        }
-        getTopicList(this.id, { page: 1, limit: 999 }).then(res => {
-          this.topicList = res.data;
-        });
-      },
-      // 关注商铺
-      follow: function() {
-        followStore(this.id).then(res => {
-          if (res.status === 200) {
-            this.store.care = true;
-          }
-          this.$util.Tips({
-            title: res.message
-          });
-        });
-      },
-      // 取消关注
-      unfollow: function() {
-        unfollowStore(this.id).then(res => {
-          if (res.status === 200) {
-            this.store.care = false;
-          }
-          this.$util.Tips({
-            title: res.message
-          });
-        });
-      },
-      // 设置是否关注
-      followToggle: function() {
-        this.store.care ? this.unfollow() : this.follow();
-      },
-      // 选择条件展示商品
-      set_where: function(param, isDiy) {
-        this.select.show = false;
-        this.loading = false;
-        this.loadend = false;
-        this.where.page = 1;
-        this.goods = [];
-        this.where.action = ""
-        switch (param) {
-          case 0:
-            this.select.selected = 0;
-            this.where.order = '';
-            this.getGoods();
-            break;
-          case 1:
-            this.select.selected = 1;
-            this.where.order = 'rate';
-            this.getGoods();
-            break;
-          case 2:
-            this.navActive = 1;
-            this.where.order = 'sales';
-            this.getGoods();
-            break;
-          case 3:
-            this.navActive = 2;
-            this.sortPrice = !this.sortPrice;
-            this.where.order = this.sortPrice ? 'price_asc' : 'price_desc';
-            this.getGoods();
-            break;
-          case 4:
-            if (isDiy == 1 || isDiy == 2) this.diyActive = isDiy
-            this.navActive = 3;
-            this.where.order = 'is_new';
-            this.getGoods();
-            break;
-          case 5:
-            if (isDiy == 1 || isDiy == 2) this.diyActive = isDiy
-            this.navActive = 5;
-            this.where.action = 1;
-            this.where.order = ""
-            this.getGoods();
-            break;
-        }
-      },
+		},
+		onShow() {
 
-      // 去分类商品页
-      goCategoryGoods: function(id) {
-        uni.navigateTo({
-          url: `/pages/store/list/index?id=${id}&mer_id=${this.id}`
-        })
-      },
-      // 去商品详情页
-      goGoodsDetail(item) {
-        goShopDetail(item, this.uid).then(res => {
-          if (this.isLogin) {
-            initiateAssistApi(item.activity_id).then(res => {
-              let id = res.data.product_assist_set_id;
-              uni.hideLoading();
-              uni.navigateTo({
-                url: `/pages/activity/assist_detail/index?id=${id}`
-              });
-            }).catch((err) => {
-              uni.showToast({
-                title: err,
-                icon: 'none'
-              })
-            });
-          } else {
-            this.isAuto = true;
-            this.isShowAuth = true
-          }
-        })
-      },
-      // 商铺首页滚动 navbar 吸顶
-      scrollHome: function(e) {
-        uni.$emit('scroll');
-        this.navShow = e.detail.scrollTop >= this.storeHeight - 30;
-      },
-      goback: function() {
-        uni.navigateBack();
-      },
-      // 首页
-      goHome() {
-        uni.switchTab({
-          url: '/pages/index/index'
-        });
-      },
-      // 商铺底部切换
-      tab: function(param) {
-        if (this.tabActive == param) {
-			// console.log(123);
-			this.getProductSpu()
-          return false;
-        }
-        this.goods = []
-		this.where.page=1
-		this.goodsLoading = this.loadend = this.loading = false
-        this.tabActive = param;
-		// console.log(this.goods);
-      },
-      resetParmas() {
-        this.where = {
-          order: '',
-          keyword: '',
-          page: 1,
-          limit: 30
-        }
-      },
-      //#ifdef H5
-      ShareInfo() {
-        let data = this.store;
-        let href = location.href;
-        if (this.$wechat.isWeixin()) {
-          getUserInfo().then(res => {
-            href =
-              href.indexOf("?") === -1 ?
-              href + "?spid=" + res.data.uid :
-              href + "&spid=" + res.data.uid;
-            let configAppMessage = {
-              desc: data.mer_info,
-              title: data.mer_name,
-              link: href,
-              imgUrl: data.mer_avatar
-            };
-            this.$wechat.wechatEvevt([
-              "updateAppMessageShareData",
-              "updateTimelineShareData",
-              "onMenuShareAppMessage",
-              "onMenuShareTimeline"
-            ], configAppMessage).then(res => {}).catch(err => {
-              // console.log(err);
-            })
-          });
-        }
-      },
-      //#endif
-	  onRefresh(){
-	  	this.isTriggered = true;
-		const newList = this.goods.reverse();
-		this.goods = newList;
-		// this.getProductSpu()
-	  	setTimeout(() => {
-	  		this.isTriggered = false;
-	  	}, 500)
-	  	    
-	  },
-    },
-	
-    onReachBottom() {
-      // 模拟触底刷新
-      if (this.tabActive == 0) {
-        setTimeout(() => {
-          // this.goods.push(...this.goods);
-        }, 500)
-      }
-    },
-    onPullDownRefresh() {
-		// console.log('123');
-      // 模拟上拉刷新
-      setTimeout(() => {
-        const newList = this.goods.reverse();
-        this.goods = newList;
-		// this.getGoods()
-		// this.getProductSpu()
-		// uni.startPullDownRefresh();
-        // uni.stopPullDownRefresh();
-      }, 500)
-    }
-  }
+		},
+		onReady: function() {
+
+		},
+
+		/**
+		 * 用户点击右上角分享
+		 */
+		// #ifdef MP
+		onShareAppMessage: function() {
+			wx.showShareMenu({
+				withShareTicket: true,
+				menus: ['shareAppMessage', 'shareTimeline']
+			})
+			let that = this;
+			return {
+				title: that.store.mer_name || '',
+				imageUrl: that.store.mer_avatar || '',
+				path: '/pages/store/home/index?id=' + that.id + '&spid=' + that.uid,
+			}
+		},
+		onShareTimeline: function() {
+			let that = this;
+			return {
+				title: that.store.mer_name || '',
+				query: {
+					id: that.id,
+					spid: that.uid
+				},
+				imageUrl: that.store.mer_avatar || ''
+			}
+		},
+		// #endif
+		mounted: function() {
+			const query = uni.createSelectorQuery().in(this);
+			query.select('#store').boundingClientRect(data => {
+				this.storeHeight = data.height;
+				this.storeTop = data.top;
+			}).exec();
+			this.userinfo()
+		},
+		methods: {
+			userinfo() {
+				getUserInfo().then(res => {
+
+					this.business_status = res.data.mer_info.business_status
+				})
+			},
+			getProductSpu() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				if (that.goodsLoading) return;
+				that.goodsLoading = true;
+				that.loadTitle = '';
+				getProductSpuAPI(that.id, that.where).then(res => {
+					that.goodsLoading = false;
+					let list = res.data.list;
+					let goodsList = that.$util.SplitArray(list, that.goods);
+					let loadend = list.length < that.where.limit;
+					// console.log(list.length);
+					// console.log(that.where.limit);
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'goods', goodsList);
+					that.$set(that.where, 'page', that.where.page + 1);
+					// console.log(loadend);
+					// console.log(that.loadTitle);
+					// console.log(that.loadend);
+				}).catch(err => {
+					that.loading = false;
+					that.goodsLoading = false;
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					})
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
+				});
+			},
+			//#ifndef H5
+			call: function() {
+				wx.makePhoneCall({
+					phoneNumber: this.store.service_phone,
+				})
+			},
+			//#endif
+			onTouchmove(e) {
+				if (this.loadend) return;
+				if (this.loading) return;
+				if (this.goodsLoading) return;
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#goods').boundingClientRect(data => {
+					if (data.bottom < 1500 && data.top < 0) {
+						if (this.loadend == false) {
+							this.getProductSpu()
+						} else {
+							this.getGoods();
+						}
+					}
+				}).exec();
+				// 模拟触底刷新
+			},
+			onTouchmoves(e) {
+				if (this.loadend) return;
+				if (this.loading) return;
+				if (this.goodsLoading) return;
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#product').boundingClientRect(data => {
+					if (data.bottom < 1500 && data.top < 0) {
+						this.get_service_list();
+					}
+				}).exec();
+			},
+			// 授权回调
+			onLoadFun() {
+				this.isShowAuth = false
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			// 打开授权
+			authOpen: function() {
+				let that = this;
+				if (that.isLogin === false) {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}
+			},
+			setDiy() {
+				this.diyActive = 0;
+			},
+			// 获取diy模板数据
+			diyData() {
+				let that = this;
+				getDiy({
+					id: that.id
+				}).then(res => {
+					let data = res.data;
+					that.styleConfig = that.objToArr(res.data.value);
+					uni.setNavigationBarTitle({
+						title: res.data.title
+					});
+				}).catch(err => {
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					});
+				});
+			},
+			// 对象转数组
+			objToArr(data) {
+				let obj = Object.keys(data).sort();
+				let m = obj.map(key => data[key]);
+				return m;
+			},
+			goService() {
+				let that = this;
+				if (that.isLogin === false) {
+					this.isAuto = true;
+					this.isShowAuth = true
+				} else {
+					uni.navigateTo({
+						url: `/pages/chat/customer_list/chat?mer_id=${this.store.mer_id}&uid=${this.uid}`,
+					});
+				}
+			},
+			// 本地生活服务商品
+			get_service_list: function(isPage) {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				if (that.goodsLoading) return;
+				that.goodsLoading = true;
+				that.loadTitle = '';
+				that.where.product_type = ''
+				storeServiceList(that.id, that.where).then(res => {
+					that.goodsLoading = false;
+					let list = res.data.list;
+					let productList = that.$util.SplitArray(list, that.productList);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '加载更多' : '已全部加载';
+					that.$set(that, 'productList', productList);
+					that.$set(that.where, 'page', that.where.page + 1);
+				}).catch(err => {
+					that.loading = false;
+					that.goodsLoading = false;
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					})
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
+				});
+			},
+			// 领取优惠券
+			receiveCoupon(item) {
+				let that = this;
+				if (that.isLogin === false) {
+					this.isAuto = true;
+					this.isShowAuth = true
+				} else {
+					setCouponReceive(item.coupon_id).then(res => {
+						item.issue = 1
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}).catch(err => {
+						uni.showToast({
+							title: err,
+							icon: 'none'
+						})
+					})
+				}
+			},
+			// 获取商品详情
+			getStore: function() {
+				getStoreDetail(this.id).then(res => {
+					this.store = res.data;
+					this.care_conut = res.data.care_count
+					// if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way
+					//   .length == 2) {
+					//   this.tabs = this.tabs1
+					//   this.service_open = true
+					// } else {
+					//   this.tabs = this.tabs2
+					//   this.service_open = false
+					// }
+
+					this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
+
+					this.tab(this.type)
+					// #ifdef H5
+					this.ShareInfo();
+					// #endif
+				}).catch(err => {
+					this.loading = false;
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					})
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
+				})
+			},
+			// 获取商铺商品
+			getGoods: function() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				if (that.goodsLoading) return;
+				that.goodsLoading = true;
+				that.loadTitle = '';
+				getStoreGoods(that.id, that.where).then(res => {
+					that.goodsLoading = false;
+					let list = res.data.list;
+					let goodsList = that.$util.SplitArray(list, that.goods);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'goods', goodsList);
+					that.$set(that.where, 'page', that.where.page + 1);
+				}).catch(err => {
+					that.loading = false;
+					that.goodsLoading = false;
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					})
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
+				});
+			},
+			// 获取商铺分类
+			getCategory: function() {
+				if (this.category.length) {
+					return;
+				}
+				this.categoryLoading = true;
+				getStoreCategory(this.id).then(res => {
+					this.categoryLoading = false;
+					this.category = res.data;
+					this.loadTitle = '已全部加载';
+				});
+			},
+			// 获取商铺优惠券
+			getCoupon: function() {
+				this.diyActive = 3
+				if (this.coupon.length) {
+					return;
+				}
+				getShopCoupons(this.id).then(res => {
+					this.coupon = res.data;
+				});
+			},
+			// 获取商铺活动专题
+			getTopic() {
+				if (this.topicList.length) {
+					return;
+				}
+				getTopicList(this.id, {
+					page: 1,
+					limit: 999
+				}).then(res => {
+					this.topicList = res.data;
+				});
+			},
+			// 关注商铺
+			follow: function() {
+				followStore(this.id).then(res => {
+					if (res.status === 200) {
+						this.store.care = true;
+					}
+					this.$util.Tips({
+						title: res.message
+					});
+				});
+			},
+			// 取消关注
+			unfollow: function() {
+				unfollowStore(this.id).then(res => {
+					if (res.status === 200) {
+						this.store.care = false;
+					}
+					this.$util.Tips({
+						title: res.message
+					});
+				});
+			},
+			// 设置是否关注
+			followToggle: function() {
+				this.store.care ? this.unfollow() : this.follow();
+			},
+			// 选择条件展示商品
+			set_where: function(param, isDiy) {
+				this.select.show = false;
+				this.loading = false;
+				this.loadend = false;
+				this.where.page = 1;
+				this.goods = [];
+				this.where.action = ""
+				switch (param) {
+					case 0:
+						this.select.selected = 0;
+						this.where.order = '';
+						this.getGoods();
+						break;
+					case 1:
+						this.select.selected = 1;
+						this.where.order = 'rate';
+						this.getGoods();
+						break;
+					case 2:
+						this.navActive = 1;
+						this.where.order = 'sales';
+						this.getGoods();
+						break;
+					case 3:
+						this.navActive = 2;
+						this.sortPrice = !this.sortPrice;
+						this.where.order = this.sortPrice ? 'price_asc' : 'price_desc';
+						this.getGoods();
+						break;
+					case 4:
+						if (isDiy == 1 || isDiy == 2) this.diyActive = isDiy
+						this.navActive = 3;
+						this.where.order = 'is_new';
+						this.getGoods();
+						break;
+					case 5:
+						if (isDiy == 1 || isDiy == 2) this.diyActive = isDiy
+						this.navActive = 5;
+						this.where.action = 1;
+						this.where.order = ""
+						this.getGoods();
+						break;
+				}
+			},
+
+			// 去分类商品页
+			goCategoryGoods: function(id) {
+				uni.navigateTo({
+					url: `/pages/store/list/index?id=${id}&mer_id=${this.id}`
+				})
+			},
+			// 去商品详情页
+			goGoodsDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					if (this.isLogin) {
+						initiateAssistApi(item.activity_id).then(res => {
+							let id = res.data.product_assist_set_id;
+							uni.hideLoading();
+							uni.navigateTo({
+								url: `/pages/activity/assist_detail/index?id=${id}`
+							});
+						}).catch((err) => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						});
+					} else {
+						this.isAuto = true;
+						this.isShowAuth = true
+					}
+				})
+			},
+			// 商铺首页滚动 navbar 吸顶
+			scrollHome: function(e) {
+				uni.$emit('scroll');
+				this.navShow = e.detail.scrollTop >= this.storeHeight - 30;
+			},
+			goback: function() {
+				uni.navigateBack();
+			},
+			// 首页
+			goHome() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
+			},
+			// 商铺底部切换
+			tab: function(param) {
+				if (this.tabActive == param) {
+					// console.log(123);
+					this.getProductSpu()
+					return false;
+				}
+				this.goods = []
+				this.where.page = 1
+				this.goodsLoading = this.loadend = this.loading = false
+				this.tabActive = param;
+				// console.log(this.goods);
+			},
+			resetParmas() {
+				this.where = {
+					order: '',
+					keyword: '',
+					page: 1,
+					limit: 30
+				}
+			},
+			//#ifdef H5
+			ShareInfo() {
+				let data = this.store;
+				let href = location.href;
+				if (this.$wechat.isWeixin()) {
+					getUserInfo().then(res => {
+						href =
+							href.indexOf("?") === -1 ?
+							href + "?spid=" + res.data.uid :
+							href + "&spid=" + res.data.uid;
+						let configAppMessage = {
+							desc: data.mer_info,
+							title: data.mer_name,
+							link: href,
+							imgUrl: data.mer_avatar
+						};
+						this.$wechat.wechatEvevt([
+							"updateAppMessageShareData",
+							"updateTimelineShareData",
+							"onMenuShareAppMessage",
+							"onMenuShareTimeline"
+						], configAppMessage).then(res => {}).catch(err => {
+							// console.log(err);
+						})
+					});
+				}
+			},
+			//#endif
+			onRefresh() {
+				this.isTriggered = true;
+				const newList = this.goods.reverse();
+				this.goods = newList;
+				// this.getProductSpu()
+				setTimeout(() => {
+					this.isTriggered = false;
+				}, 500)
+
+			},
+		},
+
+		onReachBottom() {
+			// 模拟触底刷新
+			if (this.tabActive == 0) {
+				setTimeout(() => {
+					// this.goods.push(...this.goods);
+				}, 500)
+			}
+		},
+		onPullDownRefresh() {
+			// console.log('123');
+			// 模拟上拉刷新
+			setTimeout(() => {
+				const newList = this.goods.reverse();
+				this.goods = newList;
+				// this.getGoods()
+				// this.getProductSpu()
+				// uni.startPullDownRefresh();
+				// uni.stopPullDownRefresh();
+			}, 500)
+		}
+	}
 </script>
 
+
 <style lang="scss" scoped>
-  .tab-cont {
-    background: #f5f5f5;
-    min-height: 500rpx;
-  }
-
-  /deep/.care {
-    background-image: none !important;
-    border: 1px solid #fff;
-    background-color: transparent;
-  }
-
-  .store-home {
-    position: fixed;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 100rpx;
-    padding-bottom: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    padding-bottom: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-    background: left top/750rpx 390rpx no-repeat fixed;
-    overflow: hidden;
-  }
-
-  .header {
-    position: relative;
-    z-index: 6;
-    display: flex;
-    align-items: center;
-    padding-right: 34rpx;
-    height: 43px;
-    padding-left: 33rpx;
-
-    .head-menu {
-      display: -webkit-box;
-      display: -webkit-flex;
-      display: flex;
-      -webkit-box-align: center;
-      -webkit-align-items: center;
-      align-items: center;
-      height: 27px;
-      width: 70px;
-      background: rgba(0, 0, 0, 0.25);
-      border-radius: 13px;
-
-      .icon-xiangzuo {
-        font-size: 32rpx;
-        color: #FFFFFF;
-      }
-
-      .iconfont {
-        -webkit-box-flex: 1;
-        -webkit-flex: 1;
-        flex: 1;
-        text-align: center;
-        color: #fff;
-        box-sizing: border-box;
-
-        &.icon-xiangzuo {
-          border-right: 1px solid rgba(255, 255, 255, .3);
-        }
-      }
-    }
-
-    .search {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      min-width: 0;
-      height: 58rpx;
-      border-radius: 29rpx;
-      margin-left: 32rpx;
-      background-color: #FFFFFF;
-      font-weight: 500;
-      font-size: 26rpx;
-      color: #999999;
-      /* #ifdef MP */
-      margin-right: 200rpx;
-
-      /* #endif */
-      .iconfont {
-        margin-right: 13rpx;
-        margin-left: 30rpx;
-        font-size: 24rpx;
-      }
-    }
-  }
-
-  .main_count {
-    background-color: #ffffff;
-    padding: 30rpx 20rpx;
-
-    .list {
-      width: 710rpx;
-      height: 280rpx;
-      margin-bottom: 30rpx;
-      position: relative;
-
-      .picture {
-        width: 710rpx;
-        height: 280rpx;
-        border-radius: 16rpx;
-      }
-    }
-  }
-
-  .main {
-    flex: 1;
-    min-height: 0rpx;
-    box-sizing: border-box;
-    padding: 0;
-  }
-
-  .store {
-    position: relative;
-    z-index: 6;
-    display: flex;
-    align-items: center;
-    padding-right: 20rpx;
-    padding-left: 20rpx;
-    padding-top: 20rpx;
-    padding-bottom: 22rpx;
-
-    image {
-      width: 74rpx;
-      height: 74rpx;
-      border-radius: 6rpx;
-    }
-
-    .store-margin {
-      width: 26rpx;
-      height: 26rpx;
-      margin-left: 10rpx;
-    }
-
-    .kefu {
-      color: #ffffff;
-      margin-right: 26rpx;
-      cursor: pointer;
-
-      .icon-kefu3 {
-        font-size: 34rpx;
-      }
-    }
-
-    .text {
-      flex: 1;
-      min-width: 0;
-      margin-right: 20rpx;
-      margin-left: 20rpx;
-
-      navigator {
-        display: inline-flex;
-        align-items: center;
-        max-width: 100%;
-
-        .name {
-          flex: 1;
-          min-width: 0;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          font-weight: bold;
-          font-size: 30rpx;
-          line-height: 1;
-          color: #FFFFFF;
-        }
-
-        .iconfont {
-          margin-left: 10rpx;
-          font-size: 17rpx;
-          color: #FFFFFF;
-        }
-      }
-
-      .score {
-        display: flex;
-        align-items: center;
-        margin-top: 17rpx;
-        font-weight: 500;
-        font-size: 24rpx;
-        line-height: 1;
-        color: #FFFFFF;
-
-        .star {
-          position: relative;
-          width: 111rpx;
-          height: 19rpx;
-          margin-right: 10rpx;
-          background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
-          overflow: hidden;
-
-          view {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
-
-            &.star_purple {
-              background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
-            }
-          }
-        }
-      }
-    }
-
-    button {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      width: 113rpx;
-      height: 48rpx;
-      border-radius: 24rpx;
-      background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-      font-weight: 500;
-      font-size: 22rpx;
-      color: #FFFFFF;
-
-      .iconfont {
-        margin-right: 6rpx;
-        font-size: 22rpx;
-      }
-
-      &.gary {
-        background-color: #999;
-      }
-    }
-  }
-
-  .font-bg-red {
-    background-color: var(--view-theme);
-    border: 1px solid var(--view-theme);
-  }
-
-  .nav.fixed {
-    position: fixed;
-    left: 0;
-    width: 100%;
-
-    .nav-cont {
-      position: absolute;
-      width: 100%;
-    }
-  }
-
-  .nav {
-    position: relative;
-
-    .nav-cont {
-      display: flex;
-      align-items: center;
-      height: 84rpx;
-
-      .item {
-        flex: 1;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        min-width: 0;
-
-        .cont {
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          width: 116rpx;
-          height: 44rpx;
-          border-radius: 22rpx;
-          font-weight: 500;
-          font-size: 24rpx;
-          color: #FFFFFF;
-
-          .arrow-icon {
-            margin-left: 10rpx;
-            font-size: 18rpx;
-          }
-
-          .layout-icon {
-            font-size: 32rpx;
-          }
-
-          .icon-pailie {
-            font-size: 32rpx;
-          }
-
-          image {
-            width: 15rpx;
-            height: 21rpx;
-            margin-left: 7rpx;
-          }
-        }
-      }
-
-      .active {
-        .cont {
-          background-color: #FFFFFF;
-          font-weight: bold;
-          color: var(--view-theme);
-        }
-      }
-    }
-
-    .select {
-      position: absolute;
-      top: 100%;
-      left: 0;
-      z-index: 2;
-      width: 100%;
-      padding-right: 40rpx;
-      padding-bottom: 28rpx;
-      padding-left: 74rpx;
-      border-bottom-right-radius: 24rpx;
-      border-bottom-left-radius: 24rpx;
-      background-color: #FFFFFF;
-      box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
-
-      .item {
-        margin-top: 28rpx;
-        font-size: 24rpx;
-        color: #454545;
-      }
-
-      .active {
-        color: var(--view-theme);
-
-        .iconfont {
-          color: var(--view-theme);
-          float: right;
-          font-size: 20rpx;
-        }
-      }
-    }
-  }
-
-  .goods {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    padding-top: 20rpx;
-    padding-right: 20rpx;
-    padding-left: 20rpx;
-    background-color: #F5F5F5;
-    width: 750rpx;
-
-    .item {
-      width: 345rpx;
-      border-radius: 16rpx;
-      margin-bottom: 20rpx;
-      background-color: #FFFFFF;
-      overflow: hidden;
-
-      .sell_out {
-        display: flex;
-        width: 110rpx;
-        height: 110rpx;
-        align-items: center;
-        justify-content: center;
-        border-radius: 100%;
-        background: rgba(0, 0, 0, .6);
-        color: #fff;
-        font-size: 24rpx;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        margin: -55rpx 0 0 -55rpx;
-
-        &::before {
-          content: "";
-          display: block;
-          width: 100rpx;
-          height: 100rpx;
-          border-radius: 100%;
-          border: 1px dashed #fff;
-          position: absolute;
-          top: 5rpx;
-          left: 5rpx;
-        }
-      }
-
-      .image,
-      .easy-loadimage,
-      image,
-      uni-image {
-        width: 345rpx;
-        height: 345rpx;
-
-        image {
-          display: block;
-          width: 100%;
-          height: 100%;
-        }
-      }
-
-      .text {
-        padding: 20rpx 20rpx 25rpx;
-
-        .name {
-          font-weight: 500;
-          font-size: 30rpx;
-          line-height: 1;
-          color: #222222;
-          display: flex;
-          align-items: center;
-
-          .name_text {
-            display: inline-block;
-            max-width: 400rpx;
-          }
-        }
-
-        .money-wrap {
-          display: flex;
-          align-items: center;
-          margin-top: 43rpx;
-
-          .money {
-            font-weight: bold;
-            font-size: 26rpx;
-            color: var(--view-priceColor);
-
-            text {
-              font-size: 34rpx;
-              line-height: 1;
-            }
-          }
-        }
-
-        .score {
-          margin-top: 20rpx;
-          font-weight: 500;
-          font-size: 20rpx;
-          line-height: 1;
-          color: #737373;
-        }
-      }
-
-      .item_tags {
-        margin-top: 8rpx;
-      }
-
-      .item_tags .tags_item {
-        display: inline-block;
-        font-size: 20rpx;
-        text-align: center;
-        border-radius: 5rpx;
-        padding: 0 4rpx;
-        line-height: 28rpx;
-        margin-right: 8rpx;
-      }
-
-      .item_tags .tags_item.ticket {
-        border: 1px solid var(--view-theme);
-        color: var(--view-theme);
-      }
-
-      .item_tags .tags_item.delivery {
-        color: #FF9000;
-        border: 1px solid #FF9000;
-      }
-
-      .foot {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 52rpx;
-        background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-        font-weight: 500;
-        font-size: 24rpx;
-        color: #FFFFFF;
-
-        .iconfont {
-          margin-right: 10rpx;
-          font-size: 22rpx;
-          line-height: 1;
-        }
-      }
-    }
-  }
-
-  .column {
-    padding: 0;
-    background-color: #FFFFFF;
-
-    .item {
-      position: relative;
-      display: flex;
-      width: 100%;
-      padding: 30rpx 20rpx;
-      border-radius: 0;
-      margin-bottom: 0;
-
-      &::before {
-        content: " ";
-        position: absolute;
-        top: 0;
-        right: 20rpx;
-        left: 250rpx;
-        border-top: 1px solid #F5F5F5;
-      }
-
-      /deep/.image,
-      /deep/.easy-loadimage,
-      /deep/image,
-      /deep/uni-image {
-        width: 260rpx;
-        height: 260rpx;
-        border-radius: 16rpx;
-        overflow: hidden;
-        position: relative;
-
-      }
-
-      .border-picture {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background: center/cover no-repeat;
-      }
-
-      .text {
-        position: relative;
-        width: 450rpx;
-        min-width: 0;
-        padding-top: 0;
-        padding-right: 0;
-        padding-bottom: 0;
-
-        .name {
-          color: #282828;
-          width: 100%;
-          display: flex;
-        }
-
-        .item_bot {
-          width: 100%;
-        }
-
-        .money-wrap {
-          display: flex;
-          align-items: center;
-          margin-top: 52rpx;
-
-          .ticket {
-            height: 28rpx;
-            padding-right: 12rpx;
-            padding-left: 12rpx;
-            border: none;
-            border-radius: 0;
-            margin-top: 17rpx;
-            margin-left: 0;
-            background: url(../../../static/images/yh.png) top left/100% 100% no-repeat;
-            line-height: 28rpx;
-          }
-        }
-      }
-
-      .foot {
-        position: absolute;
-        right: 20rpx;
-        bottom: 30rpx;
-        height: 44rpx;
-        padding-right: 17rpx;
-        padding-left: 17rpx;
-        border-radius: 22rpx;
-        font-size: 22rpx;
-        color: #F5F5F5;
-      }
-    }
-  }
-
-  .category {
-    padding-top: 34rpx;
-    padding-right: 20rpx;
-    padding-left: 20rpx;
-
-    .section {
-      border-radius: 10rpx;
-      margin-bottom: 20rpx;
-      background-color: #FFFFFF;
-
-      .head {
-        position: relative;
-        display: flex;
-        align-items: center;
-        height: 90rpx;
-        padding-right: 20rpx;
-        padding-left: 36rpx;
-        font-weight: bold;
-        color: #282828;
-
-        &::before {
-          content: " ";
-          position: absolute;
-          top: 50%;
-          left: 20rpx;
-          width: 6rpx;
-          height: 24rpx;
-          background-color: var(--view-theme);
-          transform: translateY(-50%);
-        }
-
-        .title {
-          flex: 1;
-          min-width: 0;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          font-size: 30rpx;
-        }
-
-        .iconfont {
-          font-size: 22rpx;
-          line-height: 1;
-        }
-      }
-
-      .body {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        align-items: center;
-        padding: 9rpx 36rpx 14rpx;
-
-        .item {
-          width: 314rpx;
-          height: 84rpx;
-          padding-right: 30rpx;
-          padding-left: 30rpx;
-          border-radius: 10rpx;
-          background-color: #F5F5F5;
-          margin-bottom: 10rpx;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          font-weight: 500;
-          font-size: 26rpx;
-          line-height: 84rpx;
-          color: #282828;
-        }
-      }
-    }
-  }
-
-  .coupon {
-    padding: 30rpx;
-    background-color: #F5F5F5;
-
-    .item {
-      display: flex;
-      margin-bottom: 16rpx;
-
-      .left {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        width: 240rpx;
-        font-weight: 500;
-        font-size: 24rpx;
-        line-height: 1;
-        color: #FFFFFF;
-        background-size: 100% 100%;
-
-        &.gary {
-          background-image: url('data:image/png;base64,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');
-        }
-
-        .money {
-          margin-bottom: 25rpx;
-          font-weight: 800;
-          font-size: 36rpx;
-
-          text {
-            margin-left: 10rpx;
-            font-size: 60rpx;
-          }
-        }
-      }
-
-      .right {
-        flex: 1;
-        min-width: 0;
-        padding-right: 18rpx;
-        padding-left: 27rpx;
-        background-color: #FFFFFF;
-        position: relative;
-        overflow: hidden;
-
-        .name {
-          padding-top: 32rpx;
-          padding-bottom: 32rpx;
-          border-bottom: 1px solid #F0F0F0;
-          font-weight: 500;
-          font-size: 30;
-          line-height: 1;
-          color: #282828;
-
-          text {
-            display: inline-block;
-            text-align: center;
-            line-height: 40rpx;
-            height: 40rpx;
-            padding: 0 10rpx;
-            -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-            background: var(--view-minorColor);
-            border: 1px solid var(--view-theme);
-            opacity: 1;
-            border-radius: 22rpx;
-            font-size: 20rpx;
-            color: var(--view-theme);
-            margin-right: 12rpx;
-
-            &.gary {
-              border-color: #BBB;
-              color: #bbb;
-              background-color: #F5F5F5;
-
-            }
-          }
-        }
-
-        .time-wrap {
-          display: flex;
-          align-items: center;
-          padding-top: 16rpx;
-          padding-bottom: 16rpx;
-          font-weight: 500;
-          font-size: 20rpx;
-          color: #999999;
-
-          .time {
-            flex: 1;
-            min-width: 0;
-          }
-
-          .button {
-            width: 136rpx;
-            height: 44rpx;
-            border-radius: 22rpx;
-            background-color: var(--view-theme);
-            font-weight: 500;
-            font-size: 22rpx;
-            line-height: 44rpx;
-            text-align: center;
-            color: #FFFFFF;
-
-          }
-
-          .gary {
-            font-size: 130rpx;
-            color: #DFDFDF;
-            position: absolute;
-            right: -15rpx;
-            z-index: 0;
-            bottom: -20rpx;
-          }
-        }
-      }
-    }
-
-    .disabled {
-      .left {
-        background-image: url(../static/images/coupon2.png);
-      }
-
-      .right {
-        .name {
-          text {
-            border-color: #C1C1C1;
-            color: #C1C1C1;
-          }
-        }
-
-        .time-wrap {
-          .button {
-            background-color: #CCCCCC;
-            color: #FFFFFF;
-          }
-        }
-      }
-    }
-  }
-
-  .empty-box {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    margin-top: 0;
-    padding-top: 200rpx;
-
-    image {
-      width: 414rpx;
-      height: 240rpx;
-    }
-
-    .txt {
-      font-size: 26rpx;
-      color: #999;
-    }
-  }
-
-  .footer {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 5;
-    display: flex;
-    width: 100%;
-    height: 100rpx;
-    height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-    background-color: #FFFFFF;
-    opacity: 0.96;
-
-    .item {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      font-weight: 500;
-      font-size: 20rpx;
-      color: #282828;
-
-      .iconfont {
-        font-size: 43rpx;
-      }
-
-      .icon-zhuanti {
-        font-size: 38rpx;
-      }
-    }
-
-    .active {
-      color: var(--view-theme);
-    }
-  }
-
-  .p-b-75 {
-    padding-bottom: 150rpx;
-  }
-
-  .vip-money {
-    color: #282828;
-    font-size: 22rpx;
-    margin-left: 6rpx;
-    font-weight: bold;
-  }
-
-  .vipImg {
-    width: 65rpx;
-    height: 28rpx;
-    margin-left: 4rpx;
-
-    image {
-      width: 100% !important;
-      height: 100% !important;
-      display: block;
-    }
-  }
+	
+
+	.tab-cont {
+		background: #f5f5f5;
+		min-height: 500rpx;
+	}
+
+	/deep/.care {
+		background-image: none !important;
+		border: 1px solid #fff;
+		background-color: transparent;
+	}
+
+	.carebtn {
+		width: 119rpx;
+		height: 46rpx;
+
+
+
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.store-dp {
+		display: flex;
+	}
+
+	.store-dp-t {
+		font-size: 23rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #F84221;
+		margin-top: 15rpx;
+		margin-left: 10rpx;
+	}
+
+	.content-top {
+		position: absolute;
+		height: 630rpx;
+		width: 100%;
+		position: fixed;
+		z-index: 9999;
+		background-color: #ffff;
+	}
+
+	.store-home {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		height: 421rpx;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		overflow: hidden;
+	}
+
+	.header {
+		position: relative;
+		z-index: 6;
+		display: flex;
+		align-items: center;
+		padding-right: 34rpx;
+		height: 43px;
+		padding-left: 33rpx;
+
+
+		/* #ifndef APP-VUE */
+		margin-top: 125rpx;
+
+		/*#endif*/
+
+		/* #ifndef H5 */
+		margin-top: 35rpx;
+		/*#endif*/
+
+		.head-menu {
+			display: -webkit-box;
+			display: -webkit-flex;
+			display: flex;
+			-webkit-box-align: center;
+			-webkit-align-items: center;
+			align-items: center;
+			height: 27px;
+			width: 70px;
+			background: rgba(0, 0, 0, 0.25);
+			border-radius: 13px;
+
+			.icon-xiangzuo {
+				font-size: 32rpx;
+				color: #FFFFFF;
+			}
+
+			.iconfont {
+				-webkit-box-flex: 1;
+				-webkit-flex: 1;
+				flex: 1;
+				text-align: center;
+				color: #fff;
+				box-sizing: border-box;
+
+				// &.icon-xiangzuo {
+				// 	border-right: 1px solid rgba(255, 255, 255, .3);
+				// }
+			}
+		}
+
+		.search {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			min-width: 0;
+			height: 58rpx;
+			border-radius: 29rpx;
+			margin-left: 32rpx;
+			background: rgba(255, 255, 255, 0.6);
+			font-weight: 500;
+			font-size: 26rpx;
+			color: #999999;
+			font-size: 26rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #737373;
+			/* #ifdef MP */
+			margin-right: 200rpx;
+
+			/* #endif */
+			.iconfont {
+				color: #999999;
+				margin-right: 13rpx;
+				margin-left: 30rpx;
+				font-size: 24rpx;
+				z-index: 999;
+			}
+		}
+	}
+
+	.main_count {
+		background-color: #ffffff;
+		padding: 30rpx 20rpx;
+
+		.list {
+			width: 710rpx;
+			height: 280rpx;
+			margin-bottom: 30rpx;
+			position: relative;
+
+			.picture {
+				width: 710rpx;
+				height: 280rpx;
+				border-radius: 16rpx;
+			}
+		}
+	}
+
+	.main {
+		flex: 1;
+		min-height: 0rpx;
+		box-sizing: border-box;
+		padding: 0;
+		position: absolute;
+		top: 630rpx;
+		border-radius: 21rpx 21rpx 0 0;
+	}
+
+	.store {
+		position: relative;
+		z-index: 6;
+		display: flex;
+		padding-right: 20rpx;
+		padding-left: 20rpx;
+		width: 725rpx;
+		height: 256rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 5px 14px 2px rgba(248, 66, 33, 0.05);
+		border-radius: 21px 21px 21px 21px;
+		margin-top: 100rpx;
+		margin-left: 15rpx;
+
+		.store-image {
+			margin-top: 32rpx;
+			width: 137rpx;
+			height: 137rpx;
+			border-radius: 6rpx;
+		}
+
+		.store-margin {
+			width: 26rpx;
+			height: 26rpx;
+			margin-left: 10rpx;
+		}
+
+		.kefu {
+			color: #000;
+			margin-right: 26rpx;
+			cursor: pointer;
+			font-size: 30rpx;
+			margin-top: 10rpx;
+			margin-left: 10rpx;
+
+			.icon-kefu3 {
+				font-size: 34rpx;
+			}
+		}
+
+		.text {
+
+			width: 520rpx;
+
+			margin-left: 20rpx;
+			margin-top: 32rpx;
+
+			navigator {
+				display: inline-flex;
+				align-items: center;
+				max-width: 100%;
+
+				.name {
+					flex: 1;
+					min-width: 0;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-weight: bold;
+					font-size: 33rpx;
+					font-weight: 600;
+					line-height: 1;
+					color: #333333;
+				}
+
+				.iconfont {
+					margin-left: 10rpx;
+					font-size: 17rpx;
+					color: #000;
+				}
+			}
+
+			.score {
+				display: flex;
+				align-items: center;
+				margin-top: 17rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+				line-height: 1;
+				color: #000;
+
+				.score-title {
+					margin-right: 15rpx;
+
+				}
+
+				.star {
+					position: relative;
+					width: 111rpx;
+					height: 19rpx;
+					margin-right: 10rpx;
+					background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
+					overflow: hidden;
+
+					view {
+						position: absolute;
+						top: 0;
+						left: 0;
+						width: 100%;
+						height: 100%;
+						background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+
+						&.star_purple {
+							background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
+						}
+					}
+				}
+			}
+		}
+
+		button {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 113rpx;
+			height: 48rpx;
+			border-radius: 24rpx;
+			background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+			font-weight: 500;
+			font-size: 22rpx;
+			color: #FFFFFF;
+
+			.iconfont {
+				margin-right: 6rpx;
+				font-size: 22rpx;
+			}
+
+			&.gary {
+				background-color: #999;
+			}
+		}
+	}
+
+	.font-bg-red {
+		background-color: var(--view-theme);
+		border: 1px solid var(--view-theme);
+	}
+
+	.font-bg-reda {
+		width: 112rpx;
+		height: 35rpx;
+		font-size: 23rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 35rpx;
+		background: linear-gradient(90deg, #F84221 0%, #FF6D20 100%);
+		border-radius: 11rpx 11rpx;
+		margin-right: 53rpx;
+		margin-top: 10rpx;
+	}
+
+	.nav.fixed {
+		position: fixed;
+		left: 0;
+		width: 100%;
+
+		.nav-cont {
+			position: absolute;
+			width: 100%;
+		}
+	}
+
+	.nav {
+		position: relative;
+
+		.nav-cont1 {
+			display: flex;
+			justify-content: space-between;
+			height: 95rpx;
+			background-color: #f5f5f5;
+
+			.nav-cont1-item {
+				display: flex;
+			}
+
+			.item {
+				// flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				min-width: 0;
+
+				.cont {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 116rpx;
+					height: 44rpx;
+					border-radius: 22rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #737373;
+
+					.dp-img {
+						width: 56rpx;
+						height: 56rpx;
+
+						image {
+							width: 56rpx;
+							height: 56rpx;
+						}
+					}
+
+
+					.arrow-icon {
+						margin-left: 10rpx;
+						font-size: 18rpx;
+					}
+
+					.layout-icon {
+						font-size: 32rpx;
+					}
+
+					.icon-pailie {
+						font-size: 32rpx;
+					}
+
+					image {
+						width: 15rpx;
+						height: 21rpx;
+						margin-left: 7rpx;
+					}
+				}
+			}
+
+			.active {
+				.cont {
+					// background-color: #FFFFFF;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 600;
+					color: #333333;
+
+				}
+			}
+		}
+
+
+		.nav-cont {
+			display: flex;
+			align-items: center;
+			height: 95rpx;
+			background-color: #f5f5f5;
+
+			.item {
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				min-width: 0;
+
+				.cont {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 116rpx;
+					height: 44rpx;
+					border-radius: 22rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #737373;
+
+					.dp-img {
+						width: 56rpx;
+						height: 56rpx;
+
+						image {
+							width: 56rpx;
+							height: 56rpx;
+						}
+					}
+
+
+					.arrow-icon {
+						margin-left: 10rpx;
+						font-size: 18rpx;
+					}
+
+					.layout-icon {
+						font-size: 32rpx;
+					}
+
+					.icon-pailie {
+						font-size: 32rpx;
+					}
+
+					image {
+						width: 15rpx;
+						height: 21rpx;
+						margin-left: 7rpx;
+					}
+				}
+			}
+
+			.active {
+				.cont {
+					// background-color: #FFFFFF;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 600;
+					color: #333333;
+
+				}
+			}
+		}
+
+		.select {
+			position: absolute;
+			top: 100%;
+			left: 0;
+			z-index: 2;
+			width: 100%;
+			padding-right: 40rpx;
+			padding-bottom: 28rpx;
+			padding-left: 74rpx;
+			border-bottom-right-radius: 24rpx;
+			border-bottom-left-radius: 24rpx;
+			background-color: #FFFFFF;
+			box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
+
+			.item {
+				margin-top: 28rpx;
+				font-size: 24rpx;
+				color: #454545;
+			}
+
+			.active {
+				color: var(--view-theme);
+
+				.iconfont {
+					color: var(--view-theme);
+					float: right;
+					font-size: 20rpx;
+				}
+			}
+		}
+	}
+
+	.goods {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		padding-top: 20rpx;
+		padding-right: 20rpx;
+		padding-left: 20rpx;
+		background-color: #F5F5F5;
+		width: 750rpx;
+
+		.item {
+			width: 345rpx;
+			border-radius: 16rpx;
+			margin-bottom: 20rpx;
+			background-color: #FFFFFF;
+			overflow: hidden;
+
+			.sell_out {
+				display: flex;
+				width: 110rpx;
+				height: 110rpx;
+				align-items: center;
+				justify-content: center;
+				border-radius: 100%;
+				background: rgba(0, 0, 0, .6);
+				color: #fff;
+				font-size: 24rpx;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				margin: -55rpx 0 0 -55rpx;
+
+				&::before {
+					content: "";
+					display: block;
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 100%;
+					border: 1px dashed #fff;
+					position: absolute;
+					top: 5rpx;
+					left: 5rpx;
+				}
+			}
+
+			.image,
+			.easy-loadimage,
+			image,
+			uni-image {
+				width: 345rpx;
+				height: 345rpx;
+
+				image {
+					display: block;
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.text {
+				padding: 20rpx 20rpx 25rpx;
+
+				.name {
+					font-weight: 500;
+					font-size: 30rpx;
+					line-height: 1;
+					color: #222222;
+					display: flex;
+					align-items: center;
+
+					.name_text {
+						display: inline-block;
+						max-width: 400rpx;
+					}
+				}
+
+				.money-wrap {
+					display: flex;
+					align-items: center;
+					margin-top: 43rpx;
+
+					.money {
+						font-weight: bold;
+						font-size: 26rpx;
+						color: var(--view-priceColor);
+
+						text {
+							font-size: 34rpx;
+							line-height: 1;
+						}
+					}
+				}
+
+				.score {
+					margin-top: 20rpx;
+					font-weight: 500;
+					font-size: 20rpx;
+					line-height: 1;
+					color: #737373;
+
+
+				}
+			}
+
+			.item_tags {
+				margin-top: 8rpx;
+			}
+
+			.item_tags .tags_item {
+				display: inline-block;
+				font-size: 20rpx;
+				text-align: center;
+				border-radius: 5rpx;
+				padding: 0 4rpx;
+				line-height: 28rpx;
+				margin-right: 8rpx;
+			}
+
+			.item_tags .tags_item.ticket {
+				border: 1px solid var(--view-theme);
+				color: var(--view-theme);
+			}
+
+			.item_tags .tags_item.delivery {
+				color: #FF9000;
+				border: 1px solid #FF9000;
+			}
+
+			.foot {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 52rpx;
+				background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+
+				.iconfont {
+					margin-right: 10rpx;
+					font-size: 22rpx;
+					line-height: 1;
+				}
+			}
+		}
+	}
+
+	.column {
+		padding: 0;
+		background-color: #FFFFFF;
+
+		.item {
+			position: relative;
+			display: flex;
+			width: 100%;
+			padding: 30rpx 20rpx;
+			border-radius: 0;
+			margin-bottom: 0;
+
+			&::before {
+				content: " ";
+				position: absolute;
+				top: 0;
+				right: 20rpx;
+				left: 250rpx;
+				border-top: 1px solid #F5F5F5;
+			}
+
+			/deep/.image,
+			/deep/.easy-loadimage,
+			/deep/image,
+			/deep/uni-image {
+				width: 260rpx;
+				height: 260rpx;
+				border-radius: 16rpx;
+				overflow: hidden;
+				position: relative;
+
+			}
+
+			.border-picture {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background: center/cover no-repeat;
+			}
+
+			.text {
+				position: relative;
+				width: 450rpx;
+
+				min-width: 0;
+				padding-top: 0;
+				padding-right: 0;
+				padding-bottom: 0;
+
+				.name {
+					color: #282828;
+					width: 100%;
+					display: flex;
+				}
+
+				.item_bot {
+					width: 100%;
+				}
+
+				.money-wrap {
+					display: flex;
+					align-items: center;
+					margin-top: 52rpx;
+
+					.ticket {
+						height: 28rpx;
+						padding-right: 12rpx;
+						padding-left: 12rpx;
+						border: none;
+						border-radius: 0;
+						margin-top: 17rpx;
+						margin-left: 0;
+						background: url(../../../static/images/yh.png) top left/100% 100% no-repeat;
+						line-height: 28rpx;
+					}
+				}
+			}
+
+			.foot {
+				position: absolute;
+				right: 20rpx;
+				bottom: 30rpx;
+				height: 44rpx;
+				padding-right: 17rpx;
+				padding-left: 17rpx;
+				border-radius: 22rpx;
+				font-size: 22rpx;
+				color: #F5F5F5;
+			}
+		}
+	}
+
+	.category {
+		padding-top: 34rpx;
+		padding-right: 20rpx;
+		padding-left: 20rpx;
+
+		.section {
+			border-radius: 10rpx;
+			margin-bottom: 20rpx;
+			background-color: #FFFFFF;
+
+			.head {
+				position: relative;
+				display: flex;
+				align-items: center;
+				height: 90rpx;
+				padding-right: 20rpx;
+				padding-left: 36rpx;
+				font-weight: bold;
+				color: #282828;
+
+				&::before {
+					content: " ";
+					position: absolute;
+					top: 50%;
+					left: 20rpx;
+					width: 6rpx;
+					height: 24rpx;
+					background-color: var(--view-theme);
+					transform: translateY(-50%);
+				}
+
+				.title {
+					flex: 1;
+					min-width: 0;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-size: 30rpx;
+				}
+
+				.iconfont {
+					font-size: 22rpx;
+					line-height: 1;
+				}
+			}
+
+			.body {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				align-items: center;
+				padding: 9rpx 36rpx 14rpx;
+
+				.item {
+					width: 314rpx;
+					height: 84rpx;
+					padding-right: 30rpx;
+					padding-left: 30rpx;
+					border-radius: 10rpx;
+					background-color: #F5F5F5;
+					margin-bottom: 10rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-weight: 500;
+					font-size: 26rpx;
+					line-height: 84rpx;
+					color: #282828;
+				}
+			}
+		}
+	}
+
+	.coupon {
+		padding: 30rpx;
+		background-color: #F5F5F5;
+
+		.item {
+			display: flex;
+			margin-bottom: 16rpx;
+
+			.left {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				width: 240rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+				line-height: 1;
+				color: #FFFFFF;
+				background-size: 100% 100%;
+
+				&.gary {
+					background-image: url('data:image/png;base64,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');
+				}
+
+				.money {
+					margin-bottom: 25rpx;
+					font-weight: 800;
+					font-size: 36rpx;
+
+					text {
+						margin-left: 10rpx;
+						font-size: 60rpx;
+					}
+				}
+			}
+
+			.right {
+				flex: 1;
+				min-width: 0;
+				padding-right: 18rpx;
+				padding-left: 27rpx;
+				background-color: #FFFFFF;
+				position: relative;
+				overflow: hidden;
+
+				.name {
+					padding-top: 32rpx;
+					padding-bottom: 32rpx;
+					border-bottom: 1px solid #F0F0F0;
+					font-weight: 500;
+					font-size: 30;
+					line-height: 1;
+					color: #282828;
+
+					text {
+						display: inline-block;
+						text-align: center;
+						line-height: 40rpx;
+						height: 40rpx;
+						padding: 0 10rpx;
+						-webkit-box-sizing: border-box;
+						box-sizing: border-box;
+						background: var(--view-minorColor);
+						border: 1px solid var(--view-theme);
+						opacity: 1;
+						border-radius: 22rpx;
+						font-size: 20rpx;
+						color: var(--view-theme);
+						margin-right: 12rpx;
+
+						&.gary {
+							border-color: #BBB;
+							color: #bbb;
+							background-color: #F5F5F5;
+
+						}
+					}
+				}
+
+				.time-wrap {
+					display: flex;
+					align-items: center;
+					padding-top: 16rpx;
+					padding-bottom: 16rpx;
+					font-weight: 500;
+					font-size: 20rpx;
+					color: #999999;
+
+					.time {
+						flex: 1;
+						min-width: 0;
+					}
+
+					.button {
+						width: 136rpx;
+						height: 44rpx;
+						border-radius: 22rpx;
+						background-color: var(--view-theme);
+						font-weight: 500;
+						font-size: 22rpx;
+						line-height: 44rpx;
+						text-align: center;
+						color: #FFFFFF;
+
+					}
+
+					.gary {
+						font-size: 130rpx;
+						color: #DFDFDF;
+						position: absolute;
+						right: -15rpx;
+						z-index: 0;
+						bottom: -20rpx;
+					}
+				}
+			}
+		}
+
+		.disabled {
+			.left {
+				background-image: url(../static/images/coupon2.png);
+			}
+
+			.right {
+				.name {
+					text {
+						border-color: #C1C1C1;
+						color: #C1C1C1;
+					}
+				}
+
+				.time-wrap {
+					.button {
+						background-color: #CCCCCC;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+	}
+
+	.empty-box {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin-top: 0;
+		padding-top: 200rpx;
+
+		image {
+			width: 414rpx;
+			height: 240rpx;
+		}
+
+		.txt {
+			font-size: 26rpx;
+			color: #999;
+		}
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 5;
+		display: flex;
+		width: 100%;
+		height: 100rpx;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		background-color: #FFFFFF;
+		opacity: 0.96;
+
+		.item {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			font-weight: 500;
+			font-size: 20rpx;
+			color: #282828;
+
+			.iconfont {
+				font-size: 43rpx;
+			}
+
+			.icon-zhuanti {
+				font-size: 38rpx;
+			}
+		}
+
+		.active {
+			color: var(--view-theme);
+		}
+	}
+
+	.p-b-75 {
+		padding-bottom: 150rpx;
+	}
+
+	.vip-money {
+		color: #282828;
+		font-size: 22rpx;
+		margin-left: 6rpx;
+		font-weight: bold;
+	}
+
+	.vipImg {
+		width: 65rpx;
+		height: 28rpx;
+		margin-left: 4rpx;
+
+		image {
+			width: 100% !important;
+			height: 100% !important;
+			display: block;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/store/list/index.vue b/pages/store/list/index.vue
index ebfa454..95f90f9 100644
--- a/pages/store/list/index.vue
+++ b/pages/store/list/index.vue
@@ -7,11 +7,27 @@
 					<view class="iconfont icon-xiangzuo"></view>
 				</view>
 				<!-- #endif -->
-				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
+				
+				<view style="position: relative;display: flex;">
+						
+							<u-search borderColor="#FCB9AD" bgColor="white" :showAction="false" placeholder="搜索产品关键词"
+								v-model="sotreParam.keyword" class="serch_cls"></u-search>
+							<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+								src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+						</view>
+			<!-- 	<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
 					<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search" :value='where.keyword'
 					 @confirm="searchSubmit"></input>
 				</view>
-				<view style="text-align: right;" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view>
+				<view class="">
+					
+				</view> -->
+                         <view class="dp-img">
+
+								<image src="@/static/images/dp1.png" v-if="is_switch==true" mode="aspectFit"  @click='Changswitch'></image>
+								<image src="@/static/images/dp2.png" v-else mode="aspectFit"  @click='Changswitch'></image>
+							</view>
+				<!-- <view style="text-align: right;" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view> -->
 			</view>
 			<view class="nav-wrapper">
 					<view class='nav acea-row row-middle'>
@@ -220,6 +236,7 @@
 				price_off: '',
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
+				
 			};
 		},
 		onLoad: function(options) {
@@ -379,7 +396,7 @@
 			},
 			searchSubmit: function(e) {
 				let that = this;
-				that.$set(that.where, 'keyword', e.detail.value);
+				that.$set(that.where, 'keyword', that.sotreParam.keywor);
 				if(this.tabIndex == 1){
 					that.loadend = false;
 					that.$set(that.where, 'page', 1)
@@ -489,6 +506,27 @@
 </script>
 
 <style lang="scss" scoped>
+	.serch_cls{
+	
+		width:600rpx;
+	
+	}
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
+	
+	}
+	.dp-img {
+		width: 56rpx;
+		height: 56rpx;
+	
+		image {
+			width: 100%;
+			height:100%;
+		}
+	}
 	.productList .search {
 		width: 100%;
 		height: 86rpx;
@@ -498,7 +536,7 @@
 		left: 0;
 		top: 0;
 		z-index: 9;
-		background-color: var(--view-theme);
+		background-color: #fff;
 	}
 	.productList .search .back {
 		display: flex;
@@ -506,7 +544,7 @@
 		width: 40rpx;
 		height: 60rpx;
 		.iconfont {
-			color: #fff;
+			color: #000;
 			font-size: 36rpx;
 		}
 	}
@@ -514,6 +552,7 @@
 		width: 570rpx;
 		height: 60rpx;
 		background-color: #fff;
+		border: 2rpx solid #FCB9AD;
 		border-radius: 50rpx;
 		padding: 0 20rpx;
 		box-sizing: border-box;
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index 32d81b2..88dd747 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -224,39 +224,39 @@
             }
             // #endif
             // console.log('验证码登录', data);
-            // let time = data.expires_time - Cache.time();
-            // const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-            // that.$Cache.clear(BACK_URL);
-            // that.$store.commit("LOGIN", {
-            //   'token': data.token,
-            //   'time': data.exp
-            // });
-            // that.$store.commit("SETUID", data.user.uid);
-            // that.$store.commit('UPDATE_USERINFO', data.user);
-            // // Cache.set(EXPIRES_TIME, data.result.expires_time, time);
-            // // #ifdef MP
-            // Cache.set(EXPIRES_TIME, data.expires_time, time);
-            // Cache.set(USER_INFO, data.user, time);
-            // // #endif
-            // let method
-            // let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-            //   '/pages/goods_cate/goods_cate',
-            //   '/pages/user/index'
-            // ]
-            // if (indexPat.includes(this.getPath(backUrl))) {
-            //   method = 'switchTab'
-            // } else {
-            //   method = 'navigateTo'
-            // }
-            // if (this.getPath(backUrl) === '/pages/users/login/index') {
-            //   uni.switchTab({
-            //     url: '/pages/index/index'
-            //   });
-            //   return
-            // }
-            // uni[method]({
-            //   url: backUrl
-            // });
+            let time = data.expires_time - Cache.time();
+            const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+            that.$Cache.clear(BACK_URL);
+            that.$store.commit("LOGIN", {
+              'token': data.token,
+              'time': data.exp
+            });
+            that.$store.commit("SETUID", data.user.uid);
+            that.$store.commit('UPDATE_USERINFO', data.user);
+            // Cache.set(EXPIRES_TIME, data.result.expires_time, time);
+            // #ifdef MP
+            Cache.set(EXPIRES_TIME, data.expires_time, time);
+            Cache.set(USER_INFO, data.user, time);
+            // #endif
+            let method
+            let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+              '/pages/goods_cate/goods_cate',
+              '/pages/user/index'
+            ]
+            if (indexPat.includes(this.getPath(backUrl))) {
+              method = 'switchTab'
+            } else {
+              method = 'navigateTo'
+            }
+            if (this.getPath(backUrl) === '/pages/users/login/index') {
+              uni.switchTab({
+                url: '/pages/index/index'
+              });
+              return
+            }
+            uni[method]({
+              url: backUrl
+            });
           })
           .catch(res => {
             that.$util.Tips({
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index bfcefe3..369d10e 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -14,7 +14,7 @@
 							{{ item }}
 						</div>
 					</div>
-					<div class="list" :hidden="current !== 0">
+					<div class="list" :hidden="current !== 1">
 						<form @submit.prevent="submit">
 							<div class="item">
 								<div class="acea-row row-middle">
@@ -39,7 +39,7 @@
 						</div>
 
 					</div>
-					<div class="list" :hidden="current !== 1">
+					<div class="list" :hidden="current !== 0">
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/phone_1.png"></image>
@@ -70,8 +70,8 @@
 						</div>
 					</div>
 
-					<div class="logon" @click="loginMobile" :hidden="current !== 1">登录</div>
-					<div class="logon" @click="submit" :hidden="current === 1">登录</div>
+					<div class="logon" @click="loginMobile" :hidden="current !== 0">登录</div>
+					<div class="logon" @click="submit" :hidden="current === 0">登录</div>
 					<div class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
@@ -639,8 +639,8 @@
 					.then(({
 						data
 					}) => {
-						// this.checkOpenId(data.user)
-						// const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						this.checkOpenId(data.user)
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$store.commit("LOGIN", {
 							'token': data.token,
@@ -650,32 +650,25 @@
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
 
-					// 	let method
-					// 	let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-					// 		'/pages/goods_cate/goods_cate',
-					// 		'/pages/user/index'
-					// 	]
-					
-					// 	if (indexPat.includes(this.getPath(backUrl))) {
-					// 		method = 'switchTab'
-					// 	} else {
-					// 		method = 'navigateTo'
-					// 	}
-						
-					// 		console.log(method)
-					// 		return
-					// 	if (this.getPath(backUrl) === '/pages/users/login/index') {
-					// 		uni.switchTab({
-					// 			url: '/pages/index/index'
-					// 		});
-					// 		return
-					// 	}
-					// 	uni[method]({
-					// 		url: backUrl
-					// 	});
-					uni.navigateTo({
-						url:'/pages/moreProject/moreProject'
-					})
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
 					})
 					.catch(res => {
 						that.$util.Tips({
@@ -809,8 +802,8 @@
 					.then(({
 						data
 					}) => {
-						// this.checkOpenId(data.user)
-						// const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						this.checkOpenId(data.user)
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$store.commit("LOGIN", {
 							'token': data.token,
@@ -818,29 +811,26 @@
 						});
 						that.$store.commit("SETUID", data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.user);
-						// let method
-						// let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-						// 	'/pages/goods_cate/goods_cate',
-						// 	'/pages/user/index'
-						// ]
-						// if (indexPat.includes(this.getPath(backUrl))) {
-						// 	method = 'switchTab'
-						// } else {
-						// 	method = 'navigateTo'
-						// }
-						// if (this.getPath(backUrl) === '/pages/users/login/index') {
-						// 	uni.switchTab({
-						// 		url: '/pages/index/index'
-						// 	});
-						// 	return
-						// }
-						// uni[method]({
-						// 	url: backUrl
-						// });
-						uni.navigateTo({
-							url:'/pages/moreProject/moreProject'
-						})
-						
+
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
 					})
 					.catch(e => {
 						that.$util.Tips({
diff --git a/static/images/1-001.png b/static/images/1-001.png
deleted file mode 100644
index 3c9ac39..0000000
Binary files a/static/images/1-001.png and /dev/null differ
diff --git a/static/images/1-002.png b/static/images/1-002.png
deleted file mode 100644
index f05682b..0000000
Binary files a/static/images/1-002.png and /dev/null differ
diff --git a/static/images/2-001.png b/static/images/2-001.png
deleted file mode 100644
index 4a4ce02..0000000
Binary files a/static/images/2-001.png and /dev/null differ
diff --git a/static/images/2-002.png b/static/images/2-002.png
deleted file mode 100644
index 5069750..0000000
Binary files a/static/images/2-002.png and /dev/null differ
diff --git a/static/images/3-001.png b/static/images/3-001.png
deleted file mode 100644
index 8637fed..0000000
Binary files a/static/images/3-001.png and /dev/null differ
diff --git a/static/images/3-002.png b/static/images/3-002.png
deleted file mode 100644
index 5aa6e9c..0000000
Binary files a/static/images/3-002.png and /dev/null differ
diff --git a/static/images/4-001.png b/static/images/4-001.png
deleted file mode 100644
index 5fb279c..0000000
Binary files a/static/images/4-001.png and /dev/null differ
diff --git a/static/images/4-002.png b/static/images/4-002.png
deleted file mode 100644
index e79368c..0000000
Binary files a/static/images/4-002.png and /dev/null differ
diff --git a/static/images/5-001.png b/static/images/5-001.png
deleted file mode 100644
index 12dbfe7..0000000
Binary files a/static/images/5-001.png and /dev/null differ
diff --git a/static/images/5-002.png b/static/images/5-002.png
deleted file mode 100644
index ffd4e51..0000000
Binary files a/static/images/5-002.png and /dev/null differ
diff --git a/static/images/fabu.png b/static/images/fabu.png
deleted file mode 100644
index a71d25b..0000000
Binary files a/static/images/fabu.png and /dev/null differ
diff --git a/static/images/guide.png b/static/images/guide.png
deleted file mode 100644
index 6ab2b26..0000000
Binary files a/static/images/guide.png and /dev/null differ
diff --git a/static/images/icon 2@4x.png b/static/images/icon 2@4x.png
deleted file mode 100644
index 3823397..0000000
Binary files a/static/images/icon 2@4x.png and /dev/null differ
diff --git a/static/images/icon 3@4x.png b/static/images/icon 3@4x.png
deleted file mode 100644
index 50ce2be..0000000
Binary files a/static/images/icon 3@4x.png and /dev/null differ
diff --git a/static/images/icon 4@4x.png b/static/images/icon 4@4x.png
deleted file mode 100644
index 43f0cb2..0000000
Binary files a/static/images/icon 4@4x.png and /dev/null differ
diff --git a/static/images/icon 5@4x.png b/static/images/icon 5@4x.png
deleted file mode 100644
index 6f8fc0e..0000000
Binary files a/static/images/icon 5@4x.png and /dev/null differ
diff --git a/static/images/icon 6@4x.png b/static/images/icon 6@4x.png
deleted file mode 100644
index 4bd02a6..0000000
Binary files a/static/images/icon 6@4x.png and /dev/null differ
diff --git a/static/images/icon 7@4x.png b/static/images/icon 7@4x.png
deleted file mode 100644
index f6eb6ea..0000000
Binary files a/static/images/icon 7@4x.png and /dev/null differ
diff --git a/static/images/icon 8@4x.png b/static/images/icon 8@4x.png
deleted file mode 100644
index 5177753..0000000
Binary files a/static/images/icon 8@4x.png and /dev/null differ
diff --git a/static/images/icon 9@4x.png b/static/images/icon 9@4x.png
deleted file mode 100644
index ff6dff3..0000000
Binary files a/static/images/icon 9@4x.png and /dev/null differ
diff --git a/static/images/jy.png b/static/images/jy.png
deleted file mode 100644
index 972ccc7..0000000
Binary files a/static/images/jy.png and /dev/null differ
diff --git a/static/images/noCart.png b/static/images/noCart.png
index c909770..b70b19a 100644
Binary files a/static/images/noCart.png and b/static/images/noCart.png differ
diff --git a/static/images/weituo.png b/static/images/weituo.png
deleted file mode 100644
index 241aa0a..0000000
Binary files a/static/images/weituo.png and /dev/null differ
diff --git a/static/images/zk.png b/static/images/zk.png
index 78bb5cc..e4cebcd 100644
Binary files a/static/images/zk.png and b/static/images/zk.png differ
diff --git a/static/tabbar_icon/a-a.png b/static/tabbar_icon/a-a.png
index 8b07313..a373e20 100644
Binary files a/static/tabbar_icon/a-a.png and b/static/tabbar_icon/a-a.png differ
diff --git a/static/tabbar_icon/a.png b/static/tabbar_icon/a.png
index 526b79a..284add7 100644
Binary files a/static/tabbar_icon/a.png and b/static/tabbar_icon/a.png differ
diff --git a/static/tabbar_icon/b-a.png b/static/tabbar_icon/b-a.png
index 5454788..8a1b255 100644
Binary files a/static/tabbar_icon/b-a.png and b/static/tabbar_icon/b-a.png differ
diff --git a/static/tabbar_icon/b.png b/static/tabbar_icon/b.png
index 8fdc5a9..ed18740 100644
Binary files a/static/tabbar_icon/b.png and b/static/tabbar_icon/b.png differ
diff --git a/static/tabbar_icon/c-a.png b/static/tabbar_icon/c-a.png
index 7d6f2cf..68a2fcc 100644
Binary files a/static/tabbar_icon/c-a.png and b/static/tabbar_icon/c-a.png differ
diff --git a/static/tabbar_icon/c.png b/static/tabbar_icon/c.png
index f896f6c..f511f85 100644
Binary files a/static/tabbar_icon/c.png and b/static/tabbar_icon/c.png differ
diff --git a/static/tabbar_icon/d-a.png b/static/tabbar_icon/d-a.png
deleted file mode 100644
index c4fc7ac..0000000
Binary files a/static/tabbar_icon/d-a.png and /dev/null differ
diff --git a/static/tabbar_icon/d.png b/static/tabbar_icon/d.png
deleted file mode 100644
index ac87a08..0000000
Binary files a/static/tabbar_icon/d.png and /dev/null differ
diff --git a/static/tabbar_icon/e-a.png b/static/tabbar_icon/e-a.png
deleted file mode 100644
index 71532de..0000000
Binary files a/static/tabbar_icon/e-a.png and /dev/null differ
diff --git a/static/tabbar_icon/e.png b/static/tabbar_icon/e.png
deleted file mode 100644
index 4aa833d..0000000
Binary files a/static/tabbar_icon/e.png and /dev/null differ
diff --git a/static/tabbar_icon/top.png b/static/tabbar_icon/top.png
deleted file mode 100644
index 9ef3842..0000000
Binary files a/static/tabbar_icon/top.png and /dev/null differ