diff --git a/config/app.js b/config/app.js
index d3e66d2..bb7d092 100644
--- a/config/app.js
+++ b/config/app.js
@@ -15,18 +15,21 @@ const env = 'dev'; // 开发
 switch (env) {
 	case 'prod':
 		httpApi = 'https://shop.lihaink.cn' // 生产
-    httpApiTwo = 'https://nk.lihaink.cn'
-    httpApiThree = 'http://ceshi-oa.lihaink.cn'
+		httpApiTwo = 'https://nk.lihaink.cn'
+		httpApiThree = 'http://ceshi-oa.lihaink.cn'
+		httpApiFour = 'https://worker-task.lihaink.cn'
 		break;
 	case 'prew':
 		httpApi = 'https://test.shop.lihaink.cn' //预发布环境
-    httpApiTwo = "https://nk.lihaink.cn"
-    httpApiThree = 'http://ceshi-oa.lihaink.cn'
+		httpApiTwo = "https://nk.lihaink.cn"
+		httpApiThree = 'http://ceshi-oa.lihaink.cn'
+		httpApiFour = 'https://preview-worker-task.lihaink.cn'
 		break;
 	default:
-		httpApi = "https://crmeb-test.shop.lihaink.cn" // 生产
-    httpApiTwo = "https://nk.lihaink.cn"
-    httpApiThree = 'http://ceshi-oa.lihaink.cn'
+		httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试
+		httpApiTwo = "https://nk.lihaink.cn"
+		httpApiThree = 'http://ceshi-oa.lihaink.cn'
+		httpApiFour = 'https://ceshi-worker-task.lihaink.cn'
 }
 
 
@@ -35,7 +38,7 @@ switch (env) {
 // if (process.env.NODE_ENV === "development") {
 // 	   httpApi = 'https://shop.lihaink.cn' // 生产
 // 	    // httpApi = 'https://test.shop.lihaink.cn' //预发布环境
-		
+
 //   // httpApi = "https://crmeb-test.shop.lihaink.cn"
 // 	// httpApi = "http://192.168.0.222"
 // 	// httpApi = "http://192.168.0.108:8325"
@@ -48,7 +51,7 @@ switch (env) {
 // 	// httpApiTwo = "baseUrl" // h5跨域配置
 // 	httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
 // 	// httpApiThree = 'baseUrlTest' // h5跨域配置
-	
+
 // 	// #endif
 // } else if (process.env.NODE_ENV === 'production') {
 // 	httpApi = 'https://shop.lihaink.cn' // 生产
@@ -73,11 +76,13 @@ module.exports = {
 	HTTP_REQUEST_URL: httpApi,
 	HTTP_REQUEST_URL_TWO: httpApiTwo,
 	HTTP_REQUEST_URL_THREE: httpApiThree,
+	HTTP_REQUEST_URL_FOUR: httpApiFour,
 	VUE_APP_WS_URL: `${wsApi}?type=user`,
 	// #endif
-
+	
 	// #ifdef H5
 	//H5接口是浏览器地址
+	HTTP_REQUEST_URL_FOUR: httpApiFour|| window.location.protocol + "//" + window.location.host,
 	HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host,
 	HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host,
 	// 聊天长连接地址
diff --git a/manifest.json b/manifest.json
index d51d063..e0273e5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.4.1",
-    "versionCode" : 141,
+    "versionName" : "1.4.3",
+    "versionCode" : 143,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index ea535c2..650d550 100644
--- a/pages.json
+++ b/pages.json
@@ -124,7 +124,7 @@
 		}, {
 			"path": "pages/moreProject/moreProject",
 			"style": {
-				"navigationBarTitleText": "更多功能",
+				"navigationBarTitleText": "商户平台",
 				"enablePullDownRefresh": false
 			}
 
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index acfab95..8b51949 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -183,7 +183,7 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-							<view class="examine" @click="margin(`/pages/margin/margin`)">
+								<view class="examine" @click="margin(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
 									<text class="text">保证缴纳金</text>
@@ -302,7 +302,8 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-							<view class="examine" @click="navigator(`/pages/margin/margin`)">
+
+								<view class="examine" @click="navigator(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
 									<text class="text">保证缴纳金</text>
@@ -373,7 +374,7 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-							<view class="examine" @click="navigator(`/pages/margin/margin`)">
+								<view class="examine" @click="navigator(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
 									<text class="text">保证缴纳金</text>
@@ -398,11 +399,6 @@
 							</view>
 
 
-							<view class="examine" @click="navigator(`/pages/margin/margin`)">
-								<image class="icon_img" src="@/static/images/jy.png" >
-								</image>
-								<text class="text">保证缴纳金</text>
-							</view>
 						</view>
 					</view>
 				</view>
@@ -415,7 +411,11 @@
 		</view>
 		<view class="settlementAgreement" v-if="isFshow">
 			<view class="setAgCount" style="width: 100%;height: 100%;">
-				<i class="icon iconfont icon-cha" @click="recuo"></i>
+				<!-- <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>
@@ -428,7 +428,6 @@
 						拒绝
 					</button>
 
-
 					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
 						<text v-if="num>0">请仔细阅读协议{{num}}S</text>
 						<text v-else>同意</text>
@@ -443,8 +442,9 @@
 				<view class="userpage-icon" @click="close">
 					<image src="@/static/images/close.png" mode=""></image>
 				</view>
-				<form report-submit='true'>
-					<view class='merchantsSettled'>
+
+				<form report-submit='true'  style="height: 90%;">
+					<view class='merchantsSettled' :style="{'height':Fheight}">
 						<view class="title">填写信息</view>
 						<view class='list'>
 							<view class="item">
@@ -570,7 +570,7 @@
 		data() {
 			return {
 				company: '',
-				organization_code:'',
+				organization_code: '',
 				locationArr: ({}),
 				emptyText: '暂无可用应用',
 				jurisdiction: false, // 是否有权限
@@ -605,6 +605,7 @@
 					cardno_front: '',
 					cardno_back: ''
 				},
+				Fheight:0,
 
 			};
 		},
@@ -612,7 +613,10 @@
 			...mapGetters(['userInfo', 'isLogin'])
 		},
 		created() {},
-		onLoad() {},
+		onLoad() {
+			this.Fheight = uni.getSystemInfoSync().windowHeight+'px';
+			console.log(this.Fheight)
+		},
 		onShow() {
 			if (this.isLogin) {
 				this.emptyText = '暂无可用应用'
@@ -624,8 +628,6 @@
 			this.getUserInfo()
 			this.codelist()
 			this.list()
-
-
 		},
 
 
@@ -643,7 +645,7 @@
 				})
 			},
 
-	
+
 			//提交
 			formSubmit: function(e) {
 				let that = this;
@@ -842,10 +844,17 @@
 				}
 
 			},
