diff --git a/App.vue b/App.vue
index d56d2d7..5129746 100644
--- a/App.vue
+++ b/App.vue
@@ -161,7 +161,7 @@
 			jpushModule.initJPushService()
 			jpushModule.addConnectEventListener(result => {
 				let connectEnable = result.connectEnable
-				// console.log("jpush连接", connectEnable)
+				console.log("jpush连接", connectEnable)
 			})
 
 
@@ -222,7 +222,8 @@
 
 		},
 		onShow() {
-
+	 
+			
 			let that = this
 			// 记录H5和公众号
 			if (this.$store.state.app.token) {
diff --git a/api/community.js b/api/community.js
index fe9ec77..23d5d09 100644
--- a/api/community.js
+++ b/api/community.js
@@ -7,7 +7,7 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-import request from "@/utils/request.js";
+import request from "@/utils/requesta.js";
 
 /** 获取话题分类*/
 export function getTopicList() {
@@ -83,7 +83,9 @@ export function videoList(data) {
 }
 /**自己的视频列表*/
 export function deoList(id) {
-	return request.get(`community/show/${id}`);
+	return request.get(`community/show/${id}`, {
+		noAuth: true
+	});
 }
 
 export function myVideoList(id,data) {
diff --git a/api/store.js b/api/store.js
index 3659801..ed9b774 100644
--- a/api/store.js
+++ b/api/store.js
@@ -1,4 +1,5 @@
 import request from "@/utils/request.js";
+import requestb from "@/utils/requestb.js";
 
 /**
  * 扫码查询商品
@@ -578,8 +579,7 @@ export function vicinityStoreApi(data) {
 	商家入驻 -- 获取商户入驻申请协议内容
 */
 export function agreeiness(data) {
-  return request.get(`business/agree`, data, { noAuth: true });
-}
-
-
-
+	return request.get(`business/agree`, data, {
+		noAuth: true
+	});
+}
\ No newline at end of file
diff --git a/api/uniMP.js b/api/uniMP.js
index 06f8b85..3562f10 100644
--- a/api/uniMP.js
+++ b/api/uniMP.js
@@ -16,3 +16,12 @@ export function getGXconfig(data) {
   return request.get("global/config", data);
 }
 
+
+/**
+ * 获取商城小程序信息
+ */
+
+export function miniapp(data) {
+  return request.get("miniapp/version?version=1", data);
+}
+
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index f1c4653..4483d6e 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -2,7 +2,7 @@
 	<view class="orderGoods" :style="viewColor">
 		<view class='goodWrapper' :class="'item'+orderData.order_type">
 			<view v-if="orderData.order_type == 1" class="title acea-row row-between-wrapper">
-				<view class="item-status" :class="'status'+evaluate">{{evaluate == 0 ? '待核销' : '已核销'}}</view>
+				<view class="item-status" :class="'status'+evaluate">{{evaluate == 7 ? '待核销' : '已核销'}}</view>
 				<view v-if="evaluate != 0 && orderData.verify_time" class="item-date">{{orderData.verify_time}}</view>
 			</view>
 			<view v-for="(item,index) in cartInfo" :key="index">
diff --git a/config/app.js b/config/app.js
index 1e8e1a6..2182f5b 100644
--- a/config/app.js
+++ b/config/app.js
@@ -6,10 +6,11 @@ let openPlantGrass = '-openPlantGrass-'
 let httpApi
 let httpApiTwo
 let httpApiThree
+let httpApiFour
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/manifest.json b/manifest.json
index 42d12ce..c8c719f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.4.4",
-    "versionCode" : 144,
+    "versionName" : "1.4.7",
+    "versionCode" : 147,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -103,13 +103,13 @@
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
                     }
                 },
                 "share" : {
                     "weixin" : {
                         "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
                     }
                 },
                 "geolocation" : {
@@ -160,7 +160,7 @@
         },
         "nativePlugins" : {
             "JG-JCore" : {
-                "JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e",
+                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
                 "JPUSH_CHANNEL_IOS" : "",
                 "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
                 "JPUSH_CHANNEL_ANDROID" : "",
@@ -178,7 +178,7 @@
                         "JPUSH_APPKEY_IOS" : {
                             "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
                             "key" : "JCore:APP_KEY",
-                            "value" : "7869a2f94b120cfb4431b96f"
+                            "value" : "daebe19b547c43128796a078"
                         },
                         "JPUSH_CHANNEL_IOS" : {
                             "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
@@ -199,9 +199,9 @@
                 }
             },
             "JG-JPush" : {
-                "JPUSH_ISPRODUCTION_IOS" : "",
+                "JPUSH_ISPRODUCTION_IOS" : "true",
                 "JPUSH_ADVERTISINGID_IOS" : "",
-                "JPUSH_DEFAULTINITJPUSH_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
                 "JPUSH_OPPO_APPKEY" : "",
                 "JPUSH_OPPO_APPID" : "",
                 "JPUSH_OPPO_APPSECRET" : "",
diff --git a/pages.json b/pages.json
index 650d550..c26eb18 100644
--- a/pages.json
+++ b/pages.json
@@ -125,6 +125,7 @@
 			"path": "pages/moreProject/moreProject",
 			"style": {
 				"navigationBarTitleText": "商户平台",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
 
@@ -150,7 +151,7 @@
             "path" : "pages/margin/margin",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText":"缴纳保证金",
                 "enablePullDownRefresh": false
             }
             
@@ -838,7 +839,7 @@
 				}, {
 					"path": "payment/payment",
 					"style": {
-						"navigationBarTitleText": "",
+						"navigationBarTitleText": "支付",
 						"enablePullDownRefresh": false
 					}
 
@@ -990,6 +991,8 @@
 				{
 					"path": "settled/index",
 					"style": {
+						"navigationStyle": "custom",
+						
 						"navigationBarTitleText": "商家入驻"
 					}
 				}, {
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index 4d4d325..d7fc7a7 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -146,7 +146,7 @@
 			</view>
 		</view>
 		<view style="height:120upx;"></view>
-		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="margin-bottom: var(--status-bar-height);">
+		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="padding-bottom: var(--status-bar-height);">
 			<view class="more"></view>
       <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(order_id,1)">
       	同意
@@ -376,8 +376,11 @@
 			/*核销订单*/
 			goCancellation() {
 				let that = this;
+				// uni.navigateTo({
+				// 	url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
+				// })
 				uni.navigateTo({
-					url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
+					url: `/pages/admin/order_cancellation/index?mer_id=${that.mer_id}`
 				})
 				// uni.showModal({
 				// 	title: '订单核销',
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index e01fdf4..399c417 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -553,6 +553,7 @@
 				uni.navigateTo({
 					url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
 				})
+				
 			},
 			toRefundDetail(item) {
 				uni.navigateTo({
diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue
index 2f54607..9a3d94d 100644
--- a/pages/admin/order_cancellation/index.vue
+++ b/pages/admin/order_cancellation/index.vue
@@ -131,8 +131,12 @@
 						// console.log(self.verify_code);
 						verifierOrder(self.mer_id,self.verify_code)
 							.then(res => {
+								// uni.navigateTo({
+								// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+								// });
+								
 								uni.navigateTo({
-									url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+									url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
 								});
 							})
 							.catch(res => {
@@ -161,8 +165,11 @@
 						scanType: ["qrCode", "barCode"]
 					}).then(res=>{
 						this.verify_code = res.resultStr
+						// uni.navigateTo({
+						// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+						// });
 						uni.navigateTo({
-							url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+							url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
 						});
 						// this.codeChange();
 					}).catch(res => {
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/gather/gather.vue b/pages/gather/gather.vue
index d5bd71f..d7a9b0c 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,11 +1,9 @@
 <template>
 	<view class="gather">
-
-
 		<view v-if="isFshow">
-			<view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}" @click="selectLocation">
+			<view class="site-box flex_a_c_j_sb" :style="{ opacity: backColor }" @click="selectLocation">
 				<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
-					<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style=" margin-left: 20rpx">
+					<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style="margin-left: 20rpx">
 					</view>
 					<view class="town_name">{{ street }}</view>
 				</view>
@@ -13,24 +11,20 @@
 					<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
 				</navigator>
 			</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 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>
+					<view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
 				</navigator>
 			</view>
 		</view>
 
-
-
-		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" ></zbpSwiper>
+		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street"></zbpSwiper>
 		<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
 			icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
 		<view class="business com special_work" v-if="jurisdiction == false">
@@ -64,8 +58,7 @@
 			<view class="content">
 				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
 					<view class="examine" @click="pushMenu(item)">
-						<image class="icon_img" :src="item.icon" mode="aspectFit">
-						</image>
+						<image class="icon_img" :src="item.icon" mode="aspectFit"> </image>
 						<u-icon class="icon" name="plus-circle-fill"></u-icon>
 						<text class="text">{{ item.name }}</text>
 					</view>
@@ -73,8 +66,7 @@
 			</view>
 		</view>
 
-	
-		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
 		<!-- <m-tabbar native>
 		      <template v-slot:tabbar_index_2>
@@ -126,7 +118,7 @@
 		components: {
 			mTabbar,
 			zbpSwiper
-		
+
 		},
 		data() {
 			return {
@@ -149,6 +141,7 @@
 				AllMenuList: [{
 						name: '商户平台',
 						icon: '/static/applet/shop_app.png',
+						// data: "__UNI__1EE148C",
 						data: '/pages/moreProject/moreProject',
 						type: 2,
 					},
@@ -158,21 +151,66 @@
 						data: '__UNI__B5B1EDD',
 						type: 1,
 					},
-          {
-            name: '农业咨询',
-            icon: '/static/applet/ny.png',
-            data: {
-              id: '__UNI__9620511',
-              url: '/static/wgt/__UNI__9620511.wgt',
-            },
-            type: 1,
-          }
+					{
+						name: '农业咨询',
+						icon: '/static/applet/ny.png',
+						data: {
+							id: '__UNI__9620511',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=nongye',
+						},
+						type: 3,
+					},
+					{
+						name: '教育咨询',
+						icon: '/static/applet/jy.png',
+						data: {
+							id: '__UNI__7AA205C',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=jiaoyu',
+						},
+						type: 3,
+					},
+					{
+						name: '法律咨询',
+						icon: '/static/applet/fl.png',
+						data: {
+							id: '__UNI__358D505',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=falv',
+						},
+						type: 3,
+					},
+					{
+						name: '情感咨询',
+						icon: '/static/applet/qg.png',
+						data: {
+							id: '__UNI__8080F14',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=qinggan',
+						},
+						type: 3,
+					},
+					{
+						name: '种植分析',
+						icon: '/static/applet/zz.png',
+						data: {
+							id: '__UNI__9EDFE40',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=zhongzhi',
+						},
+						type: 3,
+					},
+					{
+						name: '养殖分析',
+						icon: '/static/applet/yz.png',
+						data: {
+							id: '__UNI__EEA7DC9',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=yangzhi',
+						},
+						type: 3,
+					}
 				],
 				nowMenuList: [],
 				street: '',
 				showPicker: false,
 				columnData: [],
-			
+
 				isFshow: false,
 				backColor: 'rgba(252, 252, 252, 0)'
 			};
@@ -292,14 +330,7 @@
 				}
 			},
 			clickMenu(e, data) {
-				switch (e) {
-					case 1:
-						this.getUniMp(data);
-						break;
-					case 2:
-						this.navigator(data);
-						break;
-				}
+				this.getUniMp(e, data);
 			},
 			// 添加菜单
 			pushMenu(data) {
@@ -320,19 +351,35 @@
 				this.editFlag = false;
 				uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
 			},
-			getUniMp(data) {
+			getUniMp(type, data) {
 				// #ifdef APP-PLUS
-        console.log(data, typeof data == 'string');
-				if(typeof data == 'string') uniMP.loadMP(data);
-        else uniMP.loadMPurl(data);
-        // uniMP.loadMPurl(data);
-        // uniMP.open(data.id);
+				switch (type) {
+					case 1:
+						uniMP.loadMP(data);
+						break;
+						// case 2: uniMP.loadMPx(data); break;
+					case 2:
+						this.navigator(data);
+						break;
+
+					case 3:
+						uniMP.loadMPurl(data);
+						break;
+				}
 				return;
 				// #endif
-				uni.showToast({
-					icon: 'none',
-					title: 'H5不支持打开小程序'
-				})
+				// #ifdef H5
+
+				if (type == 2) {
+					this.navigator(data);
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: 'H5不支持打开小程序'
+					})
+				}
+				// #endif
+
 			},
 			changeHandler(e) {
 				const {
@@ -427,6 +474,7 @@
 				let that = this;
 				getUserInfo().then(res => {
 					that.userInfoData = res.data;
+					that.$store.commit('SET_USERINFO', res.data);
 					// console.log(res.data.service);
 					if (res.data.service == null) {
 						// console.log('123');
@@ -467,7 +515,8 @@
 			opacity: 1;
 		}
 	}
-.site-box1 {
+
+	.site-box1 {
 		width: 706rpx;
 		/* #ifdef MP || APP-PLUS */
 		height: 160rpx;
@@ -479,25 +528,26 @@
 		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 */
@@ -518,7 +568,7 @@
 		padding-top: 25rpx;
 		/* #endif */
 		// background-color: #e5e5e5;
-		background: url('@/static/images/bg2.png') no-repeat;
+		background: url("@/static/images/bg2.png") no-repeat;
 		background-size: 100% 100%;
 		padding-right: 20rpx;
 
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 153c189..41562cc 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -290,8 +290,8 @@
 								<view v-if="description.content && description.content.title" class="title">
 									{{description.content.title}}
 								</view>
-								<view v-if="description.content && description.content.image" class="pictures">
-									<image v-for="(item,index) in description.content.image" :key="index" :src="item">
+								<view v-if="description.content && description.content.image" class="pictures" style="background-color: #fff;">
+									<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="aspectFit">
 									</image>
 								</view>
 							</view>
@@ -704,11 +704,6 @@
 			that.getConfig();
 			uni.hideLoading();
 		},
-
-		onHide() {
-
-			this.CartCount = 0
-		},
 		/**
 		 * 用户点击右上角分享
 		 */
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6d5d98e..cd1760d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -129,6 +129,7 @@
 		getIndexData,
 		getDiy,
 		getArticleList,
+		cloudWarehouse,
 		getArticleCategoryLists
 	} from '@/api/api.js'
 	import {
@@ -332,7 +333,7 @@
 			//分栏视频 图文查看
 			itemTap(item) {
 
-				if (this.userid) {
+		
 					if (item.video_link.length > 0) {
 						uni.navigateTo({
 							// #ifdef MP || H5
@@ -347,11 +348,7 @@
 							url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
 						})
 					}
-				} else {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-
+			
 			},
 			// 授权关闭
 			authColse: function(e) {
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index a9ab8a1..122ff8e 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -1,60 +1,65 @@
 <template>
-  <view class="">
-	<view class="info">
-		<view class="bg"></view>
-	  <view class="card">
-	    <view class="title">店铺保证金信息</view>
-		<view class="item">
-		  <text>已缴纳保证金</text>
-		  <text>{{merchant_Data.paid_margin}}</text>
+	<view class="">
+		<view class="info">
+			<view class="bg"></view>
+			<view class="card">
+				<view class="title">店铺保证金信息</view>
+				<view class="item">
+					<text>已缴纳保证金</text>
+					<text>{{merchant_Data.paid_margin}}</text>
+				</view>
+				<view class="item">
+					<text>剩余缴纳保证金</text>
+					<text>{{merchant_Data.unpaid_margin}}</text>
+				</view>
+				<view class="item">
+					<text>缴纳店铺账户</text>
+					<text>{{merchant_Data.mer_name}}</text>
+				</view>
+			</view>
 		</view>
-	    <view class="item">
-	      <text>缴纳店铺账户</text>
-	      <text>{{merchant_Data.mer_name}}</text>
-	    </view>
-	  </view>
-	</view>
-    <view class="price">
-      <view class="title">缴纳金额</view>
-      <view class="tab">
-        <view class="item active" style="margin: 0;">{{merchant_Data.margin}}元</view>
-      </view>
-      <button class="btn" @click="paydecimal">缴纳</button>
-    </view>
-<!--    <view class="tip">
+		<view class="price">
+			<view class="title">缴纳金额</view>
+			<view class="tab">
+				<view class="item active" style="margin: 0;">{{merchant_Data.margin}}元</view>
+			</view>
+			<button class="btn" @click="paydecimal">缴纳</button>
+		</view>
+		<!--    <view class="tip">
       <view class="title">注意事项</view>
       <view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
       </view>
     </view> -->
-	
-	<view class="content-order" v-for="(item,i ) in productList">
-		<view class="">订单编号：{{item.order_sn}}</view>
-		<view class="">支付金额：{{item.total_price}}</view>
-		<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
-		<view class="">支付时间：{{item.pay_time}}</view>
+
+		<view class="content-order" v-for="(item,i ) in productList">
+			<view class="">订单编号：{{item.order_sn}}</view>
+			<view class="">支付金额：{{item.total_price}}</view>
+			<view class="">支付状态：{{item.paid==1?'已支付':'待支付'}}</view>
+			<view class="">支付时间：{{item.pay_time}}</view>
+		</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 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>
 </template>
 
 <script>
 	import {
 		merchant,
 		paymerchant,
-		 marginlist
+		marginlist
 	} from '@/api/api.js'
 	export default {
 		data() {
 			return {
-				mer_id:0,
+				mer_id: 0,
 				merchant_Data: {},
-				where:{
-					page:1,
-					limit:10
+				where: {
+					page: 1,
+					limit: 10
 				},
-				productList:[],
+				productList: [],
 				loadend: false,
 				loading: false,
 				loadTitle: '加载更多',
@@ -63,26 +68,26 @@
 		onLoad(e) {
 			this.mer_id = e.mer_id
 			this.decimal()
-			this.list(false)
+			this.list(true)
 
 		},
 		onReachBottom() {
-		if (this.productList.length > 0) {
-			setTimeout(() => {
-				this.list(false);
-			}, 1000)
-		}
+			if (this.productList.length > 0) {
+				setTimeout(() => {
+					this.list(false);
+				}, 1000)
+			}
 		},
 		methods: {
-			list(isPage){
+			list(isPage) {
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
 				if (isPage === true) that.$set(that, 'productList', []);
-				
+
 				that.loading = true;
 				that.loadTitle = '';
-				 marginlist(that.where).then(res => {
+				marginlist(that.where).then(res => {
 					let list = res.data.list;
 					let productList = that.$util.SplitArray(list, that.productList);
 					let loadend = list.length < that.where.limit;
@@ -92,21 +97,22 @@
 					setTimeout(() => {
 						that.$set(that, 'productList', productList);
 					}, 500)
+
 				
-					// console.log(that.productList)
 					that.$set(that.where, 'page', that.where.page + 1);
 					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
 				}).catch(err => {
 					that.loading = false;
 					that.loadTitle = '加载更多';
 				});
-				
+
 			},
 			//获取保证金信息
 			decimal() {
 				merchant({
 					id: this.mer_id
 				}).then((res) => {
+					
 					this.merchant_Data = res.data
 				});
 			},
@@ -117,23 +123,32 @@
 						title: '暂时无需缴纳保证金'
 					});
 				} else {
-			
+					let that = this
 					uni.showModal({
 						title: '提示',
 						content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
-						success: function(res) {
+						success: (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));
+										success: (res) => {
+											that.$util.Tips({
+												title: '支付成功'
+											});
+											that.decimal()
+											that.list(true)
 										},
-										fail: function(err) {
+										fail: (err) => {
+											that.$util.Tips({
+												title: '支付失败'
+											});
+
 											console.log('fail:' + JSON.stringify(err));
 										}
 									});
@@ -145,9 +160,9 @@
 							}
 						}
 					});
-			
+
 				}
-			
+
 			},
 		}
 	}
@@ -157,172 +172,174 @@
 
 </style>
 <style lang="scss">
-  page {
-    background-color: #fff;
-  }
-.content-order{
-	
-
-	background: #F4F4F4;
-	border-radius: 21rpx 21rpx ;
-	margin-top: 30rpx;
-	padding: 10rpx;
-	margin-left: 10rpx;
-	margin-right:  10rpx;
-	view{
-		font-size: 30rpx;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #333333;
-		margin: 20rpx;
-		
+	page {
+		background-color: #fff;
 	}
-}
-  .info {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
-    height: 250rpx;
 
-    .bg {
-      background-color: #FF5C2D;
-      height: 170rpx;
-      width: 100vw;
-      border-radius: 0rpx 0rpx 28rpx 28rpx;
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
+	.content-order {
+		background: #F4F4F4;
+		border-radius: 21rpx 21rpx;
+		margin-top: 30rpx;
+		padding: 10rpx;
+		margin-left: 10rpx;
+		margin-right: 10rpx;
 
-    .card {
-      width: 694rpx;
-      min-height: 180rpx;
-      background: #FFFFFF;
-      margin-top: 38.55rpx;
-      box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      opacity: 1;
-      padding: 31.5rpx 28rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-around;
-      position: absolute;
-      top: 0;
+		view {
+			font-size: 30rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			margin: 20rpx;
 
-      .title {
-        font-size: 32rpx;
-        font-weight: 600;
-        color: #333333;
-        padding-bottom: 10rpx;
-      }
+		}
+	}
 
-      .item {
-        display: flex;
-        justify-content: space-between;
-        font-size: 32rpx;
-        font-weight: 400;
-        color: #333333;
-		margin-bottom: 10rpx;
-        text:nth-child(1){
-          flex-shrink: 0;
-          margin-right: 18rpx;
-        }
-      }
-    }
-  }
+	.info {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		position: relative;
+		height: 250rpx;
 
-  .price {
-    display: flex;
-    flex-direction: column;
-    padding: 0 28rpx;
-    margin-top: 50rpx;
+		.bg {
+			background-color: #FF5C2D;
+			height: 170rpx;
+			width: 100vw;
+			border-radius: 0rpx 0rpx 28rpx 28rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 600;
-      color: #333333;
-      line-height: 39rpx;
-      margin-bottom: 42rpx;
-    }
+		.card {
+			width: 694rpx;
+			min-height: 180rpx;
+			background: #FFFFFF;
+			margin-top: 38.55rpx;
+			box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			opacity: 1;
+			padding: 31.5rpx 28rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			position: absolute;
+			top: 0;
 
-    .tab {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: left;
-      width: 694rpx;
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+				padding-bottom: 10rpx;
+			}
 
-      .item {
-        width: 217rpx;
-        height: 131rpx;
-        margin: 0 auto;
-        margin-bottom: 20rpx;
-        border-radius: 7rpx 7rpx 7rpx 7rpx;
-        border: 2rpx solid #F5F5F5;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 32rpx;
-        font-weight: 500;
-        line-height: 32rpx;
-      }
+			.item {
+				display: flex;
+				justify-content: space-between;
+				font-size: 32rpx;
+				font-weight: 400;
+				color: #333333;
+				margin-bottom: 10rpx;
 
-      .active {
-        border: 2rpx solid #FF5C2D;
-        color: #FF5C2D;
-      }
-    }
+				text:nth-child(1) {
+					flex-shrink: 0;
+					margin-right: 18rpx;
+				}
+			}
+		}
+	}
 
-    .input {
-      width: 100%;
-      height: 112rpx;
-      background: #F5F5F5;
-      border-radius: 56rpx 56rpx 56rpx 56rpx;
-      opacity: 1;
-      padding: 0 45.56rpx;
-      box-sizing: border-box;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #333;
-      line-height: 35rpx;
-    }
+	.price {
+		display: flex;
+		flex-direction: column;
+		padding: 0 28rpx;
+		margin-top: 85rpx;
 
-    .btn {
-      width: 694rpx;
-      height: 84rpx;
-      margin-top: 73.6rpx;
-      background: #FF5C2D;
-      box-shadow: 0rpx 14rpx 44rpx 2rpx #E9EFF5;
-      border-radius: 42rpx 42rpx 42rpx 42rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      font-size: 32rpx;
-      font-weight: 400;
-      color: #FFFFFF;
-    }
-  }
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333333;
+			line-height: 39rpx;
+			margin-bottom: 42rpx;
+		}
 
-  .tip {
-    display: flex;
-    flex-direction: column;
-    padding: 0 28rpx;
-    margin-top: 84rpx;
+		.tab {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: left;
+			width: 694rpx;
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-      color: #FF5C2D;
-      line-height: 32rpx;
-      margin-bottom: 21rpx;
-    }
+			.item {
+				width: 217rpx;
+				height: 131rpx;
+				margin: 0 auto;
+				margin-bottom: 20rpx;
+				border-radius: 7rpx 7rpx 7rpx 7rpx;
+				border: 2rpx solid #F5F5F5;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 32rpx;
+				font-weight: 500;
+				line-height: 32rpx;
+			}
 
-    .text {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: rgba(0, 0, 0, 0.6);
-      line-height: 42rpx;
-      -webkit-background-clip: text;
-    }
-  }
+			.active {
+				border: 2rpx solid #FF5C2D;
+				color: #FF5C2D;
+			}
+		}
+
+		.input {
+			width: 100%;
+			height: 112rpx;
+			background: #F5F5F5;
+			border-radius: 56rpx 56rpx 56rpx 56rpx;
+			opacity: 1;
+			padding: 0 45.56rpx;
+			box-sizing: border-box;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333;
+			line-height: 35rpx;
+		}
+
+		.btn {
+			width: 694rpx;
+			height: 84rpx;
+			margin-top: 73.6rpx;
+			background: #FF5C2D;
+			box-shadow: 0rpx 14rpx 44rpx 2rpx #E9EFF5;
+			border-radius: 42rpx 42rpx 42rpx 42rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 32rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+		}
+	}
+
+	.tip {
+		display: flex;
+		flex-direction: column;
+		padding: 0 28rpx;
+		margin-top: 84rpx;
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #FF5C2D;
+			line-height: 32rpx;
+			margin-bottom: 21rpx;
+		}
+
+		.text {
+			font-size: 28rpx;
+			font-weight: 400;
+			color: rgba(0, 0, 0, 0.6);
+			line-height: 42rpx;
+			-webkit-background-clip: text;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index a76d52a..e681ae3 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,5 +1,20 @@
 <template>
 	<view class="gather">
+
+
+		<!-- #ifdef MP || APP-PLUS -->
+
+		<view class="conten-top" :style="'height:'+statusBarHeight+'px'">
+			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
+					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
+			<view class=""
+				style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
+				商家平台
+			</view>
+		</view>
+		<view :style="'height:'+statusBarHeight+'px'"></view>
+		<!-- #endif -->
+
 		<block v-if="isShow&&userInfoData.mer_info.mer_name">
 			<view class="" v-if="userInfoData.mer_info.setting_status==1">
 				<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
@@ -70,7 +85,7 @@
 							<view class="examine" @click="navigator(`/pages/margin/margin`)">
 								<image class="icon_img" src="@/static/images/jy.png">
 								</image>
-								<text class="text">保证缴纳金</text>
+								<text class="text">缴纳保证金</text>
 							</view>
 							<!-- <view class="examine"
 								@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
@@ -186,10 +201,10 @@
 								<view class="examine" @click="margin(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
-									<text class="text">保证缴纳金</text>
+									<text class="text">缴纳保证金</text>
 								</view>
-								<!-- 
-								<view class="examine"
+
+								<!-- <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>
@@ -306,7 +321,7 @@
 								<view class="examine" @click="navigator(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
-									<text class="text">保证缴纳金</text>
+									<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">
@@ -377,7 +392,7 @@
 								<view class="examine" @click="navigator(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
-									<text class="text">保证缴纳金</text>
+									<text class="text">缴纳保证金</text>
 								</view>
 							</view>
 						</view>
@@ -410,11 +425,12 @@
 			<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> -->
-				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx"
+			<view class="setAgCount" style="width: 100%;height: 100%; padding-top:120rpx ;">
+
+				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:80rpx"
 					@click="recuo">
-					<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
+					<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
+					<!-- <image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image> -->
 				</view>
 				<div class="title">{{detail.title}}</div>
 				<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
@@ -440,9 +456,9 @@
 
 			<view class="userpage">
 				<view class="userpage-icon" @click="close">
-					<image src="@/static/images/close.png" mode=""></image>
+					<!-- <image src="@/static/images/close.png" mode=""></image> -->
+					<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
 				</view>
-
 				<form report-submit='true' style="height: 90%;">
 					<view class='merchantsSettled' :style="{'height':Fheight}">
 						<view class="title">填写信息</view>
@@ -606,7 +622,7 @@
 					cardno_back: ''
 				},
 				Fheight: 0,
-
+				statusBarHeight: 0
 			};
 		},
 		computed: {
@@ -615,7 +631,7 @@
 		created() {},
 		onLoad() {
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
-			console.log(this.Fheight)
+this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
 		},
 		onShow() {
 			if (this.isLogin) {
@@ -628,9 +644,6 @@
 			this.getUserInfo()
 			this.codelist()
 			this.list()
-
-
-
 		},
 
 
@@ -855,6 +868,12 @@
 				}
 
 			},
+			//
+			logout() {
+				uni.switchTab({
+					url: '/pages/gather/gather'
+				})
+			},
 			//商户设置
 			buyserset() {
 				uni.navigateTo({
@@ -864,7 +883,6 @@
 			navigator(url, t) {
 
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
-					// console.log(this.codenote)
 
 
 					if (this.codenote.length == 0) {
@@ -880,7 +898,6 @@
 							this.countDown()
 						}
 					}
-
 				} else {
 
 					uni.navigateTo({
@@ -939,6 +956,16 @@
 		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
 
+	.conten-top {
+		width: 100%;
+		text-align: center;
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		position: fixed;
+		z-index: 10;
+	}
+
 	.userpage {
 		width: 100%;
 
@@ -952,7 +979,7 @@
 		height: 60rpx;
 		position: absolute;
 		top: 65rpx;
-		right: 60rpx;
+		left: 60rpx;
 
 		image {
 			width: 100%;
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index b520e7b..f0527f2 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -6,10 +6,18 @@
 				<view v-if="showtit">
 					<view :class="{'head':true,'show':showtit}" style="padding-top:  var(--status-bar-height);">
 						<view style="display: flex;align-items: center;">
-							<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
+							<!-- 	<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
 								width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
+								
 							<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx" @click='goBack'></u--image>
+								height="50.82rpx" @click='goBack'></u--image> -->
+
+							<i class="iconfont icon-xiangzuo" v-if="cloudList.length>0"
+								style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
+							<i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx;text-align: left;"
+								@click='goBack'></i>
+
+
 							<view class="head_tit" v-if="cloudList.length"
 								style="font-size: 40rpx;transform: skewX(-10deg);font-weight: bold;"
 								:style="{color:cloudList.length>0?'':'black'}">
@@ -39,8 +47,10 @@
 					<view style="align-items: center;display: flex;justify-content: space-between;">
 						<view class="" style="display: flex;align-items: center;">
 							<view class="back" style="margin-right: 17rpx;">
-								<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
-									height="50.82rpx" @click='goBack'></u--image>
+								<!-- <u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
+									height="50.82rpx" @click='goBack'></u--image> -->
+									<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+										@click='goBack'></i>
 							</view>
 							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
 								供销综合云市场
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 62acea1..d046642 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -22,10 +22,15 @@
 					<view :class="{'head':true,'show':showtit}"
 						style="padding-top:  var(--status-bar-height);display: block;">
 						<view style="display: flex;align-items: center;">
-							<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
+							<!-- <u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
 								width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
 							<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx" @click='goBack'></u--image>
+								height="50.82rpx" @click='goBack'></u--image> -->
+							<i class="iconfont icon-xiangzuo" v-if="cloudList.length>0"
+								style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
+							<i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx;text-align: left;"
+								@click='goBack'></i>
+
 							<view class="head_tit" style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);"
 								:style="{color:cloudList.length>0?'':'black'}"
 								@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
@@ -70,7 +75,6 @@
 						</view>
 					 -->
 						<view class="flags1">
-
 						</view>
 					</view>
 
@@ -110,24 +114,28 @@
 					<view style="align-items: center;display: flex;justify-content: space-between;">
 						<view class="" style="display: flex;align-items: center;">
 							<view class="back" style="margin-right: 17rpx;">
-								<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
-									height="50.82rpx" @click='goBack'></u--image>
+								<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
+									height="50.82rpx" @click='goBack'></u--image> -->
+
+								<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"
+									@click='goBack'></i>
 							</view>
 							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
-								供销综合云市场
+								供销综合云商品
 							</view>
 						</view>
 
 						<view style="position: relative;width: 289.14rpx;">
 							<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..."
-								v-model="keyword" class="serch_cls"></u-search>
-							<u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
-								width="115.65rpx" height="56.82rpx" @click="serch"></u--image>
+								v-model="keyword" class="serch_cls" style="height: 56.82rpx;"></u-search>
+							<!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
+								width="115.65rpx" height="56.82rpx" @click="serch"></u--image> -->
+							<view class="serchbtn img_cls" @click="serch">搜索</view>
 						</view>
 						<view class='head_r' @click="showPop=true">
 							<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
 								height="50.82rpx"></u--image>
-							<text class="" style="height: 5px;"></text>
+							<text class="" style="height: 10px;"></text>
 							<view class="flags">
 
 							</view>
@@ -225,7 +233,7 @@
 								</view>
 							</view>
 							<view style="height: 100rpx;">
-								<u-loadmore :status="status" />
+								<!-- <u-loadmore :status="status" /> -->
 							</view>
 						</view>
 						<!-- 空 -->
@@ -523,13 +531,7 @@
 			let that = this
 			setTimeout(() => {
 
-				uni.createSelectorQuery()
-					.in(this)
-					.select('.flags')
-					.boundingClientRect(rect => {
-						this.headtop = rect.top
-					})
-					.exec();
+
 				uni.createSelectorQuery()
 					.in(this)
 					.select('.flags1')
@@ -581,6 +583,14 @@
 		onPageScroll(e) {
 			let that = this
 			this.showtit = !Boolean(e.scrollTop)
+			uni.createSelectorQuery()
+				.in(this)
+				.select('.flags')
+				.boundingClientRect(rect => {
+					this.headtop = rect.top
+					console.log(rect.top)
+				})
+				.exec();
 			uni.createSelectorQuery()
 				.in(this)
 				.select('.content')
@@ -960,6 +970,19 @@
 		}
 	}
 
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
+
 	.selected-list {
 		padding: 24rpx 14rpx;
 		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
@@ -1192,7 +1215,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue
index 27e954a..386ad5e 100644
--- a/pages/nongKe/food/index.vue
+++ b/pages/nongKe/food/index.vue
@@ -9,7 +9,10 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right:17rpx ;">
-							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+								<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+									></i>
 						</view>
 						<view style="font-size: 40rpx;">
 							<!-- {{titName}} -->
@@ -23,8 +26,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" 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 class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+						<!-- <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>
@@ -700,7 +704,19 @@
 		margin: 0;
 		padding: 0;
 	}
-
+.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	.com_name {
 		font-size: 32rpx;
 		// background-color: red;
@@ -1301,7 +1317,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index 71ad4dc..a2df3ba 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -9,7 +9,11 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
-							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+								<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+									></i>
+								
 						</view>
 						<view style="font-size: 40rpx;">
 							<!-- {{titName}} -->
@@ -26,8 +30,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" 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 class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+					<!-- 	<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>
@@ -699,6 +704,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	* {
 		margin: 0;
 		padding: 0;
@@ -1304,7 +1322,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 9bb3a07..395eebe 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -8,8 +8,9 @@
 
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
-						<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-							height="50.82rpx" @click='backjJump'></u--image>
+					<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+							height="50.82rpx" @click='backjJump'></u--image> -->
+						<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;" @click='backjJump'></i>
 						<view class=""
 							style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 20rpx;color: #F84221;">
 							供销综合云市场
@@ -141,7 +142,7 @@
 
 				</view>
 
-
+				<u-loadmore :status="status" />
 			</view>
 
 			<!-- 热搜 -->
@@ -414,6 +415,7 @@
 				menuList: [],
 				street: "",
 				showPicker: false,
+				status: "loadmore",
 				// 下拉菜单
 				downMenu: [{
 						title: '默认',
@@ -572,7 +574,7 @@
 					area_code: code
 				}).then(res => {
 					this.$refs.uPicker.setColumnValues(1, res.data);
-					console.log(res.data, 9999)
+			
 				});
 			},
 
@@ -920,19 +922,33 @@
 		},
 		//上划加载更多
 		onReachBottom() {
-			if (this.count === this.storeList.length) {
-				if (this.count === 0) {
+			this.sotreParam.page += 1
+
+			let rqData = {
+				keyword: this.sotreParam.keyword,
+				page: this.sotreParam.page,
+				limit: 10,
+				order: this.sotreParam.order,
+				category_id: this.sotreParam.category_id,
+				type_id: this.sotreParam.type_id,
+				street_id: this.sotreParam.street_id,
+				credit_buy: this.credit_buy
+			}
+			if (this.latitude) {
+				rqData.location = this.latitude + ',' + this.longitude
+			}
+			// console.log(rqData)
+			storeMerchantList(rqData).then(res => {
+				if (res.data.list == 0) {
+					this.status = "nomore"
 					return
 				}
-				uni.showToast({
-					title: '已加载全部',
-					icon: 'none',
-					duration: 1000
-				});
-			} else {
-				this.sotreParam.page += 1
-				this.storeMerchantList()
-			}
+				this.count = res.data.count
+				this.storeList.push(...res.data.list)
+
+			})
+
+
 		}
 
 	}
diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue
index d40a5ea..a62daee 100644
--- a/pages/nongKe/tourism/index.vue
+++ b/pages/nongKe/tourism/index.vue
@@ -9,7 +9,10 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
-							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+							<!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+								<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+									></i>
 						</view>
 						<view style="font-size: 40rpx;">
 							<!-- {{titName}} -->
@@ -26,8 +29,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" 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 class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+					<!-- 	<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>
@@ -701,7 +705,19 @@
 		margin: 0;
 		padding: 0;
 	}
-
+.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	.com_name {
 		font-size: 32rpx;
 		// background-color: red;
@@ -1302,7 +1318,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index fd8c56e..69e7b32 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -306,7 +306,7 @@
 			<view class="content-clip"></view>
 			<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
 				<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
-				<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
+				<view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view>
 				<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
 					class=" acea-row row-right row-middle">
 					<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 2e7bb70..663e932 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -363,7 +363,7 @@
 			},
 			mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])),
 		onLoad: function(options) {
-			console.log('11111111')
+			
 			this.credit_buy = options.credit_buy
 			// console.log(options.product_type)
 			if (options.product_type) {
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index 49539fc..8c0dd9e 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -28,7 +28,8 @@
 					<view class="list_count">
 						<view v-if="followDetail.author" class="title">
 							<view class="head-menu">
-								<image src="@/static/images/right.png" mode="aspectFill" @click="returns"></image>
+								<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;" @click="returns"></i>
+								<!-- <image src="@/static/images/right.png" mode="aspectFill" @click="returns"></image> -->
 							</view>
 
 							<view class="author">
diff --git a/pages/product/addGoods/addGoodDetils.vue b/pages/product/addGoods/addGoodDetils.vue
index 1aae373..2c9f40d 100644
--- a/pages/product/addGoods/addGoodDetils.vue
+++ b/pages/product/addGoods/addGoodDetils.vue
@@ -32,7 +32,7 @@
 			getProductContent(obj) {
 				// console.log(obj);
 				this.goodsDis = obj;
-				this.a=obj.store_name
+				this.a=obj.store_name;
 			},
 			save() {
 				setStorage('goodsDis', this.goodsDis);
diff --git a/pages/product/addGoods/commodity.vue b/pages/product/addGoods/commodity.vue
new file mode 100644
index 0000000..ad41d6a
--- /dev/null
+++ b/pages/product/addGoods/commodity.vue
@@ -0,0 +1,677 @@
+<template>
+  <view class=" writeBg  ">
+    
+    <view class="content_list">
+      <view class="content_list_item" @click="inputGoodsDetils">
+        <view>商品详情</view>
+        <!-- <view class="content_list_item_han">
+          <span v-if="disModel" style="color: #000000">去修改</span>
+          <span v-else>设置详情</span>
+          <span class="iconfont">&#xe6bd;</span>
+        </view> -->
+      </view>
+      <input-goods-detils class="input-goods-detils" @getProductContent="getProductContent" :title="store_name" :prodectContent="goodsDis" :maxLength="200"></input-goods-detils>
+      <block v-if="!moreThanFlag">
+        <view class="content_list_video input-goods-detils">
+          <view class="content_list_video_title">商品视频</view>
+          <view class="video_list">
+            <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
+              <view class="jiao" @click="deleteImage()">
+                <!-- video标签在app端层级过高 -->
+                <!--#ifndef APP-PLUS-->
+                <video :src="addGoodsSecoundData.video_link"></video>
+                <!--#endif-->
+                <!--#ifdef APP-PLUS-->
+                <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
+                  style=" width:150rpx"></img>
+                <!--#endif-->
+                <image src="../static/images/close.png" mode="widthFix"></image>
+              </view>
+        
+              <!--#ifndef APP-PLUS-->
+              <view style="position: absolute;">
+                <view class="videoHover" @click="videoshow">
+                </view>
+                <text class="video-text">点击可预览视频</text>
+              </view>
+              <!--#endif-->
+        
+              <!--#ifdef APP-PLUS-->
+              <view class='preview_video'>
+                <view class="videoHover" @click="videoshow">
+                </view>
+                <text class="video-text">点击可预览视频</text>
+              </view>
+              <!--#endif-->
+            </view>
+            <view class="photo" @click="uploadVideo" v-else>
+              <view>
+                <image src="../static/images/creamer.png" mode="widthFix"></image>
+              </view>
+              <view>添加视频</view>
+            </view>
+          </view>
+        </view>
+        <view class="container_input marginTop_none input-goods-detils">
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否推荐</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGood" />
+            </view>
+          </view>
+          <!-- <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否开启礼包</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_gift_bag == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGiftBag" />
+            </view>
+          </view> -->
+        </view>
+       <!-- <view class="tip input-goods-detils">
+          <span class="iconfont">&#xe688;</span>
+          <span>开启后此商品只能在分销礼包中展示并销售</span>
+        </view> -->
+        <view class="container_input marginTop_none input-goods-detils">
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>限购数量</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view>
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>商品排序</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view>
+        </view>
+      </block>
+      <view class="more_than" @click="moreThanFlag=!moreThanFlag" >
+      	<view v-if="moreThanFlag">更多</view>
+        <view v-else>收起</view>
+      </view>	
+    </view>
+    <view v-if="showVideo" class="video-count">
+      <!--#ifndef APP-PLUS-->
+      <video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
+      <!--#endif-->
+      <!--#ifdef APP-PLUS-->
+
+      <video id="myVideo" class="videoLink" autoplay loop
+        :src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
+      <!--#endif-->
+    </view>
+    <view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
+    <view class="handle dobuButton">
+      <view class="handle_button margin_right" @click="lastStep">上一步</view>
+      <view class="handle_button" @click="submitCreatedGoods">提交</view>
+    </view>
+  </view>
+</template>
+<script>
+  import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js';
+  import store from 'store';
+  import {
+    navigateTo,
+    setStorage,
+    getStorage,
+    removeStorage,
+    navigateBack,
+    Toast,
+    Loading,
+    hideLoading,
+    Modal
+  } from '../../../libs/uniApi.js';
+  import { productCreate, productUpdate } from 'api/product.js';
+  import inputGoodsDetils from '../components/inputGoodsDetils.vue';
+  export default {
+    components: {
+      inputGoodsDetils
+    },
+    props: {
+      merId: {
+        type: [String, Number],
+        default: ''
+      },
+      product_id: {
+        type: [String, Number],
+        default: ''
+      },
+      resetKey: {
+        type: Boolean,
+        default: false
+      },
+      code: {
+        type: [String, Number],
+        default: 0
+      }
+    },
+    data() {
+      return {
+        showVideo: false,
+        disModel: false,
+        upload_max: 10,
+        uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
+        addGoodsSecoundData: {
+          is_good: 0, // 是否推荐
+          is_gift_bag: 0,
+          sort: '',
+          once_count: '', // 限购数量
+          video_link: ''
+        },
+        goodsDis: {imageList: []},
+        store_name:'',
+        moreThanFlag: true,
+      };
+    },
+
+    created() {
+      // console.log('123');
+      this.initData();
+    },
+
+    watch: {
+      addGoodsSecoundData: {
+        handler(val) {
+          setTimeout(() => {
+            setStorage(this.product_id ? 'editGoodsDetils' : 'addGoodsSecoundData', val)
+          });
+        },
+        deep: true
+      },
+      resetKey: {
+        handler(val) {
+          // console.log(1);
+          this.initData();
+        }
+      },
+      goodsDis: {
+        handler(val) {
+          setTimeout(() => {
+            setStorage('goodsDis', this.goodsDis);
+          });
+        },
+        deep: true
+      },
+    },
+    methods: {
+      videoshow() {
+        this.showVideo = true
+        this.videoContext = uni.createVideoContext('myVideo', this);
+        this.$nextTick(() => {
+          this.videoContext.play();
+        })
+        // this.video_link = this.formData.video_link;
+        // this.videoContext.requestFullScreen({ direction: 90 });
+        // this.videoContext.play(); this.videoplay = true; 
+      },
+      initData() {
+        let editGoodsDetils = {};
+        if (getStorage('goodsDis')) {
+          this.disModel = true;
+        }
+        if (this.product_id) {
+          editGoodsDetils = getStorage('editGoodsDetils');
+          Object.keys(this.addGoodsSecoundData).forEach(item => {
+            this.addGoodsSecoundData[item] = editGoodsDetils[item];
+          });
+
+          if (editGoodsDetils.content) {
+            setStorage('goodsDis', {
+              store_name: editGoodsDetils.content.title,
+              imageList: editGoodsDetils.content.image
+            });
+            this.disModel = true;
+          }
+          setStorage('canChangeSecound', true);
+          return;
+        }
+
+        if (getStorage('addGoodsSecoundData')) {
+          Object.keys(this.addGoodsSecoundData).forEach(item => {
+            if (getStorage('addGoodsSecoundData')[item] || getStorage('addGoodsSecoundData')[item] == 0) {
+              this.addGoodsSecoundData[item] = getStorage('addGoodsSecoundData')[item];
+            }
+          });
+
+
+
+
+        }
+      },
+      lastStep() {
+        this.$emit('lastStep');
+      },
+      // 创建商品
+      submitCreatedGoods() {
+        Loading();
+        let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
+          'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound'
+        ];
+        let attrValue = getStorage('addGoodsFormData').spec_type == 0 ? [getStorage('singleSpecification')] :
+          getStorage('attrValue');
+        let postData = {
+          ...this.addGoodsSecoundData,
+          ...getStorage('addGoodsFormData'),
+          content: {
+            title: getStorage('goodsDis') ? getStorage('goodsDis').store_name : '',
+            image: getStorage('goodsDis') ? getStorage('goodsDis').imageList : []
+          },
+          video_link: this.addGoodsSecoundData.video_link
+        };
+
+        if (attrValue) {
+          postData.attrValue = attrValue.filter(item => item != '');
+          postData.attrValue[0].bar_code
+        }
+        // console.log(postData);
+        if (getStorage('addGoodsFormData').spec_type == 0) {
+          // postData.attr = [getStorage('singleSpecification')];
+        }
+        if (this.product_id) {
+          productUpdate(this.merId, this.product_id, postData)
+            .then(res => {
+              waitDeleteData.forEach(item => {
+                if (getStorage(item)) {
+                  removeStorage(item);
+                }
+              });
+              hideLoading()
+              Modal('提交成功', '点击确定，返回商品管理', {
+                showCancel: false
+              }).then(() => {
+                uni.removeStorageSync('singleSpecification')
+                uni.redirectTo({
+                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                })
+              })
+            })
+            .catch(rej => {
+              Toast(rej);
+            });
+
+        } else {
+          productCreate(this.merId, postData)
+            .then(res => {
+              waitDeleteData.forEach(item => {
+                if (getStorage(item)) {
+                  removeStorage(item);
+                }
+              });
+              hideLoading();
+              Modal('提交成功', '点击确定，返回商品管理', {
+                showCancel: false,
+              }).then(() => {
+                uni.redirectTo({
+                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                })
+              })
+            })
+            .catch(rej => {
+              Toast(rej);
+            });
+        }
+      },
+      // 是否推荐
+      isGood(e) {
+        this.addGoodsSecoundData.is_good = e.detail.value ? 1 : 0;
+      },
+      // 是否开启礼包
+      isGiftBag(e) {
+        this.addGoodsSecoundData.is_gift_bag = e.detail.value ? 1 : 0;
+      },
+
+      switchChange(value, item) {
+        this.addGoodsSecoundData[item.model] = value ? 1 : 0;
+      },
+      // 跳转商品详情
+      inputGoodsDetils() {
+        navigateTo(1, '/pages/product/addGoods/addGoodDetils', { mer_id: this.merId });
+      },
+      // 上传视频
+      uploadVideo() {
+        uni.chooseVideo({
+          sourceType: ['camera', 'album'],
+          success: res => {
+            console.log(res)
+
+            if (Math.ceil(res.size / 1024) < this.upload_max * 1024) {
+              uni.uploadFile({
+                url: this.uploadUrl, //仅为示例，非真实的接口地址
+                filePath: res.tempFilePath,
+                name: 'file',
+                //请求参数
+                formData: {
+                  user: 'test'
+                },
+                header: {
+                  // #ifdef MP
+                  'Content-Type': 'multipart/form-data',
+                  // #endif
+                  [TOKENNAME]: 'Bearer ' + store.state.app.token
+                },
+                success: uploadFileRes => {
+                  let data = JSON.parse(uploadFileRes.data);
+                  this.addGoodsSecoundData.video_link = (data.data.src);
+                },
+                complete: a => {
+                  // console.log(a);
+                }
+              });
+            } else {
+              uni.showModal({
+                title: '提示',
+                content: `视频超出限制${this.upload_max}MB,已过滤`
+              });
+            }
+          },
+          fail: err => {
+            // 取消上传也会出现弹框
+            // uni.showModal({
+            //   content: JSON.stringify(err)
+            // });
+            console.log(err)
+          }
+        });
+      },
+      deleteImage(index) {
+        this.addGoodsSecoundData.video_link = '';
+      },
+      getProductContent(obj) {
+      	// console.log(obj);
+      	this.goodsDis = obj;
+      	this.a=obj.store_name
+      },
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  @import './scss/index.scss';
+
+  .content_list {
+    width: 710rpx;
+    margin: auto;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+    background: #fff;
+    margin-top: 31rpx;
+    border-radius: 10rpx;
+    
+    .input-goods-detils{
+      width: 100%;
+      padding: 20rpx 10rpx !important;
+    }
+    
+    .more_than{
+      background: #FFFFFF;
+      border-radius: 0 0 10rpx 10rpx;
+      margin: auto;
+      // margin-top: 30rpx;
+      border-top: 1px solid #f5f5f5;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 84rpx;
+      color: #333333;
+      font-size: 30rpx;
+    }
+
+    .content_list_item {
+      padding: 32rpx 10rpx;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 1px solid #eee;
+
+      .content_list_item_han {
+        color: #bbbbbb;
+        display: flex;
+        align-items: center;
+      }
+    }
+
+    .content_list_video {
+      min-height: 154rpx;
+      padding: 23rpx 10rpx;
+      display: flex;
+      justify-content: space-between;
+
+      .content_list_video_title {
+        padding-top: 10rpx;
+      }
+
+      .video_list {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        flex-wrap: wrap;
+      }
+    }
+  }
+
+  .videoHover {
+    width: 180rpx;
+    height: 180rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 10;
+
+    view {
+      width: 50rpx;
+      height: 50rpx;
+      background: #000000;
+      border-radius: 50rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .iconfont {
+        color: #ffffff;
+        font-size: 21rpx;
+      }
+    }
+  }
+
+  .photo {
+    border: 1px solid #dddddd;
+    opacity: 1;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    text-align: center;
+    // padding: 27rpx 21rpx 24rpx 21rpx;
+    width: 150rpx;
+    height: 150rpx;
+    box-sizing: border-box;
+    color: #bbbbbb;
+    margin-left: 16rpx;
+    position: relative;
+    margin-bottom: 12rpx;
+
+    image {
+      width: 62rpx;
+      margin-bottom: 10rpx;
+    }
+  }
+
+  .jiao {
+    image {
+      position: absolute;
+      top: -14rpx;
+      right: -14rpx;
+      width: 40rpx;
+      height: 40rpx;
+      border-radius: 50%;
+      padding: 8rpx;
+      background: #e93323;
+      z-index: 999;
+    }
+
+    video {
+      width: 150rpx;
+      height: 150rpx;
+    }
+  }
+
+  .preview_video {
+    position: absolute;
+
+  }
+
+  .container_input {
+    background: #fff;
+    padding: 0 20rpx;
+    width: 710rpx;
+
+    margin: auto;
+    margin-top: 31rpx;
+    border-radius: 10rpx;
+
+    &_item {
+      display: flex;
+      height: 106rpx;
+      align-items: center;
+
+      .select_and_input {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .greyColor {
+          color: #bbbbbb;
+        }
+      }
+
+      .radio {
+        padding: 30rpx 0;
+      }
+
+      &_label {
+        padding-left: 10rpx;
+        color: #333333;
+        font-size: 30rpx;
+        display: flex;
+        align-items: center;
+
+        .select_check {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 40rpx;
+          height: 40rpx;
+          border: 1px solid #cccccc;
+          border-radius: 50%;
+          margin-right: 20rpx;
+
+          .iconfont {
+            font-size: 24rpx;
+          }
+        }
+
+        .select {
+          background: #e93323;
+          border: none;
+
+          .iconfont {
+            color: #fff;
+          }
+        }
+      }
+
+      &_value {
+        padding-right: 10rpx;
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        >span:nth-child(1) {
+          display: inline-block;
+          margin-right: 15rpx;
+        }
+
+        .text {
+          color: #000;
+          display: inline-block;
+          max-width: 400rpx;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        input {
+          text-align: right;
+        }
+
+        .select_group {
+          display: flex;
+        }
+
+        &_select {
+          display: flex;
+          margin-right: 110rpx;
+        }
+      }
+
+      .flex_start {
+        padding: 0 10rpx;
+        margin-top: 40rpx;
+        justify-content: flex-start;
+      }
+    }
+
+    >view:not(:last-child) {
+      border-bottom: 1px solid #eeeeee;
+    }
+  }
+
+  .inputPlaceHolder {
+    color: #bbbbbb;
+  }
+
+  .paddingTop_none {
+    padding-top: 0 !important;
+  }
+
+  .marginTop_none {
+    margin-top: 0;
+  }
+
+  .video-count {
+    position: fixed;
+    width: 600rpx;
+    height: 500rpx;
+    top: 50%;
+    left: 50%;
+    margin-left: -300rpx;
+    margin-top: -250rpx;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .videoLink {
+      width: 600rpx;
+      height: 500rpx;
+    }
+  }
+
+  // .writeBg {
+  // 	background: #fff;
+  // }
+  
+  .tip{
+    padding: 0 !important;
+    margin: 0 !important;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index 3f099a6..a93082e 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -40,26 +40,6 @@
 					<image :src="image"></image>
 					<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
 				</u-popup>
-				<view class="input_content_describe">
-					<view class="input_content_describe_title">
-						<view class="input_content_describe_title_msg">商品简介</view>
-						<view class="input_content_describe_title_num">
-							<text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
-							<text v-else>0</text>
-							/200
-						</view>
-					</view>
-					<view class="input_content_describe_textarea">
-						<textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
-							placeholderClass="placeholderClass" maxlength="200" />
-					</view>
-				</view>
-
-				<view class="input_content_keyword">
-					<view class="input_content_keyword_label">关键字</view>
-					<view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
-							placeholder="填写关键字" /></view>
-				</view>
 			</view>
 
 			<view class="popup_group">
@@ -75,7 +55,7 @@
 					</view>
 				</view>
 
-				<view class="popup_group_item" @click="selectStoreClass">
+				<!-- <view class="popup_group_item" @click="selectStoreClass">
 					<view class="popup_group_item_label">店铺分类</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -85,7 +65,7 @@
 						</view>
 						<view><span class="iconfont">&#xe6bd;</span></view>
 					</view>
-				</view>
+				</view> -->
 
 				<!-- 		<view class="popup_group_item" @click="selectBrand">
 					<view class="popup_group_item_label">商品品牌</view>
@@ -105,8 +85,10 @@
 							placeholder="请填写商品单位" /></view>
 				</view>
 			</view>
+      
+      <priceComponent></priceComponent>
 
-			<view class="popup_group">
+			<!-- <view class="popup_group">
 				<view class="radio">
 					<view class="radio_label ">规格选择</view>
 					<radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
@@ -154,21 +136,10 @@
 						<view><span class="iconfont">&#xe6bd;</span></view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 
 			<view class="popup_group">
-				<view class="radio">
-					<view class="radio_label ">送货方式</view>
-					<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
-						<label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
-							<view>
-								<checkbox :value="val.value" disabled :checked="val.value" />
-							</view>
-							<view>{{ val.name }}</view>
-						</label>
-					</checkbox-group>
-				</view>
-
+				
 				<!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
 					<view class="popup_group_item_label">是否包邮</view>
 					<view class="popup_group_item_value">
@@ -179,7 +150,7 @@
 					</view>
 				</view> -->
 
-				<view class="popup_group_item"
+				<!-- <view class="popup_group_item"
 					v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"
 					@click="tempIdSelect">
 					<view class="popup_group_item_label">运费模板</view>
@@ -191,10 +162,61 @@
 						</view>
 						<view><span class="iconfont">&#xe6bd;</span></view>
 					</view>
-				</view>
+				</view> -->
 			</view>
-			<view class="handle">
-				<view class="handle_button" @click="handleNextStep">下一步</view>
+			
+      <commodityComponent :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
+      </commodityComponent>
+      
+      <view class="popup_group">
+        <view class="popup_group_item" @click="showMoreInfo=!showMoreInfo">
+        	<view class="popup_group_item_label">更多信息</view>
+          <view class="popup_group_item_value" :class="showMoreInfo?'icon_bottom':'icon_top'">
+          	<view><span class="iconfont">&#xe6bd;</span></view>
+          </view>
+        </view>
+        <block v-if="showMoreInfo">
+          <view class="input_content">
+            <view class="input_content_describe" style="border-top: none">
+            	<view class="input_content_describe_title">
+            		<view class="input_content_describe_title_msg">商品简介</view>
+            		<view class="input_content_describe_title_num">
+            			<text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
+            			<text v-else>0</text>
+            			/200
+            		</view>
+            	</view>
+            	<view class="input_content_describe_textarea">
+            		<textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
+            			placeholderClass="placeholderClass" maxlength="200" />
+            	</view>
+            </view>
+            
+            <view class="input_content_keyword">
+            	<view class="input_content_keyword_label">关键字</view>
+            	<view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
+            			placeholder="填写关键字" /></view>
+            </view>
+          </view>
+          <view class="radio">
+          	<view class="radio_label ">送货方式</view>
+          	<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+          		<label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
+          			<view>
+          				<checkbox :value="val.value" disabled :checked="val.value" />
+          			</view>
+          			<view>{{ val.name }}</view>
+          		</label>
+          	</checkbox-group>
+          </view>
+        </block>
+        
+      </view>
+      
+      <view class="handle">
+				<!-- <view class="handle_button" @click="handleNextStep">下一步</view> -->
+        <secound :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
+        </secound>
 			</view>
 		</view>
 
@@ -269,6 +291,8 @@
 		HTTP_REQUEST_URL
 	} from '@/config/app.js';
 	import store from '@/store';
+  import priceComponent from "./price.vue";
+  import commodityComponent from "./commodity.vue";
 	export default {
 		components: {
 			inputGoodsDetils,
@@ -277,7 +301,9 @@
 			platfrom, // 选择平台分类组件
 			storeClassification,
 			secound,
-			avatar
+			avatar,
+      priceComponent,
+      commodityComponent
 		},
 		data() {
 			return {
@@ -310,6 +336,7 @@
 					tempName: '' // 运费模板名称
 				},
 				popupContainerKey: false,
+        showMoreInfo: false,
 				productItem: {} || [],
 				selectProductTitle: '选择平台分类',
 				specificationsRadioList: [{
@@ -828,6 +855,8 @@
 			// 开始下一步
 
 			handleNextStep() {
+        this.step = 2;
+        return ;
 				// console.log(this.setFormData.setSpecificaValue)
 				let canJumpFlag = true;
 				let requireData = {
@@ -837,9 +866,9 @@
 					mer_cate_id: '请选择店铺分类', // 店铺分类
 					unit_name: '请输入商品单位', // 商品单位
 				};
-				console.log({
-					...this.setFormData
-				})
+				// console.log({
+				// 	...this.setFormData
+				// })
 				Object.keys(requireData).some(item => {
 					if (!this.setFormData[item]) {
 						Toast(requireData[item]);
@@ -858,6 +887,10 @@
 					Toast('请选择送货方式');
 					return;
 				}
+				if (!this.setFormData.mer_cate_id.length) {
+					Toast('请选择店铺分类');
+					return;
+				}
 				if (this.setFormData.imageList.length < 2) {
 					Toast('请添加最少两张图片用于展示');
 					return;
diff --git a/pages/product/addGoods/price.vue b/pages/product/addGoods/price.vue
new file mode 100644
index 0000000..39938ed
--- /dev/null
+++ b/pages/product/addGoods/price.vue
@@ -0,0 +1,202 @@
+<template>
+	<view class="container">
+		<select-form style="border-radius: 10rpx 10rpx 0 0;" :platformClassification="formList" :form="singleSpecification" @input="input"></select-form>
+		<view class="more_than" @click="moreThanFlag?selectMoreThan():spliceMoreThan()" >
+			<view v-if="moreThanFlag">更多</view>
+      <view v-else>收起</view>
+		</view>	
+		<!-- <view class="handle">
+			<view class="button" @click="saveSingleSpecification">
+				保存
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	import selectForm from '../components/selectForm.vue';
+	import { navigateTo, navigateBack, serialize, setStorage, getStorage } from '../../../libs/uniApi.js';
+	// 单规格商品 attrValue
+	export default {
+		components:{
+			selectForm
+		},
+		data() {
+			return {
+				singleSpecification: {
+					price: '', // 售价
+					cost: '', // 成本价
+					ot_price: '', // 原价
+					bar_code: '', // 商品编号
+					weight: '', // 重量
+					volume: '', // 体积
+					image: '',
+					extension_one: '',
+					extension_two: ''
+				},
+				moreThanFlag: true,
+				formList: [
+					{
+						id: 1,
+						label: '售价',
+						type: 'digit',
+						model: 'price',
+						holder: '请填写售价'
+					},
+          {
+          	id: 0,
+          	label: '库存',
+          	type: 'digit',
+          	model: 'stock_num',
+          	holder: '请填写库存'
+          },
+				],
+				moreThanList: [
+          {
+          	id: 2,
+          	label: '成本价',
+          	type: 'digit',
+          	holder: '请填写成本价',
+          	model: 'cost'
+          },
+          {
+          	id: 3,
+          	label: '原价',
+          	type: 'digit',
+          	holder: '请填写原价',
+          	model: 'ot_price'
+          },
+					{
+						id: 5,
+						label: '商品编号',
+						type: 'input',
+						holder: '请填写商品编号',
+						model: 'bar_code'
+					},
+					{
+						id: 6,
+						label: '重量',
+						type: 'digit',
+						holder: '请输入重量',
+						model: 'weight'
+					},
+					{
+						id: 7,
+						label: '体积',
+						type: 'digit',
+						holder: '请输入体积',
+						model: 'volume'
+					},
+					// {
+					// 	id: 8,
+					// 	label: '佣金（一级）',
+					// 	type: 'digit',
+					// 	holder: '请输入一级佣金',
+					// 	model: 'extension_one'
+					// },
+					// {
+					// 	id: 9,
+					// 	label: '佣金（二级）',
+					// 	type: 'digit',
+					// 	holder: '请输入二级佣金',
+					// 	model: 'extension_two'
+					// }
+				],
+				
+			}
+		},
+	
+		watch: {
+			singleSpecification: {
+				handler(val) {
+					this.singleSpecification = val;
+          this.saveSingleSpecification();
+				},
+				deep: true
+			}
+		},
+		// onLoad(option) {
+		// 	console.log(option);
+		// 	this.singleSpecification.bar_code=option.code
+		// },
+		// onShow() {
+		// 	if(getStorage('addGoodsFormData').image) {
+		// 		this.singleSpecification.image = getStorage('addGoodsFormData').image;
+		// 	}
+		// 	if(getStorage('singleSpecification')) {
+		// 		Object.keys(this.singleSpecification).forEach(item => {
+		// 			if(getStorage('singleSpecification')[item]) {
+		// 				this.singleSpecification[item] = getStorage('singleSpecification')[item]
+		// 			}
+		// 		})
+		// 	}
+		// },
+		// beforeDestroy() {
+		// 	console.log('123');
+		// 	uni.removeStorage({
+		// 		key: 'singleSpecification'
+		// 	});
+		// },
+		methods: {
+			selectMoreThan() {
+				this.formList = this.formList.concat(this.moreThanList);
+				this.moreThanFlag = false;
+			},
+			spliceMoreThan() {
+				this.moreThanFlag = true;
+				this.formList.splice(2, this.formList.length);
+			},
+			input(val) {
+				this.singleSpecification = val
+			},
+			// 保存
+			saveSingleSpecification() {
+				setStorage('singleSpecification', this.singleSpecification);
+				// navigateBack(1);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 0 !important;
+	}
+	.more_than {
+		background: #FFFFFF;
+		border-radius: 0 0 10rpx 10rpx;
+		margin: auto;
+		// margin-top: 30rpx;
+		margin-top: 1px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 710rpx;
+		height: 84rpx;
+		color: #333333;
+		font-size: 30rpx;
+	}
+	
+	.handle {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 126rpx;
+		background: #FFFFFF;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.button {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			width: 690rpx;
+			height: 86rpx;
+			background: #E93323;
+			border-radius: 43rpx;
+		}
+	}
+</style>
diff --git a/pages/product/addGoods/scss/index.scss b/pages/product/addGoods/scss/index.scss
index 5b634ca..2a7dabc 100644
--- a/pages/product/addGoods/scss/index.scss
+++ b/pages/product/addGoods/scss/index.scss
@@ -18,7 +18,7 @@
     }
   }
 .tip {
-	padding: 16rpx 0 0 40rpx;
+	padding: 16rpx 0 0 20rpx;
 	font-size: 22rpx;
 	color: #e93323;
 	display: flex;
@@ -36,6 +36,14 @@
 	width: 710rpx;
 	font-size: 30rpx;
 	border-radius: 10rpx;
+  
+  .icon_top{
+    transform: rotate(-90deg);
+  }
+  
+  .icon_bottom{
+    transform: rotate(90deg);
+  }
 	.popup_group_item {
 		padding: 32rpx 30rpx;
 		display: flex;
diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue
index a33116d..69e3365 100644
--- a/pages/product/addGoods/secound.vue
+++ b/pages/product/addGoods/secound.vue
@@ -1,112 +1,117 @@
 <template>
-  <view class=" writeBg  ">
-    <view class="container_input marginTop_none">
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>是否推荐</span></view>
-        <view class="container_input_item_value">
-          <switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323" style="transform:scale(0.8)"
-            @change="isGood" />
-        </view>
-      </view>
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>是否开启礼包</span></view>
-        <view class="container_input_item_value">
-          <switch :checked="addGoodsSecoundData.is_gift_bag == 1" color="#E93323" style="transform:scale(0.8)"
-            @change="isGiftBag" />
-        </view>
-      </view>
-    </view>
-    <view class="tip">
-      <span class="iconfont">&#xe688;</span>
-      <span>开启后此商品只能在分销礼包中展示并销售</span>
-    </view>
-    <view class="container_input marginTop_none">
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>限购数量</span></view>
-        <view class="container_input_item_value">
-          <input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
-            placeholder-class="inputPlaceHolder" />
-        </view>
-      </view>
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>商品排序</span></view>
-        <view class="container_input_item_value">
-          <input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
-            placeholder-class="inputPlaceHolder" />
-        </view>
-      </view>
-    </view>
-    <view class="content_list">
-      <view class="content_list_item" @click="inputGoodsDetils">
-        <view>商品详情</view>
-        <view class="content_list_item_han">
-          <span v-if="disModel" style="color: #000000">去修改</span>
-          <span v-else>设置详情</span>
-          <span class="iconfont">&#xe6bd;</span>
-        </view>
-      </view>
-      <view class="content_list_video">
-        <view class="content_list_video_title">商品视频</view>
-        <view class="video_list">
-         <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
-            <view class="jiao" @click="deleteImage()">
-				<!-- video标签在app端层级过高 -->
-				 <!--#ifndef APP-PLUS-->
-              <video  :src="addGoodsSecoundData.video_link"></video>
-			    <!--#endif-->
-				 <!--#ifdef APP-PLUS-->
-			  <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png" style=" width:150rpx" ></img>
-			   <!--#endif-->
-              <image src="../static/images/close.png" mode="widthFix"></image>
+  <view>
+    <block v-if="showComponent">
+      <view class=" writeBg  ">
+        <view class="container_input marginTop_none">
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否推荐</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGood" />
             </view>
-			
-			  <!--#ifndef APP-PLUS-->
-			<view style="position: absolute;">
-				<view class="videoHover" @click="videoshow">
-				</view>
-				<text class="video-text">点击可预览视频</text>
-			</view>
-			       <!--#endif-->
-		
-  <!--#ifdef APP-PLUS-->
-		<view class='preview_video'>
-			<view class="videoHover" @click="videoshow">
-			</view>
-			<text class="video-text">点击可预览视频</text>
-		</view>
-		 <!--#endif-->
           </view>
-		  
-		  
-		  
-		  
-		  
-		  
-		  
-          <view class="photo" @click="uploadVideo" v-else>
-            <view>
-              <image src="../static/images/creamer.png" mode="widthFix"></image>
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否开启礼包</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_gift_bag == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGiftBag" />
             </view>
-            <view>添加视频</view>
           </view>
         </view>
+        <view class="tip">
+          <span class="iconfont">&#xe688;</span>
+          <span>开启后此商品只能在分销礼包中展示并销售</span>
+        </view>
+        <view class="container_input marginTop_none">
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>限购数量</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view>
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>商品排序</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view>
+        </view>
+        <view class="content_list">
+          <view class="content_list_item" @click="inputGoodsDetils">
+            <view>商品详情</view>
+            <view class="content_list_item_han">
+              <span v-if="disModel" style="color: #000000">去修改</span>
+              <span v-else>设置详情</span>
+              <span class="iconfont">&#xe6bd;</span>
+            </view>
+          </view>
+          <view class="content_list_video">
+            <view class="content_list_video_title">商品视频</view>
+            <view class="video_list">
+             <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
+                <view class="jiao" @click="deleteImage()">
+      			<!-- video标签在app端层级过高 -->
+      			 <!--#ifndef APP-PLUS-->
+                  <video  :src="addGoodsSecoundData.video_link"></video>
+      		    <!--#endif-->
+      			 <!--#ifdef APP-PLUS-->
+      		  <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png" style=" width:150rpx" ></img>
+      		   <!--#endif-->
+                  <image src="../static/images/close.png" mode="widthFix"></image>
+                </view>
+      		
+      		  <!--#ifndef APP-PLUS-->
+      		<view style="position: absolute;">
+      			<view class="videoHover" @click="videoshow">
+      			</view>
+      			<text class="video-text">点击可预览视频</text>
+      		</view>
+      		       <!--#endif-->
+      	
+      <!--#ifdef APP-PLUS-->
+      	<view class='preview_video'>
+      		<view class="videoHover" @click="videoshow">
+      		</view>
+      		<text class="video-text">点击可预览视频</text>
+      	</view>
+      	 <!--#endif-->
+              </view>
+      	  
+      	  
+      	  
+      	  
+      	  
+      	  
+      	  
+              <view class="photo" @click="uploadVideo" v-else>
+                <view>
+                  <image src="../static/images/creamer.png" mode="widthFix"></image>
+                </view>
+                <view>添加视频</view>
+              </view>
+            </view>
+          </view>
       </view>
-    </view>
-  <view v-if="showVideo" class="video-count">
-        <!--#ifndef APP-PLUS-->
-        <video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
-        <!--#endif-->
-        <!--#ifdef APP-PLUS-->
-
-        <video id="myVideo" class="videoLink" autoplay loop
-          :src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
-        <!--#endif-->
+      <view v-if="showVideo" class="video-count">
+            <!--#ifndef APP-PLUS-->
+            <video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
+            <!--#endif-->
+            <!--#ifdef APP-PLUS-->
+      
+            <video id="myVideo" class="videoLink" autoplay loop
+              :src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
+            <!--#endif-->
+          </view>
+          <view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
+        <view class="handle dobuButton">
+          <view class="handle_button margin_right" @click="lastStep">上一步</view>
+          <view class="handle_button" @click="submitCreatedGoods">提交</view>
+        </view>
       </view>
-      <view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
-    <view class="handle dobuButton">
-      <view class="handle_button margin_right" @click="lastStep">上一步</view>
-      <view class="handle_button" @click="submitCreatedGoods">提交</view>
-    </view>
+    </block>
+    <view class="handle_button" @click="submitCreatedGoods">提交</view>
   </view>
 </template>
 <script>
@@ -148,7 +153,8 @@
     },
     data() {
       return {
-		  showVideo:false,
+        showComponent: false,
+        showVideo:false,
         disModel: false,
         upload_max: 10,
         uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
diff --git a/pages/product/addGoods/singleSpecification.vue b/pages/product/addGoods/singleSpecification.vue
index 5e2ed0f..0c4fe4f 100644
--- a/pages/product/addGoods/singleSpecification.vue
+++ b/pages/product/addGoods/singleSpecification.vue
@@ -14,7 +14,7 @@
 
 <script>
 	import selectForm from '../components/selectForm.vue';
-	import { navigateTo, navigateBack, serialize, setStorage, getStorage} from '../../../libs/uniApi.js';
+	import { navigateTo, navigateBack, serialize, setStorage, getStorage } from '../../../libs/uniApi.js';
 	// 单规格商品 attrValue
 	export default {
 		components:{
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index b1f9367..df3097b 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -135,12 +135,12 @@
 				<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
 			</view>
 			
-			<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
+		<!-- 	<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
 				<u-switch v-model="credit_buy" @change="change"></u-switch>
-			</view> -->
+			</view>
 			
-			<!-- <view class="item_cell flex_a_c"  v-if="credit_buy">
+			<view class="item_cell flex_a_c"  v-if="credit_buy">
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
 				<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
 			</view>
@@ -148,8 +148,8 @@
 			<view class="item_cell flex_a_c" v-if="credit_buy">
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
 				<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
-			</view> -->
-			<!-- <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
+			</view>
+			<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
 			<!-- <view class="item_cell">
         <view class="if_btn flex_a_c_j_sb">
           <text class="sub_title">是否开启商户：</text>
diff --git a/pages/product/components/inputGoodsDetils.vue b/pages/product/components/inputGoodsDetils.vue
index 5f5368f..ac540c0 100644
--- a/pages/product/components/inputGoodsDetils.vue
+++ b/pages/product/components/inputGoodsDetils.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="input_content">
     <view class="input_content_textarea">
-      <textarea v-model="prodectContent.store_name" placeholder="请输入简介" placeholder-class="placeholderStyle"
+      <textarea v-model="prodectContent.store_name" placeholder="请输入商品详情" placeholder-class="placeholderStyle"
         :maxlength="maxLength" />
       <view><text v-if="prodectContent.store_name">{{prodectContent.store_name.length}}</text><text
           v-else>0</text>/{{maxLength}}</view>
@@ -40,7 +40,7 @@
       <view class="input_content_keyword_value"><input v-model="prodectContent.keyword" type="text" value=""
           placeholder="填写关键字" /></view>
     </view>
-    <avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
+    <avatar style="height: 1px;" @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
     </avatar>
   </view>
 </template>
@@ -90,7 +90,7 @@
       prodectContent: {
         handler(val) {
 			// console.log(val.store_name);
-			this.upstore=val.store_name
+          this.upstore=val.store_name
           this.$emit('getProductContent', val);
 		  
         },
diff --git a/pages/product/goodsOnSale/index.vue b/pages/product/goodsOnSale/index.vue
index 2004e71..c2f98d5 100644
--- a/pages/product/goodsOnSale/index.vue
+++ b/pages/product/goodsOnSale/index.vue
@@ -5,7 +5,7 @@
 				<view class="title_search">
 					<span class="iconfont">&#xe67d;</span>
 					<form @submit="search" report-submit="true">
-						<input type="text" :name="where.keyword" v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
+						<input type="text"  v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
 					</form>		
 				</view>
 			</view>
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index ae8de1f..882ce83 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -47,12 +47,13 @@
 							<swiper-item :class="{ active: 1 == swiperCur }">
 								<view class="slide-navigator">
 									<!-- 隐藏暂时不需要 -->
-									 <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_freight.png">
-                    </image>
-                    <text class="text">运费模板</text>
-                  </navigator>
+								<!-- 	<navigator class="item"
+										:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_freight.png">
+										</image>
+										<text class="text">运费模板</text>
+									</navigator> -->
 									<navigator class="item"
 										:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
 										hover-class='none'>
@@ -60,12 +61,12 @@
 											src="../static/images/product_specification.png"></image>
 										<text class="text">规格模板</text>
 									</navigator>
-									<navigator class="item"
+								<!-- 	<navigator class="item"
 										:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
 										hover-class='none'>
 										<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
 										<text class="text">商品导入</text>
-									</navigator>
+									</navigator> -->
 								</view>
 							</swiper-item>
 						</block>
@@ -124,9 +125,9 @@
 						</view>
 						<view class="operation acea-row row-between-wrapper">
 							<view class="acea-row row-middle">
-								<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
+							<!-- 	<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
 									线上入库
-								</view>
+								</view> -->
 								<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
 									线下入库
 								</view>
@@ -169,7 +170,7 @@
 						</view>
 					</scroll-view>
 				</view>
-				
+
 				<view class="shuru" v-if="this.on_line == 1">
 					数量: <input type="number" v-model="data.number" placeholder="请输入">
 				</view>
@@ -245,7 +246,8 @@
 				on_line: '',
 				isshow: false,
 				num: -1,
-				ll: 0
+				ll: 0,
+
 			}
 		},
 		onLoad(options) {
@@ -262,10 +264,10 @@
 		},
 		onReachBottom() {
 			// console.log(this.status, '222222222')
-			if (this.status == 'nomore') return;
+		if (this.status == 'nomore') return;
 			this.status = 'loading';
 			this.where.page = ++this.where.page;
-			this.getList(this.mer_id, true);
+			this.getList(this.mer_id, false);
 		},
 
 		methods: {
@@ -342,7 +344,17 @@
 				this.checkboxList1 = item.attrValue
 				this.data.product_id = item.attrValue[0].product_id
 				this.data.unique = item.attrValue[0].unique
-				this.show = true
+				if (item.spec_type == 1) {
+					this.show = true
+				} else {
+					navigateTo(1, '/pages/users/online_warehousing/index', {
+						mer_id: this.mer_id,
+						product_id: this.data.product_id,
+						unique: this.data.unique,
+
+					});
+				}
+
 
 			},
 			//线下
@@ -381,8 +393,8 @@
 					} else {
 						postImport(this.mer_id, this.data).then(res => {
 							this.data.unique = ''
-							this.data.product_id=''
-							this.data.number=1
+							this.data.product_id = ''
+							this.data.number = 1
 							this.loading = false
 							this.loaded = false
 							this.getList(this.mer_id, true);
@@ -391,15 +403,15 @@
 								title: res.message
 							})
 							this.data.unique = ''
-							this.data.product_id=''
-							this.data.number=1
-								
+							this.data.product_id = ''
+							this.data.number = 1
+
 
 						}).catch(err => {
 							this.show = false
 							this.data.unique = ''
-							this.data.product_id=''
-							this.data.number=1
+							this.data.product_id = ''
+							this.data.number = 1
 							this.$util.Tips({
 								title: '请选择规格后再次进行入库'
 							})
@@ -414,12 +426,15 @@
 							title: '请选择规格'
 						})
 					} else {
+
 						navigateTo(1, '/pages/users/online_warehousing/index', {
 							mer_id: this.mer_id,
 							product_id: this.data.product_id,
 							unique: this.data.unique,
 
 						});
+
+
 					}
 
 				}
@@ -474,8 +489,8 @@
 					res => {
 						that.loading = false;
 						that.loaded = res.data.list.length < that.where.limit;
-						// that.productList.push.apply(that.productList, res.data.list);
-						that.productList.push(...res.data.list);
+						that.productList.push.apply(that.productList, res.data.list);
+
 						that.where.page = that.where.page + 1;
 
 					},
@@ -541,6 +556,7 @@
 									title: '下架成功',
 									icon: 'none'
 								})
+								that.getList(this.mer_id,false)
 							} else if (res.cancel) {
 								// console.log('用户点击取消');
 							}
@@ -561,6 +577,7 @@
 						icon: 'success'
 					}, () => {
 						that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
+						that.getList(this.mer_id,false)
 					});
 				}).catch(err => {
 					return that.$util.Tips({
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 17b4b3e..e3442f3 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1,2119 +1,2160 @@
 <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
+		: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>
 </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,
-          }
-        ],
-		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
-      }
-    },
-    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() {
-
-    },
-    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
-			 })
+	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
 		},
-      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
-          // }
-		  if(this.business_status==2){
-			    this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
-		  }else{
-			    this.tabs = this.tabs5  
-		  }
-      
-          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;
-        }
-      },
+		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: '',
+				
+			}
+		},
+		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';
 
-      // 去分类商品页
-      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)
-    }
-  }
+		},
+		onShow() {
+
+		},
+		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();
+
+		},
+		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
+					// }
+
+					if (res.data.business_status == 2) {
+						this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
+					} else {
+						this.tabs = this.tabs5
+					}
+
+					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;
+	}
+
+	.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;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 07ad331..66c4f08 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -1,242 +1,259 @@
 <template>
-	<view v-if="!successful" :style="viewColor">
-		<form report-submit='true'>
-			<view class='merchantsSettled'>
-				<view class="merchantBgCount">
-					<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
-						alt="">
-				</view>
-				<view class="application-record" @click="jumpToList">
-					申请记录
-					<text class="iconfont icon-xiangyou"></text>
-				</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.enterprise_name" @input="validateBtn"
-								placeholder-class='placeholder' />
-						</view>
-					</view>
+	<view class="">
+		<!-- #ifdef MP || APP-PLUS -->
 
+		<view class="conten-top" :style="'height:'+statusBarHeight+'px'">
+			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
+					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
+			<view class=""
+				style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
+				商家入驻
+			</view>
+		</view>
+		<view :style="'height:'+statusBarHeight+'px'"></view>
+		<!-- #endif -->
 
-					<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 v-if="!successful" :style="viewColor">
+			<form report-submit='true'>
+				<view class='merchantsSettled'>
+					<view class="merchantBgCount">
+						<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
+							alt="">
 					</view>
-					<view class="item rel">
-						<view class="acea-row row-middle">
-							<text class="item-name">验证码</text>
-							<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
-								@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
-							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
-								@click="handleVerify">
-								{{ text }}
-							</button>
-						</view>
+					<view class="application-record" @click="jumpToList">
+						申请记录
+						<text class="iconfont icon-xiangyou"></text>
 					</view>
-					<view class="item" v-if="isShowCode">
-						<view class="acea-row row-middle">
-							<text class="item-name">验证码</text>
-							<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
-								@input="validateBtn" placeholder-class='placeholder' />
-							<view class="imageCode" @click="again">
-								<image :src="codeUrl" />
+					<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.enterprise_name" @input="validateBtn"
+									placeholder-class='placeholder' />
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name">商户分类</text>
-									<picker @change="bindPickerChange" :value="index" :range="array"
-										range-key="category_name">
-										<input placeholder="请选择商户分类" type="text" readonly disabled
-											v-model="mer_classification">
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
+
+
+						<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 rel">
+							<view class="acea-row row-middle">
+								<text class="item-name">验证码</text>
+								<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
+									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
+								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+									@click="handleVerify">
+									{{ text }}
+								</button>
+							</view>
+						</view>
+						<view class="item" v-if="isShowCode">
+							<view class="acea-row row-middle">
+								<text class="item-name">验证码</text>
+								<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
+									@input="validateBtn" placeholder-class='placeholder' />
+								<view class="imageCode" @click="again">
+									<image :src="codeUrl" />
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name">店铺类型</text>
-									<text class="iconfont wenhao" @click="getAgreement">?</text>
-									<picker @change="bindPickerChange1" :value="index1" :range="storeTypeArr"
-										range-key="type_name">
-										<input placeholder="请选择店铺类型" type="text" disabled readonly
-											v-model="mer_storeType">
-										<view v-if="mer_storeType" @tap.stop="mer_storeType=''"
-											class="iconfont icon-guanbi2"></view>
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name">商户分类</text>
+										<picker @change="bindPickerChange" :value="index" :range="array"
+											range-key="category_name">
+											<input placeholder="请选择商户分类" type="text" readonly disabled
+												v-model="mer_classification">
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">店铺所在地</text>
-									<picker mode=multiSelector @change="bindPickerChange2" :value="index2"
-										:range="business" range-key="name" @columnchange="pickerColumnchange">
-										<input class="businessBox" placeholder="请选择商圈" type="text" readonly disabled
-											v-model="business_name">
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name">店铺类型</text>
+										<text class="iconfont wenhao" @click="getAgreement">?</text>
+										<picker @change="bindPickerChange1" :value="index1" :range="storeTypeArr"
+											range-key="type_name">
+											<input placeholder="请选择店铺类型" type="text" disabled readonly
+												v-model="mer_storeType">
+											<view v-if="mer_storeType" @tap.stop="mer_storeType=''"
+												class="iconfont icon-guanbi2"></view>
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">详细地址</text>
-									<input type="text" maxlength="30" placeholder="请输入详细地址"
-										v-model="merchantData.address" @input="validateBtn"
-										placeholder-class='placeholder' />
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">店铺所在地</text>
+										<picker mode=multiSelector @change="bindPickerChange2" :value="index2"
+											:range="business" range-key="name" @columnchange="pickerColumnchange">
+											<input class="businessBox" placeholder="请选择商圈" type="text" readonly disabled
+												v-model="business_name">
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">详细地址</text>
+										<input type="text" maxlength="30" placeholder="请输入详细地址"
+											v-model="merchantData.address" @input="validateBtn"
+											placeholder-class='placeholder' />
 
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">公司名称</text>
-									<input type="text" maxlength="30" placeholder="请输入公司名称"
-										v-model="merchantData.company_name" @input="validateBtn"
-										placeholder-class='placeholder' />
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">公司名称</text>
+										<input type="text" maxlength="30" placeholder="请输入公司名称"
+											v-model="merchantData.company_name" @input="validateBtn"
+											placeholder-class='placeholder' />
 
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="acea-row row-middle">
-							<text class="item-name">法人名称</text>
-							<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
-								@input="validateBtn" placeholder-class='placeholder' />
+						<view class="item">
+							<view class="acea-row row-middle">
+								<text class="item-name">法人名称</text>
+								<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
+									@input="validateBtn" placeholder-class='placeholder' />
+							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">社会信用代码</text>
-									<input type="text" maxlength="30" placeholder="请输入社会信用代码"
-										v-model="merchantData.social_credit_code" @input="validateBtn"
-										placeholder-class='placeholder' />
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">社会信用代码</text>
+										<input type="text" maxlength="30" placeholder="请输入社会信用代码"
+											v-model="merchantData.social_credit_code" @input="validateBtn"
+											placeholder-class='placeholder' />
 
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
 
-					<!-- <view class="item">
+						<!-- <view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name">是否农贸市场</text>
 							<u-switch v-model="isnm" @change="change" activeColor="#42CA4C"></u-switch>
 						</view>
 					</view> -->
-					<view class="item no-border">
-						<view class='acea-row row-middle'>
-							<text class="item-title">请上传营业执照及行业相关资质证明图片</text>
-							<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
-							<view class="upload">
-								<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
-									@click="getPhotoClickIdx">
-									<image :src='item'></image>
-									<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
-								</view>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic'
-									v-if="pics.length < 10">
-									<text class='iconfont icon-icon25201'></text>
-									<view>上传图片</view>
+						<view class="item no-border">
+							<view class='acea-row row-middle'>
+								<text class="item-title">请上传营业执照及行业相关资质证明图片</text>
+								<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
+								<view class="upload">
+									<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
+										@click="getPhotoClickIdx">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+									</view>
+									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic'
+										v-if="pics.length < 10">
+										<text class='iconfont icon-icon25201'></text>
+										<view>上传图片</view>
+									</view>
 								</view>
 							</view>
 						</view>
+						<view class="item no-border">
+							<checkbox-group @change='ChangeIsAgree'>
+								<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
+							</checkbox-group>
+							<button class="settleAgree" @click="getConfig">《入驻协议》</button>
+						</view>
+
+						<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
+							提交申请
+						</button>
 					</view>
-					<view class="item no-border">
-						<checkbox-group @change='ChangeIsAgree'>
-							<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
-						</checkbox-group>
-						<button class="settleAgree" @click="getConfig">《入驻协议》</button>
+				</view>
+			</form>
+			<view class="settlementAgreement" v-if="showProtocol">
+				<view class="setAgCount" style="width: 656rpx;height: 458px;">
+					<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
+					<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
+					<view class="content">
+						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
+						<!-- <view v-html="protocol"></view> -->
+					</view>
+				</view>
+			</view>
+			<view class="settlementAgreement" v-if="isshow">
+				<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
+					<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
+					<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
+						@click="recuo">
+						<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
+						<!-- <image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image> -->
 					</view>
 
-					<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
-						提交申请
-					</button>
+					<div class="title">{{detail.title}}</div>
+					<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
+					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
+
+					<view class="contenta">
+						<jyf-parser :html="detail.mer_services_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>
-		</form>
-		<view class="settlementAgreement" v-if="showProtocol">
-			<view class="setAgCount" style="width: 656rpx;height: 458px;">
-				<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
-				<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
-				<view class="content">
-					<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
-					<!-- <view v-html="protocol"></view> -->
-				</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
 			</view>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
+			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+				ref="verify">
+			</Verify>
 		</view>
-		<view class="settlementAgreement" v-if="isshow">
-			<view class="setAgCount" style="width: 100%;height: 100%;">
-				<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
-				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx"
-					@click="recuo">
-					<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
-				</view>
-
-				<div class="title">{{detail.title}}</div>
-				<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
-				<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
-
-				<view class="contenta">
-					<jyf-parser :html="detail.mer_services_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="formSubmit">
-						<text v-if="num>0">请仔细阅读协议{{num}}S</text>
-						<text v-else>同意</text>
-
-					</button>
-				</view>
+		<view class="settledSuccessMain " v-else :style="viewColor">
+			<view class="settledSuccessful">
+				<image class="image" src="../static/images/settledSuccessful.svg" alt="">
+					<view class="title">恭喜，您的资料提交成功！</view>
+					<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
+					<view class="goHome" hover-class="none" @click="goHome">
+						返回首页
+					</view>
 			</view>
 		</view>
-		<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
-			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
-			ref="verify">
-		</Verify>
-	</view>
-	<view class="settledSuccessMain" v-else :style="viewColor">
-		<view class="settledSuccessful">
-			<image class="image" src="../static/images/settledSuccessful.svg" alt="">
-				<view class="title">恭喜，您的资料提交成功！</view>
-				<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
-				<view class="goHome" hover-class="none" @click="goHome">
-					返回首页
-				</view>
-		</view>
 	</view>
 </template>
 <script>
@@ -274,6 +291,9 @@
 	import {
 		configMap
 	} from "@/utils";
+	import {
+		intention,
+	} from "@/api/product"
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import authorize from '@/components/Authorize';
 	import Verify from '@/components/verify/verify.vue';
@@ -354,7 +374,14 @@
 				mer_i_id: null, // 商户申请id
 				isType: false,
 				num: 10,
-				detail: {}
+				detail: {},
+				statusBarHeight: 0,
+				where: {
+					type: 1,
+					page: 1,
+					limit: 10
+				},
+				codenote: []
 			};
 		},
 		beforeDestroy() {
@@ -383,12 +410,25 @@
 			}
 			this.getArea()
 			this.shoplist()
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 		onShow() {
 
 		},
 		onReady() {},
 		methods: {
+			//获取交易信息
+			codelist() {
+				intention(this.where).then(res => {
+					this.codenote = res.data.list
+				})
+			},
+			//退出
+			logout() {
+				uni.switchTab({
+					url: '/pages/user/index'
+				})
+			},
 			//关闭弹窗
 			recuo() {
 				if (this.num > 0) {
@@ -576,13 +616,18 @@
 					street_code: this.street_id
 				}).then((res) => {
 					if (res.code == 0) {
+						this.company = ''
+						this.organization_code = ''
 						this.$util.Tips({
 							title: res.msg
 						});
 						return false;
+					} else {
+						this.company = res.data.title
+						this.organization_code = res.data.organization_code
 					}
-					this.company = res.data.title
-					this.organization_code = res.data.organization_code
+
+
 				}).catch(res => {
 					console.log(res)
 				})
@@ -753,75 +798,144 @@
 			showxy() {
 				this.isshow = true
 			},
-
-			formSubmit: function(e) {
-
-
-
-
+			//提交
+			agree() {
 				let that = this;
-				if (that.validateForm() && that.validate) {
-					if (this.num == 0) {
-						let requestData = {
-							phone: that.merchantData.phone,
-							mer_name: that.merchantData.enterprise_name,
-							name: that.merchantData.user_name,
-							code: that.merchantData.yanzhengma,
-							company_name: that.merchantData.company_name,
-							address: that.merchantData.address,
-							social_credit_code: that.merchantData.social_credit_code,
-							merchant_category_id: that.merchantData.classification,
-							mer_type_id: that.merchantData.mer_type,
-							mer_storeType: this.mer_storeType,
-							area_id: this.area_id,
-							street_id: this.street_id,
-							village_id: this.village_id,
-							is_nmsc: this.isnum,
-							images: that.pics
-						}
-						that.validate = false;
-						if (that.mer_i_id) {
-							updateGoodsRecord(that.mer_i_id, requestData).then(res => {
-								if (res.status == 200) {
-									title: '提交成功',
-									that.loading = true;
-									that.timer = setTimeout(() => {
-										that.successful = true;
-										that.validate = true;
-									}, 1000)
-								}
-							}).catch(res => {
-								this.isshow = false
+				let requestData = {
+					phone: that.merchantData.phone,
+					mer_name: that.merchantData.enterprise_name,
+					name: that.merchantData.user_name,
+					code: that.merchantData.yanzhengma,
+					company_name: that.merchantData.company_name,
+					address: that.merchantData.address,
+					social_credit_code: that.merchantData.social_credit_code,
+					merchant_category_id: that.merchantData.classification,
+					mer_type_id: that.merchantData.mer_type,
+					mer_storeType: this.mer_storeType,
+					area_id: this.area_id,
+					street_id: this.street_id,
+					village_id: this.village_id,
+					is_nmsc: this.isnum,
+					images: that.pics
+				}
+				that.validate = false;
+				if (that.mer_i_id) {
+					updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+						if (res.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							that.timer = setTimeout(() => {
+								that.successful = true;
 								that.validate = true;
-								that.$util.Tips({
-									title: res
-								});
-							})
-						} else {
-							create(requestData).then(data => {
-								if (data.status == 200) {
-									title: '提交成功',
-									that.loading = true;
-									this.timer = setTimeout(() => {
-										that.successful = true;
-										that.validate = true;
-									}, 1000)
-								}
+							}, 1000)
+						}
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				} else {
+					create(requestData).then(data => {
+						if (data.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							this.timer = setTimeout(() => {
+								that.successful = true;
+								that.validate = true;
+							}, 1000)
+						}
 
-							}).catch(res => {
-								that.validate = true;
-								that.$util.Tips({
-									title: res
-								});
-							})
-						}
-					} else {
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				}
+			},
+			formSubmit() {
+				if (this.validateForm() && this.validate) {
+					if (this.codenote.length == 0) {
 						this.isshow = true
 						this.countDown()
+					} else {
+						if (this.codenote[0].status == 0) {
+							uni.showModal({
+								title: '申请正在审核中，请勿重复提交'
+							})
+						} else {
+							this.isshow = true
+							this.countDown()
+						}
 					}
-
 				}
 
+				// let that = this;
+				// if (that.validateForm() && that.validate) {
+				// 	if (this.num == 0) {
+				// 		let requestData = {
+				// 			phone: that.merchantData.phone,
+				// 			mer_name: that.merchantData.enterprise_name,
+				// 			name: that.merchantData.user_name,
+				// 			code: that.merchantData.yanzhengma,
+				// 			company_name: that.merchantData.company_name,
+				// 			address: that.merchantData.address,
+				// 			social_credit_code: that.merchantData.social_credit_code,
+				// 			merchant_category_id: that.merchantData.classification,
+				// 			mer_type_id: that.merchantData.mer_type,
+				// 			mer_storeType: this.mer_storeType,
+				// 			area_id: this.area_id,
+				// 			street_id: this.street_id,
+				// 			village_id: this.village_id,
+				// 			is_nmsc: this.isnum,
+				// 			images: that.pics
+				// 		}
+				// 		that.validate = false;
+				// 		if (that.mer_i_id) {
+				// 			updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+				// 				if (res.status == 200) {
+				// 					title: '提交成功',
+				// 					that.loading = true;
+				// 					that.timer = setTimeout(() => {
+				// 						that.successful = true;
+				// 						that.validate = true;
+				// 					}, 1000)
+				// 				}
+				// 			}).catch(res => {
+				// 				this.isshow = false
+				// 				that.validate = true;
+				// 				that.$util.Tips({
+				// 					title: res
+				// 				});
+				// 			})
+				// 		} else {
+				// 			create(requestData).then(data => {
+				// 				if (data.status == 200) {
+				// 					title: '提交成功',
+				// 					that.loading = true;
+				// 					this.timer = setTimeout(() => {
+				// 						that.successful = true;
+				// 						that.validate = true;
+				// 					}, 1000)
+				// 				}
+
+				// 			}).catch(res => {
+				// 				that.validate = true;
+				// 				that.$util.Tips({
+				// 					title: res
+				// 				});
+				// 			})
+				// 		}
+				// 	} else {
+				// 		this.isshow = true
+				// 		this.countDown()
+				// 	}
+
+				// }
+
 
 
 			},
@@ -930,6 +1044,16 @@
 		color: #fff !important;
 	}
 
+	.conten-top {
+		width: 100%;
+		text-align: center;
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		position: fixed;
+		z-index: 10;
+	}
+
 	.uni-input-placeholder {
 		color: #B2B2B2;
 	}
@@ -960,7 +1084,9 @@
 
 	.merchantsSettled {
 		background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+
 		height: 140vh;
+		position: relative;
 	}
 
 	.merchantsSettled .merchantBg {
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 042c24b..baed312 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -20,7 +20,7 @@
 			<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="place_wrapper flex_a_c" @click="selectLocation">
 						<view class="iconfont icon-weizhi"></view>
 						<view class="town_name">{{street}}</view>
 					</view>
@@ -175,7 +175,7 @@
 	import {
 		getIndexData,
 		getDiy,
-
+		cloudWarehouse
 	} from '@/api/api.js'
 
 	import {
@@ -183,8 +183,7 @@
 	} from '@/api/product.js';
 	import {
 		getGeocoder,
-		merClassifly,
-		getProductHot
+		merClassifly
 	} from '@/api/store.js';
 	import {
 		getArea,
@@ -247,19 +246,17 @@
 				loadTitle: '加载更多',
 			}
 		},
-
 		onPullDownRefresh() {
-			this.list(true);
+			this.list(true, this.street_id);
 			this.Area()
 			uni.stopPullDownRefresh()
 		},
+		onShow() {
+			this.selfLocation()
+		},
 		onLoad() {
-
-			this.list()
-
 			this.Area()
-
-
+			this.selfLocation()
 			// this.openTongZhi()
 			uni.$on('connectstatusChange', (connectstatus) => {
 				var connectstr = ''
@@ -273,15 +270,13 @@
 			})
 
 		},
+		
 		onReachBottom() {
 			if (this.productList.length > 0) {
 				setTimeout(() => {
-					this.list(false);
+					this.list(false, this.street_id);
 				}, 500)
-			} else {
-				this.list()
-			}
-
+			} 
 
 		},
 		beforeDestroy() {
@@ -300,13 +295,12 @@
 				this.street = newValue.split(',')[0]
 				this.town = newValue.split(',')[0]
 				this.street_id = newValue.split(',')[1]
+				
 			});
 
 
 
-			if (this.street.length <= 0) {
-				this.selfLocation()
-			}
+			
 
 		},
 		// #ifdef APP-PLUS
@@ -336,7 +330,6 @@
 			},
 			//获取商品列表
 			list(isPage, id) {
-
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
@@ -345,7 +338,13 @@
 
 				that.loading = true;
 				that.loadTitle = '';
-				getProductHot(that.where.page, that.where.limit).then(res => {
+				cloudWarehouse({
+					page: that.where.page,
+					limit: that.where.limit,
+					street_code: id,
+					category_id: 0
+				}).then(res => {
+					// console.log(222)
 					let list = res.data.list;
 					let productList = that.$util.SplitArray(list, that.productList);
 					let loadend = list.length < that.where.limit;
@@ -400,25 +399,16 @@
 				} else if (scrollTop > 100) {
 					this.backColor = 1
 					this.isFshow = true
-
-
 				}
 
-
 			},
 
-
-
-
-
-
 			getCloudShopMerId(id) {
 				get_cloud_shop(id).then(res => {
 					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
 				})
 			},
 			selectLocation() {
-
 				this.showPicker = true
 			},
 			confirm(e) {
@@ -426,7 +416,8 @@
 				this.street = e.value[1].name
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
-				this.productList = []
+				this.loadend = false;
+				this.$set(this.where, 'page', 1)
 				this.list(true, this.street_id)
 				this.$nextTick(() => {
 					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
@@ -517,7 +508,8 @@
 				this.street = e.value[1].name
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
-				this.productList = []
+				this.loadend = false;
+				this.$set(this.where, 'page', 1)
 				this.list(true, this.street_id)
 			},
 			selfLocation() {
@@ -544,12 +536,13 @@
 							this.town = res.data.address_reference.town.title
 							this.street_id = res.data.address_reference.town.id
 							this.street = res.data.address_component.street
+							this.list(true,this.street_id)
 							this.$nextTick(() => {
 								this.$bus.$emit('value-updated', this.street + ',' + this
 									.street_id);
 
 							})
-							this.list(this.street_id)
+
 						}).catch(err => {
 							this.isshow = false
 							uni.showToast({
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 6603d0e..2344871 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -8,7 +8,7 @@
 					</div>
 				</div>
 				<div class="whiteBg" v-if="formItem === 1">
-					<div class="title acea-row row-center-wrapper">
+					<div class="title acea-row row-center-wrappe">
 						<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
 							@click="navTap(index)" :key="index">
 							{{ item }}
@@ -47,11 +47,13 @@
 									v-model="account" />
 							</div>
 						</div>
+						
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" />
+							
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+									v-model="captcha" maxlength="4" />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -61,8 +63,8 @@
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" />
+								<input type="number" placeholder="填写验证码"  placeholder-class="placeholder" class="codeIput"
+									v-model="codeVal" maxlength="4" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -95,8 +97,9 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<input type="number" placeholder="填写验证码"   maxLength='4'  placeholder-class="placeholder" class="codeIput"
 									v-model="captcha" />
+									
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -110,10 +113,11 @@
 									v-model="password" />
 							</div>
 						</div>
+						
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput"
 									v-model="codeVal" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
@@ -156,16 +160,18 @@
 						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
 							v-model="account"></input>
 					</view>
+					
 					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput"
+						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder' class="codeIput"
 							v-model="captcha"></input>
+							
 						<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 							@click="handleVerify">
 							{{ text }}
 						</button>
 					</view>
 					<view class="item">
-						<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
+						<input type='password' placeholder='填写登录密码'  placeholder-class='placeholder'
 							v-model="password"></input>
 					</view>
 					<view class="protocol acea-row row-between-wrapper">
@@ -892,7 +898,9 @@
 				// #ifdef APP-PLUS
 				jpushModule.initJPushService()
 				jpushModule.getRegistrationID(result => {
+					
 					if (result.registerID) {
+					
 						bindJG({
 							phone: this.account,
 							jg_register_id: result.registerID
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index fae8f15..f5a8ecc 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -150,7 +150,7 @@
 							</view>
 							<view class='discount' v-else>免运费</view>
 						</view>
-						<view class='item acea-row row-between-wrapper'
+					<!-- 	<view class='item acea-row row-between-wrapper'
 							v-if="!seckillId && order_type != 3 && order_type != 4 && item.order.enabledCoupon">
 							<view>店铺优惠券</view>
 							<block v-if="item.coupon.length>0">
@@ -163,14 +163,15 @@
 							<block v-else>
 								<view class='discount'>暂无优惠券</view>
 							</block>
-						</view>
-						<!-- <view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
+						</view> -->
+						<view class='item acea-row row-between-wrapper'>
 							<view>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
 							<view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
 								{{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
 								<text class='iconfont icon-jiantou'></text>
 							</view>
-						</view> -->
+						</view>
+						
 						<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
 							class="item acea-row row-between-wrapper"
 							style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">
@@ -382,6 +383,7 @@
 				</view>
 			</view>
 			<view style='height:140rpx;'></view>
+			
 			<view class='footer acea-row row-between-wrapper'>
 				<view class="footer_count">
 					<view>
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 813fd98..f540c1a 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -250,8 +250,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-								<!-- 	<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 55fe401..0ea1728 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -259,8 +259,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue
index d8df1e0..59c3119 100644
--- a/pages/users/order_list/order.vue
+++ b/pages/users/order_list/order.vue
@@ -247,8 +247,8 @@
 								</view>
 							</view>
 							<view class='bottom acea-row row-right row-middle'>
-								<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-									@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+								<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+									@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 									<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
index 1dcd9a1..e25d0d6 100644
--- a/pages/users/order_list/relase.vue
+++ b/pages/users/order_list/relase.vue
@@ -257,8 +257,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
index c395e4d..1777648 100644
--- a/pages/users/payment/payment.vue
+++ b/pages/users/payment/payment.vue
@@ -172,7 +172,7 @@
 			},
 			getOrderInfo() {
 				groupOrderDetail(this.order_id, this.product_type).then(res => {
-					console.log(res)
+
 					this.couponData = res.data
 					this.$nextTick(() => {
 						if (this.couponData.interest !== null) {
@@ -189,6 +189,7 @@
 							pay_type: this.payType
 						}
 					).then(res => {
+
 						if (res.data.paid === false) {
 							//拉起微信支付
 
@@ -204,7 +205,7 @@
 							}, 1000)
 						}
 					}).catch(err => {
-						
+
 						uni.showToast({
 							title: err.message
 						})
@@ -213,7 +214,10 @@
 					orderPay(this.order_id, {
 						type: this.payType
 					}).then(res => {
+
+
 						let jsConfig = res.data.result.config
+
 						if (res.data.status === 'weixinApp') {
 							//拉起微信支付
 							// #ifdef APP-PLUS
@@ -257,15 +261,35 @@
 							});
 							// #endif
 
+						} else {
+							if (res.status == 200) {
+							
+								// uni.navigateBack({
+								// 	delta: 1
+								// })
+								
+								uni.showToast({
+									icon: 'none',
+									title: res.message
+								})
+								setTimeout(() => {
+									uni.navigateTo({
+										url:'/pages/users/order_list/index?status=2'
+									})
+								}, 1000)
+							}
+
 						}
+
 						// setTimeout(() => {
 						// 	uni.navigateBack({
 						// 		delta: 1
 						// 	})
 						// }, 1000)
-						uni.showToast({
-							title: res.message
-						})
+						// uni.showToast({
+						// 	icon:'none' ,
+						// 	title: res.message
+						// })
 					})
 				}
 
diff --git a/utils/uniMP.js b/utils/uniMP.js
index 666b87f..ed86f2a 100644
--- a/utils/uniMP.js
+++ b/utils/uniMP.js
@@ -1,5 +1,6 @@
 import {
-	getGXconfig
+	getGXconfig,
+	miniapp
 } from "@/api/uniMP.js";
 import {
 	HTTP_REQUEST_URL
@@ -66,11 +67,73 @@ const loadMP = async (id) => {
 					console.log('初始化完成', wgtFile);
 					installMP();
 				},
-        fail(res) {
-          clearInterval(timer);
-          timer = null;
-          uni.hideLoading();
-        }
+				fail(res) {
+					clearInterval(timer);
+					timer = null;
+					uni.hideLoading();
+				}
+			});
+			downloadTask.onProgressUpdate((res) => {
+				// console.log('初始化进度' + res.progress);
+				if (res.progress > count) count += 10;
+				if (count >= 90) {
+					clearInterval(timer);
+					timer = null;
+				}
+			});
+		} else {
+			open()
+		}
+	});
+};
+
+//加载商城小程序
+const loadMPx = async (id) => {
+	
+	appid = id;
+	let info = await miniapp();
+	console.log('最新版本', info.data);
+	console.log(mp, uni);
+	// return ;
+	uni.showLoading({
+		title: '初始化中...',
+		mask: true
+	})
+	mp.getUniMPVersion(id, (ret) => {
+		console.log('当前版本', ret);
+		let flag;
+		if (HTTP_REQUEST_URL == 'https://shop.lihaink.cn') {
+			flag = false
+		} else {
+			flag = true
+		}
+		if (0 != ret.code || compareVersions(info.data.appInfo.version, ret.versionInfo.name) == 1 ||
+			flag ==
+			true) {
+			let count = 0;
+			timer = setInterval(() => {
+				if (count < 100) uni.showLoading({
+					title: `初始化中... ${count}%`,
+					mask: true
+				})
+				else uni.showLoading({
+					title: '初始化中...100%',
+					mask: true
+				})
+			}, 600)
+
+			let downloadTask = uni.downloadFile({
+				url: info.data.appInfo.dow_url,
+				success(res) {
+					wgtFile = res.tempFilePath;
+					console.log('初始化完成', wgtFile);
+					installMP();
+				},
+				fail(res) {
+					clearInterval(timer);
+					timer = null;
+					uni.hideLoading();
+				}
 			});
 			downloadTask.onProgressUpdate((res) => {
 				// console.log('初始化进度' + res.progress);
@@ -89,17 +152,68 @@ const loadMP = async (id) => {
 // 按URL加载小程序
 const loadMPurl = async (e) => {
 	appid = e.id;
-	mp.getUniMPVersion(appid, (ret) => {
-		console.log('当前版本', ret);
-    wgtFile = e.url;
-    doInstallMP();
-		// if (0 != ret.code) {
-  //     wgtFile = e.url;
-		// 	installMP();
-		// } else {
-		// 	open()
-		// }
-	});
+  let FURL = e.url;
+	uni.showLoading({
+		title: '初始化中...',
+		mask: true
+	})
+  uni.request({
+    url: FURL,
+    method: 'GET',
+    success: (fileInfo) => {
+      mp.getUniMPVersion(appid, (ret) => {
+      	console.log('当前版本', ret);
+      	let flag;
+      	if (HTTP_REQUEST_URL == 'https://shop.lihaink.cn') {
+      		flag = false
+      	} else {
+      		flag = true
+      	}
+      	if (0 != ret.code || compareVersions(fileInfo.data?.data?.version, ret.versionInfo.name) == 1 || flag ==
+      		true) {
+      		let count = 0;
+      		timer = setInterval(() => {
+      			if (count < 100) uni.showLoading({
+      				title: `初始化中... ${count}%`,
+      				mask: true
+      			})
+      			else uni.showLoading({
+      				title: '初始化中...100%',
+      				mask: true
+      			})
+      		}, 600)
+      		let downloadTask = uni.downloadFile({
+      			url: fileInfo.data?.data?.down_url,
+      			success(res) {
+      				wgtFile = res.tempFilePath;
+      				console.log('初始化完成', wgtFile);
+      				installMP();
+      			},
+      		  fail(res) {
+      		    clearInterval(timer);
+      		    timer = null;
+      		    uni.hideLoading();
+      		  }
+      		});
+      		downloadTask.onProgressUpdate((res) => {
+      			// console.log('初始化进度' + res.progress);
+      			if (res.progress > count) count += 10;
+      			if (count >= 90) {
+      				clearInterval(timer);
+      				timer = null;
+      			}
+      		});
+      	} else {
+      		open()
+      	}
+      });
+      
+    },
+    fail:(err)=> {
+      console.log('错误:', err);
+    }
+  })
+	
 };
 
 // 小程序版本信息
@@ -127,8 +241,8 @@ const doInstallMP = () => {
 			open();
 		} else {
 			uni.hideLoading();
-      clearInterval(timer);
-      timer = null;
+			clearInterval(timer);
+			timer = null;
 			uni.showModal({
 				title: '初始化失败',
 				content: JSON.stringify(r),
@@ -145,13 +259,13 @@ const open = (id = null) => {
 		icon: 'none',
 		title: '请先登录'
 	})
-  let avatar = store?.state?.userInfo?.avatar;
+	let avatar = store?.state?.userInfo?.avatar;
 	mp.openUniMP({
 		appid: id || appid,
 		extraData: {
 			uniMP: true,
 			token: token,
-      avatar: avatar,
+			avatar: avatar,
 		}
 	}, (ret) => {
 		uni.hideLoading();
@@ -168,7 +282,8 @@ const open = (id = null) => {
 
 export default {
 	loadMP,
-  loadMPurl,
+	loadMPurl,
+	loadMPx,
 	installMP,
 	doInstallMP,
 	getVersion,