Merge branch 'release-wangcz-201814' of ssh://10.10.100.21/source/mall-web-ssr into feature-wangcz-201814

components/brandCenter/BrandIndex.vue

@@ -252,6 +252,7 @@
               font-weight: bold;
               position: relative;
               bottom: 2px;
+              background-color: #ec190f;
             }
           }
         }
@@ -270,6 +271,7 @@
               font-weight: bold;
               position: relative;
               bottom: 2px;
+              background-color: #ea8f02;
             }
           }
         }
@@ -288,6 +290,7 @@
               font-weight: bold;
               position: relative;
               bottom: 2px;
+              background-color: #009b87;
             }
           }
         }
@@ -306,6 +309,7 @@
               font-weight: bold;
               position: relative;
               bottom: 2px;
+              background-color: #0095db;
             }
           }
         }
@@ -324,6 +328,7 @@
               font-weight: bold;
               position: relative;
               bottom: 2px;
+              background-color: #026dc5;
             }
           }
         }
@@ -342,6 +347,7 @@
               font-weight: bold;
               position: relative;
               bottom: 2px;
+              background-color: #7479eb;
             }
           }
         }
@@ -350,7 +356,7 @@
     .brand-center-index-list {
       .brand-list-nav {
         height: 56px;
-        padding-top: 15px;
+        padding-top: 8px;
         .filter-area {
           float: right;
           height: 50px;

components/mobile/Home.vue

@@ -10,9 +10,9 @@
             <div class="swiper-slide">
               <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_02.jpg" alt="">
             </div>
-            <div class="swiper-slide">
-              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_03.png" alt="">
-            </div>
+            <!--<div class="swiper-slide">-->
+              <!--<img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_03.png" alt="">-->
+            <!--</div>-->
           </div>
           <div class="swiper-pagination swiper-pagination-bullets"></div>
         </div>

components/store/home/CommodityList.vue

@@ -126,7 +126,7 @@
                   <!--<p class="grey f16">暂无器件信息</p>-->
                   <p class="grey f16"> 暂无产品信息</p>
                   <i class="iconfont" v-if="emptyShow === false">&#xe610;</i>&nbsp;<a v-if="emptyShow === false" href="/">返回首页</a>
-                  <img v-if="emptyShow === true" src="/images/brandList/upload.png">&nbsp;<a v-if="emptyShow === true" href="/vendor#/vendor_upload?type=company">马上去上传</a>
+                  <img v-if="emptyShow === true" src="/images/brandList/upload.png">&nbsp;<a v-if="emptyShow === true" href="/vendor#/vendor_upload?type=company" target="_blank">马上去上传</a>
                 </div>
               </div>
             </td>
@@ -266,11 +266,25 @@
         }
       }
     },
-    mounted () {
+//    watch: {
+//       kinds: {
+//         handler: function (val) {
+//           this.kinds.forEach((item) => {
+//             this.KindsNameChange(item)
+//           })
+//         },
+//         immediate: false
+//       }
+//  },
+//    mounted () {
+//      this.$nextTick(() => {
+//      })
+//    },
+  mounted () {
       this.kinds.forEach((item) => {
         this.KindsNameChange(item)
       })
-//    alert(JSON.stringify(this.kinds))
+ //    alert(JSON.stringify(this.kinds))
     },
     methods: {
       sendprove: function () {
@@ -288,10 +302,9 @@
         this.baseUtils.goLinkUser(this, this.storeInfo.enUU)
       },
       KindsNameChange: function (obj) {
-//        obj.nameCn += `  (${obj.count})`
-//        document.getElementsByClassName('el-tree-node__label').innerHTML = "<span style='color:#666;'>11</span>"
+        obj.nameCn += `  (${obj.count})`
+        document.getElementsByClassName('el-tree-node__label').innerHTML = "<span style='color:#666;'>11</span>"
         if (obj.children && obj.children.length) {
-          console.log(obj.children)
           obj.children.forEach((item) => {
             this.KindsNameChange(item)
           })
@@ -582,7 +595,6 @@
     outline: none;
     border-color: transparent;
   }
-
   #goods-list-fragment #search_input {
     font-size: 14px;
     height: 28px;
@@ -597,6 +609,9 @@
   #goods-list-fragment .brand-code .code {
     font-weight: 600;
   }
+  #goods-list-fragment .brand-code .spec {
+    word-break: break-all;
+  }
   #goods-list-fragment .brand-code .brand a {
     color: #3c7df5;
   }

components/store/home/EnterpriseInfo.vue

@@ -9,7 +9,7 @@
               <div v-if="storeInfo.description" :title="storeInfo.description">{{storeInfo.description | introduceFilter}}</div>
               <div v-else>—</div>
             </div>
-            <div class="information-list" :title="storeInfo.enterprise.enAddress">
+            <div class="information-list">
               <div>应用领域&nbsp;:</div>
               <div v-if="storeInfo.storeApplication" :title="storeInfo.storeApplication">{{storeInfo.storeApplication | introduceFilter}}</div>
               <div v-else>—</div>
@@ -34,7 +34,7 @@
             </div>-->
             <div class="introduce">
               <h4>企业简介</h4>
-              <p v-if="storeInfo.description">{{storeInfo.description}}</p>
+              <p v-if="storeInfo.enterprise.description">{{storeInfo.enterprise.description}}</p>
               <p v-else class="empty-introduce">暂无简介</p>
             </div>
           </div>

components/store/home/QualificationCertificate.vue

@@ -3,7 +3,7 @@
     <div class="brand-content-list">
       <ul class="list-unstyled list-inline">
         <li class="store-box"  v-if="storeInfo.qualifications || storeInfo.qualifications.length !== 0" v-for="(store, index) in storeInfo.qualifications.slice(0,5)">
