lhl 2 vuotta sitten
vanhempi
commit
3f6ebfb43b
22 muutettua tiedostoa jossa 387 lisäystä ja 122 poistoa
  1. 9 0
      api/shop.js
  2. 67 13
      pages/index/index.vue
  3. 35 0
      pages/shop/giftDetail.vue
  4. 163 85
      pages/shop/shopDetail.vue
  5. 110 21
      pages/shop/shopList.vue
  6. 2 2
      store/index.js
  7. BIN
      unpackage/dist/build/h5/h5.rar
  8. 1 1
      unpackage/dist/build/h5/index.html
  9. 0 0
      unpackage/dist/build/h5/static/js/index.84a94b58.js
  10. 0 0
      unpackage/dist/build/h5/static/js/index.f674758a.js
  11. 0 0
      unpackage/dist/build/h5/static/js/pages-category-business~pages-game-game~pages-shop-shopList~pages-user-award~pages-user-cash~pages-user-mygx.0075e1f2.js
  12. 0 0
      unpackage/dist/build/h5/static/js/pages-category-business~pages-game-game~pages-user-award~pages-user-cash~pages-user-mygx.4cdb14e4.js
  13. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.ad95604c.js
  14. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.c53998a9.js
  15. 0 0
      unpackage/dist/build/h5/static/js/pages-public-wxLogin.095d04b7.js
  16. 0 0
      unpackage/dist/build/h5/static/js/pages-public-wxLogin.d41f74ed.js
  17. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-giftDetail.3bef2b23.js
  18. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-giftDetail.eaf7b173.js
  19. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-shopDetail.b229b237.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-shopDetail.fb57a36d.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-shopList.02d0c49b.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-shop-shopList.65b89946.js

+ 9 - 0
api/shop.js

@@ -16,4 +16,13 @@ export function getStoreList(data) {
 		method: 'get',
 		data
 	});
+}
+
+//获取店铺详情
+export function getStoreDetail(data, id) {
+	return request({
+		url: '/api/store_details/' + id,
+		method: 'get',
+		data
+	});
 }

+ 67 - 13
pages/index/index.vue

@@ -23,7 +23,8 @@
 			</swiper>
 		</view>
 		<view class="shop-list flex" style="padding-top: 40rpx;">
-			<view class="shop-item flex" v-for="(item,index) in shopList">
+			<view class="shop-item flex" v-for="(item,index) in shopList"
+				@click="navto('/pages/shop/shopList?id=' + item.id)">
 				<image :src="item.pic" mode="" class="shop-img"></image>
 				<view class="shop-name">
 					{{item.cate_name}}
@@ -62,7 +63,8 @@
 		</view>
 		<!-- 门店列表 -->
 		<view class="" style="height: 20rpx;"></view>
-		<view class="djq-wrap flex f-ai-s" v-for="storeitem in storeList">
+		<view class="djq-wrap flex f-ai-s" v-for="storeitem in storeList"
+			@click="navto('/pages/shop/shopDetail?id=' + storeitem.id )">
 			<image :src="storeitem.image" mode="" class="djq-img"></image>
 			<view class="djq-right pl20">
 				<view class="djq-tit flex f-j-sb f-ai-s">
@@ -70,7 +72,7 @@
 						{{storeitem.name}}
 					</view>
 					<view class="djq-dis">
-						<image src="../../static/icon/dw.png" mode=""></image>
+						<image src="../../static/index/index10.png" mode=""></image>
 						距离{{(storeitem.range*1 > 1000 )?( storeitem.range + 'KM'):(storeitem.range*1 + 'm')}}
 					</view>
 				</view>
@@ -84,27 +86,27 @@
 						</view>
 						<view class="hd-btn">
 							<image src="../../static/icon/call.png" mode="" style="margin-right: 15rpx;"
-								@click="makeCall(storeitem.phone)"></image>
-							<image src="../../static/icon/dh.png" mode="" @click="dh(storeitem)"></image>
+								@click.stop="makeCall(storeitem.phone)"></image>
+							<image src="../../static/icon/dh.png" mode="" @click.stop="dh(storeitem)"></image>
 						</view>
 					</view>
 				</view>
