From 65178f0e9efc6cf693f7a15e8572243315296e62 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 6 Apr 2022 16:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8Ddiy=E9=A6=96=E9=A1=B5=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=8B=E6=8B=89=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/index/diy/index.vue | 52 +++++-----------------
 template/uni-app/pages/index/index.vue     | 13 ++++--
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/template/uni-app/pages/index/diy/index.vue b/template/uni-app/pages/index/diy/index.vue
index e8f78de36..347c3fe72 100644
--- a/template/uni-app/pages/index/diy/index.vue
+++ b/template/uni-app/pages/index/diy/index.vue
@@ -402,39 +402,6 @@
 				}
 			} catch (e) {}
 			// #endif
-			// const {
-			// 	state,
-			// 	scope
-			// } = options;
-			// #ifndef H5
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					try {
-						uni.setStorageSync('user_latitude', res.latitude);
-						uni.setStorageSync('user_longitude', res.longitude);
-					} catch {}
-				}
-			});
-			// #endif
-			// #ifdef H5
-			if (this.$wechat.isWeixin()) {
-				this.$wechat.location().then(res => {
-					uni.setStorageSync('user_latitude', res.latitude);
-					uni.setStorageSync('user_longitude', res.longitude);
-				})
-			} else {
-				uni.getLocation({
-					type: 'wgs84',
-					success: function(res) {
-						try {
-							uni.setStorageSync('user_latitude', res.latitude);
-							uni.setStorageSync('user_longitude', res.longitude);
-						} catch {}
-					}
-				});
-			}
-			// #endif
 			this.diyData();
 			this.getIndexData();
 			// #ifdef MP
@@ -799,7 +766,7 @@
 					uni.stopPullDownRefresh({
 						success: (e) => {},
 					});
-					
+
 				}).catch(error => {
 					// #ifdef APP-PLUS
 					if (error.status) {
@@ -888,14 +855,19 @@
 					});
 				});
 			},
-		},
-		onReachBottom: function() {
-			if (this.isSortType == 0) {
-				// this.getGroomList();
-			} else {
-				this.getGoodsList();
+			onsollBotton() {
+				console.log('????', this.isSortType)
+				if (this.isSortType == 0) {
+					// this.getGroomList();
+				} else {
+					this.getGoodsList();
+				}
 			}
 		},
+
+		onReachBottom: function() {
+
+		},
 		onPageScroll(e) {
 			// #ifdef H5
 			if (this.isHeaderSerch) {
diff --git a/template/uni-app/pages/index/index.vue b/template/uni-app/pages/index/index.vue
index 870bd5202..4a12ed5d0 100644
--- a/template/uni-app/pages/index/index.vue
+++ b/template/uni-app/pages/index/index.vue
@@ -1,17 +1,19 @@
 <template>
-	<diy v-if="isDiy"></diy>
+	<diy ref="diy" v-if="isDiy"></diy>
 	<visualization v-else></visualization>
 </template>
 
 <script>
 	import diy from './diy'
 	import visualization from './visualization'
-	import {getShare} from "@/api/public.js";
+	import {
+		getShare
+	} from "@/api/public.js";
 	export default {
 		data() {
 			return {
 				isDiy: uni.getStorageSync('is_diy'),
-				shareInfo:{}
+				shareInfo: {}
 			}
 		},
 		components: {
@@ -58,6 +60,11 @@
 				});
 			},
 		},
+		onReachBottom: function() {
+			if (this.isDiy) {
+				this.$refs.diy.onsollBotton()
+			}
+		},
 		// #ifdef MP
 		//发送给朋友
 		onShareAppMessage(res) {