From 31cce22ba302088c4c72da4e42a1e273487934c6 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 16 May 2024 11:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=AB=99=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/addGoodDetail/goodsAttr.vue |  2 +-
 pages/product/list/index.vue              | 42 ++++++++++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pages/product/addGoodDetail/goodsAttr.vue b/pages/product/addGoodDetail/goodsAttr.vue
index e2e4972..8cde171 100644
--- a/pages/product/addGoodDetail/goodsAttr.vue
+++ b/pages/product/addGoodDetail/goodsAttr.vue
@@ -298,7 +298,7 @@
 			choseCity() {
 				this.positionType = 1;
 				getCity({
-					code: this.address.province_code
+					province_code: this.address.province_code
 				}).then(res => {
 					this.cityList = res.data
 					this.positionList = this.cityList
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 79612b9..9dc8671 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -6,7 +6,15 @@
 					:actionStyle="{color: '#20B128'}" @search="keywordSearch" @custom="keywordSearch"
 					:clearabled="false" @clickIcon="scanQRcodes"></u-search>
 			</view>
-			<u-tabs :current='current' :list="tabList" @click="selectMenu" type='primary' lineColor='#32BB3B'></u-tabs>
+
+
+
+			<u-tabs @touchend.stop :current='current' :list="tabList" @click="selectMenu" type='primary'
+				lineColor='#32BB3B'></u-tabs>
+
+
+
+
 			<view class="wrapper" style="background-color: #F1F1F1;">
 				<view class='product_list' v-if="productList && productList.length > 0">
 					<view v-for="(item,index) in productList" :key="index" class="card">
@@ -54,7 +62,8 @@
 								@click="Fline(item)">
 								修改库存
 							</view>
-							<view v-if="where.type!=2 && where.type != 5" style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
+							<view v-if="where.type!=2 && where.type != 5"
+								style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
 								@click="Fline(item)">
 								修改库存
 							</view>
@@ -71,7 +80,8 @@
 							<view v-if="where.type != 5" style="flex: 1;text-align: center;" @click="editGoods(item)">
 								编辑商品
 							</view>
-							<view v-if="where.type == 5" style="flex: 1;text-align: center;" @click="handleRestore(item)">
+							<view v-if="where.type == 5" style="flex: 1;text-align: center;"
+								@click="handleRestore(item)">
 								恢复
 							</view>
 						</view>
@@ -834,7 +844,6 @@
 						// this.$set(this, 'num', -1);
 					})
 					.catch(rej => {
-
 						this.$set(this, 'num', -1);
 						Toast(`${rej}, 删除失败`);
 					}) :
@@ -845,6 +854,7 @@
 							icon: 'success'
 						}, () => {
 							that.productList.splice(index, 1);
+							that.getProductTitle()
 						});
 						this.$set(this, 'num', -1);
 					})
@@ -861,19 +871,19 @@
 				let index = this.productList.findIndex(items => items.product_id == item.product_id)
 				let that = this
 				productRestore(that.mer_id, item.product_id)
-				.then(res => {
-					that.$util.Tips({
-						title: res.message,
-						icon: 'success'
-					});
-					that.getList(this.mer_id, true)
-					// this.$set(this, 'num', -1);
-				})
-				.catch(rej => {
+					.then(res => {
+						that.$util.Tips({
+							title: res.message,
+							icon: 'success'
+						});
+						that.productList.splice(index, 1);
+						that.getProductTitle()
+					})
+					.catch(rej => {
 
-					this.$set(this, 'num', -1);
-					Toast(`${rej}, 删除失败`);
-				})
+						this.$set(this, 'num', -1);
+						Toast(`${rej}, 删除失败`);
+					})
 
 				this.showOverly = false
 			},