-				<!-- <view class="" style="padding: 10rpx 0 0 0;">
-					<view class="left-btm flex f-j-s" v-for="itemt in 3">
+				<view class="" style="padding: 10rpx 0 0 0;" v-if="storeitem.coupon.length > 0">
+					<view class="left-btm flex f-j-s" v-for="qitem in storeitem.coupon">
 						<view class="j-logo">
 						</view>
 						<view class="j-price">
-							<text>¥</text>25
+							<text>¥</text>{{qitem.price}}
 						</view>
 						<view class="j-zk">
-							5.8
+							{{(((qitem.price*10)/(qitem.ot_price*1)).toFixed(1))}}
 						</view>
 						<view class="j-name">
-							50元代金券
+							{{qitem.store_name}}
 						</view>
 					</view>
-				</view> -->
+				</view>
 			</view>
 		</view>
 	</view>
@@ -255,8 +257,20 @@
 				});
 			},
 			// 导航
-			dh() {
-
+			dh(item) {
+				// #ifdef H5
+				weixindata().then(wxOjb => {
+					console.log(wxOjb, '获取微信');
+					wxOjb.openLocation({
+						latitude: item.latitude, // 纬度,浮点数,范围为90 ~ -90
+						longitude: item.longitude, // 经度,浮点数,范围为180 ~ -180。
+						name: item.name, // 位置名
+						address: item.detailed_address, // 地址详情说明
+						scale: 28, // 地图缩放级别,整型值,范围从1~28。默认为最大
+						infoUrl: '' // 在查看位置界面底部显示的超链接,可点击跳转
+					});
+				});
+				// #endif
 			},
 			// 获取商店列表
 			getStoreList() {
@@ -1351,4 +1365,44 @@
 			}
 		}
 	}
