用户协议

ghsApp/src/admin/home/login.vue

@@ -23,11 +23,26 @@
 				</view>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
-				<view style="margin-top:50upx;">
+				<!-- <view style="margin-top:50upx;">
 				<button class="admin-button-com small blue buttonText" @click="mobileLogin()">本机号码一键登录</button>
+				</view> -->
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<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="pageTo({url: '/admin/home/register'})">《用户协议》</text>
+								和
+								<text style="font-weight:bold;color:#666666;" @click.stop="pageTo({url: '/admin/home/privacy'})">《隐私政策》</text>
+							</text>
+						</label>
+					</radio-group>
 				</view>
 				<!-- #endif -->
-				<view style="margin-top:60upx;color:#999999;width:88%;font-size:30upx;">
+				<view style="margin-top:50upx;color:#999999;width:88%;font-size:30upx;">
 				<text style="float:right;" @click="pageTo({url: '/pagesClient/official/apply',type:2})">注册帐号</text>
 				</view>
 			</view>
@@ -50,7 +65,8 @@ export default {
 		return {
 			mobile:'',
 			password: '',
-			hasMobileNet:false
+			hasMobileNet:false,
+			agree:0
 		}
 	},
 	computed: {
@@ -69,6 +85,9 @@ export default {
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),
+		agreeItem(e){
+			this.agree = e.target.value
+		},
 		dealLogin(res){
 			let that = this
 			console.log(res)
@@ -219,6 +238,10 @@ export default {
 			let that = this
 			let mobile = this.mobile
 			let password = this.password
+			if(that.agree == 0){
+				this.$msg('请同意并勾选用户协议和隐私政策')
+				return false				
+			}
 			if (that.$util.isEmpty(mobile)) {
 				this.$msg('请输入手机号')
 				return false

ghsApp/src/admin/home/privacy.vue

@@ -0,0 +1,48 @@
+<template>
+	<view style="font-size:30upx;">
+        <view style="padding:0upx 8upx 30upx 8upx">
+        <view v-for="(item, index) in itemData" :key="index">
+            <view :class="[item.gap == 2 ? 'hasGap':'noGap',item.bold == 2 ? 'hasBold':'noBold']">{{item.content}}</view>
+        </view>
+        </view>
+	</view>
+</template>
+<script>
+import { getPrivacyAgreement } from '@/api/auth'
+export default {
+	name: "privacy",
+	components: {},
+	mixins: [],
+	data() {
+		return {
+            itemData:[]
+		}
+	},
+	computed: {
+	},
+	onLoad(){
+        getPrivacyAgreement().then(res=>{
+			console.log(res)
+            if(res.code == 1){
+                this.itemData = res.data.html
+            }
+        })
+	},
+	methods: {
+    }
+};
+</script>
+<style lang="scss" scoped>
+.hasGap{
+	margin-top:49upx;
+}
+.hasBold{
+	font-weight:bold;
+}
+.noGap{
+	margin-top:0upx;
+}
+.noBold{
+	font-weight:normal;
+}
+</style>

ghsApp/src/admin/home/register.vue

@@ -0,0 +1,48 @@
+<template>
+	<view style="font-size:30upx;">
+        <view style="padding:0upx 8upx 30upx 8upx">
+        <view v-for="(item, index) in itemData" :key="index">
+            <view :class="[item.gap == 2 ? 'hasGap':'noGap',item.bold == 2 ? 'hasBold':'noBold']">{{item.content}}</view>
+        </view>
+        </view>
+	</view>
+</template>
+<script>
+import { getRegisterAgreement } from '@/api/auth'
+export default {
+	name: "register",
+	components: {},
+	mixins: [],
+	data() {
+		return {
+            itemData:[]
+		}
+	},
+	computed: {
+	},
+	onLoad(){
+        getRegisterAgreement().then(res=>{
+			console.log(res)
+            if(res.code == 1){
+                this.itemData = res.data.html
+            }
+        })
+	},
+	methods: {
+    }
+};
+</script>
+<style lang="scss" scoped>
+.hasGap{
+	margin-top:49upx;
+}
+.hasBold{
+	font-weight:bold;
+}
+.noGap{
+	margin-top:0upx;
+}
+.noBold{
+	font-weight:normal;
+}
+</style>

ghsApp/src/api/auth/index.js

@@ -12,4 +12,14 @@ export const wxMobileLogin = data => {
 
 export const getApkVersion = data => {
 	return https.get('/auth/get-apk-version', data)
+}
+
+//用户协议
+export const getRegisterAgreement = data => {
+	return https.get('/auth/register', data)
+}
+
+//隐私协议
+export const getPrivacyAgreement = data => {
+	return https.get('/auth/privacy', data)
 }

ghsApp/src/manifest.json

@@ -39,7 +39,7 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true,
+                "autoSdkPermissions" : false,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */

ghsApp/src/pages.json

@@ -10,6 +10,8 @@
 		{"path": "admin/home/apply","style": {"navigationBarTitleText": "应用","enablePullDownRefresh": true}},
 		{"path": "admin/home/me","style": {"navigationBarTitleText": "我的","enablePullDownRefresh": true,"navigationStyle": "custom"}},
 		{"path": "admin/home/mall","style": {"navigationBarTitleText": "商城"}},
+		{"path": "admin/home/register","style": {"navigationBarTitleText": "用户协议"}},
+		{"path": "admin/home/privacy","style": {"navigationBarTitleText": "隐私政策"}},
 		{"path": "common/redirect","style": {"navigationBarTitleText": "加载中..."}},
 		{"path": "common/webview","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}},
 		{"path": "common/pageSuccess","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}},

ghsApp/src/pagesClient/official/apply.vue

@@ -62,6 +62,22 @@
         </div>
       </view>
 
+				<!-- #ifdef APP-PLUS -->
+				<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="pageTo({url: '/admin/home/register'})">《用户协议》</text>
+								和
+								<text style="font-weight:bold;color:#666666;" @click.stop="pageTo({url: '/admin/home/privacy'})">《隐私政策》</text>
+							</text>
+						</label>
+					</radio-group>
+				</view>
+				<!-- #endif -->
+
       <div class="btn-wrap">
         <button class="admin-button-com blue big" formType="submit" >确认</button>
       </div>
@@ -103,6 +119,7 @@ export default {
   data () {
     return {
       merchantData: {},
+      agree:0,
       form: {
         name: "",
         mobile: "",
@@ -168,6 +185,9 @@ export default {
 
 	},
   methods: {
+		agreeItem(e){
+			this.agree = e.target.value
+		},
     requestAuthCode(){
       let that = this
       let mobile = this.form.mobile
@@ -257,6 +277,11 @@ export default {
       let formData = this.form;
       let checkRes = form.validation(formData, rules);
 
+			if(this.agree == 0){
+				this.$msg('请同意并勾选用户协议和隐私政策')
+				return false				
+			}
+
       if(this.$util.isEmpty(this.form.cover)){
         this.$msg('请上传照片')
         return false

hdApp/src/admin/home/login.vue

@@ -23,9 +23,9 @@
 				</view>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
-				<view style="margin-top:55upx;">
+				<!-- <view style="margin-top:55upx;">
 				<button class="admin-button-com small blue buttonText" @click="mobileLogin">本机号码一键登录</button>
-				</view>
+				</view> -->
 				<!-- #endif -->
 				<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>

hdApp/src/manifest.json

@@ -70,7 +70,7 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
                 ],
-                "autoSdkPermissions" : true,
+                "autoSdkPermissions" : false,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */

开发/ghsApp/src/manifest.json

@@ -39,7 +39,7 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true,
+                "autoSdkPermissions" : false,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */

开发/ghsPad/src/manifest.json

@@ -39,7 +39,7 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true
+                "autoSdkPermissions" : false
             },
             /* ios打包配置 */
             "ios" : {

开发/hdApp/src/manifest.json

@@ -70,7 +70,7 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
                 ],
-                "autoSdkPermissions" : true,
+                "autoSdkPermissions" : false,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */

线上/ghsApp/src/manifest.json

@@ -39,7 +39,7 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true,
+                "autoSdkPermissions" : false,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */

线上/ghsPad/src/manifest.json

@@ -39,7 +39,7 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true
+                "autoSdkPermissions" : false
             },
             /* ios打包配置 */
             "ios" : {

线上/hdApp/src/manifest.json

@@ -70,7 +70,7 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
                 ],
-                "autoSdkPermissions" : true,
+                "autoSdkPermissions" : false,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */