From 3275130d80e0ee958d4e9d196cc686d7ed5ccbf5 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 24 Oct 2023 18:28:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E7=AA=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                     | 11 ++++++-----
 pages/trading_hall/adddiscounts/index.vue |  5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index c951c45..a328445 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -83,7 +83,7 @@
             <view class="tools-two-title"> {{item.name}}</view>
           </view>
         </view>
-        <view class="tools-two" v-else-if="userInfoData.mer_info.setting_status==1">
+        <view class="tools-two" v-else-if="isgShow&&userInfoData.mer_info.setting_status==1">
           <view class="" v-for="(item,k) in typelist" :key='k' @click="navation(item)">
             <view class="tools-two-img">
               <image :src="item.image" mode=""></image>
@@ -264,7 +264,7 @@
         </view>
       </view>
     </view>
-    <uni-popup ref="popup" type="bottom">
+    <uni-popup ref="popup" type="bottom" @change="changePopup">
 
       <view class="userpage">
         <view class="userpage-icon" @click="close">
@@ -537,14 +537,12 @@
         num: 10
       }
     },
-
     onPullDownRefresh() {
       this.getGoods(true)
       uni.stopPullDownRefresh()
     },
 
     onLoad() {
-
       this.list1()
       this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
     },
@@ -668,6 +666,10 @@
         }
 
       },
+      changePopup(e){
+        if(e.show)uni.hideTabBar();
+        else uni.showTabBar();
+      },
       //备注弹窗
       refundModify(item) {
         this.refundInfo = item;
@@ -679,7 +681,6 @@
       agree() {
         this.$refs.popup.open()
         this.isFshow = false
-
       },
       //拒绝
       refuse() {
diff --git a/pages/trading_hall/adddiscounts/index.vue b/pages/trading_hall/adddiscounts/index.vue
index 8a85112..7395266 100644
--- a/pages/trading_hall/adddiscounts/index.vue
+++ b/pages/trading_hall/adddiscounts/index.vue
@@ -609,7 +609,9 @@
 			},
 			/*获取选中的宝贝*/
 			getProduct(data) {
-				this.productList = []
+        console.log(data);
+				this.productList = [];
+        this.formData.product_info=[];
 				this.price = 0;
 				if (data.length > 0) {
 					this.productList = data;
@@ -639,6 +641,7 @@
 				let that = this,
 
 					value = that.formData;
+          console.log(value, value.product_info[0].deliver_method);
 				if (value.image.length == 0) return that.$util.Tips({
 					title: '请添加图文图片'
 				});