From 82aa7690e4cad66564060a942ec05ae31979b10c Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Wed, 13 Sep 2023 08:59:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/images/LHYC/GWC.png | Bin 3147 -> 2631 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/static/images/LHYC/GWC.png b/static/images/LHYC/GWC.png
index 87eaaa1b313ca5bcf5cc7fbe7cc707e3c1b55f79..6af473fb69b65209f0f04b3d742e969fc417d75d 100644
GIT binary patch
literal 2631
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
BxE25a

literal 3147
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
GWB&`|8@DL{


From 31763a09eb8fb436fad79b642435ef828aca17eb Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Wed, 13 Sep 2023 10:55:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E9=A1=B5,=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                            |  8 +++
 pages/nongKe/cloud_entrepot/index.vue | 78 +++++++++++++++++++--------
 2 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/pages.json b/pages.json
index 1862c49..499ddbf 100644
--- a/pages.json
+++ b/pages.json
@@ -264,6 +264,14 @@
 						"enablePullDownRefresh": true
 					}
 
+				}, {
+					"path": "cloud_entrepot/indexa",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "里海云仓",
+						"enablePullDownRefresh": true
+					}
+
 				}, {
 					"path": "teach_video/teach_video",
 					"style": {
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 2fdff6a..afb0697 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">
@@ -102,9 +102,15 @@
 					<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"
+								<view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index"
 									@click="screenGoods(item.screen,index)">
 									{{item.tit}}
+									<view class="" v-if="index==2" style="margin-left: 10rpx;">
+										<u-icon name="arrow-up" :color="item.price&&item.act?'#FF6D20':'black'"
+											size="10"></u-icon>
+										<u-icon name="arrow-down" :color="!item.price&&item.act?'#FF6D20':'black'"
+											size="10"></u-icon>
+									</view>
 								</view>
 							</view>
 							<view class="goods_list" v-if="goodsList.length>0">
@@ -160,7 +166,7 @@
 									</view>
 								</view>
 								<view style="height: 100rpx;">
-									<!-- <u-loadmore :status="status" /> -->
+									<u-loadmore :status="status" />
 								</view>
 							</view>
 							<!-- 空 -->
@@ -291,6 +297,7 @@
 				current: 1,
 				goodsNum: 0,
 				goodsList: [],
+				isEmpty: false,
 				winHeight: 0,
 				cloudList: [],
 				street_code: '',
@@ -319,7 +326,8 @@
 				}, {
 					tit: '价格',
 					act: "",
-					screen: "price_asc"
+					screen: "price_asc",
+					price: true,
 				}],
 				status: "loadmore",
 				flag: false,
@@ -339,21 +347,36 @@
 			this.cartFn()
 		},
 		// 分页
-		// onReachBottom() {
-		// 	if (this.flag) return
-		// 	this.status = "loading"
-		// 	this.page_num += 1
-		// 	this.flag = true
-		// 	this.getList().then(res => {
-		// 		return
-		// 		this.goodsList = this.goodsList.concat(res.data.data)
-		// 		this.flag = false
-		// 		if (!res.data.data.length) {
-		// 			this.status = "nomore"
-		// 			this.flag = true
-		// 		}
-		// 	})
-		// },
+		onReachBottom() {
+			if (this.flag || !this.goodsList.length) return
+			this.status = "loading"
+			this.page_num += 1
+			this.flag = true
+			cloudWarehouse({
+				street_code: this.street_code,
+				category_id: this.cloudList[this.current].category_id,
+				order: this.type,
+				keyword: this.keyword,
+				page_num: this.page_num
+
+			}).then(res => {
+				// console.log(res.data.list[0].product_id, this.goodsList[0].product_id)
+				if (res.data.list[0].product_id == this.goodsList[0].product_id) {
+					this.status = "nomore"
+					this.flag = false
+				}
+			})
+			// this.getList().then(res => {
+			// 	// console.log(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) {
@@ -461,6 +484,10 @@
 				})
 				this.actList[i].act = true
 				this.type = type
+				if (i == 2) {
+					this.actList[i].price = !this.actList[i].price
+					this.type = this.actList[i].price ? 'price_asc' : ''
+				}
 				this.getList()
 
 				// console.log(this.type)
@@ -473,12 +500,13 @@
 			},
 			getList() {
 				this.showLoading = true
+				this.status = "loading"
 				cloudWarehouse({
 					street_code: this.street_code,
 					category_id: this.cloudList[this.current].category_id,
 					order: this.type,
 					keyword: this.keyword,
-					// page_num: this.page_num
+					page_num: this.page_num
 
 				}).then(res => {
 					this.goodsList = res.data.list
@@ -513,12 +541,15 @@
 					let timer = setTimeout(() => {
 						that.trnList[i].left = 0
 						that.trnList[i].bottom = 0
+						that.act_cart = true
+						setTimeout(() => {
+							that.act_cart = false
+						}, 500)
 					}, 1000)
 				}).exec();
 				let res = postCartAdd({
 					...data
 				}).then((res, err) => {
-					this.act_cart = true
 					this.cartFn()
 					uni.showToast({
 						title: "加入成功",
@@ -1097,4 +1128,9 @@
 		/* 设置为1 */
 		// transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
 	}
+
+	.price_sift {
+		display: flex;
+		align-items: center;
+	}
 </style>
\ No newline at end of file

From 817f410089cd27cd37d7913c4d6d74b5fccd735b Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 13 Sep 2023 10:56:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plantGrass/plant_release/index.vue |  2 +-
 pages/product/list/index.vue             | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pages/plantGrass/plant_release/index.vue b/pages/plantGrass/plant_release/index.vue
index 8c96326..13b26b8 100644
--- a/pages/plantGrass/plant_release/index.vue
+++ b/pages/plantGrass/plant_release/index.vue
@@ -187,7 +187,7 @@
 			// #endif
 		},
 		onLoad(options) {
-			console.log(options.type);
+			
 			this.id = options.id;
 			this.order_id = options.order_id;
 			this.tabActive = options.type || 1;
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 766a9e0..6dcb676 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -249,14 +249,14 @@
 		},
 		onLoad(options) {
 			this.mer_id = options.mer_id;
-			this.getList(this.mer_id,true);
+			this.getList(this.mer_id, true);
 		},
 		onPullDownRefresh() {
 			this.where.page = 1
 			this.productList = []
 			this.loading = false
 			this.loaded = false
-			this.getList(this.mer_id,false);
+			this.getList(this.mer_id, false);
 			uni.stopPullDownRefresh()
 		},
 		onReachBottom() {
@@ -264,7 +264,7 @@
 			if (this.status == 'nomore') return;
 			this.status = 'loading';
 			this.where.page = ++this.where.page;
-			this.getList(this.mer_id,true);
+			this.getList(this.mer_id, true);
 		},
 
 		methods: {
@@ -351,6 +351,7 @@
 				this.checkboxList1 = item.attrValue
 				// console.log(this.checkboxList1.length)
 				if (this.checkboxList1.length > 0) {
+
 					this.show = true
 					this.data.product_id = this.checkboxList1[0].product_id
 					this.data.unique = this.checkboxList1[0].unique
@@ -378,7 +379,9 @@
 						})
 					} else {
 						postImport(this.mer_id, this.data).then(res => {
-							// console.log(res);
+							this.data.unique = ''
+							this.data.product_id=''
+							this.data.number=1
 							this.loading = false
 							this.loaded = false
 							this.getList(this.mer_id, true);
@@ -386,10 +389,16 @@
 							this.$util.Tips({
 								title: res.message
 							})
-
+							this.data.unique = ''
+							this.data.product_id=''
+							this.data.number=1
+								
 
 						}).catch(err => {
 							this.show = false
+							this.data.unique = ''
+							this.data.product_id=''
+							this.data.number=1
 							this.$util.Tips({
 								title: '请选择规格后再次进行入库'
 							})
@@ -457,7 +466,7 @@
 				if (that.loading || that.loaded) return;
 				that.loading = true;
 				if (ispage) {
-					this.where.page=1
+					this.where.page = 1
 					that.productList = []
 				}
 				productLstApi(mer_id, that.where).then(