From f874159f8f251ff2e677dc0ce963ec5a56260c50 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 09:35:25 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=A7=94=E6=89=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commissionedSales/addDelegation/index.vue |  50 +++--
 .../initiateDelegation/index.vue              | 182 ++++++++++++------
 .../receivedCommission/index.vue              |  89 ++++-----
 pages/moreProject/moreProject.vue             |   8 +-
 pages/product/basicSet.vue                    |   2 +-
 5 files changed, 187 insertions(+), 144 deletions(-)

diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index 86619ff..6da72d9 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -1,12 +1,9 @@
 <template>
 
-	<!-- #ifdef APP || H5 -->
-	<view>
-		<!-- #endif -->
+	<view class="content">
+
 		<form @submit="formSubmit" report-submit='true'>
 			<view class="release_content">
-
-
 				<view class="release_item">
 					<view class="release_item-one">
 						<view class="item-one">
@@ -19,7 +16,7 @@
 						<view class="item-one">
 							委托周期
 						</view>
-						<view class="" @click="calendar">
+						<view class="">
 
 							<input type="number" v-model="formData.entrust_day" />
 						</view>
@@ -61,22 +58,15 @@
 
 					</view>
 				</view>
-				<button class="release_btn button" form-type="submit">发布</button>
+				<button class="release_btn button" form-type="submit">提交</button>
 			</view>
 		</form>
 
-		<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
-			:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
-			:showMonth="info.showMonth" @close="close" />
-
 
 		<!-- 提到的宝贝弹窗 -->
 		<uni-popup ref="associated" type="bottom">
 			<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
 		</uni-popup>
-
-
-
 	</view>
 </template>
 
@@ -98,20 +88,8 @@
 			return {
 				value1: 1,
 				value2: "",
-				options1: [{
-					text: "Shenzhen1",
-					value: 1
-				}, {
+				options1: [],
 
-					text: "Shenzhen2",
-					value: 2
-				}, {
-
-
-					text: "Shenzhen3",
-					value: 3
-				}],
-				date: 1,
 				productList: [],
 				info: {
 					startDate: '',
@@ -122,6 +100,14 @@
 					selected: [],
 					showMonth: false
 				},
+				formData: {
+					entrust_mer_id: '',
+					entrust_day: 0,
+					is_type: "4",
+					product_info: [],
+					content: ''
+				},
+				type: ''
 			};
 		},
 		computed: {
@@ -287,6 +273,10 @@
 		background: #F5F5F5;
 	}
 
+	.content {
+		height: 100vh;
+		position: relative;
+	}
 
 	.release_content {
 
@@ -531,6 +521,10 @@
 	}
 
 	.release_btn {
-		margin-top: 100rpx;
+
+		position: absolute;
+		bottom: 150rpx;
+		left: 50%;
+		margin-left: -347rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index 4615473..5ade2bd 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -6,7 +6,7 @@
 			<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
 		</view>
 		<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
-		<view class="content-content" v-for="(item,i) in list" :key="i" >
+		<view class="content-content" v-for="(item,i) in orderList" :key="i">
 
 			<view class="content-one">
 				<view class="content-one-img">
@@ -14,10 +14,10 @@
 				</view>
 				<view class="content-one-txt">
 					<view class="one-txt-a">
-						{{item.content}}
+						{{item.title}}
 					</view>
 					<view class="one-txt-b">
-						委托周期:{{item.day}}
+						委托周期:{{item.credit_buy}}
 					</view>
 				</view>
 			</view>
@@ -28,7 +28,6 @@
 				<view class="content-two-edita"  @click="order">
 					待处理
 				</view>
-
 				<view class="contentgn">
 				<!-- 	<view class="contentgn_a" @click="soldEdit(item)">
 						处理
@@ -47,13 +46,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="content-two_oneq" v-if="item.type==2">
-
-
+			<view class="content-two_oneq" v-if="item.mer_status==1">
 				<view class="content-two-editb" @click="accepted">
 					已接受
 				</view>
-
 				<view class="contentgn">
 					<view class="contentgn_a" @click="closingorder">
 						结束委托
@@ -64,45 +60,48 @@
 					</view>
 				</view>
 			</view>
-			<view class="content-two_one" v-if="item.type==3">
-
-
+			<view class="content-two_one" v-if="item.mer_status==2">
 				<view class="content-two-editc" @click="declined">
 					已拒绝
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a">
+					<view class="contentgn_a" click="deleteOrder(item)">
 						删除
 					</view>
 					<span></span>
-					<view class="contentgn_b">
+					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
 				</view>
 			</view>
 			<view class="content-two_one" v-if="item.type==4">
-
-
 				<view class="content-two-editd" @click="soldEdit">
 					已完成
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a">
+					<view class="contentgn_a" click="deleteOrder(item)">
 						删除
 					</view>
 					<span></span>
-					<view class="contentgn_b">
+					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
 				</view>
 			</view>
 		</view>
-
-		<view v-if="orderList.length == 0 && this.where.page > 1">
+		<view class="adddelegation" @click="addDelegation">
+			<view class="adddelegation-one">
+				<image src="@/static/images/delegation.png" mode=""></image>
+			</view>
+			<view class="adddelegation-two">
+				新增委托
+			</view>
+		</view>
+		<view v-if="orderList.length == 0">
 			<emptyPage title="暂无订单~"></emptyPage>
 		</view>
+		<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
 		<uni-popup ref="bindmobile" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -114,19 +113,16 @@
 								委托申请处理
 							</view>
 							<view class="bg-content-b">
-								结算周期: <span>30天</span>
-
-
+								结算周期: <span>{{obj.settle_cycle}}天</span>
 							</view>
 							<view class="bg-content-c">
-								利息比例: <span>0.05%</span>
+								利息比例: <span>{{obj.interest_rate}}%</span>
 							</view>
-
 							<view class="entrust_bga_btn">
-								<view class="cancellation">
+								<view class="cancellation" @click="passDelete(obj)">
 									拒绝
 								</view>
-								<view class="determine">
+								<view class="determine" @click="passagree(obj)">
 									接受
 								</view>
 							</view>
@@ -136,7 +132,6 @@
 			</view>
 		</uni-popup>
 		<uni-popup ref="bindmobile1" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -156,15 +151,11 @@
 								</view>
 							</view>
 						</view>
-
 					</view>
-
 				</view>
-
 			</view>
 		</uni-popup>
 		<uni-popup ref="bindmobile2" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -177,13 +168,10 @@
 							</view>
 							<view class="bg-content-b">
 								结算周期: <span>30天</span>
-
-
 							</view>
 							<view class="bg-content-c">
 								利息比例: <span>0.05%</span>
 							</view>
-
 							<view class="entrust_bga_btn">
 								<view class="cancellation">
 									拒绝
@@ -211,20 +199,15 @@
 							</view>
 							<view class="bg-content-b">
 								结算周期: <span>30天</span>
-
-
 							</view>
 							<view class="bg-content-c">
 								利息比例: <span>0.05%</span>
 							</view>
 							<view class="bg-content-c">
-
 								拒绝原因：
 								<view class="" style="margin-top: 21rpx;">
-
 									<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
 								</view>
-
 							</view>
 							<view class="entrust_bga_btn">
 								<view class="determine">
@@ -242,34 +225,43 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
+	import {
+		entrustlist,
+		finishchain,
+		checkchain
+	} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
-			emptyPage
+			emptyPage,
+
 		},
 		data() {
 			return {
 				activeItem: "tabOne",
+				status: 'loadmore',
 				tabTitle: "",
 				orderList: [],
 				where: {
 					page: 1,
-					limit: 10
+					limit: 10,
+					type: 1,
+					status: 0
 				},
 				tabs: [{
 						name: "tabOne",
 						label: '待处理',
-						type: '1'
+						type: 0
 					},
 					{
 						name: "tabTwo",
 						label: '已接受',
-						type: '2'
+						type: 1
 					},
 					{
 						name: "tabThree",
 						label: '已拒绝',
-						type: '3'
+						type: 2
 					},
 
 				],
@@ -297,24 +289,43 @@
 						type: 4
 
 					}
-				]
+				],
+				obj: {}
 			}
 		},
 		onLoad() {
 			this.tabTitle = this.tabs[0].name
 			//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
-			console.log(this.tabs[0])
+			// console.log(this.tabs[0])
 
 		},
 		mounted() {
-
+			this.commislist()
 		},
 		methods: {
+			onReachBottom() {
+				if (this.status == 'nomore') return;
+				this.status = 'loading';
+				this.where.page = ++this.where.page;
+				this.commislist()
+			},
 			nav(item) {
 				// uni.navigateTo({
 				// 	url: '/pages/commissionedSales/delegation_details/index'
 				// })
 			},
+			//获取分类数据
+			commislist() {
+				entrustlist(this.where).then((res) => {
+					this.orderList.push(...res.data.list)
+					if (res.data.list.length < this.where.limit) this.status = 'nomore'
+
+					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+
+				})
+			},
+
+			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
@@ -337,7 +348,6 @@
 			},
 			//管理弹窗
 			close() {
-				console.log('1111111')
 				this.$refs.bindmobile.close()
 				this.$refs.bindmobile1.close()
 				this.$refs.bindmobile2.close()
@@ -366,25 +376,24 @@
 				})
 			},
 			// 待处理