+
+	.left-btm {
+		height: 66rpx;
+
+		.j-logo {
+			width: 32rpx;
+			line-height: 33rpx;
+			background: linear-gradient(-48deg, #FFA30B, #FFD158);
+			border-radius: 13rpx;
+			font-size: 21rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			text-align: center;
+		}
+
+		.j-price {
+			font-size: 27rpx;
+			font-weight: bold;
+			color: #FF4C4C;
+			margin: 0 10rpx 0 5rpx;
+		}
+
+		.j-zk {
+			height: 31rpx;
+			border: 1rpx solid #FF4C4C;
+			border-radius: 7rpx;
+			line-height: 31rpx;
+			padding: 0 8rpx;
+			font-size: 20rpx;
+			font-weight: bold;
+			color: #FF4C4C;
+			margin-right: 5rpx;
+		}
+
+		.j-name {
+			font-size: 23rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
 </style>

+ 35 - 0
pages/shop/giftDetail.vue

@@ -104,6 +104,15 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="popupdh" type="bottom" @click="close">
+			<view class="popup_row">
+				<view class="rows">
+					<view class="rows-item" @click="toGaodeMap">高德地图</view>
+					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
+					<!-- <view class="rows-item" @click="totengxunMap">腾讯地图</view> -->
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -482,4 +491,30 @@
 	.iconyue {
 		color: #fe8e2e;
 	}
+
+	.popup_row {
+		width: 100%;
+		height: 500rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.rows {
+			width: 100%;
+			padding: 0 24rpx;
+
+			.rows-item {
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
+				width: 100%;
+				font-size: 32rpx;
+				color: #303133;
+				// border-bottom: 1rpx solid #f0f0f0;
+			}
+
+		}
+	}
 </style>

+ 163 - 85
pages/shop/shopDetail.vue

@@ -5,9 +5,9 @@
 				<image class="simage" :src="info.image" mode=""></image>
 				<view class="stop-main">
 					<view class="stop-title">{{ info.name }}</view>
-					<view class="stop-address" v-if="info.jl">
+					<view class="stop-address">
 						<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
-						<view class="mrt-font">距离{{ info.jl }}KM</view>
+						<view class="mrt-font">距离{{ info.jl }}KM</view>
 					</view>
 				</view>
 			</view>
@@ -33,19 +33,30 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="shop-dhq">
-			<view class="dhq-left">
+		<view class="" style="padding: 20rpx 20rpx 1rpx 20rpx;background-color: #fff;margin-top: 20rpx;">
+			<view class="shop-dhq flex" v-for="qitem in info.coupon">
+				<view class="dhq-left flex f-d-c f-j-c fg1 f-ai-s">
+					<view class="dhq-name">
+						{{qitem.store_name}}
+					</view>
+					<view class="dhq-price flex">
+						<view class="j-price">
+							{{qitem.price}}
+						</view>
+						<view class="j-zk">
+							{{(((qitem.price*10)/(qitem.ot_price*1)).toFixed(1))}}折
 
-			</view>
-			<view class="dhq-right">
-				<view class="right-btn">
-					抢购
+						</view>
+					</view>
 				</view>
-				<view class="right-btn">
-					抢购
+				<view class="dhq-right fs0">
+					<view class="right-btn" @click="goBuy(qitem)">
+						抢购
+					</view>
 				</view>
 			</view>
 		</view>
+
 		<view class="store-main" v-if="info.images != null">
 			<view class="smain-title">店内图片</view>
 			<scroll-view class="scroll-box flex" @scroll="scroll" scroll-x="true" :scroll-with-animation="true"
@@ -54,24 +65,32 @@
 					<image class="scroll-image" :src="item" mode="heightFix"></image>
 				</view>
 			</scroll-view>
+		</view>
+		<view class="" style="height: 100rpx;">
+
 		</view>
 		<view class="btn-box flex">
 			<view class="btn-left" @click="tocall()">联系商家</view>
 			<view class="btn-right" @click="markertap()">导航到店</view>
 		</view>
-		<uni-popup ref="popup" type="bottom" @click="close">
-			<view class="popup_row">
-				<view class="rows">
-					<view class="rows-item" @click="toGaodeMap">高德地图</view>
-					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
-					<!-- <view class="rows-item" @click="totengxunMap">腾讯地图</view> -->
-				</view>
-			</view>
-		</uni-popup>
+
 	</view>
 </template>
 
 <script>
+	// #ifdef H5
+	import {
+		weixindata,
+		shareLoad
+	} from '@/utils/wxAuthorized';
+	// #endif
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		getStoreDetail
+	} from '@/api/shop.js'
 	import {
 		store_details
 	} from '@/api/index.js';
@@ -81,54 +100,54 @@
 			return {
 				id: '',
 				info: '',
-				longitude: '',
-				latitude: '',
-				latitude1: '',
-				longitude1: '',
 				address: ''
 			};
 		},
+		computed: {
+			...mapState(['loginInterceptor', 'baseURL', 'latitude', 'longitude']),
+		},
 		onLoad(option) {
-			// this.id = option.id;
+			this.id = option.id;
 			// this.loadData();
+			if (this.latitude) {
+				this.getStoreDetail()
+			} else {
+				this.getaddress()
+			}
+
+			// this.getStoreDetail()
 		},
 		methods: {
-			markertap(e) {
-				this.$refs.popup.open();
+			// 获取门店详情
+			getStoreDetail() {
+				let obj = this
+				getStoreDetail({}, obj.id).then(res => {
+					console.log(res)
+					obj.info = res.data
+					obj.info.jl = obj.getFlatternDistance(obj.latitude, obj.longitude, obj.info.latitude, obj
+						.info.longitude);
+
+				})
 			},
-			loadData() {
-				const obj = this;
-				// store_details({}, this.id).then(({ data }) => {
-				// 	console.log(data);
-				// 	this.info = data;
-				// });
-				uni.getLocation({
-					type: 'gcj02',
-					success: res => {
-						console.log('dizhi+++++++++++');
-						this.longitude = res.longitude; //经度
-						this.latitude = res.latitude; //纬度
-						store_details({}, this.id).then(({
-							data
-						}) => {
-							obj.longitude1 = data.longitude;
-							obj.latitude1 = data.latitude;
-							obj.address = data.detailed_address;
-							data.jl = this.getFlatternDistance(this.latitude, this.longitude, data
-								.latitude, data.longitude);
-							this.info = data;
-						});
-					},
-					fail: err => {
-						console.log(err);
-						openMap().then(e => {
-							this.getaddress();
-						});
-					}
+			markertap(e) {
+				let obj = this
+				// #ifdef H5
+				weixindata().then(wxOjb => {
+					console.log(wxOjb, '获取微信');
+					wxOjb.openLocation({
+						latitude: obj.info.latitude, // 纬度,浮点数,范围为90 ~ -90
+						longitude: obj.info.longitude, // 经度,浮点数,范围为180 ~ -180。
+						name: obj.info.name, // 位置名
+						address: obj.info.detailed_address, // 地址详情说明
+						scale: 28, // 地图缩放级别,整型值,范围从1~28。默认为最大
+						infoUrl: '' // 在查看位置界面底部显示的超链接,可点击跳转
+					});
 				});
+				// #endif
 			},
 			//根据经纬度计算距离
 			getFlatternDistance(lat1, lng1, lat2, lng2) {
+				console.log(lat1, lng1, lat2, lng2)
 				let radLat1 = (lat1 * Math.PI) / 180.0;
 				let radLat2 = (lat2 * Math.PI) / 180.0;
 				let a = radLat1 - radLat2;
@@ -149,35 +168,36 @@
 					phoneNumber: num //仅为示例
 				});
 			},
-			// 调用高德
-			toGaodeMap() {
-				let latitude = this.latitude1;
-				let longitude = this.longitude1;
-				let address = this.address;
-				console.log('选择高德', latitude, longitude, address);
-				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
+			goBuy(item) {
+				uni.navigateTo({
+					url: '/pages/product/product?id=' + item.id
+				})
 			},
-			// 调用腾讯
-			totengxunMap() {
-				let latitude = this.latitude1;
-				let longitude = this.longitude1;
-				let address = this.address;
-				console.log('选择腾讯', latitude, longitude);
-				window.location.href =
-					`http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			getaddress() {
+				console.log('dizhi+++++++++++');
+				let obj = this;
+				// #ifdef H5
+				weixindata().then(wxOjb => {
+					console.log(wxOjb, '获取微信');
+					wxOjb.getLocation({
+						type: 'gcj02',
+						success: res => {
+							console.log(res, 123456);
+							obj.setLat(res.latitude);
+							obj.setLon(res.longitude);
+							obj.getStoreDetail()
+						},
+						fail: err => {
+							console.log(err, 'shi+++++++++++++++');
+							openMap().then(e => {
+								obj.getaddress();
+							});
+						}
+					});
+				});
+				// #endif
 			},
-			// 调用百度
-			tobaiDuMap() {
-				let latitude = this.latitude1;
-				let longitude = this.longitude1;
-				let latitude6 = this.latitude;
-				let longitude6 = this.longitude;
-				let address = this.address;
-				console.log('选择百度', latitude, longitude);
-				console.log('获取当前经纬度', latitude6, longitude6);
-				window.location.href =
-					`http://api.map.baidu.com/direction?origin=latlng:${latitude6},${longitude6}|name:我的位置&destination=${latitude},${longitude}&mode=driving&region=${address}&output=html&src=webapp.baidu.openAPIdemo`;
-			}
+
 		}
 	};
 </script>
@@ -299,12 +319,12 @@
 			margin-left: 20rpx;
 			display: inline-block;
 			height: 240rpx;
-			width: 240rpx;
+			// width: 240rpx;
 		}
 
 		.scroll-image {
 			height: 240rpx;
-			width: 240rpx;
+			// width: 240rpx;
 		}
 	}
 
@@ -387,9 +407,67 @@
 	.shop-dhq {
 		width: 702rpx;
 		height: 171rpx;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.15);
 		margin: auto;
 		border-radius: 20rpx;
 		background-color: #fff;
+		padding: 0 48rpx 0 26rpx;
+		margin-bottom: 20rpx;
+
+		.dhq-left {
+
+
+			.dhq-name {
+				font-size: 33rpx;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.dhq-price {
+				padding-top: 20rpx;
+
+				.j-price {
+					font-size: 38rpx;
+					font-weight: bold;
+					color: #FF4C4C;
+
+					&::before {
+						content: '¥';
+						font-size: 24rpx;
+						color: #FF4C4C;
+					}
+				}
+
+				.j-zk {
+					display: inline-block;
+					margin-left: 10rpx;
+					line-height: 32rpx;
+					height: 32rpx;
+					border: 1px solid #FF4C4C;
+					border-radius: 5rpx;
+					font-size: 22rpx;
+					font-weight: 500;
+					color: #FF4C4C;
+					padding: 0 8rpx;
+				}
+			}
+
+
+		}
+
+		.dhq-right {
+
+			.right-btn {
+				width: 105rpx;
+				line-height: 56rpx;
+				background: linear-gradient(143.2747deg, #FF6A00, #EE0979);
+				border: 1rpx solid #FF4C4C;
+				border-radius: 27rpx;
+				text-align: center;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+			}
+		}
 	}
 </style>

+ 110 - 21
pages/shop/shopList.vue

@@ -4,29 +4,32 @@
 			<view class="input-box flex" @click.stop="clickSearch">
 				<view class=" input-content flex">
 					<view class="iconfont iconsearch"></view>
-					<view class="input"><input type="text" placeholder="请输入店铺名称" /></view>
+					<view class="input"><input type="text" placeholder="请输入店铺名称" v-model="name" /></view>
 				</view>
 			</view>
-			<view class="search-btn">
+			<view class="search-btn" @click="search()">
 				搜索
 			</view>
 		</view>
-		<scroll-view scroll-y="true" :style="{'height': height}" class="shop-list-wrap">
-			<view class="djq-wrap flex f-ai-s" v-for="item in 10">
-				<image src="../../static/error/errorImage.jpg" mode="" class="djq-img"></image>
+		<scroll-view scroll-y="true" :style="{'height': height}" class="shop-list-wrap" @scrolltolower="getStoreList()">
+			<!-- 空白页 -->
+			<empty v-if="loaded === true && shopList.length === 0"></empty>
+			<view class="djq-wrap flex f-ai-s" v-for="item in shopList"
+				@click="navTo('/pages/shop/shopDetail?id=' + item.id)">
+				<image :src="item.image" mode="" class="djq-img"></image>
 				<view class="djq-right pl20">
 					<view class="djq-tit flex f-j-sb f-ai-s">
 						<view class="djq-name clamp">
-							岭上会推拿SPA岭上会推拿SPA岭上会推拿SPA岭上会推拿SPA岭上会推拿SPA
+							{{item.name}}
 						</view>
 						<view class="djq-dis">
 							<image src="../../static/icon/dw.png" mode=""></image>
-							距离0.3KM
+							距离{{(item.range*1 > 1000 )?( item.range + 'KM'):(item.range*1 + 'm')}}
 						</view>
 					</view>
 					<view class="flex f-d-c f-j-sb f-ai-s fg1" style="height: 110rpx;">
 						<view class="djq-dz clamp2">
-							椒江区市府大道200号椒江区市府大道200号椒江区
+							{{item.detailed_address}}
 						</view>
 						<view class="djq-hd flex f-j-sb">
 							<view class="buy-info">
@@ -34,24 +37,24 @@
 							</view>
 							<view class="hd-btn">
 								<image src="../../static/icon/call.png" mode="" style="margin-right: 15rpx;"
-									@click="makeCall()"></image>
-								<image src="../../static/icon/dh.png" mode="" @click="dh()"></image>
+									@click.stop="makeCall(item.phone)"></image>
+								<image src="../../static/icon/dh.png" mode="" @click.stop="dh(item)"></image>
 							</view>
 						</view>
 					</view>
 					<view class="" style="padding: 10rpx 0 0 0;">
-						<view class="left-btm flex f-j-s" v-for="itemt in 3">
+						<view class="left-btm flex f-j-s" v-for="itemt in item.coupon">
 							<view class="j-logo">
 							</view>
 							<view class="j-price">
-								<text>¥</text>25
+								<text>¥</text>{{itemt.price}}
 							</view>
 							<view class="j-zk">
-								5.8
+								{{(((itemt.price*10)/(itemt.ot_price*1)).toFixed(1))}}
 							</view>
 							<view class="j-name">
-								50元代金券
+								{{itemt.store_name}}
 							</view>
 						</view>
 					</view>
@@ -64,15 +67,43 @@
 </template>
 
 <script>
+	import empty from '@/uview-ui/components/u-empty/u-empty.vue';
+	// #ifdef H5
+	import {
+		weixindata,
+		shareLoad
+	} from '@/utils/wxAuthorized';
+	// #endif
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		getStoreList
+	} from '@/api/shop.js'
 	export default {
+		components: {
+			empty
+		},
 		data() {
 			return {
+				page: 1,
+				limit: 10,
+				shopList: [],
+				name: '',
 				height: '',
-				loadingType: 'more'
+				loadingType: 'more',
+				loaded: false
 			}
 		},
-		onLoad() {
-
+		computed: {
+			...mapState(['loginInterceptor', 'baseURL', 'latitude', 'longitude']),
+		},
+		onLoad(opt) {
+			if (opt.id) {
+				this.id = opt.id
+			}
+			this.getStoreList()
 		},
 		onShow() {
 
@@ -94,13 +125,70 @@
 			});
 		},
 		methods: {
-			// 拨打电话
-			makeCall() {
+			navTo(url) {
+				uni.navigateTo({
+					url,
+					fail() {
+						uni.switchTab({
+							url
+						})
+					}
+				})
+			},
+			search() {
+				let obj = this
+				obj.shopList = []
+				obj.loadingType = 'more'
+				obj.page = 1
+				obj.getStoreList()
 
 			},
+			// 拨打电话
+			makeCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone //仅为示例
+				});
+			},
 			// 导航