+			//保证金缴纳
 			margin(url) {
-				uni.navigateTo({
-					url: url+`?mer_id=` + this.mer_id
-				})
+				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
+					this.isFshow = true
+					this.countDown()
+				} else {
+					uni.navigateTo({
+						url: url + `?mer_id=` + this.mer_id
+					})
+				}
+
 			},
 			//商户设置
 			buyserset() {
@@ -868,20 +877,20 @@
 				getUserInfo().then(res => {
 					this.userInfoData = res.data;
 					this.merchantData.phone = res.data.phone
-				merstreet({
-					street_code: res.data.mer_info.street_id
-				}).then((res) => {
-					if(res.code==0){
-						this.$util.Tips({
-							title: res.msg
-						});
-						return false;
-					}
-					this.company=res.data.title
-					this.organization_code=res.data.organization_code
-				}).catch(res=>{
-					console.log(res)
-				})
+					merstreet({
+						street_code: res.data.mer_info.street_id
+					}).then((res) => {
+						if (res.code == 0) {
+							this.$util.Tips({
+								title: res.msg
+							});
+							return false;
+						}
+						this.company = res.data.title
+						this.organization_code = res.data.organization_code
+					}).catch(res => {
+						console.log(res)
+					})
 					if (res.data.service == null) {
 						// console.log('123');
 						this.isShow = false
@@ -896,7 +905,7 @@
 					// console.log(that.userInfoData);
 				});
 			},
-			
+
 			//获取协议内容
 			list() {
 				business({
@@ -916,8 +925,8 @@
 
 	.userpage {
 		width: 100%;
-		height: 1368rpx;
-		padding-top: 150rpx;
+
+
 		background-color: #fff;
 		position: relative;
 	}
@@ -926,7 +935,7 @@
 		width: 60rpx;
 		height: 60rpx;
 		position: absolute;
-		top: 60rpx;
+		top: 65rpx;
 		right: 60rpx;
 
 		image {
@@ -940,7 +949,8 @@
 	}
 
 	.merchantsSettled {
-		height: 1368rpx;
+		height: 100%;
+		padding-top: 80rpx;
 	}
 
 	.merchantsSettled .title {
@@ -953,12 +963,8 @@
 	.merchantsSettled .list {
 		background-color: #fff;
 		border-radius: 12px;
-
 		margin: 0 15px;
 		position: absolute;
-
-		width: calc(100% - 30px);
-
 	}
 
 	.application-record {
@@ -977,7 +983,6 @@
 	.item-card {
 		display: flex;
 		margin-top: 20rpx;
-
 		.item-carda {
 			width: 298rpx;
 			height: 175rpx;
@@ -1133,6 +1138,7 @@
 		width: 588rpx;
 		margin: 0 auto;
 		height: 86rpx;
+	
 		border-radius: 25px;
 		text-align: center;
 		line-height: 86rpx;
@@ -1203,27 +1209,15 @@
 		font-weight: bold;
 	}
 
-	.settlementAgreement .setAgCount .content {
-		margin-top: 32rpx;
-		color: #333;
-		font-size: 26rpx;
-		line-height: 22px;
-		text-align: justify;
-		text-justify: distribute-all-lines;
-		height: 1050rpx;
-		overflow-y: scroll;
-	}
-
 
 	.settlementAgreement .setAgCount .contenta {
-		margin-top: 32rpx;
+
 		color: #333;
 		font-size: 26rpx;
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
-
-		height: 1050rpx;
+		height: 75%;
 
 		overflow-y: scroll;
 
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index aa43f0d..b520e7b 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -1,20 +1,5 @@
 <template>
 	<view class="">
-		<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
-			<view class="head-wrapper"></view>
-			<view class="town-title">{{town}}里海云仓</view>
-			<view class="body-wrapper">
-				<block v-for="(item,index) in cloudList" :key="index">
-					<navigator class="item"
-						:url="`/pages/nongKe/goods_list/index?cate_id=${item.category_id}&street=${street_code}&name=${item.category_name}`"
-						:style="{'background-image': `url(${item.background})`}">
-						<text class="item-title">{{item.category_name}}云仓服务</text>
-						<text>{{item.description}}</text>
-						<view class="chakan-btn">查看</view>
-					</navigator>
-				</block>
-			</view>
-		</view> -->
 
 		<view class="">
 			<view class="">
@@ -25,24 +10,14 @@
 								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>
-							<view class="head_tit" :style="{color:cloudList.length>0?'':'black'}">
+							<view class="head_tit" v-if="cloudList.length"
+								style="font-size: 40rpx;transform: skewX(-10deg);font-weight: bold;"
+								:style="{color:cloudList.length>0?'':'black'}">
 								{{town}}里海云仓
 							</view>
-							<view class="sl" :class="{actsl:showSelect}" @click="showSelect=!showSelect">
-								<u--image :showLoading="true" src="/static/images/GXSC/BSL.png" width="33.29rpx"
-									height="33.29rpx"></u--image>
-							</view>
 						</view>
 						<view class="" style="display: flex;align-items: center;">
-							<view style="display: flex;align-items: center;z-index: 999999;">
-								<u--image :showLoading="true" v-if="cloudList.length>0"
-									src="/static/images/LHYC/DWB.png" width="50.82rpx" height="50.82rpx"></u--image>
-								<u--image :showLoading="true" v-else src="/static/images/LHYC/DWB1.png" width="50.82rpx"
-									height="50.82rpx"></u--image>
-								<view class="town_name" :style="{color:cloudList.length>0?'':'black'}"
-									@click="showpick">{{street}}</view>
-							</view>
-							<view class="head_r" @click="showPop=true">
+							<view class="head_r" @click="showPop=true" v-if="cloudList.length>0">
 								<u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
 									width="50.82rpx" height="50.82rpx"></u--image>
 								<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
@@ -50,22 +25,9 @@
 							</view>
 
 						</view>
-
-
 					</view>
 
-					<view class="selected-list" :style="`top:${headtop}px`" :class="{actSel:showSelect}">
-						<div class="triangle-up"></div>
-						<view
-							@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
-							供销综合云市场 <text></text>
-						</view>
-						<view class="selected-li">
-							供销综合云商品 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
-									src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image>
-							</text>
-						</view>
-					</view>
+
 				</view>
 
 
@@ -80,7 +42,7 @@
 								<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
 									height="50.82rpx" @click='goBack'></u--image>
 							</view>
-							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
+							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
 								供销综合云市场
 							</view>
 						</view>
@@ -285,8 +247,17 @@
 			</view>
 
 		</view>
+
+
+
+
+
+
 		<view class="empty" style="" v-if="cloudList.length<=0">
+
 			<view style="height: var(--status-bar-height);"></view>
+
+
 			<view style="padding: 10rpx;">
 
 				<view class="info">
@@ -298,16 +269,21 @@
 				</view>
 			</view>
 
-
-
 			<!-- 多规格购物车 -->
 
 
+
 			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
 			</authorize>
-			<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
+			<view class="" :style="`height:${appInfo.bottom}px;`">
 			</view>
 		</view>
+
+
+
+
+
+
 		<view class="">
 			<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 				@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
@@ -549,7 +525,11 @@
 		},
 		onPageScroll(e) {
 			let that = this
+			// if (e.scrollTop > 0) {
 			this.showtit = !Boolean(e.scrollTop)
+			// }
+			// console.log(e)
+
 			uni.createSelectorQuery()
 				.in(this)
 				.select('.content')
@@ -786,7 +766,7 @@
 
 			},
 			navgo(url) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url
 				})
 			},
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 8b8bce0..62acea1 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<!-- 	<view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
+		<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
 			<view class="head-wrapper"></view>
 			<view class="town-title">{{town}}里海云仓</view>
 			<view class="body-wrapper">
@@ -16,59 +16,127 @@
 			</view>
 		</view> -->
 
-		<view class="" v-if="cloudList.length>0">
-
+		<view class="">
 			<view class="">
-				<!-- <view :style="`height: ${appInfo.top}px;background-color: red;z-index: 99999;`"></view> -->
-				<transition name="fade">
-					<view class="head" style="padding-top:  var(--status-bar-height);" v-if="showtit">
+				<view v-if="showtit">
+					<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" src="/static/images/LHYC/FH.png" width="50.82rpx"
+							<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>
-							<view class="head_tit">
-								<!-- {{town}}里海云仓 -->
-								{{a}}
+							<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}`)">
+								供销综合云市场
+							</view>
+							<view class="head_tit"
+								style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);color: #F84221;">
+								供销综合云商品
+							</view>
+							<view class="" @click="showPop=true">
+								<u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
+									width="50.82rpx" height="50.82rpx"></u--image>
+								<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
+									height="50.82rpx"></u--image>
+							</view>
+							<!-- <view class="sl" :class="{actsl:showSelect}" @click="showSelect=!showSelect">
+								<u--image :showLoading="true" v-if="cloudList.length>0"
+									src="/static/images/GXSC/BSL.png" width="33.29rpx" height="33.29rpx"></u--image>
+								<u--image v-else :showLoading="true" style="transform: rotate(180deg);"
+									src="/static/images/GXSC/XL.png" width="33.29rpx" height="33.29rpx"></u--image>
+
+							</view> -->
+						</view>
+
+
+						<!-- <view class="" style="display: flex;align-items: center;">
+							<view style="display: flex;align-items: center;z-index: 999999;">
+								<u--image :showLoading="true" v-if="cloudList.length>0"
+									src="/static/images/LHYC/DWB.png" width="50.82rpx" height="50.82rpx"></u--image>
+								<u--image :showLoading="true" v-else src="/static/images/LHYC/DWB1.png" width="50.82rpx"
+									height="50.82rpx"></u--image>
+								<view class="town_name" :style="{color:cloudList.length>0?'':'black'}"
+									@click="showpick">{{street}}</view>
+							</view>
+							<view class="head_r" @click="showPop=true">
+								<u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
+									width="50.82rpx" height="50.82rpx"></u--image>
+								<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
+									height="50.82rpx"></u--image>
+							</view>
+
+						</view>
+					 -->
+						<view class="flags1">
+
+						</view>
+					</view>
+
+					<view class="dw_cls" @click="showFn" :style="`top:${headTop1+5}px`">
+						<view class="dw_text">
+							<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/DWB.png"
+								width="50.82rpx" height="50.82rpx"></u--image>
+							<u--image :showLoading="true" v-else src="/static/images/LHYC/DWB1.png" width="50.82rpx"
+								height="50.82rpx"></u--image>
+							<view class="town_name" :style="{color:cloudList.length>0?'':'black'}" @click="showpick">
+								{{street}}
+							</view>
+							<view class="sl" :class="{actsl:showSelect}">
+								<u--image :showLoading="true" style="transform: rotate(180deg);"
+									src="/static/images/GXSC/XL.png" width="31.54rpx" height="31.54rpx"></u--image>
 							</view>
 						</view>
-						<view class="head_r" @click="showPop=true">
+					</view>
+					<!-- <view class="selected-list" :style="`top:${headtop}px`" :class="{actSel:showSelect}">
+						<div class="triangle-up"></div>
+						<view
+							@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
+							供销综合云市场 <text></text>
+						</view>
+						<view class="selected-li">
+							供销综合云商品 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
+									src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image>
+							</text>
+						</view>
+					</view> -->
+				</view>
+
+
+
+				<!-- 滚动 -->
+				<view :class="{'heads':true,'show':!showtit}" style="padding-top: var(--status-bar-height);">
+					<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>
+							</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>
+						</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>全部</text>
-						</view>
-					</view>
-				</transition>
-				<transition name="fade">
-					<!-- 滚动 -->
-					<view class="heads" style="padding-top: var(--status-bar-height);" v-if="!showtit">
-						<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>
-								</view>
-								<view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
-									供销综合云市场
-								</view>
-							</view>
+							<text class="" style="height: 5px;"></text>
+							<view class="flags">
 
-							<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/SS.png"
-									width="115.65rpx" height="56.82rpx" @click="serch"></u--image>
-							</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="">全部</text>
-								<view class="flags">
-
-								</view>
 							</view>
 						</view>
 					</view>
-				</transition>
-				<view class="box">
+				</view>
+
+
+				<view class="box" v-if="cloudList.length>0">
 					<view :class="act_swiper">
 						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers"
 							:circular="true" previous-margin='0rpx' next-margin='0rpx' :current="current"
@@ -83,160 +151,251 @@
 
 					</view>
 
-					<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/BG.png" width="750rpx"
-					height="998.83rpx"></u--image> -->
-					<view class="menu" style="z-index: 999;" v-if="showtit">
+
+					<view class="menu" v-if="showtit" style="transition: 1s;">
 						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
-							:circular="true" previous-margin='280rpx' next-margin='280rpx' :current="current"
+							:circular="true" previous-margin='270rpx' next-margin='270rpx' :current="current"
 							@change="test">
-							<swiper-item v-for="(item,index) in cloudList" :class="{active_swiper:index==current}">
-								<u--image :showLoading="true" :src="item.background" width="175.23rpx"
-									height="175.23rpx"></u--image>
+							<swiper-item v-for="(item,index) in cloudList" :key="index" @click="clickSwiperFn(index)">
+								<view class="swiper_item" :class="{swiper_item_act:index==current}">
+									<u--image :showLoading="true" :src="item.background" class="swiper_b"
+										width="175.23rpx" height="175.23rpx"></u--image>
+								</view>
+
 							</swiper-item>
 						</swiper>
 					</view>
-
-					<transition name="fade">
-						<view class="content">
-							<view class="content_sift" :style="{position:pocls,top:(headtop+16)+'px'}" v-if="!showtit">
-								<view :class="{act:item.act}" v-for="item,index in actList" :key="index"
-									@click="screenGoods(item.screen,index)">
-									{{item.tit}}
+					<!-- 商品列表 -->
+					<view class="content">
+						<view class="content_sift" :style="{position:pocls,top:(headtop)+'px'}" v-if="!showtit">
+							<view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index"
+								@click="screenGoods(item.screen,index)">
+								{{item.tit}}
+								<view class="" v-if="index==2" style="margin-left: 10rpx;">
+									<u-icon name="arrow-up" :color="item.price&&item.act?'#FF6D20':'black'"
+										size="10"></u-icon>
+									<u-icon name="arrow-down" :color="!item.price&&item.act?'#FF6D20':'black'"
+										size="10"></u-icon>
 								</view>
 							</view>
-							<view class="goods_list" v-if="goodsList.length>0">
-								<view class="empty" v-if='showLoading'>
-									<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
-								</view>
-								<view class="goods" @click="godDetail(item)" v-else v-for="item,index in goodsList">
-									<view class="left">
-										<u--image :showLoading="true" :src="item.image" width="192.76rpx"
-											height="192.76rpx"></u--image>
-									</view>
-									<view class="right">
-										<view class="tit">
-											<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
-											{{item.store_info}}
-										</view>
-										<view class="">
-											<view class="good_score">
-												<text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
-												<text>{{item.reply_count}}评论</text>
-											</view>
-											<view class="good_price">
-												<view class="good_price_l">
-													<view class=""
-														style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
-														￥<text style="font-size: 30rpx;">{{item.price}}</text>
-													</view>
-													<view class="old_price">
-														￥30.00
-													</view>
-												</view>
-												<view class="good_price_r" ref="container">
-													<view :class="{x_tra:trnList[index].bottom }"
-														:style="`transform:translateY(${trnList[index].bottom}px);transition:${trnList[index].bottom?1:0}s  cubic-bezier(0.4, -0.9, 0.75, 1);`"
-														@click.stop="addcart(index)">
-														<u--image :class="'act_class'+index"
-															:style="`transform:translateX(${trnList[index].left}px);transition:${trnList[index].bottom?1:0}s `"
-															src="/static/images/LHYC/J.png" width="49.07rpx"
-															height="49.07rpx"></u--image>
-													</view>
-
-												</view>
-
-											</view>
-										</view>
-									</view>
-								</view>
-								<view style="height: 100rpx;">
-									<!-- <u-loadmore :status="status" /> -->
-								</view>
+						</view>
+						<view class="goods_list" v-if="goodsList.length>0">
+							<view class="empty" v-if='showLoading'>
+								<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
 							</view>
-
-							<view v-else>
-								<view class="empty">
-									<view class="info">
-										<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-											height="400.09rpx"></u--image>
-									</view>
-								</view>
-							</view>
-
-							<view class="card" :style="`bottom:${appInfo.bottom}px`"
-								@click="navgo('/pages/order_addcart/order_addcart')">
+							<view class="goods" @click="goodDetail(item)" v-else v-for="item,index in goodsList">
 								<view class="left">
-									<view class="cart" :class="{act_cart:act_cart}"
-										style="position: relative;z-index: 9999999;">
-										<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
-											height="63.09rpx"></u--image>
-
-										<view class="badge" v-show="goodsNum">
-											{{goodsNum}}
-										</view>
-									</view>
-									<view class="tot_price">
-										<view class="">
-											￥{{totalMoney}}
-										</view>
-										<view class="">
-											支持配送 售后无忧
-										</view>
-									</view>
+									<u--image :showLoading="true" :src="item.image" width="192.76rpx"
+										height="192.76rpx"></u--image>
 								</view>
 								<view class="right">
-									去结算
+									<view class="tit">
+										<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
+										{{item.store_info}}
+									</view>
+									<view class="">
+										<view class="good_score">
+											<text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
+											<text>{{item.reply_count}}评论</text>
+										</view>
+										<view class="good_price">
+											<view class="good_price_l">
+												<view class=""
+													style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
+													￥<text style="font-size: 30rpx;">{{item.price}}</text>
+												</view>
+												<view class="old_price">
+													￥30.00
+												</view>
+											</view>
+											<view class="good_price_r">
+												<view :class="{x_tra:trnList[index].bottom }"
+													:style="`transform:translateY(${trnList[index].bottom}px);transition:${trnList[index].bottom?1:0}s  cubic-bezier(0.4, -0.9, 0.75, 1);`"
+													@click.stop="addcart(item,index)">
+													<u--image :class="'act_class'+index"
+														:style="`transform:translateX(${trnList[index].left}px);transition:${trnList[index].bottom?1:0}s `"
+														src="/static/images/LHYC/J.png" width="49.07rpx"
+														height="49.07rpx"></u--image>
+												</view>
+
+											</view>
+
+										</view>
+									</view>
+								</view>
+							</view>
+							<view style="height: 100rpx;">
+								<u-loadmore :status="status" />
+							</view>
+						</view>
+						<!-- 空 -->
+						<view v-else>
+							<view class="empty">
+								<view class="info">
+									<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+										height="400.09rpx"></u--image>
+									<view class="" style="text-align: center;color:#999">
+										暂无商品
+									</view>
 								</view>
 							</view>
 						</view>
-					</transition>
+						<!-- 购物车 -->
+						<view class="card" :style="`bottom:${appInfo.bottom}px`"
+							@click="navgo('/pages/order_addcart/order_addcart')">
+							<view class="left">
+								<view class="cart" :class="{act_cart:act_cart}"
+									style="position: relative;z-index: 9999999;">
+									<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
+										height="63.09rpx"></u--image>
+
+									<view class="badge" v-show="goodsNum">
+										{{goodsNum}}
+									</view>
+								</view>
+								<view class="tot_price">
+									<view class="">
+										￥{{totalMoney}}
+									</view>
+									<view class="">
+										支持配送 售后无忧
+									</view>
+								</view>
+							</view>
+							<view class="right">
+								去结算
+							</view>
+						</view>
+					</view>
+
 
 				</view>
-				<!-- http://192.168.1.5:8080/ -->
 			</view>
 			<!-- 组件 -->
-			<view<u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true">
-				<view class="pop">
-					<!-- <text>出淤泥而不染，濯清涟而不妖</text> -->
-					<view style="height: var(--status-bar-height);"></view>
-					<view class="pop_head" style="display: flex;">
-						<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-							height="50.82rpx" @click='showPop=false'></u--image>
-						<view class="head_tit">
-							里海云仓
+			<view class="" v-if="showPop">
+				<u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true">
+					<view class="pop">
+						<view style="height: var(--status-bar-height);"></view>
+						<view class="pop_head" style="display: flex;">
+							<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx" @click='showPop=false'></u--image>
+							<view class="head_tit">
+								里海云仓
+							</view>
 						</view>
-					</view>
-					<view class="pop_content">
-						<view class="pop_li" @click="all(index)" v-for="item,index in cloudList" :key="index">
-							<u--image :showLoading="true" :src="item.background" width="84.11rpx"
-								height="84.11rpx"></u--image>
-							<view class="" style="margin-left: 20rpx;">
-								<view style="font-size: 33.29rpx;color: black;">
-									{{item.category_name}}云仓服务
-								</view>
-								<view class="" style="font-size: 22.78rpx;">
-									{{item.description}}
+						<view class="pop_content" v-if="cloudList.length">
+							<view class="pop_li" @click="all(index)" v-for="item,index in cloudList" :key="index">
+								<u--image :showLoading="true" :src="item.background" width="84.11rpx"
+									height="84.11rpx"></u--image>
+								<view class="" style="margin-left: 20rpx;">
+									<view style="font-size: 33.29rpx;color: black;">
+										{{item.category_name}}云仓服务
+									</view>
+									<view class="" style="font-size: 22.78rpx;">
+										{{item.description}}
+									</view>
 								</view>
 							</view>
 						</view>
+
+
+						<view v-else>
+							<!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
+							@click='goBack'></u--image>
+					</view> -->
+							<view class="yuncangempty">
+
+								<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+									height="400.09rpx"></u--image>
+								<view class="" style="text-align: center;color:#999">
+									当前区域暂无云仓
+								</view>
+							</view>
+						</view>
+
 					</view>
-				</view>
 				</u-popup>
-		</view>
-		<view class="empty" style="" v-else>
-			<view style="height: var(--status-bar-height);"></view>
-			<view class="info">
-				<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-					height="400.09rpx"></u--image>
+
 			</view>
 
 		</view>
 
-		<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
+		<view class="empty" style="" v-if="cloudList.length<=0">
+			<view style="height: var(--status-bar-height);"></view>
+			<view style="padding: 10rpx;">
 
+				<view class="info">
+					<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+						height="400.09rpx"></u--image>
+					<view class="" style="text-align: center;color:#999">
+						当前区域暂无云仓
+					</view>
+				</view>
+			</view>
+
+
+
+			<!-- 多规格购物车 -->
+
+
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
+			<view class="" :style="`height:${appInfo.bottom}px;`">
+			</view>
 		</view>
 
-	</view>
+		<view class="">
+			<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+				@cancel="showPicker = false,showSelect = false" @change="changeHandler" keyName="name"></u-picker>
+		</view>
+
+		<view class="" v-if="showcartpop">
+			<u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
+				<view class="sku">
+					<view class="sku_head">
+						<view class="sku_head_l">
+							<u--image :showLoading="true" :src="skuform.image" width="200.09rpx"
+								height="200.09rpx"></u--image>
+						</view>
+						<view class="sku_head_r">
+							<view class="sku_goods_tit">
+								{{skuform.store_info}}
+							</view>
+							<view class="">
+								<view class="sku_goods_price">
+									￥ {{skuform.price}}
+								</view>
+								<view class="sku_goods_num" v-if="this.skusize">
+									库存:{{skuform.sku[this.skusize].stock}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="sku_size">
+						<view class="" style="margin-bottom: 10rpx;">
+							尺码
+						</view>
+						<view class="">
+							<text class="size_li" :class="{act_size_li:item.sku==skusize}"
+								v-for="(item,index) in skuform.sku" @click="skusizechange(item.sku)">{{item.sku}}</text>
+
+						</view>
+					</view>
+					<view class="sku_num">
+						<view class="">
+							数量
+						</view>
+						<view class="">
+							<u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
+						</view>
+					</view>
+					<view class="skuaddcart" @click="skuaddcart">
+						确定
+					</view>
+
+				</view>
+			</u-popup>
+		</view>
 
 
 	</view>
@@ -247,7 +406,7 @@
 	import {
 		cloudWarehouse,
 		getCityCloundShop
-	} from '@/api/api.js'
+	} from '@/api/requesta.js'
 	import {
 		Toast
 	} from '@/libs/uniApi';
@@ -258,21 +417,45 @@
 		getCartCounts,
 		getCartList,
 
-	} from '@/api/order.js';
+	} from '@/api/requesta.js';
 	import {
 		goShopDetail
 	} from '@/libs/order.js'
+	// 7200 = 8 = 80000 8616
 	import {
 		postCartAdd,
 	} from '@/api/store.js';
+	import authorize from '@/components/Authorize';
+
 	import {
-		times
-	} from '../../../uni_modules/uview-ui/libs/function/digit';
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		getIndexData,
+		getDiy
+	} from '@/api/api.js'
+	import {
+		getGeocoder
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from 'vuex'
+	import Cache from '@/utils/cache';
 	export default {
+		components: {
+			authorize,
+		},
 		data() {
 			let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
 			return {
-				a: "",
+				skuform: {},
+				defaInd: [0, 0],
+				showPicker: false,
+				columnData: [],
+				skusize: 0,
+				skuNumber: 1,
+				showcartpop: false,
 				trnList: [],
 				act_cart: false,
 				appInfo: {},
@@ -282,12 +465,15 @@
 				current: 3,
 				goodsNum: 0,
 				goodsList: [],
+				isEmpty: false,
 				winHeight: 0,
 				cloudList: [],
+				street: '',
 				street_code: '',
 				totalMoney: 0,
 				town: '',
 				list: [1, 1, 1, 1, 1],
+				showSelect: false,
 				showPop: false,
 				keyword: "",
 				showLoading: false,
@@ -299,6 +485,8 @@
 				page_num: 1,
 				act_img: "",
 				cartTagInfo: {},
+				isAuto: false,
+				headTop1: "",
 				actList: [{
 					tit: '综合',
 					act: "",
@@ -310,43 +498,86 @@
 				}, {
 					tit: '价格',
 					act: "",
-					screen: "price_asc"
+					screen: "price_asc",
+					price: true,
 				}],
 				status: "loadmore",
 				flag: false,
+				isShowAuth: false, //是否隐藏授权
 
 			}
 		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor', 'uid']),
+		},
+		// ...mapGetters(['isLogin', 'viewColor', 'uid']),
 		onLoad(e) {
-			this.cartFn()
-			uni.getSystemInfo({
-				success: (res) => {
-					this.winHeight = res.windowHeight
-					this.appInfo = res.safeAreaInsets
-				},
-			});
+			// this.cartFn()
+			this.appInfo = this.$appInfo.safeAreaInsets
+			this.winHeight = this.$appInfo.windowHeight
 			this.street_code = e.street
 			this.town = e.town
 			this.getCloundShop()
+			this.street = e.town
+			this.Area()
+			let that = this
+			setTimeout(() => {
+
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.flags')
+					.boundingClientRect(rect => {
+						this.headtop = rect.top
+					})
+					.exec();
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.flags1')
+					.boundingClientRect(rect => {
+						that.headTop1 = rect.top
+					})
+					.exec();
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.cart')
+					.boundingClientRect(rect => {
+						that.cartTagInfo = rect
+					})
+					.exec();
+			}, 1)
+
+		},
+		onShow() {
+			this.cartFn()
+			this.showSelect = false
 		},
 		// 分页
-		// onReachBottom() {
-		// 	if (this.flag) return
-		// 	this.status = "loading"
-		// 	this.page_num += 1
-		// 	this.flag = true
-		// 	this.getList().then(res => {
-		// 		return
-		// 		this.goodsList = this.goodsList.concat(res.data.data)
-		// 		this.flag = false
-		// 		if (!res.data.data.length) {
-		// 			this.status = "nomore"
-		// 			this.flag = true
-		// 		}
-		// 	})
-		// },
+		onReachBottom() {
+			if (this.flag || !this.goodsList.length) return
+			this.status = "loading"
+			this.page_num += 1
+			this.flag = true
+			cloudWarehouse({
+				street_code: this.street_code,
+				category_id: this.cloudList[this.current]?.category_id || "",
+				order: this.type,
+				keyword: this.keyword,
+				page_num: this.page_num
 
+			}).then(res => {
+				if (res.data.list[0].product_id == this.goodsList[0].product_id) {
+					this.status = "nomore"
+					this.flag = false
+				} else {
+					if (res.data.list.length == 0) {
+						this.status = "nomore"
+						return
+					}
+					this.goodsList = this.goodsList.concat(res.data.list)
+				}
+			})
 
+		},
 		onPageScroll(e) {
 			let that = this
 			this.showtit = !Boolean(e.scrollTop)
@@ -354,7 +585,7 @@
 				.in(this)
 				.select('.content')
 				.boundingClientRect(rect => {
-					if (rect.top <= (this.headtop + 16)) {
+					if (rect.top <= (this.headtop)) {
 						this.pocls = 'fixed'
 						this.act_swiper = 'act_swiper'
 						this.act_img = 'act_img'
@@ -367,45 +598,187 @@
 					}
 				})
 				.exec();
-			if (this.headtop) return
-			uni.createSelectorQuery()
-				.in(this)
-				.select('.flags')
-				.boundingClientRect(rect => {
-					this.headtop = rect.top
-				})
-				.exec();
 			uni.createSelectorQuery()
 				.in(this)
 				.select('.cart')
 				.boundingClientRect(rect => {
-					this.cartTagInfo = rect
+					that.cartTagInfo = rect
 				})
 				.exec();
-
 		},
 		onPullDownRefresh() {
-			uni.stopPullDownRefresh()
 			this.getCloundShop()
 			this.getList()
+			this.cartFn()
+			uni.stopPullDownRefresh()
 		},
-		// onReachBottom() {
-		// 	console.log("daidi")
-
-		// },
 		methods: {
+			showpick() {
+				this.showPicker = !this.showPicker
+
+
+			},
+			swiperClick(item) {
+				const url = item.info[1].value
+				uni.navigateTo({
+					url: url
+				})
+			},
+			selectLocation() {
+				this.isSelectPlace ? this.showPicker = true : ''
+
+			},
+
+			confirm(e) {
+				this.showPicker = false
+				this.showSelect = false
+				this.$emit('selectPlce', e)
+				this.$emit('change', e)
+				this.street = e.value[1].name
+				this.$nextTick(() => {
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+				})
+
+				// this.sotreParam.street_id = e.value[1].code
+				this.street_code = e.value[1].code
+				this.getCloundShop()
+				this.town = e.value[1].name
+				// this.storeMerchantList()
+
+			},
+			showFn() {
+				this.showSelect = true
+				this.showPicker = true
+				console.log(this.showSelect)
+				// console.log(545)
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						picker.setColumnValues(1, res.data);
+					});
+				}
+			},
+			Area() {
+				let that = this
+				getArea({
+					city_code: 510500
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+
+					//  (res.data, 66666)
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
+
+				});
+			},
+
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'autoplay' || source === 'touch') {
+					this.bgColor = this.swiper.url[e.detail.current]['img']
+					this.$emit('kkchange', this.bgColor)
+				}
+			},
+
+
+			// 对象转数组
+			objToArr(data) {
+				let obj = Object.keys(data).sort();
+				let m = obj.map(key => data[key]);
+				return m;
+			},
+			skusizechange(i) {
+
+				this.skusize = i
+			},
+			skuaddcart() {
+				this.showcartpop = false
+				// this.skuform = {}
+				let res = postCartAdd({
+					cart_num: this.skuNumber,
+					is_new: 0,
+					product_attr_unique: this.skuform.sku[this.skusize].unique,
+					product_id: this.skuform.product_id,
+					product_type: this.skuform.product_type,
+					spread_id: "",
+				}).then((res, err) => {
+					this.cartFn()
+					uni.showToast({
+						title: "加入成功",
+						duration: 1000,
+
+					})
+				}).catch(err => {
+					// this.act_cart = false
+					uni.showToast({
+						title: err,
+						icon: "none",
+						duration: 1000,
+					})
+				})
+
+			},
+			valChange(e) {
+				this.skuNumber = e.value
+
+			},
+			closecartpop() {
+				this.showcartpop = false
+			},
+			opencartpop() {
+				this.showcartpop = true
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+
+			onLoadFun() {
+				this.isShowAuth = false;
+			},
+			clickSwiperFn(i) {
+				//  (i)
+				this.current = i
+			},
 			cartFn() {
 				getCartList().then(res => {
+					//  (res)
+					this.totalMoney = 0
 					this.cartList = res.data.list
-					this.cartList[0].list.forEach(e => {
-						this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num
+					this.cartList.forEach(e => {
+
+						e.list.forEach(item => {
+							this.totalMoney += item.cart_num * item.productAttr.price
+						})
+
 					})
+					this.totalMoney = this.totalMoney.toFixed(2)
 				})
 				getCartCounts().then(res => {
 					this.goodsNum = res.data[0].count
 				})
 			},
-			godDetail(item) {
+			goodDetail(item) {
 				goShopDetail(item, this.uid).then(res => {
 					if (this.isLogin) {
 						initiateAssistApi(item.activity_id).then(res => {
@@ -428,7 +801,6 @@
 				})
 			},
 			serch() {
-				// console.log(this.keyword)
 				this.getList()
 			},
 			goBack() {
@@ -440,92 +812,103 @@
 				})
 				this.actList[i].act = true
 				this.type = type
+				if (i == 2) {
+					this.actList[i].price = !this.actList[i].price
+					this.type = this.actList[i].price ? 'price_asc' : ''
+				}
 				this.getList()
 
-				// console.log(this.type)
+				//  (this.type)
 
 			},
 			navgo(url) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url
 				})
 			},
 			getList() {
 				this.showLoading = true
+				this.status = "loading"
 				cloudWarehouse({
 					street_code: this.street_code,
-					category_id: this.cloudList[this.current].category_id,
+					category_id: this.cloudList[this.current]?.category_id || "",
 					order: this.type,
 					keyword: this.keyword,
-					// page_num: this.page_num
+					page_num: this.page_num
 
 				}).then(res => {
 					this.goodsList = res.data.list
 					this.showLoading = false
+					this.goodsList.forEach(item => {
+						this.trnList.push({
+							left: 0,
+							bottom: 0
+						})
+					})
 				})
 
 			},
-			addcart(i) {
-				let that = this
-				// return
-				console.log(i)
-				uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
-					that.trnList[i].left = this.cartTagInfo.left - data1.left;
-					that.trnList[i].bottom = this.cartTagInfo.top - data1.top;
-					console.log(that.trnList[i])
-					timer = setTimeout(() => {
-						that.trnList[i].left = 0
-						that.trnList[i].bottom = 0
-					}, 1000)
-				}).exec();
-				// console.log(this.$refs.jia1[i])
-				// return
-				// this.$refs.jia[i].style.transition = "0.5s"
-				// this.$refs.jia[i].style.transform = `translateX(${this.trnList[i].left})`
-				// this.$refs.jia1[i].style.transform = `translateY(${this.trnList[i].bottom})`
-				// this.$refs.jia[i].style.transform = `translateY(${this.trnList[i].bottom})`
+			addcart(item, i) {
+				if (!this.isLogin) {
+					this.isAuto = true;
+					this.isShowAuth = true
+					return
+				}
+
+				if (item.sku['']) {
+					let data = {
+						cart_num: 1,
+						is_new: 0,
+						product_attr_unique: item.sku[''].unique,
+						product_id: item.product_id,
+						product_type: item.product_type,
+						spread_id: "",
+					}
+					let that = this
+
+					uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
+						that.trnList[i].left = that.cartTagInfo.left - data1.left;
+						that.trnList[i].bottom = that.cartTagInfo.top - data1.top;
+
+						let timer = setTimeout(() => {
+							that.trnList[i].left = 0
+							that.trnList[i].bottom = 0
+							that.act_cart = true
+							setTimeout(() => {
+								that.act_cart = false
+							}, 500)
+						}, 1000)
+					}).exec();
+					let res = postCartAdd({
+						...data
+					}).then((res, err) => {
+						this.cartFn()
+						uni.showToast({
+							title: "加入成功",
+							duration: 1000,
+
+						})
+					}).catch(err => {
+						uni.showToast({
+							title: err,
+							icon: "none",
+							duration: 1000,
+						})
+					})
+					setTimeout(() => {
+						that.act_cart = false
+					}, 500)
+				} else {
+					this.skuform = item
+					this.showcartpop = true
+					const keys = Object.keys(item.sku);
+					const firstKey = keys[0];
+					this.skusize = keys[0]
+
+				}
+				return
 
-				// this.trnList[i].left
-				// this.$refs.jia[i].style.translateY = this.trnList[i].bottom
-				// this.$refs.jia[i].style.translateY = this.trnList[i].bottom
-				// transform: ;
-				// return
-				// let data = {
-				// 	cart_num: 1,
-				// 	is_new: 0,
-				// 	product_attr_unique: i.sku[''].unique,
-				// 	product_id: i.product_id,
-				// 	product_type: i.product_type,
-				// 	spread_id: "",
-				// }
-				// let that = this
-				// let res = postCartAdd({
-				// 	...data
-				// }).then((res, err) => {
-				// 	this.act_cart = true
-				// 	this.cartFn()
-				// 	uni.showToast({
-				// 		title: "加入成功",
-				// 		duration: 1000,
 
-				// 	})
-				// }).catch(err => {
-				// 	// this.act_cart = false
-				// 	uni.showToast({
-				// 		title: err,
-				// 		icon: "none",
-				// 		duration: 1000,
-				// 	})
-				// })
-				// setTimeout(() => {
-				// 	that.act_cart = false
-				// }, 500)
-				// uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
-				// 	that.trnList[i].left = this.cartTagInfo.left - data1.left + 'px';
-				// 	that.trnList[i].bottom = this.cartTagInfo.top - data1.top + 'px';
-				// 	console.log(that.trnList[i])
-				// }).exec();
-				// this.tot_price += Number(price)
 			},
 			all(index) {
 				this.showPop = false
@@ -533,9 +916,9 @@
 				this.getList()
 			},
 			test(e) {
-				// console.log(e.target.current)
+				//  (e.target.current)
 				this.current = e.target.current
-				// console.log(e)
+				//  (e)
 				this.getList()
 			},
 
@@ -550,6 +933,7 @@
 					street_code: this.street_code,
 					category_id: this.cloudList[this.current].category_id
 				}).then(res => {
+					this.trnList = []
 					this.goodsList = res.data.list
 					this.goodsList.forEach(item => {
 						this.trnList.push({
@@ -558,31 +942,126 @@
 						})
 					})
 				})
-				console.log("sad", this.trnList)
-				data.length < 1 ? Toast("暂无云仓") : '';
 			}
 		}
 	}
 </script>
 
-
-
-
-
 <style lang="scss" scoped>
-	@keyframes addcatr {
-		0% {
-			opacity: 1;
+	@keyframes addcart {
+		from {
+			// background-color: red;
+			opacity: 1,
 		}
 
-		95% {
-			opacity: 1;
+		to {
+			// background-color: yellow;
+			opacity: 0,
+		}
+	}
+
+	.selected-list {
+		padding: 24rpx 14rpx;
+		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+		background-color: #fff;
+		position: absolute;
+		left: 100rpx;
+		font-size: 29.79rpx;
+		z-index: 9999;
+		// top: 100rpx;
+		opacity: 0;
+		transition: 0.5s;
+
+
+
+		.triangle-up {
+			width: 0;
+			height: 0;
+			border-left: 10rpx solid transparent;
+			border-right: 10rpx solid transparent;
+			border-bottom: 10rpx solid white;
+			position: absolute;
+			top: -10rpx;
 		}
 
-		100% {
-			opacity: 0;
+		.selected-li {
+			margin-top: 35rpx;
+			color: #F84221;
+			display: flex;
+			align-items: center;
+		}
+	}
 
-			// top: ;
+
+	.sku {
+		padding: 20rpx;
+
+		.sku_head {
+			display: flex;
+
+			.sku_head_r {
+				margin-left: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				flex-direction: column;
+
+				.sku_goods_tit {
+					font-size: 30rpx;
+					width: 60vw;
+					/* 容器的宽度 */
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				.sku_goods_price {
+					color: red;
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+			}
+
+			// justify-content;
+		}
+
+		.sku_size {
+			margin: 40rpx 0;
+
+			.size_li {
+				display: inline-block;
+				// width: 100rpx;
+				padding: 5rpx 20rpx;
+				margin-right: 20rpx;
+				text-align: center;
+				color: black;
+				border: 1px solid #EBECEE;
+
+				// height: 2;
+			}
+
+			.act_size_li {
+				background-color: #FF5C2D;
+				color: white;
+				border: #FF5C2D 1px solid;
+
+			}
+		}
+
+		.sku_num {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.skuaddcart {
+			width: 50vw;
+			background-color: #FEAB00;
+			margin: 20rpx auto;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			color: white;
+			border-radius: 80rpx;
+			// margin-top: 20rpx;
 		}
 	}
 
@@ -591,12 +1070,36 @@
 		z-index: 99999999;
 	}
 
+	.swiper_item {
+		display: flex;
+		justify-content: space-around;
+		transition: .5s;
+		padding: 40rpx;
+		// transform: scale(1.2);
+	}
+
+	.swiper_item_act {
+		transform: scale(1.2);
+	}
+
+	// .swiper_item:hover {}
+
+
+	// .swiper_item {
+	// 	transform: scale(1.2);
+	// }
+
+	.swiper_b {
+		transition: 1s;
+	}
+
+	// .swiper_b:active {
+	// 	transform: scale(1.5);
+	// }
+
 	.act_cart {
 		transition: 0.5s;
 		transform: scale(1.1);
-		// transform: translateY() translateY();
-		// transition: trans;
-		// transform: translate();
 	}
 
 	.box {
@@ -604,11 +1107,13 @@
 
 		.content {
 			width: 100vw;
+			// transform: translateY(-100px);
+			border-radius: 50rpx 50rpx 0 0;
 			// position: absolute;
 			// top: 965rpx;
 			// border-top: 5px solid red;
-			z-index: 99;
-			background-color: #F4F4F4;
+			z-index: 9999;
+			background-color: white;
 			// padding: 0 10rpx;
 
 		}
@@ -644,11 +1149,13 @@
 			padding-top: 200rpx;
 		}
 
+		.act_class {
+			transition: 0.5s;
+		}
 
-
-		// .act_class:active {
-		// 	transform: scale(2);
-		// }
+		.act_class:active {
+			transform: scale(2);
+		}
 
 
 
@@ -718,8 +1225,15 @@
 	.head_tit {
 		margin-left: 20rpx;
 		font-size: 40rpx;
+		// background-color: red;
+		width: 40vw;
+		white-space: nowrap;
+		overflow: hidden;
+
+		text-overflow: ellipsis;
+
 		// font-weight: 700;
-		transform: skewX(-10deg);
+		// transform: skewX(-10deg);
 	}
 
 
@@ -728,14 +1242,19 @@
 	}
 
 	.head {
-		position: absolute;
-		z-index: 100;
+		position: fixed;
+		z-index: 999;
 		color: white;
 		display: flex;
 		justify-content: space-between;
-		width: 100%;
-		padding: 0 20rpx;
+		width: 100vw;
+
+		// background-color: red;
+		// padding: 0 20rpx;
+
 		align-items: center;
+		transition: .5s;
+		// padding-right: 10px;
 
 
 
@@ -747,25 +1266,36 @@
 		color: white;
 		width: 100%;
 		padding: 0 20rpx;
-		// background-color: white;
-
-
-
-
+		transition: 1s;
+		opacity: 0;
+	}
 
+	.show {
+		opacity: 1;
 	}
 
 	.menu {
 		position: absolute;
 		top: 748rpx;
 		width: 750rpx;
-		background-color: rgba(255, 255, 255, 0.5);
+		// background-color: rgba(255, 255, 255, 0.7);
+		height: 250rpx;
 		// height: 175.23rpx;
 		// box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
-		box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
+		// box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
 
 	}
 
+	.town_name {
+		// margin-right: 50rpx;
+		// background-color: red;
+		max-width: 15vw;
+		white-space: nowrap;
+		overflow: hidden;
+		font-size: 26rpx;
+		text-overflow: ellipsis;
+	}
+
 	.goods_list {
 		min-height: 95vh;
 		padding: 0 10rpx;
@@ -811,7 +1341,6 @@
 
 					.good_price_r {
 						z-index: 9;
-						// transition: 1s linear;
 					}
 
 					.good_price_l {
@@ -838,7 +1367,7 @@
 	}
 
 	.act_swiper {
-		height: 150rpx;
+		height: 200rpx;
 		position: fixed;
 		z-index: 99;
 		overflow: hidden;
@@ -846,7 +1375,10 @@
 
 	.act_img {
 		// transition:t;
-		transform: translateY(-848rpx);
+		transform: translateY(-840rpx);
+		/* #ifdef APP-PLUS */
+		transform: translateY(-800rpx);
+		/* #endif */
 
 	}
 
@@ -857,9 +1389,11 @@
 	.content_sift {
 		width: 750rpx;
 		padding: 22rpx 0;
+		// padding-top: 80rpx;
+		background-color: white;
 		display: flex;
 		justify-content: space-around;
-		background-color: white;
+		// background-color: white;
 		// background-color: green;
 		z-index: 99;
 		box-sizing: border-box;
@@ -875,7 +1409,7 @@
 
 	.card {
 		width: 720rpx;
-		z-index: 999999;
+		z-index: 99;
 		// margin:auto;
 		left: 50%;
 		transform: translateX(-50%);
@@ -912,113 +1446,105 @@
 		}
 	}
 
-	.x_tra {
-		// position: relative;
-		z-index: 999999;
-		animation-name: addcatr;
-		animation-duration: 1s;
-		animation-timing-function: ease-in-out;
-		animation-iteration-count: 1;
-		animation-fill-mode: forwards; // animation-iteration-count: 1;
-		/* 设置为1 */
-		// transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
-	}
-
 	.badge {
 		position: absolute;
 		top: 0;
 		right: 0;
-		background-color: red;
+		background-color: #F84221;
 		transform: translate(50%, -50%);
-		padding: 0 10rpx;
-		border-radius: 30rpx;
-	}
-
-	.cloud_entrepot {
-		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
-		background-size: cover;
-		padding-bottom: 92.98rpx;
-	}
-
-	.head-wrapper {
-		height: 485.96rpx;
-		width: 100%;
-		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
-		background-size: cover;
-		margin-bottom: 49.12rpx;
-	}
-
-	.town-title {
-		margin: 0 auto;
-		width: 100%;
+		// padding: 10rpx 10rpx;
+		border-radius: 35rpx;
 		text-align: center;
-		font-size: 50.88rpx;
-		color: #fff;
-		margin-bottom: 28.07rpx;
-
-		&::after {
-			content: '';
-			display: inline-block;
-			width: 66.67rpx;
-			height: 31.58rpx;
-			background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
-			background-size: cover;
-			margin-left: 24.56rpx;
-		}
-
-		&::before {
-			content: '';
-			display: inline-block;
-			width: 66.67rpx;
-			height: 31.58rpx;
-			background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
-			background-size: cover;
-			margin-right: 24.56rpx;
-		}
+		width: 35rpx;
+		line-height: 35rpx;
+		height: 35rpx;
 	}
 
+	// .cloud_entrepot {
+	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
+	// 	background-size: cover;
+	// 	padding-bottom: 92.98rpx;
+	// }
 
-	.body-wrapper {
-		width: 694.74rpx;
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		margin: 0 auto;
+	// .head-wrapper {
+	// 	height: 485.96rpx;
+	// 	width: 100%;
+	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
+	// 	background-size: cover;
+	// 	margin-bottom: 49.12rpx;
+	// }
 
-		.item {
-			width: 336.84rpx;
-			height: 100%;
-			padding: 24.56rpx 28.07rpx;
-			margin-bottom: 21.05rpx;
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			box-sizing: border-box;
+	// .town-title {
+	// 	margin: 0 auto;
+	// 	width: 100%;
+	// 	text-align: center;
+	// 	font-size: 50.88rpx;
+	// 	color: #fff;
+	// 	margin-bottom: 28.07rpx;
 
-			text {
-				display: block;
-				font-size: 24.56rpx;
-				color: #999;
-				margin-bottom: 14.04rpx;
-			}
+	// 	&::after {
+	// 		content: '';
+	// 		display: inline-block;
+	// 		width: 66.67rpx;
+	// 		height: 31.58rpx;
+	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
+	// 		background-size: cover;
+	// 		margin-left: 24.56rpx;
+	// 	}
 
-			.item-title {
-				font-size: 31.58rpx;
-				color: #333;
-			}
+	// 	&::before {
+	// 		content: '';
+	// 		display: inline-block;
+	// 		width: 66.67rpx;
+	// 		height: 31.58rpx;
+	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
+	// 		background-size: cover;
+	// 		margin-right: 24.56rpx;
+	// 	}
+	// }
 
-			.chakan-btn {
-				width: 114.04rpx;
-				height: 49.12rpx;
-				font-size: 28.07rpx;
-				text-align: center;
-				line-height: 49.12rpx;
-				color: #fff;
-				margin-top: auto;
-				background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
-				border-radius: 50px;
-			}
-		}
-	}
+
+	// .body-wrapper {
+	// 	width: 694.74rpx;
+	// 	display: flex;
+	// 	justify-content: space-between;
+	// 	flex-wrap: wrap;
+	// 	margin: 0 auto;
+
+	// 	.item {
+	// 		width: 336.84rpx;
+	// 		height: 100%;
+	// 		padding: 24.56rpx 28.07rpx;
+	// 		margin-bottom: 21.05rpx;
+	// 		background-repeat: no-repeat;
+	// 		background-size: 100% 100%;
+	// 		box-sizing: border-box;
+
+	// 		text {
+	// 			display: block;
+	// 			font-size: 24.56rpx;
+	// 			color: #999;
+	// 			margin-bottom: 14.04rpx;
+	// 		}
+
+	// 		.item-title {
+	// 			font-size: 31.58rpx;
+	// 			color: #333;
+	// 		}
+
+	// 		.chakan-btn {
+	// 			width: 114.04rpx;
+	// 			height: 49.12rpx;
+	// 			font-size: 28.07rpx;
+	// 			text-align: center;
+	// 			line-height: 49.12rpx;
+	// 			color: #fff;
+	// 			margin-top: auto;
+	// 			background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
+	// 			border-radius: 50px;
+	// 		}
+	// 	}
+	// }
 
 	.empty {
 		// display: flex;
@@ -1048,4 +1574,66 @@
 	.cart {
 		z-index: 999;
 	}
+
+	.x_tra {
+		// position: relative;
+		z-index: 999999;
+		animation-name: addcatr;
+		animation-duration: 1s;
+		animation-timing-function: ease-in-out;
+		animation-iteration-count: 1;
+		animation-fill-mode: forwards; // animation-iteration-count: 1;
+		/* 设置为1 */
+		// transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
+	}
+
+	.price_sift {
+		display: flex;
+		align-items: center;
+	}
+
+	.sl {
+
+		transform: rotate(180deg);
+		transition: 0.5s;
+	}
+
+	.actsl {
+		transform: rotate(0deg);
+	}
+
+	.actSel {
+		opacity: 1;
+		// transform: translateX(100rpx);
+
+	}
+
+	.yuncangempty {
+		margin: 20vh 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.dw_cls {
+		position: fixed;
+		z-index: 99;
+		width: 212.03rpx;
+		// width: 100vw;
+		height: 78.86rpx;
+		background-image: url(/static/images/LHYC/DWBG.png);
+		background-size: cover;
+		right: 0;
+		// top: 130rpx;
+
+
+		.dw_text {
+			display: flex;
+			align-items: center;
+			// background-color: red;
+			height: 78.86rpx;
+			justify-content: space-around;
+
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index c0dea0a..9bb3a07 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -4,70 +4,88 @@
 		<view class='productList' :style="viewColor">
 			<!-- 顶部 -->
 			<view class="top">
-				<view style="height: 10px;">
-
-				</view>
 
 
 				<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>
-						</view>
-						<view class="" style="font-size: 40rpx;">
+						<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+							height="50.82rpx" @click='backjJump'></u--image>
+						<view class=""
+							style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 20rpx;color: #F84221;">
 							供销综合云市场
 						</view>
-						<view style="margin-left: 20rpx;transition: 0.3s;" @click="showSelect=!showSelect"
+						<view class=""
+							@click="navGoto(`/pages/nongKe/cloud_entrepot/indexa?street=${street_id}&town=${street}`)"
+							style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 60rpx;">
+							供销综合云商品
+						</view>
+						<!-- <view style="margin-left: 20rpx;transition: 0.3s;" @click="showSelect=!showSelect"
 							:class="{selects:showSelect}">
 							<u--image :showLoading="true" src="/static/images/GXSC/XL.png" width="33.29rpx"
 								height="33.29rpx"></u--image>
-						</view>
+						</view> -->
 					</view>
-					<view class="">
 
-					</view>
 					<!-- 搜索框 -->
-					<view style="position: relative;width: 289.14rpx;" v-if="showSerch">
+					<!-- <view style="position: relative;width: 289.14rpx;" v-if="showSerch">
 						<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
 							placeholder="请输入..." v-model="sotreParam.keyword" @search="onInputConfirm"
 							class="serch_cls"></u-search>
 						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
 							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
-					</view>
+					</view> -->
 					<!-- 位置 -->
-					<view v-else style="display: flex;align-items: center;" @click="showPicker=!showPicker">
+					<!-- <view v-else style="display: flex;align-items: center;">
 						<u--image @tap="showSerch=!showSerch" style="margin-right: 30rpx;" :showLoading="true"
 							src="/static/images/GXSC/SS.png" width="49rpx" height="49rpx"></u--image>
+						<u--image @click="showPicker=!showPicker" :showLoading="true" src="/static/images/GXSC/DW1.png"
+							width="50.82rpx" height="50.82rpx"></u--image>
+						<view class="town_name">{{street}}</view>
+					</view> -->
+				</view>
+
+				<view class="sswz">
+					<view style="position: relative;width: 501.17rpx;">
+						<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
+							placeholder="搜索店铺或者名称" v-model="sotreParam.keyword" @search="onInputConfirm"
+							class="serch_cls"></u-search>
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+					</view>
+					<view style="display: flex;align-items: center;" @click="showPicker=!showPicker">
 						<u--image :showLoading="true" src="/static/images/GXSC/DW1.png" width="50.82rpx"
 							height="50.82rpx"></u--image>
 						<view class="town_name">{{street}}</view>
 					</view>
 				</view>
-				<view class="selected-list" :class="{actSel:showSelect}">
+				<!-- <view class="selected-list" :class="{actSel:showSelect}">
 					<div class="triangle-up"></div>
 					<view class="selected-li">
 						供销综合云市场 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
 								src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image> </text>
 					</view>
 					<view class=""
-						@click="navGoto(`/pages/nongKe/cloud_entrepot/index?street=${street_id}&town=${street}`)">
+						@click="navGoto(`/pages/nongKe/cloud_entrepot/indexa?street=${street_id}&town=${street}`)">
 						供销综合云商品
 					</view>
+				</view> -->
+
+				<view class="flags">
+
 				</view>
-
-
-
 			</view>
+
+
 			<view class="content">
-				<view style="height: 10px">
+				<view class="" :style="`height:${headTop}px`">
 
 				</view>
 				<view class="hot_serch">
-					<text>热搜:</text>
+					<!-- <text>热搜:</text>
 					<text @click="hotSerchFn('小张副食')">小张副食</text>
 					<text @click="hotSerchFn('正新酒店')">正新酒店</text>
 					<text @click="hotSerchFn('麻辣鸡')">麻辣鸡</text>
-					<text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text>
+					<text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text> -->
 				</view>
 
 				<view class="menu_cls">
@@ -356,6 +374,7 @@
 				defaInd: [0, 0],
 				columnData: [],
 				showSerch: false,
+				headTop: 0,
 				imgList: [
 					"/static/images/GXSC/BBY.png",
 					"/static/images/GXSC/NYSC.png",
@@ -473,6 +492,19 @@
 				this.menuList = res.data
 			})
 			this.Area()
+			let that = this
+			setTimeout(() => {
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.flags')
+					.boundingClientRect(rect => {
+						// console.log(this.cartTagInfo, 6666)
+						// that.cartTagInfo = rect
+						that.headTop = rect.top
+						console.log(that.headTop)
+					})
+					.exec();
+			}, 100)
 		},
 		computed: {
 			downMenus: function() {
@@ -531,7 +563,7 @@
 					city_code: 510500
 				}).then(res => {
 					this.$refs.uPicker.setColumnValues(0, res.data);
-					// this.Street(res.data[0]['code']);
+					this.Street(res.data[0]['code']);
 					// console.log(res.data, 66666)
 				});
 			},
@@ -587,10 +619,10 @@
 			},
 
 			test() {
-				if (this.sotreParam.keyword.length > 3) {
-					this.sotreParam.keyword.slice(0, 3)
-					this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
-				}
+				// if (this.sotreParam.keyword.length > 3) {
+				// 	this.sotreParam.keyword.slice(0, 3)
+				// 	this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
+				// }
 				// console.log(this.sotreParam.keyword.length)
 			},
 			hotSerchFn(keywords) {
@@ -933,6 +965,7 @@
 		align-items: center;
 		box-sizing: border-box;
 		padding: 0 20rpx;
+
 	}
 
 	.productList {
@@ -941,9 +974,7 @@
 
 		.top {
 			padding-top: var(--status-bar-height);
-			/* #ifdef H5 */
-			padding-top: 30rpx;
-			/* #endif */
+
 			// padding-top: 80rpx;
 			background-color: #F0F2F5;
 			position: fixed;
@@ -954,6 +985,7 @@
 
 		.content {
 			padding: 20rpx;
+			padding-top: 0;
 		}
 
 		.menu_cls {
@@ -1066,24 +1098,7 @@
 	}
 
 	.hot_serch {
-		color: #B3B3B3;
-		display: flex;
-		justify-content: space-around;
-		margin-top: 40rpx;
-
-		flex-wrap: wrap;
-		// margin-top: 50rpx;
-		// padding-top: 100rpx;
-		padding-top: var(--status-bar-height);
-		// margin-top: 10px;
-		/* #ifdef H5 */
-		padding-top: 50rpx;
-		/* #endif */
-		// margin-top: 200rpx;
-
-		text {
-			margin: 10rpx;
-		}
+		height: 20rpx;
 	}
 
 	.productList .search .input {
@@ -1577,4 +1592,12 @@
 	.pop {
 		z-index: 1;
 	}
+
+	.sswz {
+		margin-top: 30rpx;
+		display: flex;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 87cb76b..86d913c 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -15,7 +15,8 @@
 							<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
 								<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
 							</view>
-							<view class="" style="font-size: 40rpx;">
+							<view class=""
+								style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 20rpx;">
 								{{titName}}
 							</view>
 						</view>
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 430c2d5..c6c6cf2 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -182,7 +182,7 @@
 			</view>
 		</form>
 		<view class="settlementAgreement" v-if="showProtocol">
-			<view class="setAgCount">
+			<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">
@@ -194,6 +194,10 @@
 		<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>
@@ -1303,25 +1307,25 @@
 	}
 
 	.settlementAgreement .setAgCount .content {
-		margin-top: 32rpx;
+	
 		color: #333;
 		font-size: 26rpx;
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
-		height: 756rpx;
+	
 		overflow-y: scroll;
 	}
 
 
 	.settlementAgreement .setAgCount .contenta {
-		margin-top: 32rpx;
+	
 		color: #333;
 		font-size: 26rpx;
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
-		height: 1000rpx;
+		height: 75%;
 		overflow-y: scroll;
 
 
diff --git a/static/images/LHYC/DWBG.png b/static/images/LHYC/DWBG.png
new file mode 100644
index 0000000..afcf3e4
Binary files /dev/null and b/static/images/LHYC/DWBG.png differ
diff --git a/static/images/SFFF.png b/static/images/SFFF.png
index def3aaa..0a56fdf 100644
Binary files a/static/images/SFFF.png and b/static/images/SFFF.png differ
diff --git a/static/images/SFZZ.png b/static/images/SFZZ.png
index 1b15302..613c196 100644
Binary files a/static/images/SFZZ.png and b/static/images/SFZZ.png differ
diff --git a/static/images/YHKF.png b/static/images/YHKF.png
index e1ba19e..a3e1929 100644
Binary files a/static/images/YHKF.png and b/static/images/YHKF.png differ
diff --git a/static/images/YHKZ.png b/static/images/YHKZ.png
index f259cbf..0ab6e78 100644
Binary files a/static/images/YHKZ.png and b/static/images/YHKZ.png differ
diff --git a/static/images/ti1.png b/static/images/ti1.png
deleted file mode 100644
index aa667d5..0000000
Binary files a/static/images/ti1.png and /dev/null differ
diff --git a/utils/requestb.js b/utils/requestb.js
index e092928..1cca306 100644
--- a/utils/requestb.js
+++ b/utils/requestb.js
@@ -9,6 +9,7 @@
 // +----------------------------------------------------------------------
 import {
 	HTTP_REQUEST_URL,
+	HTTP_REQUEST_URL_FOUR,
 	HEADER,
 	TOKENNAME
 } from '@/config/app';
@@ -18,6 +19,7 @@ import {
 import store from '../store';
 
 
+console.log(HTTP_REQUEST_URL_FOUR)
 
 /**
  * 发送请求
@@ -27,7 +29,7 @@ function baseRequest(url, method, data, {
 	noVerify = false
 }) {
 	
-	let Url = 'https://preview-worker-task.lihaink.cn',
+	let Url = HTTP_REQUEST_URL_FOUR,
 		header = HEADER;
 
 
@@ -58,7 +60,6 @@ function baseRequest(url, method, data, {
 					})
 					reject(res.data);
 				} else if (res.statusCode==200) {
-console.log(res)
 					reslove(res.data,res.data);
 				} else
 					reject(res.data.message || '系统错误');