-			soldEdit() {
-
+			soldEdit(item) {
+				this.obj = item
+				console.log(item)
 				this.$refs.bindmobile.open()
-
-
-
-
 			},
 			//已接受
 			accepted() {
-				this.$refs.bindmobile1.open()
+
 			},
 			//结束委托
 			closingorder() {
-				this.$refs.bindmobile3.open()
+				this.$refs.bindmobile1.open()
+				// this.$refs.bindmobile3.open()
 			},
 			// 已拒绝
 			declined() {
-				this.$refs.bindmobile2.open()
+				// this.$refs.bindmobile2.open()
+				this.$refs.bindmobile3.open()
 			},
 			//删除订单
 			deleteOrder(item) {
@@ -438,10 +447,56 @@
 </script>
 
 <style lang="scss" scoped>
+	.content {
+		height: 100vh;
+		position: relative;
+
+	}
+
 	.content_top {
 		background-color: #FFFFFF;
 	}
 
+	.adddelegation {
+		width: 694rpx;
+		height: 95rpx;
+
+
+		background: linear-gradient(276deg, #F98649 0%, #F34E45 100%);
+		box-shadow: 0 5rpx 11rpx 2rpx rgba(136, 20, 7, 0.3);
+		border-radius: 47rpx 47rpx 47rpx 47rpx;
+		opacity: 1;
+		display: flex;
+		position: fixed;
+		position: absolute;
+		bottom: 84rpx;
+		left: 50%;
+		margin-left: -347rpx;
+
+		.adddelegation-one {
+			width: 50rpx;
+			margin-right: 30rpx;
+			height: 50rpx;
+			margin-left: 242rpx;
+
+			margin-top: 21rpx;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+			}
+		}
+
+		.adddelegation-two {
+			font-size: 32rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin-top: 25rpx;
+		}
+
+
+	}
 
 	.content_top {
 
@@ -637,12 +692,11 @@
 				}
 
 				span {
-					width: 0px;
+					width: 1px;
 					height: 30rpx;
 					opacity: 1;
-
-					margin-top: 10rpx;
-					border: 2rpx solid #CCCCCC;
+					margin-top: 8rpx;
+					background-color: #cccccc;
 
 				}
 
@@ -823,7 +877,7 @@
 
 			.entrust_bg-content {
 				position: absolute;
-				top: 404rpx;
+				top: 304rpx;
 
 				.bg-content-a {
 					margin-left: 242rpx;
@@ -869,7 +923,7 @@
 
 				.bg-content_textarea {
 					width: 624rpx;
-					height: 152rpx;
+					height: 242rpx;
 					padding: 25rpx 18rpx;
 
 					background: #F5F5F5;
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 6be2850..63e69da 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -14,7 +14,7 @@
 				</view>
 				<view class="content-one-txt">
 					<view class="one-txt-a">
-						{{item.content}}
+						{{item.title}}
 					</view>
 					<view class="one-txt-b">
 						委托周期:{{item.entrust_day}}
@@ -27,7 +27,7 @@
 					待处理
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a">
+					<view class="contentgn_a" @click="soldEdit(item)">
 						处理
 					</view>
 					<span></span>
@@ -44,13 +44,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="content-two_oneq" v-if="item.type==2">
-
-
+			<view class="content-two_oneq" v-if="item.mer_status==1">
 				<view class="content-two-editb" @click="accepted">
 					已接受
 				</view>
-
 				<view class="contentgn">
 					<view class="contentgn_a" style="margin-left: 10rpx;"
 						v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)">
@@ -71,25 +68,21 @@
 					</view>
 				</view>
 			</view>
-			<view class="content-two_one" v-if="item.type==3">
-
-
+			<view class="content-two_one" v-if="item.mer_status==2">
 				<view class="content-two-editc" @click="declined">
 					已拒绝
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a">
+					<view class="contentgn_a" click="deleteOrder(item)">
 						删除
 					</view>
 					<span></span>
-					<view class="contentgn_b">
+					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
 				</view>
 			</view>
 			<view class="content-two_one" v-if="item.type==4">
-
-
 				<view class="content-two-editd" @click="soldEdit">
 					已完成
 				</view>
@@ -109,7 +102,6 @@
 		<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
 		<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
 		<uni-popup ref="bindmobile" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -121,19 +113,16 @@
 								委托申请处理
 							</view>
 							<view class="bg-content-b">
-								结算周期: <span>30天</span>
-
-
+								结算周期: <span>{{obj.settle_cycle}}天</span>
 							</view>
 							<view class="bg-content-c">
-								利息比例: <span>0.05%</span>
+								利息比例: <span>{{obj.interest_rate}}%</span>
 							</view>
-
 							<view class="entrust_bga_btn">
-								<view class="cancellation">
+								<view class="cancellation" @click="passDelete(obj)">
 									拒绝
 								</view>
-								<view class="determine">
+								<view class="determine" @click="passagree(obj)">
 									接受
 								</view>
 							</view>
@@ -143,7 +132,6 @@
 			</view>
 		</uni-popup>
 		<uni-popup ref="bindmobile1" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -164,15 +152,11 @@
 								</view>
 							</view>
 						</view>
-
 					</view>
-
 				</view>
-
 			</view>
 		</uni-popup>
 		<uni-popup ref="bindmobile2" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -185,13 +169,10 @@
 							</view>
 							<view class="bg-content-b">
 								结算周期: <span>30天</span>
-
-
 							</view>
 							<view class="bg-content-c">
 								利息比例: <span>0.05%</span>
 							</view>
-
 							<view class="entrust_bga_btn">
 								<view class="cancellation">
 									拒绝
@@ -219,20 +200,15 @@
 							</view>
 							<view class="bg-content-b">
 								结算周期: <span>30天</span>
-
-
 							</view>
 							<view class="bg-content-c">
 								利息比例: <span>0.05%</span>
 							</view>
 							<view class="bg-content-c">
-
 								拒绝原因：
 								<view class="" style="margin-top: 21rpx;">
-
 									<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
 								</view>
-
 							</view>
 							<view class="entrust_bga_btn">
 								<view class="determine">
@@ -250,7 +226,11 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
-	import {} from '@/api/sale.js'
+	import {
+		entrustlist,
+		finishchain,
+		checkchain
+	} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
@@ -321,14 +301,32 @@
 
 		},
 		mounted() {
-
+			this.commislist()
 		},
 		methods: {
+			onReachBottom() {
+				if (this.status == 'nomore') return;
+				this.status = 'loading';
+				this.where.page = ++this.where.page;
+				this.commislist()
+			},
 			nav(item) {
-				uni.navigateTo({
-					url: '/pages/commissionedSales/delegation_details/index'
+				// uni.navigateTo({
+				// 	url: '/pages/commissionedSales/delegation_details/index'
+				// })
+			},
+			//获取分类数据
+			commislist() {
+				entrustlist(this.where).then((res) => {
+					this.orderList.push(...res.data.list)
+					if (res.data.list.length < this.where.limit) this.status = 'nomore'
+
+					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+
 				})
 			},
+
+			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
@@ -339,7 +337,6 @@
 			},
 			//管理弹窗
 			close() {
-				console.log('1111111')
 				this.$refs.bindmobile.close()
 				this.$refs.bindmobile1.close()
 				this.$refs.bindmobile2.close()
@@ -356,14 +353,10 @@
 				this.obj = item
 
 				this.$refs.bindmobile.open()
-
-
-
-
 			},
 			//已接受
 			accepted() {
-				this.$refs.bindmobile1.open()
+
 			},
 			//结束委托
 			closingorder(item) {
@@ -383,6 +376,7 @@
 				finishchain(item.community_id, {
 					status: 1
 				}).then((res) => {
+					console.log(res)
 					this.$util.Tips({
 						title: res.message,
 						icon: 'success'
@@ -401,7 +395,8 @@
 			},
 			// 已拒绝
 			declined() {
-				this.$refs.bindmobile2.open()
+				// this.$refs.bindmobile2.open()
+				this.$refs.bindmobile3.open()
 			},
 			//删除订单
 			deleteOrder(item) {
@@ -838,7 +833,7 @@
 
 			.entrust_bg-content {
 				position: absolute;
-				top: 404rpx;
+				top: 304rpx;
 
 				.bg-content-a {
 					margin-left: 242rpx;
@@ -884,7 +879,7 @@
 
 				.bg-content_textarea {
 					width: 624rpx;
-					height: 152rpx;
+					height: 242rpx;
 					padding: 25rpx 18rpx;
 
 					background: #F5F5F5;
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 9a5671c..4150e71 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -53,7 +53,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>
@@ -64,7 +64,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"
 								src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
@@ -149,7 +149,7 @@
 									</image>
 									<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>
@@ -172,7 +172,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/product/basicSet.vue b/pages/product/basicSet.vue
index 530f9fd..f9e2eec 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -273,7 +273,7 @@
 		},
 		onLoad(e) {
 			this.id = e.mer_id
-			// this.getMerchantInfo(e.mer_id)
+			this.getMerchantInfo(e.mer_id)
 			
 		    this.isZiti = true
 		    this.isKuaidi = true

From 5d507c251502d69635975f27251a85c864705131 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Mon, 11 Sep 2023 11:53:55 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/cloud_entrepot/index.vue | 50 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 35bd961..43041bb 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.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">
@@ -26,7 +26,7 @@
 							<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
 								height="50.82rpx" @click='goBack'></u--image>
 							<view class="head_tit">
-								通滩镇里海云仓
+								{{town}}里海云仓
 							</view>
 						</view>
 						<view class="head_r" @click="showPop=true">
@@ -108,8 +108,6 @@
 								</view>
 							</view>
 							<view class="goods_list" v-if="goodsList.length>0">
-								<!-- <view style="background-color: white;height: 100rpx;" v-if="!showtit">
-							</view> -->
 								<view class="empty" v-if='showLoading'>
 									<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
 								</view>
@@ -149,7 +147,7 @@
 									</view>
 								</view>
 								<view style="height: 100rpx;">
-
+									<u-loadmore :status="status" />
 								</view>
 							</view>
 
@@ -162,7 +160,7 @@
 								</view>
 							</view>
 
-							<view class="card">
+							<view class="card" :style="`bottom:${appInfo.bottom}px`">
 								<view class="left">
 									<view class="" style="position: relative;">
 										<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
@@ -259,6 +257,7 @@
 		data() {
 			let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
 			return {
+				appInfo: {},
 				pocls: "",
 				type: "",
 				act_swiper: "",
@@ -279,6 +278,7 @@
 				cartList: [],
 				activeClass: 'activeClass',
 				headtop: "",
+				page_num: 1,
 				actList: [{
 					tit: '综合',
 					act: "",
@@ -292,14 +292,9 @@
 					act: "",
 					screen: "price_asc"
 				}],
-				list3: [
-					'/static/images/LHYC/BG.png',
-					'/static/images/LHYC/WYLVYC.png',
-					'/static/images/LHYC/NFCPYC.png',
-					'/static/images/LHYC/BG.png',
-					'/static/images/LHYC/NFCPYC.png',
-					'/static/images/LHYC/NFCPYC.png',
-				],
+				status: "loadmore",
+				flag: false,
+
 			}
 		},
 		onLoad(e) {
@@ -307,15 +302,31 @@
 			uni.getSystemInfo({
 				success: (res) => {
 					this.winHeight = res.windowHeight
+					this.appInfo = res.safeAreaInsets
 				},
 			});
 			this.street_code = e.street
 			this.town = e.town
 			this.getCloundShop()
 		},
-		onShow() {
+		// 分页
+		// 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
+		// 		}
+		// 	})
+		// },
+
 
-		},
 		onPageScroll(e) {
 			let that = this
 			this.showtit = !Boolean(e.scrollTop)
@@ -323,6 +334,7 @@
 				.in(this)
 				.select('.content')
 				.boundingClientRect(rect => {
+					console.log(rect)
 					if (rect.top <= this.headtop) {
 						this.pocls = 'fixed'
 						this.act_swiper = 'act_swiper'
@@ -419,7 +431,9 @@
 					street_code: this.street_code,
 					category_id: this.cloudList[this.current].category_id,
 					order: this.type,
-					keyword: this.keyword
+					keyword: this.keyword,
+					// page_num: this.page_num
+
 				}).then(res => {
 					this.goodsList = res.data.list
 					this.showLoading = false
@@ -727,7 +741,7 @@
 		left: 50%;
 		transform: translateX(-50%);
 		position: fixed;
-		bottom: 0;
+		// bottom: 0;
 		background-color: #333333;
 		height: 101.64rpx;
 		border-radius: 50.82rpx;

From 4b2dbc1be50d06094c9c1ec90ed38acefe644cf1 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 11:56:17 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8Atabar=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/sale.js                                   |  16 ++-
 pages.json                                    |  24 ++--
 .../delegation_details/index.vue              |  61 +++++-----
 .../initiateDelegation/index.vue              |  96 ++++++++++------
 .../receivedCommission/index.vue              |  17 ++-
 pages/order_pay_status/index.vue              |  11 ++
 pages/supply_chains/supply_chains.vue         | 107 +++++++++++++-----
 static/tabbar_icon/a-a.png                    | Bin 3995 -> 4650 bytes
 static/tabbar_icon/a.png                      | Bin 2080 -> 1446 bytes
 static/tabbar_icon/b-a.png                    | Bin 4042 -> 4771 bytes
 static/tabbar_icon/b.png                      | Bin 2174 -> 2656 bytes
 static/tabbar_icon/c-a.png                    | Bin 4914 -> 4873 bytes
 static/tabbar_icon/c.png                      | Bin 1882 -> 1625 bytes
 static/tabbar_icon/d-a.png                    | Bin 4335 -> 3750 bytes
 static/tabbar_icon/d.png                      | Bin 4070 -> 2193 bytes
 static/tabbar_icon/e-a.png                    | Bin 3867 -> 4903 bytes
 static/tabbar_icon/e.png                      | Bin 2696 -> 2267 bytes
 17 files changed, 214 insertions(+), 118 deletions(-)

diff --git a/api/sale.js b/api/sale.js
index a11ed19..c7e5ce8 100644
--- a/api/sale.js
+++ b/api/sale.js
@@ -35,8 +35,22 @@ export function checkchain(id,data) {
 export function finishchain(id,data) {
   return request.post("community/entrust/apply/finish/"+id, data);
 }
-
+//商家申请结束委托
+export function finishentrust(id,data) {
+  return request.post("community/entrust/finish/"+id, data);
+}
 //委托商品加入购物车
 export function addEntrustCart(data) {
   return request.post("community/entrust/addEntrustCart", data);
+}
+
+
+//获取委托商品详情
+export function entrustdetail(id) {
+  return request.get("community/entrust/"+id);
+}
+
+//编辑委托商品详情
+export function editentrust(id,data) {
+  return request.post("community/entrust/edit/"+id, data);
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 397cbbd..19b254a 100644
--- a/pages.json
+++ b/pages.json
@@ -1611,16 +1611,16 @@
 			},
 			{
 				"pagePath": "pages/plant_release/index",
-				"iconPath": "static/tabbar_icon/d.png",
-				"selectedIconPath": "static/tabbar_icon/d-a.png",
-				"text": "发布",
-				"visible": false
+				"iconPath": "static/tabbar_icon/c.png",
+				"selectedIconPath": "static/tabbar_icon/c-a.png",
+				"text": "发布"
+			
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
 
-				"iconPath": "static/tabbar_icon/c.png",
-				"selectedIconPath": "static/tabbar_icon/c-a.png",
+				"iconPath": "static/tabbar_icon/d.png",
+				"selectedIconPath": "static/tabbar_icon/d-a.png",
 				"text": "供应"
 			},
 			{
@@ -1629,16 +1629,8 @@
 				"selectedIconPath": "static/tabbar_icon/e-a.png",
 				"text": "我的"
 			}
-		],
-		"midButton": {
-			"width": "68px",
-			"height": "70px",
-			"iconWidth": "48px",
-			"selectedColor": "#E93323",
-			"pagePath": "pages/plant_release/index",
-			"iconPath": "static/tabbar_icon/d.png",
-			"text": "发布"
-		}
+		]
+		
 
 
 
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 05b293a..6d24b4c 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -10,7 +10,9 @@
 					{{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
 				</view>
 				<view class="top-two-two">
-					2020-07-07 14:14:14
+					<!-- 2020-07-07 14:14:14
+					 -->
+					 {{objinfo.entrust_start_date}}
 				</view>
 			</view>
 		</view>
@@ -37,12 +39,12 @@
 
 			</view>
 
-			<view class="content_center-two">
+			<view class="content_center-two" v-if="objinfo">
 				<view class="center-two">
 					<view class="center-twoa">
 						委托方:
 					</view>
-					<view class="center-twob">
+					<view class="center-twob" >
 						{{objinfo.mer_info.mer_name}}
 					</view>
 				</view>
@@ -50,7 +52,7 @@
 					<view class="center-twoa">
 						被委托方:
 					</view>
-					<view class="center-twob">
+					<view class="center-twob" >
 						{{objinfo.entrust_mer_info.mer_name}}
 					</view>
 				</view>
@@ -92,7 +94,7 @@
 						是否结束委托:
 					</view>
 					<view class="center-twob">
-					{{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
+						{{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
 					</view>
 				</view>
 				<view class="center-two" v-if="objinfo.entrust_finish_refusal">
@@ -100,7 +102,7 @@
 						拒绝原因:
 					</view>
 					<view class="center-twob" style="text-align: left;">
-					{{objinfo.entrust_finish_refusal}}
+						{{objinfo.entrust_finish_refusal}}
 					</view>
 				</view>
 			</view>
@@ -122,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>
 
@@ -150,12 +152,12 @@
 						img: require('@/static/images/wtt2.png')
 					}
 				],
-type:0,
+				type: 0,
 			}
 		},
 		onLoad(e) {
 			this.list(e.id)
-			this.type=e.type
+			this.type = e.type
 		},
 		onShow() {
 
@@ -164,25 +166,27 @@ type:0,
 
 			list(id) {
 				entrustdetail(id).then((res) => {
-
+console.log(res.data)
 					this.objinfo = res.data
 				})
 			},
-			
-			submit(item){
-			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()
-					})
-				}
-				
-			})
+
+			submit(item) {
+				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()
+						})
+					}
+
+				})
 			}
 		}
 
@@ -192,9 +196,10 @@ type:0,
 
 
 <style lang="scss">
-	.content{
+	.content {
 		position: relative;
 	}
+
 	.content_top {
 		height: 151rpx;
 		background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
@@ -366,10 +371,8 @@ type:0,
 		color: #FFFFFF;
 		position: absolute;
 		left: 50%;
-		margin-left:-347rpx;
+		margin-left: -347rpx;
 		position: fixed;
 		bottom: 100rpx;
 	}
-
-
 </style>
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index 5ade2bd..d4ac509 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -17,7 +17,7 @@
 						{{item.title}}
 					</view>
 					<view class="one-txt-b">
-						委托周期:{{item.credit_buy}}
+						委托周期:{{item.entrust_day}}
 					</view>
 				</view>
 			</view>
@@ -25,11 +25,11 @@
 
 
 			<view class="content-two_one" v-if="item.mer_status==0">
-				<view class="content-two-edita"  @click="order">
+				<view class="content-two-edita" @click="order">
 					待处理
 				</view>
 				<view class="contentgn">
-				<!-- 	<view class="contentgn_a" @click="soldEdit(item)">
+					<!-- 	<view class="contentgn_a" @click="soldEdit(item)">
 						处理
 					</view> 
 					<span></span>-->
@@ -51,10 +51,10 @@
 					已接受
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a" @click="closingorder">
+					<view class="contentgn_a"   @click="closingorder(item)" v-if="item.entrust_finish==3">
 						结束委托
 					</view>
-					<span></span>
+					<span v-if="item.entrust_finish==3"></span >
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -166,17 +166,17 @@
 							<view class="bg-content-a" style="margin-left: 207rpx;">
 								结束委托申请处理
 							</view>
-							<view class="bg-content-b">
-								结算周期: <span>30天</span>
+							<view class="bg-content-b" v-if="obj.mer_info">
+								结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
 							</view>
-							<view class="bg-content-c">
-								利息比例: <span>0.05%</span>
+							<view class="bg-content-c" v-if="obj.mer_info">
+								利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 							</view>
 							<view class="entrust_bga_btn">
-								<view class="cancellation">
+								<view class="cancellation"  @click="refused">
 									拒绝
 								</view>
-								<view class="determine">
+								<view class="determine"  @click="agree(obj)">
 									接受
 								</view>
 							</view>
@@ -197,19 +197,19 @@
 							<view class="bg-content-a" style="margin-left: 207rpx;">
 								结束委托申请处理
 							</view>
-							<view class="bg-content-b">
-								结算周期: <span>30天</span>
+							<view class="bg-content-b" v-if="obj.mer_info">
+								结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
 							</view>
-							<view class="bg-content-c">
-								利息比例: <span>0.05%</span>
+							<view class="bg-content-c" v-if="obj.mer_info">
+								利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 							</view>
 							<view class="bg-content-c">
 								拒绝原因：
 								<view class="" style="margin-top: 21rpx;">
-									<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
+									<textarea v-model="refuseds" placeholder="输入拒绝原因" class="bg-content_textarea" />
 								</view>
 							</view>
-							<view class="entrust_bga_btn">
+							<view class="entrust_bga_btn" @click="agree(obj)">
 								<view class="determine">
 									接受
 								</view>
@@ -228,7 +228,8 @@
 	import {
 		entrustlist,
 		finishchain,
-		checkchain
+		checkchain,
+		finishentrust
 	} from '@/api/sale.js'
 	export default {
 		components: {
@@ -290,7 +291,8 @@
 
 					}
 				],
-				obj: {}
+				obj: {},
+				refuseds:''
 			}
 		},
 		onLoad() {
@@ -330,7 +332,7 @@
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
 				this.where.page = 1
-				this.orderList=[]
+				this.orderList = []
 				this.where.status = e.type
 				this.commislist()
 			},
@@ -354,18 +356,18 @@
 				this.$refs.bindmobile3.close()
 			},
 			//提交订单
-			
-			order(item){
-				 if(item.mer_status==0&&entrust_order_id!=0){
-					 uni.navigateTo({
-					 	url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
-					 })
-				 }else{
-					 this.$util.Tips({
-					 	title:'商家还没同意该订单',
-					 	icon: 'err'
-					 })
-				 }
+
+			order(item) {
+				if (item.mer_status == 0 && entrust_order_id != 0) {
+					uni.navigateTo({
+						url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
+					})
+				} else {
+					this.$util.Tips({
+						title: '商家还没同意该订单',
+						icon: 'err'
+					})
+				}
 			},
 			//详情
 
@@ -386,15 +388,41 @@
 
 			},
 			//结束委托
-			closingorder() {
-				this.$refs.bindmobile1.open()
+			closingorder(item) {
+				console.log(item)
+				this.obj=item
+				this.$refs.bindmobile2.open()
 				// this.$refs.bindmobile3.open()
 			},
+			//拒绝申请委托
+			refused() {
+				this.$refs.bindmobile2.close()
+				setTimeout(() => {
+					this.$refs.bindmobile3.open()
+				}, 1000)
+			},
 			// 已拒绝
 			declined() {
 				// this.$refs.bindmobile2.open()
 				this.$refs.bindmobile3.open()
 			},
+			agree(item){
+				finishentrust(item.community_id,{
+					 status: 2,
+					 refusal:this.refuseds
+				}).then(res => {
+					
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle = "tabTwo"
+					this.$refs.bindmobile2.close()
+					this.$refs.bindmobile3.close()
+					this.commislist()
+				})
+			},
 			//删除订单
 			deleteOrder(item) {
 				checkchain(item.community_id, {
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 63e69da..0e6775a 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -51,7 +51,7 @@
 				<view class="contentgn">
 					<view class="contentgn_a" style="margin-left: 10rpx;"
 						v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)">
-						结束委托
+						申请结束委托
 					</view>
 					<span v-if="item.entrust_order_id>0&&item.mer_status==1"></span>
 					<view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;"
@@ -60,9 +60,6 @@
 					</view>
 					<span v-if="item.entrust_order_id==0"></span>
 
-
-
-
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -370,9 +367,9 @@
 					url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
 				})
 			},
-			//结束委托申请
+			//申请结束委托申请
 			deteragrss(item) {
-				console.log(item)
+
 				finishchain(item.community_id, {
 					status: 1
 				}).then((res) => {
@@ -384,9 +381,9 @@
 					this.orderList = []
 					this.tabTitle = "tabTwo"
 					this.commislist()
-					this.$refs.bindmobile1.colse()
-				}).catch((err)=>{
-		
+					this.$refs.bindmobile1.close()
+				}).catch((err) => {
+                    this.$refs.bindmobile1.close()
 					this.$util.Tips({
 						title: err,
 						icon: 'error'
@@ -428,7 +425,7 @@
 					this.orderList = []
 					this.tabTitle = "tabOne"
 					this.commislist()
-					this.$refs.bindmobile1.colse()
+					this.$refs.bindmobile.close()
 				})
 			},
 			//审核通过 同意
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index 71d610f..a28f466 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -232,6 +232,17 @@
 							})
 						}
 					
+				} else if (this.product_type == 99) {
+					if(val==1){
+						uni.navigateTo({
+							url: `/pages/users/order_list/relase?status=1&product_type=${this.product_type}`
+						})
+						}else{
+							uni.navigateTo({
+								url: `/pages/users/order_list/relase?status=0&product_type=${this.product_type}`
+							})
+						}
+					
 				} else {
 					if(val==1){
 						uni.navigateTo({
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 5ab73b6..8255da7 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -14,7 +14,11 @@
 						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
 					</navigator>
 				</view>
+
+
 			</view>
+
+
 			<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
 				@change="dchange">
 			</zbpSwiper>
@@ -70,8 +74,6 @@
 			</view>
 
 			<view class="list-con">
-				<!-- <view class="list-con-left"
-					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')"> -->
 				<view class="list-con-left"
 					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
 					<!-- <view class="list-con-title">
@@ -85,8 +87,6 @@
 					<image src="@/static/images/f5.png" mode="aspectFit"></image>
 				</view>
 				<view class="list-con-right">
-					<!-- <view class="con-right" style="margin-bottom: 20rpx"
-						@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')"> -->
 					<view class="con-right" style="margin-bottom: 20rpx"
 						@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
 						<!-- <view class="list-con-title">
@@ -99,8 +99,6 @@
 						</view> -->
 						<image src="@/static/images/f7.png" mode="aspectFit"></image>
 					</view>
-					<!-- 	<view class="con-right"
-						@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')"> -->
 					<view class="con-right"
 						@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
 						<!-- <view class="list-con-title">
@@ -119,7 +117,10 @@
 				<image src="@/static/images/f4.png" mode="aspectFit"></image>
 			</view>
 			<view class="goodslist">
-				<WaterfallsFlow :wfList="cateGoods" />
+				<WaterfallsFlow :wfList="productList"  :type="1" />
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 			</view>
 			<view class="empty_wrapper" v-if="emptyShow">
 				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
@@ -128,14 +129,13 @@
 
 		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-		<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
+
 
 		<view class="location" v-if="isshow">
 			<view class="locationa"> 位置权限使用说明 </view>
 			<view class="locationb"> 用于向你推荐最近门店 </view>
 		</view>
 		<!-- <m-tabbar native>
-		<!-- 	<m-tabbar native>
 		      <template v-slot:tabbar_index_2>
 		        <view class="custom_style">
 		          <view class="custom_style_icon"></view>
@@ -199,7 +199,7 @@
 				},
 				isshow: false,
 				locationArr: ({}),
-				status: 'loadmore',
+			
 				bgColor: '',
 				showPicker: false,
 				columnData: [],
@@ -223,20 +223,23 @@
 				location: '',
 				emptyShow: false,
 				town: '',
-				cateGoods: [],
+				productList: [],
 				recoList: [],
 				articleList: [],
 				street_id: '',
 				street: '',
 				bgColor: '',
 				isFshow: false,
-				backColor: 'rgba(252, 252, 252, 0)'
+				backColor: 'rgba(252, 252, 252, 0)',
+				loadend: false,
+				loading: false,
+				loadTitle: '加载更多',
 			}
 		},
 
 		onPullDownRefresh() {
-			this.cateGoods = []
-			this.list()
+			
+			this.list(true);
 			this.Area()
 			uni.stopPullDownRefresh()
 		},
@@ -263,11 +266,15 @@
 		},
 
 		onReachBottom() {
-			if (this.status == 'nomore') return;
-			this.status = 'loading';
-			this.where.page = ++this.where.page;
+			if (this.productList.length > 0) {
+				setTimeout(() => {
+					this.list(false);
+				}, 500)
+			} else {
+				this.list()
+			}
 
-			this.list()
+			
 		},
 		beforeDestroy() {
 			// 销毁监听事件
@@ -322,17 +329,59 @@
 
 			},
 			//获取商品列表
-			list(id) {
+			list(isPage,id) {
 				if (id) {
-					spuInfo(id, this.where1).then(res => {
-						this.cateGoods.push(...res.data.list)
 					
-					})
+					let that = this;
+					if (that.loadend) return;
+					if (that.loading) return;
+						           
+					if (isPage === true) that.$set(that, 'productList', []);
+							
+					that.loading = true;
+					that.loadTitle = '';
+					spuInfo(id,that.where).then(res => {
+						let list = res.data.list;
+						let productList = that.$util.SplitArray(list, that.productList);
+						let loadend = list.length < that.where.limit;
+						that.loadend = loadend;
+						that.loading = false;
+						that.loadTitle = loadend ? '已全部加载' : '加载更多';
+						that.$set(that, 'productList', productList);
+						// console.log(that.productList)
+						that.$set(that.where, 'page', that.where.page + 1);
+						if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
+					}).catch(err => {
+						that.loading = false;
+						that.loadTitle = '加载更多';
+					});
+					
 					 
 				} else {
-					getProductHot(this.where.page, this.where.limit).then(res => {
-						this.cateGoods.push(...res.data.list)
-					})
+					let that = this;
+					if (that.loadend) return;
+					if (that.loading) return;
+						           
+					if (isPage === true) that.$set(that, 'productList', []);
+							
+					that.loading = true;
+					that.loadTitle = '';
+					getProductHot(that.where.page,that.where.limit).then(res => {
+						let list = res.data.list;
+						let productList = that.$util.SplitArray(list, that.productList);
+						let loadend = list.length < that.where.limit;
+						that.loadend = loadend;
+						that.loading = false;
+						that.loadTitle = loadend ? '已全部加载' : '加载更多';
+						that.$set(that, 'productList', productList);
+						// console.log(that.productList)
+						that.$set(that.where, 'page', that.where.page + 1);
+						if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
+					}).catch(err => {
+						that.loading = false;
+						that.loadTitle = '加载更多';
+					});
+					
 				}
 
 
@@ -398,8 +447,8 @@
 				this.street = e.value[1].name
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
-				this.cateGoods=[]
-                this.list(this.street_id)
+				this.productList=[]
+                this.list(true,this.street_id)
 				this.$nextTick(() => {
 					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
@@ -489,7 +538,7 @@
 				this.street = e.value[1].name
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
-				this.cateGoods=[]
+				this.productList=[]
 				this.list(this.street_id)
 			},
 			selfLocation() {
@@ -512,6 +561,7 @@
 							lat: latitude,
 							long: longitude
 						}).then(res => {
+							this.isshow = false
 							this.town = res.data.address_reference.town.title
 							this.street_id = res.data.address_reference.town.id
 							this.street = res.data.address_component.street
@@ -522,6 +572,7 @@
 							})
 							this.list(this.street_id)
 						}).catch(err => {
+							this.isshow = false
 							uni.showToast({
 								title: err,
 								icon: 'none'
diff --git a/static/tabbar_icon/a-a.png b/static/tabbar_icon/a-a.png
index ae29eb198f23aa585320268096900f2c551f5311..8b07313a5209bfd43073ad9382d849e83ed261f6 100644
GIT binary patch
delta 4645
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
bT@d~s5al>#R%y<900000NkvXXu0mjfDRuG5

delta 3985
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

diff --git a/static/tabbar_icon/a.png b/static/tabbar_icon/a.png
index dd9d6f337e1cb5f5c2a089e5a2c761ec2a927c6a..526b79a4bbde492e3ddee839f46bd888c0c017c4 100644
GIT binary patch
delta 1416
zcmV;31$X+O5T*-|Fn<MLNkl<ZcwX(BT}UHW6vrps7-K{;(MUo*G!N1T)3mXbwo=xG
zg@X8Et6^EUp;3fd`mv4)S`thmlspwp0wNY+Lu*^wP>I4?*r)igwhIj^tq5T;RE?Ps
z+~DTJWMecXu!XYS&3xUMvE01m;huBu|NiDbXJ(kW90dMK5`W-8KBWmjKm-nffFK}d
zO$0g!ItV(58G*~-pxN13Ln4tF%;j=#rPFCXm&+{(1cKv2q3}yfOUoUD!Qd||g%ZUp
z+JhDs7hem7LW_w+LQ@KWNF?&BRI1PPdi~BtgQ^%Hm&<iK8ja4Jo}OMIvuGZVciPm{
z^r6vc{E<vNsDGFX2NVbds@B%lJUEVjKy?uu4hK;v6iy7oj8t>!#$PBPuh-kUy}iAh
zPN&s$1sC%g8X8vH+uLvT^z<Z{)FG35VSrpN*SkkYM@yMZrjCp-q8Ncdu-n?&+Gj8r
z{ve8FGJYX|oKB}1$8pEm*%{FJs;jGW5{bkxIyzdmzJCN%@Uus%*l+xP{}0h<RLA5f
zmdfRDI0d;}?j9Q(8!N{gWdr2(dYgB4c6`ZX^7V2Ef3~JbBwA~0Yt!}h^*sVPUs(Xn
z&COklL?XUSCL;nVmZ+9MAUIU1RPPNB4+n^1$&LdD<a9cX(P;Fmd_MmYSrH)PcsyQS
zB9VN8VSm^Hh`PW4dA;5%`}_Of;W&O1gfONx<Z}5pMx$|%X&oSdR#sMITU%ScL?ZDf
zQ$Zl}>+9<uXtmn@-rn8_-MWkc&CkzwhQr~NOeWJrS427UYHDhZluG6MBO@dC>CD3j
zklXG47{~Ehvd>d=1cJz^s;WAdN~NP1hRsr~M}G^D$K&D0VzKXIu~;9~2`d>dlgYj{
znM?*M8Ylx=US3viZf@R9rBbg_nTRd1LZNV7tybUc@9z(j(L@Q*($Z4P#>U24Hk(zE
zDbCgyfk5z=Mx(iQ<Hn7BB8`*)+3ohtR4Sz<DtZ~lQ53yzwOX$dX(bKF>2!V?4u>f>
zIe#Jnl^oY-G`hjT!KG3fNCR>>9KXlo@s3I^2=v@_b#-^9rly900J7O^Ptxf$546Zi
z))R}x56x!t%Rm5`Or}C57gLV8Q4~G4TCF7?s7aq<|5HGZtyU`v9rOYMB9Z9v<m4m-
z^dg5qKm?5oMNxQ)m0|=PMBpF@2m)eucYg#O1Rcc8LGUUD9RwZ3i~w{HGk&lKK?gB&
z5WEk953A5Y%m`c-2l4rQq^qk75sAQkPqn+div$A9zLR1_58`sU2!>&ZR4N7ThV}Jz
z#OL$TuFHzcyjrbBhK7b{FM=r1VzD5(T#hL0x#O$=q}6H>y<Sgi0c4Wwb~}<zr+>+W
z{wIbNfNE=Nk%@^3r1%f|7YqiGg$4SbA_4_8K0bbaetu5+J=(uv6#GwicQ+!F$$&7*
z=krLhNw2Q1BH3(~cFo4d#)!pYk(Vk!dck(PJ(EhM__WoqFi|WPKQNokoj?FN9FE`O
z@%Y;;TqkWwD2je*wOVaJ08LL%-+zuoB5vAhSeV$+(eci}z`(CS02RMW4244Y$;nB{
zSG6qU@LWkkq0n!$*{&1mCEbIHg<LLI|G~k*&qPJpK3?3ts8*}r(ChVo5^1Fbs90=f
zX6Ea|!^4k=3bS>*xI0LxRNf-Hg^Dtur;yw@j(<+~vR^59Pxo=?F%0{OtbYbtfQrRE
z9?#Xiy}h|)GWiPG$to3Bbd69byw}{^`~}q=inIa!vska!dp#Hob{-!eD-Z->&3#g#
zP<X=Oa2_d@$|HqBaaX6)J*0Dh7z3g+>1E1+fC!Ej1Ox#wJE5V2po5@;m=Pez{u_PQ
W3uinu%~=2d002ovPDHLkU;%=$kDqJ+

delta 2054
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

diff --git a/static/tabbar_icon/b-a.png b/static/tabbar_icon/b-a.png
index 0a6a048991025f7f1fcebb9dc588098258911b79..545478855169524c99aff8a1030faba196e9f415 100644
GIT binary patch
delta 4767
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

delta 4032
zcmV;x4?pmuCCVR=Fn<q(Nkl<ZcwX(Ce~ewnRmZ<)=DvI1eY?-Uk~N`;?R9Wn;Y0z|
zlq#-7)(Ma*q`*H`NrI>d|3HI834|u3N$kcXDJ8ga#gB^87K)lSYa>Ofgn~-F1Q0)p
zg-B~FZrreLoTgdVcI>zN-u*cTow@hEefzv`_x-d}DI=}lkAFKecjoiHb7tn8xhA}w
zRwO`g^I4g|TLw_$mMyzU(MJJ#AA^6OfM;A4KTZGi+Sx1lBVKVp(Jh<aW3=-}0Di6=
z1OXR~F$c?y+9&Bh&t1F{pspC8aB9<ytn}kx{1S*(YzKkQf$=Bq*~US7@r{Mc3F@)~
z;@dV~AF$p>;D5US(!F$+!E?-b%4hrq&CCY9l<ha~Wdp?T+w_jm(~p4ZH$W)$+h8fj
z%&%#}{?dinzow&z2dQhdvLgq?w_STxm^u%F=spnnt2L;n>&*YhjE|RRX1_>4+Edvs
zGmi`qPfd&mH1+@yeFVUoF5A;zHs%wCvDcrO{R#oxUw<Xbml`@Co|-I&#2;p;hlp_X
zFdN%NT`v;zqu!C(=eo$-RhFRv;wd;GCdIxy0-|fXy8DPS5%3LWex!V4_W40?F%&?-
z?k#tK=paBpHfV!}S)PG^Ars$Qo;iK8-+BiIRG*sspi=bZej70Aa?CgrFGN4S=D+$|
zkq-<gxPNu>C4k;F>W&Unzv163&&+<NpE?Eyw0p8X^y#~wo~%%Y3_s}2%zmPuY6k~&
z>(+l<ZXeZ8V@6d*8NS(_nf;G`>K_<Tc-!V3#^~pXa9uwQ7-<<s%rH;+M@~K3?|u3L
z#K6*W@7++1Dr<g^FUO*=yPhV@{3QyK$Gv|){ePXJNI#3n;Q-27K=}C|xjKx?;?w!9
zD`S^9CGayG#{0d0``*j@06f;Rvc7VF_JVK>gfp44f@tft<ncow`gH(qcR%_dxj1Em
zX%z?i-O~3@U;;c1V9#`O+hMmKmkrRuEt@}}m6AQyH4OZ>fjL;=@BXjtVhx1G4#LK|
z0)H?W5FR1I2YYpGbdAfHLyD69rC0rz;GX28K6qypERb;Wnhnv~@_k0p9SZCigXd14
zo_*?_ClPjAe@{b9Y)>$?<z7<iv+Xw^=4nJ`pL>4%WeX=v2-R32G88BNyG%(v3Zh@^
zwqdL0V}8yg$rHXGA49EV;5m%b4#Rc%yni3~W7YJxndtXHw63)-HvA9%%<LVj)}LqS
z8Bn-;@;e~f+TjKX8U8y?;wQa}$!pkP2#r)BSx4{_m5{nAb@*c-^|ReJa7jL92IH%m
z%qQm0t7EJ$a9Y;p>Y6sMmo%5rC{@PS-pd*f5@=(md#J>`+kN5G|8&!at^l>pT7TiK
zTTK@ghk*GjFX983SLZNp2vMp~8MCipIexF*?SpRaqAu$p1Ms{y{KpP?-$Z?ZFKS|*
zS8QCztjBrO$H(thT0cx!eWPp)|B62|`)oHhX;gsnX$|uX^BE7(rx9}<=@`LH6;dV`
zLxEOPr0EYp^b^a1$`tc8r0LTh)PIZ6#0w4LF}GoAb!822sp{TIiXH;6y(`$(BWdm_
zA362RC;(A->(-t<cf@=iz^6^hU*I^6;FSr6i3Aigk;k`#aDQ`8CtwIiV9WuIofpfR
zxS@y<2F#8&91yE9OlgIO7<5y&U>4Uye7F1c*)P9k02K{mU=GF{q=cVgqkmI@1edLf
zNq{-(CT6pVlk{8A&a5pL5tkKlK*X#A21@TCO&=wqpY9b*k>8|zxBt&W0CdTUc`qn@
zp?3wfcZ3<Q63nN(&^#B4GF;axYDqpt>_rhnt}Eh@cn4%w0`2Y>Ogo@OMRj)5u4seW
z01@^A!vNIM!IzOH2f(GTEq~i-6|rWu)sXsKCcJ;O_*u8$3Iz=hkgSv?9Rr0wn2d+j
z(3TE;l?*??M47`~R3j-dzW_~70`R)+d^h=w;k*2)*=MmgQ_f1Zs5=D}TL}Oo0tChU
zJ0+0yA<Ht?OHCzm=wBIB>88`Y<RQa%xq|>&&h}(`ttkp=HX4C~K!41C>#{3q0Vw9k
z@Vi;lmwM@Vw|UzEtu)k@RnT&_M*tmtWv9Av&Dn4?fXrc+y^q<63lWHMv(faqZadve
zz7{}ItQkjJZm6vYXdgh2NfmqYoqBC2g(Cz6CJV@lXw-lvW~VU?Zgq+D1!xCAd-ed<
zl`*$Nh1b*@0Le~$sDFvr9KPIurl*1902e-^o&jYB9)u~7bz@w=gTk|;0R%ROJ*bBZ
zBh7|)(I|%)W)ES;4zJ>G+1ae)5Ni&vRzMrKsW43HqfpS51XK*ORTb1~oCVO1Js=rf
zGJ9cePGL(#qXI-QhnSVML7pOxQ?tt``utGGabe$Nn#bfJOn=N+&*Smw#bMUIE?T0X
z<p52b0Zr9*5*iKbB@7kjN8ug3oPg{?v3Awrnd(tKGXWkP(Dt2#^9{n85d$J^ZIGRN
zQ?rXkq#z4u`&EZ$zC8j!0nvAfFfn}Tn?txvfHZKsvu(qXK>*pIH@ydBhgge(8pKa4
zQXl@|1;nQ=ntz2GC$?`63qUJHKRVf<CZIjC{@K2hPQH3UmER21+LSBaSm{rh=+}k`
ziGV{)v^d1r>>>=^NPjbl<6nJ!ynJHYrnLs&KFZS*;JyJhSI{khu3Lx|s_RtX1V5z|
z?PsE0!vJNC^oWKSGryskA1|G*eev`}B@Wh=O##S;hksUxpRK5%l>lKO)bPhtT&~|~
zz!K6K=<w8N0C63L{@lBe96+T~L+wp-daPuI21smB`w%M>lmSW<oJ2RY_B5OiLDBsT
z+R%@ph6{*O2A)+(@}wK%H8dQ9F)v*X&_F|MIU|i)q)@JE1hIk}>3Jv7<F2pjL82X<
ztTp6)gnu-Bs8=V~umCah3rNhz%dY;`eAF=GiIXC7Q<O^vK`lkqHJGRvtoL~kBaLDu
z-M&z?fU4^hYC%&$3k^??xkfdjM3ckHDLI=BsRtPNK-aDjV-CUSKWwgplwAjXp?fv*
z2~Nxt9Hw9QT_;_Llo|8G6aq*TR4rQtSwM3Y1ApJ=p)3?zw;Hn>>uOR$%HA4{Mx;=R
zv<(P4WsNvh4JXll$tXCU3KFA~<NPFZ`Y?!guG&!vU8mV*)h-mlH<N?ES-l+2kl_QI
zny+{&i5sypzCbBygCt1dYJ=EK;kyRm#T4tx2B%!c#*Jp+t;S<}Ge5NK#g5O-sY(Gz
zVt?)nsX}R7BNRJS&Os#_0x0&BeKkyBViZcH+o8+@Ae!vlVg3}1{<Gq`=6GwWwVYmC
zJ~0BY`7Fi!mu^WdAXWyY(AZZ2Bwz%P=NQEEDaN$1F?<0ux7MIqWdVd6!29-gJ|@#~
zFJ@cSJk~NrsMYA?#%wKg-PMM0F4FMVD1QWrsySs{jZ#(DiKaxrdCE_jf*cYVmne;0
z_;e4L?_;9%t-U7Tf--bx3i`f$FPl|)4LSK7h<;`%AvOU0y$Shg()@-v_{*^}4NZ(V
zG!j^>q)u9MwW$iAvSZM=Xt2ReQOoVmD?YaZDxCMleOh<*tGQe=f6yM_=qpe=uYccR
z_hXqIiWM4bmCR(ddaTJy6$NEYZmKF0;}SS&nS#_P2@XnNP#TaRtvV$~p4+&`Zh9Ht
zfH6-X<r9m+i|llY$M7SU?g!B?+u4zM1}T3MhF@ZVC_zQ73?!f!D^pj*9BISlAmvb-
zYNeFfAOAw8p29$%Id1axPd1u!w}0!Z?vBOr-#lWM0W4guvgLU7g2J1DLcU<Mvzb6@
zB$_;5QJks*QlsQ48(#J#7SB|c!&U78!X@&M9FjUe>13m<lEsFiCE7~t$Dx6v%|bxT
zC2crtn5v%}XPLdkIFIGSD_=pcwm@uA)1^baaC=<pla|9#AZ(n>RMe1Fb$_Z5uCb8j
zgG7@nwx>d4Wu``wDnEx4q@Xg&2sl&H>L{{ywdX6701CjOy&RJ7XoE<URA+?Rz*WX7
z$Gd1y(*}O7p1D~AAB^IF)i8Y0O{cxI*7~KPuw@%HRg@S)b*&tjQZ+Z$q9FKVG@crQ
z&tzveQH}ihK8g@?ug^s_ihtixpfnm*K{CuLGFvqye60=YbzX$y7}PEpIEtI<Idzh;
z5!vvPG$^3FO*Z6gXERB!K-nX9^}523CX@}eR3VUKEo<#Tsaj-IwPMH~cM(tmr_5A0
zrfG}%1!QfHQd|kLm_4*&=!Hx<VyHzq`U0aYvzE?=*6R+VB5R-HjDPEqoo~7UZ2L7x
z*rz%8T0+lOMJ*o2=21JD_T?m*O#7_|rUa1Kq14cVC<?$>%c!o)H3045(|Vq#BAw1t
z^I_G7*dE2>a!ml$7cvFSE4I_R^CmZ^bvc@sFAPyVnw?z~IFj<vbBn#X<XN-sLeE(Z
zi%PPPS`KT<;!%`jhksiRs%pr7E&x?BNb?rRIL3=k%k?&B^0|O9CIA5O^Jf2Q;&BT_
z;N*a07}XS8Fru1bST*4sU$i@2DyIcn%g@>NcDWGr^s(HDCVAVHR6tt4fsmwx0#XjD
zR$;2zdsI=&!DOF1r&@lgYC+W?pQ{#*0LlL>9L+d?F8fY~)qjA>=?YMhsXY|k+{9W)
zxsnQ-6d5thWDju0oT*5Lo-7UR`%Ezxb3m&-t64lOzb02w6N;Q!6U7LS5;4xns}>{8
zOKeUtWA&(<K>*nm_OeRa5)m4S*ddbRzql&RUd4qi&_q=L&R5OSrSvK)vSk3Q7o|uN
zwFnHHfdz6l2Y(}~@g25%Enim4z1y7jrgU|Pb0sBZo7qL1bTW#_NfMfrT~`50@(3VF
zqAdHl?L^sXkVGYtL@AOiAUVfx4RiC1wEa$Is{xhMlY%+`%JyoKiY0&q7;7~;-e`~;
zMYQdmfK`+vfh9>4^^O)AVGgbnATI|Y*T0tok@o_{!hdK{jC?LOq4K_m*{aj+ds0vb
zP(>Yf&n9X*T0`dFkoA&<5-r~6x*SwdSplvipd3VTT~5;%$#ru`nPO%DOl3Z1NkzUD
zkGFKXZC?uNsHEcYDA}{+X-2|Dn1U$EekGCFBHbV}b_=xCS}E7ZUB<DNjACQj6q9ke
z^dXj(&VTm&OnqMpT182V?Xd<bw^7BnGV5KEI{DL%UYb>GOOY103{AzzK?F&IJ_gkS
zwVR)B`8=1blNPgO5VEEGqKzu9=Z{S-W}oWN2pKdjsQ^-ZwP<6CZ<bX^HwVT$Q5Z-;
z?Ui-_)_#x7R`rvX+Ln$`1_9FEtjhtY^`1+W)j2DqLXoTd{~T{wK%M%#!cgoL(USbb
m1aVo0*xP^x`n`WR3;#bB*q^~&u!7A10000<MNUMnLSTZkU7LXb

diff --git a/static/tabbar_icon/b.png b/static/tabbar_icon/b.png
index 57ab44c7db1deffb7d477eb71d033595e7512271..8fdc5a951798170745fc880a40a425ce851840de 100644
GIT binary patch
delta 2635
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

delta 2149
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
bJrDXXJo;FaNEPQ<00000NkvXXu0mjf3TrNH

diff --git a/static/tabbar_icon/c-a.png b/static/tabbar_icon/c-a.png
index 91ac11080eeed8522b1bf55c9e0bd8f63ec36a89..7d6f2cf52b5393be7f0b161c0c2e85d48c307218 100644
GIT binary patch
delta 4868
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

delta 4910
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

diff --git a/static/tabbar_icon/c.png b/static/tabbar_icon/c.png
index ff73369590029a59f2a3c7c088c39116f8a922e4..f896f6cd5982d41542fce1660edb36e3a4c146a1 100644
GIT binary patch
delta 1596
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

delta 1855
zcmV-F2f+B*4B8HmFn<RWNkl<ZcwX&VZ>Us76rVG9SNDnFpQoUtU=a3r>Arhsgba)d
z3=D#bgbWIek_rryf&}$Lr0AEZu&6-LNJyxtNJueA$f&59z3*jDlfoA%_Q7X@!duzB
z_r#IiW#0PU?!9w&^?jK6xI5?1{mpOAoO5P?xzQ2<aQL)Fz<&YMh9M51ZUfZc-#@cZ
zC~O9Rb&RoPw{XjzV~ib+<9JW0RQkJ9eq>@$u~@t_m&+XifF+%BD61Ysyo!h$N~O~0
zS#^=TH9$4y{5F-qF#xH?alE2bDh*}@$r>Ob#5Mrfnbm=A$s^*oTI&b1>dykuS(818
zcp#4BEnyg5&VTBZg?vs3@d5zsHD#kHx;+fT5et0{5i5X#AXv>gKV}#%M^Uu!7J<`n
zLkRIB0IW3p+NqS<ank`3LVQv?wXWMn#DiMvr?WWH30Wb;1_0P^=sKsAx}7mrwbh@R
zLB8+L_B`(bW2{g&8b#3qVHh5_b)r*pwS(gV0L-lGM1RCJTI-{>Hc|s5gm@kRJ}?{@
z(OT0gO^G3d*be|34F3*kt)H}Y&IX`g0APjTz;><mE?WmWEhnX1#TfhEjE{`5#Y(A*
zHnvg$R4f*k<@5R9Ohc7QW%1C^5M{9wj$*O6D3{Ca27pC24w^EQ1X89PhT#vbbO|9&
z0YIOzh<}^3*6-QaPX&+=;w=Dp*)V)WYyD6gXTJe}H8##oB!h^TFI~E{aAahpJekfQ
z2wvly?=k)ll~RF?4`~3(Nhv8f&#N1X<M_!^sdT87VJRgsuA?>Dl`B`~pE+}8(k(-*
z&FAxH8DqJ+Z&4HlVHk#KK}rme@B5E<p7*6;;D6%i=;-2BD@k*ul<OH|`%GukI@vUT
zpHgaLI~_uZuL0m;gY9o?t+%w3YyLkmKthO*0pKaa;JaGumy#G<x^(Hh88c>NW)bK7
zoYwl!BsPN}Sj##8)R;>-(c&bs=A6U;Nhwb;#u|Zds^mVCeejYcOA5Wcz5ki{+Su6G
z!hhl6;eXSBlm;L)6_1XN_O#nxX&mXs+~(55W>FnLZB`~RKthP->ir(A^-oDxzOS#Z
zm*$>6eR?#hOnn}0mszuB^$rdWo=+i575;x_*<n-NCk9ALNda%I5u^`jt)FS<a1aFd
zan9dnjQKPd5q|}MO-iYs+sXF#_b-?}eSi91&iSLYQ;_1v9;MVf?PPu5U+;O|0rS*V
zO3iO4XMKtVL9mW<{)wTW8b#6lt+Lu62p;F0Q=ZhwM`|EZM!cq#EP>P0)AOBqFeE*)
zNw!cZQ0v2N1%IHFda-K&5zXh$ol7Zv!zg97aU5?5!|<yn!$fZ?YKb}Hz%f4ZDt}{a
ztJeC%=5_?J4gmH6z#Wr)&}0p|fq{X$a=9EWikVhaE0szxG&FRwYXFgA-}fK&JnxGM
zjD(0t?T*WcxQKI3rA2e?MLn4tz(Pdo_#I}9QD!_709MzxW0Rd5<f%3TfFp=_5&#N_
z=ucGEAfi>0NcI!Qpt`eC%H6c`X@6IOF;=hPh*fFFXNdSFW9*n2bQ3B$p_F>SwrQ3c
zAaY7d`3eQgB;`Zx8fIg?W)nhCHog}CW+(YTM5K(JN`z{yn?Q#}BVlc&0}&6E%jJ#3
z!^5<lt%emqWU1!t8;mhJVI~?>Z6B;uDz7)ULu$q3HpUn=wi=yDQwiNl#D8(TtGQE2
zv2f0uIh#4>#K;Ac*rqMNLu*Z2H`A~NsBV=$*7LlT0B{%mhKOYV_`O^%A8)sEwHE0r
zl10SpZBj)1BZ{IEt$Iu~+jJ1D0D!v@@j4shI6fc8@lQ6vcrp~N0is*gd_G@QO8u2-
ziMk*>Ffec%=X~BRyEv3m(tp<4Ui-FJl~NQyr^FCKJOKa)DLzsR%F>Uf53*vAlya;d
zI}q`r);e{D+ATDN5aW90HWj?-n=L@&Dto1rm7Z>Z)Lb*#)L#yu6f0x3@={92pjIF|
zfZ9;d0ptK`AmCz98!|Y696;G#nK=e^i9r>!7c`ab$fT72nBB}<m48W(yJgM#iYrB8
z+j8pi<;(k~O`Ar()kj$=)sscP?G}5VG4?{;Fe3h0E|-IL{hut3CXl7qC-kuNe#5WK
zPl2rf@_pa;Jg;OrO&}rS)@#?U9le=A)oxqvV~p)IU%ruVQ4~EEhN1Z)B>~Rkr&s|*
zDx{R-Sd`jwmjw{9?SJF0BraG3L_u0gNf&$cCUB~a(~PluZQmtkZg&_82qb#l{#=q9
zj+=zyXJcby&va^=XJJs|d+CNFm&-j%mv(e<XmNLy1-mjLo&$j6)oS&l!NI{3S(G))
zb_AeKIyBXEIe^-%hy%z0lx@>G1~~>f24zFQF(?~;E(SRUIXDJoL%=a88-6YZIR-ff
tWkbL*C>wq*1~~>f24zFQF(?~;{{!k~R(8FEHq!tA002ovPDHLkV1kr3Z}k8G

diff --git a/static/tabbar_icon/d-a.png b/static/tabbar_icon/d-a.png
index 6ef1d4ea4faf28fa3229eefd54eab7350090af2b..c4fc7accb182079174a7500588e1628a4ff0de5a 100644
GIT binary patch
literal 3750
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
QWB>pF07*qoM6N<$f_gCz)Bpeg

literal 4335
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

diff --git a/static/tabbar_icon/d.png b/static/tabbar_icon/d.png
index 6a414a115507bcd727aae82a56f0c2037180c71f..ac87a08406ecd876867f42ce6154b5402357021b 100644
GIT binary patch
literal 2193
zcmV;C2yXX@P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px-OG!jQRCr$Pn|)AI*%`+3Q4$jqZobqo9coul(OS`pn$=Dj+S2WGWZde2(nZ~N
z#`;+cNV>T<9|j091{mEg4yb6sxV8&8=*&80>R4CTH8{mKBU+KkG6fV(VhDj^5)wiu
zPMuM5liYKXxG^OE=6#>{Iluen=A3)ZC6f}LpajSXKEVkj0EOs~1fT?<@NOcB4oY+o
ziG1P0g)F<>o;fr$B=mSZ88jMgwbSXGKR!NAM-ar!<MH0#zkk0Tk5$}u(5X|WR+&sD
z-PqXJVvol|3Dzha4(DsRT%JCo098~}4A|}VR3djEDwR5=)oO7e#$^XxxpD>R=;#<B
z0>>A_<#Ib^GTFN`rh{5rTi11Vc77EM5QRdSVzb#}R4VoA!i5WeS5Q#!c*X$I>2w7K
zgW<F315Qp(zA|_2+|PMD-oKel=B>QEyyv01EG~ayCr+H$*W24$H+}Hw>FK}UvuDpA
zLqU1<`?v&DU0sbnefm^A9Ykhk<_FuiZ$Cfd0ZAm1LvFWQIUR&ZB+ALp&;Me^1Cq<-
zC!Rll{@dvw)~#Fj-OZaf_s@7hYPI^7)oOk1Z`=2;Rb5>jbiz0z{>AF+>wnqb-{0nT
zyI+Gbd-m*!ii!$4NcZ?+1Ky<D+uJ$!@83U2rBZ+8cDv_!y<RG)_?wRRdcBnK@o^en
zT`re9ER)Ijpq_96ojrSYS#NLeHHX6?02PeYcs`$R#4v0js6RhImoHxy>h=16IUEil
zs8}q=3j~52D2ir-dh`RN(P)lZES6$Wp;(V+v)Ro`rSd~ipMHQ;DwWx0v&{h&iuHIZ
zm8#TgwdJ5b{Q!x@Vz1Zhjk_84oH=u(5{blbb{z`XYao<LC1q@EY%)~R+xY#01q+Jz
z?c4V;sCU0kkxHd*r_=c@P@!0lU%7JSwxXh<bD%!`099304Gj+ur+^B@db~&^`e}ZC
z{#8()et^_!^;N6Y`eRU`SdY)i$w}L=VM8CNPd`8yhG|?b*GHg2u^dk(lSwr-HNK_C
z6sS)>K*x?96Aum!YC(m3@k}O@M5l*d?$~TL7<uR%CX?x|tgOUcf`k(F0~F|SWiTNM
zg+ki0WeaK5s#T%tz4-pglP9Fc#zvCeZYLBUZV-pV8IjB7To@fcK<(}AX*X})G=hk&
zSh0dsR8$0#Lb`qXHmS9>6(|QbSRfGep(vULlaD(gL{Zc;F)=}S^`4!bP0Gv51FGNC
z)AOQ>-o%H`=YNG^*biZ9;Q~^rR3@9vHkYU%pU)?imX;E_|Gd;ZckUd?U@#CZ5mp?V
z&HhxWRD!km|107GQmfTpSglr|m9J1JB#A_#kdVAyFX_R92c&!V?u9jIkYp;ATCUY<
z{hm=1(ZB_SVVKtCa*2ruybUn|fk1|$XcdfCTtG*U9{t0kM~{xc2*zSgT3TAk-o1N|
z!Fa<3q|@mN4F&_y{t-;^H<hz|`SK5U?AXx^Qx6x=rAwC<-?(w32SzX!b5^fj{odBC
zTmJ^*E#Pw>i9|9veP;lsKrG~}U%!6wrcIlAVY~zc6i-hU7cE*u+qG+#JEDN9s;a&m
z9v+68T)`NLRt|%~@TgR(Bv}1`9fV<6jmzaa2rC>bc?g1xDijI?)=xk{wY9Y$4Gj%x
zV1;8PkI(1-2g9&;VEqIH)YR1UL3ejI@FPlCBhkte2n3xdisBxxBT_RUptiQQ@9FjW
zH@6-j;uazXL6E;F6pBKK)E6m1w|68GiO21B6JFKBnuul|gTYX$R4U;8u$P{K0#d8h
z-Bzo0Su_U_ZS9PVjNk0sx${r3b%Fvqa^%QCv)Nn&EB;OAF&GR-YHBJ1I|mB+6Z4%n
zzJC4s*A9mR_}Iud4aZkMB_%~(R#v78$4kg9=DNDN+`+-Yj!?(>!!Z$!Tn>lxrCcum
zQMlS60r?8l*4A#fSS)AWmK!#g%l-S>wQD!!=H`aID?kX457Oz=r?VbEeq3j_+t-GB
zRic&8VzEXz91d1eQc@qO8iWD8EZEZ0@_n<}oa=JApw~B%GXGMC#bS-~c)WX{M|_F+
z00u-vG@fD-fI?i&1fT?<@P6>X9n{?1yuoNRW+x>jeP?QF>h6*yOWFzw3Lb`M11`Iv
zq2bp90|S|KI$bbp)~xP~jEts@8#kKZ)bO(i1G;wY+AO_Z|7WY!`u?j@G#bq_Z{EC;
z;^Jbz*N-A;^i{2k7cZvXy?eKH`jmsgV2ts2yn@ow(vC>gCJacU(daA|3-0zUnM|Ha
zPf!2F?%lg1W-QnMD=RDYBO@asycpjFTe@`VvTfV8MWm|<0cvS!`F2-V*Wl#jWWabX
zmwQVlldX@`l?$Y!)9HS0Fc|(CtPYpUZIH=idm`b55TKJMPwsyB@L|x|DUC*(Jbd_Y
z)DM4_mzT>&M@K7y4W7s2nWR!_MBWr21gO5g{(#YF40(jMu&|Jpm6Zjxy+ZVA2YOlV
z)qDg&{;N<Z*hDph#SsE@{`~peJ9q8`-I+{IPPQL9bchoPQ^7QjA3wgoudnZu5FPYS
zsZ>hrxLc&=LFMJ;J)@(eiv#JUq@-xd%F57a1M<D5)z#HC;B-0zcF6qs^NS7~IPhsC
zyb$UjU!gN+&iue=G~RN#Tz;oC5d`^%LZR@j@_|p0!VIFWu5RPNz(70RpN3E<Y!i#c
z`7pY8IfMcEk{cTvSDH*F<;29q&zw#toy}&Olai8})~s2h%*n}dM#>ZsorZ>npFDf^
zOyP7o-}QJrR2GZXPp8xC#bR+ak$j>tK!Avf##3AZP^50s@zfO{V@Y&S2wMLG_DQp6
T1sL3!00000NkvXXu0mjfcMLGi

literal 4070
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
Ye|6Hu*-G2-2LJ#707*qoM6N<$f+mHkG5`Po

diff --git a/static/tabbar_icon/e-a.png b/static/tabbar_icon/e-a.png
index c6b7c1b8709d6fd5adf26493b1cf94150e503d85..71532de32ca10c821351a859add3e95a8a57d7ed 100644
GIT binary patch
delta 4900
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
Wbw0tLi!A;C0000<MNUMnLSTZ87;H`e

delta 3856
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
S?2P~b00{s|MNUMnLSTZC9A2*g

diff --git a/static/tabbar_icon/e.png b/static/tabbar_icon/e.png
index 296fb09dc42bc37e55591e5c6ead94ac793063d1..4aa833d9cc0ebc28f0a043ece404db5b230e224e 100644
GIT binary patch
delta 2243
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
RzXJdO002ovPDHLkV1j;_IZ^-s

delta 2675
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


From d94efb420d092e986f0ff2d4fd207c8754809ee2 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 12:14:26 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=20static/tabbar=5Ficon?=
 =?UTF-8?q?/top.png?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/tabbar_icon/top.png | Bin 5011 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 static/tabbar_icon/top.png

diff --git a/static/tabbar_icon/top.png b/static/tabbar_icon/top.png
deleted file mode 100644
index f8daebd4e464350d819431897922e16b4d8798ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5011
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


From 852344cac24b2d711213a91e9b2e4984883507a6 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 12:15:27 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/tabbar_icon/top.png | Bin 5011 -> 4033 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/static/tabbar_icon/top.png b/static/tabbar_icon/top.png
index f8daebd4e464350d819431897922e16b4d8798ef..9ef38427b092809681073d15599fdcbfd90b85c5 100644
GIT binary patch
delta 4023
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

delta 5009
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
b&i?|uubkibgYt<0015yANkvXXu0mjf<SS}l


From 45feda69948fe29ba3df69b8b42e0afe74f15b3f Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Mon, 11 Sep 2023 13:51:40 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=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/index.vue | 28 +++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 43041bb..5a356e9 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -16,7 +16,6 @@
 			</view>
 		</view> -->
 
-
 		<view class="" v-if="cloudList.length>0">
 			<view class="">
 				<!-- <view style="height: var(--status-bar-height);"></view> -->
@@ -98,15 +97,15 @@
 							</swiper-item>
 						</swiper>
 					</view>
-
+					<view class="content_sift" :style="{position:pocls,top:headtop+'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>
+					</view>
 					<transition name="fade">
 						<view class="content">
-							<view class="content_sift" :style="{position:pocls,top:headtop+'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>
-							</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>
@@ -147,7 +146,7 @@
 									</view>
 								</view>
 								<view style="height: 100rpx;">
-									<u-loadmore :status="status" />
+									<!-- <u-loadmore :status="status" /> -->
 								</view>
 							</view>
 
@@ -225,8 +224,12 @@
 					height="400.09rpx"></u--image>
 			</view>
 
+		</view>
+
+		<view class="" :style="`height:${appInfo.bottom};background-color:white`">
 
 		</view>
+
 	</view>
 
 
@@ -644,7 +647,8 @@
 	}
 
 	.goods_list {
-
+		min-height: 100vh;
+		// background-color: red;
 
 		.goods {
 			display: flex;
@@ -719,7 +723,7 @@
 	// }
 
 	.content_sift {
-		width: 730rpx;
+		width: 750rpx;
 		padding: 22rpx 0;
 		display: flex;
 		justify-content: space-around;
@@ -875,7 +879,7 @@
 		// align-items: center;
 		// padding: 20vh 0;
 		position: relative;
-		height: 85vh;
+		height: 100vh;
 
 		.info {
 			position: absolute;

From a1fd0875d7b889e04e5858e5361a95c59930c3e0 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Mon, 11 Sep 2023 14:04:47 +0800
Subject: [PATCH 07/11] revert

---
 pages/nongKe/cloud_entrepot/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 5a356e9..d2a0cb2 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -226,7 +226,7 @@
 
 		</view>
 
-		<view class="" :style="`height:${appInfo.bottom};background-color:white`">
+		<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
 
 		</view>
 
@@ -337,7 +337,7 @@
 				.in(this)
 				.select('.content')
 				.boundingClientRect(rect => {
-					console.log(rect)
+					// console.log(rect)
 					if (rect.top <= this.headtop) {
 						this.pocls = 'fixed'
 						this.act_swiper = 'act_swiper'
@@ -370,7 +370,6 @@
 		methods: {
 			cartFn() {
 				getCartList().then(res => {
-
 					this.cartList = res.data.list
 					this.cartList[0].list.forEach(e => {
 						this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num

From b775d4cf78764c8f5732f918a7c7cc9bfecb120c Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 14:09:38 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delegation_details/index.vue              | 20 +++++---
 pages/index/index.vue                         | 11 +---
 pages/plantGrass/plant_detail/index.vue       |  2 +
 store/modules/app.js                          | 51 ++++++++++---------
 4 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 6d24b4c..954c7ff 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -12,7 +12,7 @@
 				<view class="top-two-two">
 					<!-- 2020-07-07 14:14:14
 					 -->
-					 {{objinfo.entrust_start_date}}
+					{{objinfo.entrust_start_date}}
 				</view>
 			</view>
 		</view>
@@ -44,7 +44,7 @@
 					<view class="center-twoa">
 						委托方:
 					</view>
-					<view class="center-twob" >
+					<view class="center-twob">
 						{{objinfo.mer_info.mer_name}}
 					</view>
 				</view>
@@ -52,7 +52,7 @@
 					<view class="center-twoa">
 						被委托方:
 					</view>
-					<view class="center-twob" >
+					<view class="center-twob">
 						{{objinfo.entrust_mer_info.mer_name}}
 					</view>
 				</view>
@@ -114,7 +114,7 @@
 			</view>
 
 
-			<view class="content_bootm_one" v-for="(item,i) in objinfo.product_list">
+			<view class="content_bootm_one" v-for="(item,i) in objinfo.product_list" @click="Merchbaby(item)">
 				<view class="bootm_oneimg">
 					<image :src="item.image[0]" mode="aspectFit"></image>
 				</view>
@@ -163,14 +163,22 @@
 
 		},
 		methods: {
-
+			//商品详情
 			list(id) {
 				entrustdetail(id).then((res) => {
-console.log(res.data)
+
 					this.objinfo = res.data
 				})
 			},
+			//商品宝贝详情
+			Merchbaby(item) {
+				uni.navigateTo({
+					url: `/pages/goods_details/index?id=${item.product_id}`
+				})
 
+			},
+
+			//提交购物车
 			submit(item) {
 				addEntrustCart({
 					community_id: item.community_id
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1b44c87..cdd710e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -157,16 +157,7 @@
 			}
 		},
 		onShow() {
-			uni.startLocationUpdate({
-				success: res => {
-					console.log('开启接收位置消息成功')
-					
-				},
-				fail: err => {
-					this.selfLocation()
-				},
-				complete: msg => console.log('调用开启接收位置消息 API 完成')
-			});
+		
 
 			//监听网络状态变化
 			uni.onNetworkStatusChange((res) => {
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index 2e53c0e..acaf1d9 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -1,8 +1,10 @@
 <template>
 	<view :style="viewColor">
+			<!-- #ifdef H5 -->
 		<view class="head-menu">
 		  <view class='iconfont icon-xiangzuo' @click="returns"></view>
 		</view>
+			<!-- #endif -->
 		<view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false">
 		<view v-if="followDetail.status != 1" class="approval_status">
 			<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">
diff --git a/store/modules/app.js b/store/modules/app.js
index 18284f4..f0cfc17 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -117,38 +117,43 @@ const actions = {
 		} else {
 			apptype = 1
 		}
-		console.log(apptype, '11111')
+
 		Appversion({
 			version: os.appWgtVersion,
 			type: apptype
 		}).then((res) => {
-			if (data) uni.showLoading({
-				title: '检查更新中'
-			})
+			
+			if (Object.keys(res.data.appInfo).length > 0) {
 
-			// 版本更新
-			if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
-				compareVersions(res.data.appInfo.version,
-					wgt_v) == 1) {
-				try {
-					let info = res.data.appInfo || {};
-					let version = {
-						title: info.title || '发现新版本',
-						content: info.content || '修复了部分BUG',
-						versionName: info.version || '1.0.1',
-						downUrl: info.dow_url || '',
-						force: info.force == 1 ? true : false, // 是否强制更新
-						quiet: info.quiet == 1 ? true : false // 是否静默更新
+
+				uni.showLoading({
+					title: '检查更新中'
+				})
+
+				// 版本更新
+				if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
+					compareVersions(res.data.appInfo.version,
+						wgt_v) == 1) {
+					try {
+						let info = res.data.appInfo || {};
+						let version = {
+							title: info.title || '发现新版本',
+							content: info.content || '修复了部分BUG',
+							versionName: info.version || '1.0.1',
+							downUrl: info.dow_url || '',
+							force: info.force == 1 ? true : false, // 是否强制更新
+							quiet: info.quiet == 1 ? true : false // 是否静默更新
+						}
+						Updater.update(version);
+					} catch (e) {
+						console.log(e);
 					}
-					Updater.update(version);
-				} catch (e) {
-					console.log(e);
+					uni.hideLoading();
 				}
-				if (data) uni.hideLoading();
-			}
 
+			}
 		}).catch((err) => {
-			console.log(err)
+			// console.log(err)
 		})
 
 

From 7a87342e3cc88dbadc151136fc10a3eb617a2751 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 15:00:07 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receivedCommission/index.vue               | 18 +++++++++++-------
 pages/order_details/index.vue                  |  9 +++++++--
 pages/users/order_list/indexCopy.vue           |  2 +-
 pages/users/order_list/relase.vue              | 10 +++++-----
 pages/users/refund/list.vue                    |  6 +++---
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 0e6775a..b2c1646 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -19,6 +19,10 @@
 					<view class="one-txt-b">
 						委托周期:{{item.entrust_day}}
 					</view>
+					
+					<view class="one-txt-b"  v-if="item.mer_status==1" style="color: red;margin-top: 3rpx;">
+					 {{item.entrust_finish==0?'未申请结束委托':""||item.entrust_finish==1?'委托已结束':""||item.entrust_finish==2?'商家拒绝结束委托':""||item.entrust_finish==3?'结束委托申请中':""}}
+					</view>
 				</view>
 			</view>
 
@@ -70,10 +74,10 @@
 					已拒绝
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a" click="deleteOrder(item)">
+				<!-- 	<view class="contentgn_a" click="deleteOrder(item)">
 						删除
 					</view>
-					<span></span>
+					<span></span> -->
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -105,15 +109,15 @@
 						<image src="@/static/images/wt_close.png" mode=""></image>
 					</view>
 					<view class="entrust_bg">
-						<view class="entrust_bg-content">
+						<view class="entrust_bg-content" v-if="obj.mer_info">
 							<view class="bg-content-a">
 								委托申请处理
 							</view>
-							<view class="bg-content-b">
-								结算周期: <span>{{obj.settle_cycle}}天</span>
+							<view class="bg-content-b" >
+								结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
 							</view>
-							<view class="bg-content-c">
-								利息比例: <span>{{obj.interest_rate}}%</span>
+							<view class="bg-content-c" >
+								利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 							</view>
 							<view class="entrust_bga_btn">
 								<view class="cancellation" @click="passDelete(obj)">
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index bafa280..fd8c56e 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -61,6 +61,7 @@
 							<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
 						</view>
 						<view class='progress acea-row row-between-wrapper'>
+						
 							<view
 								v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
 								<view class='iconfont icon-webicon318 t-color'>
@@ -82,13 +83,17 @@
 
 							</view>
 							<view class='iconfont'
-								:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 && orderInfo.status != 9 ? "t-color":"")'
+								:class='(orderInfo.status == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status > 3 && orderInfo.status != 9 ? "t-color":"")'
 								v-if="orderInfo.order_type == 0"></view>
+								
+								
 							<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
 								v-if="orderInfo.order_type == 0"></view>
+								
 							<view class='iconfont'
 								:class='(orderInfo.status == 2 && orderInfo.status != 9&& orderInfo.order_status != 8 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "t-color":"")'>
 							</view>
+							
 							<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
 							</view>
 							<view class='iconfont'
@@ -336,7 +341,7 @@
 						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
 					</navigator>
 
-					<view class="" v-if="orderInfo.activity_type==98">
+					<view class="" v-if="orderInfo.activity_type==98||orderInfo.activity_type==99">
 						<view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">确认收货
 						</view>
 						<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index e838c9c..63577c1 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -732,7 +732,7 @@
 
 					if (status == 5) {
 						uni.navigateTo({
-							url: '/pages/users/refund/list?type=0'
+							url: '/pages/users/refund/list?type=98'
 						})
 					} else {
 						if (status == this.orderStatus) return;
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
index 4014b4e..1dcd9a1 100644
--- a/pages/users/order_list/relase.vue
+++ b/pages/users/order_list/relase.vue
@@ -490,7 +490,7 @@
 				arrlist() {
 
 					refundList({
-						product_type: 98,
+						product_type: 99,
 						type: 0,
 						page: 1,
 						limit: 1500
@@ -568,7 +568,7 @@
 				getOrderData: function() {
 					let that = this;
 					orderData({
-						product_type: 98
+						product_type: 99
 					}).then(res => {
 						// console.log(res.data)
 						that.$set(that, 'orderData', res.data);
@@ -729,7 +729,7 @@
 
 					if (status == 5) {
 						uni.navigateTo({
-							url: '/pages/users/refund/list?type=0'
+							url: '/pages/users/refund/list?type=99'
 						})
 					} else {
 						if (status == this.orderStatus) return;
@@ -756,7 +756,7 @@
 							groupOrderList({
 								page: that.page,
 								limit: that.limit,
-								product_type: 98
+								product_type: 99
 							}).then(res => {
 								that.isReady = true;
 								let list = res.data.list || [];
@@ -783,7 +783,7 @@
 								status: arr,
 								page: that.page,
 								limit: that.limit,
-								product_type: 98
+								product_type: 99
 							}).then(res => {
 								let list = res.data.list || [];
 								let loadend = list.length < that.limit;
diff --git a/pages/users/refund/list.vue b/pages/users/refund/list.vue
index 5184774..145fc39 100644
--- a/pages/users/refund/list.vue
+++ b/pages/users/refund/list.vue
@@ -111,7 +111,7 @@
 				isScroll: true,
 				page: 1,
 				limit: 15,
-				type: 1
+				type: 0
 			}
 		},
 		onLoad(e) {
@@ -153,7 +153,7 @@
 			},
 			getList() {
 				if (!this.isScroll) return
-				if (this.type == 1) {
+				if (this.type == 0) {
 					refundList({
 						type: this.tabIndex,
 						page: this.page,
@@ -167,7 +167,7 @@
 					})
 				} else {
 					refundList({
-						product_type: 98,
+						product_type: this.type,
 						type: this.tabIndex,
 						page: this.page,
 						limit: this.limit

From 7f0a309fdb3e2114ed3e6329148c8efaaa22cd15 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 15:54:39 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commissionedSales/addDelegation/index.vue |  2 +-
 .../delegation_details/index.vue              |  2 +-
 .../initiateDelegation/index.vue              | 35 +++++++++++--------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index 6da72d9..d2da49e 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -102,7 +102,7 @@
 				},
 				formData: {
 					entrust_mer_id: '',
-					entrust_day: 0,
+					entrust_day: 15,
 					is_type: "4",
 					product_info: [],
 					content: ''
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 954c7ff..3cf0d27 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -101,7 +101,7 @@
 					<view class="center-twoa">
 						拒绝原因:
 					</view>
-					<view class="center-twob" style="text-align: left;">
+					<view class="center-twob" :style="{'text-align':objinfo.entrust_finish_refusal.length<15?'right':'left'}">
 						{{objinfo.entrust_finish_refusal}}
 					</view>
 				</view>
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index d4ac509..d26b645 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -51,10 +51,10 @@
 					已接受
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a"   @click="closingorder(item)" v-if="item.entrust_finish==3">
+					<view class="contentgn_a" @click="closingorder(item)" v-if="item.entrust_finish==3">
 						结束委托
 					</view>
-					<span v-if="item.entrust_finish==3"></span >
+					<span v-if="item.entrust_finish==3"></span>
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -65,10 +65,10 @@
 					已拒绝
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a" click="deleteOrder(item)">
+					<!--<view class="contentgn_a" @click="deleteOrder(item)">
 						删除
 					</view>
-					<span></span>
+					<span></span> -->
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -79,7 +79,7 @@
 					已完成
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a" click="deleteOrder(item)">
+					<view class="contentgn_a" @click="deleteOrder(item)">
 						删除
 					</view>
 					<span></span>
@@ -173,10 +173,10 @@
 								利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 							</view>
 							<view class="entrust_bga_btn">
-								<view class="cancellation"  @click="refused">
+								<view class="cancellation" @click="refused">
 									拒绝
 								</view>
-								<view class="determine"  @click="agree(obj)">
+								<view class="determine" @click="agree(obj)">
 									接受
 								</view>
 							</view>
@@ -292,7 +292,7 @@
 					}
 				],
 				obj: {},
-				refuseds:''
+				refuseds: ''
 			}
 		},
 		onLoad() {
@@ -390,7 +390,7 @@
 			//结束委托
 			closingorder(item) {
 				console.log(item)
-				this.obj=item
+				this.obj = item
 				this.$refs.bindmobile2.open()
 				// this.$refs.bindmobile3.open()
 			},
@@ -406,12 +406,12 @@
 				// this.$refs.bindmobile2.open()
 				this.$refs.bindmobile3.open()
 			},
-			agree(item){
-				finishentrust(item.community_id,{
-					 status: 2,
-					 refusal:this.refuseds
+			agree(item) {
+				finishentrust(item.community_id, {
+					status: 2,
+					refusal: this.refuseds
 				}).then(res => {
-					
+
 					this.$util.Tips({
 						title: res.message,
 						icon: 'success'
@@ -425,6 +425,7 @@
 			},
 			//删除订单
 			deleteOrder(item) {
+
 				checkchain(item.community_id, {
 					status: 3
 				}).then(res => {
@@ -435,6 +436,12 @@
 					this.orderList = []
 					this.tabTitle = "tabOne"
 					this.commislist()
+				}).catch((err) => {
+					console.log(err)
+					this.$util.Tips({
+						title: err,
+						icon: 'error'
+					})
 				})
 			},
 			// 审核未通过 编辑

From 4c69a3db9053330f2e6d93534e7b8ed3d9e0ef2e Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 16:15:09 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/moreProject/moreProject.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 4150e71..9a5671c 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -53,7 +53,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>
@@ -64,7 +64,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"
 								src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
@@ -149,7 +149,7 @@
 									</image>
 									<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>
@@ -172,7 +172,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">