Merge branch 'master' of http://47.99.244.21:9999/zhangjie/offical_web

src/views/contact.vue

@@ -2,7 +2,7 @@
   <div class="login_bg">
   <div class="login_bg">
     <div class="contact-header">
     <div class="contact-header">
       <div class="header-image">
       <div class="header-image">
-        <img src="../assets/logo.png" height="40px" />
+        <img src="../assets/logo.png" height="40px"/>
       </div>
       </div>
       <!-- <div class="user-info">
       <!-- <div class="user-info">
         <div class="user-msg">
         <div class="user-msg">
@@ -16,14 +16,24 @@
     </div>
     </div>
     <div class="login_content">
     <div class="login_content">
       <div class="no-authority">
       <div class="no-authority">
+        <div
+            style="
+            text-align: center;
+            color: #fff;
+            font-size: 50px;
+            line-height: 100px;
+            font-family: '微软雅黑';
+          " v-if="userInfo.erpKey">
+          <a :href="'https://'+userInfo.erpKey+'.jomalls.com'" target="_blank" style="text-decoration: none"> {{userInfo.erpKey+'.jomalls.com'}}</a>
+        </div>
         <h1
         <h1
-          style="
+            style="
             text-align: center;
             text-align: center;
             color: #fff;
             color: #fff;
             font-size: 50px;
             font-size: 50px;
             line-height: 100px;
             line-height: 100px;
             font-family: '微软雅黑';
             font-family: '微软雅黑';
-          ">
+          "  v-else>
           您尚未开通erp权限,请联系您的商务经理
           您尚未开通erp权限,请联系您的商务经理
         </h1>
         </h1>
         <h2
         <h2
@@ -47,7 +57,7 @@
           邮箱:nikki@jomalls.com
           邮箱:nikki@jomalls.com
         </h2>
         </h2>
         <el-button
         <el-button
-          style="
+            style="
             text-align: center;
             text-align: center;
             font-size: 30px;
             font-size: 30px;
             width: 160px;
             width: 160px;
@@ -56,8 +66,8 @@
             margin-top: 30px;
             margin-top: 30px;
             border-radius: 15px;
             border-radius: 15px;
           "
           "
-          type="success"
-          @click="goBack">
+            type="success"
+            @click="goBack">
           返回首页
           返回首页
         </el-button>
         </el-button>
       </div>
       </div>
@@ -67,15 +77,18 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { mapState } from 'vuex'
+// import {mapState} from 'vuex'
+
 export default {
 export default {
   name: 'contact',
   name: 'contact',
   components: {},
   components: {},
   data() {
   data() {
-    return {}
+    return {
+      userInfo:JSON.parse(localStorage.getItem('userInfo'))
+    }
   },
   },
   computed: {
   computed: {
-    ...mapState(['userInfo']),
+    // ...mapState(['userInfo']),
   },
   },
   methods: {
   methods: {
     goBack() {
     goBack() {
@@ -92,6 +105,7 @@ export default {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
 }
 }
+
 .login_content {
 .login_content {
   flex: 1;
   flex: 1;
   background: url(../assets/contact.jpg) center / cover no-repeat;
   background: url(../assets/contact.jpg) center / cover no-repeat;

src/views/login.vue

@@ -293,8 +293,8 @@ export default {
             password: passwordHash,
             password: passwordHash,
           }).then((res) => {
           }).then((res) => {
             if (res.code === 200) {
             if (res.code === 200) {
-              localStorage.setItem('userInfo', res.data)
-              this.setUserInfo(res.data)
+              localStorage.setItem('userInfo', JSON.stringify(res.data))
+              this.setUserInfo(JSON.parse(JSON.stringify(res.data)))
               this.ruleForm = {}
               this.ruleForm = {}
               this.$router.push('/contact')
               this.$router.push('/contact')
             }
             }