5.11 首页修改

pages/index/index - 副本.vue

@@ -20,7 +20,7 @@
 						<text class="t">{{userInfo.nickName}}</text>
 					</view>
 					<navigator class="ewm-wrap" url="/pages/pay_code/pay_code" hover-class="none">
-						<image class="ewm" src="../../static/ewm.png" mode="aspectFit"></image>
+						<image class="ewm" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/ewm.png" mode="aspectFit"></image>
 						<text class="t">会员码</text>
 					</navigator>
 				</view>

pages/index/index.vue

@@ -291,26 +291,8 @@
 			},
 		},
 		async onLoad() {
-			uni.getLocation({
-				type: 'wgs84',
-				success: (res) => {
-					// console.log(res, '获取距离')
-					// this.lng = res.longitude
-					// this.lat = res.latitude
-					// // 测试
-					let datastorage = {
-						address: '西安市', //地址
-						lng: res.longitude,
-						lat: res.latitude,
-					}
-					uni.cache.set('getLocationstorage', datastorage);
-				},
-				fail: (err) => {
-					// this.positionindex()
-					console.log(err, '获取错误')
-				}
-			});
-		
+
+
 			setTimeout(() => {
 				this.GetTop()
 			}, 1000)
@@ -319,9 +301,33 @@
 			this.onLoadhome()
 		},
 		onShow() {
-			this.hometop()
-			this.init_fn()
-			this.timersetInterval = '0'
+			uni.getLocation({
+				type: 'wgs84',
+				success: (res) => {
+					let datastorage = {
+						address: '西安市', //地址
+						lng: res.longitude,
+						lat: res.latitude,
+					}
+					uni.cache.set('getLocationstorage', datastorage);
+					this.hometop()
+					this.init_fn()
+					this.timersetInterval = '0'
+				},
+				fail: (err) => {
+					let datastorage = {
+						address: '西安市', //地址
+						lng: res.longitude,
+						lat: res.latitude,
+					}
+					uni.cache.set('getLocationstorage', datastorage);
+					this.hometop()
+					this.init_fn()
+					this.timersetInterval = '0'
+					console.log(err, '获取错误')
+				}
+			});
+
 		},
 		methods: {
 			closeproductlist() {
@@ -335,8 +341,8 @@
 				uni.pro.navigateTo('index/uindexlist')
 			},
 			fivecontentclick(item) {
-				uni.pro.navigateTo('product/index',{
-					id:item.id
+				uni.pro.navigateTo('product/index', {
+					id: item.id
 				})
 			},
 			updateCity(data) {
@@ -432,6 +438,9 @@
 					})
 					if (res.data.pages < this.form.page) {
 						this.form.status = 'nomore'
+						if (this.form.page == 1 && res.data.list.length == 0) {
+							this.is_end = true
+						}
 						return false;
 					} else {
 						this.form.status = 'loading';
@@ -803,7 +812,7 @@
 									width: 300rpx;
 									overflow: hidden;
 									text-overflow: ellipsis;
-									white-space:nowrap; //溢出不换行white-space:nowrap; //溢出不换行
+									white-space: nowrap; //溢出不换行white-space:nowrap; //溢出不换行
 									font-family: Source Han Sans CN, Source Han Sans CN;
 									font-weight: 500;
 									font-size: 28rpx;
@@ -908,6 +917,7 @@
 									width: 100%;
 									padding-right: 7rpx;
 									margin-top: 2rpx;
+
 									.indexboxitemleftthere_countdowntext {
 										font-family: Source Han Sans CN, Source Han Sans CN;
 										font-weight: 400;