diff --git a/App.vue b/App.vue
index 08adb30..a1c0a0f 100644
--- a/App.vue
+++ b/App.vue
@@ -16,13 +16,11 @@
 		checkLogin
 	} from "./libs/login";
 	import {
-
 		getUserInfo
-
 	} from '@/api/user.js';
-  import {
-    parseToken
-  } from "@/api/appLet.js";
+	import {
+		parseToken
+	} from "@/api/appLet.js";
 	import {
 		HTTP_REQUEST_URL
 	} from './config/app';
@@ -32,7 +30,9 @@
 		history
 	} from '@/api/public.js'
 	import Routine from './libs/routine.js';
-  import { Toast } from "./libs/uniApi";
+	import {
+		Toast
+	} from "./libs/uniApi";
 
 	export default {
 		data() {
@@ -97,47 +97,47 @@
 				key: 'launchFlag'
 			})
 
-      // 用于调试中台登录
-      // parseToken({
-      //   token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNjIwMjUxLCJuYmYiOjE3MDA2MjAyNTEsImV4cCI6MTcwMTIyNTA1MSwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.sTWAHCScRY9FExwJw1MReHTnRBcK7tYu1AMSia_Sm4M'
-      // }).then((res)=>{
-      //   this.$store.commit("LOGIN", {
-      //   	'token': res.data.token,
-      //   	'time': 604800
-      //   });
-      //   this.$isResolve()
-      // }).catch((err)=>{
-      //   if(err=='签名错误'){
-      //     this.$store.commit("LOGIN", {
-      //     	'token': option.referrerInfo?.extraData?.uniMP,
-      //     	'time': 604800
-      //     });
-      //   }else {
-      //     Toast(err);
-      //   }
-      //   this.$isResolve()
-      // })
+			// 用于调试中台登录
+			// parseToken({
+			//   token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNjIwMjUxLCJuYmYiOjE3MDA2MjAyNTEsImV4cCI6MTcwMTIyNTA1MSwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.sTWAHCScRY9FExwJw1MReHTnRBcK7tYu1AMSia_Sm4M'
+			// }).then((res)=>{
+			//   this.$store.commit("LOGIN", {
+			//   	'token': res.data.token,
+			//   	'time': 604800
+			//   });
+			//   this.$isResolve()
+			// }).catch((err)=>{
+			//   if(err=='签名错误'){
+			//     this.$store.commit("LOGIN", {
+			//     	'token': option.referrerInfo?.extraData?.uniMP,
+			//     	'time': 604800
+			//     });
+			//   }else {
+			//     Toast(err);
+			//   }
+			//   this.$isResolve()
+			// })
 
 			if (option?.referrerInfo?.extraData?.uniMP) {
 				uni.setStorageSync('uniMP', option.referrerInfo?.extraData?.uniMP);
-        parseToken({
-          token: option.referrerInfo?.extraData?.token
-        }).then((res)=>{
-          this.$store.commit("LOGIN", {
-          	'token': res.data.token,
-          	'time': 604800
-          });
-          this.$isResolve()
-        }).catch((err)=>{
-          this.$store.commit("LOGIN", {
-          	'token': option.referrerInfo?.extraData?.token,
-          	'time': 604800
-          });
-          this.$isResolve()
-        })
-			}else {
-        this.$isResolve()
-      }
+				parseToken({
+					token: option.referrerInfo?.extraData?.token
+				}).then((res) => {
+					this.$store.commit("LOGIN", {
+						'token': res.data.token,
+						'time': 604800
+					});
+					this.$isResolve()
+				}).catch((err) => {
+					this.$store.commit("LOGIN", {
+						'token': option.referrerInfo?.extraData?.token,
+						'time': 604800
+					});
+					this.$isResolve()
+				})
+			} else {
+				this.$isResolve()
+			}
 			// #ifdef APP-PLUS
 
 			// #endif
@@ -431,6 +431,12 @@
 		box-sizing: border-box;
 	}
 
+	.c_active {
+		&:active {
+			opacity: .8;
+		}
+	}
+
 	.custom_style {
 		color: #fff;
 		display: flex;
diff --git a/api/store.js b/api/store.js
index fbd93b6..26166b4 100644
--- a/api/store.js
+++ b/api/store.js
@@ -1,5 +1,16 @@
 import request from "@/utils/request.js";
 
+/**
+ * 获取商铺云商品列表
+ * @param {Object} id 商铺 id
+ * @param {Object} data 商铺商品列表数据
+ */
+export function getStoreCloudGoods(id, data) {
+	return request.get("product/spu/merchant/" + id + "/merCloudProduct", data, {
+		noAuth: true
+	});
+}
+
 /**
  * 扫码查询商品
  * 
@@ -595,8 +606,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/user.js b/api/user.js
index 6d01c74..229ca81 100644
--- a/api/user.js
+++ b/api/user.js
@@ -12,6 +12,14 @@ import request1 from "@/utils/requestb.js";
 import Cache from '@/utils/cache'
 
 
+/**
+ * 报错信息记录
+ */
+export function errorReport(data) {
+	return request.post(`api/err/report`, data);
+}
+
+
 /**
  * 提现----查询单条信息
  */
diff --git a/pages.json b/pages.json
index c0d67be..5365cdc 100644
--- a/pages.json
+++ b/pages.json
@@ -78,6 +78,12 @@
 					"scrollIndicator": false //禁用原生导航栏
 				}
 			}
