Merge branch 'hotfix-775-wangcz'

assets/scss/mobileCenter.scss

@@ -76,6 +76,7 @@
         margin: 0 .28rem;
       }
       span {
+        color:#666;
         font-size: .28rem;
         .text {
           color: #3f84f6;

components/default/Header.vue

@@ -133,6 +133,10 @@
 //          }
           window.location.href = '/'
         })
+        // 切换帐套用
+        // this.$jsonp(`/sso/login/change/userspace?spaceUU=${en.uu}`, {timeout: 5000, name: 'successCallback'}, (res) => {
+        //   console.log(res.data)
+        // })
       },
       toVendor: function () {
         let isSelf = true

components/mobile/MobileFooter.vue

@@ -151,12 +151,12 @@
     display: inline-block;
     width: 25%;
     font-size:.32rem;
-    color:#b0b0b0;
+    color:#666;
     padding-top:.1rem;
   }
 
   .mobile-footer > span a{
-    color:#b0b0b0;
+    color:#666;
   }
 
   .mobile-footer > span a i{

components/mobile/center/Message.vue

@@ -16,8 +16,8 @@
             <p>{{item.createTime | time}}</p>
             <a :href="item.type === 'MALL跳转买家已报价页面' ? '/mobile/center/user/seek?seekType=done' : item.type === 'MALL公共询价' ? '/mobile/center/vendor/seek?seekType=wait&messageType=my' : item.type === '商城公共询价采纳结果' ? '/mobile/center/vendor/seek?seekType=done' : ''"
                v-if="item.type"
-               :title="item.content" class="info">{{item.content}}</a>
-            <a v-else :title="item.content" class="noLink info">{{item.content}}</a>
+               :title="item.content" :class="{info: item.isRead === 0}">{{item.content}}</a>
+            <a v-else :title="item.content" class="noLink" :class="{info: item.isRead === 0}">{{item.content}}</a>
           </div>
         </div>
       </div>
@@ -144,13 +144,16 @@
             font-size: .24rem;
             color: #666;
           }
-          a.info{
+          a{
             font-size: .28rem;
-            color: #333;
+            color: #666;
             word-break: break-all;
-            padding:0;
-            &:active{
-               background: #e1e1e1;
+            padding: 0;
+            &.info {
+              color: #333;
+            }
+            &:active {
+              background: #e1e1e1;
             }
           }
         }

components/mobile/common/userHeader.vue

@@ -73,6 +73,10 @@
           //   this.$emit('updateLoad')
           // })
         })
+        // 切换帐套用
+        // this.$jsonp(`/sso/login/change/userspace?spaceUU=${en.uu}`, {timeout: 5000, name: 'successCallback'}, (res) => {
+        //   console.log(res.data)
+        // })
       },
       setShowEnterpriseToggle(flag, e) {
         if (e) {

components/mobile/user/Admin.vue

@@ -3,15 +3,15 @@
     <div class="info">
       <div class="line">
         <span>用户名：</span>
-        {{info.userName}}
+        <span v-text="info.userName"></span>
       </div>
       <div class="line">
         <span>手机：</span>
-        {{info.userTel}}
+        <span v-text="info.userTel"></span>
       </div>
       <div class="line">
         <span>邮箱：</span>
-        {{info.userEmail}}
+        <span v-text="info.userEmail"></span>
       </div>
     </div>
   </div>
@@ -37,25 +37,28 @@
     height: 3.5rem;
     padding: 0 .24rem;
     font-size: .28rem;
-    color: #999;
     border-radius: .05rem;
     margin-top: .3rem;
-  .line {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    height: 1.16rem;
-    line-height: 1.16rem;
-    border-bottom: .01rem solid #d9d9d9;
-  &:last-child {
-     border-bottom: none;
-   }
-  span {
-    margin-left: .56rem;
-    display: inline-block;
-    width: 1.2rem;
-    text-align: right;
-  }
-  }
+    .line {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      height: 1.16rem;
+      line-height: 1.16rem;
+      border-bottom: .01rem solid #d9d9d9;
+      &:last-child {
+         border-bottom: none;
+       }
+      span {
+        margin-left: .56rem;
+        display: inline-block;
+        width: 1.2rem;
+        color:#666;
+        &:first-child{
+          color:#226ce7;
+          text-align: right;
+        }
+      }
+    }
   }
 </style>

components/mobile/user/Info.vue

@@ -15,18 +15,16 @@
         <span><i class="iconfont icon-yonghuming"></i>用户名：</span>
         <span class="describe">{{info.userName}}</span>
       </div>
-      <!--<div class="line" @click="jumpSet('email')">-->
-      <div class="line">
+      <div class="line" @click="jumpSet('email')">
         <span><i class="iconfont icon-youxiang"></i>邮箱：</span>
         <span class="describe">{{info.userEmail}}
-        <!--<i class="iconfont icon-xiangyou"></i>-->
+        <i class="iconfont icon-xiangyou"></i>
         </span>
       </div>
-      <!--<div class="line" @click="jumpSet('mobile')">-->
-      <div class="line">
+      <div class="line" @click="jumpSet('mobile')">
         <span><i class="iconfont icon-shouji"></i>手机：</span>
         <span class="describe">{{info.userTel}}
-        <!--<i class="iconfont icon-xiangyou"></i>-->
+        <i class="iconfont icon-xiangyou"></i>
         </span>
       </div>
     </div>
@@ -76,14 +74,14 @@
               }
             })
         }
