Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/App.vue

@@ -44,6 +44,18 @@
       chosenOpenMode,
       mycareer
     },
+    watch: {
+      'window.location': {
+        handler(newValue) {
+          if(window.location.ancestorOrigins.length==0) localStorage.setItem('typeSystem', 0)
+          else localStorage.setItem('typeSystem', 1)
+          console.log(window.location.href)
+          console.log(localStorage.typeSystem,'=-===')
+        },
+        deep: true,
+        immediate: true
+      },
+    },
     created() {
       //注册禁止后退，并且不做卸载
       // history.go(-1)

src/components/Details.vue

@@ -4,7 +4,7 @@
 </style>
 <template>
   <div class="flexDiv">
-    <div class="secondMenu" :class="{'big':!isCollapse}">
+    <div v-if="typeSystem==0" class="secondMenu" :class="{'big':!isCollapse}">
       <div class="secondMenu_l">
         <div class="menuItem">
           <el-menu default-active="1" :background-color="!isRed?'#282733':'#FBFBFB'"
@@ -31,7 +31,7 @@
       </div>
     </div>
     <div class="flexParent" v-if="openMode==1">
-      <div class="nav-tabs-box" @contextmenu.prevent="showRightMenu" :style="{width:`${navWidth}px`}">
+      <div v-if="typeSystem==0" class="nav-tabs-box" @contextmenu.prevent="showRightMenu" :style="{width:`${navWidth}px`}">
         <el-tabs v-if='tabs && tabs.length>0' v-model="currentTabName" style="margin-left: 120px;"
           :closable="tabs.length>1" type="card" @edit="handleTabsEdit">
           <el-tab-pane :key="i" v-for="(item,i) in tabs" :label="item.title" :name="item.name+'_'+i">
@@ -81,6 +81,7 @@
   export default {
     data() {
       return {
+        typeSystem: 0,
         msg: {
           ParentId: "",
           MenuStatus: "0",
@@ -992,7 +993,7 @@
         window.localStorage.navTabs = JSON.stringify(this.tabs)
     },
     created() {
-
+      this.typeSystem = localStorage.typeSystem
     }
   };
 

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1840,7 +1840,7 @@
           this.GetCarList(path)
         } else {
           if(this.GetDetail.OtherType == 80){
-            if(this.typeSystem>0){
+            if(this.typeSystem==1){
               let href = this.domainManager().CarUrl
               window.parent.postMessage({
               event_id: 'CarDealerOrder',
@@ -2861,14 +2861,8 @@
       }
     },
     mounted() {
-      if(localStorage.crmuserInfo){
-          let crmuserInfo = JSON.parse(localStorage.crmuserInfo)
-          if(crmuserInfo
-          &&crmuserInfo.parameter
-          &&crmuserInfo.parameter.typeSystem) {
-            this.typeSystem = crmuserInfo.parameter.typeSystem
-        }
-      }
+      this.typeSystem = localStorage.typeSystem
+
       // document.onkeydown = this.KeyDown
       // document.onkeyup = this.KeyUp
       // document.oncontextmenu = function(){return false;}

src/components/index.vue

@@ -65,7 +65,7 @@
 
 <template>
   <div style="position: relative;" class="myIndexStyle" ref="firstParent">
-    <div class="nav" v-if="!typeSystem">
+    <div class="nav" v-if="typeSystem==0">
       <div class="nav-left">
         <img class="GroupPic" v-if="userInfo.GroupPic!='' " :src="userInfo.GroupPic" :onerror='defaultHeadImg' />
       </div>
@@ -957,7 +957,7 @@
         <source src="/static/music/msgMusic.mp3" type="audio/mpeg">
       </audio>
     </div>
-    <div class="temDivs" :style="{'top':!typeSystem?'58px':'0px'}">
+    <div class="temDivs" :style="{'top':typeSystem==0?'58px':'58px'}">
       <router-view></router-view>
     </div>
 
@@ -1753,14 +1753,7 @@
       },
     },
     mounted() {
-      if(localStorage.crmuserInfo){
-        let crmuserInfo = JSON.parse(localStorage.crmuserInfo)
-        if(crmuserInfo
-        &&crmuserInfo.parameter
-        &&crmuserInfo.parameter.typeSystem) {
-          this.typeSystem = crmuserInfo.parameter.typeSystem
-        }
-      }
+      this.typeSystem = localStorage.typeSystem
 
       let that = this;
       this.qjGroupId = this.QjGroupId();