bug

components/applyPurchase/ApplyInfo.vue

@@ -45,11 +45,11 @@
                 <span>品牌</span>
                 <div class="content">{{purchaseMan.inbrand || '-'}}</div>
               </div>
-              <div :title="purchaseMan.prodTitle | nullFilter" class="fl item">
+              <div :title="purchaseMan.cmpCode | nullFilter" class="fl item">
                 <span>型号</span>
                 <div class="content">{{purchaseMan.cmpCode || '-'}}</div>
               </div>
-              <div :title="purchaseMan.cmpCode" class="fl item bottom size-middle">
+              <div :title="purchaseMan.prodTitle" class="fl item bottom size-middle">
                 <span>类目(产品名称)</span>
                 <div class="content">{{(purchaseMan.prodTitle || '-') | nullFilter}}</div>
               </div>

components/mobile/MobileHeader.vue

@@ -59,7 +59,7 @@
       <p>{{title}}
         <span @click="goMainSearch" v-if="showSearchIcon"><i class="icon-sousuo iconfont"></i>搜索</span>
       </p>
-      <p v-show="showEnHeader" class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise ? user.data.enterprise.enName : ''}}</p>
+      <p v-show="showEnHeader" class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <main-search v-if="showMainSearch" @cancelSearchAction="onCancelSearch"></main-search>
 <!--    <i v-show="rightIcon=='share'" class="iconfont icon-fenxiang" @click="showShare = true" @touchmove="onTouchMove($event)"></i>

components/mobile/center/Seek.vue

@@ -3,7 +3,7 @@
     <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>{{seekTitle}}</p>
-      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
+      <p class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <div class="mobile-fix-content mobile-centerfix-content" id="mobileFixContent">
       <div class="seek-title com-switch-item" v-if="userType == 'saler' && seekType == 'wait'">

components/mobile/user/Info.vue

@@ -116,11 +116,12 @@
         i{
           margin: 0 0 0 .1rem;
           font-size: .24rem;
-          color: #000;
+          color: #bebebe;
         }
         img{
-          width: .43rem;
-          height: .43rem;
+          width: .58rem;
+          height: .58rem;
+          border: 1px solid #bebebe;
         }
       }
     }

components/provider/Suppliers.vue

