Merge branch 'feature-201815-wangcz' into dev

# Conflicts:
#	components/mobile/user/Admin.vue
#	components/mobile/user/Info.vue

components/default/Header.vue

@@ -53,6 +53,7 @@
             <a class="item" :href="url + '/vendor'">卖家中心</a>-->
             <a class="item" href="/user#/index">买家中心</a>
             <a class="item" @click="toVendor">卖家中心</a>
+            <a class="item" href="/sso#/index">帐户中心</a>
           </template>
           <template v-else>
             <a class="item" @click="onLoginClick()">登录</a>

components/mobile/user/Admin.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mobile-fix-content">
+  <div class="mobile-fix-content admin-info">
     <div class="info">
       <div class="line">
         <span>用户名：</span>
@@ -30,33 +30,35 @@
   .mobile-fix-content {
     background: #f1f3f6;
   }
-  .info {
-    width: 7.1rem;
-    background: #fff;
-    margin: 0 auto;
-    height: 3.5rem;
-    padding: 0 .24rem;
-    font-size: .28rem;
-    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;
-        color:#666;
-        &:first-child{
-          color:#226ce7;
-          text-align: right;
+  .admin-info {
+    .info {
+      width: 7.1rem;
+      background: #fff;
+      margin: 0 auto;
+      height: 3.5rem;
+      padding: 0 .24rem;
+      font-size: .28rem;
+      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;
+          color:#666;
+          &:first-child{
+            color:#226ce7;
+            text-align: right;
+          }
         }
       }
     }

components/mobile/user/Info.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mobile-fix-content">
+  <div class="mobile-fix-content user-info">
     <div class="info">
       <div class="line">
         <input type="file"
@@ -89,6 +89,13 @@
           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>
@@ -96,58 +103,60 @@
   .mobile-fix-content {
     background: #f1f3f6;
   }
-  .info {
-    width: 7.1rem;
-    background: #fff;
-    margin: 0 auto;
-    height: 4.66rem;
-    padding: 0 .24rem;
-    font-size: .28rem;
-    color: #999;
-    border-radius: .05rem;
-    margin-top: .3rem;
-    .line {
-      position: relative;
-      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;
-      }
-      input{
-        position: absolute;
-        top: 0;
-        left: 0;
+  .user-info {
+    .info {
+      width: 7.1rem;
+      background: #fff;
+      margin: 0 auto;
+      height: 4.66rem;
+      padding: 0 .24rem;
+      font-size: .28rem;
+      color: #999;
+      border-radius: .05rem;
+      margin-top: .3rem;
+      .line {
+        position: relative;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         height: 1.16rem;
-        width: 100%;
-        opacity: 0;
-      }
-      span{
-        display: inline-block;
-        font-size: 0.28rem;
-        color: #226ce7;
-        text-align: left;
-        i{
-          margin-right: .15rem;
-          font-size: .3rem;
-          color: #f8953c;
+        line-height: 1.16rem;
+        border-bottom: .01rem solid #d9d9d9;
+        &:last-child {
+          border-bottom: none;
         }
-      }
-      span.describe {
-        float: right;
-        color: #333;
-        i{
-          margin: 0 0 0 .1rem;
-          font-size: .24rem;
-          color: #bebebe;
+        input{
+          position: absolute;
+          top: 0;
+          left: 0;
+          height: 1.16rem;
+          width: 100%;
+          opacity: 0;
         }
-        img{
-          width: .58rem;
-          height: .58rem;
-          /*border: 1px solid #bebebe;*/
+        span{
+          display: inline-block;
+          font-size: 0.28rem;
+          color: #226ce7;
+          text-align: left;
+          i{
+            margin-right: .15rem;
+            font-size: .3rem;
+            color: #f8953c;
+          }
+        }
+        span.describe {
+          float: right;
+          color: #333;
+          i{
+            margin: 0 0 0 .1rem;
+            font-size: .24rem;
+            color: #bebebe;
+          }
+          img{
+            width: .58rem;
+            height: .58rem;
+            /*border: 1px solid #bebebe;*/
+          }
         }
       }
     }

nuxt.config.js

@@ -194,7 +194,6 @@ module.exports = {
     '/cmsApi**': cmsUrl,
     '/mEmail/**': baseUrl,
     '/mPhone/**': baseUrl,
-    // 帐套切换
-    '/sso/**': ssoUrl
+    '/sso**': baseUrl
   }
 }