-			dh() {
-
+			dh(item) {
+				// #ifdef H5
+				weixindata().then(wxOjb => {
+					console.log(wxOjb, '获取微信');
+					wxOjb.openLocation({
+						latitude: item.latitude, // 纬度,浮点数,范围为90 ~ -90
+						longitude: item.longitude, // 经度,浮点数,范围为180 ~ -180。
+						name: item.name, // 位置名
+						address: item.detailed_address, // 地址详情说明
+						scale: 28, // 地图缩放级别,整型值,范围从1~28。默认为最大
+						infoUrl: '' // 在查看位置界面底部显示的超链接,可点击跳转
+					});
+				});
+				// #endif
+			},
+			getStoreList() {
+				let obj = this
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getStoreList({
+					cate_id: obj.id,
+					name: obj.name,
+					latitude: obj.latitude,
+					longitude: obj.longitude,
+					page: obj.page,
+					limit: obj.limit
+				}).then(res => {
+					console.log(res)
+					obj.shopList = obj.shopList.concat(res.data.list)
+					obj.page++
+					if (obj.limit == res.data.list.length) {
+						obj.loadingType = 'more'
+					} else {
+						obj.loadingType = 'noMore'
+					}
+					obj.loaded = true
+				})
 			}
 		}
 	}
@@ -285,6 +373,7 @@
 			padding: 0 0 0 20rpx;
 			font-size: 32rpx;
 			color: #FF4C4C;
