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

components/home/displayCard.vue

@@ -169,28 +169,32 @@
       itemCounts () {
         let arr = []
         let count = this.baseUtils.deepCopy(this.counter)
-        count.forEach((value) => {
-          if (value.usedFor === 'mall_home_banner') {
-            value.type = value.detno === 2 ? 3: 1
-            value.count = this.formatNumber(value.count)
-            arr.push(value)
-          }
-        })
-        arr = arr.sort((a,b) => {return a.detno - b.detno})
-        arr.push({count: this.inquirySheet ? this.inquirySheet : 0, type: 2},
-          {count: this.inquirySheetLast ? this.inquirySheetLast : 0, type: 2})
+        if(count.length){
+          count.forEach((value) => {
+            if (value.usedFor === 'mall_home_banner') {
+              value.type = value.detno === 2 ? 3: 1
+              value.count = this.formatNumber(value.count)
+              arr.push(value)
+            }
+          })
+          arr = arr.sort((a,b) => {return a.detno - b.detno})
+          arr.push({count: this.inquirySheet ? this.inquirySheet : 0, type: 2},
+            {count: this.inquirySheetLast ? this.inquirySheetLast : 0, type: 2})
+        }
         return arr
       },
       counts () {
         let arr = []
         let count = this.baseUtils.deepCopy(this.counter)
-        count.forEach((value) => {
-          if (value.usedFor === 'b2c_index') {
-            value.logo = value.detno === 4 ? 0: 1
-            arr.push(value)
-          }
-        })
-        arr = arr.sort((a,b) => {return a.detno - b.detno})
+        if(count.length) {
+          count.forEach((value) => {
+            if (value.usedFor === 'b2c_index') {
+              value.logo = value.detno === 4 ? 0: 1
+              arr.push(value)
+            }
+          })
+          arr = arr.sort((a,b) => {return a.detno - b.detno})
+        }
         return arr
       }
     }
@@ -199,10 +203,8 @@
 <style lang="scss" scoped>
   .display-card{
     position: fixed;
-    right: 116px;
-    top: 235px;
-    /*width: 180px;*/
-    /*height: 540px;*/
+    right: 56px;
+    top: 182px;
     z-index: 100;
     .cardClose{
       position: absolute;

components/mobile/Home.vue

@@ -44,32 +44,32 @@
         </div>
       </div>
       <ul class="link-list">
-        <li v-bind:class="{'widthActive' : isShowStoreApply}">
+        <li>
           <nuxt-link to="/mobile/supplier">
             <img src="/images/mobile/@2x/home/supplier.png" alt="">
             <span>供应商</span>
           </nuxt-link>
         </li>
-        <li v-bind:class="{'widthActive' : isShowStoreApply}">
+        <li>
           <a @click="goOpportunity">
             <img src="/images/mobile/@2x/home/seek.png" alt="">
             <span>公司商机</span>
           </a>
         </li>
-        <li v-bind:class="{'widthActive' : isShowStoreApply}">
+        <li>
           <nuxt-link to="/mobile/shop">
             <img src="/images/mobile/@2x/home/store.png" alt="">
             <span>店铺列表</span>
             <!-- <i></i>-->
           </nuxt-link>
         </li>
-        <li v-bind:class="{'widthActive' : isShowStoreApply}">
+        <li>
           <nuxt-link to="/mobile/brand/brandCenter/A">
             <img src="/images/mobile/@2x/home/brand.png" alt="">
             <span>品牌墙</span>
           </nuxt-link>
         </li>
-        <li v-bind:class="{'widthActive' : isShowStoreApply}" v-show="isShowStoreApply">
+        <li>
           <a @click="goOpenStoreApply">
             <img src="/images/mobile/@2x/home/store-into.png" alt="">
             <span>商家入驻</span>
@@ -143,8 +143,7 @@
         keyword: '',
         associate: {
           show: false
-        },
-        isShowStoreApply: false
+        }
       }
     },
     components: {
@@ -315,9 +314,9 @@
             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'
+                  window.location.href = '/mobile/user/storeinfo'
                 } else {
-                  this.setRemindText('您的申请已提交，请耐心等待工作人员审核（2-3个工作日）')
+                  this.onRemind('您的申请已提交，请耐心等待工作人员审核（2-3个工作日）')
                 }
               }, err => {
                 this.$message.error('获取开店信息失败')
@@ -332,35 +331,10 @@
         } else {
           this.login()
         }
-      },
-      storeApply: 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) {
-                  this.isShowStoreApply = false
-                } else {
-                  this.isShowStoreApply = true
-                }
-              }, err => {
-                this.$message.error('获取开店信息失败')
-                console.log(err)
-              })
-            } else {
-              this.isShowStoreApply = true
-            }
-          } else {
-            this.isShowStoreApply = true
-          }
-        } else {
-          this.isShowStoreApply = false
-        }
       }
     },
     mounted() {
       this.$nextTick(() => {
-        this.storeApply()
         let ua = this.$store.state.option.userAgent.toLowerCase()
         let info = localStorage.getItem('USOFTMALLWECHATINFO')
         // 如果本地有缓存 则证明存在openid
@@ -506,7 +480,7 @@
       li {
         position: relative;
         display: inline-block;
-        width: 25%;
+        width: 20%;
         text-align: center;
         float: left;
         height: 1.56rem;
@@ -531,9 +505,6 @@
           top: .2rem;
         }
       }
-      li.widthActive{
-        width: 20%;
-      }
     }
   }
 </style>

pages/mobile/center/vendor/seek.vue

@@ -60,6 +60,7 @@
         } else {
           params._state = 'done'
           params.filter = {
+            useruu: activeType === 'self' ? user.userUU : null,
             vendUU: user.enterprise.uu,
             fromDate: null,
             endDate: null,