-          <div><img :src="store.resourceUrl.indexOf('.pdf')>0?'/images/store/common/pdf.png':store.resourceUrl"/></div>
+          <div><img :src="store.resourceUrl.indexOf('.pdf')>0?'/images/store/common/pdf.jpg':store.resourceUrl"/></div>
           <a @click="showImg(store.resourceUrl)"><div class="Open"><i class="fa fa-search"></i>&nbsp;&nbsp;查看</div></a>
         </li>
         <li class="active-empty" v-if="!storeInfo.qualifications || storeInfo.qualifications.length == 0">
@@ -14,7 +14,7 @@
             <div class="col-xs-4 txt-info">
               <p class="grey f16"> 暂无资质证明</p>
                <i class="iconfont" v-if="emptyShow === false">&#xe610;</i>&nbsp;<a href="/" v-if="emptyShow === false">返回首页</a>
-               <img v-if="emptyShow === true" src="/images/brandList/upload.png">&nbsp;<a v-if="emptyShow === true" href="/vendor#/store/maintain">马上去上传</a>
+               <img v-if="emptyShow === true" src="/images/brandList/upload.png">&nbsp;<a v-if="emptyShow === true" href="/vendor#/store/maintain" target="_blank">马上去上传</a>
             </div>
           </div>
         </li>

components/store/home/RecommendList.vue

@@ -26,7 +26,7 @@
            <div class="empty-info">
              <p class="grey f16"> 暂无展示产品</p>
              <i class="iconfont" v-if="emptyShow === false">&#xe610;</i>&nbsp;<a v-if="emptyShow === false" href="/">返回首页</a>
-             <img v-if="emptyShow === true" src="/images/brandList/upload.png">&nbsp;<a v-if="emptyShow === true" href="/vendor#/store/maintain">马上去上传</a>
+             <img v-if="emptyShow === true" src="/images/brandList/upload.png">&nbsp;<a v-if="emptyShow === true" href="/vendor#/store/maintain" target="_blank">马上去上传</a>
            </div>
          </div>
        </li>

components/store/home/StoreBanner.vue

@@ -10,7 +10,7 @@
         <div class="shop-logo">
           <img class="logo-img" :src="storeInfo.logoUrl || '/images/store/common/default.png'" />
          <!-- <p id="shop-title" v-if="storeInfo.storeShortName" v-text="storeInfo.storeShortName">店铺名称</p>-->
-          <p class="shop-name" v-if="storeInfo.storeShortName">{{storeInfo.storeShortName | nameFilter}}</p>
+          <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>
@@ -85,8 +85,8 @@ export default {
       _this.clipboard.destroy()
     })
     document.addEventListener('click', function () {
-      _this.showShare = false
-      _this.showCate = false
+//      _this.showShare = false
+//      _this.showCate = false
     })
   },
   components: {

pages/mobile/center/user/index.vue

@@ -37,11 +37,11 @@
           <span>店铺关注<span class="text">({{storeCount.data || 0}})</span></span>
           <i class="iconfont icon-xiangyou"></i>
         </nuxt-link>
-     <!--   <nuxt-link tag="div" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
+        <nuxt-link tag="div" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
           <img src="/images/mobile/center/user/message.png" alt="">
           <span>消息<span class="text">({{messageCount.count || 0}})</span></span>
           <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>-->
+        </nuxt-link>
       </div>
     </div>
     <publish-seek :showSayPriceBox="showPublishBox" @cancelAction="showPublishBox = false" @remindAction="onRemind"></publish-seek>
@@ -62,14 +62,14 @@
       }
     },
     fetch ({store}) {
-//      let user = store.state.option.user.data
+      let user = store.state.option.user.data
       let promises = [
         store.dispatch('product/loadCompCollectInfo'),
         store.dispatch('shop/loadStoreCollectInfo')
       ]
-//      if (user.enterprise.uu) {
-//        promises.push(store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0}))
-//      }
+      if (user.enterprise.uu) {
+        promises.push(store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0}))
+      }
       return Promise.all([
         promises
       ])
@@ -84,13 +84,13 @@
       },
       storeCount () {
         return this.$store.state.shop.storeInfo.collectCount.data
+      },
+      messageCount () {
+        // console.log(this.$store.state.messageShow.messageCount.count.data)
+        if (this.user.data.enterprise.uu) {
+          return this.$store.state.messageShow.messageCount.count.data
+        }
       }
-//      messageCount () {
-//        // console.log(this.$store.state.messageShow.messageCount.count.data)
-//        if (this.user.data.enterprise.uu) {
-//          return this.$store.state.messageShow.messageCount.count.data
-//        }
-//      }
     },
     methods: {
       onRemind: function (str) {

pages/mobile/center/vendor/index.vue

@@ -71,10 +71,10 @@
       }
     },
     fetch ({ store }) {
-//      let user = store.state.option.user.data
+      let user = store.state.option.user.data
       return Promise.all([
-        store.dispatch('loadStoreStatus', { op: 'check' })
-//        store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0})
+        store.dispatch('loadStoreStatus', { op: 'check' }),
+        store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0})
       ])
     },
     components: {
@@ -83,10 +83,10 @@
     computed: {
       storeInfo () {
         return this.$store.state.option.storeStatus.data
+      },
+      messageCount () {
+        return this.$store.state.messageShow.messageCount.count.data
       }
-//      messageCount () {
-//        return this.$store.state.messageShow.messageCount.count.data
-//      }
     },
     methods: {
       goStore: function () {