From ffc8b8faf47d9328422b29e1ca24d30cb469eed6 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 15 Jan 2024 10:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                            | 4 ++--
 pages/nongKe/gather/select_warehouse.vue | 8 ++++----
 pages/product/goodsOnSale/index.vue      | 5 ++++-
 pages/product/list/index.vue             | 9 +++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/manifest.json b/manifest.json
index a088c5c..79838bc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.0.6",
-    "versionCode" : 106,
+    "versionName" : "1.0.7",
+    "versionCode" : 107,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 9323762..f12a27d 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -724,12 +724,12 @@
       		})
       	}
       	if(type==4){ // 个人商户
-          // navigateTo(1, '/pages/product/addGood/addGood_one', {
-          // 	mer_id: this.mer_id
-          // });
-          navigateTo(1, '/pages/product/addGood/addGood', {
+          navigateTo(1, '/pages/product/addGood/addGood_one', {
           	mer_id: this.mer_id
           });
+          // navigateTo(1, '/pages/product/addGood/addGood', {
+          // 	mer_id: this.mer_id
+          // });
         } else {
           navigateTo(1, '/pages/product/addGood/addGood', {
           	mer_id: this.mer_id
diff --git a/pages/product/goodsOnSale/index.vue b/pages/product/goodsOnSale/index.vue
index 01e45e9..4297298 100644
--- a/pages/product/goodsOnSale/index.vue
+++ b/pages/product/goodsOnSale/index.vue
@@ -61,7 +61,10 @@
 							<view v-if="item.is_show == 0 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">上架</view>
 							<view class="shop_button" v-if="type != 1 && type != 3" @click="handleDelete(item, index)">删除</view>
 							<view class="shop_button" v-if="type == 5" @click="reduction(item, index)">恢复</view>
-							<navigator :url="`/pages/product/addGood/addGood?mer_id=${merId}&product_id=${item.product_id}`" v-if="type != 5" class="shop_button" hover-class="none">编辑</navigator>
+							<block v-if="type != 5">
+                <navigator v-if="mer_info.type_code=='PersonalStore'" :url="`/pages/product/addGood/addGood_one?mer_id=${merId}&product_id=${item.product_id}`" class="shop_button" hover-class="none">编辑</navigator>
+                <navigator v-else :url="`/pages/product/addGood/addGood?mer_id=${merId}&product_id=${item.product_id}`" class="shop_button" hover-class="none">编辑</navigator>
+              </block>
 						</view>
 					</view>
 				</view>
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index a74632b..c1ff1ff 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -711,10 +711,11 @@
 				// 		removeStorage(item);
 				// 	}
 				// });
-				navigateTo(1, '/pages/product/addGood/addGood', {
-					mer_id: item.mer_id,
-					product_id: item.product_id
-				});
+        let url = this.mer_info.type_code=='PersonalStore' ? '/pages/product/addGood/addGood_one' : '/pages/product/addGood/addGood';
+        navigateTo(1, url, {
+        	mer_id: item.mer_id,
+        	product_id: item.product_id
+        });
 			},
 			handleRecycle(item, index) {
 				let that = this;