+		}, {
+			"path": "pages/index/unregist",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
 		},
 		{
 			"path": "pages/nongKe/supply_chain/shopping_trolley",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5606db9..f6db902 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -901,7 +901,20 @@
 			handleToWithDraw(item, index) {
 				if (index == 4) return;
 				let url;
-				if (index == 0) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
+				if (index == 0) {
+					progressBankList(this.userInfoData.service.mer_id).then(res => {
+						const data = res.data.list || [];
+						if ((data.length == 1 && data[0].is_check === 0) || (data.length == 2 && data[
+								0].is_check === 0 && data[1].is_check === 0)) {
+							url = '/pages/withdrawal/progress?mer_id=' + this.userInfoData.service.mer_id
+						} else {
+							url = '/pages/withdrawal/index?mer_id=' + this.userInfoData.service.mer_id
+						}
+						return uni.navigateTo({
+							url: url
+						})
+					})
+				}
 				if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=`;
 				if (index == 3) url = "/pages/activeCode/subsidy";
 
@@ -1333,17 +1346,21 @@
 						this.isgShow = true
 					}
 					if (res.data.mer_info.length == 0) {
-						uni.showModal({
-							title: '暂未开通商户',
-							complete(res) {
-								// #ifdef APP-PLUS
-								uni.sendHostEvent('closeApp', (ret) => {
-									//发送消息成功回调
-									console.log('关闭应用' + JSON.stringify(ret));
-								});
-								// #endif
-							}
+						//未开通商户 提示
+						uni.reLaunch({
+							url: "/pages/index/unregist"
 						})
+						// uni.showModal({
+						// 	title: '暂未开通商户',
+						// 	complete(res) {
+						// 		// #ifdef APP-PLUS
+						// 		uni.sendHostEvent('closeApp', (ret) => {
+						// 			//发送消息成功回调
+						// 			console.log('关闭应用' + JSON.stringify(ret));
+						// 		});
+						// 		// #endif
+						// 	}
+						// })
 					} else {
 						this.getindex()
 						this.getGoods(true)
@@ -1482,9 +1499,6 @@
 								// 是否有一个银行卡在申请 或者两个银行卡在申请
 								progressBankList(this.userInfoData.service.mer_id).then(res => {
 									const data = res.data.list || [];
-
-									console.log(data.length == 1 && data[0].is_check === 0)
-
 									if ((data.length == 1 && data[0].is_check === 0) || (data.length == 2 && data[
 											0].is_check === 0 && data[1].is_check === 0)) {
 										uni.navigateTo({
diff --git a/pages/index/unregist.vue b/pages/index/unregist.vue
new file mode 100644
index 0000000..2864be0
--- /dev/null
+++ b/pages/index/unregist.vue
@@ -0,0 +1,106 @@
+<!-- 未开通商户 -->
+<template>
+	<view class="unregist">
+		<view class="head">
+			<image src="@/static/images/f.png"></image>
+			<text>暂无信息</text>
+		</view>
+
+		<view class="con">
+			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e70e7202404021040448288.png"></image>
+			<text class="empty">暂无数据</text>
+			<text class="no_shop">您还没有开通商户</text>
+		</view>
+
+		<view class="btn c_active" @click="handleOpen">
+			<text>点击开通</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		methods: {
+			handleOpen() {
+				// #ifdef APP-PLUS
+				uni.sendHostEvent('closeAppToOpenShop', (ret) => {
+					//发送消息成功回调
+					console.log('关闭应用' + JSON.stringify(ret));
+				});
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.unregist {
+		.head {
+			display: flex;
+			align-items: center;
+			width: 100%;
+			height: 360rpx;
+			background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a2e04202404021019436262.webp);
+			background-size: cover;
+			background-repeat: no-repeat;
+			background-position: center;
+			margin-bottom: 200rpx;
+
+			image {
+				width: 112rpx;
+				height: 112rpx;
+				border-radius: 50%;
+				margin: 0 12rpx 0 60rpx;
+			}
+
+			text {
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+		}
+
+		.con {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+
+			image {
+				width: 512rpx;
+				height: 334rpx;
+				margin: 0 auto;
+			}
+
+			.empty {
+				margin-bottom: 16rpx;
+				font-size: 34rpx;
+				color: #000000;
+			}
+
+			.no_shop {
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 0rpx;
+			}
+		}
+
+		.btn {
+			position: fixed;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 80rpx;
+			width: 650rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			background: linear-gradient(359deg, #72BE53 0%, #46B03A 100%);
+			border-radius: 88rpx;
+			text-align: center;
+
+			text {
+				font-weight: 600;
+				font-size: 30rpx;
+				color: #F5F5F5;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue
index b6c7c88..6b9a747 100644
--- a/pages/product/shop_type_change/index.vue
+++ b/pages/product/shop_type_change/index.vue
@@ -18,18 +18,26 @@
 		<view class="shop-type-con">
 			<view class="shop-type-con-title">点击选择变更的商户类型</view>
 			<view class="pifa" @click="handleChoose(1)">
+				<view class="pifa-title">
+					<view class="main-title">升级为批发商户</view>
+					<view class="sub-title">备注:批发商户仅能销售批发价产品，产品仅展示在批发-供销云市场批发类目</view>
+				</view>
 				<image v-if="selected == '' || selected == 2"
-					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b0811202403191613185951.webp" mode="">
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8a38202404011735139115.webp" mode="">
 				</image>
 				<image v-if="selected == 1"
-					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d7d97202403191611433157.webp" mode=""></image>
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/145e2202404011734207958.webp" mode=""></image>
 			</view>
 			<view class="pifalingshou" @click="handleChoose(2)">
+				<view class="pifa-title">
+					<view class="main-title">升级为批发/零售商户</view>
+					<view class="sub-title">备注:批发/零售商户可以进行批发与零售交易，产品可在供销云市场全面展示</view>
+				</view>
 				<image v-if="selected == '' || selected == 1"
-					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39776202403191612456811.webp" mode="">
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a9447202404011734582066.webp" mode="">
 				</image>
 				<image v-if="selected == 2"
-					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/40592202403191613498205.webp" mode=""></image>
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/19c0b202404011735289980.webp" mode=""></image>
 			</view>
 		</view>
 
@@ -52,12 +60,10 @@
 		},
 
 		onLoad(opt) {
-			if (opt.mer_id)
-				this.mer_id = opt.mer_id;
+			if (opt.mer_id) this.mer_id = opt.mer_id;
 		},
 
 		methods: {
-
 			handleToRecord() {
 				uni.navigateTo({
 					url: "/pages/product/shop_type_change/list?mer_id=" + this.mer_id,
@@ -173,20 +179,43 @@
 				display: flex;
 				justify-content: center;
 				margin-bottom: 30rpx;
+				position: relative;
 
 				image {
 					width: 690rpx;
-					height: 178rpx;
+					height: 200rpx;
 				}
 			}
 
 			.pifalingshou {
+				position: relative;
 				display: flex;
 				justify-content: center;
 
 				image {
 					width: 690rpx;
-					height: 178rpx;
+					height: 200rpx;
+				}
+			}
+
+			.pifa-title {
+				position: absolute;
+				z-index: 10;
+				padding-top: 36rpx;
+				margin-left: 202rpx;
+				width: 464rpx;
+
+				.main-title {
+					margin-bottom: 14rpx;
+					font-weight: 600;
+					font-size: 30rpx;
+					color: #333333;
+				}
+
+				.sub-title {
+					font-size: 24rpx;
+					color: #555555;
+					line-height: 45rpx;
 				}
 			}
 		}
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index d09d034..3fcae29 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1,243 +1,102 @@
 <template>
-	<view>
-		<view class="content-top">
-			<view
-				:style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
-				class="store-home">
-			</view>
-			<!-- 搜索 -->
-			<!-- #ifdef MP || APP-PLUS -->
-			<view :style="{ height: statusBarHeight }"></view>
-			<view class="header">
-				<view class="head-menu" style="width: 30rpx;background-color: transparent;">
-					<view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
+	<view class="store-home">
+		<view class="header">
+			<view style="height: var(--status-bar-height);"></view>
 
-				</view>
-				<navigator style="width:403rpx ;margin-right: 56rpx;" :url="'/pages/store/list/index?mer_id='+id"
-					hover-class="none" class="search"><text class="iconfont icon-xiazai5"></text>搜索商品</navigator>
-				<retuntop />
-			</view>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<view class="header">
-				<view class="head-menu">
-					<view class="iconfont icon-xiangzuo" @click="goback"></view>
-					<view class="iconfont icon-shouye4" @click="goHome"></view>
-				</view>
-				<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text
-						class="iconfont icon-xiazai5"></text>搜索商品</navigator>
-			</view>
-			<!-- #endif -->
-			<!-- 店铺信息 -->
-			<view id="store" class="store">
-				<image class="store-image" :src="store.mer_avatar"></image>
-				<view class="text">
-					<view class="" style="display: flex;justify-content: space-between;">
-						<view class="" style="display: flex;">
-							<navigator :url="`/pages/store/detail/index?id=${id}`" hover-class="none">
-								<text class="name">{{ store.mer_name }}</text>
-								<image v-if="margin_ico_switch==1 && margin_ico && store.is_margin == 10"
-									:src="margin_ico" class="store-margin"></image>
-								<text class="iconfont icon-xiangyou"></text>
-							</navigator>
-							<!-- #ifdef H5 -->
-							<view v-if="store.services_type == 1" class="kefu">
-								<a :href="'tel:'+store.service_phone" style="color: #fff; text-decoration: none;"
-									class="iconfont icon-kefu3"></a>
-							</view>
-							<!-- #endif -->
-							<!-- #ifndef H5 -->
-							<view v-if="store.services_type == 1" class="kefu" @click="call">
-								<text class="iconfont icon-kefu3"></text>
-							</view>
-							<!-- #endif -->
-							<view v-else class="kefu" @click="goService">
-								<text class="iconfont icon-kefu3"></text>
-							</view>
-						</view>
-						<view class="">
-							<view class="carebtn" v-if="!isLogin" @click="authOpen">
-								<image src="@/static/images/gz.png" v-if=" store.care" mode="aspectFit"></image>
-								<image src="@/static/images/gz1.png" v-else mode="aspectFit"></image>
-							</view>
-
-							<view class="carebtn" @click="followToggle" v-else>
-								<image src="@/static/images/gz.png" v-if=" store.care" mode="aspectFit"></image>
-								<image src="@/static/images/gz1.png" v-else mode="aspectFit"></image>
-							</view>
-
-						</view>
-					</view>
-					<view class="store-dp">
-						<view v-if="store.type_name" class="font-bg-reda" style='margin-top: 15rpx;'>{{store.type_name}}
-						</view>
-						<view v-else-if="store.is_trader" class="font-bg-red" style='margin-top: 15rpx;'>自营</view>
-						<view class="score">
-							<view class="score-title">店铺评分</view>
-							<view class="star">
-								<view
-									:style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
-								</view>
-							</view>
-							<!-- <view>{{ score.number.toFixed(1) }}</view> -->
-						</view>
-						<view class="store-dp-t">
-							{{ care_conut < 10000 ? care_conut : (care_conut / 10000).toFixed(2) + '万' }}人关注
-						</view>
-
-					</view>
-
-				</view>
-
-
-				<!-- <button hover-class="none" :class="store.care ? 'care' : ''" v-if="!isLogin" @click="authOpen">
-					<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
-					{{ store.care ? '已关注' : '关注' }}
-
-				</button> -->
-				<!-- <button v-else hover-class="none" :class="store.care ? 'care' : ''" @click="followToggle"
-					style="background-color: red;">
-					<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
-					{{ store.care ? '已关注' : '关注' }}
-				</button> -->
-
-			</view>
-			<view v-show="!navShow && tabActive === 3 || tabActive === 7" class="nav">
-				<view class="nav-cont1">
-					<view class="nav-cont1-item">
-						<view :class="{ active: navActive === 0 }" class="item"
-							@click="navActive = 0;select.show = !select.show">
-							<view class="cont">
-								{{ select.selected ? '评分' : '默认' }}
-								<text
-									:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
-							</view>
-						</view>
-						<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
-							<view class="cont">
-								销量
-							</view>
-						</view>
-						<view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
-							<view class="cont">
-								价格
-								<image v-if="navActive === 2 && where.order == 'price_asc'"
-									:src="domain+'/static/diy/up'+keyColor+'.png'"></image>
-								<image v-if="navActive === 2 && where.order == 'price_desc'"
-									:src="domain+'/static/diy/down'+keyColor+'.png'"></image>
-							</view>
-						</view>
-
-					</view>
-
-					<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
-						<view class="cont">
-
-							<view class="dp-img">
-
-								<image src="@/static/images/dp1.png" v-if="isColumn " mode="aspectFit"></image>
-								<image src="@/static/images/dp2.png" v-else mode="aspectFit"></image>
-							</view>
-							<!-- <text
-								:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text> -->
-						</view>
-					</view>
-				</view>
-				<view v-show="select.show && !navShow" class="select">
-					<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }"
-						class="item" @click="set_where(item.id,0)">{{ item.name }}
-						<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-					</view>
-				</view>
-			</view>
-			<!--diy导航-->
-			<view v-show="!navShow && tabActive === 1" class="nav">
-				<view class="nav-cont">
-					<view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
-						<view class="cont">精选</view>
-					</view>
-					<view :class="{ active: diyActive == 1 }" class="item" @click="set_where(4,1)">
-						<view class="cont">新品</view>
-					</view>
-					<view :class="{ active: diyActive == 2 }" class="item" @click="set_where(5,2)">
-						<view class="cont">活动</view>
-					</view>
-					<view :class="{ active: diyActive == 3 }" class="item" @click="getCoupon">
-						<view class="cont">领券</view>
-					</view>
-				</view>
-				<view v-show="select.show && !navShow" class="select">
-					<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }"
-						class="item" @click="set_where(item.id)">{{ item.name }}
-						<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-					</view>
-				</view>
+			<view class="head-menu">
+				<view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
+				<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none"
+					class="search iconfont icon-xiangyou">
+					<text class="iconfont icon-sousuo"></text>
+					<text class="search-txt">搜索商品名称</text>
+					<text class="search-btn">搜索</text>
+				</navigator>
 			</view>
 
+			<view class="shop">
+				<!-- <view class="shop-img">
+					<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar"
+						radius="10">
+						<template v-slot:loading>
+							<u-loading-icon color="#999"></u-loading-icon>
+						</template>
+					</u-image>
+				</view> -->
 
-		</view>
+				<view class="shop-info">
+					<view class="shop-info-title" @click="navTo('/pages/store/detail/index?id='+id)">
+						<text>{{store.mer_name}}</text>
+						<u-icon name="arrow-right" color="#fff"></u-icon>
+					</view>
+					<view class="shop-info-eva">
+						<view class="star">
+							<u-rate readonly count="5" :value="score.star" size="12" activeColor="#FFBC21"
+								inactiveColor="transparent"></u-rate>
+							<text
+								style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
+						</view>
+						<view class="shop-info-sale">月销{{store.sales}}+</view>
+						<view v-if="store.services_type == 0" class="iconfont icon-kefu3" @click="goService"></view>
+						<view v-else-if="store.services_type == 1" class="iconfont icon-kefu3" @click="call(1)"></view>
+						<view v-else class="iconfont icon-kefu3" @click="call(0)"> </view>
+					</view>
+					<view class="shop-info-runtime" v-if="store.mer_info&&store.mer_info.mer_take_time">营业时间 :
+						{{ store.mer_info.mer_take_time[0] + ' - ' + store.mer_info.mer_take_time[1] }}
+					</view>
+					<view class="shop-info-runtime" v-else>营业时间 : {{ '00:00 - 00:00' }}</view>
+					<view class="shop-info-addr iconfont iconfont-xiangyou" @click="showMaoLocation">
+						<text>{{store.mer_address}}</text>
+						<u-icon name="arrow-right" :size="12" color="#fff"></u-icon>
+					</view>
+				</view>
 
-		<view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
-			<view class="nav-cont">
-				<view :class="{ active: navActive === 0 }" class="item"
-					@click="navActive = 0;select.show = !select.show">
-					<view class="cont">
-						{{ select.selected ? '评分' : '默认' }}
-						<text
-							:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
-					</view>
-				</view>
-				<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
-					<view class="cont">销量</view>
-				</view>
-				<view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
-					<view class="cont">
-						价格
-						<image
-							:src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
-						</image>
-					</view>
-				</view>
-				<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
-					<view class="cont">
-						<text
-							:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
-					</view>
-				</view>
-			</view>
-			<view v-show="select.show && navShow" class="select">
-				<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }"
-					class="item" @click="set_where(item.id,0)">
-					{{ item.name }}
-					<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
+				<view class="shop-logo">
+					<u-image width="192rpx" height="192rpx" :lazyLoad="true" :fade="true"
+						src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/6e86c202403131641068012.webp">
+						<template v-slot:loading>
+							<u-loading-icon color="#999"></u-loading-icon>
+						</template>
+					</u-image>
 				</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>
+
+		<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
+			<view v-show="!navShow && (tabActive === 3 || tabActive === 7)" class="nav">
+				<view class="nav-cont" :class="{noPointer : preview}" id="nav-cont">
+					<view :class="{ active: navActive === 0 }" class="item" @click="set_where(0,0)">
+						<view class="cont">默认商品</view>
+					</view>
+
+					<view :class="{ active: navActive === 1 }" class="item" @click="set_where(1,0)">
+						<view class="cont">销量</view>
+					</view>
+
+					<view :class="{ active: navActive === 2 }" class="item" @click="set_where(2,0)">
+						<view class="cont"> 价格
+							<image
+								:src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
+							</image>
+						</view>
+					</view>
+					<view :class="{ active: navActive === 3 }" class="item" @click="set_where(3,0)">
+						<view class="cont">评分</view>
+					</view>
 				</view>
+
+				<block v-if="tabActive != 7">
+					<view class="guanzhu" :class="{'guanzhu-active':store.care}" v-if="!isLogin" @click="authOpen">
+						{{ store.care ? '已关注' : '关注' }}
+					</view>
+					<view v-else class="guanzhu" :class="{'guanzhu-active':store.care}" @click="followToggle">
+						{{ store.care ? '已关注' : '关注' }}
+					</view>
+				</block>
 			</view>
-		</view>
-		<scroll-view @refresherrefresh="onRefresh" refresher-enabled="true" :refresher-triggered="isTriggered"
-			class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
 
-
-			<view class="tab-cont" :style="viewColor">
-				<!-- diy组件 -->
-				<!-- <view v-show="diyActive == 0 && tabActive == 1"> -->
-				<view v-show="false">
+			<view class="tab-cont" :style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx)'}"
+				:class="{noPointer : preview}">
+				<view v-show="diyActive == 0 && tabActive == 1">
 					<!-- #ifdef H5 -->
 					<view v-for="(item, index) in styleConfig" :key="index">
 						<block v-if="item.name != 'headerSerch' && item.name != 'tabNav'">
@@ -276,45 +135,57 @@
 					</block>
 					<!-- #endif -->
 				</view>
-				<!-- 首页 -->
-				<view v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5">
-					<!-- 商品 -->
 
+				<!-- 首页 -->
+				<view
+					v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
+					<!-- 商品 -->
 					<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 class="image" style="width: 180rpx;height: 180rpx;">
+									<image style="width: 100%;height: 100%;" :src="item.image" lazy-load></image>
 									<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">
+									<view class="name line1">
 										<text class="name_text line1">{{ item.store_name }}</text>
+										<text class="sale_num">已销 {{item.sales}}{{item.sales>0?'+':''}}</text>
 									</view>
-									<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
-									<view class="item_bot">
-										<view class="money-wrap">
-											<view class=""
-												style="width: 500rpx;display: flex;justify-content: space-between;">
-												<view class="money">
 
-													¥<text>{{ item.price }}</text>
-												</view>
-												<view class="items-img" style='width: 58rpx;height: 58rpx;'>
-													<image src="@/static/images/LHYC/J.png" mode="aspectFit"
-														style='width: 44rpx;height: 44rpx;'></image>
-												</view>
+									<!-- 标签 -->
+									<view class="tag" v-if="item.mer_label_name && item.mer_label_name.length > 0">
+										<view class="tag-item" v-for="(ii,indx) in item.mer_label_name">{{ii}}</view>
+									</view>
+
+									<!-- 规格产地 -->
+									<view class="shop-detail" v-if="item.store_info">
+										{{item.store_info}}
+									</view>
+
+									<view class="price">
+										<view class="price-num">
+											<text class="unit-price">¥{{ item.price }}</text><text
+												class="unit-name">/份</text>
+										</view>
+										<view class="price-icon iconfont icon-gouwuche"></view>
+									</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>
+													<image class="image" :src="`${domain}/static/images/svip.png`">
+													</image>
 												</view>
 											</view>
 										</view>
@@ -326,28 +197,29 @@
 											<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
 											<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 										</view>
-
-									</view>
+										<view 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)"
+								<!-- <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>
 						<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 v-if="goodsLoading" 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 v-show="tabActive === 2">
+				<view v-show="tabActive == 2">
 					<view class="category">
 						<view class="section">
 							<view class="head" @click="goCategoryGoods('')">
@@ -371,8 +243,10 @@
 						{{loadTitle}}
 					</view>
 				</view>
-				<!--生活服务-->
-				<view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
+
+
+				<!--生活服务 优惠券-->
+				<!-- <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)">
@@ -389,11 +263,12 @@
 											¥
 											<text>{{ item.price }}</text>
 										</view>
-										<view v-if="item.show_svip_info.show_svip_price && item.svip_price"
+										<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>
+												<image class="image" :src="`${domain}/static/images/svip.png`"></image>
 											</view>
 										</view>
 									</view>
@@ -420,7 +295,7 @@
 					</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">
@@ -440,7 +315,7 @@
 								<view>满{{ item.use_min_price }}元可用</view>
 							</view>
 							<view class="right">
-								<view class="name">
+								<view class="name line1">
 									<text :class="{gary:item.issue}">{{item.type===0?'店铺券':'商品券'}}</text>
 									{{ item.title }}
 								</view>
@@ -464,9 +339,10 @@
 						</view>
 					</view>
 					<emptyPage v-if="coupon.length == 0" title="暂无优惠券~"></emptyPage>
-				</view>
+				</view> -->
+
 				<!--活动专场-->
-				<view v-show="tabActive === 4">
+				<!-- <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'
@@ -483,32 +359,42 @@
 							<view class="txt">暂无活动专场哦~</view>
 						</view>
 					</block>
-				</view>
+				</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"
+
+		<view class="footer" :style="viewColor" :class="{noPointer : preview}">
+			<view v-for="(item, index) in tabs3" :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>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
 	import request from "@/utils/request.js";
 	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
 	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
-	import retuntop from '@/components/content-top/index.vue';
 	import {
 		getStoreDetail,
 		getStoreGoods,
+		getStoreCloudGoods,
 		getStoreCategory,
 		followStore,
 		unfollowStore,
-		storeServiceList
+		storeServiceList,
+		hasServiceApi
 	} from '@/api/store.js';
 	import {
 		initiateAssistApi,
@@ -517,8 +403,7 @@
 	import {
 		getShopCoupons,
 		setCouponReceive,
-		getDiy,
-		getProductSpuAPI
+		getDiy
 	} from '@/api/api.js';
 	import {
 		getUserInfo
@@ -532,16 +417,18 @@
 	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 {
+		toLogin
+	} from '@/libs/login.js';
 	import mConfig from '../component/index.js';
 	// #ifdef MP || APP-PLUS
-	import activeParty from '@/pages/index/component/activeParty';
+	import activeParty from '../../index/component/activeParty';
 	import coupon from '../../index/component/coupon';
 	import bargain from '../../index/component/bargain';
 	import blankPage from '../../index/component/blankPage';
@@ -562,7 +449,6 @@
 	export default {
 		components: {
 			...mConfig,
-			authorize,
 			emptyPage,
 			WaterfallsFlow,
 			easyLoadimage,
@@ -573,6 +459,7 @@
 			blankPage,
 			combination,
 			goodList,
+			guide,
 			liveBroadcast,
 			menus,
 			topic,
@@ -581,10 +468,8 @@
 			seckill,
 			swiperBg,
 			pictureCube,
-			titles,
-			retuntop
+			titles
 			// #endif
-
 		},
 		mixins: [history],
 		filters: {
@@ -597,8 +482,6 @@
 		},
 		data() {
 			return {
-				//下拉
-				isTriggered: false,
 				domain: HTTP_REQUEST_URL,
 				// #ifdef MP
 				menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
@@ -610,11 +493,11 @@
 				coupon: [], // 优惠券
 				productList: [], //本地服务商品
 				styleConfig: [],
-				isColumn: false, // 商品列表排列方式
+				isColumn: true, // 商品列表排列方式
 				navShow: false,
 				navActive: 0,
-				diyActive: 1,
-				tabActive: 0, // 底部切换
+				diyActive: 0,
+				tabActive: '', // 底部切换
 				isCoupon: 0,
 				keyword: '',
 				order: '',
@@ -622,105 +505,80 @@
 				goodsLoading: false,
 				categoryLoading: false,
 				loadTitle: '加载更多',
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
+				loadend: false,
 				where: {
 					order: '',
 					keyword: '',
 					page: 1,
-					limit: 10
+					limit: 30,
+					sale_type: 1
 				},
 				// 下拉菜单
 				select: {
 					show: false,
 					selected: 0,
 					options: [{
-							id: 0,
-							name: '默认'
-						},
-						{
-							id: 1,
-							name: '评分'
-						}
-					]
+						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,
-					}
-				],
+					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,
-					}
-				],
+					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,
+				}],
 				tabs: [],
 				storeScroll: true,
 				storeTop: 0,
@@ -728,11 +586,10 @@
 				currSpid: "",
 				topicList: [],
 				service_open: false,
-				type: 3,
-				statusBarHeight: 0,
-				isLihaiYun: '',
-				business_status: 0,
-				care_conut: 0,
+				type: 0,
+				serviceInfo: {},
+				preview: false,
+				listHeight: 0
 			}
 		},
 		computed: {
@@ -740,16 +597,13 @@
 				let store = this.store,
 					score = {
 						star: 0,
-						number: 0,
-
+						number: 0
 					};
 				if ('postage_score' in store) {
 					score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(
-							store
-							.service_score)) /
+							store.service_score)) /
 						3;
 					score.star = score.number / 5 * 100;
-
 				}
 				return score;
 			},
@@ -775,12 +629,8 @@
 						this.getCategory();
 						break;
 					case 3:
-						this.where = {
-							order: '',
-							keyword: '',
-							page: 1,
-							limit: 10
-						};
+						this.resetParmas();
+						this.goods = [];
 						this.getGoods();
 						break;
 					case 4:
@@ -796,26 +646,29 @@
 						this.getCoupon();
 						break;
 					case 7:
-						this.getProductSpu()
+						this.resetParmas();
+						this.goods = [];
+						this.getGoods();
 						break;
 				}
 			},
 		},
 		onLoad: function(options) {
-			this.isLihaiYun = options.LihaiYun // 是否是里海云仓
-			this.type = parseInt(options.type) || 3
+			this.type = parseInt(options.type) || 1
 			this.id = options.mer_id || options.id || 0;
 			this.isCoupon = options.coupon || 0;
 			this.diyActive = options.order || 0;
 			this.order = options.order;
+			this.preview = options.time ? true : false;
+			if (options.sale_type) this.where.sale_type = options.sale_type;
 			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) {
@@ -824,22 +677,12 @@
 				}
 			}
 			// #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() {
+			shareScence(this.currSpid, this.isLogin);
 
+			this.initHeight();
 		},
 
 		/**
@@ -870,63 +713,75 @@
 			}
 		},
 		// #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.setting_status
+			navTo(url) {
+				uni.navigateTo({
+					url: url
 				})
 			},
-			getProductSpu() {
-        return ;
-				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'
+			// 查看地图
+			showMaoLocation: function() {
+				if (!this.store.lat || !this.store.long) return this
+					.$util.Tips({
+						title: '请设置允许商城访问您的位置！'
+					});
+				let that = this,
+					lat = parseFloat(this.store.lat),
+					long = parseFloat(this.store.long)
+				//#ifdef H5
+				if (that.$wechat.isWeixin() === true) {
+					that.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						address: this.store.mer_address ? this.store.mer_address : ''
+					}).then(res => {
+						console.log('success');
 					})
-					setTimeout(function() {
-						uni.navigateBack()
-					}, 1000);
-				});
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: lat,
+						longitude: long,
+						address: this.store.mer_address ? this.store.mer_address : '',
+						scale: 8,
+						success: function() {},
+					});
+					// #ifdef H5
+				}
+				//#endif
 			},
-			//#ifndef H5
-			call: function() {
-				wx.makePhoneCall({
-					phoneNumber: this.store.service_phone,
+
+			// 列表高度
+			initHeight() {
+				this.$nextTick(async () => {
+					const headHeight = await this.getDomInfo('.header');
+					const footerHeight = await this.getDomInfo('.footer');
+					const navHeight = await this.getDomInfo('#nav-cont');
+
+					this.listHeight = headHeight.height + footerHeight.height + 'px';
 				})
 			},
-			//#endif
+
+			call: function() {
+				let that = this;
+				if (that.store.service_phone) {
+					uni.showModal({
+						title: '提示',
+						content: '暂无在线客服，确定拨打客服电话:' + that.store.service_phone + '吗？',
+						success: function(res) {
+							if (res.confirm) {
+								uni.makePhoneCall({
+									phoneNumber: that.store.service_phone,
+								});
+							}
+						}
+					})
+				} else {
+					return that.$util.Tips({
+						title: '暂无可用客服'
+					})
+				}
+			},
 			onTouchmove(e) {
 				if (this.loadend) return;
 				if (this.loading) return;
@@ -934,11 +789,7 @@
 				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();
-						}
+						this.getGoods();
 					}
 				}).exec();
 				// 模拟触底刷新
@@ -954,35 +805,28 @@
 					}
 				}).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
-				}
+				toLogin()
 			},
 			setDiy() {
 				this.diyActive = 0;
 			},
+
 			// 获取diy模板数据
 			diyData() {
 				let that = this;
 				getDiy({
-					id: that.id
+					id: that.id,
+					version: '221'
 				}).then(res => {
 					let data = res.data;
-					that.styleConfig = that.objToArr(res.data.value);
+					that.styleConfig = that.objToArr(data.value);
+					that.styleConfig.forEach((item, index, arr) => {
+						item.did = data.id
+					});
 					uni.setNavigationBarTitle({
-						title: res.data.title
+						title: data.title
 					});
 				}).catch(err => {
 					uni.showToast({
@@ -1000,8 +844,7 @@
 			goService() {
 				let that = this;
 				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
+					toLogin()
 				} else {
 					uni.navigateTo({
 						url: `/pages/chat/customer_list/chat?mer_id=${this.store.mer_id}&uid=${this.uid}`,
@@ -1016,7 +859,6 @@
 				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;
@@ -1043,8 +885,7 @@
 			receiveCoupon(item) {
 				let that = this;
 				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
+					toLogin()
 				} else {
 					setCouponReceive(item.coupon_id).then(res => {
 						item.issue = 1
@@ -1060,15 +901,19 @@
 					})
 				}
 			},
-			// 获取商品详情
+			// 获取店铺详情
 			getStore: function() {
 				getStoreDetail(this.id).then(res => {
 					this.store = res.data;
-					this.care_conut = res.data.care_count
-					if (res.data.business_status == 2) {
-						this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
-					} 
-					this.tab(this.type)
+					if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data
+						.delivery_way.length == 2) {
+						this.tabs = this.tabs1
+						this.service_open = true
+					} else {
+						this.tabs = this.tabs2
+						this.service_open = false
+					}
+					this.tab(3);
 					// #ifdef H5
 					this.ShareInfo();
 					// #endif
@@ -1078,9 +923,9 @@
 						title: err,
 						icon: 'none'
 					})
-					setTimeout(function() {
-						uni.navigateBack()
-					}, 1000);
+					// setTimeout(function() {
+					// 	uni.navigateBack()
+					// }, 1000);
 				})
 			},
 			// 获取商铺商品
@@ -1091,7 +936,58 @@
 				if (that.goodsLoading) return;
 				that.goodsLoading = true;
 				that.loadTitle = '';
-				getStoreGoods(that.id, that.where).then(res => {
+				if (this.tabActive == 7) getStoreCloudGoods(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);
+				});
+				else 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);
+				});
+			},
+			// 获取商铺云商品
+			getCloudGoods: function() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				if (that.goodsLoading) return;
+				that.goodsLoading = true;
+				that.loadTitle = '';
+				getStoreCloudGoods(that.id, that.where).then(res => {
 					that.goodsLoading = false;
 					let list = res.data.list;
 					let goodsList = that.$util.SplitArray(list, that.goods);
@@ -1173,6 +1069,7 @@
 			followToggle: function() {
 				this.store.care ? this.unfollow() : this.follow();
 			},
+
 			// 选择条件展示商品
 			set_where: function(param, isDiy) {
 				this.select.show = false;
@@ -1183,24 +1080,24 @@
 				this.where.action = ""
 				switch (param) {
 					case 0:
-						this.select.selected = 0;
+						this.navActive = 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;
+					case 2:
+						this.navActive = 2; //按照价格排序
 						this.where.order = this.sortPrice ? 'price_asc' : 'price_desc';
+						this.sortPrice = !this.sortPrice;
+						this.getGoods();
+						break;
+					case 3:
+						this.navActive = 3; //评分
+						this.where.order = 'rate';
 						this.getGoods();
 						break;
 					case 4:
@@ -1227,13 +1124,13 @@
 			},
 			// 去商品详情页
 			goGoodsDetail(item) {
-				goShopDetail(item, this.uid).then(res => {
+				goShopDetail(item, this.uid, this.where.sale_type).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}`
+								url: '/pages/activity/assist_detail/index?id=' + id
 							});
 						}).catch((err) => {
 							uni.showToast({
@@ -1242,16 +1139,16 @@
 							})
 						});
 					} else {
-						this.isAuto = true;
-						this.isShowAuth = true
+						toLogin()
 					}
 				})
 			},
 			// 商铺首页滚动 navbar 吸顶
 			scrollHome: function(e) {
 				uni.$emit('scroll');
-				this.navShow = e.detail.scrollTop >= this.storeHeight - 30;
+				this.navShow = e.detail.scrollTop >= 50;
 			},
