Merge branch '安卓审核' of xiongzhu/raex_front into master

src/views/account/Login.vue

@@ -111,14 +111,14 @@
             </div>
         </van-form>
 
-        <!-- <div class="xieyi">
+        <div class="xieyi">
             <van-checkbox v-model="checked">
                 已阅读并同意
                 <span @click.stop="$router.push('/agreement?page=service')"> &lt;&lt;用户服务协议>></span>
                 和
                 <span @click.stop="$router.push('/agreement')"> &lt;&lt;平台隐私协议>></span>
             </van-checkbox>
-        </div> -->
+        </div>
     </div>
 </template>
 
@@ -152,6 +152,10 @@ export default {
             });
         },
         submit() {
+            if (!this.checked) {
+                this.$toast('请先阅读并同意隐私政策');
+                return;
+            }
             this.$toast.loading({
                 message: '加载中...',
                 forbidClick: true
@@ -161,7 +165,12 @@ export default {
                 setTimeout(() => {
                     if (this.$store.state.loginBackUrl) {
                         this.$router.replace(this.$store.state.loginBackUrl);
-                    } else if (!fromRoute.name || fromRoute.name === 'userRegister' || fromRoute.name === 'userLogin') {
+                    } else if (
+                        !fromRoute ||
+                        !fromRoute.name ||
+                        fromRoute.name === 'userRegister' ||
+                        fromRoute.name === 'userLogin'
+                    ) {
                         this.$router.replace('/home');
                     } else {
                         this.$router.back();
@@ -312,10 +321,19 @@ export default {
     margin-top: 50px;
     font-size: @font1;
 
+    color: #fff;
     span {
-        color: @prim;
+        color: #25f50d;
     }
 }
+.van-checkbox {
+    background-color: #101010;
+    padding: 5px 10px;
+    border-radius: 12px;
+}
+/deep/.van-checkbox__label {
+    color: #fff;
+}
 
 /deep/.van-checkbox__icon--checked .van-icon {
     background: linear-gradient(135deg, @prim 0%, @warn 100%);