From ea60344f02dbf6cfa22c04b1f199229a75647c67 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 17 May 2024 09:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/advertisement.vue |  13 +-
 pages/index/components/todaylist.vue     |   6 +-
 pages/index/drinks.vue                   |   1 +
 pages/index/freedaily.vue                |   1 -
 pages/index/index.vue                    |  29 +-
 pages/index/tothestore.vue               |  12 +-
 pages/login/login.vue                    |   2 +-
 pages/login/register.vue                 | 578 ++++++++++++-----------
 pages/product/index.vue                  |  10 +-
 9 files changed, 351 insertions(+), 301 deletions(-)

diff --git a/pages/index/components/advertisement.vue b/pages/index/components/advertisement.vue
index da5433e..f9f4fc8 100644
--- a/pages/index/components/advertisement.vue
+++ b/pages/index/components/advertisement.vue
@@ -1,7 +1,10 @@
 <template>
 	<view class="onecontent flex-between">
 		<view class="onecontentleft">
-			现有{{bannervo.coupons==null?116:bannervo.coupons}}人已免单
+			现有<text style="color: #FC851E;font-size: 24rpx;">
+			{{bannervo.coupons==null?116:bannervo.coupons}}人
+			</text> 
+			已免单
 		</view>
 
 		<view class="onecontentright flex-start">
@@ -128,7 +131,7 @@
 
 		.onecontentleft {
 			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
+			font-weight: 700;
 			font-size: 24rpx;
 			color: #333333;
 
@@ -147,7 +150,7 @@
 
 
 			.onecontentrightimage {
-				width: 90rpx;
+				width: 65rpx;
 				position: relative;
 				overflow: hidden;
 				height: 28rpx;
@@ -155,7 +158,7 @@
 
 				.swiperPanel {
 					height: 28rpx;
-					width: 100%;
+					width: 100rpx;
 					overflow: hidden;
 					position: relative;
 
@@ -225,7 +228,7 @@
 						width: 100rpx;
 						font-family: Source Han Sans CN, Source Han Sans CN;
 						font-weight: 400;
-						font-size: 24rpx;
+						font-size: 20rpx;
 						color: #333333;
 						overflow: hidden; //超出的文本隐藏
 						text-overflow: ellipsis; //溢出用省略号显示
diff --git a/pages/index/components/todaylist.vue b/pages/index/components/todaylist.vue
index 58b5f89..9f12c29 100644
--- a/pages/index/components/todaylist.vue
+++ b/pages/index/components/todaylist.vue
@@ -205,7 +205,10 @@
 
 						.therecontent_box_itembox_itemviewthere {
 							margin-top: 4rpx;
-							align-items: flex-end;
+							// align-items: flex-end;
+							// display: flex;
+							// align-items: center;
+							// justify-content: center;
 
 							text:nth-child(1) {
 								font-family: Source Han Sans CN, Source Han Sans CN;
@@ -220,6 +223,7 @@
 								font-size: 16rpx;
 								color: #999999;
 								text-decoration-line: line-through;
+								margin-top: 10rpx;
 							}
 						}
 					}
diff --git a/pages/index/drinks.vue b/pages/index/drinks.vue
index 89fbca0..07dcb3b 100644
--- a/pages/index/drinks.vue
+++ b/pages/index/drinks.vue
@@ -135,6 +135,7 @@
 					size: 10, //页容量
 					status: 'loadmore'
 				},
+				type:''
 			};
 		},
 		onPageScroll(e) {
diff --git a/pages/index/freedaily.vue b/pages/index/freedaily.vue
index e325931..2ac488a 100644
--- a/pages/index/freedaily.vue
+++ b/pages/index/freedaily.vue
@@ -72,7 +72,6 @@
 									</view>
 								</view>
 							</swiper-item>
-
 						</swiper> -->
 					</view>
 				</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 020a0d0..efe8456 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -74,7 +74,7 @@
 										{{item.shopName}}
 									</view>
 									<view>
-										龙首.{{item.distances}}km
+										{{item.districts}}{{item.distances}}
 									</view>
 								</view>
 								<view class="fivecontent_item_nav_lefttopstart flex-start">
@@ -128,7 +128,7 @@
 													:day="item.end_times.d" :hour="item.end_times.h"
 													:minute="item.end_times.m" :second="item.end_times.s"
 													:indexs='index' color="#FFFFFF" border-color="#00B26A"
-													splitorColor="#FFFFFF" :font-size="7"></uni-countdown>
+													splitorColor="#FFFFFF" :font-size="8"></uni-countdown>
 
 											</view>
 
@@ -385,7 +385,7 @@
 						this.seighT = data.windowHeight;
 						this.$u.getRect('.fourcontent').then(res => {
 							console.log(res.top)
-							this.Topdistance = res.top - res.height -20 //滚动距离
+							this.Topdistance = res.top - res.height - 20 //滚动距离
 						})
 					}
 				})
