页面修改

src/components/Login2019.vue

@@ -268,6 +268,13 @@
     components: {
       'my-carousel': Carousel
     },
+    watch:{
+       '$route':function(old,newval)
+       {
+            console.log("old",old);
+            console.log("newval",newval);
+       }
+    },
     methods: {
       //初始化数据
       initData() {
@@ -488,6 +495,7 @@
       this.getGroup()
     },
     created() {
+
       let autoLogin = localStorage.autoLogin ? JSON.parse(localStorage.autoLogin) : null
       this.userInfo.name = autoLogin ? autoLogin.acc : ''
       this.userInfo.password = autoLogin ? autoLogin.pwd : ''

src/components/automaticLogin.vue

 <style>
   @import "../assets/css/login2019.css";
-  .Autologin{
+  .Autologin {
     position: fixed;
     left: 0;
     top: 0;
     right: 0;
     bottom: 0;
-    /* transform: translate(-50%,-50%); */
     background: url('../assets/img/login/load.gif')no-repeat center;
     background-size: 350px auto;
   }
@@ -15,7 +14,6 @@
   <div>
     <div class="Autologin">
       <div class="gifContent">
-
       </div>
     </div>
   </div>
@@ -25,38 +23,38 @@
     data() {
       return {
         loading: false,
-        msg:{},
+        msg: {},
         userInfo: {
           name: "",
           password: "",
           Domain: ""
         },
-        crmOrderObj:{},
-        obj:{}
+        crmOrderObj: {},
+        obj: {}
       }
     },
     components: {
-      
+
     },
     mounted() {
-      
+
     },
     created() {
-      if(this.$route.query){
-        let param = JSON.parse(this.$route.query.data) ;
-        this.obj.token=this.$route.query.token;
-        if(param){
-          this.obj.parameter=param[0]
+      if (this.$route.query) {
+        let param = JSON.parse(this.$route.query.data);
+        this.obj.token = this.$route.query.token;
+        if (param) {
+          this.obj.parameter = param[0]
           localStorage.crmuserInfo = JSON.stringify(this.obj);
         }
       }
-      if(!this.getLocalStorage()){
+      if (!this.getLocalStorage()) {
         this.autoLogin()
-      }else{
+      } else {
         var data = JSON.parse(localStorage.crmuserInfo)
         this.$router.push({
           path: data.parameter.path,
-          query:{
+          query: {
             crmOrderObj: JSON.stringify(data.parameter),
             Type: data.parameter.type
           }
@@ -64,7 +62,7 @@
       }
     },
     methods: {
-      autoLogin(){
+      autoLogin() {
         this.apipostLogin(
           "admin_get_GetErpAutoLoginInfo",
           this.msg,
@@ -78,30 +76,26 @@
               localStorage.userInfo = userJson;
               let firstTire = []
               userData.UserMenu.forEach(x => {
-                if (x.MenuUrl != '/' && x.MenuUrl!='') {
+                if (x.MenuUrl != '/' && x.MenuUrl != '') {
                   firstTire.push(x.MenuName)
                 } else {
-                  x.MenuUrl='';
+                  x.MenuUrl = '';
                   firstTire.push(x.MenuName);
                 }
               })
-              //UserMenu
-              // this.$cookie.set("account", this.userInfo.name);
               this.$cookie.set("EmployeeId", userData.EmployeeId);
               this.$cookie.set("RB_Branch_id", userData.RB_Branch_id);
               this.$cookie.set("RB_Group_id", userData.RB_Group_id);
               localStorage.menu = JSON.stringify(firstTire)
               this.loginState = 0;
-
               var data = JSON.parse(localStorage.crmuserInfo)
               this.$router.push({
                 path: data.parameter.path,
-                query:{
+                query: {
                   crmOrderObj: JSON.stringify(data.parameter),
                   Type: data.parameter.type
                 }
               });
-              
             } else {
               this.$notify.error({
                 title: "提示",
@@ -116,7 +110,5 @@
         );
       }
     },
-    
   }
-
-</script>
+</script>
\ No newline at end of file

src/components/clientProtocol.vue

@@ -247,19 +247,6 @@
     font-weight: bold;
   }
 
-
-
-  .CliSignDiv {
-    position: fixed;
-    border: 1px solid #d1d1d1;
-    width: 100%;
-    background-color: #fff;
-    z-index: 999;
-    margin: auto;
-    display: block;
-    z-index: -999;
-  }
-
   .TopFixed {
     z-index: 100;
   }
@@ -715,10 +702,6 @@
       this.msg.OrderId = this.$route.query.OrderId;
       this.msg.GuestId = this.$route.query.GuestId;
       this.msg.ProtocolId = this.$route.query.ProtocolId;
-      try {
-        var cHeight = document.getElementsByClassName("CliSignDiv")[0];
-        cHeight.style.height = 900 + 'px';
-      } catch (error) {}
       this.getList();
     }
   };

src/router/config.js

-// import login from '../components/Login'
 import login from '../components/Login2019'
 import index from '../components/index'
 import clientConfirm from '../components/clientConfirm'
 import clientConfirmRB from '../components/clientConfirmRB'
+import clientProtocol from '../components/clientProtocol'
 import SignName from '../components/SignName'
 import supplierLogin from '../components/SupplierLogin'
 import supplierIndex from '../components/SupplierIndex'
@@ -5865,6 +5865,22 @@ export default {
       name: 'clientConfirmRB',
       component: clientConfirmRB
     },
+    {
+      path: '/discountProtocol', //价格保密协议
+      name: 'discountProtocol',
+      component: resolve => require(['@/components/discountProtocol'], resolve),
+      meta: {
+        title: '价格保密协议'
+      }
+    },
+    {
+      path: '/clientProtocol', //价格保密协议签订
+      name: 'clientProtocol',
+      component: clientProtocol,
+      meta: {
+        title: '价格保密协议签订'
+      }
+    },
     {
       path: '/SignName',
       name: 'SignName',
@@ -5894,22 +5910,7 @@ export default {
         title: '日本线电子合同'
       }
     },
-    {
-      path: '/discountProtocol', //价格保密协议
-      name: 'discountProtocol',
-      component: resolve => require(['@/components/discountProtocol'], resolve),
-      meta: {
-        title: '价格保密协议'
-      }
-    },
-    {
-      path: '/clientProtocol', //价格保密协议签订
-      name: 'clientProtocol',
-      component: resolve => require(['@/components/clientProtocol'], resolve),
-      meta: {
-        title: '价格保密协议签订'
-      }
-    },
+
     {
       path: '/SingleContract', //单项合同
       name: 'SingleContract',

src/store/actions/index.js

@@ -93,7 +93,6 @@ export default {
     if (state.nim) {
       state.nim.disconnect()
     }
-    //pageUtil.turnPage('', 'login')
   },
 
   // 初始化 重新连接SDK

src/store/actions/initNimSDK.js

@@ -41,8 +41,7 @@ export function initNimSDK ({ state, commit, dispatch }, loginInfo) {
       }
     },
     onerror: function onError (event) {
-      // alert(JSON.stringify(event))
-      //location.href = config.loginUrl
+  
     },
     onwillreconnect: function onWillReconnect () {