From f594fe66400395c6094b9f0b105284dd93c4b2cf Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 21 Sep 2023 17:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue           |  10 +--
 pages/moreProject/moreProject.vue | 113 +++---------------------------
 2 files changed, 14 insertions(+), 109 deletions(-)

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 37b9398..bb740c1 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -30,7 +30,7 @@
 
 
 
-		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" @kkchange="kkchange"></zbpSwiper>
+		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" ></zbpSwiper>
 		<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
 			icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
 		<view class="business com special_work" v-if="jurisdiction == false">
@@ -141,7 +141,7 @@
 				},
 				prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
 				isShow: false,
-				bgColor: '',
+				
 				isFshow: false,
 				street: '',
 				// 编辑中标记
@@ -164,7 +164,7 @@
 				street: '',
 				showPicker: false,
 				columnData: [],
-				bgColor: '',
+			
 				isFshow: false,
 				backColor: 'rgba(252, 252, 252, 0)'
 			};
@@ -409,10 +409,6 @@
 			},
 
 
-			kkchange(e) {
-				this.bgColor = e
-			},
-
 			navigator(url, t) {
 				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
 				uni.navigateTo({
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 52d9a18..9f90bf9 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -163,7 +163,7 @@
 									</image>
 									<text class="text">交易申请</text>
 								</view>
-								<!-- <view class="examine"
+								<view class="examine"
 									@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
 									<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
 									</image>
@@ -186,7 +186,7 @@
 									<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
 									</image>
 									<text class="text">发布管理</text>
-								</view> -->
+								</view>
 
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
@@ -375,15 +375,12 @@
 	import emptyPage from '@/components/emptyPage.vue';
 	import zbpSwiper from '@/components/zbpSwiper'
 	import {
-		mapState,
+	
 		mapGetters
 	} from 'vuex'
+	
 	import {
-		getWorkArticleCount,
-		getSlideAPI
-	} from '@/api/article.js'
-	import {
-		getStoreList,
+	
 		getUserInfo
 	} from '@/api/user.js'
 	import {
@@ -417,13 +414,11 @@
 				},
 				prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
 				isShow: false,
-				bgColor: '',
-				isFshow: false,
-				street: ''
+				
 			};
 		},
 		computed: {
-			...mapGetters(['userInfo', 'location', 'isLogin'])
+			...mapGetters(['userInfo',  'isLogin'])
 		},
 		created() {},
 		onLoad() {},
@@ -436,100 +431,14 @@
 				this.jurisdiction = true
 			}
 			this.getUserInfo()
-			this.appLocation()
-		},
-		onPullDownRefresh() {
-			this.getUserInfo()
-			uni.stopPullDownRefresh()
-		},
-		mounted() {
-			this.appLocation()
-
+		
 		},
+	
+		
 
 		methods: {
-
-
-
-			//获取定位
-			appLocation() {
-				uni.getLocation({
-					type: 'wgs84',
-					timeout: '10',
-					success: (res) => {
-						// console.log(res)
-
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							this.street = res.data.address_component.street
-							Cache.set('ADRESS_LOCATION', this.street)
-						}).catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						})
-					},
-					fail: (err) => {
-
-						// uni.showToast({
-						// 	title: "获取定位超时",
-						// 	icon: 'none',
-						// 	duration: 2000
-						// });
-					}
-				});
-			},
-
-			scrolling() {
-				// 滚动条距文档顶部的距离
-				let scrollTop =
-					window.pageYOffset ||
-					document.documentElement.scrollTop ||
-					document.body.scrollTop;
-				// 滚动条滚动的距离
-				let scrollStep = scrollTop - this.oldScrollTop;
-				console.log("header 滚动距离 ", scrollTop);
-				// 更新——滚动前，滚动条距文档顶部的距离
-				this.oldScrollTop = scrollTop;
-
-				//变量windowHeight是可视区的高度
-				let windowHeight =
-					document.documentElement.clientHeight || document.body.clientHeight;
-				//变量scrollHeight是滚动条的总高度
-				let scrollHeight =
-					document.documentElement.scrollHeight || document.body.scrollHeight;
-
-				//滚动条到底部的条件
-				if (scrollTop + windowHeight == scrollHeight) {
-					//你想做的事情
-					console.log("header  你已经到底部了");
-				}
-				if (scrollStep < 0) {
-					this.isFshow = false
-					console.log("header 滚动条向上滚动了！");
-				} else {
-					this.isFshow = true
-					console.log("header  滚动条向下滚动了！");
-				}
-				// 判断是否到了最顶部
-				if (scrollTop <= 0) {
-					this.isFshow = false
-					console.log("header 到了最顶部")
-				}
-			},
-
-			kkchange(e) {
-				this.bgColor = e
-			},
-
 			navigator(url, t) {
-				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+				
 				uni.navigateTo({
 					url: url
 				})