Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/home/login.vue

 <template>
   <div class="container">
-
     <div class="newLogin">
       <div class="login">
         <div class="logo">
             :disabled="loginDisable"
           >登录</button>
 
-          <!-- <router-link to="/forgetPassword"> -->
-          <div class="newForget" style="display:none">忘记密码</div>
-          <!-- </router-link> -->
+          <!-- <router-link to="/forgetPassword">
+            <div class="newForget">忘记密码</div>
+          </router-link>-->
           <!-- </router-link> -->
           <!-- <div class="forget">
           <a href="">免密码登录</a>
           <a href="">忘记密码？</a>
           </div>-->
-          <!--<div class="agree">-->
-            <!--<el-checkbox v-model="agreement">-->
-              <!--我已阅读并同意-->
-              <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
-
-              <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
-            <!--</el-checkbox>-->
-            <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
-            <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
-          <!--</div>-->
-            <span  class="agreeText" @click.native="agree">《隐私服务协议》</span>
-
+          <div class="agree">
+            <el-checkbox v-model="agreement">我已阅读并同意</el-checkbox>
+            <span class="agreeText" @click="agree()">《隐私服务协议》</span>
+          </div>
         </div>
       </div>
     </div>
-
   </div>
 </template>
 
       });
     },
     to: function() {
-      this.$router.push({ path: "/forgetPassword" });
+      this.$router.push({ path: "/privacy" });
     },
     submitForm() {
       const self = this;
 
       loginByPwd(this.form.mobile, hex_md5(this.form.pwd)).then(rs => {
         var resp = rs.data;
+        if (this.agreement != true) {
+          Toast("请同意隐私服务协议");
+        }
 
-        if (resp.state == 1) {
+        if (resp.state == 1 && this.agreement == true) {
           cacheLoginInfo(this.form.mobile, this.form.pwd);
           console.log(resp);
 
       this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
     },
     agree() {
-      this.$nextTick(() => {
-        this.$router.push({ path: "/privacy" });
-      })
+      this.$router.push({ path: "/privacy" });
     }
   }
 };

src/pages/privacy/index.vue

 
 
 <script>
-    export default {
-        name: "privacy"
-
-    }
+export default {
+  name: "privacy"
+};
 </script>
 
 <style lang="scss" scoped>
-  .page_privacy {
-    width: 100%;
-    margin: 0 auto;
-    height: 100%;
-    overflow-y: auto;
-    display: flex;
-    flex-direction: column;
+.page_privacy {
+  width: 100%;
+  margin: 0 auto;
+  height: 100%;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
   > div:last-child {
     flex: 1;
     overflow-y: auto;
     font-size: 0.45rem;
     padding: 0.3rem 0.37rem;
     color: $title-color;
-  @include align-items-center;
-  @include display-flex;
-  @include justify-content-between;
-  @include text-align;
+    @include align-items-center;
+    @include display-flex;
+    @include justify-content-between;
+    @include text-align;
     background: #fff;
-  .GoBack {
-    color: $main-color;
-    font-size: 0.45rem;
-  @include display-flex;
-  .iconfont {
-    color: $main-color;
-    font-size: 0.5rem;
-    margin-top: 1px;
-  @media only screen and (min-width: 768px) {
-    margin-top: 3px;
-  }
-  }
-  }
+    .GoBack {
+      color: $main-color;
+      font-size: 0.45rem;
+      @include display-flex;
+      .iconfont {
+        color: $main-color;
+        font-size: 0.5rem;
+        margin-top: 1px;
+        @media only screen and (min-width: 768px) {
+          margin-top: 3px;
+        }
+      }
+    }
   }
   .name {
     margin-right: 1.3rem;
     width: 90%;
     margin: 0 auto;
   }
-  }
+}
 </style>

src/permission.js

-import router from './router'
-import store from './store'
+import router from "./router";
+import store from "./store";
 
-const loginWhiteList = ['/'] // 登录验证白名单
+const loginWhiteList = ["/", "/privacy", "/forgetPassword"]; // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-//   next()
-//   return
+  //   next()
+  //   return
 
   if (store.getters.user.user.id == 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
-      next()
+      next();
     } else {
-      next({ path: '/'})
+      next({ path: "/" });
     }
   } else {
-    next()
+    next();
   }
-})
+});