@@ -692,14 +692,14 @@
 		}
 
 		.fourcontent {
-			padding: 32rpx 28rpx 32rpx 28rpx;
+			padding: 32rpx 28rpx;
 			overflow-x: auto;
 			flex-wrap: nowrap;
 
 			.fourcontent_item {
 				flex-wrap: nowrap;
 				margin-left: 22rpx;
-				padding: 4rpx 14rpx;
+				padding: 8rpx 28rpx;
 				background: #FFFFFF;
 				border-radius: 8rpx 8rpx 8rpx 8rpx;
 
@@ -762,6 +762,7 @@
 		.fivecontent {
 			padding: 0 28rpx;
 			height: 100vh;
+
 			.fivecontent_item:nth-child(1) {
 				margin-top: 0;
 			}
@@ -844,8 +845,8 @@
 
 								text {
 									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 400;
-									font-size: 24rpx;
+									font-weight: 700;
+									font-size: 28rpx;
 									color: #999999;
 								}
 
@@ -856,7 +857,7 @@
 									white-space: nowrap; //溢出不换行white-space:nowrap; //溢出不换行
 									font-family: Source Han Sans CN, Source Han Sans CN;
 									font-weight: 500;
-									font-size: 28rpx;
+									font-size: 32rpx;
 									color: #333333;
 								}
 							}
@@ -900,6 +901,8 @@
 								background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat;
 								background-size: 100% 100%;
 
+
+
 								.indexboxitemleftthereabsolute {
 									position: absolute;
 									top: 14rpx;
@@ -913,10 +916,15 @@
 								.indexboxitemlefttheretext {
 									// width: 100%;
 									margin-top: 12rpx;
-									align-items: flex-end;
+
+									display: flex;
+									justify-content: center;
+									align-items: center;
 
 									.fivecontent_item_boxitemlefthere_one {
-										align-items: flex-end;
+										display: flex;
+										justify-content: center;
+										align-items: center;
 
 										.flex_startone {
 											font-family: Source Han Sans CN, Source Han Sans CN;
@@ -946,6 +954,7 @@
 
 									.fivecontent_item_boxitemlefthere_there {
 										margin-left: 6rpx;
+										line-height: 24rpx;
 										font-family: Source Han Sans CN, Source Han Sans CN;
 										font-weight: 400;
 										font-size: 16rpx;
diff --git a/pages/index/tothestore.vue b/pages/index/tothestore.vue
index 364a2be..55e77ab 100644
--- a/pages/index/tothestore.vue
+++ b/pages/index/tothestore.vue
@@ -20,7 +20,7 @@
 								{{item.shopName}}
 							</view>
 						</view>
-						<view class="fivecontent_itemoneboxtow flex-start" @click="goMap">
+						<view class="fivecontent_itemoneboxtow flex-start" @click="goMap(item)">
 							<image class="fivecontent_itemoneboxtowimage"
 								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/dw.png" mode="widthFix"></image>
 							<view class="fivecontent_itemoneboxtow_o">
@@ -81,11 +81,15 @@
 			this.distiricttopCommon()
 		},
 		methods: {
-			goMap() {
+			goMap(d) {
 				uni.openLocation({
-					longitude: uni.cache.get('getLocationstorage').lng,
-					latitude: uni.cache.get('getLocationstorage').lat
+					longitude: (d.lng * 1),
+					latitude: (d.lat * 1)
 				})
+				// uni.openLocation({
+				// 	longitude: uni.cache.get('getLocationstorage').lng,
+				// 	latitude: uni.cache.get('getLocationstorage').lat
+				// })
 			},
 			init_fn(e) {
 				this.list = []
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1dab5cf..4d8134b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -52,7 +52,7 @@
 			<view class="agreement flex-start">
 				<u-checkbox-group><u-checkbox shape="circle" @change="radioChange"
 						size="24"></u-checkbox></u-checkbox-group>
-				<text>阅读并同意银收客</text>
+				<text>阅读并同意{{uni.cache.set('NAME', '零点八零')}}</text>
 				<view class="agreement-Item" @click="Privacy(1)">《用户协议》</view>
 				及
 				<view class="agreement-Item" @click="Privacy(2)">《隐私政策》</view>
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 8476191..78e0750 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="box flex-colum-start">
 			<text>您好，</text>
-			<text>欢迎使用银收客</text>
+			<text>欢迎使用{{uni.cache.set('NAME', '零点八零')}}</text>
 		</view>
 		<view class="top_box" :style="h">
 			<view class="top_box_one">
@@ -15,7 +15,8 @@
 			</view>
 			<view class="top_box_one">
 				<text class="top_box_one_text">密码</text>
-				<input type="mobile" v-model="form.password" placeholder="8-16位密码" maxlength="16" :password="!showPassword" />
+				<input type="mobile" v-model="form.password" placeholder="8-16位密码" maxlength="16"
+					:password="!showPassword" />
 				<view class="repeat" @click="display">
 					<u-icon name="eye" v-if="showPassword"></u-icon>
 					<u-icon v-else name="eye-off"></u-icon>
@@ -25,10 +26,14 @@
 				<text class="top_box_one_text">验证码</text>
 				<input type="mobile" v-model="form.code" placeholder="请输入短信验证码" maxlength="6" />
 				<view class="repeats">
-					<view v-if="showText == true" class="yzm" style="padding: 8rpx 16rpx 6rpx 16rpx; background: #288efb; border-radius: 15rpx" @click="CodeRegister">
+					<view v-if="showText == true" class="yzm"
+						style="padding: 8rpx 16rpx 6rpx 16rpx; background: #288efb; border-radius: 15rpx"
+						@click="CodeRegister">
 						{{ Recapture }}
 					</view>
-					<view v-else style="color: #ccc; background-color: #f9f9f9; padding: 8rpx 16rpx 6rpx 16rpx; border-radius: 15rpx">{{ second }}s重新发送</view>
+					<view v-else
+						style="color: #ccc; background-color: #f9f9f9; padding: 8rpx 16rpx 6rpx 16rpx; border-radius: 15rpx">
+						{{ second }}s重新发送</view>
 				</view>
 			</view>
 			<!-- <view class="top_box_one">
@@ -40,7 +45,8 @@
 			</view> -->
 			<view class="Register" @click="Register">注册</view>
 			<view class="agreement flex-start">
-				<u-checkbox-group><u-checkbox shape="circle" @change="radioChange" size="12"></u-checkbox></u-checkbox-group>
+				<u-checkbox-group><u-checkbox shape="circle" @change="radioChange"
+						size="12"></u-checkbox></u-checkbox-group>
 				<text>阅读并同意银收客</text>
 				<view class="agreement-Item" @click="Privacy(1)">《用户协议》</view>
 				及
@@ -51,295 +57,319 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			radioChangeItem: false, //单选框
-			h: null,
-			showPassword: false,
-			// 注册定时器   初始值
-			second: 60,
-			showText: true,
-			Recapture: '发送验证码',
-			form: {
-				nickName:'',
-				telephone: '',
-				password: '',
-				code: '',
-				inviteCode: ''
-			}
-		};
-	},
-	mounted() {
-		this.computed_h();
-	},
-	onLoad() {},
-	methods: {
-		showTips() {
-			uni.showModal({
-				title: '注意',
-				content: '若该邀请码的用户无推广权限，将自动绑定到其上级名下',
-				showCancel: false
-			});
-		},
-		leftClick() {
-			uni.navigateBack();
-		},
-		async CodeRegister() {
-			//发起验证码
-			if (this.form.telephone == null || this.form.telephone == '') {
-				uni.showToast({
-					title: '请输入电话号码',
-					icon: 'none'
-				});
-				return false;
-			}
-			const res = await this.api.phoneValidateCode({
-				// post  手机验证码
-				phone: this.form.telephone
-			});
-			console.log(res);
-			if (res) {
-				uni.showToast({
-					title: '验证码获取成功',
-					icon: 'none'
-				});
-				// 定时器
-				this.showText = false;
-				this.Recapture = '重新获取';
-				var interval = setInterval(() => {
-					let times = --this.second;
-					this.second = times < 10 ? '0' + times : times; //小于10秒补 0
-				}, 1000);
-				setTimeout(() => {
-					clearInterval(interval);
-					this.second = 60;
-					this.showText = true;
-				}, 60000);
-			}
-		},
-		radioChange(n) {
-			//是否同意
-			console.log(n);
-			this.radioChangeItem = n;
-		},
-		display() {
-			// 切换密码显示隐藏
-			this.showPassword = !this.showPassword;
-		},
-		async Privacy(e) {
-			if (e == 1) {
-				//用户协议
-				let res = await this.api.agreementgetAgreementOne({
-					discern: 0
-				});
-				uni.pro.navigateTo('my/about/agreement', { discern: 0, list: res.data.content });
-			} else {
-				let res3 = await this.api.agreementgetAgreementOne({
-					discern: 3
-				});
-				uni.pro.navigateTo('my/about/agreement', { discern: 3, list: res3.data.content });
-			}
-		},
-		async computed_h() {
-			//获取div宽度
-			let content_Icon = await uni.utils.info_distance('box');
-			let content_top_box = await uni.utils.info_distance('top_box');
-			let system_info = await uni.getSystemInfo();
-			var h_ = null;
-			if (content_Icon.height + content_top_box.height > system_info.windowHeight) {
-				console.log(135);
-				h_ = content_top_box.height + 30 + 'px';
-			} else {
-				h_ = system_info.windowHeight - content_Icon.height + 'px';
-			}
-			this.h = {
-				height: h_
+	export default {
+		data() {
+			return {
+				radioChangeItem: false, //单选框
+				h: null,
+				showPassword: false,
+				// 注册定时器   初始值
+				second: 60,
+				showText: true,
+				Recapture: '发送验证码',
+				form: {
+					nickName: '',
+					telephone: '',
+					password: '',
+					code: '',
+					inviteCode: ''
+				}
 			};
 		},
-		async Register() {
-			//注册
-			if (this.form.nickName == null || this.form.nickName == '') {
-				uni.showToast({
-					title: '请输入用户昵称',
-					icon: 'none'
+		mounted() {
+			this.computed_h();
+		},
+		onLoad() {},
+		methods: {
+			showTips() {
+				uni.showModal({
+					title: '注意',
+					content: '若该邀请码的用户无推广权限，将自动绑定到其上级名下',
+					showCancel: false
 				});
-				return false;
-			}
-			if (this.form.telephone == null || this.form.telephone == '') {
-				uni.showToast({
-					title: '请输入电话号码',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (this.form.password == null || this.form.password == '' || uni.$u.trim(this.form.password, 'all') == '') {
-				uni.showToast({
-					title: '请输入密码或密码不能输入空格',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (this.form.code == null || this.form.code == '') {
-				uni.showToast({
-					title: '请输入验证码',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (this.radioChangeItem == false) {
-				uni.showToast({
-					icon: 'none',
-					title: '请先阅读《用户协议》和《隐私政策》'
-				});
-				return;
-			}
-			let res = await this.api.cashierServiceloginregister({
-				telephone: this.form.telephone,
-				nickName: this.form.nickName,
-				password: this.form.password,
-				code: this.form.code,
-				// inviteCode: this.form.inviteCode,
-				source: 'promoter'
-			});
-			if (res) {
-				setTimeout((res) => {
+			},
+			leftClick() {
+				uni.navigateBack();
+			},
+			async CodeRegister() {
+				//发起验证码
+				if (this.form.telephone == null || this.form.telephone == '') {
 					uni.showToast({
-						title: '注册成功',
-						icon: 'none',
-						success: () => {
-							uni.navigateTo({
-								url: '../login/login'
-							});
-						}
+						title: '请输入电话号码',
+						icon: 'none'
 					});
-				}, 1500);
-				// uni.cache.set('storage:authorization', res.data.auth_token);
-				// this.$store.commit('set_login', true);
-				// uni.pro.switchTab('index/index');
+					return false;
+				}
+				const res = await this.api.phoneValidateCode({
+					// post  手机验证码
+					phone: this.form.telephone
+				});
+				console.log(res);
+				if (res) {
+					uni.showToast({
+						title: '验证码获取成功',
+						icon: 'none'
+					});
+					// 定时器
+					this.showText = false;
+					this.Recapture = '重新获取';
+					var interval = setInterval(() => {
+						let times = --this.second;
+						this.second = times < 10 ? '0' + times : times; //小于10秒补 0
+					}, 1000);
+					setTimeout(() => {
+						clearInterval(interval);
+						this.second = 60;
+						this.showText = true;
+					}, 60000);
+				}
+			},
+			radioChange(n) {
+				//是否同意
+				console.log(n);
+				this.radioChangeItem = n;
+			},
+			display() {
+				// 切换密码显示隐藏
+				this.showPassword = !this.showPassword;
+			},
+			async Privacy(e) {
+				if (e == 1) {
+					//用户协议
+					let res = await this.api.agreementgetAgreementOne({
+						discern: 0
+					});
+					uni.pro.navigateTo('my/about/agreement', {
+						discern: 0,
+						list: res.data.content
+					});
+				} else {
+					let res3 = await this.api.agreementgetAgreementOne({
+						discern: 3
+					});
+					uni.pro.navigateTo('my/about/agreement', {
+						discern: 3,
+						list: res3.data.content
+					});
+				}
+			},
+			async computed_h() {
+				//获取div宽度
+				let content_Icon = await uni.utils.info_distance('box');
+				let content_top_box = await uni.utils.info_distance('top_box');
+				let system_info = await uni.getSystemInfo();
+				var h_ = null;
+				if (content_Icon.height + content_top_box.height > system_info.windowHeight) {
+					console.log(135);
+					h_ = content_top_box.height + 30 + 'px';
+				} else {
+					h_ = system_info.windowHeight - content_Icon.height + 'px';
+				}
+				this.h = {
+					height: h_
+				};
+			},
+			async Register() {
+				//注册
+				if (this.form.nickName == null || this.form.nickName == '') {
+					uni.showToast({
+						title: '请输入用户昵称',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (this.form.telephone == null || this.form.telephone == '') {
+					uni.showToast({
+						title: '请输入电话号码',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (this.form.password == null || this.form.password == '' || uni.$u.trim(this.form.password, 'all') ==
+					'') {
+					uni.showToast({
+						title: '请输入密码或密码不能输入空格',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (this.form.code == null || this.form.code == '') {
+					uni.showToast({
+						title: '请输入验证码',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (this.radioChangeItem == false) {
+					uni.showToast({
+						icon: 'none',
+						title: '请先阅读《用户协议》和《隐私政策》'
+					});
+					return;
+				}
+				let res = await this.api.cashierServiceloginregister({
+					telephone: this.form.telephone,
+					nickName: this.form.nickName,
+					password: this.form.password,
+					code: this.form.code,
+					// inviteCode: this.form.inviteCode,
+					source: 'promoter'
+				});
+				if (res) {
+					setTimeout((res) => {
+						uni.showToast({
+							title: '注册成功',
+							icon: 'none',
+							success: () => {
+								uni.navigateTo({
+									url: '../login/login'
+								});
+							}
+						});
+					}, 1500);
+					// uni.cache.set('storage:authorization', res.data.auth_token);
+					// this.$store.commit('set_login', true);
+					// uni.pro.switchTab('index/index');
+				}
+				// if (result.status === 1) {
+				// 	this.login(result.data);
+				// 	uni.navigateBack();
+				// } else {
+				// 	this.$api.msg(result.msg);
+				// 	this.logining = false;
+				// }
 			}
-			// if (result.status === 1) {
-			// 	this.login(result.data);
-			// 	uni.navigateBack();
-			// } else {
-			// 	this.$api.msg(result.msg);
-			// 	this.logining = false;
-			// }
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	width: 100%;
-	background: linear-gradient(104deg, #4679ff 0%, #2868e8 47%, #2a94fc 100%);
-}
-.container {
-	position: relative;
-	.top {
-		position: absolute;
-		left: 64rpx;
-		.u-navbar--fixed {
-			top: 88rpx;
-		}
-	}
-	.box {
-		padding-top: 228rpx;
-		padding-left: 64rpx;
-		padding-bottom: 144rpx;
-		text {
-			font-size: 40rpx;
-			font-family: Source Han Sans CN-Medium, Source Han Sans CN;
-			font-weight: 500;
-			color: #ffffff;
-		}
-	}
-	.top_box::after {
-		position: absolute;
-		// content: url(@/static/icon.png);
-		width: 282rpx;
-		height: 280rpx;
-		top: -240rpx;
-		right: 32rpx;
-		z-index: 2;
-	}
-	.top_box {
-		position: relative;
+	page {
 		width: 100%;
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		background: #ffffff;
-		border-radius: 40rpx 40rpx 0px 0px;
-		.top_box_one {
-			position: relative;
-			width: 85%;
-			margin-top: 64rpx;
-			border-bottom: 6rpx solid #e5e5e5;
-			.top_box_one_text {
-				display: flex;
-				align-items: center;
-				font-size: 36rpx;
+		background: linear-gradient(104deg, #4679ff 0%, #2868e8 47%, #2a94fc 100%);
+	}
+
+	.container {
+		position: relative;
+
+		.top {
+			position: absolute;
+			left: 64rpx;
+
+			.u-navbar--fixed {
+				top: 88rpx;
+			}
+		}
+
+		.box {
+			padding-top: 228rpx;
+			padding-left: 64rpx;
+			padding-bottom: 144rpx;
+
+			text {
+				font-size: 40rpx;
 				font-family: Source Han Sans CN-Medium, Source Han Sans CN;
 				font-weight: 500;
-				color: #333333;
+				color: #ffffff;
 			}
-			input {
-				padding: 18rpx 0 20rpx 0;
+		}
+
+		.top_box::after {
+			position: absolute;
+			// content: url(@/static/icon.png);
+			width: 282rpx;
+			height: 280rpx;
+			top: -240rpx;
+			right: 32rpx;
+			z-index: 2;
+		}
+
+		.top_box {
+			position: relative;
+			width: 100%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			background: #ffffff;
+			border-radius: 40rpx 40rpx 0px 0px;
+
+			.top_box_one {
+				position: relative;
+				width: 85%;
+				margin-top: 64rpx;
+				border-bottom: 6rpx solid #e5e5e5;
+
+				.top_box_one_text {
+					display: flex;
+					align-items: center;
+					font-size: 36rpx;
+					font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				input {
+					padding: 18rpx 0 20rpx 0;
+				}
+
+				.repeat {
+					position: absolute;
+					bottom: 26rpx;
+					right: 0;
+					width: 25rpx;
+					height: 17rpx;
+				}
+
+				.repeats {
+					position: absolute;
+					bottom: 26rpx;
+					right: 0;
+					font-size: 24rpx;
+					z-index: 9;
+					font-family: $uni_family;
+					font-weight: 400;
+					color: #ffffff;
+					border-radius: 12rpx;
+				}
 			}
-			.repeat {
-				position: absolute;
-				bottom: 26rpx;
-				right: 0;
-				width: 25rpx;
-				height: 17rpx;
+
+			.top_box_tow {
+				width: 85%;
+
+				text {
+					margin-top: 34rpx;
+					font-size: 24rpx;
+					font-family: $uni_family;
+					font-weight: 400;
+					color: #666666;
+				}
 			}
-			.repeats {
-				position: absolute;
-				bottom: 26rpx;
-				right: 0;
-				font-size: 24rpx;
-				z-index: 9;
+
+			.Register {
+				width: 75%;
+				margin-top: 112rpx;
+				padding: 10rpx 0;
+				text-align: center;
+				background: #288efb;
+				border-radius: 40rpx 40rpx 40rpx 40rpx;
+				font-size: 36rpx;
 				font-family: $uni_family;
 				font-weight: 400;
 				color: #ffffff;
-				border-radius: 12rpx;
 			}
-		}
-		.top_box_tow {
-			width: 85%;
-			text {
-				margin-top: 34rpx;
-				font-size: 24rpx;
-				font-family: $uni_family;
-				font-weight: 400;
-				color: #666666;
-			}
-		}
-		.Register {
-			width: 75%;
-			margin-top: 112rpx;
-			padding: 10rpx 0;
-			text-align: center;
-			background: #288efb;
-			border-radius: 40rpx 40rpx 40rpx 40rpx;
-			font-size: 36rpx;
-			font-family: $uni_family;
-			font-weight: 400;
-			color: #ffffff;
-		}
-		.agreement {
-			margin-top: 14rpx;
-			font-size: 20rpx;
-			font-family: Source Han Sans CN-Medium, Source Han Sans CN;
-			font-weight: 500;
-			color: #7c8e97;
-			.agreement-Item {
-				color: #4ca1fc;
+
+			.agreement {
+				margin-top: 14rpx;
+				font-size: 20rpx;
+				font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+				font-weight: 500;
+				color: #7c8e97;
+
+				.agreement-Item {
+					color: #4ca1fc;
+				}
 			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
index d927169..655026a 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -64,11 +64,11 @@
 				<view class="theretherecontent">
 					营业时间：{{listdata.businessTime}}
 				</view>
-				<view class="fourtherecontent flex-start" @click="goMap">
+				<view class="fourtherecontent flex-start" @click="goMap(listdata)">
 					<image class="fourtherecontentimage"
 						src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/d.png" mode="aspectFill"></image>
 					<view class="fourtherecontent_o">
-						{{listdata.distances}}km
+						{{listdata.distances}}
 					</view>
 					<view class="fourtherecontent_t">
 						{{listdata.address}}
@@ -403,10 +403,10 @@
 					name
 				})
 			},
-			goMap(){
+			goMap(d) {
 				uni.openLocation({
-					longitude: uni.cache.get('getLocationstorage').lng,
-					latitude: uni.cache.get('getLocationstorage').lat
+					longitude: (d.lng * 1),
+					latitude: (d.lat * 1)
 				})
 			},
 			// 跳转