5.11 首页修改

components/listitem.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="contentone flex-center">
-			<image class="contentoneimage" src="@/static/ewm.png" mode="aspectFill"></image>
+			<image class="contentoneimage" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/ewm.png" mode="aspectFill"></image>
 			<text class="contentonetext">精选推荐</text>
 		</view>
 		<view class="contenttow flex-between">

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()
+			uni.getLocation({
-			this.init_fn()
+				type: 'wgs84',
-			this.timersetInterval = '0'
+				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',{
+				uni.pro.navigateTo('product/index', {
-					id:item.id
+					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;

pages/make/make.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="item" @click="goMap">
 				<text class="t" style="margin-right: 12upx">门店地址：{{shopInfo.address || '无'}}</text>
-				<u-icon :name="require('@/static/icon_address.png')"></u-icon>
+				<!-- <u-icon :name="require('@/static/icon_address.png')"></u-icon> -->
 			</view>
 			<!-- <view class="item">
 				<text class="t undline">点击查看近期预约</text>

pages/order_food/order_food.vue

@@ -98,7 +98,7 @@
 		<view class="cart-wrap">
 			<view class="cart-content">
 				<view class="left">
-					<image class="icon" src="../../static/icon_cart.png" mode="aspectFit" @click="showCart = !showCart">
+					<image class="icon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/icon_cart.png" mode="aspectFit" @click="showCart = !showCart">
 					</image>
 					<text class="i">￥</text>
 					<text class="num">{{cartLists.amount}}</text>

pages/user/shop/detail.vue

@@ -106,7 +106,17 @@
 			this.countScrollTitle(e.scrollTop);
 		},
 		onLoad(e) {
-
+			// #ifdef APP-PLUS || H5
+			uni.getSystemInfo({
+				success: (res) => {
+					console.log(res)
+					this.menuInfo = res
+				}
+			})
+			// #endif
+			// #ifdef MP-WEIXIN
+			this.menuInfo = uni.getMenuButtonBoundingClientRect()
+			// #endif
 		},
 		onUnload() {
 

pages/user/shop/index.vue

@@ -53,7 +53,8 @@
 				</view>
 			</view>
 			<view class="shop_contentlist flex-between">
-				<view class="shop_contentlistitem flex-colum-start" @click="clickshopinfo(item)" v-for="(item,index) in 4" :key="index">
+				<view class="shop_contentlistitem flex-colum-start" @click="clickshopinfo(item)"
+					v-for="(item,index) in 4" :key="index">
 					<image class="shop_contentlistitemimage" src="@/static/avatar.png" mode="aspectFill"></image>
 					<view class="shop_contentlistitemone">
 						澳洲高级洗发水
@@ -86,7 +87,7 @@
 		data() {
 			return {
 				keyword: '',
-				menuInfo: uni.getMenuButtonBoundingClientRect(),
+				menuInfo: {},
 				paddingBtmSize: 6,
 				isFixed: false,
 				active: 0,
@@ -134,16 +135,26 @@
 			}
 			this.countScrollTitle(e.scrollTop);
 		},
-		onLoad(e) {
+		onLoad() {
-
+			// #ifdef APP-PLUS || H5
+			uni.getSystemInfo({
+				success: (e) => {
+					console.log(e)
+					this.menuInfo = e
+				}
+			})
+			// #endif
+			// #ifdef MP-WEIXIN
+			this.menuInfo = uni.getMenuButtonBoundingClientRect()
+			// #endif
 		},
 		onUnload() {
 
 		},
 		methods: {
-			clickshopinfo(item){
+			clickshopinfo(item) {
-				uni.pro.navigateTo('user/shop/shopinfo',{
+				uni.pro.navigateTo('user/shop/shopinfo', {
-					item:item
+					item: item
 				})
 			},
 			// 导航栏点击
@@ -180,9 +191,11 @@
 	$tabLeft: 200upx;
 	$itemH: 100upx;
 	$cartH: 90upx;
-	page{
+
+	page {
 		background: #fff;
 	}
+
 	.nav-wrap {
 		width: 100%;
 		position: fixed;
@@ -360,13 +373,16 @@
 					font-size: 28rpx;
 					color: #333333;
 				}
-				.shop_contentlistitemtow{
+
+				.shop_contentlistitemtow {
 					padding: 16rpx 16rpx 0 16rpx;
-					image{
+
+					image {
 						width: 28rpx;
 						height: 28rpx;
 					}
-					view{
+
+					view {
 						margin-left: 6rpx;
 						font-family: SourceHanSansCN-Medium, SourceHanSansCN-Medium;
 						font-weight: normal;
@@ -374,10 +390,12 @@
 						color: #FF981E;
 					}
 				}
-				.shop_contentlistitemthere{
+
+				.shop_contentlistitemthere {
 					padding: 16rpx;
 					width: 100%;
-					view:nth-child(1){
+
+					view:nth-child(1) {
 						font-family: SourceHanSansCN-Regular, SourceHanSansCN-Regular;
 						font-weight: normal;
 						font-size: 20rpx;
@@ -387,7 +405,8 @@
 						text-decoration-line: line-through;
 						text-transform: none;
 					}
-					view:nth-child(2){
+
+					view:nth-child(2) {
 						font-family: SourceHanSansCN-Regular, SourceHanSansCN-Regular;
 						font-weight: normal;
 						font-size: 20rpx;

pages/user/shop/shopinfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<image class="contentimage" src="@/static/ewm.png" mode="aspectFill"></image>
+		<image class="contentimage" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/ewm.png" mode="aspectFill"></image>
 		<view class="contentbox">
 			<view class="contentbox_one">
 				111