From 8ac478412906a6d635e965abbab2110e19ea7563 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue | 33 +++++++++++++++++----------------
 pages/index/index.vue   |  9 ++++++---
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index b3b268d..d750591 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -31,7 +31,7 @@
       :show="jurisdiction"
       mode="permission"
       :text="emptyText"
-      icon="/static/empty/permission.png"
+      icon="http://cdn.uviewui.com/uview/empty/permission.png"
     ></u-empty>
     <view class="business com special_work" v-if="jurisdiction == false">
       <view class="title project">
@@ -101,9 +101,12 @@
       </view>
     </view>
 
-    <!-- <view class="" v-if="jurisdiction == false && isShow == false">
+    <view class="" v-if="jurisdiction == false && isShow == false">
       <emptyPage title="暂无信息"></emptyPage>
-    </view> -->
+    </view>
+	<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+		@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+	
   </view>
 </template>
 
@@ -139,9 +142,7 @@ import {
 import {
   getDiy
 } from '@/api/api.js';
-// #ifdef APP-PLUS
 import uniMP from '@/utils/uniMP.js';
-// #endif
 
 export default {
   components: {
@@ -183,8 +184,8 @@ export default {
       ],
       nowMenuList: [],
       street: '',
-      showPicker: false,
-      columnData: [],
+    showPicker: false,
+    columnData: [],
       bgColor: '',
       isFshow: false,
       backColor: 'rgba(252, 252, 252, 0)'
@@ -337,7 +338,7 @@ export default {
       uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
     },
     getUniMp (appid) {
-      console.log('点击小程序');
+      console.log('点击供销平台');
       // #ifdef APP-PLUS
       uniMP.loadMP(appid);
       return;
@@ -364,14 +365,14 @@ export default {
       }
     },
 
-    Area () {
-      getArea({
-        city_code: 510500
-      }).then(res => {
-        this.$refs.uPicker.setColumnValues(0, res.data);
-        this.Street(res.data[0]['code']);
-      });
-    },
+ Area() {
+ 	getArea({
+ 		city_code: 510500
+ 	}).then(res => {
+ 		this.$refs.uPicker.setColumnValues(0, res.data);
+ 		this.Street(res.data[0]['code']);
+ 	});
+ },
     Street (code) {
       getStreet({
         area_code: code
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f52da0d..0de3ecd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -163,9 +163,8 @@
 
 
 			this.getCateList()
-			this.getArticle()
+			// this.getArticle()
 			this.getGoods()
-			
 			this.Area()
 			//this.setPermissions()
 
@@ -229,7 +228,10 @@
 
 		},
 		// #endif
-
+	beforeDestroy () {
+		  // 销毁监听事件
+		  this.$bus.$off('value-updated')
+		},
 		methods: {
 
 			scrolling() {
@@ -725,6 +727,7 @@
 
 	/deep/.u-tabs__wrapper__nav__line {
 		width: 46rpx;
+		margin-left: -2rpx;
 
 
 	}