Merge branch 'liuxin' into develop

src/pages/login.vue

 <template>
   <scroll id="login">
+    <transition name="trans">
+      <div v-show="downNum" class="modal-show">
+        <div class="down">
+          <div class="policy">
+            <p>隐私政策</p>
+            <span>徐工金服遵守隐私相关的法律规范，在使用徐工金服前，请先阅读《徐工金服隐私政策》</span>
+            <button @click="downNum=false;privacyPolicy()">立即查看</button>
+          </div>
+        </div>
+      </div>
+    </transition>
     <div class="bird-icon" />
     <div class="login-wrap">
       <img class="title" src="../assets/login/title.png" >
       <div class="pwd">
         <div class="pwd-input">
-          <input id="userInput" v-model="username" class="user" type="text" placeholder="请输入用户名/手机号" >
+          <input
+            id="userInput" v-model="username" class="user" type="text"
+            placeholder="请输入用户名/手机号" >
         </div>
         <div v-if="username" class="delete" @click="clearAccount">
           <img src="../assets/login/login-delete.png" >
@@ -26,11 +39,10 @@
         <div class="pwd-forgotten" @click="pwdForgotten">忘记密码？</div>
       </div>
       <div class="button submit" @click="access">登录</div>
-      <div class="clear-button" id="clearBtn"></div>
+      <div id="clearBtn" class="clear-button"/>
     </div>
   </scroll>
 </template>
-
 <script>
 var CryptoJS = require('crypto-js')
 export default {
@@ -44,11 +56,15 @@ export default {
       password: '',
       currentVersion: process.env.currentVersion,
       routeName: this.$route.params.routeName || '',
+      downNum: false, // 关闭查看隐私协议
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getAccessToken()
+      setTimeout(() => {
+        vm.downNum = true
+      }, 1000)
     })
   },
   created () {
@@ -59,7 +75,7 @@ export default {
       document.activeElement.blur()
     })
     if (vum.Platform.isAndroid()) { // 安卓
-      document.getElementById('userInput').focus()  // 进入页面强行给dom增加点击事件，为了解决进入页面黑屏
+      document.getElementById('userInput').focus() // 进入页面强行给dom增加点击事件，为了解决进入页面黑屏
     }
   },
   methods: {
@@ -70,6 +86,14 @@ export default {
           ? require('@/assets/login/pwd.png')
           : require('@/assets/login/pwd-show.png')
     },
+    privacyPolicy () {
+      this.$router.push({
+        name: 'PrivacyPolicy',
+        params: {
+          button: true,
+        },
+      })
+    },
     login: function () {
       let vm = this
       // vm.password = CryptoJS.MD5(vm.password).toString().toUpperCase();
@@ -208,6 +232,14 @@ export default {
 </script>
 
 <style lang="less" scoped type="text/less">
+  .trans-enter-active,
+  .trans-leave-active {
+    transition: opacity 0.5s;
+  }
+  .trans-enter,
+  .trans-leave-active {
+    opacity: 0;
+  }
 #login {
   background: url("../assets/login/back.png") no-repeat;
   background-size: 100% 100%;
@@ -220,6 +252,66 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
+  }
+   .modal-show {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    display: flex;
+    z-index: 900;
+    background-color: rgba(56, 63, 69, 0.3);
+    justify-content: center;
+    align-items: center;
+    .policy{
+      width:80%;
+      height:90%;
+      margin:0 auto;
+      display: flex;
+      justify-content: center;
+      flex-direction: column;
+      flex-wrap: wrap;
+      align-items: center;
+    }
+    .down {
+      position: relative;
+      width: 301px;
+      height: 202px;
+      display: flex;
+      justify-content: center;
+      flex-flow: column wrap;
+      align-items: center;
+      background-size: 301px 24.7px;
+      background-color: #fff;
+      border-radius: 8px;
+      p {
+        font-family: PingFangSC-Semibold;
+        font-size: 16px;
+        color: #1d3fff;
+        margin-top: 16px;
+        flex: 2;
+      }
+      span {
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #383f45;
+        flex: 3;
+        line-height: 25px;
+        text-indent: 10px;
+        letter-spacing: 0;
+        // margin-top: 6px;
+      }
+      button {
+        width: 159px;
+        flex: 2;
+        margin-bottom: 16px;
+        height: 40px;
+        background-color: @headerColor;
+        font-family: PingFangSC-Semibold;
+        font-size: 15px;
+        color: #fafafa;
+        line-height: 20px;
+      }
+    }
   }
   .bird-icon {
     padding-top: 30%;

src/pages/userBindNew/org/baseInfo.vue

@@ -585,6 +585,7 @@ export default {
         vm.isApproved = true
         window.localStorage.setItem('isApproved', vm.isApproved)
       }
+      vm.isMultiRole = vm.$route.params.isMultiRole
       if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
         vm.legal_personMsg = {}
         window.localStorage.setItem('from', true)