Merge branch 'app' of http://101.37.147.115:3000/mz666/apply-assistant-v3 into app

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "fadanzhushou",
+    "name" : "报名助手",
     "appid" : "__UNI__860FDF3",
     "description" : "报名助手",
     "versionName" : "1.0.0",
@@ -41,7 +41,8 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "targetSdkVersion" : 32
             },
             /* ios打包配置 */
             "ios" : {
@@ -127,5 +128,6 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "3"
+    "vueVersion" : "3",
+    "fallbackLocale" : "zh-Hans"
 }

root/person/loginIndex.vue

@@ -16,7 +16,7 @@
             <u-input maxlength="4" v-model="msgCode.code" @input="hideKeyboard" type="number" class="g_fs_16" placeholder="请输入验证码" placeholder-style="color:#999999;font-size:32rpx;line-height:1" />
           </view>
           <view class="btn-text g_flex_column_center g_bg_f_5 g_radius_6 g_flex_none g_pt_8 g_pb_8" @click="handleSendMsg">
-            <button :class="form.tel.length == 11 ? (msgCode.countdown > 0 ? 'g_c_9' : 'g_c_main') : 'g_c_9'" class="btn-con g_w_126 g_flex_row_center" style="font-size: 32rpx">{{ msgCode.btnText }}</button>
+            <button :class="form.tel.length == 11 ? (msgCode.countdown > 0 ? 'g_c_9' : 'g_c_main') : 'g_c_9'" class="btn-con g_w_146 g_flex_row_center" style="font-size: 32rpx">{{ msgCode.btnText }}</button>
           </view>
         </view>
       </view>
@@ -44,6 +44,18 @@
         <g-button width="260" height="48" btnText="一键免密登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
       </view>
       <!-- #endif -->
+			
+			<view class="g_flex_column_between g_flex_1 g_pb_24">
+				<view class="g_fs_12 g_c_9 g_flex_row_center g_mb_32" style="align-items: center; margin-top: 16px">
+					<radio-group class="dib">
+						<radio :checked="switchChecked" @click="switchChange" value="0" class="dib biggerSize" color="#3578f6" style="transform: scale(0.7)" />
+					</radio-group>
+					我已阅读并同意
+					<navigator url="/root/person/agreeUser" class="g_c_sub">《用户服务协议》</navigator>
+					及
+					<navigator url="/root/person/agreePrive" class="g_c_sub">《隐私政策》</navigator>
+				</view>
+			</view>
     </view>
   </view>
 </template>
@@ -55,6 +67,7 @@ export default {
   },
   data() {
     return {
+			switchChecked: false,
       localBaseImg: this.G.store().localBaseImg,
       v3BaseImg: this.G.store().v3BaseImg,
       isLoginCode: true,
@@ -98,6 +111,10 @@ export default {
     }
   },
   methods: {
+		switchChange() {
+			console.log(this.switchChecked);
+			this.switchChecked = !this.switchChecked;
+		},
     hideKeyboard(e) {
       console.log(e)
       if (e.length >= 4) {
@@ -164,6 +181,14 @@ export default {
           wxCode: '',
         }
       }
+			if (!that.switchChecked) {
+				uni.showToast({
+					icon: "none",
+					title: "请先同意用户及隐私协议",
+				});
+				return false;
+			}
+			
       uni.showLoading({
         title: '登录中...',
         mask: true,