From 10fa18df328671cd1616b63ae4faeb1495c9a14e Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 19:43:53 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=20=E4=BE=9B=E9=94=80=E7=AD=89=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                |   5 +-
 manifest.json                          |   8 +-
 pages.json                             |   2 +-
 pages/goods_details/index.vue          |   4 +-
 pages/margin/margin.vue                |  11 +-
 pages/nongKe/cloud_entrepot/indexa.vue |  42 +++--
 pages/nongKe/food/index.vue            |  21 ++-
 pages/nongKe/specialty/index.vue       |  27 ++-
 pages/nongKe/tourism/index.vue         |  21 ++-
 pages/product/goodsOnSale/index.vue    |   2 +-
 pages/store/settled/index.vue          | 223 +++++++++++++++++--------
 pages/supply_chains/supply_chains.vue  |  13 +-
 pages/users/login/login_copy.vue       |   2 +
 pages/users/payment/payment.vue        |   1 +
 14 files changed, 262 insertions(+), 120 deletions(-)

diff --git a/App.vue b/App.vue
index d56d2d7..5129746 100644
--- a/App.vue
+++ b/App.vue
@@ -161,7 +161,7 @@
 			jpushModule.initJPushService()
 			jpushModule.addConnectEventListener(result => {
 				let connectEnable = result.connectEnable
-				// console.log("jpush连接", connectEnable)
+				console.log("jpush连接", connectEnable)
 			})
 
 
@@ -222,7 +222,8 @@
 
 		},
 		onShow() {
-
+	 
+			
 			let that = this
 			// 记录H5和公众号
 			if (this.$store.state.app.token) {
diff --git a/manifest.json b/manifest.json
index f637671..849cf13 100644
--- a/manifest.json
+++ b/manifest.json
@@ -103,13 +103,13 @@
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
                     }
                 },
                 "share" : {
                     "weixin" : {
                         "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
                     }
                 },
                 "geolocation" : {
@@ -160,7 +160,7 @@
         },
         "nativePlugins" : {
             "JG-JCore" : {
-                "JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e",
+                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
                 "JPUSH_CHANNEL_IOS" : "",
                 "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
                 "JPUSH_CHANNEL_ANDROID" : "",
@@ -178,7 +178,7 @@
                         "JPUSH_APPKEY_IOS" : {
                             "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
                             "key" : "JCore:APP_KEY",
-                            "value" : "7869a2f94b120cfb4431b96f"
+                            "value" : "daebe19b547c43128796a078"
                         },
                         "JPUSH_CHANNEL_IOS" : {
                             "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
diff --git a/pages.json b/pages.json
index f8048ae..c26eb18 100644
--- a/pages.json
+++ b/pages.json
@@ -839,7 +839,7 @@
 				}, {
 					"path": "payment/payment",
 					"style": {
-						"navigationBarTitleText": "",
+						"navigationBarTitleText": "支付",
 						"enablePullDownRefresh": false
 					}
 
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 153c189..b91603b 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -290,8 +290,8 @@
 								<view v-if="description.content && description.content.title" class="title">
 									{{description.content.title}}
 								</view>
-								<view v-if="description.content && description.content.image" class="pictures">
-									<image v-for="(item,index) in description.content.image" :key="index" :src="item">
+								<view v-if="description.content && description.content.image" class="pictures" style="background-color: #fff;">
+									<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="aspectFit">
 									</image>
 								</view>
 							</view>
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 356de23..122ff8e 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -112,6 +112,7 @@
 				merchant({
 					id: this.mer_id
 				}).then((res) => {
+					
 					this.merchant_Data = res.data
 				});
 			},
@@ -137,14 +138,14 @@
 										orderInfo: res.data
 											.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
 										success: (res) => {
-											this.$util.Tips({
+											that.$util.Tips({
 												title: '支付成功'
 											});
-											this.decimal()
-											this.list(true)
+											that.decimal()
+											that.list(true)
 										},
 										fail: (err) => {
-											this.$util.Tips({
+											that.$util.Tips({
 												title: '支付失败'
 											});
 
@@ -176,8 +177,6 @@
 	}
 
 	.content-order {
-
-
 		background: #F4F4F4;
 		border-radius: 21rpx 21rpx;
 		margin-top: 30rpx;
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 9592892..d046642 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -26,11 +26,11 @@
 								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> -->
-								<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>
-								
+							<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}`)">
@@ -114,22 +114,23 @@
 					<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"
+								<!-- 	<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>
+
+								<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"
+									@click='goBack'></i>
 							</view>
 							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
-								供销综合云市场
+								供销综合云商品
 							</view>
 						</view>
 
 						<view style="position: relative;width: 289.14rpx;">
 							<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..."
-								v-model="keyword" class="serch_cls"></u-search>
-							<u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
-								width="115.65rpx" height="56.82rpx" @click="serch"></u--image>
+								v-model="keyword" class="serch_cls" style="height: 56.82rpx;"></u-search>
+							<!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
+								width="115.65rpx" height="56.82rpx" @click="serch"></u--image> -->
+							<view class="serchbtn img_cls" @click="serch">搜索</view>
 						</view>
 						<view class='head_r' @click="showPop=true">
 							<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
@@ -969,6 +970,19 @@
 		}
 	}
 
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
+
 	.selected-list {
 		padding: 24rpx 14rpx;
 		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
@@ -1201,7 +1215,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue
index d84703e..386ad5e 100644
--- a/pages/nongKe/food/index.vue
+++ b/pages/nongKe/food/index.vue
@@ -26,8 +26,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+							<view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+						<!-- <u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
 					</view>
 
 				</view>
@@ -703,7 +704,19 @@
 		margin: 0;
 		padding: 0;
 	}
-
+.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	.com_name {
 		font-size: 32rpx;
 		// background-color: red;
@@ -1304,7 +1317,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index 9a5ab18..a2df3ba 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -9,8 +9,11 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
-							<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx"></u--image>
+						<!-- 	<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}} -->
@@ -27,8 +30,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+							<view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+					<!-- 	<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
 					</view>
 
 				</view>
@@ -700,6 +704,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	* {
 		margin: 0;
 		padding: 0;
@@ -1305,7 +1322,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue
index bd9df7a..a62daee 100644
--- a/pages/nongKe/tourism/index.vue
+++ b/pages/nongKe/tourism/index.vue
@@ -29,8 +29,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+							<view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+					<!-- 	<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
 					</view>
 
 				</view>
@@ -704,7 +705,19 @@
 		margin: 0;
 		padding: 0;
 	}
-
+.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	.com_name {
 		font-size: 32rpx;
 		// background-color: red;
@@ -1305,7 +1318,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/product/goodsOnSale/index.vue b/pages/product/goodsOnSale/index.vue
index 2004e71..c2f98d5 100644
--- a/pages/product/goodsOnSale/index.vue
+++ b/pages/product/goodsOnSale/index.vue
@@ -5,7 +5,7 @@
 				<view class="title_search">
 					<span class="iconfont">&#xe67d;</span>
 					<form @submit="search" report-submit="true">
-						<input type="text" :name="where.keyword" v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
+						<input type="text"  v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
 					</form>		
 				</view>
 			</view>
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 85ccc8d..66c4f08 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -3,16 +3,17 @@
 		<!-- #ifdef MP || APP-PLUS -->
 
 		<view class="conten-top" :style="'height:'+statusBarHeight+'px'">
-			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i class="iconfont icon-xiangzuo"
-					style="font-size: 40rpx;text-align: left;"></i></view>
-			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
+			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
+					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
+			<view class=""
+				style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
 				商家入驻
 			</view>
 		</view>
 		<view :style="'height:'+statusBarHeight+'px'"></view>
 		<!-- #endif -->
 
-		<view v-if="!successful" :style="viewColor" >
+		<view v-if="!successful" :style="viewColor">
 			<form report-submit='true'>
 				<view class='merchantsSettled'>
 					<view class="merchantBgCount">
@@ -226,7 +227,7 @@
 							拒绝
 						</button>
 
-						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="formSubmit">
+						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
 							<text v-if="num>0">请仔细阅读协议{{num}}S</text>
 							<text v-else>同意</text>
 
@@ -290,6 +291,9 @@
 	import {
 		configMap
 	} from "@/utils";
+	import {
+		intention,
+	} from "@/api/product"
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import authorize from '@/components/Authorize';
 	import Verify from '@/components/verify/verify.vue';
@@ -371,7 +375,13 @@
 				isType: false,
 				num: 10,
 				detail: {},
-				statusBarHeight:0
+				statusBarHeight: 0,
+				where: {
+					type: 1,
+					page: 1,
+					limit: 10
+				},
+				codenote: []
 			};
 		},
 		beforeDestroy() {
@@ -400,13 +410,19 @@
 			}
 			this.getArea()
 			this.shoplist()
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 		onShow() {
 
 		},
 		onReady() {},
 		methods: {
+			//获取交易信息
+			codelist() {
+				intention(this.where).then(res => {
+					this.codenote = res.data.list
+				})
+			},
 			//退出
 			logout() {
 				uni.switchTab({
@@ -782,75 +798,144 @@
 			showxy() {
 				this.isshow = true
 			},
-
-			formSubmit: function(e) {
-
-
-
-
+			//提交
+			agree() {
 				let that = this;
-				if (that.validateForm() && that.validate) {
-					if (this.num == 0) {
-						let requestData = {
-							phone: that.merchantData.phone,
-							mer_name: that.merchantData.enterprise_name,
-							name: that.merchantData.user_name,
-							code: that.merchantData.yanzhengma,
-							company_name: that.merchantData.company_name,
-							address: that.merchantData.address,
-							social_credit_code: that.merchantData.social_credit_code,
-							merchant_category_id: that.merchantData.classification,
-							mer_type_id: that.merchantData.mer_type,
-							mer_storeType: this.mer_storeType,
-							area_id: this.area_id,
-							street_id: this.street_id,
-							village_id: this.village_id,
-							is_nmsc: this.isnum,
-							images: that.pics
-						}
-						that.validate = false;
-						if (that.mer_i_id) {
-							updateGoodsRecord(that.mer_i_id, requestData).then(res => {
-								if (res.status == 200) {
-									title: '提交成功',
-									that.loading = true;
-									that.timer = setTimeout(() => {
-										that.successful = true;
-										that.validate = true;
-									}, 1000)
-								}
-							}).catch(res => {
-								this.isshow = false
+				let requestData = {
+					phone: that.merchantData.phone,
+					mer_name: that.merchantData.enterprise_name,
+					name: that.merchantData.user_name,
+					code: that.merchantData.yanzhengma,
+					company_name: that.merchantData.company_name,
+					address: that.merchantData.address,
+					social_credit_code: that.merchantData.social_credit_code,
+					merchant_category_id: that.merchantData.classification,
+					mer_type_id: that.merchantData.mer_type,
+					mer_storeType: this.mer_storeType,
+					area_id: this.area_id,
+					street_id: this.street_id,
+					village_id: this.village_id,
+					is_nmsc: this.isnum,
+					images: that.pics
+				}
+				that.validate = false;
+				if (that.mer_i_id) {
+					updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+						if (res.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							that.timer = setTimeout(() => {
+								that.successful = true;
 								that.validate = true;
-								that.$util.Tips({
-									title: res
-								});
-							})
-						} else {
-							create(requestData).then(data => {
-								if (data.status == 200) {
-									title: '提交成功',
-									that.loading = true;
-									this.timer = setTimeout(() => {
-										that.successful = true;
-										that.validate = true;
-									}, 1000)
-								}
+							}, 1000)
+						}
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				} else {
+					create(requestData).then(data => {
+						if (data.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							this.timer = setTimeout(() => {
+								that.successful = true;
+								that.validate = true;
+							}, 1000)
+						}
 
-							}).catch(res => {
-								that.validate = true;
-								that.$util.Tips({
-									title: res
-								});
-							})
-						}
-					} else {
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				}
+			},
+			formSubmit() {
+				if (this.validateForm() && this.validate) {
+					if (this.codenote.length == 0) {
 						this.isshow = true
 						this.countDown()
+					} else {
+						if (this.codenote[0].status == 0) {
+							uni.showModal({
+								title: '申请正在审核中，请勿重复提交'
+							})
+						} else {
+							this.isshow = true
+							this.countDown()
+						}
 					}
-
 				}
 
+				// let that = this;
+				// if (that.validateForm() && that.validate) {
+				// 	if (this.num == 0) {
+				// 		let requestData = {
+				// 			phone: that.merchantData.phone,
+				// 			mer_name: that.merchantData.enterprise_name,
+				// 			name: that.merchantData.user_name,
+				// 			code: that.merchantData.yanzhengma,
+				// 			company_name: that.merchantData.company_name,
+				// 			address: that.merchantData.address,
+				// 			social_credit_code: that.merchantData.social_credit_code,
+				// 			merchant_category_id: that.merchantData.classification,
+				// 			mer_type_id: that.merchantData.mer_type,
+				// 			mer_storeType: this.mer_storeType,
+				// 			area_id: this.area_id,
+				// 			street_id: this.street_id,
+				// 			village_id: this.village_id,
+				// 			is_nmsc: this.isnum,
+				// 			images: that.pics
+				// 		}
+				// 		that.validate = false;
+				// 		if (that.mer_i_id) {
+				// 			updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+				// 				if (res.status == 200) {
+				// 					title: '提交成功',
+				// 					that.loading = true;
+				// 					that.timer = setTimeout(() => {
+				// 						that.successful = true;
+				// 						that.validate = true;
+				// 					}, 1000)
+				// 				}
+				// 			}).catch(res => {
+				// 				this.isshow = false
+				// 				that.validate = true;
+				// 				that.$util.Tips({
+				// 					title: res
+				// 				});
+				// 			})
+				// 		} else {
+				// 			create(requestData).then(data => {
+				// 				if (data.status == 200) {
+				// 					title: '提交成功',
+				// 					that.loading = true;
+				// 					this.timer = setTimeout(() => {
+				// 						that.successful = true;
+				// 						that.validate = true;
+				// 					}, 1000)
+				// 				}
+
+				// 			}).catch(res => {
+				// 				that.validate = true;
+				// 				that.$util.Tips({
+				// 					title: res
+				// 				});
+				// 			})
+				// 		}
+				// 	} else {
+				// 		this.isshow = true
+				// 		this.countDown()
+				// 	}
+
+				// }
+
 
 
 			},
@@ -999,7 +1084,7 @@
 
 	.merchantsSettled {
 		background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		
+
 		height: 140vh;
 		position: relative;
 	}
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 2e12f8a..baed312 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -246,12 +246,14 @@
 				loadTitle: '加载更多',
 			}
 		},
-
 		onPullDownRefresh() {
 			this.list(true, this.street_id);
 			this.Area()
 			uni.stopPullDownRefresh()
 		},
+		onShow() {
+			this.selfLocation()
+		},
 		onLoad() {
 			this.Area()
 			this.selfLocation()
@@ -268,18 +270,13 @@
 			})
 
 		},
-		onShow(){
-			this.list(true,this.street_id);
-		},
+		
 		onReachBottom() {
 			if (this.productList.length > 0) {
 				setTimeout(() => {
 					this.list(false, this.street_id);
 				}, 500)
-			} else {
-				this.list(true, this.street_id)
-			}
-
+			} 
 
 		},
 		beforeDestroy() {
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 6603d0e..9b25334 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -892,7 +892,9 @@
 				// #ifdef APP-PLUS
 				jpushModule.initJPushService()
 				jpushModule.getRegistrationID(result => {
+					
 					if (result.registerID) {
+					
 						bindJG({
 							phone: this.account,
 							jg_register_id: result.registerID
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
index c395e4d..9aa4184 100644
--- a/pages/users/payment/payment.vue
+++ b/pages/users/payment/payment.vue
@@ -264,6 +264,7 @@
 						// 	})
 						// }, 1000)
 						uni.showToast({
+							icon:'none' ,
 							title: res.message
 						})
 					})

From 0fbcbec4477063607a66879ec7dba1d41f7fdbe6 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 21:56:08 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                            |  8 ++++----
 pages/admin/orderDetail/index.vue        |  2 +-
 pages/admin/order_cancellation/index.vue | 11 ++++++++--
 pages/goods_details/index.vue            |  5 -----
 pages/order_details/index.vue            |  2 +-
 pages/users/login/login_copy.vue         | 26 +++++++++++++++---------
 pages/users/order_confirm/index.vue      |  6 ++++--
 pages/users/order_list/index.vue         |  4 ++--
 pages/users/order_list/indexCopy.vue     |  4 ++--
 pages/users/order_list/order.vue         |  4 ++--
 pages/users/order_list/relase.vue        |  4 ++--
 11 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/manifest.json b/manifest.json
index 849cf13..44b6df3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.4.5",
-    "versionCode" : 145,
+    "versionName" : "1.4.6",
+    "versionCode" : 146,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -199,9 +199,9 @@
                 }
             },
             "JG-JPush" : {
-                "JPUSH_ISPRODUCTION_IOS" : "",
+                "JPUSH_ISPRODUCTION_IOS" : "true",
                 "JPUSH_ADVERTISINGID_IOS" : "",
-                "JPUSH_DEFAULTINITJPUSH_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
                 "JPUSH_OPPO_APPKEY" : "",
                 "JPUSH_OPPO_APPID" : "",
                 "JPUSH_OPPO_APPSECRET" : "",
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index 1517bb5..d7fc7a7 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -146,7 +146,7 @@
 			</view>
 		</view>
 		<view style="height:120upx;"></view>
-		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="margin-bottom: var(--status-bar-height);">
+		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="padding-bottom: var(--status-bar-height);">
 			<view class="more"></view>
       <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(order_id,1)">
       	同意
diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue
index 2f54607..9a3d94d 100644
--- a/pages/admin/order_cancellation/index.vue
+++ b/pages/admin/order_cancellation/index.vue
@@ -131,8 +131,12 @@
 						// console.log(self.verify_code);
 						verifierOrder(self.mer_id,self.verify_code)
 							.then(res => {
+								// uni.navigateTo({
+								// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+								// });
+								
 								uni.navigateTo({
-									url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+									url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
 								});
 							})
 							.catch(res => {
@@ -161,8 +165,11 @@
 						scanType: ["qrCode", "barCode"]
 					}).then(res=>{
 						this.verify_code = res.resultStr
+						// uni.navigateTo({
+						// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+						// });
 						uni.navigateTo({
-							url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+							url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
 						});
 						// this.codeChange();
 					}).catch(res => {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index b91603b..41562cc 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -704,11 +704,6 @@
 			that.getConfig();
 			uni.hideLoading();
 		},
-
-		onHide() {
-
-			this.CartCount = 0
-		},
 		/**
 		 * 用户点击右上角分享
 		 */
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index fd8c56e..69e7b32 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -306,7 +306,7 @@
 			<view class="content-clip"></view>
 			<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
 				<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
-				<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
+				<view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view>
 				<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
 					class=" acea-row row-right row-middle">
 					<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 9b25334..27ee2c1 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -8,14 +8,14 @@
 					</div>
 				</div>
 				<div class="whiteBg" v-if="formItem === 1">
-					<div class="title acea-row row-center-wrapper">
+					<div class="title acea-row row-center-wrappe">
 						<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
 							@click="navTap(index)" :key="index">
 							{{ item }}
 						</div>
 					</div>
 					<div class="list" :hidden="current !== 1">
-						<form @submit.prevent="submit">
+						<form @submit.prevent="submit">r
 							<div class="item">
 								<div class="acea-row row-middle">
 									<image src="/static/images/phone_1.png"></image>
@@ -47,11 +47,13 @@
 									v-model="account" />
 							</div>
 						</div>
+						
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" />
+							
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+									v-model="captcha" maxlength="4" />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -61,8 +63,8 @@
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" />
+								<input type="number" placeholder="填写验证码"  placeholder-class="placeholder" class="codeIput"
+									v-model="codeVal" maxlength="4" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -95,8 +97,9 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<input type="number" placeholder="填写验证码"   maxLength='4'  placeholder-class="placeholder" class="codeIput"
 									v-model="captcha" />
+									
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -110,10 +113,11 @@
 									v-model="password" />
 							</div>
 						</div>
+						
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput"
 									v-model="codeVal" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
@@ -156,16 +160,18 @@
 						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
 							v-model="account"></input>
 					</view>
+					
 					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput"
+						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder' class="codeIput"
 							v-model="captcha"></input>
+							
 						<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 							@click="handleVerify">
 							{{ text }}
 						</button>
 					</view>
 					<view class="item">
-						<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
+						<input type='password' placeholder='填写登录密码'  placeholder-class='placeholder'
 							v-model="password"></input>
 					</view>
 					<view class="protocol acea-row row-between-wrapper">
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 48848b7..f5a8ecc 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -164,13 +164,14 @@
 								<view class='discount'>暂无优惠券</view>
 							</block>
 						</view> -->
-						<!-- <view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
+						<view class='item acea-row row-between-wrapper'>
 							<view>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
 							<view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
 								{{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
 								<text class='iconfont icon-jiantou'></text>
 							</view>
-						</view> -->
+						</view>
+						
 						<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
 							class="item acea-row row-between-wrapper"
 							style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">
@@ -382,6 +383,7 @@
 				</view>
 			</view>
 			<view style='height:140rpx;'></view>
+			
 			<view class='footer acea-row row-between-wrapper'>
 				<view class="footer_count">
 					<view>
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 813fd98..f540c1a 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -250,8 +250,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-								<!-- 	<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 55fe401..0ea1728 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -259,8 +259,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue
index d8df1e0..59c3119 100644
--- a/pages/users/order_list/order.vue
+++ b/pages/users/order_list/order.vue
@@ -247,8 +247,8 @@
 								</view>
 							</view>
 							<view class='bottom acea-row row-right row-middle'>
-								<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-									@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+								<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+									@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 									<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
index 1dcd9a1..e25d0d6 100644
--- a/pages/users/order_list/relase.vue
+++ b/pages/users/order_list/relase.vue
@@ -257,8 +257,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>

From 9b30956be95f4fde5979c0ab2ce6d3e80684414b Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 22:06:56 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=9E=81=E5=85=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifest.json b/manifest.json
index 44b6df3..84fd61d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,6 +3,7 @@
     "appid" : "__UNI__3A527D1",
     "description" : "",
     "versionName" : "1.4.6",
+	
     "versionCode" : 146,
     "transformPx" : false,
     /* 5+App特有相关 */

From 7d3ad1194678f492b817c62b19b0e1e2b1050b21 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 22:33:26 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_details/stay.vue    |  2 +-
 pages/users/payment/payment.vue | 35 +++++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 2e7bb70..663e932 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -363,7 +363,7 @@
 			},
 			mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])),
 		onLoad: function(options) {
-			console.log('11111111')
+			
 			this.credit_buy = options.credit_buy
 			// console.log(options.product_type)
 			if (options.product_type) {
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
index 9aa4184..1777648 100644
--- a/pages/users/payment/payment.vue
+++ b/pages/users/payment/payment.vue
@@ -172,7 +172,7 @@
 			},
 			getOrderInfo() {
 				groupOrderDetail(this.order_id, this.product_type).then(res => {
-					console.log(res)
+
 					this.couponData = res.data
 					this.$nextTick(() => {
 						if (this.couponData.interest !== null) {
@@ -189,6 +189,7 @@
 							pay_type: this.payType
 						}
 					).then(res => {
+
 						if (res.data.paid === false) {
 							//拉起微信支付
 
@@ -204,7 +205,7 @@
 							}, 1000)
 						}
 					}).catch(err => {
-						
+
 						uni.showToast({
 							title: err.message
 						})
@@ -213,7 +214,10 @@
 					orderPay(this.order_id, {
 						type: this.payType
 					}).then(res => {
+
+
 						let jsConfig = res.data.result.config
+
 						if (res.data.status === 'weixinApp') {
 							//拉起微信支付
 							// #ifdef APP-PLUS
@@ -257,16 +261,35 @@
 							});
 							// #endif
 
+						} else {
+							if (res.status == 200) {
+							
+								// uni.navigateBack({
+								// 	delta: 1
+								// })
+								
+								uni.showToast({
+									icon: 'none',
+									title: res.message
+								})
+								setTimeout(() => {
+									uni.navigateTo({
+										url:'/pages/users/order_list/index?status=2'
+									})
+								}, 1000)
+							}
+
 						}
+
 						// setTimeout(() => {
 						// 	uni.navigateBack({
 						// 		delta: 1
 						// 	})
 						// }, 1000)
-						uni.showToast({
-							icon:'none' ,
-							title: res.message
-						})
+						// uni.showToast({
+						// 	icon:'none' ,
+						// 	title: res.message
+						// })
 					})
 				}
 

From 4bc0e98b09ab7fa66abd5ac84d1b43178ca85d8a Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 22:46:15 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                    | 5 ++---
 pages/users/login/login_copy.vue | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 84fd61d..393cebd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,9 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.4.6",
-	
-    "versionCode" : 146,
+    "versionName" : "1.5.0",
+    "versionCode" : 150,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 27ee2c1..2344871 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -15,7 +15,7 @@
 						</div>
 					</div>
 					<div class="list" :hidden="current !== 1">
-						<form @submit.prevent="submit">r
+						<form @submit.prevent="submit">
 							<div class="item">
 								<div class="acea-row row-middle">
 									<image src="/static/images/phone_1.png"></image>

From 8f7e5f2ff2b573643fd62fd2477f193111679a80 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 22:52:59 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 393cebd..c8c719f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.5.0",
-    "versionCode" : 150,
+    "versionName" : "1.4.7",
+    "versionCode" : 147,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From af93ae7101a03ff34e7d3330574e710e4fc6c2a9 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 28 Sep 2023 09:55:18 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BA=91=E4=BB=93=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E3=80=81=E5=A7=94=E6=89=98=E9=94=80=E5=94=AEbug=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E3=80=81=E4=BA=91=E4=BB=93=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                    |  2 +-
 .../delegation_details/index.vue              |  6 ++--
 .../receivedCommission/index.vue              | 23 ++++++++++++--
 pages/moreProject/moreProject.vue             |  2 +-
 pages/nongKe/cloud_entrepot/index.vue         | 30 +++++++++++++++----
 pages/users/order_list/relase.vue             |  6 ++++
 6 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/api/api.js b/api/api.js
index c382e10..f5545dc 100644
--- a/api/api.js
+++ b/api/api.js
@@ -5,7 +5,7 @@ import request from "@/utils/request.js";
  * 
  */
 export function cloudWarehouse(data) {
-  return request.get("store/product/cloudWarehouse", data);
+  return request.get("store/product/cloudWarehouse", data, { noAuth: true });
 }
 /**
  * 获取云仓分类
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 3cf0d27..dc3c98c 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -109,8 +109,8 @@
 
 		</view>
 		<view class="content_bootm">
-			<view class="content_bootm_txt">
-				查看TA提到的宝贝(2)
+			<view class="content_bootm_txt" v-if="objinfo.product_list.length>0">
+				查看TA提到的宝贝({{objinfo.product_list.length}})
 			</view>
 
 
@@ -124,7 +124,7 @@
 			</view>
 
 		</view>
-		<button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button>
+		<!-- <button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button> -->
 	</view>
 </template>
 
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 729a4b2..f3443be 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -227,6 +227,7 @@
 	import emptyPage from '@/components/emptyPage.vue';
 	import {
 		entrustlist,
+			addEntrustCart,
 		finishchain,
 		checkchain
 	} from '@/api/sale.js'
@@ -365,9 +366,25 @@
 			},
 			//下单
 			order(item) {
-				uni.navigateTo({
-					url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
-				})
+				// uni.navigateTo({
+				// 	url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
+				// })
+				addEntrustCart({
+						community_id: item.community_id
+					}).then(res => {
+				
+						if (res.status == 200) {
+							this.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							})
+							uni.navigateTo({
+								url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
+							})
+						}
+				
+					})
+				
 			},
 			//申请结束委托申请
 			deteragrss(item) {
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index e681ae3..8b6ad68 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -204,7 +204,7 @@
 									<text class="text">缴纳保证金</text>
 								</view>
 
-								<!-- <view class="examine"
+							<!-- 	<view class="examine"
 									@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
 									<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
 									</image>
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index f0527f2..73eace9 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -52,16 +52,23 @@
 									<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;">
-								供销综合云市场
+							<!-- <view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
+						    {town}}
+							</view> -->
+							<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>
 
 						<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>
+							<!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
+								width="115.65rpx" height="56.82rpx" @click="serch"></u--image> -->
+								
+								<view class="serchbtn img_cls" @click="serch">搜索</view>
 						</view>
 						<view class='head_r' @click="showPop=true">
 							<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
@@ -913,7 +920,18 @@
 			opacity: 0,
 		}
 	}
-
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	.selected-list {
 		padding: 24rpx 14rpx;
 		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
@@ -1146,7 +1164,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
index e25d0d6..495fcae 100644
--- a/pages/users/order_list/relase.vue
+++ b/pages/users/order_list/relase.vue
@@ -283,6 +283,12 @@
 											去付款
 										</view>
 									</block>
+									<block v-if="item.order_status == 2 ">
+									
+										<view class='bnt b-color'  @click.stop='goOrderDetails(item.order_id)'>
+											去发货
+										</view>
+									</block>
 									<block v-if="item.order_status == 9 ">
 
 										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>

From 46137717e8c7681732520f3f07cfe52a1fbec68b Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 28 Sep 2023 10:34:58 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BE=9B=E9=94=80=E4=BA=91=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/cloud_entrepot/indexa.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index d046642..a22442d 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -346,8 +346,7 @@
 			<!-- 多规格购物车 -->
 
 
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
-			</authorize>
+			
 			<view class="" :style="`height:${appInfo.bottom}px;`">
 			</view>
 		</view>
@@ -405,7 +404,8 @@
 			</u-popup>
 		</view>
 
-
+<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
 	</view>
 
 </template>
@@ -493,7 +493,7 @@
 				page_num: 1,
 				act_img: "",
 				cartTagInfo: {},
-				isAuto: false,
+			
 				headTop1: "",
 				actList: [{
 					tit: '综合',
@@ -511,6 +511,7 @@
 				}],
 				status: "loadmore",
 				flag: false,
+				isAuto: false,
 				isShowAuth: false, //是否隐藏授权
 
 			}
@@ -860,8 +861,9 @@
 			},
 			addcart(item, i) {
 				if (!this.isLogin) {
-					this.isAuto = true;
-					this.isShowAuth = true
+					console.log('2222')
+					this.isAuto = true
+					this.isShowAuth = true;
 					return
 				}