Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/layout/components/Navbar.vue

@@ -115,7 +115,7 @@ export default {
         }
     },
     mounted() {
-        this.thirdLogin = getSessionStorage('thirdLogin');
+        this.thirdLogin = getSessionStorage('project') == 'richor';
         this.routes = this.$router.options.routes;
         if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
             this.activePath = '/design/usermap/home';

src/views/newMap/displayNew/dispatherContest/contectUs.vue

@@ -5,6 +5,18 @@
     width="400px"
     :before-close="handleClose"
   >
+    <div v-if="thirdLogin">
+      <div><span class="el-icon-user" style="font-size:15px;margin-right:8px;" />联系人：欧阳炜椿</div>
+      <div class="eachInfo"><span class="el-icon-mobile-phone" style="font-size:15px;margin-right:7px;" />电&nbsp;&nbsp;&nbsp;&nbsp;话：4000500081</div>
+      <div class="eachInfo"><span class="el-icon-message" style="font-size:15px;margin-right:7px;" />邮&nbsp;&nbsp;&nbsp;&nbsp;箱：zhrc@richortech.com</div>
+      <div class="eachInfo"><span class="el-icon-connection" style="font-size:15px;margin-right:7px;" />网&nbsp;&nbsp;&nbsp;&nbsp;址：www.richortech.com</div>
+      <!-- <div class="eachInfo">
+        <span class="el-icon-chat-round" style="font-size:15px;margin-right:3px;vertical-align:top;" />
+        <span style="vertical-align: top;">微&nbsp;&nbsp;&nbsp;&nbsp;信：</span>
+        <img :src="wchatImg" width="80" height="80">
+      </div> -->
+    </div>
+    <div v-else>
       <div><span class="el-icon-user" style="font-size:15px;margin-right:8px;" />联系人：小九</div>
       <div class="eachInfo"><span class="el-icon-mobile-phone" style="font-size:15px;margin-right:7px;" />手&nbsp;&nbsp;&nbsp;&nbsp;机：13289398171</div>
       <div class="eachInfo"><span class="el-icon-message" style="font-size:15px;margin-right:7px;" />邮&nbsp;&nbsp;&nbsp;&nbsp;箱：ServiceEmail@joylink.club</div>
@@ -13,6 +25,8 @@
         <span style="vertical-align: top;">微&nbsp;&nbsp;&nbsp;&nbsp;信：</span>
         <img :src="wchatImg" width="80" height="80">
       </div>
+    </div>
+
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
     </span>
@@ -20,6 +34,7 @@
 </template>
 <script>
 import wchat from '@/assets/wchat.png';
+import { getSessionStorage } from '@/utils/auth';
 export default {
     name:'',
     data() {
@@ -28,6 +43,11 @@ export default {
             wchatImg: wchat
         };
     },
+    computed:{
+        thirdLogin() {
+            return getSessionStorage('project') == 'richor';
+        }
+    },
     methods:{
         handleClose() {
             this.dialogVisible = false;

src/views/thirdLogin/index.vue

@@ -62,7 +62,7 @@ export default {
                     this.$store.dispatch('setToken', token);
                     this.$store.dispatch('subscribe', {header, type:'class'});
                     this.$router.replace({path:'/trainingPlatform'});
-                    setSessionStorage('thirdLogin', true);
+                    // setSessionStorage('thirdLogin', true);
                 }).catch(() => {
                     this.message = '参数有误，请检查';
                 });