phone-login

pages.json

@@ -60,13 +60,6 @@
 
 			}
 		},
-		{
-			"path": "pages/shop/giftDetail",
-			"style": {
-				"navigationBarTitleText": "礼包详情"
-
-			}
-		},
 		{
 			"path": "pages/shop/createYhq",
 			"style": {

pages/public/wxLogin.vue

@@ -3,20 +3,101 @@
 		<!-- #ifndef H5 -->
 		<view class="logo-img-box">
 			<image class="logo-img" src="../../static/img/logo.png" mode=" aspectFit"></image>
-			<button class="userInfo" type="warn" @click="userInfoData()" :class="{'nocaction': isclick}">
+			<!-- <button class="userInfo" type="warn" @click="userInfoData()" :class="{'nocaction': isclick}">
 				<text class="iconfont iconweixin"></text>
 				<text>
 					微信授权登录
 				</text>
+			</button> -->
+			<view class="two" @click="checkboxChange">
+				<radio style="transform:scale(0.7)" color="#f65067" :checked="istype" />
+				我已阅读并同意
+				<text @click.stop="mzss">《隐私政策》</text>
+			</view>
+			<button class="userInfo" :class="{'nocaction': isclick}" open-type="getPhoneNumber"
+				@getphonenumber="decryptPhoneNumber" v-if="istype">
+				<text class="iconfont iconweixin"></text>
+				<text>
+					微信用户一键登录
+				</text>
+			</button>
+			<button class="userInfo" :class="{'nocaction': true}" v-if="!istype">
+				<text class="iconfont iconweixin"></text>
+				<text>
+					微信用户一键登录
+				</text>
 			</button>
 		</view>
 		<!-- #endif -->
+		<uni-popup ref="popup" type="center">
+			<scroll-view scroll-y="true" class="mzsm-wrap">
+				<view class="" style="font-size: 28rpx;text-align: center;padding: 20rpx 0;">
+					隐私政策
+				</view>
+				<view style="white-space: pre-line;">
+					本指引是想亮商城小程序开发者“台州六牛传媒策划有限公司”（以下简称“开发者”）为处理你的个人信息而制定。
+					开发者处理的信息
+					· 为了便于小程序内展示用户信息，且方便线下处理客诉问题作为一个参考值，开发者将在获取你的明示同意后，收集你的微信昵称、头像。
+					
+					· 为了便于给用户推荐匹配度更高的商品，开发者将在获取你的明示同意后，收集你的位置信息。
+					
+					· 为了用户下单需求，方便处理物流、售后等问题，开发者将在获取你的明示同意后，收集你的手机号。
+					
+					· 为了部分场景下用户对于素材信息主动保存，开发者将在获取你的明示同意后，使用你的相册（仅写入）权限。
+					
+					· 开发者收集你选中的照片或视频信息，用于用户发表评论时可做出更具象的描述。
+					
+					· 开发者收集你的地址，用于用户下单需求，方便处理物流、售后等问题。
+					
+					· 开发者收集你的身份证号码，用于用户下单需求，根据商家的到店使用需求。
+					
+					第三方插件信息/SDK信息
+					为实现特定功能，开发者可能会接入由第三方提供的插件/SDK。第三方插件/SDK的个人信息处理规则，请以其公示的官方说明为准。探店台州严选小程序接入的第三方插件信息/SDK信息如下：<br />
+					
+					插件名称：小程序直播组件
+					
+					插件提供方名称: 深圳市腾讯计算机系统有限公司
+					
+					插件名称：微信支付券
+					
+					插件提供方名称: 财付通支付科技有限公司
+					
+					第三方服务商信息
+					想亮商城小程序由浙江六牛科技有限公司代为开发，开发者保证，浙江六牛科技有限公司将在本指引规定范围内处理你的个人信息。
+					
+					你的权益
+					关于你的个人信息，你可以通过以下方式与开发者联系，行使查阅、复制、更正、删除等法定权利。
+					
+					- 邮箱: 1334991396@qq.com
+					
+					开发者对信息的存储
+					开发者承诺，除法律法规另有规定外，开发者对你的信息的保存期限应当为实现处理目的所必要的最短时间。
+					
+					信息的使用规则
+					开发者将会在本指引所明示的用途内使用收集的信息
+					
+					如开发者使用你的信息超出本指引目的或合理范围，开发者必须在变更使用目的或范围前，再次以公告方式告知并征得你的明示同意。
+					
+					信息对外提供
+					开发者承诺，不会主动共享或转让你的信息至任何第三方，如存在确需共享或转让时，开发者应当直接征得或确认第三方征得你的单独同意。
+					
+					开发者承诺，不会对外公开披露你的信息，如必须公开披露时，开发者应当向你告知公开披露的目的、披露信息的类型及可能涉及的信息，并征得你的单独同意。
+					
+					若你认为开发者未遵守上述约定，或有其他的投诉建议、或未成年人个人信息保护相关问题，可通过以下方式与开发者联系；或者向微信进行投诉。
+					- 邮箱: 1334991396@qq.com
+					
+					更新日期：2022年6月24日 
+					生效日期：2022年6月24日
+				</view>
+			</scroll-view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
 	import {
-		getUserInfo
+		getUserInfo,
+		bangding
 	} from '@/api/login.js';
 	// #ifdef H5
 	import {
@@ -41,16 +122,80 @@
 				userInfo: {}, //授权用户信息
 				code: '', //授权code
 				isclick: false, //是否点击了
+				isShow:false,
+				istype: false
 			};
 		},
 		onLoad(option) {
-			this.loadData();
+			// this.loadData();
 		},
 		computed: {
 			// ...mapState(['baseURL','urlFile']) 
 		},
 		methods: {
 			// ...mapMutations(['login', 'setUserInfo']),
+			checkboxChange() {
+				this.istype = !this.istype;
+				console.log(this.istype);
+			},
+			mzss() {
+				this.$refs.popup.open();
+			},
+			mzssClose() {
+				this.$refs.popup.close();
+			},
+			decryptPhoneNumber(e) {
+				console.log(e)
+				let obj = this
+				if(obj.isclick) {
+					return
+				}
+				let spread_spid = uni.getStorageSync('spread') || '';
+				// #ifdef MP
+				let spread_code = uni.getStorageSync('spread_code') || '';
+				// #endif
+				obj.isclick = true
+				if (e.detail.errMsg == 'getPhoneNumber:fail user deny') { //用户点击拒绝
+					// uni.showToast({
+					// 	title: '请绑定手机号',
+					// 	duration: 5000,
+					// 	icon: 'none',
+					// });
+					obj.isclick = false
+				} else {
+
+					wx.login({
+						success(res) {
+							console.log(e, 'loginWinxinMp');
+							obj.code = res.code;
+							console.log(res.code,'res.code')
+							console.log( e.detail,' e.detail+++++')
+							wechatMpAuth({
+								code: obj.code,
+								iv: e.detail.iv,
+								encryptedData: e.detail.encryptedData,
+								spread_spid: spread_spid,
+								// #ifdef MP
+								spread_code: spread_code,
+								// #endif
+							}).then(({
+								data
+							}) => {
+								obj.isclick = false
+								obj.wchatAuth(data);
+								console.log(data, 'wechatMpAuth++++++++++++++++++++++++++')
+
+							}).catch(err => {
+								// obj.loding = false;
+								// uni.hideLoading();
+							});
+						},
+						fill: function(e) {
+							console.log(e)
+						}
+					})
+				}
+			},
 			...mapMutations('user', ['login', 'setUserInfo']),
 			loadData() {
 				let obj = this;
@@ -74,10 +219,6 @@
 			// 用户确认授权
 			userInfoData() {
 				let that = this
-				if (that.isclick) {
-					return
-				}
-				that.isclick = true
 				wx.getUserProfile({
 					desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
 					success: res => {
@@ -167,7 +308,54 @@
 						}
 					});
 				});
-			}
+			},
+			// 绑定手机号
+			PhoneNumber(e) {
+				let obj = this;
+				obj.MaskShow = false;
+				(obj.iv = e.detail.iv), (obj.encryptedData = e.detail.encryptedData);
+
+				uni.setStorageSync('code', obj.code);
+				bangding({
+					flag: 1,
+					cache_key: obj.cache_key,
+					code: obj.code,
+					iv: obj.iv,
+					encryptedData: obj.encryptedData
+				}).then(function(e) {
+					if (e.data.is_bind == 1) {
+						console.log('bangding1');
+						bangding({
+								flag: 1,
+								cache_key: obj.cache_key,
+								code: obj.code,
+								iv: obj.iv,
+								encryptedData: obj.encryptedData,
+								step: 1
+							})
+							.then(function(e) {
+								// 获取用户基础信息
+								obj.GetUser();
+								obj.$api.msg(e.msg);
+								obj.$nextTick(function() {
+									obj.ToIndex();
+								});
+							})
+							.catch(e => {
+								console.log(e);
+							});
+					} else {
+						console.log('bangding2');
+						obj.$api.msg(e.msg);
+						// 获取用户基础信息
+						obj.GetUser();
+						obj.$api.msg(e.msg);
+						obj.$nextTick(function() {
+							obj.ToIndex();
+						});
+					}
+				});
+			},
 		}
 	};
 </script>