+			z-index: 99;
 		}
 
 		.address {

+ 2 - 2
store/index.js

@@ -21,8 +21,8 @@ const store = new Vuex.Store({
 		weichatInfo: {}, //保存微信注册信息
 		weichatObj: '', //微信对象
 		// #endif
-		latitude: '',
-		longitude: '',
+		latitude: '28.67307',
+		longitude: '121.44297',
 	},
 	mutations: {
 		//保存微信信息

BIN
unpackage/dist/build/h5/h5.rar


+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>想亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.58012eb0.js></script><script src=/index/static/js/index.f674758a.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.58012eb0.js></script><script src=/index/static/js/index.84a94b58.js></script></body></html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/index.84a94b58.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/index.f674758a.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-business~pages-game-game~pages-shop-shopList~pages-user-award~pages-user-cash~pages-user-mygx.0075e1f2.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-business~pages-game-game~pages-user-award~pages-user-cash~pages-user-mygx.4cdb14e4.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.ad95604c.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.c53998a9.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-wxLogin.095d04b7.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-wxLogin.d41f74ed.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-giftDetail.3bef2b23.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-giftDetail.eaf7b173.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-shopDetail.b229b237.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-shopDetail.fb57a36d.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-shopList.02d0c49b.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-shop-shopList.65b89946.js


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä