shish 4 лет назад
Родитель
Сommit
39f4977c0d
2 измененных файлов с 58 добавлено и 4 удалено
  1. 32 3
      hdApp/src/admin/home/login.vue
  2. 26 1
      hdApp/src/pagesClient/official/apply.vue

+ 32 - 3
hdApp/src/admin/home/login.vue

@@ -23,10 +23,23 @@
 				</view>
 				</view>
 				<!-- #endif -->
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
 				<!-- #ifdef APP-PLUS -->
-				<!-- <view style="margin-top:55upx;">
+				<view style="margin-top:55upx;">
 				<button class="admin-button-com small blue buttonText" @click="mobileLogin">本机号码一键登录</button>
 				<button class="admin-button-com small blue buttonText" @click="mobileLogin">本机号码一键登录</button>
-				</view> -->
+				</view>
 				<!-- #endif -->
 				<!-- #endif -->
+				<view style="color:#999999;font-size:25upx;margin-top:30upx;">
+					<radio-group @change="agreeItem">
+						<label>
+							<radio value="1" style="width:6upx;transform:scale(0.8)" />
+							<text style="margin-left:38upx;">
+								我已阅读并同意
+								<text style="font-weight:bold;color:#666666;" @click.stop="goToService">《服务协议》</text>
+								和
+								<text style="font-weight:bold;color:#666666;" @click.stop="goToPrivacy">《隐私政策》</text>
+							</text>
+						</label>
+					</radio-group>
+				</view>
 				<view style="margin-top:60upx;color:#999999;width:88%;font-size:30upx;">
 				<view style="margin-top:60upx;color:#999999;width:88%;font-size:30upx;">
 				<text style="float:right;" @click="pageTo({url: '/pagesClient/official/apply',type:2})">注册帐号</text>
 				<text style="float:right;" @click="pageTo({url: '/pagesClient/official/apply',type:2})">注册帐号</text>
 				</view>
 				</view>
@@ -51,7 +64,8 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			mobile:'',
 			mobile:'',
-			password:''
+			password:'',
+			agree:0
 		};
 		};
 	},
 	},
 	computed: {
 	computed: {
@@ -70,6 +84,12 @@ export default {
 	},
 	},
 	methods: {
 	methods: {
 		...mapActions(['setUserShopAll']),
 		...mapActions(['setUserShopAll']),
+		goToService(){
+			plus.runtime.openURL('http://www.wixhb.com/main/xhb-register')
+		},
+		goToPrivacy(){
+			plus.runtime.openURL('http://www.wixhb.com/main/xhb-privacy')
+		},
 		dealLogin(res){
 		dealLogin(res){
 			let that = this
 			let that = this
 			console.log(res)
 			console.log(res)
@@ -142,6 +162,11 @@ export default {
 			// 	return
 			// 	return
 			// }
 			// }
 
 
+			if(this.agree == 0){
+				this.$msg('请同意并勾选服务协议和隐私政策')
+				return false				
+			}
+
 			uni.showLoading({mask:true})
 			uni.showLoading({mask:true})
 			uni.preLogin({
 			uni.preLogin({
 				provider: 'univerify',
 				provider: 'univerify',
@@ -224,6 +249,10 @@ export default {
 			let that = this
 			let that = this
 			let mobile = this.mobile
 			let mobile = this.mobile
 			let password = this.password
 			let password = this.password
+			if(that.agree == 0){
+				this.$msg('请同意并勾选服务协议和隐私政策')
+				return false				
+			}
 			if (that.$util.isEmpty(mobile)) {
 			if (that.$util.isEmpty(mobile)) {
 				this.$msg('请输入手机号')
 				this.$msg('请输入手机号')
 				return false
 				return false

+ 26 - 1
hdApp/src/pagesClient/official/apply.vue

@@ -62,7 +62,19 @@
           </div>
           </div>
         </div>
         </div>
       </view>
       </view>
-
+      <view style="color:#999999;font-size:25upx;margin-top:30upx;margin-left:50upx;">
+        <radio-group @change="agreeItem">
+          <label>
+            <radio value="1" style="width:6upx;transform:scale(0.8)" />
+            <text style="margin-left:38upx;">
+              我已阅读并同意
+              <text style="font-weight:bold;color:#666666;" @click.stop="goToService()">《服务协议》</text>
+              和
+              <text style="font-weight:bold;color:#666666;" @click.stop="goToPrivacy()">《隐私政策》</text>
+            </text>
+          </label>
+        </radio-group>
+      </view>
       <div class="btn-wrap">
       <div class="btn-wrap">
         <button class="admin-button-com blue big" formType="submit" >确认</button>
         <button class="admin-button-com blue big" formType="submit" >确认</button>
       </div>
       </div>
@@ -107,6 +119,7 @@ export default {
   data () {
   data () {
     return {
     return {
       merchantData: {},
       merchantData: {},
+      agree:0,
       form: {
       form: {
         name: "",
         name: "",
         mobile: "",
         mobile: "",
@@ -173,6 +186,12 @@ export default {
 	},
 	},
   methods: {
   methods: {
     ...mapActions(['setUserShopAll']),
     ...mapActions(['setUserShopAll']),
+		goToService(){
+			plus.runtime.openURL('http://www.wixhb.com/main/xhb-register')
+		},
+		goToPrivacy(){
+			plus.runtime.openURL('http://www.wixhb.com/main/xhb-privacy')
+		},
     requestAuthCode(){
     requestAuthCode(){
       let that = this
       let that = this
       let mobile = this.form.mobile
       let mobile = this.form.mobile
@@ -261,6 +280,12 @@ export default {
       ];
       ];
       let formData = this.form;
       let formData = this.form;
       let checkRes = form.validation(formData, rules)
       let checkRes = form.validation(formData, rules)
+
+			if(this.agree == 0){
+				this.$msg('请同意并勾选服务协议和隐私政策')
+				return false				
+			}
+
       if (!checkRes) {
       if (!checkRes) {
         uni.showLoading({mask:true})
         uni.showLoading({mask:true})
         setTimeout(() => {
         setTimeout(() => {