Merge remote-tracking branch 'origin/feature-201824-wangcz' into feature-201824-wangcz

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

app.html

@@ -6,7 +6,7 @@
   <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" />
   <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/element-ui/1.3.7/theme-default/index.css" />
   <!--<link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_0d1jjt5tukcblnmi.css"/>-->
-  <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_452262_c7tjqxmhqkl.css">
+  <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_452262_218u5ghbpzt.css">
   <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/Swiper/3.4.2/css/swiper.css" />
   <!--<script src="https://wechatfe.github.io/vconsole/lib/vconsole.min.js?v=3.2.0"></script>-->
   {{ HEAD }}

components/mobile/Home.vue

@@ -69,6 +69,12 @@
             <span>品牌墙</span>
           </nuxt-link>
         </li>
+        <li>
+          <a @click="goOpenStoreApply">
+            <img src="/images/mobile/@2x/home/store-into.png" alt="">
+            <span>商家入驻</span>
+          </a>
+        </li>
       </ul>
 
       <div class="display_card">
@@ -300,6 +306,31 @@
         this.page++
         this.isSearchSearchingMore = true
         this.reloadData()
+      },
+      // 商家入驻
+      goOpenStoreApply: function () {
+        if (this.user.logged) {
+          if (this.user.data.enterprise.uu) {
+            if (this.user.data.enterprise.isVendor === 313) {
+              this.$http.get('/basic/vendor/transactionInfo').then(response => {
+                if (response.data.isOpenStore) {
+                  window.location.href = '/mobile/user/storeinfo'
+                } else {
+                  window.location.href = '/mobile/store'
+                }
+              }, err => {
+                this.$message.error('获取开店信息失败')
+                console.log(err)
+              })
+            } else {
+              this.$router.push('/mobile/store')
+            }
+          } else {
+            this.$router.push('/mobile/store/register')
+          }
+        } else {
+          this.login()
+        }
       }
     },
     mounted() {
@@ -449,7 +480,7 @@
       li {
         position: relative;
         display: inline-block;
-        width: 25%;
+        width: 20%;
         text-align: center;
         float: left;
         height: 1.56rem;

components/mobile/user/Info.vue

@@ -17,6 +17,10 @@
         <span><i class="iconfont icon-yonghuming"></i>用户名：</span>
         <span class="describe">{{info.userName}}</span>
       </div>
+      <div class="line">
+        <span><i class="iconfont icon-id"></i>UU号：</span>
+        <span class="describe">{{info.userUU}}</span>
+      </div>
       <div class="line" @click="jumpSet('email')">
         <span><i class="iconfont icon-youxiang"></i>邮箱：</span>
         <span class="describe">{{info.userEmail}}
@@ -103,7 +107,7 @@
       width: 7.1rem;
       background: #fff;
       margin: 0 auto;
-      height: 4.66rem;
+      height: 5.82rem;
       padding: 0 .24rem;
       font-size: .28rem;
       color: #999;
@@ -135,9 +139,15 @@
           text-align: left;
           i{
             margin-right: .15rem;
-            font-size: .3rem;
+            font-size: .38rem;
             color: #f8953c;
           }
+          i.icon-id{
+            font-size: .46rem;
+          }
+          i.icon-tuxiang-{
+            font-size: .32rem;
+          }
         }
         span.describe {
           float: right;