+      },
+      jumpSet (info) {
+        if (info === 'email') {
+          window.location.href = decodeURIComponent(this.getEmail)
+        } else if (info === 'mobile') {
+          window.location.href = decodeURIComponent(this.getMobile)
+        }
       }
-      // jumpSet (info) {
-      //   if (info === 'email') {
-      //     window.location.herf = decodeURIComponent(this.getEmail)
-      //   } else if (info === 'mobile') {
-      //     window.location.herf = decodeURIComponent(this.getMobile)
-      //   }
-      // }
     }
   }
 </script>
@@ -123,7 +121,7 @@
       span{
         display: inline-block;
         font-size: 0.28rem;
-        color: #999;
+        color: #226ce7;
         text-align: left;
         i{
           margin-right: .15rem;

components/supplier/details.vue

@@ -5,9 +5,9 @@
         <div class="container">
           <div class="menu-com row">
             <div class="menu-title col-md-12">
-              <a href="/">首页 ></a>
-              <a href="/supplier">供应商资源 ></a>
-              <a :href="'/supplier/' + uuid">供应商物料库 ></a>
+              <nuxt-link to="/">首页 ></nuxt-link>
+              <nuxt-link to="/supplier">供应商资源 ></nuxt-link>
+              <nuxt-link :to="'/supplier/' + uuid">供应商物料库 ></nuxt-link>
               <span>物料详情</span>
             </div>
           </div>

components/supplier/resource.vue

@@ -5,8 +5,8 @@
       <div class="container">
         <div class="menu-com row">
           <div class="menu-title col-md-12">
-            <a href="/">首页 ></a>
-            <a href="/supplier">供应商资源 ></a>
+            <nuxt-link to="/">首页 ></nuxt-link>
+            <nuxt-link to="/supplier">供应商资源 ></nuxt-link>
             <span>供应商物料库</span>
           </div>
         </div>

nuxt.config.js

@@ -10,6 +10,8 @@ const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-produ
 const cmsUrl = process.env.CMS_URL || (isProdMode ? 'https://cms.usoftmall.com' : 'https://cms.usoftmall.com')
 // 消息
 const messageUrl = process.env.MESSAGE_URL || (isProdMode ? 'https://api-message.ubtob.com/' : 'http://192.168.253.6:24000/message')
+// 帐户中心
+// const ssoUrl = process.env.ssoUrl || (isProdMode ? 'https://sso.ubtob.com/' : 'http://192.168.253.6:32323/')
 
 module.exports = {
   router: {
@@ -95,6 +97,7 @@ module.exports = {
     materialUrl,
     cmsUrl,
     messageUrl
+    // ssoUrl
   },
   plugins: [
     {
@@ -191,5 +194,7 @@ module.exports = {
     '/cmsApi**': cmsUrl,
     '/mEmail/**': baseUrl,
     '/mPhone/**': baseUrl
+    // 帐套切换
+    // '/sso/**': ssoUrl
   }
 }

pages/mobile/user/enterpriseinfo.vue

@@ -524,7 +524,7 @@
       padding: 0 0.24rem;
       border-bottom: 0.01rem solid #d9d9d9;
       .pull-right {
-        color: #999;
+        color: #666;
         font-size: 0.26rem;
         img {
           width: 0.34rem;
@@ -551,7 +551,7 @@
         }
         &.noupdate {
           background: #fafafa;
-          color: #999;
+          color: #666;
         }
       }
       .name {
@@ -560,10 +560,6 @@
         color: #226ce7;
       }
       &.no-edit {
-        color: #999;
-        .name {
-          color: #999;
-        }
         li:last-child {
           border-bottom: none;
         }

pages/mobile/user/index.vue

@@ -138,6 +138,10 @@
             })
           })
         })
+        // 切换帐套用
+        // this.$jsonp(`/sso/login/change/userspace?spaceUU=${en.uu}`, {timeout: 5000, name: 'successCallback'}, (res) => {
+        //   console.log(res.data)
+        // })
       },
       logout () {
         this.$http.get('/logout/crossBefore', {params: {returnUrl: window.location.protocol + '//' + window.location.host}}).then(response => {
@@ -196,6 +200,7 @@
       background: #fff;
       line-height: 1.17rem;
       font-size: .28rem;
+      color:#666;
       padding: 0 .24rem 0 .26rem;
       width: 7.1rem;
       margin: .3rem auto 0;

pages/mobile/user/storeinfo.vue

@@ -476,7 +476,7 @@
     line-height: 0.8rem;
     border-bottom: 0.01rem solid #d9d9d9;
     .pull-right {
-      color: #999;
+      color: #666;
       font-size: 0.26rem;
       img {
         width: 0.34rem;
@@ -534,7 +534,7 @@
       }
       &.noupdate {
         background: #fafafa;
-        color: #999;
+        color: #666;
       }
     }
     .name {
@@ -543,7 +543,7 @@
       color: #226ce7;
     }
     &.no-edit {
-      color: #999;
+      color: #666;
       .name {
         color: #226ce7;
       }

plugins/axios.js

@@ -22,6 +22,8 @@ service.interceptors.request.use(config => {
       config.url = process.env.messageUrl + config.url
     } else if (config.url.indexOf('/cmsApi') === 0) {
       config.url = process.env.cmsUrl + config.url
+    // } else if (config.url.indexOf('/sso') === 0) {
+    //   config.url = process.env.ssoUrl + config.url
     } else {
       config.url = process.env.baseUrl + config.url
     }