@@ -93,7 +93,7 @@ export default {
     search (obj) {
       this.pageParams.page = 1
       this.pageParams.keyword = obj.keyword === '' ? null : obj.keyword
-      this.$store.dispatch('provider/findStoreList', this.pageParams)
+      this.$store.dispatch('provider/findSimilarStoreList', this.pageParams)
     },
     showLittleDescription (description) {
       if (!description || description === '') {
@@ -103,7 +103,7 @@ export default {
     },
     async pageCommodity (pageParams) {
 //    pageCommodity (pageParams) {
-      pageParams.op = 'pageByType'
+      pageParams.op = 'similar'
 
       try {
         let { data } = await this.$http.get('/api/store-service/stores', { params: pageParams })

components/store/BaseInfo.vue

@@ -35,7 +35,7 @@
       </div>
     </div>
     <div id="contact-fragment">
-      <div class="container" style="margin-top: 30px;">
+      <div class="container" style="margin-top: 10px;">
         <div class="contact-title">
           <h3>
             联系我们

components/supplier/merchant.vue

@@ -72,7 +72,8 @@
           count: 20,
           page: 1
         },
-        similarUrl: '/search/product/similarKeywords'
+        similarUrl: '/search/product/similarKeywords',
+        type: ''
       }
     },
     components: {
@@ -135,6 +136,7 @@
       search (type) {
         this.pageParams.page = 1
         this.searchCode = type.keyword
+        this.type = type.type
         this.handleCurrentChange(1)
       },
       goodsSearch (type) {
@@ -143,7 +145,7 @@
       },
       handleCurrentChange (type) {
         this.pageParams.page = type
-        this.$store.dispatch('supplier/loadVendorList', {page: this.pageParams.page, size: this.pageParams.count, keyword: this.searchCode})
+        this.$store.dispatch('supplier/loadVendorList', {page: this.pageParams.page, size: this.pageParams.count, keyword: this.searchCode, field: this.type})
       }
     }
   }

pages/mobile/center/user/collect/component.vue

@@ -3,7 +3,7 @@
     <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>器件收藏</p>
-      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
+      <p class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <div class="mobile-fix-content mobile-centerfix-content" id="mobileFixContent">
       <ul v-if="compList && compList.length">

pages/mobile/center/user/collect/store.vue

@@ -3,7 +3,7 @@
     <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>店铺关注</p>
-      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
+      <p class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <div class="mobile-content">
       <div v-if="storeList.length" class="shop-list" v-bind:key="item.id" v-for="item in storeList" @click="goStoreDetail(item.storeInfo.uuid)">

pages/mobile/center/user/index.vue

@@ -3,7 +3,7 @@
     <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>买家中心</p>
-      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
+      <p class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <div class="mobile-fix-content mobile-centerfix-content">
       <div class="seek-banner block-wrap">

pages/mobile/center/vendor/index.vue

@@ -3,7 +3,7 @@
     <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>卖家中心</p>
-      <p class="en-name"><img src="/images/mobile/center/en.png" alt="">{{user.data.enterprise.enName}}</p>
+      <p class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <div class="mobile-fix-content mobile-centerfix-content">
       <div class="seek-banner block-wrap">

pages/mobile/product/_batchCode.vue

@@ -44,19 +44,51 @@
             <i class="iconfont icon-kefu1"></i>
             <p>联系卖家</p>
           </li>
-          <li class="text-ellipse inline-block price-level" :class="{'active': component.attach && component.attach != '1'}" @click="goAttach(component.attach)">
+          <li class="text-ellipse inline-block price-level active" @click="goAttach(component.attach)">
             <i class="iconfont icon-pdf"></i>
             <p>数据手册</p>
           </li>
         </ul>
       </div>
     </div>
+    <div class="item-wrap">
+      <p>产品信息</p>
+      <div class="com-info">
+        <span class="name">品牌</span>：<span v-text="commodity.brandNameEn"></span>
+      </div>
+      <div class="com-info">
+        <span class="name no-letter">类目(产品名称)</span>：<span v-text="commodity.kindNameCn || '无类目信息'"></span>
+      </div>
+      <div class="com-info">
+        <span class="name">规格</span>：<span v-text="commodity.spec || '无规格信息'"></span>
+      </div>
+      <div class="com-info">
+        <span class="name">包装</span>：<span v-text="commodity.packaging || '无包装信息'"></span>
+      </div>
+      <div class="com-info">
+        <span class="name">最小包装数</span>：<span v-text="commodity.minPackQty || '无最小包装数信息'"></span>
+      </div>
+      <div class="com-info">
+        <span class="name">库存</span>：<span v-text="commodity.reserve || 0"></span><em style="margin-left: 3px;">PCS</em>
+        （<span v-text="commodity.minBuyQty || 1"></span>个起订）
+        <span class="can-div-sell" v-if="commodity.breakUp">可拆卖</span>
+      </div>
+      <div class="com-info">
+        <span class="name">交期</span>：
+        <div class="delivery inline-block">
+          <span v-text="commodity.b2cMinDelivery || 0"></span>
+          <span v-if="commodity.b2cMaxDelivery && commodity.b2cMaxDelivery !== commodity.b2cMinDelivery">-</span>
+          <span v-if="commodity.b2cMaxDelivery && commodity.b2cMaxDelivery !== commodity.b2cMinDelivery" v-text="commodity.b2cMaxDelivery || 0"></span>
+          <span>(天)</span>
+        </div>
+      </div>
+    </div>
     <div class="params-wrap">
       <p>产品参数</p>
       <ul v-if="component.properties && component.properties.length">
         <li v-for="prop in component.properties" v-if="prop.property">
           <span class="inline-block text-ellipse" v-text="prop.property.labelCn"></span>
-          <span class="inline-block text-ellipse" v-text="prop.value"></span>
+          <span class="inline-block text-ellipse" v-text="prop.value || '—'"></span>
         </li>
       </ul>
       <div class="com-none-state" v-else>
@@ -194,10 +226,10 @@
       }
     }
     .content-wrap {
-      -webkit-box-shadow: 0 0 7px 0 rgba(143, 141, 141, 0.25);
-      -moz-box-shadow: 0 0 7px 0 rgba(143, 141, 141, 0.25);
-      box-shadow: 0 0 7px 0 rgba(143, 141, 141, 0.25);
-      margin-bottom: .1rem;
+      -webkit-box-shadow: 0 -2px 7px 0 rgba(143, 141, 141, 0.25);
+      -moz-box-shadow: 0 -2px 7px 0 rgba(143, 141, 141, 0.25);
+      box-shadow: 0 -2px 7px 0 rgba(143, 141, 141, 0.25);
+      border-bottom: .1rem solid #f4f4f4;
       .content-line {
         height: 1.04rem;
         border-bottom: .01rem solid #d9d9d9;
@@ -238,8 +270,13 @@
             border-right: none;
           }
           p {
-            font-size: .44rem;
+            font-size: .38rem;
             color: #f42d29;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            max-width: 1.88rem;
+            margin: 0 auto;
             span {
               font-size: .22rem;
             }
@@ -316,7 +353,7 @@
       }
     }
     .params-wrap {
-      background: #f4f4f4;
+      background: #fff;
       padding: .29rem .23rem;
       p {
         font-size: .26rem;
@@ -347,6 +384,40 @@
         }
       }
     }
