Merge remote-tracking branch 'origin/release-wangcz-201814' into release-wangcz-201814

# Conflicts:
#	components/brandCenter/BrandIndex.vue

components/brandCenter/BrandIndex.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="brand-center-index" @click="showSimilarWord = false">
+  <div class="brand-center-index" id="index" @click="showSimilarWord = false">
     <img src="/images/brandCenter/brand-index-title1.png" alt="">
     <div class="brand-index-tab">
       <div class="brand-index-group" v-for="(indexGroup, index) in indexGroups">
@@ -209,6 +209,8 @@
             this.reloadData()
           } else {
             this.$router.push('/product/brand/brandList/' + index)
+//            window.location.href = '/product/brand/brandList/' + index + '#index'
+//            window.open('/product/brand/brandList/' + index + '#index', '_self')
           }
         },
         goBrandApply: function () {
@@ -388,6 +390,18 @@
       .brand-list-nav {
         height: 56px;
         padding-top: 8px;
+        position: relative;
+        &::after{
+          content: '';
+          height: 25px;
+          width: 1px;
+          position: absolute;
+          display: block;
+          border-left: 1px solid #c6c6c6;
+          top: 21px;
+          right: 192px;
+          z-index: 1000;
+        }
         .filter-area {
           float: right;
           height: 50px;

components/btbBusiness/features.vue

@@ -41,9 +41,6 @@
         }, {
           illustrationF: ' 全智能的',
           illustrationS: '交易平台'
-        }, {
-          illustrationF: '平台用户的链式',
-          illustrationS: '反应式发展'
         }],
         timerIndex: 0,
         isTop: false
@@ -169,7 +166,7 @@
 
       }
       .content{
-        width: 1140px;
+        width: 1000px;
         height: 228px;
         margin: 0 auto;
         padding-left: 3px;
@@ -177,8 +174,8 @@
           float: left;
           height: 228px;
           width: 165px;
-          margin-right: 29px;
-          &:nth-child(6){
+          margin-right: 42px;
+          &:nth-child(5){
             margin-right: 0px;
           }
           &:nth-child(2), &:nth-child(4), &:nth-child(6){

components/mobile/register-saler/register/StepFirst.vue

@@ -9,7 +9,7 @@
       <div class="">
         <label class="col-sm-2 mobile-x-required">企业名称：</label>
         <div class="col-sm-5 mobile-x-input-kuang">
-          <input :class="!validName.isValidTypeName || !validName.isValidName?'form-control error-box-border':'form-control'" type="text" @input="nameTypeCheck()" :disabled="!loginData.isSelf" v-model="data.name" name="name" required="" placeholder="填写营业执照上的企业名称">
+          <input :class="!validName.isValidTypeName || !validName.isValidName?'form-control error-box-border':'form-control'" type="text" @input="nameTypeCheck()" @change="nameCheck(3)" :disabled="!loginData.isSelf" v-model="data.name" name="name" required="" placeholder="填写营业执照上的企业名称">
           <div class="mobile-x-text-help" v-show="validName.isValidTypeName && validName.isValidName && !validName.init">
             <i class="glyphicon glyphicon-ok x-icon-left"></i>
           </div>
@@ -266,46 +266,46 @@
         this.data.address = val.address || val.enAddress || ''
       },
       sectionChange: function (type) {
-        this.nameCheck(3, () => {
-          if (!this.isValid) {
-            // this.nameCheck(3)
-            if (!this.validName.isValidName) {
-              this.showBangdingPage = true
-            } else {
-              this.timeoutCount++
-              this.collectResult = '请填写正确的注册信息'
-            }
-            // this.$message.error('请填写正确的注册信息')
+        // this.nameCheck(3, () => {
+        if (!this.isValid) {
+          // this.nameCheck(3)
+          if (!this.validName.isValidName) {
+            this.showBangdingPage = true
           } else {
-            if (this.enterpriseData.uu) {
-              this.enCheckFullData()
-            } else {
-              this.checkFullData()
-            }
-            let enterprise = this.data
-  //          enterprise.tagsData = enterprise.tagsData.toString()
-  //          if (typeof this.data.tagsData === 'string') {
-  //            this.data.tagsData = this.data.tagsData.split(',')
-  //          }
-            let data = {}
-            data.enterprise = enterprise
-            data.isValidRegister = this.isValid
-  //          data.url = this.data.url
-            enterprise.enIsRead = false
-  //          enterprise.enBussinessCodeImage = this.data.url
-            // 个人用户，提交保存缓存企业信息
-            if (this.loginData.isSelf) {
-              this.$http.post('/basic/user/userCacheEnterprise', enterprise)
-              this.$emit('isSelfCacheDataAction', enterprise)
-            } else { // 企业用户，更新当前企业信息，主要是更新企业地址
-              this.enterpriseData.enAddress = this.data.address
-              this.$http.post('/basic/enterprise/' + this.enterpriseData.uu + '/updateInfo', this.enterpriseData)
-            }
-            this.$emit('registerAction', data)
-            this.$emit('sectionEvent', type)
-  //          this.$emit('businessImgUrlAction', this.data.url)
+            this.timeoutCount++
+            this.collectResult = '请填写正确的注册信息'
           }
-        })
+          // this.$message.error('请填写正确的注册信息')
+        } else {
+          if (this.enterpriseData.uu) {
+            this.enCheckFullData()
+          } else {
+            this.checkFullData()
+          }
+          let enterprise = this.data
+//          enterprise.tagsData = enterprise.tagsData.toString()
+//          if (typeof this.data.tagsData === 'string') {
+//            this.data.tagsData = this.data.tagsData.split(',')
+//          }
+          let data = {}
+          data.enterprise = enterprise
+          data.isValidRegister = this.isValid
+//          data.url = this.data.url
+          enterprise.enIsRead = false
+//          enterprise.enBussinessCodeImage = this.data.url
+          // 个人用户，提交保存缓存企业信息
+          if (this.loginData.isSelf) {
+            this.$http.post('/basic/user/userCacheEnterprise', enterprise)
+            this.$emit('isSelfCacheDataAction', enterprise)
+          } else { // 企业用户，更新当前企业信息，主要是更新企业地址
+            this.enterpriseData.enAddress = this.data.address
+            this.$http.post('/basic/enterprise/' + this.enterpriseData.uu + '/updateInfo', this.enterpriseData)
+          }
+          this.$emit('registerAction', data)
+          this.$emit('sectionEvent', type)
+//          this.$emit('businessImgUrlAction', this.data.url)
+        }
+        // })
       },
 //      upload: function (e) {
 //        let file = e.target.files[0]
@@ -402,7 +402,7 @@
         this.validName.init = false
       },
       // 企业名称是否已存在验证
-      nameCheck: function (num, cb) {
+      nameCheck: function (num) {
         if (num > 0) {
           this.$http.post('/basic/enterprise/register/valid/name?name=' + this.data.name)
             .then(response => {
@@ -410,7 +410,7 @@
                 this.validName.init = false
                 this.validName.isValidName = response.data.success
                 this.validCheck()
-                cb && cb()
+                // cb && cb()
               } else {
                 this.nameCheck(num - 1)
               }

components/mobile/register-saler/register/StepSecond.vue

@@ -19,7 +19,7 @@
             《优软商城买卖条例》</a>
           </div>
         </div>
-        <div class="row next-btn step-two-btn" style="">
+        <div class="row next-btn step-two-btn" style="padding-top: 0px;">
           <button @click="sectionChange(1)" class="btn">不同意</button>
           <button @click="sectionChange(3)" class="btn" :style="!checkData.checked ? 'opacity: 1;':''">同意</button>
         </div>
@@ -113,8 +113,8 @@
   .mobile-join_xieyi .ql-editor br {
     display: none;
   }
-  .mobile-join_xieyi .ql-editor {
-    padding: 0 5px;
+  .mobile-join_xieyi .ql-container.ql-snow .ql-editor {
+    padding: 0 5px !important;
   }
  /* .join_xieyi .ql-editor p {
     width: 494px;

components/mobile/register-saler/register/StepThird.vue

@@ -18,7 +18,7 @@
       <!--</label>-->
     <!--</div>-->
     <!--导入店铺模板-->
-    <div class="vendor_store_apply" v-show="selectFlag == 'open'">
+    <div class="mobile-vendor_store_apply" v-show="selectFlag == 'open'">
         <div>
           <!-- Nav tabs -->
           <ul class="nav nav-tabs" v-show="false">

components/product/brand/BrandDetail.vue

@@ -18,7 +18,7 @@
           应用领域：<span v-for="(item, index) in applications"><span>{{item}}</span><span v-show="index+1 < applications.length">|</span></span>
         </li>
         <li class="brand-description" v-if="list.brief"><span>品牌介绍：</span><div class="txt-description">{{list.brief | briefFilter}}</div></li>
-        <li style="margin-top: 10px;color:#eb062b;" v-show="list.url"><span style="color:#666;">官网地址：</span><a class="office-address" :href="list.url">{{list.url}}</a></li>
+        <li style="margin-top: 10px;color:#eb062b;" v-show="list.url"><span style="color:#666;">官网地址：</span><a class="office-address" :href="list.url" target="_blank">{{list.url}}</a></li>
         </ul>
       </div>
     </div>
@@ -132,9 +132,10 @@
           font-size: 20px;
           color: #eb062b;
           padding: 30px 0px 0px 30px;
-          border-left: 2px solid #efefef;
-          border-right: 2px solid #efefef;
-          border-bottom: 3px solid #efefef;
+          border-left: 1px solid #efefef;
+          border-right: 1px solid #efefef;
+          border-bottom: 1px solid #efefef;
+          /*box-shadow: 2px 0px 1px #d9d9d9, -2px 0px 1px #d9d9d9, 0px 2px 1px #d9d9d9, 0px -2px 1px #d9d9d9;*/
           li {
             color: #666;
             font-size: 14px;

components/search/GoodList.vue

@@ -59,7 +59,7 @@
             <!--<nuxt-link class="component-img-box" :to="item.batchCode?`/store/${item.storeId}/${item.batchCode}`:`/product/component/${item.uuid}`">-->
               <!--&lt;!&ndash;          <img :src="item.img?item.img:item.brand&&item.brand.logoUrl?item.brand.logoUrl:'/images/component/default.png'">&ndash;&gt;-->
               <!--<img class="component-img" :src="item.batchCode?item.img?item.img:'/images/component/default.png':item.brand&&item.brand.logoUrl?item.brand.logoUrl:'/images/component/default.png'">-->
-              <!--<img v-if="item.status === 602" class="sellout-flag" src="/images/search/sellout-search.png" alt="">-->
+              <!--<img v-if="item.status === 602" class="sellout-flag" src="/images/search/sellsearch-btn1.png.png" alt="">-->
             <!--</nuxt-link>-->
           <!--</td>-->
             <td class="brand-code">

components/store/home/CommodityList.vue

@@ -612,6 +612,7 @@
 
   #goods-list-fragment .brand-code .code {
     font-weight: 600;
+    word-break: break-all;
   }
   #goods-list-fragment .brand-code .spec {
     word-break: break-all;
@@ -715,18 +716,20 @@
     background-color: #ffa422;
     color: #fff;
     width: 80px;
-    height: 30px;
+    height: 24px;
     font-size: 12px;
     border: 1px solid #ffa422;
+    border-radius: 2px;
   }
 
   #goods-list-fragment .btn-add-cart {
     margin-top: 10px;
     color: #3b7cf4;
     width: 80px;
-    height: 30px;
+    height: 24px;
     font-size: 12px;
     background-color: #fff;
+    border-radius: 2px;
     border: 1px solid #3b7cf4;
   }
   #goods-list-fragment .btn-buy-now:hover{

components/store/home/EnterpriseInfo.vue

@@ -294,13 +294,15 @@
                 margin:10px 0px;
               }
               p {
-                margin: -15px 0px 0px 15px;
+                margin: -7px 0px 0px 15px;
                 text-indent: 2em;
                 overflow-y: auto;
                 overflow-x: hidden;
                 width: 200px;
                 line-height: 19px;
                 max-height: 153px;
+                word-break:break-all;
+                word-wrap:break-word;
               }
               .empty-introduce{
                 text-align: center;

components/store/home/RecommendList.vue

@@ -363,7 +363,7 @@
     &:hover{
       box-shadow: 2px 0px 1px #d9d9d9, -2px 0px 1px #d9d9d9, 0px 2px 1px #d9d9d9, 0px -2px 1px #d9d9d9;
       .enter-store {
-        top: 140px;
+        top: 132px;
         left: 0px;
         transition: all .3s linear;
       }

components/store/home/StoreBanner.vue

@@ -13,8 +13,10 @@
           <p class="shop-name" v-if="storeInfo.storeName">{{storeInfo.storeName | nameFilter}}</p>
           <p class="shop-name" v-else></p>
           <div class="enter-store">
-            <a v-if="isFocus == 'false' || typeof isFocus == 'object'" @click="focus(storeInfo.id, storeInfo.storeName)">关注店铺</a>
-            <a v-if="isFocus == 'true'" class="focus">已关注</a>
+            <!--<a v-if="isFocus == 'false' || typeof isFocus == 'object'" @click="focus(storeInfo.id, storeInfo.storeName)">关注店铺</a>-->
+            <!--<a v-if="isFocus == 'true'" class="focus">已关注</a>-->
+            <a v-if="isFocus == 'false' || typeof isFocus == 'object'" @click="focusStore(storeInfo, $event)">关注店铺</a>
+            <a v-if="isFocus == 'true'" class="focus" @click="focusStore(storeInfo, $event)">已关注</a>
             <a @click="goLink()">联系卖家</a>
           </div>
           <div class="share">
@@ -47,6 +49,18 @@
           </button>
         </div>
       </el-dialog>
+      <el-dialog
+        :visible.sync="dialogInvisible"
+        size="tiny"
+      >
+        <h3 class="header-text">关注取消！</h3>
+        <div class="focus modal-body">
+          <button type="button" @click="dialogInvisible = false" class="btn" style="margin-left:25px;">关&nbsp;&nbsp;闭</button>
+          <button type="button" @click="dialogInvisible = false" class="focus-btn btn btn btn-info" style="margin-left:35px;">
+            <a href="/user#/storeFocus" target="_blank">查看我的店铺关注</a>
+          </button>
+        </div>
+      </el-dialog>
       <link-saler-box
         :tel="tel"
         v-if="showLinkBox"
@@ -65,6 +79,7 @@ export default {
   data () {
     return {
       dialogVisible: false,
+      dialogInvisible: false,
       showShare: false,
       clipboard: {},
       showLinkBox: false,
@@ -105,19 +120,42 @@ export default {
       this.showShare = flag
       this.showCate = flag
     },
-    focus (id, name) {
-      if (!this.user.logged) {
+    focusStore: function (item) {
+      if (this.user.logged) {
+        if (this.isFocus === 'false' || typeof isFocus === 'object') {
+          this.dialogVisible = true
+          this.$store.dispatch('shop/StoreFocus', {storeName: item.storeName, storeid: item.id})
+          this.isFocus = 'true'
+        } else {
+          this.$http.post('/trade/storeFocus/delete/storeId', [item.id])
+            .then(response => {
+              this.dialogInvisible = true
+//              alert(this.isFocus)
+              this.isFocus = 'false'
+//              alert(this.isFocus)
+            })
+        }
+      } else {
         this.$http.get('/login/page', {params: {returnUrl: window.location.href}}).then(response => {
           if (response.data) {
             window.location.href = response.data.content + '&baseUrl=' + encodeURIComponent(window.location.protocol + '//' + window.location.host + response.data.baseUrl)
           }
         })
-      } else {
-        this.dialogVisible = true
-        this.$store.dispatch('shop/StoreFocus', {storeName: name, storeid: id})
-        this.isFocus = true
       }
     },
+//    focus (id, name) {
+//      if (!this.user.logged) {
+//        this.$http.get('/login/page', {params: {returnUrl: window.location.href}}).then(response => {
+//          if (response.data) {
+//            window.location.href = response.data.content + '&baseUrl=' + encodeURIComponent(window.location.protocol + '//' + window.location.host + response.data.baseUrl)
+//          }
+//        })
+//      } else {
+//        this.dialogVisible = true
+//        this.$store.dispatch('shop/StoreFocus', {storeName: name, storeid: id})
+//        this.isFocus = true
+//      }
+//    },
     goLink: function () {
       this.baseUtils.goLinkUser(this, this.storeInfo.enUU)
     }

middleware/authenticated.js

@@ -1,6 +1,6 @@
-export default function ({ isServer, store, req, redirect, route }) {
+export default function ({ store, req, redirect, route }) {
   // If nuxt generate, pass this middleware
-  if (isServer && !req) return
+  if (process.server && !req) return
   if (!store.state.option.user.logged) {
     let ua = store.state.option.userAgent.toLowerCase()
     if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === 'micromessenger' && req.url.indexOf('?code') === -1) {

middleware/check-auth.js

@@ -1,9 +1,9 @@
 import { getAuthInfo } from '~/utils/client-auth'
 
-export default function ({ isServer, store, req }) {
+export default function ({ store, req }) {
   // If nuxt generate, pass this middleware
-  if (isServer && !req) return
-  if (isServer) {
+  if (process.server && !req) return
+  if (process.server) {
     store.dispatch('loadUserInfo')
   } else {
     getAuthInfo()

middleware/wechatInfo.js

@@ -1,6 +1,6 @@
-export default function ({ isServer, store, req, redirect, route }) {
-  if (isServer && !req) return
-  if (isServer) return
+export default function ({ store, req, redirect, route }) {
+  if (process.server && !req) return
+  if (process.server) return
   // nuxt拦截器 存在一个问题，如果进入到了判断的地方，一定需要做跳转路由相关操作，不然会出现404
   //  && window.__wxjs_environment !== 'miniprogram'
   if (!store.state.option.wechatInfo.data.openid) {

nuxt.config.js

@@ -46,7 +46,7 @@ module.exports = {
     ** Run ESLINT on save
     */
     extractCSS: { allChunks: true },
-    extend(config, { isDev, isClient, isServer }) {
+    extend(config, { isDev }) {
       config.resolve.alias['~utils'] = path.join(__dirname, 'utils')
       config.resolve.alias['~components'] = path.join(__dirname, 'components')
       config.resolve.alias['~plugins'] = path.join(__dirname, 'plugins')
@@ -57,7 +57,7 @@ module.exports = {
       //   loader: 'style-loader!css-loader!sass-loader'
       // })
 
-      if (isClient) {
+      if (process.client) {
         config.module.rules.push({
           enforce: 'pre',
           test: /\.(js|vue)$/,

pages/mobile/store/index.vue

@@ -180,6 +180,8 @@
     letter-spacing: 4px;
     background: #fff;
     color: #3f84f6;
+    margin-right: 0px;
+    border: 0px;
   }
   .no-apply{
     width: 150px;
@@ -343,90 +345,90 @@
     height: 120px;
     top: 69px;
   }
-  .mobile-tab-list div.vendor_store_apply {
+  .mobile-tab-list div.mobile-vendor_store_apply {
     background-color: #f1f3f6;
   }
 
 
-  .mobile-tab-list div.vendor_store_apply .title_row {
+  .mobile-tab-list div.mobile-vendor_store_apply .title_row {
     margin-bottom: 20px;
     border-bottom: #e8e8e8 1px solid;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col {
     margin: 0.2rem;
     border-radius: 5px;
     border: 1px solid #d3d3d3;
     background: #fff;
     padding: 0 0 0.2rem 0;
   }
-  .mobile-tab-list div.vendor_store_apply .infoTextMobile {
+  .mobile-tab-list div.mobile-vendor_store_apply .infoTextMobile {
     color: #999;
     font-size: 0.28rem
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col img.previewImage {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col img.previewImage {
     width: 100%;
     cursor: pointer;
     /*padding: 0 30px;*/
   }
 
-  .mobile-tab-list div.vendor_store_apply .row h2 {
+  .mobile-tab-list div.mobile-vendor_store_apply .row h2 {
     padding: 10px 0;
     font-size: 16px;
     font-weight: 500;
     color: #000000;
   }
 
-  .mobile-tab-list div.vendor_store_apply .row span {
+  .mobile-tab-list div.mobile-vendor_store_apply .row span {
     /*display: block;*/
     /*padding: 10px 0;*/
     font-size: 14px;
     color: #000000;
   }
-  .mobile-tab-list div.vendor_store_apply .mobile-register-brand-name {
+  .mobile-tab-list div.mobile-vendor_store_apply .mobile-register-brand-name {
     font-size: 0.28rem;
     color: #226ce7;
     border-bottom: 1px solid #d3d3d3;
   }
-  .mobile-tab-list div.vendor_store_apply .mobile-register-brand-name input {
+  .mobile-tab-list div.mobile-vendor_store_apply .mobile-register-brand-name input {
     font-size: 0.28rem;
     color: #999;
     width: 5rem;
   }
 
-  .mobile-tab-list div.vendor_store_apply #file_upload {
+  .mobile-tab-list div.mobile-vendor_store_apply #file_upload {
     width: 100px;
     height: 100px;
     border:1px solid #CDCDCD;
     /*background: url("static/img/vendor/images/upload.png");*/
   }
 
-  .mobile-tab-list div.vendor_store_apply #upload_qualification {
+  .mobile-tab-list div.mobile-vendor_store_apply #upload_qualification {
     width: 100px;
     height: 100px;
     opacity: 0;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_tab {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_tab {
     margin: 0 15px;
     width: 90px;
     text-align: center;
   }
 
-  .mobile-tab-list div.vendor_store_apply .nav li.custom_tab.active>a,
-  .mobile-tab-list div.vendor_store_apply .nav li.custom_tab.active>a:focus,
-  .mobile-tab-list div.vendor_store_apply .nav li.custom_tab.active>a:hover {
+  .mobile-tab-list div.mobile-vendor_store_apply .nav li.custom_tab.active>a,
+  .mobile-tab-list div.mobile-vendor_store_apply .nav li.custom_tab.active>a:focus,
+  .mobile-tab-list div.mobile-vendor_store_apply .nav li.custom_tab.active>a:hover {
     border: 1px solid #5078CB;
     border-bottom-color: transparent;
     color: #5078cb;
   }
 
-  .mobile-tab-list div.vendor_store_apply .uploadify-button {
+  .mobile-tab-list div.mobile-vendor_store_apply .uploadify-button {
     display: block;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area {
     height: 1.09rem;
     position: relative;
     overflow: hidden;
@@ -443,20 +445,20 @@
     border-radius: 0;
     color: #333;
   }
-  .mobile-tab-list div.vendor_store_apply .btn-primary{
+  .mobile-tab-list div.mobile-vendor_store_apply .btn-primary{
     background: #5078cb;
     border-radius: 0;
   }
-  .mobile-tab-list div.vendor_store_apply .btn-primary:hover{
+  .mobile-tab-list div.mobile-vendor_store_apply .btn-primary:hover{
     background: #3f7ae3;
   }
-  .mobile-tab-list div.vendor_store_apply .com_row .col-md-2{
+  .mobile-tab-list div.mobile-vendor_store_apply .com_row .col-md-2{
     width: 120px;
   }
-  .mobile-tab-list div.vendor_store_apply .com_row .col-md-10 span{
+  .mobile-tab-list div.mobile-vendor_store_apply .com_row .col-md-10 span{
     color: #666;
   }
-  .mobile-tab-list div.vendor_store_apply .brand-small-upload {margin-top:0.2rem;}
+  .mobile-tab-list div.mobile-vendor_store_apply .brand-small-upload {margin-top:0.2rem;}
   /*修改的样式*/
   .hover-show{
     position: absolute;
@@ -466,7 +468,7 @@
     left: 0;
     background: rgba(0,0,0,.5);
   }
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area .hover-show{
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area .hover-show{
     top: 0;
   }
   .mobile-tab-list .hover-show .delete{
@@ -701,10 +703,10 @@
     display: none;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area:hover .hoverShow{
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area:hover .hoverShow{
     display: block;
   }
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area .deleteImg{
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area .deleteImg{
     position: absolute;
     right: 7px;
     top: 0;

pages/mobile/user/index.vue

@@ -132,6 +132,9 @@
           this.$store.dispatch('loadUserInfo').then(() => {
             this.showLogin = false
             this.$store.dispatch('loadStoreStatus', {op: 'check'})
+            this.$http.get('/store-service/applications?status=normal').then(res => {
+              this.applyStatus = res.data.data.status
+            })
           })
         })
       },

pages/product/brand/_code.vue

@@ -12,7 +12,7 @@
 <script>
   import { BrandDetail, CategoriesList, BrandComponent } from '~components/product'
   export default {
-    layout: 'main',
+    layout: 'default',
     data () {
       return {
         code: '',

plugins/axios.js

@@ -9,12 +9,11 @@ const service = axios.create({
 
 let reqCount = 0 // 请求计数器
 
-const isServer = typeof window === 'undefined'
 service.interceptors.request.use(config => {
   // is server render, use ${baseUrl} directly rather than ${proxyUrl}
   config.url = config.url || '/'
   reqCount++
-  if (isServer) {
+  if (process.server) {
     if (config.url.indexOf('/inquiry') === 0) {
       config.url = process.env.commonUrl + config.url
     } else if (config.url.indexOf('/productsuer') === 0) {
@@ -59,12 +58,12 @@ service.interceptors.response.use(response => {
       }
     }
   }
-  if (--reqCount <= 0 && !isServer) {
+  if (--reqCount <= 0 && !process.server) {
     document.getElementById('loading').setAttribute('class', 'loading')
   }
   return response
 }, error => {
-  if (--reqCount <= 0 && !isServer) {
+  if (--reqCount <= 0 && !process.server) {
     document.getElementById('loading').setAttribute('class', 'loading')
   }
   return Promise.reject(error)

store/index.js

@@ -25,11 +25,11 @@ function loadBrandComponent({ commit }, params = {}) {
 
 export const actions = {
   // 全局服务初始化
-  nuxtServerInit(store, { params, route, isDev, isServer, req }) {
+  nuxtServerInit(store, { params, route, isDev, req }) {
     // 检查设备类型
-    const userAgent = isServer ? req.headers['user-agent'] : navigator.userAgent
+    const userAgent = process.server ? req.headers['user-agent'] : navigator.userAgent
     const isMobile = /(iPhone|iPad|Opera Mini|Android.*Mobile|NetFront|PSP|BlackBerry|Windows Phone)/ig.test(userAgent)
-    const cookie = isServer ? req.headers['cookie'] : null
+    const cookie = process.server ? req.headers['cookie'] : null
     store.commit('option/SET_MOBILE_LAYOUT', isMobile)
     store.commit('option/SET_USER_AGENT', userAgent)
     store.commit('option/SET_COOKIES', cookie)

store/product.js

@@ -13,9 +13,9 @@ function saveStores ({ commit }, params = {}) {
 
 export const actions = {
   // 全局服务初始化
-  nuxtServerInit (store, { params, route, isServer, req }) {
+  nuxtServerInit (store, { params, route, req }) {
     // 检查设备类型
-    const userAgent = isServer ? req.headers['user-agent'] : navigator.userAgent
+    const userAgent = process.server ? req.headers['user-agent'] : navigator.userAgent
     const isMobile = /(iPhone|iPod|Opera Mini|Android.*Mobile|NetFront|PSP|BlackBerry|Windows Phone)/ig.test(userAgent)
     store.commit('option/SET_MOBILE_LAYOUT', isMobile)
     store.commit('option/SET_USER_AGENT', userAgent)