+
 			goback: function() {
 				uni.navigateBack();
 			},
@@ -1263,25 +1160,29 @@
 			},
 			// 商铺底部切换
 			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);
+				this.goodsLoading = this.loadend = this.loading = false
 			},
 			resetParmas() {
+				this.navActive = 0;
 				this.where = {
 					order: '',
 					keyword: '',
 					page: 1,
-					limit: 30
+					limit: 30,
+					sale_type: this.where.sale_type
 				}
 			},
+
+			// 获取dom布局信息
+			getDomInfo(selector) {
+				return new Promise((resolve, reject) => {
+					uni.createSelectorQuery().in(this).select(selector).boundingClientRect((data) => {
+						resolve(data);
+					}).exec();
+				})
+			},
+
 			//#ifdef H5
 			ShareInfo() {
 				let data = this.store;
@@ -1304,52 +1205,44 @@
 							"onMenuShareAppMessage",
 							"onMenuShareTimeline"
 						], configAppMessage).then(res => {}).catch(err => {
-							// console.log(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);
+					this.goods.push(...this.goods);
 				}, 500)
 			}
 		},
+		onPageScroll() {
+			uni.$emit('scroll');
+		},
 		onPullDownRefresh() {
-			// console.log('123');
 			// 模拟上拉刷新
 			setTimeout(() => {
 				const newList = this.goods.reverse();
 				this.goods = newList;
-				// this.getGoods()
-				// this.getProductSpu()
-				// uni.startPullDownRefresh();
-				// uni.stopPullDownRefresh();
+				uni.stopPullDownRefresh();
 			}, 500)
 		}
 	}
 </script>
 