+    .item-wrap {
+      padding: .3rem 0;
+      border-bottom: .1rem solid #f4f4f4;
+      p {
+        font-size: .26rem;
+        text-align: center;
+        margin-bottom: .24rem;
+        font-weight: bold;
+      }
+      .com-info {
+        padding-left: .5rem;
+        padding-right: .2rem;
+        line-height: .5rem;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        .name {
+          color: #666;
+        }
+        .can-div-sell {
+          font-size: 0.18rem;
+          margin-left: 0.1rem;
+          display: inline-block;
+          height: .3rem;
+          line-height: .3rem;
+          width: .7rem;
+          text-align: center;
+          background: #3f84f6;
+          color: #fff;
+          font-weight: bold;
+          border-radius: 3px;
+        }
+      }
+    }
   }
   .com-none-state {
     padding: .2rem 0;

pages/mobile/user/index.vue

@@ -23,7 +23,7 @@
         </div>
        <!-- <span>公司</span>-->
         <i class="iconfont icon-xiangyou"></i>
-        <span class="l-right">{{user.data.enterprise.enName}}</span>
+        <span class="l-right">{{currentEnName}}</span>
       </div>
       <div class="line" @click="go('/mobile/user/storeinfo')">
         <div class="img-wrap">
@@ -72,7 +72,7 @@
           <p>公司选择 <i class="iconfont icon-guanbi1" @click="showLogin=false"></i></p>
           <ul>
             <li class="active" @click="switchEnterprise(user.data.enterprise)">
-              <a>{{ user.data.enterprise.enName }}</a>
+              <a>{{ currentEnName }}</a>
               <i class="iconfont icon-xuanzhong"></i>
             </li>
             <li

pages/provider/factories.vue

@@ -24,7 +24,7 @@ export default {
       store.dispatch('provider/loadSalesStore', { isOriginal: true }),
       store.dispatch('provider/loadNewStores', { types: 'ORIGINAL_FACTORY' }),
       store.dispatch('provider/loadRecommendOriginal', { types: 'ORIGINAL_FACTORY', num: 5 }),
-      store.dispatch('provider/findStoreList', { page: 1, count: 10, types: 'ORIGINAL_FACTORY' }),
+      store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, types: 'ORIGINAL_FACTORY' }),
       store.dispatch('loadStoreStatus', { op: 'check' })
     ])
   },

pages/provider/list.vue

@@ -13,7 +13,7 @@ export default {
   fetch ({ store }) {
     return Promise.all([
       store.dispatch('provider/loadRecommendStores', { types: 'AGENCY-DISTRIBUTION', num: 5 }),
-      store.dispatch('provider/findStoreList', { page: 1, count: 10, types: 'AGENCY-DISTRIBUTION' })
+      store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, types: 'AGENCY-DISTRIBUTION' })
     ])
   },
   components: {

plugins/mixin.js

@@ -41,6 +41,13 @@ Vue.mixin({
         }
         return cookieObj.type === 'erp'
       }
+    },
+    currentEnName () {
+      if (this.user.data.enterprise) {
+        return this.user.data.enterprise.uu ? this.user.data.enterprise.enName : this.user.data.userName + '(个人账户)'
+      } else {
+        return {}
+      }
     }
   },
   methods: {

store/provider.js

@@ -105,6 +105,16 @@ export const actions = {
         commit('stores/GET_STORE_LIST_FAILURE', err)
       })
   },
+  findSimilarStoreList ({ commit }, params = {}) {
+    params.op = 'similar'
+    commit('stores/REQUEST_STORE_LIST')
+    return axios.get('/api/store-service/stores', { params })
+      .then(response => {
+        commit('stores/GET_STORE_LIST_SUCCESS', response.data)
+      }, err => {
+        commit('stores/GET_STORE_LIST_FAILURE', err)
+      })
+  },
   findStoreListInMobil ({ commit }, params = {}) {
     params.op = 'similar'
     commit('stores/REQUEST_STORE_LIST')