@@ -200,10 +388,32 @@
 		margin-top: 50rpx;
 		color: #FFFFFF;
 		border-radius: 99rpx;
-		background-color: $base-color !important;
+		background-color: $base-color;
 	}
 
 	.nocaction {
-		background-color: #999;
+		background: #999 !important;
+	}
+	.two {
+		margin: 20rpx 0;
+		width: 750rpx;
+		font-size: 28rpx;
+		text-align: center;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #999999;
+	
+		text {
+			color: #f65067;
+		}
+	}
+	.mzsm-wrap {
+		width: 500rpx;
+		height: 600rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		text-align: justify;
+		font-size: 26rpx;
 	}
 </style>

pages/shop/createYhq.vue

@@ -13,7 +13,7 @@
 			</view>
 			<view class="tab-item flex">
 				<view class="item-name">价格</view>
-				<input type="number" placeholder="请输入优惠券价格" class="item-val" v-model="price">
+				<input type="text" placeholder="请输入优惠券价格" class="item-val" v-model="price">
 			</view>
 			<view class="tab-item flex">
 				<view class="item-name">原价</view>
@@ -122,7 +122,7 @@
 				}
 				obj.uping = true
 				storeCoupon({
-					name: obj.name,
+					title: obj.name,
 					price: obj.price,
 					ot_price: obj.ot_price,
 					coupon_price: obj.coupon_price,
@@ -131,7 +131,10 @@
 					stock: obj.stock,
 					store_info: obj.store_info,
 				}).then(res => {
-					obj.$api.showOk('添加成功')
+					uni.showToast({
+						title: '添加成功',
+						duration: 2000
+					});
 					obj.uping = false
 				}).catch(res => {
 					obj.uping = false

pages/shop/giftDetail.vue

@@ -1,520 +0,0 @@
-<template>
-	<view class="content">
-		<view class="gift-wrap flex f-j-s">
-			<view class="gift-img">
-				<image src="../../static/error/errorImage.jpg" mode=""></image>
-			</view>
-			<view class="gift-info flex f-d-c f-j-sb f-ai-s pl20 pt20">
-				<view class="gift-name">
-					会员礼包<image src="../../static/icon/g-l.png" mode=""></image><text class="info-tit">内含五张门店优惠券</text>
-				</view>
-				<view class="gift-price">
-					<text class="new-price pr10">￥300</text><text class="old-price">￥1000</text>
-				</view>
-			</view>
-		</view>
-		<view class="gift-jg flex f-j-c">
-			<view class="jg"></view>
-			<view class="">礼包包含</view>
-			<view class="jg"></view>
-		</view>
-		<scroll-view scroll-y="true" :style="{'height': height}" class="scroll-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>
-				<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
-						</view>
-						<view class="djq-dis">
-							<image src="../../static/icon/dw.png" mode=""></image>
-							距离0.3KM
-						</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号椒江区
-						</view>
-						<view class="djq-hd flex f-j-sb">
-							<view class="buy-info">
-								1425人已购买
-							</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>
-							</view>
-						</view>
-					</view>
-					<view class="left-btm flex f-j-s">
-						<view class="j-logo">
-							券
-						</view>
-						<view class="j-price">
-							<text>￥</text>25
-						</view>
-						<view class="j-zk">
-							5.8折
-						</view>
-						<view class="j-name">
-							50元代金券
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="tb" style="height: 100rpx;"></view>
-		</scroll-view>
-		<view class="btm-btn" @click="buying?'':goBuy()">
-			立即购买
-		</view>
-		<uni-popup ref="popup" type="bottom">
-			<view class="zf-wrap">
-				<view class="zf-top flex f-j-sb">
-					<view class="top-left">
-						选择支付方式
-					</view>
-					<image src="../../static/icon/colse.png" mode="" @click="close"></image>
-				</view>
-				<view class="zf-type flex" @click="changePayType(1)">
-					<view class="type-left">
-						<text class="icon iconfont iconweixin"></text>
-						<text style="margin-left: 20rpx;">微信支付</text>
-					</view>
-					<label class="radio">
-						<radio value="" color="#FF4C4C" :checked="payType == 1"></radio>
-					</label>
-				</view>
-				<view class="zf-type flex" @click="changePayType(3)">
-					<view class="type-left">
-						<text class="icon iconfont iconyue"></text>
-						<text style="margin-left: 20rpx;">余额支付</text>
-					</view>
-					<label class="radio">
-						<radio value="" color="#FF4C4C" :checked="payType == 3"></radio>
-					</label>
-				</view>
-				<view class="" style="width: 750rpx;height: 20rpx;background: #F6F6F6;"></view>
-				<view class="zf-btn flex">
-					<view class="btn-left">
-						合计：<text class="zf-price">100</text>
-					</view>
-					<view class="btn-right" @click="buying?'':buy()">
-						立即支付
-					</view>
-				</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>
-
-<script>
-	export default {
-		data() {
-			return {
-				height: '',
-				payType: 1,
-				buying: false,
-			}
-		},
-		onLoad() {
-
-		},
-		onShow() {
-
-		},
-		onReachBottom() {
-
-		},
-		onReady() {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.scroll-wrap').boundingClientRect();
-					query.exec(function(res) {
-						obj.height = resu.windowHeight - res[0].top + 'px';
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			// 打开支付弹窗
-			goBuy() {
-				this.$refs.popup.open()
-			},
-			// 关闭支付弹窗
-			close() {
-				this.$refs.popup.close()
-			},
-			//选择支付方式
-			changePayType(type) {
-				this.payType = type;
-				if (this.payType == 1) {
-					this.payName = 'weixin';
-				}
-				if (this.payType == 2) {
-					this.payName = 'ali';
-				}
-				if (this.payType == 3) {
-					this.payName = 'yue';
-				}
-				if (this.payType == 4) {
-					this.payName = 'pink_integral';
-				}
-				if (this.payType == 5) {
-					this.payName = 'cash';
-				}
-			},
-			//支付
-			buy() {
-				let obj = this
-				if (obj.payType == 0) {
-					return obj.$api.msg('请选择支付方式')
-				}
-				if (obj.buying) {
-					return
-				}
-				obj.buying = true
-				obj.close()
-			},
-			// 拨打电话
-			makeCall() {
-
-			},
-			// 导航
-			dh() {
-
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.gift-wrap {
-		width: 750rpx;
-		height: 198rpx;
-		background: #FFFFFF;
-		padding: 24rpx 30rpx;
-
-		.gift-img {
-			image {
-				width: 150rpx;
-				height: 150rpx;
-				border-radius: 20rpx;
-			}
-		}
-
-		.gift-info {
-			flex-grow: 1;
-			height: 100%;
-
-			.gift-name {
-				font-size: 36rpx;
-				font-weight: bold;
-				color: #333333;
-				line-height: 44rpx;
-
-				image {
-					width: 26rpx;
-					height: 26rpx;
-					margin-left: 13rpx;
-					margin-right: 9rpx;
-				}
-
-				.info-tit {
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #FFA30B;
-
-				}
-			}
-
-			.gift-price {
-				text-align: left;
-
-				text {
-					display: inline-block;
-				}
-
-				.new-price {
-					font-size: 38rpx;
-					font-weight: bold;
-					color: #FF4C4C;
-				}
-
-				.old-price {
-					font-size: 24rpx;
-					font-weight: 500;
-					text-decoration: line-through;
-					color: #999999;
-
-					text {
-						font-size: 17rpx;
-					}
-				}
-			}
-		}
-
-	}
-
-	.gift-jg {
-		margin: 20rpx 0;
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #363636;
-
-		.jg {
-			width: 120rpx;
-			height: 1rpx;
-			background: #989898;
-			margin: 0 50rpx;
-		}
-	}
-
-	.djq-wrap {
-		width: 701rpx;
-		height: 255rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 27rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: 0 auto 20rpx;
-		padding: 23rpx 22rpx;
-
-		&:last-of-type {
-			margin-bottom: 0;
-		}
-
-		.djq-img {
-			flex-shrink: 0;
-			width: 150rpx;
-			height: 150rpx;
-			border-radius: 10rpx;
-		}
-
-		.djq-right {
-			flex-grow: 1;
-
-			.djq-tit {
-				font-size: 34rpx;
-				font-weight: bold;
-				color: #333333;
-				line-height: 52rpx;
-
-				.djq-name {
-					max-width: 300rpx;
-				}
-
-				.djq-dis {
-					flex-shrink: 0;
-
-					image {
-						width: 20rpx;
-						height: 28rpx;
-						margin-right: 10rpx;
-					}
-
-					font-size: 22rpx;
-					font-weight: 500;
-					color: #666666;
-				}
-			}
-
-			.djq-dz {
-				width: 100%;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #666666;
-			}
-
-			.djq-hd {
-				width: 100%;
-				border-bottom: 1rpx solid #EAECED;
-
-				.buy-info {
-					display: inline-block;
-					height: 32rpx;
-					border-radius: 16rpx 16rpx 16rpx 0px;
-					line-height: 32rpx;
-					font-size: 20rpx;
-					font-weight: 500;
-					color: #FF440D;
-					padding: 0 15rpx;
-					background-color: #fcf3f0;
-				}
-
-				.hd-btn {
-					image {
-						width: 46rpx;
-						height: 46rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.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;
-		}
-	}
-
-	.btm-btn {
-		width: 750rpx;
-		height: 100rpx;
-		text-align: center;
-		line-height: 100rpx;
-		font-size: 36rpx;
-		font-weight: 500;
-		color: #FFFFFF;
-		background-color: #ff4c4c;
-		position: fixed;
-		bottom: 0;
-	}
-
-	.zf-wrap {
-		width: 750rpx;
-		height: 404rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 0px 0px;
-
-		.zf-top {
-			height: 86rpx;
-			border-bottom: #EEEEEE solid 1rpx;
-			padding: 0 25rpx;
-			font-size: 28rpx;
-			font-weight: bold;
-			color: #333333;
-
-			image {
-				width: 15rpx;
-				height: 15rpx;
-			}
-		}
-
-		.zf-type {
-			margin-left: 23rpx;
-			width: 727rpx;
-			height: 100rpx;
-			border-bottom: #EEEEEE solid 1rpx;
-			padding: 0 25rpx;
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #3F454B;
-
-			&:last-of-type {
-				border-bottom: none;
-			}
-		}
-
-		.zf-btn {
-			.btn-right {
-				width: 360rpx;
-				line-height: 100rpx;
-				background: #FF4C4C;
-				text-align: center;
-				font-size: 32rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-			}
-
-			.btn-left {
-				width: 390rpx;
-				line-height: 100rpx;
-				padding-left: 24rpx;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3F454B;
-
-				.zf-price {
-					font-size: 36rpx;
-					font-weight: bold;
-					color: #FF4C4C;
-
-					&::before {
-						content: '￥';
-						font-size: 24rpx;
-						color: #FF4C4C;
-					}
-				}
-			}
-		}
-	}
-
-	.iconweixin {
-		color: #36cb59;
-	}
-
-	.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>

pages/user/user.vue

@@ -16,7 +16,8 @@
 					<image src="../../static/error/missing-face.png" mode="" v-else></image>
 					<view class="user-font">
 						<view class="name clamp" v-if="userInfo.nickname">{{ userInfo.nickname }}</view>
-						<view class="name clamp" v-else>游客</view>
+						<view class="name clamp" v-if="hasLogin && (userInfo.nickname=='')">微信用户</view>
+						<view class="name clamp" v-if="!hasLogin">游客</view>
 						<view class="phone" v-if="userInfo.spread_nickname">推荐人：{{ userInfo.spread_nickname }}</view>
 						<view class="phone" v-if="userInfo.uid">邀请码：{{ userInfo.uid }}</view>
 					</view>
@@ -46,15 +47,51 @@
 			</view>
 			<!-- <view class="shenqing" @click="shareLL"><image src="../../static/user/shenqing.png" mode="heightFix"></image></view> -->
 		</view>
-
+<view class="" style="height: 20rpx;">
+	
+</view>
 		<uni-list class="tool-list">
-			<uni-list-item v-if="userInfo.clerk_type == 1" title="券码核销" @click="shao()" thumb="/static/user/user1.png">
-			</uni-list-item>
-			<uni-list-item v-if="userInfo.clerk_type == 1" title="核销历史" @click="navTo('/pages/user/hxjl')"
-				thumb="/static/user/user2.png"></uni-list-item>
-			<uni-list-item v-if="userInfo.clerk_type == 1" title="添加优惠券" @click="navTo('/pages/shop/createYhq')"
-				thumb="/static/icon/addyhq.png"></uni-list-item>
-			<uni-list-item title="我的优惠券" @click="navTo('/pages/user/myyhq')" thumb="/static/icon/g-l.png">
+			<template v-if="userInfo.clerk_type == 1">
+				<uni-list-item  title="券码核销" @click="shao()" thumb="/static/user/user1.png">
+				</uni-list-item>
+				<uni-list-item title="核销历史" @click="navTo('/pages/user/hxjl')"
+					thumb="/static/user/user2.png"></uni-list-item>
+				<uni-list-item title="添加优惠券" @click="navTo('/pages/shop/createYhq')"
+					thumb="/static/icon/addyhq.png"></uni-list-item>
+				<uni-list-item title="我的优惠券" @click="navTo('/pages/user/myyhq')" thumb="/static/icon/g-l.png">
+				</uni-list-item>
+				<uni-list-item title="兑换码兑换" @click="openDh" thumb="/static/user/mybank.png" v-if="userInfo.uid">
+				</uni-list-item>
+				<uni-list-item title="邀请有礼" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/user3.png"
+					v-if="userInfo.level">
+				</uni-list-item>
+				<uni-list-item title="加入创业合伙人" @click="navTo('/pages/product/product?id=1')"
+					thumb="/static/icon/good-gift.png" v-if="userInfo.level != 2">
+				</uni-list-item>
+				<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/user4.png">
+				</uni-list-item>
+				<uni-list-item title="客服中心" @click="openKf()" thumb="/static/user/user5.png"></uni-list-item>
+				<uni-list-item title="设置" @click="navTo('/pages/set/userinfo')" thumb="/static/user/user6.png">
+				</uni-list-item>
+			</template>
+			<template v-else>
+				<uni-list-item title="我的优惠券" @click="navTo('/pages/user/myyhq')" thumb="/static/icon/g-l.png">
+				</uni-list-item>
+				<uni-list-item title="兑换码兑换" @click="openDh" thumb="/static/user/mybank.png" v-if="userInfo.uid">
+				</uni-list-item>
+				<uni-list-item title="邀请有礼" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/user3.png"
+					v-if="userInfo.level">
+				</uni-list-item>
+				<uni-list-item title="加入创业合伙人" @click="navTo('/pages/product/product?id=1')"
+					thumb="/static/icon/good-gift.png" v-if="userInfo.level != 2">
+				</uni-list-item>
+				<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/user4.png">
+				</uni-list-item>
+				<uni-list-item title="客服中心" @click="openKf()" thumb="/static/user/user5.png"></uni-list-item>
+				<uni-list-item title="设置" @click="navTo('/pages/set/userinfo')" thumb="/static/user/user6.png">
+				</uni-list-item>
+			</template>
+			<!-- <uni-list-item title="我的优惠券" @click="navTo('/pages/user/myyhq')" thumb="/static/icon/g-l.png">
 			</uni-list-item>
 			<uni-list-item title="兑换码兑换" @click="openDh" thumb="/static/user/mybank.png" v-if="userInfo.uid">
 			</uni-list-item>
@@ -68,7 +105,7 @@
 			</uni-list-item>
 			<uni-list-item title="客服中心" @click="openKf()" thumb="/static/user/user5.png"></uni-list-item>
 			<uni-list-item title="设置" @click="navTo('/pages/set/userinfo')" thumb="/static/user/user6.png">
-			</uni-list-item>
+			</uni-list-item> -->
 		</uni-list>
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
@@ -118,6 +155,9 @@
 				</view>
 			</view>
 		</uni-popup>
+		<view class="" style="height: 40rpx;">
+			
+		</view>
 	</view>
 </template>
 <script>

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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3a9bf0f3.js></script><script src=/index/static/js/index.c0d93ae7.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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3a9bf0f3.js></script><script src=/index/static/js/index.91bde256.js></script></body></html>

unpackage/dist/build/mp-weixin/app.json

@@ -1,95 +1,93 @@
 {
-    "pages": [
-        "pages/index/index",
-        "pages/index/selectCity",
-        "pages/shoping/list",
-        "pages/shop/shopList",
-        "pages/shop/djqQm",
-        "pages/shop/shareF",
-        "pages/shop/yhqDetail",
-        "pages/shop/shopDetail",
-        "pages/shop/giftDetail",
-        "pages/shop/createYhq",
-        "pages/public/register",
-        "pages/user/jiedianDetails",
-        "pages/user/hxjl",
-        "pages/user/myyhq",
-        "pages/public/login",
-        "pages/public/wxLogin",
-        "pages/public/forget",
-        "pages/user/team",
-        "pages/user/cash",
-        "pages/money/withdmoenys",
-        "pages/product/reply",
-        "pages/product/product",
-        "pages/product/search",
-        "pages/set/set",
-        "pages/set/address",
-        "pages/set/addressManage",
-        "pages/set/phone",
-        "pages/set/user",
-        "pages/set/password",
-        "pages/set/userinfo",
-        "pages/user/user",
-        "pages/user/award",
-        "pages/user/withdrawal",
-        "pages/user/notice",
-        "pages/user/favorites",
-        "pages/user/coupon",
-        "pages/order/order",
-        "pages/order/expressInfo",
-        "pages/order/orderDetail",
-        "pages/order/evaluate",
-        "pages/order/orderRefund",
-        "pages/order/createOrder",
-        "pages/money/pay",
-        "pages/money/paySuccess",
-        "pages/money/wallet",
-        "pages/money/account",
-        "pages/money/withdrawal",
-        "pages/money/recharge",
-        "pages/redirect/redirect",
-        "pages/user/shareQrCode",
-        "pages/money/success"
-    ],
-    "subPackages": [],
-    "window": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "想亮",
-        "navigationBarBackgroundColor": "#FFFFFF",
-        "backgroundColor": "#f8f8f8"
-    },
-    "tabBar": {
-        "color": "#666666",
-        "selectedColor": "#f65067",
-        "borderStyle": "black",
-        "backgroundColor": "#ffffff",
-        "list": [
-            {
-                "pagePath": "pages/index/index",
-                "iconPath": "static/tabBar/tab-cate.png",
-                "selectedIconPath": "static/tabBar/tab-cate-current.png",
-                "text": "首页"
-            },
-            {
-                "pagePath": "pages/order/order",
-                "iconPath": "static/tabBar/order.png",
-                "selectedIconPath": "static/tabBar/order-action.png",
-                "text": "我的订单"
-            },
-            {
-                "pagePath": "pages/user/user",
-                "iconPath": "static/tabBar/tab-my.png",
-                "selectedIconPath": "static/tabBar/tab-my-current.png",
-                "text": "我的"
-            }
-        ]
-    },
-    "permission": {
-        "scope.userLocation": {
-            "desc": "需要根据你的定位来给你推送最近的门店"
-        }
-    },
-    "usingComponents": {},
-    "sitemapLocation": "sitemap.json"
+  "pages": [
+    "pages/index/index",
+    "pages/index/selectCity",
+    "pages/shoping/list",
+    "pages/shop/shopList",
+    "pages/shop/djqQm",
+    "pages/shop/shareF",
+    "pages/shop/yhqDetail",
+    "pages/shop/shopDetail",
+    "pages/shop/createYhq",
+    "pages/public/register",
+    "pages/user/jiedianDetails",
+    "pages/user/hxjl",
+    "pages/user/myyhq",
+    "pages/public/login",
+    "pages/public/wxLogin",
+    "pages/public/forget",
+    "pages/user/team",
+    "pages/user/cash",
+    "pages/money/withdmoenys",
+    "pages/product/reply",
+    "pages/product/product",
+    "pages/product/search",
+    "pages/set/set",
+    "pages/set/address",
+    "pages/set/addressManage",
+    "pages/set/phone",
+    "pages/set/user",
+    "pages/set/password",
+    "pages/set/userinfo",
+    "pages/user/user",
+    "pages/user/award",
+    "pages/user/withdrawal",
+    "pages/user/notice",
+    "pages/user/favorites",
+    "pages/user/coupon",
+    "pages/order/order",
+    "pages/order/expressInfo",
+    "pages/order/orderDetail",
+    "pages/order/evaluate",
+    "pages/order/orderRefund",
+    "pages/order/createOrder",
+    "pages/money/pay",
+    "pages/money/paySuccess",
+    "pages/money/wallet",
+    "pages/money/account",
+    "pages/money/withdrawal",
+    "pages/money/recharge",
+    "pages/redirect/redirect",
+    "pages/user/shareQrCode",
+    "pages/money/success"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "想亮",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#f8f8f8"
+  },
+  "tabBar": {
+    "color": "#666666",
+    "selectedColor": "#f65067",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/tabBar/tab-cate.png",
+        "selectedIconPath": "static/tabBar/tab-cate-current.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/order/order",
+        "iconPath": "static/tabBar/order.png",
+        "selectedIconPath": "static/tabBar/order-action.png",
+        "text": "我的订单"
+      },
+      {
+        "pagePath": "pages/user/user",
+        "iconPath": "static/tabBar/tab-my.png",
+        "selectedIconPath": "static/tabBar/tab-my-current.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "需要根据你的定位来给你推送最近的门店"
+    }
+  },
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/public/wxLogin.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "微信登录",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "/components/uni-popup/uni-popup"
+  }
 }

unpackage/dist/build/mp-weixin/pages/public/wxLogin.wxml

@@ -1 +1,51 @@
-<view class="content"><view class="logo-img-box"><image class="logo-img" src="../../static/img/logo.png" mode=" aspectFit"></image><button class="{{['userInfo',(isclick)?'nocaction':'']}}" type="warn" data-event-opts="{{[['tap',[['userInfoData']]]]}}" bindtap="__e"><text class="iconfont iconweixin"></text><text>微信授权登录</text></button></view></view>
+<view class="content"><view class="logo-img-box"><image class="logo-img" src="../../static/img/logo.png" mode=" aspectFit"></image><view data-event-opts="{{[['tap',[['checkboxChange',['$event']]]]]}}" class="two" bindtap="__e"><radio style="transform:scale(0.7);" color="#f65067" checked="{{istype}}"></radio>我已阅读并同意<text data-event-opts="{{[['tap',[['mzss',['$event']]]]]}}" catchtap="__e">《隐私政策》</text></view><block wx:if="{{istype}}"><button class="{{['userInfo',(isclick)?'nocaction':'']}}" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['decryptPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e"><text class="iconfont iconweixin"></text><text>微信用户一键登录</text></button></block><block wx:if="{{!istype}}"><button class="{{['userInfo',(true)?'nocaction':'']}}"><text class="iconfont iconweixin"></text><text>微信用户一键登录</text></button></block></view><uni-popup class="vue-ref" vue-id="0445d94b-1" type="center" data-ref="popup" bind:__l="__l" vue-slots="{{['default']}}"><scroll-view class="mzsm-wrap" scroll-y="true"><view style="font-size:28rpx;text-align:center;padding:20rpx 0;">隐私政策</view><view style="white-space:pre-line;">本指引是想亮商城小程序开发者“台州六牛传媒策划有限公司”（以下简称“开发者”）为处理你的个人信息而制定。
+				开发者处理的信息
+				· 为了便于小程序内展示用户信息，且方便线下处理客诉问题作为一个参考值，开发者将在获取你的明示同意后，收集你的微信昵称、头像。
+				
+				· 为了便于给用户推荐匹配度更高的商品，开发者将在获取你的明示同意后，收集你的位置信息。
+				
+				· 为了用户下单需求，方便处理物流、售后等问题，开发者将在获取你的明示同意后，收集你的手机号。
+				
+				· 为了部分场景下用户对于素材信息主动保存，开发者将在获取你的明示同意后，使用你的相册（仅写入）权限。
+				
+				· 开发者收集你选中的照片或视频信息，用于用户发表评论时可做出更具象的描述。
+				
+				· 开发者收集你的地址，用于用户下单需求，方便处理物流、售后等问题。
+				
+				· 开发者收集你的身份证号码，用于用户下单需求，根据商家的到店使用需求。
+				
+				第三方插件信息/SDK信息
+				为实现特定功能，开发者可能会接入由第三方提供的插件/SDK。第三方插件/SDK的个人信息处理规则，请以其公示的官方说明为准。探店台州严选小程序接入的第三方插件信息/SDK信息如下：<view class="_br"></view>插件名称：小程序直播组件
+				
+				插件提供方名称: 深圳市腾讯计算机系统有限公司
+				
+				插件名称：微信支付券
+				
+				插件提供方名称: 财付通支付科技有限公司
+				
+				第三方服务商信息
+				想亮商城小程序由浙江六牛科技有限公司代为开发，开发者保证，浙江六牛科技有限公司将在本指引规定范围内处理你的个人信息。
+				
+				你的权益
+				关于你的个人信息，你可以通过以下方式与开发者联系，行使查阅、复制、更正、删除等法定权利。
+				
+				- 邮箱: 1334991396@qq.com
+				
+				开发者对信息的存储
+				开发者承诺，除法律法规另有规定外，开发者对你的信息的保存期限应当为实现处理目的所必要的最短时间。
+				
+				信息的使用规则
+				开发者将会在本指引所明示的用途内使用收集的信息
+				
+				如开发者使用你的信息超出本指引目的或合理范围，开发者必须在变更使用目的或范围前，再次以公告方式告知并征得你的明示同意。
+				
+				信息对外提供
+				开发者承诺，不会主动共享或转让你的信息至任何第三方，如存在确需共享或转让时，开发者应当直接征得或确认第三方征得你的单独同意。
+				
+				开发者承诺，不会对外公开披露你的信息，如必须公开披露时，开发者应当向你告知公开披露的目的、披露信息的类型及可能涉及的信息，并征得你的单独同意。
+				
+				若你认为开发者未遵守上述约定，或有其他的投诉建议、或未成年人个人信息保护相关问题，可通过以下方式与开发者联系；或者向微信进行投诉。
+				- 邮箱: 1334991396@qq.com
+				
+				更新日期：2022年6月24日 
+				生效日期：2022年6月24日</view></scroll-view></uni-popup></view>

unpackage/dist/build/mp-weixin/pages/public/wxLogin.wxss

@@ -1,3 +1,3 @@
 page,
 .content{height:100%;background-color:#fff}.bg-img,
-.logo-img-box{position:absolute;top:0;left:0;width:100%;height:100%}.logo-img{margin-top:20vh;margin-left:176rpx;width:385rpx;height:394rpx}.userInfo{margin:0 100rpx;margin-top:50rpx;color:#fff;border-radius:99rpx;background-color:#f65067!important}.nocaction{background-color:#999}
+.logo-img-box{position:absolute;top:0;left:0;width:100%;height:100%}.logo-img{margin-top:20vh;margin-left:176rpx;width:385rpx;height:394rpx}.userInfo{margin:0 100rpx;margin-top:50rpx;color:#fff;border-radius:99rpx;background-color:#f65067}.nocaction{background:#999!important}.two{margin:20rpx 0;width:750rpx;font-size:28rpx;text-align:center;font-family:PingFang SC;font-weight:500;color:#999}.two text{color:#f65067}.mzsm-wrap{width:500rpx;height:600rpx;background-color:#fff;border-radius:20rpx;padding:20rpx;text-align:justify;font-size:26rpx}

unpackage/dist/build/mp-weixin/pages/shop/giftDetail.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "礼包详情",
-  "usingComponents": {
-    "uni-popup": "/components/uni-popup/uni-popup"
-  }
-}

unpackage/dist/build/mp-weixin/sitemap.json

@@ -1,7 +0,0 @@
-{
-    "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-    "rules": [{
-    "action": "allow",
-    "page": "*"
-    }]
-}