-
 <style lang="scss" scoped>
 	.tab-cont {
 		background: #f5f5f5;
 		min-height: 500rpx;
+		overflow: auto;
+	}
+
+	.noPointer {
+		pointer-events: none;
 	}
 
 	/deep/.care {
@@ -1358,129 +1251,159 @@
 		background-color: transparent;
 	}
 
-	.carebtn {
-		width: 119rpx;
-		height: 46rpx;
-
-
-
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.store-dp {
-		display: flex;
-	}
-
-	.store-dp-t {
-		font-size: 23rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #F84221;
-		margin-top: 15rpx;
-		margin-left: 10rpx;
-	}
-
-	.content-top {
-		position: absolute;
-		height: 630rpx;
-		width: 100%;
-		position: fixed;
-		z-index: 9999;
-		background-color: #ffff;
-	}
-
 	.store-home {
 		position: fixed;
 		top: 0;
 		right: 0;
 		bottom: 0;
 		left: 0;
-		height: 421rpx;
-		background-size: 100% 100%;
-		background-repeat: no-repeat;
+		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;
-
-
-		/* #ifndef APP-VUE */
-		margin-top: 125rpx;
-
-		/*#endif*/
-
-		/* #ifndef H5 */
-		margin-top: 35rpx;
-		/*#endif*/
+		padding: 0 34rpx 20rpx;
+		min-height: calc(300rpx + var(--status-bar-height));
+		background-color: #40AE36;
 
 		.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;
+			height: 88rpx;
+			margin-bottom: 30rpx;
 
-			.icon-xiangzuo {
-				font-size: 32rpx;
+			.icon-xiangzuo,
+			.icon-gouwuche {
+				font-size: 36rpx;
 				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 {
+				position: relative;
+				flex: 1;
+				display: flex;
+				align-items: center;
+				height: 58rpx;
+				border-radius: 29rpx;
+				margin-left: 32rpx;
+				background-color: #FFFFFF;
+
+				.iconfont {
+					margin-right: 13rpx;
+					margin-left: 30rpx;
+					font-size: 32rpx;
+					color: #A1A1A1;
+				}
+
+				.search-txt {
+					font-size: 26rpx;
+					color: #A1A1A1;
+				}
+
+				.search-btn {
+					position: absolute;
+					right: 4rpx;
+					width: 92rpx;
+					height: 50rpx;
+					line-height: 50rpx;
+					background: linear-gradient(139deg, #72BE53 0%, #46B03A 100%);
+					border-radius: 28rpx 28rpx 28rpx 28rpx;
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #F8F9FA;
+					text-align: center;
+				}
 			}
 		}
 
-		.search {
-			flex: 1;
+		.shop {
 			display: flex;
 			align-items: center;
-			min-width: 0;
-			height: 58rpx;
-			border-radius: 29rpx;
-			margin-left: 32rpx;
-			background: rgba(255, 255, 255, 0.6);
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #999999;
-			font-size: 26rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
-			font-weight: 400;
-			color: #737373;
-			/* #ifdef MP */
-			margin-right: 200rpx;
 
-			/* #endif */
-			.iconfont {
-				color: #999999;
-				margin-right: 13rpx;
-				margin-left: 30rpx;
-				font-size: 24rpx;
-				z-index: 999;
+			.shop-logo {
+				position: absolute;
+				right: 0;
+				bottom: 12rpx;
+			}
+
+			.shop-img {
+				margin-right: 20rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+			}
+
+			.shop-info {
+				.shop-info-title {
+					width: 530rpx;
+					margin-bottom: 10rpx;
+					font-weight: 600;
+					font-size: 28rpx;
+					color: #FFFFFF;
+					display: flex;
+					align-items: flex-end;
+
+					text {
+						max-width: 480rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
+
+				.shop-info-eva {
+					display: flex;
+					align-items: center;
+					margin-bottom: 10rpx;
+
+					.star {
+						display: flex;
+						align-items: center;
+					}
+
+					.shop-info-sale {
+						margin-right: 6rpx;
+						color: #FFFFFF;
+						font-size: 22rpx;
+					}
+
+					.icon-kefu3 {
+						color: #fff;
+					}
+				}
+
+				.shop-info-runtime {
+					margin-bottom: 10rpx;
+					font-size: 22rpx;
+					color: #FFFFFF;
+				}
+
+				.shop-info-addr {
+					width: 530rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-size: 22rpx;
+					color: #FFFFFF;
+					display: flex;
+					align-items: center;
+
+					text {
+						max-width: 480rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
 			}
 		}
 	}
@@ -1508,29 +1431,21 @@
 		min-height: 0rpx;
 		box-sizing: border-box;
 		padding: 0;
-		position: absolute;
-		top: 630rpx;
-		border-radius: 21rpx 21rpx 0 0;
 	}
 
 	.store {
 		position: relative;
 		z-index: 6;
 		display: flex;
+		align-items: center;
 		padding-right: 20rpx;
 		padding-left: 20rpx;
-		width: 725rpx;
-		height: 256rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 5px 14px 2px rgba(248, 66, 33, 0.05);
-		border-radius: 21px 21px 21px 21px;
-		margin-top: 100rpx;
-		margin-left: 15rpx;
+		padding-top: 20rpx;
+		padding-bottom: 22rpx;
 
-		.store-image {
-			margin-top: 32rpx;
-			width: 137rpx;
-			height: 137rpx;
+		image {
+			width: 74rpx;
+			height: 74rpx;
 			border-radius: 6rpx;
 		}
 
@@ -1541,12 +1456,9 @@
 		}
 
 		.kefu {
-			color: #000;
+			color: #ffffff;
 			margin-right: 26rpx;
 			cursor: pointer;
-			font-size: 30rpx;
-			margin-top: 10rpx;
-			margin-left: 10rpx;
 
 			.icon-kefu3 {
 				font-size: 34rpx;
@@ -1554,11 +1466,10 @@
 		}
 
 		.text {
-
-			width: 520rpx;
-
+			flex: 1;
+			min-width: 0;
+			margin-right: 20rpx;
 			margin-left: 20rpx;
-			margin-top: 32rpx;
 
 			navigator {
 				display: inline-flex;
@@ -1572,16 +1483,15 @@
 					white-space: nowrap;
 					text-overflow: ellipsis;
 					font-weight: bold;
-					font-size: 33rpx;
-					font-weight: 600;
+					font-size: 30rpx;
 					line-height: 1;
-					color: #333333;
+					color: #FFFFFF;
 				}
 
 				.iconfont {
 					margin-left: 10rpx;
 					font-size: 17rpx;
-					color: #000;
+					color: #FFFFFF;
 				}
 			}
 
@@ -1592,12 +1502,7 @@
 				font-weight: 500;
 				font-size: 24rpx;
 				line-height: 1;
-				color: #000;
-
-				.score-title {
-					margin-right: 15rpx;
-
-				}
+				color: #FFFFFF;
 
 				.star {
 					position: relative;
@@ -1648,22 +1553,6 @@
 
 	.font-bg-red {
 		background-color: var(--view-theme);
-		border: 1px solid var(--view-theme);
-	}
-
-	.font-bg-reda {
-		width: 112rpx;
-		height: 35rpx;
-		font-size: 23rpx;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #FFFFFF;
-		text-align: center;
-		line-height: 35rpx;
-		background: linear-gradient(90deg, #F84221 0%, #FF6D20 100%);
-		border-radius: 11rpx 11rpx;
-		margin-right: 53rpx;
-		margin-top: 10rpx;
 	}
 
 	.nav.fixed {
@@ -1679,89 +1568,17 @@
 
 	.nav {
 		position: relative;
-
-		.nav-cont1 {
-			display: flex;
-			justify-content: space-between;
-			height: 95rpx;
-			background-color: #f5f5f5;
-
-			.nav-cont1-item {
-				display: flex;
-			}
-
-			.item {
-				// flex: 1;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				min-width: 0;
-
-				.cont {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 116rpx;
-					height: 44rpx;
-					border-radius: 22rpx;
-					font-size: 30rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 500;
-					color: #737373;
-
-					.dp-img {
-						width: 56rpx;
-						height: 56rpx;
-
-						image {
-							width: 56rpx;
-							height: 56rpx;
-						}
-					}
-
-
-					.arrow-icon {
-						margin-left: 10rpx;
-						font-size: 18rpx;
-					}
-
-					.layout-icon {
-						font-size: 32rpx;
-					}
-
-					.icon-pailie {
-						font-size: 32rpx;
-					}
-
-					image {
-						width: 15rpx;
-						height: 21rpx;
-						margin-left: 7rpx;
-					}
-				}
-			}
-
-			.active {
-				.cont {
-					// background-color: #FFFFFF;
-					font-size: 30rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 600;
-					color: #333333;
-
-				}
-			}
-		}
-
+		padding: 0 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 
 		.nav-cont {
 			display: flex;
 			align-items: center;
-			height: 95rpx;
-			background-color: #f5f5f5;
+			height: 84rpx;
 
 			.item {
-				flex: 1;
 				display: flex;
 				justify-content: center;
 				align-items: center;
@@ -1774,21 +1591,9 @@
 					width: 116rpx;
 					height: 44rpx;
 					border-radius: 22rpx;
-					font-size: 30rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
 					font-weight: 500;
-					color: #737373;
-
-					.dp-img {
-						width: 56rpx;
-						height: 56rpx;
-
-						image {
-							width: 56rpx;
-							height: 56rpx;
-						}
-					}
-
+					font-size: 24rpx;
+					color: #666666;
 
 					.arrow-icon {
 						margin-left: 10rpx;
@@ -1813,16 +1618,31 @@
 
 			.active {
 				.cont {
-					// background-color: #FFFFFF;
-					font-size: 30rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 600;
-					color: #333333;
-
+					font-size: 28rpx;
+					font-weight: bold;
+					color: var(--view-theme);
 				}
 			}
 		}
 
+		.guanzhu {
+			width: 146rpx;
+			height: 58rpx;
+			line-height: 58rpx;
+			background: #46B03A;
+			border-radius: 68rpx 68rpx 68rpx 68rpx;
+			font-weight: 600;
+			font-size: 28rpx;
+			color: #FFFFFF;
+			text-align: center;
+		}
+
+		.guanzhu-active {
+			background: transparent;
+			border: 2rpx solid #46B03A;
+			color: #46B03A;
+		}
+
 		.select {
 			position: absolute;
 			top: 100%;
@@ -1904,8 +1724,8 @@
 			.easy-loadimage,
 			image,
 			uni-image {
-				width: 345rpx;
-				height: 345rpx;
+				width: 180rpx;
+				height: 180rpx;
 
 				image {
 					display: block;
@@ -1918,16 +1738,101 @@
 				padding: 20rpx 20rpx 25rpx;
 
 				.name {
-					font-weight: 500;
-					font-size: 30rpx;
-					line-height: 1;
-					color: #222222;
 					display: flex;
+					justify-content: space-between;
 					align-items: center;
+					margin-bottom: 10rpx;
 
 					.name_text {
 						display: inline-block;
-						max-width: 400rpx;
+						max-width: 340rpx;
+						font-size: 29rpx;
+						color: #262626;
+					}
+
+					.sale_num {
+						font-size: 22rpx;
+						color: #9A9A9A;
+					}
+				}
+
+				.tag {
+					margin-bottom: 10rpx;
+					display: flex;
+					flex-wrap: wrap;
+
+					.tag-item {
+						padding: 2rpx 6rpx;
+						border-radius: 6rpx;
+						border: 1rpx solid #40AE36;
+						font-size: 18rpx;
+						margin-right: 7rpx;
+						color: #40AE36;
+					}
+				}
+
+				.shop-detail {
+					display: flex;
+					align-items: center;
+					width: 100%;
+					// margin-bottom: 28rpx;
+					font-size: 22rpx;
+					line-height: 28rpx;
+					color: #999999;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					-webkit-line-clamp: 3;
+					/* 控制显示的行数 */
+					white-space: pre-wrap;
+
+					.brand {
+						&::after {
+							content: "";
+							display: inline-block;
+							width: 0rpx;
+							height: 12rpx;
+							margin: 0 8rpx;
+							border: 1rpx solid #A1A1A1;
+							border-radius: 1rpx;
+							background-color: #A1A1A1;
+							opacity: .5;
+						}
+					}
+
+					.unit {}
+				}
+
+				.price {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					width: 100%;
+
+					.price-num {
+						.unit-price {
+							font-weight: bold;
+							color: #F55726;
+							font-size: 32rpx;
+						}
+
+						.unit-name {
+							font-size: 22rpx;
+							color: #999999;
+						}
+					}
+
+					.price-icon {
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						width: 48rpx;
+						height: 48rpx;
+						margin-top: 4rpx;
+						border-radius: 50%;
+						background-color: #40AE36;
+						color: #fff;
 					}
 				}
 
@@ -1954,8 +1859,6 @@
 					font-size: 20rpx;
 					line-height: 1;
 					color: #737373;
-
-
 				}
 			}
 
@@ -2046,8 +1949,7 @@
 
 			.text {
 				position: relative;
-				width: 450rpx;
-
+				width: 530rpx;
 				min-width: 0;
 				padding-top: 0;
 				padding-right: 0;
@@ -2199,7 +2101,6 @@
 					font-size: 36rpx;
 
 					text {
-						margin-left: 10rpx;
 						font-size: 60rpx;
 					}
 				}
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 35ba3f8..e8dfdf3 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -335,47 +335,46 @@
 
 				let that = this;
 				loginMpPhone({
-						iv: e.detail.iv,
-						encryptedData: e.detail.encryptedData,
-						code: that.codeVal,
-						auth_token: uni.getStorageSync('auth_token'),
-					}).then(({
-						data
-					}) => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						that.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': data.exp
-						});
-						that.$store.commit("SETUID", data.user.uid);
-						that.$store.commit('UPDATE_USERINFO', data.user);
-
-						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-							'/pages/goods_cate/goods_cate',
-							'/pages/user/index', '/pages/plant_grass/index'
-						]
-						if (indexPat.includes(this.getPath(backUrl))) {
-							method = 'switchTab'
-						} else {
-							method = 'navigateTo'
-						}
-						if (this.getPath(backUrl) === '/pages/users/login/index') {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-							return
-						}
-						uni[method]({
-							url: backUrl
-						});
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
+					iv: e.detail.iv,
+					encryptedData: e.detail.encryptedData,
+					code: that.codeVal,
+					auth_token: uni.getStorageSync('auth_token'),
+				}).then(({
+					data
+				}) => {
+					const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+					that.$Cache.clear(BACK_URL);
+					that.$store.commit("LOGIN", {
+						'token': data.token,
+						'time': data.exp
 					});
+					that.$store.commit("SETUID", data.user.uid);
+					that.$store.commit('UPDATE_USERINFO', data.user);
+
+					let method
+					let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+						'/pages/goods_cate/goods_cate',
+						'/pages/user/index', '/pages/plant_grass/index'
+					]
+					if (indexPat.includes(this.getPath(backUrl))) {
+						method = 'switchTab'
+					} else {
+						method = 'navigateTo'
+					}
+					if (this.getPath(backUrl) === '/pages/users/login/index') {
+						uni.switchTab({
+							url: '/pages/index/index'
+						});
+						return
+					}
+					uni[method]({
+						url: backUrl
+					});
+				}).catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
 			},
 			// #endif
 			goCopyUrl() {
@@ -436,12 +435,12 @@
 						});
 					},
 					fail(error) {
+						that.$utils.error("苹果登录/uni.login", JSON.stringify(error))
 						uni.showToast({
 							title: '获取用户信息失败',
 							icon: 'none',
 							duration: 2000
 						})
-						// console.log(error)
 					}
 				})
 			},
@@ -493,6 +492,7 @@
 						that.auth_token = res.data.result.key;
 					}
 				}).catch(res => {
+					that.$utils.error("微信登录/auth", JSON.stringify(res))
 					uni.hideLoading();
 					uni.showToast({
 						title: res.message || res,
@@ -520,6 +520,7 @@
 						self.wxLoginApi()
 					},
 					fail(error) {
+						self.$utils.error("微信登录/uni.login", JSON.stringify(error))
 						uni.showToast({
 							title: '登录失败',
 							icon: 'none',
@@ -583,6 +584,7 @@
 					uni.hideLoading();
 				}).catch(res => {
 					uni.hideLoading();
+					that.$utils.error("微信登录/auth", JSON.stringify(res))
 					uni.showToast({
 						title: res.message || res,
 						icon: 'none',
diff --git a/pages/withdrawal/add.vue b/pages/withdrawal/add.vue
index e68b6ea..5ae8849 100644
--- a/pages/withdrawal/add.vue
+++ b/pages/withdrawal/add.vue
@@ -44,7 +44,7 @@
 					<view class="withdrawal-form-item">
 						<view class="withdrawal-form-item-label">持卡人</view>
 						<view class="withdrawal-form-item-val">
-							<input v-model="bindForm.name" type="text" placeholder="请输入持卡人姓名"
+							<input v-model="bindForm.name" type="text" placeholder="请输入持卡人姓名" :disabled="true"
 								placeholder-class="placeholderClass">
 						</view>
 					</view>
@@ -126,7 +126,7 @@
 					<view class="withdrawal-form-item">
 						<view class="withdrawal-form-item-label">账户名称</view>
 						<view class="withdrawal-form-item-val">
-							<input v-model="bindForm.name" type="text" placeholder="请输入账户名称"
+							<input v-model="bindForm.name" type="text" placeholder="请输入账户名称" :disabled="true"
 								placeholder-class="placeholderClass">
 						</view>
 					</view>
@@ -188,7 +188,8 @@
 		extractBank,
 		addBank,
 		searchBank,
-		getById
+		getById,
+		getUserInfo
 	} from "@/api/user.js";
 	export default {
 		data() {
@@ -226,19 +227,33 @@
 						name: '对公账户'
 					}];
 					this.bindForm.is_own = 1;
+					//获取法人真实姓名
+					this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name;
 				} else if (opt.hasOwnProperty('isOwn') && opt.isOwn == 1) {
 					this.list = [{
 						name: '法人账户'
 					}];
 					this.bindForm.is_own = 0;
+					//获取法人真实姓名
+					this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.mer_name;
 				} else {
 					this.bindForm.is_own = 0;
+					//获取法人真实姓名
+					this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.mer_name;
 					this.list = [{
 						name: '对公账户'
 					}, {
 						name: '法人账户'
 					}]
 				}
+
+				//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户  is_company =0 个体户
+				const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company;
+				if (isCompany != 1) {
+					this.list = [{
+						name: '法人账户'
+					}];
+				}
 			}
 		},
 
@@ -260,8 +275,15 @@
 			// 账户类型
 			handleSelected(e) {
 				this.show = false;
-				if (e.name == '法人账户') this.bindForm.is_own = 0;
-				if (e.name == '对公账户') this.bindForm.is_own = 1;
+				if (e.name == '法人账户') {
+					this.bindForm.is_own = 0;
+					this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.mer_name;
+				}
+				if (e.name == '对公账户') {
+					//获取法人真实姓名
+					this.bindForm.is_own = 1;
+					this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name;
+				}
 			},
 
 			// 上传图片
diff --git a/pages/withdrawal/index.vue b/pages/withdrawal/index.vue
index 35a5d21..6acbcd1 100644
--- a/pages/withdrawal/index.vue
+++ b/pages/withdrawal/index.vue
@@ -11,14 +11,21 @@
 		</view>
 		<view class="withdrawal-con">
 			<view class="withdrawal">
-				<view class="withdrawal-left" @click="handleAddAccount">
+				<view class="withdrawal-left">
 					<text class="withdrawal-left-to">提现至</text>
 					<text
 						class="withdrawal-left-empty">{{!bankInfo?'请绑定账户': bankInfo.is_own === 0 ? '法人账户' : '对公账户'}}</text>
 				</view>
-				<view class="withdrawal-right" v-if="bankList.length < 2 " @click="handleToAdd">
-					<text
-						class="withdrawal-right-add">{{(bankList.length == 0 || bankList.length ==1)?'添加账户' :''}}</text>
+
+				<view class="withdrawal-right" @click.stop="handleToAdd" v-if="isShowAdd()">
+					<text class="withdrawal-right-add">添加账户</text>
+					<u-icon name="arrow-right" size="14" color="#40AE36"></u-icon>
+				</view>
+
+				<view class="withdrawal-right"
+					v-if="!isShowAdd() && userInfo.mer_info.is_company == 1 && bankList.length == 2"
+					@click="handleAddAccount">
+					<text class="withdrawal-right-add">切换账户</text>
 					<u-icon name="arrow-right" size="14" color="#40AE36"></u-icon>
 				</view>
 			</view>
@@ -34,10 +41,6 @@
 						<view class="withdrawal-form-item-label">持卡人</view>
 						<view class="withdrawal-form-item-val">{{bankInfo.financial_account.name}}</view>
 					</view>
-					<view class="withdrawal-form-item">
-						<view class="withdrawal-form-item-label">身份证</view>
-						<view class="withdrawal-form-item-val">{{bankInfo.financial_account.id_card}}</view>
-					</view>
 					<view class="withdrawal-form-item">
 						<view class="withdrawal-form-item-label">银行账号</view>
 						<view class="withdrawal-form-item-val">{{bankInfo.financial_account.bank_code}}</view>
@@ -126,6 +129,9 @@
 			</view>
 		</view>
 
+		<!-- 明细按钮 -->
+		<view class="saomaCode" @click="navigator(`/pages/users/gather_list/index?mer_id=${mer_id}`)">明细</view>
+
 		<!-- 提现提示 -->
 		<u-modal :show="tipShow" title="提示"
 			content='工作日当日10点前提现当日12点到账, 当日16点前提现当日18点到账, 当日18点后提现次日12点到账, 周末节假日提现, 下一工作日18点前到账'
@@ -174,15 +180,27 @@
 				ot_margin: '', //押金
 				extract_money: '', //可提现金额
 				lock_money: '', //暂存金额
+				userInfo: {}
 			}
 		},
 
 		onLoad(opt) {
 			this.mer_id = opt.mer_id;
 			this.getBankInfo();
+			// 用户信息
+			this.userInfo = JSON.parse(this.$Cache.get("USER_INFO"));
+
+			console.log(this.userInfo.mer_info.is_company)
 		},
 
 		methods: {
+			//添加账户
+			isShowAdd() {
+				if (this.bankList.length == 0) return true;
+				if (this.bankList.length == 1 && this.userInfo.mer_info.is_company == 1) return true;
+				return false;
+			},
+
 			// 图片预览
 			handlePreview() {
 				let that = this;
@@ -196,6 +214,10 @@
 
 			// 添加账户
 			handleToAdd() {
+				//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户  is_company =0 个体户
+				const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company;
+				if (isCompany != 1 && this.bankInfo && this.bankInfo.is_own === 0) return;
+
 				let strUrl = "?mer_id=" + this.mer_id;
 				if (this.bankInfo) strUrl += "&isOwn=" + this.bankInfo.is_own
 				uni.navigateTo({
@@ -223,23 +245,9 @@
 
 			// 切换账号
 			handleAddAccount() {
-
 				if (this.bankList.length == 0) return this.$util.Tips({
 					title: "请先添加一个账户!"
-				})
-
-				if (this.bankList.length < 2) {
-					let isOwn = this.bankList[0].financial_account.is_own;
-					if (isOwn === 0) {
-						return this.$util.Tips({
-							title: "您还没有添加对公账户!"
-						})
-					} else {
-						return this.$util.Tips({
-							title: "您还没有添加法人账户!"
-						})
-					}
-				}
+				});
 
 				if (this.type === 0)
 					this.type = 1;
@@ -344,6 +352,13 @@
 				})
 			},
 
+			//明细跳转
+			navigator(url, t) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+
 			handleBack() {
 				uni.navigateBack()
 			}
@@ -470,6 +485,7 @@
 					font-size: 30rpx;
 					color: #333333;
 					text-align: left;
+					white-space: nowrap;
 				}
 
 				.withdrawal-form-item-val {
@@ -519,4 +535,18 @@
 			}
 		}
 	}
+
+	.saomaCode {
+		z-index: 1;
+		position: fixed;
+		bottom: 190rpx;
+		right: 28.07rpx;
+		width: 87.72rpx;
+		height: 87.72rpx;
+		border-radius: 175.44rpx;
+		background-image: linear-gradient(359deg, #72BE53 0%, #46B03A 100%);
+		color: #fff;
+		text-align: center;
+		line-height: 87.72rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 74b8c5d..c4bc796 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -21,7 +21,20 @@ import {
 // #ifdef APP-PLUS
 import permision from "./permission.js"
 // #endif
+
+import {
+	errorReport
+} from "@/api/user.js";
+
+
 export default {
+
+	errorSave: function(a, b) {
+		errorReport({
+			route: a,
+			msg: b
+		})
+	},
 	// 是否设置密码
 	checkPassword: async function(e) {
 		e = e ? e : '';