From 3a8691c0d9a9e4c671c44bb861f0afdb50deeaf2 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 26 Sep 2023 17:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js                          |  4 +-
 pages/gather/gather.vue                | 86 ++++++++------------------
 pages/moreProject/moreProject.vue      |  8 +--
 pages/nongKe/cloud_entrepot/index.vue  | 18 ++++--
 pages/nongKe/cloud_entrepot/indexa.vue | 16 +++--
 pages/nongKe/food/index.vue            |  5 +-
 pages/nongKe/specialty/index.vue       |  5 +-
 pages/nongKe/supply_chain/supplier.vue | 44 ++++++++-----
 pages/nongKe/tourism/index.vue         |  5 +-
 pages/product/basicSet.vue             | 10 +--
 10 files changed, 104 insertions(+), 97 deletions(-)

diff --git a/config/app.js b/config/app.js
index 346d3c5..2182f5b 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
 let httpApiFour
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 022a6dc..d5bd71f 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -30,7 +30,7 @@
 
 
 
-		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street"></zbpSwiper>
+		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" ></zbpSwiper>
 		<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
 			icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
 		<view class="business com special_work" v-if="jurisdiction == false">
@@ -73,7 +73,7 @@
 			</view>
 		</view>
 
-
+	
 		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
 		<!-- <m-tabbar native>
@@ -126,7 +126,7 @@
 		components: {
 			mTabbar,
 			zbpSwiper
-
+		
 		},
 		data() {
 			return {
@@ -149,7 +149,7 @@
 				AllMenuList: [{
 						name: '商户平台',
 						icon: '/static/applet/shop_app.png',
-						data: "__UNI__1EE148C",
+						data: '/pages/moreProject/moreProject',
 						type: 2,
 					},
 					{
@@ -158,21 +158,21 @@
 						data: '__UNI__B5B1EDD',
 						type: 1,
 					},
-					{
-						name: '农业咨询',
-						icon: '/static/applet/ny.png',
-						data: {
-							id: '__UNI__9620511',
-							url: '/static/wgt/__UNI__9620511.wgt',
-						},
-						type: 1,
-					}
+          {
+            name: '农业咨询',
+            icon: '/static/applet/ny.png',
+            data: {
+              id: '__UNI__9620511',
+              url: '/static/wgt/__UNI__9620511.wgt',
+            },
+            type: 1,
+          }
 				],
 				nowMenuList: [],
 				street: '',
 				showPicker: false,
 				columnData: [],
-
+			
 				isFshow: false,
 				backColor: 'rgba(252, 252, 252, 0)'
 			};
@@ -297,7 +297,7 @@
 						this.getUniMp(data);
 						break;
 					case 2:
-						this.getUniMp1(data);
+						this.navigator(data);
 						break;
 				}
 			},
@@ -322,12 +322,11 @@
 			},
 			getUniMp(data) {
 				// #ifdef APP-PLUS
-				console.log(data, typeof data == 'string');
-
-				if (typeof data == 'string') uniMP.loadMP(data);
-				else uniMP.loadMPurl(data);
-				// uniMP.loadMPurl(data);
-				// uniMP.open(data.id);
+        console.log(data, typeof data == 'string');
+				if(typeof data == 'string') uniMP.loadMP(data);
+        else uniMP.loadMPurl(data);
+        // uniMP.loadMPurl(data);
+        // uniMP.open(data.id);
 				return;
 				// #endif
 				uni.showToast({
@@ -335,38 +334,6 @@
 					title: 'H5不支持打开小程序'
 				})
 			},
-			changeHandler(e) {
-				const {
-					columnIndex,
-					value,
-					values,
-					index,
-					picker = this.$refs.uPicker
-				} = e;
-				if (columnIndex === 0) {
-					getStreet({
-						area_code: value[0]['code']
-					}).then(res => {
-						this.$refs.uPicker.setColumnValues(1, res.data);
-					});
-				}
-			},
-			getUniMp1(data) {
-				// #ifdef APP-PLUS
-				console.log(data, typeof data == 'string');
-
-				if (typeof data == 'string') uniMP.loadMPx(data);
-				else uniMP.loadMPurl(data);
-				// uniMP.loadMPurl(data);
-				// uniMP.open(data.id);
-				return;
-				// #endif
-				uni.showToast({
-					icon: 'none',
-					title: 'H5不支持打开小程序'
-				})
-			},
-			
 			changeHandler(e) {
 				const {
 					columnIndex,
@@ -500,8 +467,7 @@
 			opacity: 1;
 		}
 	}
