From d9eac859428f37282cf4a2c43a8d349546605131 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Wed, 8 May 2024 18:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/store.js                                  | 13 +++++++++++++
 manifest.json                                 |  4 ++--
 pages.json                                    |  4 ++--
 pages/cloud_warehouse/market/market.vue       |  6 ++++++
 pages/cloud_warehouse/specialty/specialty.vue |  6 ++++++
 pages/users/order_list/index.vue              |  7 ++++---
 6 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/api/store.js b/api/store.js
index 2965e37..e4b2f32 100644
--- a/api/store.js
+++ b/api/store.js
@@ -300,6 +300,19 @@ export function getStoreCategory(id, data) {
 		noAuth: true
 	});
 }
+
+/**
+ * 新获取商品分类
+ * @param {Object} id 商铺 id
+ * @param {Object} data
+ */
+export function getProductCategoryList(data) {
+	return request.get("store/product/category/index", data, {
+		noAuth: true
+	});
+}
+
+
 /**
  * 关注商铺
  * @param {Object} type_id 商铺 id
diff --git a/manifest.json b/manifest.json
index 196d30b..2df1b6c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
 	"name": "惠农生活",
 	"appid": "__UNI__3A527D1",
 	"description": "",
-	"versionName": "2.0.49",
-	"versionCode": 2049,
+	"versionName": "2.0.51",
+	"versionCode": 2051,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {
diff --git a/pages.json b/pages.json
index f95e173..d63e76e 100644
--- a/pages.json
+++ b/pages.json
@@ -334,7 +334,7 @@
 					"path": "market/market",
 					"style": {
 						"navigationBarTitleText": "供销云市场",
-						"enablePullDownRefresh": false,
+						"enablePullDownRefresh": true,
 						"navigationStyle": "custom"
 					}
 				},
@@ -342,7 +342,7 @@
 					"path": "specialty/specialty",
 					"style": {
 						"navigationBarTitleText": "名优特产",
-						"enablePullDownRefresh": false,
+						"enablePullDownRefresh": true,
 						"navigationStyle": "custom"
 					}
 				}
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 0703bcb..2539195 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -527,6 +527,9 @@
 		onPageScroll() {
 			uni.$emit('scroll');
 		},
+		onPullDownRefresh() {
+			this.storeMerchantList(true);
+		},
 		methods: {
 			navTo(url) {
 				uni.navigateTo({
@@ -576,10 +579,13 @@
 				if (this.isLoading == -1) return;
 				this.isLoading = 1;
 				storeMerchantList(this.where).then(res => {
+					uni.stopPullDownRefresh();
 					this.goodsList = [...this.goodsList, ...res.data.list];
 					this.isLoading = 0;
 					if (res.data.list.length < this.where.limit) this.isLoading = -1;
 					this.where.page++;
+				}).catch(() => {
+					uni.stopPullDownRefresh();
 				})
 			},
 			closeShowAddress() {
diff --git a/pages/cloud_warehouse/specialty/specialty.vue b/pages/cloud_warehouse/specialty/specialty.vue
index 326e1c8..fda28ba 100644
--- a/pages/cloud_warehouse/specialty/specialty.vue
+++ b/pages/cloud_warehouse/specialty/specialty.vue
@@ -326,6 +326,9 @@
 		onPageScroll() {
 			uni.$emit('scroll');
 		},
+		onPullDownRefresh() {
+			this.getProductslist(true);
+		},
 		methods: {
 			navTo(url) {
 				uni.navigateTo({
@@ -392,10 +395,13 @@
 				if (this.isLoading == -1) return;
 				this.isLoading = 1;
 				getProductslist(this.where).then(res => {
+					uni.stopPullDownRefresh();
 					this.hostProduct = [...this.hostProduct, ...res.data.list];
 					this.where.page++;
 					this.isLoading = 0;
 					if (res.data.list.length < this.where.limit) this.isLoading = -1;
+				}).catch(() => {
+					uni.stopPullDownRefresh();
 				})
 			},
 			goDetail(item) {
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 65ac23c..d82850b 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -664,10 +664,11 @@
 			},
 
 			changeSaleType(type = 1) {
-				this.loadend = false;
-				this.loading = false;
-				this.$set(this, 'orderList', []);
 				if (type != this.sale_type) {
+					this.loadend = false;
+					this.loading = false;
+					this.$set(this, 'orderList', []);
+
 					if (this.orderStatus == 4) {
 						this.refundParam.identity = type;
 						this.refundParam.page = 1;