upbug

pages/login/login.vue

@@ -71,11 +71,9 @@
 
           <view v-if="iflogin" class="loginno">登录中..</view>
 		  
-		  <view class="regcon">
+		  <!-- <view class="regcon">
-		  	<!-- <view class="regtxt" @click="gotopwd">修改密码</view>
-		  	<view class="regtxtl"></view> -->
 		  	<view class="regtxtr" @click="gotoregister">注册账号 → </view>
-		  </view>
+		  </view> -->
 		  
 		  <view class="xycon">
 		  	<view class="sitem">
@@ -606,6 +604,11 @@
         const phone = this.form.phonenumber;
         const smsCode = this.form.smsCode;
 		
+		// 是否阅读协议
+		if(!this.checkxy()){
+			return false;
+		}
+
         if (!this.$u.test.mobile(phone)) {
           this.$refs.uToast.show({
             title: '请输入正确的手机号码',

pages/user/set.vue

@@ -8,6 +8,24 @@
 				</view>
 				<uni-icons type="right" size="18" color="#777777"></uni-icons>
 			</view>
+			<view class="cells" @tap="gotopwd()">
+				<view class="title">
+					<image class="timg" src="../../static/image/mm.png"></image>修改密码
+				</view>
+				<uni-icons type="right" size="18" color="#777777"></uni-icons>
+			</view>
+			<view class="cells" @tap="gotofw()">
+				<view class="title">
+					<image class="timg" src="../../static/image/yhxy.png"></image>用户服务协议
+				</view>
+				<uni-icons type="right" size="18" color="#777777"></uni-icons>
+			</view>
+			<view class="cells" @tap="gotoys()">
+				<view class="title">
+					<image class="timg" src="../../static/image/ys.png"></image>隐私政策条款
+				</view>
+				<uni-icons type="right" size="18" color="#777777"></uni-icons>
+			</view>
 <!--			<view class="cells" @tap="gotopj()">-->
 <!--				<view class="title">-->
 <!--					<image class="timg" src="../../static/image/wpj.png"></image>我的评价-->
@@ -21,18 +39,13 @@
 				<view style="color:#00a89b">已开启</view>
 				<uni-icons type="right" size="18" color="#777777"></uni-icons>
 			</view> -->
-			<view class="cells" @tap="gotopwd()">
+			 
-				<view class="title">
-					<image class="timg" src="../../static/image/mm.png"></image>修改密码
-				</view>
-				<uni-icons type="right" size="18" color="#777777"></uni-icons>
-			</view>
 <!-- 			<view class="cells" @tap="gotout()">-->
 <!--				<view class="title">-->
 <!--					<image class="timg" src="../../static/image/zx.png"></image>账号注销-->
 <!--				</view>-->
 <!--				<uni-icons type="right" size="18" color="#777777"></uni-icons>-->
-<!--			</view>-->
+<!--			</view> -->
 			<view class="cells">
 				<view class="title"><image class="timg" src="../../static/image/bb.png"></image>关于我们</view>
 				<view class="version">版本号 {{versionIn}}</view>
@@ -115,6 +128,16 @@
 					})
 				}
 			},
+			gotofw(){
+				uni.navigateTo({
+					url: `/pages/user/infofw`
+				});
+			},
+			gotoys(){
+				uni.navigateTo({
+					url: `/pages/user/infoys`
+				});
+			}, 
 			gotoaddr() {
 				// 收货地址
 				uni.navigateTo({

pages/user/user.vue

@@ -638,44 +638,6 @@
 					});
 				}
 			},
-			// 学员签到扫码
-			scando(){
-				var _this=this;
-				// 允许从相机和相册扫码
-				//qrCode,barCode
-				// #ifdef APP-PLUS
-				uni.scanCode({
-					scanType: ['qrCode', 'barCode'],
-					success: function(res) {
-						console.log(res);
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
-						// 入库扫码内容确认
-						var rmbm=res.result;
-						console.log(rmbm);
-						if(rmbm){
-							// 预约详情
-							uni.navigateTo({
-								url: `/pages/book/bookinfo?id=${rmbm}&type=qd`
-							});
-						}
-						else{
-							uni.showModal({
-								title: '提示',
-								content: '扫码异常，请正确扫码绑定推广员！',
-								cancelText: '取消',
-								confirmText: '确定',
-								success: ress => {
-									if (ress.confirm) {
-									}
-								}
-							});
-						}
-					}
-				});
-				// #endif
-			},
-
 			async logoff(){
 				uni.showLoading({
 					title: '账号注销中...'
@@ -683,9 +645,9 @@
 				var params = {
 					phone: this.phone
 				};
-				const {data: res} = await uni.$http.post('/appiso/deleteBuyer',params);
+				const {data: res} = await uni.$http.get('/api/cancel');
 				console.log("账号注销返回",res)
-				if (res&&res.data) {
+				if (res&&res.success) {
 					// 清除登录缓存
 					this.openId = "";
 					this.phone = "";
@@ -767,6 +729,44 @@
 					});
 				}
 			},
+			
+			// 学员签到扫码
+			scando(){
+				var _this=this;
+				// 允许从相机和相册扫码
+				//qrCode,barCode
+				// #ifdef APP-PLUS
+				uni.scanCode({
+					scanType: ['qrCode', 'barCode'],
+					success: function(res) {
+						console.log(res);
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+						// 入库扫码内容确认
+						var rmbm=res.result;
+						console.log(rmbm);
+						if(rmbm){
+							// 预约详情
+							uni.navigateTo({
+								url: `/pages/book/bookinfo?id=${rmbm}&type=qd`
+							});
+						}
+						else{
+							uni.showModal({
+								title: '提示',
+								content: '扫码异常，请正确扫码绑定推广员！',
+								cancelText: '取消',
+								confirmText: '确定',
+								success: ress => {
+									if (ress.confirm) {
+									}
+								}
+							});
+						}
+					}
+				});
+				// #endif
+			},
 			getPhoneNumber(e){
 				if(e.userid){
 					this.userid = e.userid