-
-	.site-box1 {
+.site-box1 {
 		width: 706rpx;
 		/* #ifdef MP || APP-PLUS */
 		height: 160rpx;
@@ -513,27 +479,25 @@
 		position: absolute;
 		top: 45rpx;
 		left: 20rpx;
-
+	
 		z-index: 999;
-
 		// 位置
 		.place_wrapper {
 			color: #fff;
 			margin-right: 0rpx;
-
+			
 			font-size: 30rpx;
-
+		
 			.town_name {
 				margin-left: 21rpx;
 			}
 		}
-
+		
 		.iconfont {
 			font-size: 35.09rpx;
 		}
 
 	}
-
 	.site-box {
 		width: 100%;
 		/* #ifdef MP || APP-PLUS */
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 488c047..321617c 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -72,7 +72,7 @@
 								</image>
 								<text class="text">保证缴纳金</text>
 							</view>
-							<!-- <view class="examine"
+							<view class="examine"
 								@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
 								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
 								</image>
@@ -83,7 +83,7 @@
 								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
 								</image>
 								<text class="text">委托订单</text>
-							</view> -->
+							</view>
 
 							<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
 							<image class="icon_img"
@@ -188,7 +188,7 @@
 									</image>
 									<text class="text">保证缴纳金</text>
 								</view>
-								<!-- 
+								
 								<view class="examine"
 									@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
 									<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
@@ -212,7 +212,7 @@
 									<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
 									</image>
 									<text class="text">发布管理</text>
-								</view> -->
+								</view>
 
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index b520e7b..f0527f2 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -6,10 +6,18 @@
 				<view v-if="showtit">
 					<view :class="{'head':true,'show':showtit}" style="padding-top:  var(--status-bar-height);">
 						<view style="display: flex;align-items: center;">
-							<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
+							<!-- 	<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
 								width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
+								
 							<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx" @click='goBack'></u--image>
+								height="50.82rpx" @click='goBack'></u--image> -->
+
+							<i class="iconfont icon-xiangzuo" v-if="cloudList.length>0"
+								style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
+							<i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx;text-align: left;"
+								@click='goBack'></i>
+
+
 							<view class="head_tit" v-if="cloudList.length"
 								style="font-size: 40rpx;transform: skewX(-10deg);font-weight: bold;"
 								:style="{color:cloudList.length>0?'':'black'}">
@@ -39,8 +47,10 @@
 					<view style="align-items: center;display: flex;justify-content: space-between;">
 						<view class="" style="display: flex;align-items: center;">
 							<view class="back" style="margin-right: 17rpx;">
-								<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
-									height="50.82rpx" @click='goBack'></u--image>
+								<!-- <u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
+									height="50.82rpx" @click='goBack'></u--image> -->
+									<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+										@click='goBack'></i>
 							</view>
 							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
 								供销综合云市场
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 62acea1..9f32189 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -22,10 +22,15 @@
 					<view :class="{'head':true,'show':showtit}"
 						style="padding-top:  var(--status-bar-height);display: block;">
 						<view style="display: flex;align-items: center;">
-							<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
+							<!-- <u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
 								width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
 							<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx" @click='goBack'></u--image>
+								height="50.82rpx" @click='goBack'></u--image> -->
+								<i class="iconfont icon-xiangzuo" v-if="cloudList.length>0"
+									style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
+								<i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx;text-align: left;"
+									@click='goBack'></i>
+								
 							<view class="head_tit" style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);"
 								:style="{color:cloudList.length>0?'':'black'}"
 								@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
@@ -110,8 +115,11 @@
 					<view style="align-items: center;display: flex;justify-content: space-between;">
 						<view class="" style="display: flex;align-items: center;">
 							<view class="back" style="margin-right: 17rpx;">
-								<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
-									height="50.82rpx" @click='goBack'></u--image>
+							<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
+									height="50.82rpx" @click='goBack'></u--image> -->
+							
+									<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"
+										@click='goBack'></i>
 							</view>
 							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
 								供销综合云市场
diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue
index 27e954a..d84703e 100644
--- a/pages/nongKe/food/index.vue
+++ b/pages/nongKe/food/index.vue
@@ -9,7 +9,10 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right:17rpx ;">
-							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+								<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+									></i>
 						</view>
 						<view style="font-size: 40rpx;">
 							<!-- {{titName}} -->
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index 71ad4dc..b2986af 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -9,7 +9,10 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
-							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+								<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+									></i>
 						</view>
 						<view style="font-size: 40rpx;">
 							<!-- {{titName}} -->
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 9bb3a07..91e9abd 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -8,8 +8,9 @@
 
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
-						<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-							height="50.82rpx" @click='backjJump'></u--image>
+					<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+							height="50.82rpx" @click='backjJump'></u--image> -->
+						<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;" @click='backjJump'></i>
 						<view class=""
 							style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 20rpx;color: #F84221;">
 							供销综合云市场
@@ -141,7 +142,7 @@
 
 				</view>
 
-
+				<u-loadmore :status="status" />
 			</view>
 
 			<!-- 热搜 -->
@@ -414,6 +415,7 @@
 				menuList: [],
 				street: "",
 				showPicker: false,
+				status: "loadmore",
 				// 下拉菜单
 				downMenu: [{
 						title: '默认',
@@ -920,19 +922,33 @@
 		},
 		//上划加载更多
 		onReachBottom() {
-			if (this.count === this.storeList.length) {
-				if (this.count === 0) {
+			this.sotreParam.page += 1
+
+			let rqData = {
+				keyword: this.sotreParam.keyword,
+				page: this.sotreParam.page,
+				limit: 10,
+				order: this.sotreParam.order,
+				category_id: this.sotreParam.category_id,
+				type_id: this.sotreParam.type_id,
+				street_id: this.sotreParam.street_id,
+				credit_buy: this.credit_buy
+			}
+			if (this.latitude) {
+				rqData.location = this.latitude + ',' + this.longitude
+			}
+			// console.log(rqData)
+			storeMerchantList(rqData).then(res => {
+				if (res.data.list == 0) {
+					this.status = "nomore"
 					return
 				}
-				uni.showToast({
-					title: '已加载全部',
-					icon: 'none',
-					duration: 1000
-				});
-			} else {
-				this.sotreParam.page += 1
-				this.storeMerchantList()
-			}
+				this.count = res.data.count
+				this.storeList.push(...res.data.list)
+
+			})
+
+
 		}
 
 	}
diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue
index d40a5ea..bd9df7a 100644
--- a/pages/nongKe/tourism/index.vue
+++ b/pages/nongKe/tourism/index.vue
@@ -9,7 +9,10 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
-							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+							<!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+								<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+									></i>
 						</view>
 						<view style="font-size: 40rpx;">
 							<!-- {{titName}} -->
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index b1f9367..85a5bc9 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -135,12 +135,12 @@
 				<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
 			</view>
 			
-			<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
+			<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
 				<u-switch v-model="credit_buy" @change="change"></u-switch>
-			</view> -->
+			</view>
 			
-			<!-- <view class="item_cell flex_a_c"  v-if="credit_buy">
+			<view class="item_cell flex_a_c"  v-if="credit_buy">
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
 				<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
 			</view>
@@ -148,8 +148,8 @@
 			<view class="item_cell flex_a_c" v-if="credit_buy">
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
 				<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
-			</view> -->
-			<!-- <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
+			</view>
+			<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view>
 			<!-- <view class="item_cell">
         <view class="if_btn flex_a_c_j_sb">
           <text class="sub_title">是否开启商户：</text>