Merge remote-tracking branch 'origin/master'

components/applyPurchase/ApplyInfo.vue

@@ -16,7 +16,7 @@
             <i class=" fa fa-long-arrow-down" :class="{active: sorting.releaseDate == 'DESC'}"></i>
           </a>-->
         </span>
-        <span class="list-title-item">数目/品牌</span>
+        <span class="list-title-item">类目/品牌</span>
         <span class="list-title-item">型号/规格</span>
         <span class="list-title-item">采购数量(PCS)</span>
         <span class="list-title-item">已报价

components/applyPurchase/BatchPublish.vue

@@ -11,7 +11,7 @@
           <!--<label for="all"></label>-->
           <!--</label>全选-->
           <!--</th>-->
-          <th width="307">数目/品牌</th>
+          <th width="307">类目/品牌</th>
           <th width="307">型号/规格</th>
           <th width="95">采购数量(PCS)</th>
           <!--<th width="114">生产日期</th>-->
@@ -1136,6 +1136,7 @@
                   }
                   .pi-title {
                     display: inline-block;
+                    vertical-align: middle;
                     text-align: right;
                     color: #999;
                     .red-text {

components/mobile/MobileFooter.vue

@@ -104,7 +104,7 @@
       },
       goWithLogin: function (url, isSelf) { // 是否拦截个人
         if (this.user.logged) {
-          if (isSelf && !this.user.data.enterprise.uu) {
+          if (isSelf && (!this.user.data.enterprise.uu || this.user.data.enterprise.isVendor !== 313)) {
             this.onRemind('请先前往pc端开通卖家中心')
           } else {
             this.$router.push(url)

pages/mobile/center/index.vue

@@ -439,7 +439,7 @@
     watch: {
       '$route.query': {
         handler: function (val, old) {
-//          this.switchSeek('wait')
+          this.switchSeek('wait')
           if (val.type === 'saler' && !this.shopuuid.uuid) {
             this.$store.dispatch('loadStoreStatus', { op: 'check' })
           }