Merge remote-tracking branch 'origin/release-201817-yc' into release-201817-yc

components/applyPurchase/ApplyInfo.vue

@@ -4,7 +4,7 @@
       <p>最新求购信息</p>
       <span>海量求购，一网打尽</span>
       <div>
-        <input type="text" class="form-control" v-model="keyWord" @keyup.13="searchList" :placeholder="user.logged ? '品牌/类目/型号/规格/公司' : '品牌/类目/型号/规格'" />
+        <input type="text" class="form-control" v-model="keyWord" @keyup.13="searchList" :placeholder="user.logged ? '品牌/物料名称/型号/规格/公司' : '品牌/物料名称/型号/规格'" />
         <span @click="searchList">搜索</span>
       </div>
     </div>
@@ -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">已报价
@@ -419,7 +419,6 @@ export default {
           background: #2496f1;
           text-align: center;
           margin: 0 6px 0 -1px;
-          /*vertical-align: middle;*/
           border: {
             top-right-radius: 3px;
             bottom-right-radius: 3px;
@@ -434,67 +433,6 @@ export default {
           text-align: center;
           display: inline-block;
         }
-        > div {
-          float: right;
-          height: 33px;
-          line-height: 33px;
-          > input {
-            width: 241px;
-            height: 33px;
-            line-height: 33px;
-            font-size: 13px;
-            border: {
-              top-right-radius: 0;
-              bottom-right-radius: 0;
-            }
-          }
-          > span {
-            display: inline-block;
-            width: 69px;
-            color: #fff;
-            background: #2496f1;
-            text-align: center;
-            margin: 0 6px 0 -1px;
-            height: 33px;
-            /*vertical-align: middle;*/
-            border: {
-              top-right-radius: 3px;
-              bottom-right-radius: 3px;
-            }
-            cursor: pointer;
-          }
-          &:nth-child(2) {
-            width: 106px;
-          }
-          &:nth-child(3) {
-            width: 200px;
-          }
-          &:nth-child(4) {
-            width: 174px;
-          }
-          &:nth-child(5) {
-            width: 152px;
-          }
-          &:nth-child(6) {
-            width: 158px;
-          }
-          &:nth-child(7) {
-            width: 180px;
-            margin-left: 30px;
-          }
-        }
-      }
-
-      .empty {
-        text-align: center;
-        height: 200px;
-        line-height: 200px;
-        border: 1px solid #e8e8e8;
-        margin-bottom: 10px;
-        span {
-          color: #999;
-          margin-left: 10px;
-        }
       }
     }
     .apply-info-list {
@@ -518,13 +456,13 @@ export default {
             margin-left: 25px;
           }
           &:nth-child(2) {
-            margin-left: 90px;
+            margin-left: 70px;
           }
           &:nth-child(3) {
-            margin-left: 168px;
+            margin-left: 90px;
           }
           &:nth-child(4) {
-            margin-left: 135px;
+            margin-left: 160px;
           }
           &:nth-child(5) {
             margin-left: 50px;
@@ -663,11 +601,6 @@ export default {
                   background: #2496f1;
                   border-radius: 3px;
                   cursor: pointer;
-                  /*  &:first-child {
-                        background: #ffa200;
-                        float: left;
-                        margin-top: 19px;
-                      }*/
                 }
                 .is-say-price {
                   display: inline-block;
@@ -678,14 +611,6 @@ export default {
                   }
                 }
               }
-              .sharescancodekuang {
-                // width: 100%;
-                // height: 220px;
-                // position: absolute;
-                // top: 115px;
-                // left: 0px;
-                // background: rgba(0, 0, 0, 0);
-              }
               .sharescancode {
                 position: absolute;
                 background: url('/images/mobile/@2x/purChase/codebg.png');
@@ -800,9 +725,6 @@ export default {
               margin-right: 2px;
             }
           }
-          /*.say-price {*/
-          /*display: block;*/
-          /*}*/
         &:last-child{
             border-bottom: none;
          }
@@ -850,8 +772,8 @@ export default {
   }
   .empty{
     text-align: center;
-    height: 200px;
-    line-height: 200px;
+    height: 1235px;
+    line-height: 250px;
     border: 1px solid #e8e8e8;
     margin-bottom: 10px;
     span {

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>-->
@@ -640,9 +640,9 @@
         this.validObj.kind = this.modifyObj.kind && this.modifyObj.kind !== ''
         // if (!this.validObj.kind) {
         if (!nullStrFlag) {
-          this.$message.error('类目输入不合法')
+          this.$message.error('物料名称(类目)输入不合法')
         } else if (!this.validObj.kind) {
-          this.$message.error('类目不能为空')
+          this.$message.error('物料名称(类目)不能为空')
         }
         // }
         return this.validObj.kind

components/applyPurchase/articleOne.vue

@@ -267,7 +267,7 @@
               })
             } else {
               if (!this.validObj.prodTitle) {
-                this.$message.error('类目不能为空')
+                this.$message.error('物料名称(类目)不能为空')
               } else if (!this.validObj.deadline) {
                 this.$message.error('截止日期不能为空')
               } else if (!this.validObj.amount) {
@@ -318,7 +318,7 @@
         let prodTitle = this.applyObj.prodTitle.trim()
         this.validObj.prodTitle = prodTitle && prodTitle !== ''
         if (!this.validObj.prodTitle) {
-          this.$message.error('类目不能为空')
+          this.$message.error('物料名称(类目)不能为空')
         }
         console.log(prodTitle)
         return this.validObj.prodTitle

components/common/PcSearchHeader.vue

@@ -61,6 +61,10 @@
       outerKeyword: {
         type: String,
         default: ''
+      },
+      useMatchRule: {
+        type: Boolean,
+        default: false
       }
     },
     data () {
@@ -109,8 +113,8 @@
 //        if (key === this.searchKeyword || this.keyword === this.searchKeyword) {
 //          return
 //        }
-        if (key) {
-          this.keyword = key
+        if (key || !this.useMatchRule) {
+          this.keyword = key || this.keyword
           this.$emit('searchAction', {
             keyword: this.keyword,
             type: type

components/error/error.vue

@@ -14,7 +14,7 @@
             <span>不存在</span>......
           </template>
         </div>
-        <div class="infotext" v-if="title==='店铺' || title==='器件' || title==='类目'">您可以逛逛：
+        <div class="infotext" v-if="title==='店铺' || title==='器件' || title==='物料名称(类目)'">您可以逛逛：
           <nuxt-link :to="{ path: '/'}">商城首页</nuxt-link>
           <span>|</span>
           <nuxt-link :to="{ path: '/provider/factories'}">原厂专区</nuxt-link>

components/home/Search.vue

@@ -2,7 +2,7 @@
   <div class="search-box">
     <div class="input-group">
       <input v-model="keyword" type="text" class="search-input form-control input-primary"
-             placeholder="型号/类目/品牌"
+             placeholder="型号/物料名称/品牌"
              @focus.stop.prevent="onFocus()"
              @blur.stop.prevent="onBlur()"
              @keyup.40="onSelectChange(1)"

components/main/Search.vue

@@ -7,7 +7,7 @@
           <option value="store">店铺</option>
         </select>
         <input v-model="keyword" type="text" class="search-input form-control input-primary"
-               :placeholder="searchType === 'product' ? '品牌/类目/型号' : '店铺名称'"
+               :placeholder="searchType === 'product' ? '品牌/物料名称/型号' : '店铺名称'"
                @focus.stop.prevent="onFocus()"
                @blur.stop.prevent="onBlur()"
                @keyup.40="onSelectChange(1)"
@@ -44,7 +44,7 @@
           :class="{'active': index==associate.activeIndex}"
           @click.stop.prevent="onAssociateClick(isCnStart() ? k.nameCn : k.nameEn)">{{ isCnStart() ? k.nameCn : k.nameEn }}
       </li>
-      <li v-if="similarKeywords.data.kind && similarKeywords.data.kind.length > 0" class="similar-title">类目：</li>
+      <li v-if="similarKeywords.data.kind && similarKeywords.data.kind.length > 0" class="similar-title">物料名称(类目)：</li>
       <li v-for="(k, index) in similarKeywords.data.kind" class="item"
           :class="{'active': index==associate.activeIndex}"
           @click.stop.prevent="onAssociateClick(k.nameCn)">{{ k.nameCn }}

components/mobile/applyPurchase/PublishSeek.vue

@@ -249,7 +249,7 @@
         let prodTitle = this.applyObj.prodTitle.trim()
         this.validObj.prodTitle = prodTitle && prodTitle !== ''
         if (!this.validObj.prodTitle) {
-          this.setRemindText('类目不能为空')
+          this.setRemindText('物料名称(类目)不能为空')
         }
         return this.validObj.prodTitle
       },

components/mobile/base/SearchHeader2.vue

@@ -20,7 +20,7 @@
         <li class="text-ellipse" v-for="brand in similarList.pBrandEn.slice(0, 4)" @click="onSearch(brand.nameCn, 'pBrandEn', $event)">{{brand.nameCn}}</li>
       </template>
       <template v-if="similarList.kind && similarList.kind.length && searchType === 'kind'">
-        <li class="title text-ellipse">类目</li>
+        <li class="title text-ellipse">物料名称(类目)</li>
         <li class="text-ellipse" v-for="kind in similarList.kind.slice(0, 4)" @click="onSearch(kind.kind, 'kind', $event)">{{kind.kind}}</li>
       </template>
     </ul>
@@ -34,7 +34,7 @@
         <li class="text-ellipse" v-for="brand in similarList.brand.slice(0, 4)" @click="onSearch(brand.nameCn, 'brand', $event)">{{brand.nameCn}}</li>
       </template>
       <template v-if="similarList.kind && similarList.kind.length">
-        <li class="title text-ellipse">类目</li>
+        <li class="title text-ellipse">物料名称(类目)</li>
         <li class="text-ellipse" v-for="kind in similarList.kind.slice(0, 4)" @click="onSearch(kind.nameCn, 'kind', $event)">{{kind.nameCn}}</li>
       </template>
     </ul>
@@ -80,7 +80,7 @@
           case 'brand':
             return '搜品牌'
           case 'kind':
-            return '搜类目'
+            return '搜物料名称'
           case 'name':
             return '供应商'
           default:

components/mobile/center/Seek.vue

@@ -15,7 +15,7 @@
         <span :class="overdue==='isattention'?'mobile-switch-btn active':'mobile-switch-btn'" @click="ChangeTab('isattention')">已截止</span>
       </div>
       <div class="search-content">
-        <input type="text" v-model="seekKeyword" :placeholder="userType == 'buyer' ? '品牌/型号' : '品牌/类目/型号/规格/公司'" @keyup.13="onSearch">
+        <input type="text" v-model="seekKeyword" :placeholder="userType == 'buyer' ? '品牌/型号' : '品牌/物料名称(类目)/型号/规格/公司'" @keyup.13="onSearch">
         <span @click="onSearch"><i class="iconfont icon-sousuo"></i></span>
       </div>
       <seek-list :keyword="remindKeyword" :isSearch="isSearch" :userType="userType" :seekType="seekType" :purchaseManList="purchaseManListData"></seek-list>

components/mobile/store/StoreDetail.vue

@@ -82,7 +82,7 @@
     </div>-->
     <div class="product-store" v-else>
       <div class="search-content">
-        <input type="text" v-model="keyword" placeholder="品牌/类目/型号/规格" @keyup.13="search">
+        <input type="text" v-model="keyword" placeholder="品牌/物料名称(类目)/型号/规格" @keyup.13="search">
         <span @click="search" style="height:0.5rem;line-height:0.5rem;">
         <i class="iconfont icon-sousuo"></i>
         </span>

components/mobile/supplier/List.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header @searchAction="search" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/类目/型号/公司名'"></search-header>
+    <search-header @searchAction="search" :useMatchRule="false" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/物料名称/型号/公司名'"></search-header>
     <div class="supplier-list mobile-content">
       <ul v-if="listData && listData.length">
         <li v-for="item in listData" @click="goSupplierDetail(item)">

components/mobile/supplier/List2.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header2 @searchAction="search" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/类目/型号/公司名'"></search-header2>
+    <search-header2 @searchAction="search" :similarUrl="similarUrl" :type="'supplier'" :placeholder="'品牌/物料名称/型号/公司名'"></search-header2>
     <div class="supplier-list mobile-content">
       <ul v-if="listData && listData.length">
         <li v-for="item in listData" @click="goSupplierDetail(item)">

components/mobile/supplier/SupplierDetail.vue

@@ -41,7 +41,7 @@
     </div>
     <div class="list">
       <div class="search-content">
-        <input type="text" placeholder="品牌/类目/型号" @keyup.13="search" v-model="key">
+        <input type="text" placeholder="品牌/物料名称/型号" @keyup.13="search" v-model="key">
         <span @click="search" >
         <i class="iconfont icon-sousuo"></i>
         </span>

components/pcb/product/Detail.vue

@@ -41,10 +41,6 @@
         </div>
       </div>
       <div class="shop inline-block fr">
-      <!--  <div class="search-area">
-          <input type="search" class="form-control" placeholder="产品名称/品牌/类目">
-          <span class="search-btn inline-block">搜索</span>
-        </div>-->
         <p class="shop-info-title">
           商家信息
         </p>

components/pcb/search/Kind.vue

@@ -6,7 +6,7 @@
     </a>
     <div v-show="show_filter">
       <div class="sl-wrap" v-if="good_list.total > 0">
-        <div class="sl-key f14">类目：</div>
+        <div class="sl-key f14">物料名称(类目)：</div>
         <div class="sl-value">
           <span v-for="(kind_temp, index) in kind_exp_arr">
             <div class="sl-filter" @click="click_kind_exp(kind_temp.ki_id, index)">

components/product/ComponentGoods.vue

@@ -8,7 +8,7 @@
     <table class="product-list">
       <thead>
       <tr style="height: 40px;">
-        <th width="180">品牌/类目/型号/规格</th>
+        <th width="180">品牌/物料名称(类目)/型号/规格</th>
         <th width="100">包装/生产日期</th>
         <th width="120">商家名称</th>
         <th width="110">库存</th>

components/provider/Suppliers.vue

@@ -15,7 +15,7 @@
         <!--<tr>{{$data}}</tr>-->
         <tr style="height: 50px;">
           <td colspan="5">
-            <search-header :outerKeyword="keyword" @searchAction="search" :placeholder="'品牌/类目/型号/店铺名'"></search-header>
+            <search-header :outerKeyword="keyword" @searchAction="search" :placeholder="'品牌/物料名称/型号/店铺名'"></search-header>
             <a @click="goStoreApply" class="btn-sure"><button class="btn btn-primary">立即入驻</button></a>
           </td>
         </tr>

components/search/Kind.vue

@@ -9,7 +9,7 @@
     </a>
     <div v-show="show_filter">
     <div class="sl-wrap" v-if="good_list.total > 0">
-      <div class="sl-key f14">类目：</div>
+      <div class="sl-key f14">物料名称(类目)：</div>
       <div class="sl-value">
         <span v-for="(kind_temp, index) in kind_exp_arr">
           <div class="sl-filter" @click="click_kind_exp(kind_temp.ki_id, index)">

components/store/CommodityInfo.vue

@@ -37,7 +37,7 @@
               <span class="name">品&nbsp;牌</span>：<span v-text="commodity.brandNameEn"></span>
             </div>
             <div class="com-info">
-              <span class="name no-letter">物料名称(类目)</span>：<span v-text="commodity.kindNameCn || '无类目信息'"></span>
+              <span class="name no-letter">物料名称(类目)</span>：<span v-text="commodity.kindNameCn || '无物料名称(类目)信息'"></span>
             </div>
             <div class="com-info">
               <span class="name">规&nbsp;格</span>：<span v-text="commodity.spec || '无规格信息'"></span>

components/store/home/CommodityList.vue

@@ -137,7 +137,7 @@
           </tbody>
         </table>
         <!--<div class="remind-area">-->
-          <!--<img src="/images/store/store-reminds.png" alt="">-->
+          <!--<img src="/images/store/store-remind.png" alt="">-->
           <!--所有报价、库存信息的真实性及准确性均由店铺负责，如有疑问请点击-->
           <!--<a @click="goLink" class="link-seller">联系卖家</a>-->
         <!--</div>-->
@@ -582,7 +582,7 @@
     position: relative;
   }
   #goods-list-fragment #search_btn {
-    background: #3c7cf5;
+    background: #2496f1;
     color: #FFF;
     border-bottom-right-radius: 3px;
     border-top-right-radius: 3px;
@@ -595,17 +595,17 @@
   #goods-list-fragment .sendprove {
     width: 110px;
     height: 28px;
-    color: #3b7cf4;
+    color: #2496f1;
     font-size: 14px;
     background-color: #fff;
     border-radius: 3px;
     float: right;
     margin-left: 10px;
-    border: 1px solid #3b7cf4;
+    border: 1px solid #2496f1;
   }
   #goods-list-fragment .sendprove:hover{
-    background-color: #3b7cf4;
-    border-color: #3b7cf4;
+    background-color: #2496f1;
+    border-color: #2496f1;
     color: #fff;
   }
   .btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus {
@@ -620,7 +620,7 @@
     float: right;
     border-bottom-left-radius: 3px;
     border-top-left-radius: 3px;
-    border: 1px solid #3b7cf4;
+    border: 1px solid #2496f1;
   }
 
   #goods-list-fragment .brand-code .code {
@@ -631,13 +631,13 @@
     word-break: break-all;
   }
   #goods-list-fragment .brand-code .brand a {
-    color: #3c7df5;
+    color: #2496f1;
   }
   #goods-list-fragment .brand-code .brand span{
-    color: #3c7df5;
+    color: #2496f1;
   }
   #goods-list-fragment .goodslist thead tr{
-    background-color: #3b7cf4;
+    background-color: #2496f1;
     height: 34px;
   }
   #goods-list-fragment .goodslist tr th {
@@ -732,31 +732,31 @@
 
   /* 物品列表按钮 */
   #goods-list-fragment .btn-buy-now {
-    background-color: #3c7cf5;
+    background-color: #2496f1;
     color: #fff;
     width: 80px;
     height: 24px;
     font-size: 12px;
-    border: 1px solid #3c7cf5;
+    border: 1px solid #2496f1;
     border-radius: 2px;
   }
 
   #goods-list-fragment .btn-add-cart {
     margin-top: 10px;
-    color: #3b7cf4;
+    color: #2496f1;
     width: 80px;
     height: 24px;
     font-size: 12px;
     background-color: #fff;
     border-radius: 2px;
-    border: 1px solid #3b7cf4;
+    border: 1px solid #2496f1;
   }
   #goods-list-fragment .btn-buy-now:hover{
-    background: #214797;
-    border: 1px solid #214797;
+    background: #1278c7;
+    border: 1px solid #1278c7;
   }
   #goods-list-fragment .btn-add-cart:hover{
-    background-color: #3b7cf4;
+    background-color: #1278c7;
     color: #fff;
   }
   .no-record{
@@ -813,7 +813,7 @@
     line-height: 20px;
     height: 20px;
     padding: 0 7px;
-    background: #3c7cf7;
+    background: #2496f1;
     border-radius: 2px;
   }
   @font-face {

components/store/home/EnterpriseInfo.vue

@@ -59,7 +59,7 @@
         </li>
       </ul>
       <div class="remind-area">
-        <img src="/images/store/store-reminds.png" alt="">
+        <img src="/images/store/store-remind.png" alt="">
         所有报价、库存信息的真实性及准确性均由店铺负责，如有疑问请点击
         <a @click="goLink" class="link-seller">联系卖家</a>
       </div>
@@ -344,12 +344,14 @@
             margin: -5px 0 0 1px;
             border-radius: 5px;
            .list{
-             height: 150px;
+             margin-top: -20px;
+             height: 170px;
              border-radius: 5px;
              background: #fff;
             .information-list {
               font-size: 12px;
               color: #333;
+              margin-bottom: 3px;
               /*background: #fff;*/
             &:first-child{
                /*padding-top: 10px;*/
@@ -386,7 +388,7 @@
                   word-wrap:break-word;
                 }
                 span.look {
-                  color: #3c7df5;
+                  color: #2496f1;
                   cursor: pointer;
                 }
               }
@@ -408,7 +410,7 @@
                   margin-top: 10px;
                   padding-right: 10px;
                   font-size: 12px;
-                  color: #3c7df5;
+                  color: #2496f1;
                   cursor: pointer;
                   img{
                     margin-top: -3px;

components/store/home/RecommendList.vue

@@ -290,12 +290,12 @@
     width: 100%;
     height: 409px;
     .reco-title {
-      border-bottom: 1px solid #3975f4;
+      border-bottom: 1px solid #2496f1;
       width: 218px;
       height: 34px;
       line-height: 34px;
       color: #fff;
-      background: #3975f4;
+      background: #2496f1;
       font-size: 18px;
       text-align: center;
       border-top-left-radius: 3px;

components/store/home/StoreBanner.vue

@@ -316,7 +316,7 @@ export default {
 		margin-left: 0px;
 		margin-right: 0px;
     position: relative;
-    background: #fff;
+    /*background: #fff;*/
 	}
   #title-fragment .logo{
     width: 28px;
@@ -337,6 +337,7 @@ export default {
     padding-top: 10px;
   }
 	#title-fragment .shop-logo {
+    margin-right: 10px;
 		width: 220px;
 		height: 260px;
 		border: 1px solid #e8e8e8;
@@ -344,6 +345,7 @@ export default {
 		text-align: center;
 		line-height: 210px;
     position: relative;
+    background: #fff;
     .shop-name{
       height: 40px;
       line-height: 40px;
@@ -367,8 +369,8 @@ export default {
         margin-left: 12px;
         border-radius: 3px;
         &:first-child {
-          background: #3b7cf4;
-          border: 1px solid #3b7cf4;
+          background: #2496f1;
+          border: 1px solid #2496f1;
           color: #fff;
         }
         &.focus{
@@ -377,8 +379,8 @@ export default {
         }
         &:last-child {
           background: #fff;
-          border: 1px solid #3c7cf7;
-          color: #3b7cf4;
+          border: 1px solid #2496f1;
+          color: #2496f1;
         }
       }
     }
@@ -388,7 +390,7 @@ export default {
       > span {
         position: relative;
         top: -81px;
-        color: #4290f7;
+        color: #2496f1;
         cursor: pointer;
         .active {
           transform:rotate(180deg);
@@ -460,15 +462,16 @@ export default {
 	#title-fragment .shop-banner {
 		float: left;
 		position: relative;
-		width: 970px;
+		width: 955px;
 		height: 280px;
 		border: 1px solid #e8e8e8;
 		border-left: none;
 		overflow: hidden;
+    border-radius: 5px;
 	}
 
 	#title-fragment .shop-banner img {
-		width: 970px;
+		width: 955px;
 		height: 280px;
 	}
 

components/supplier/merchant.vue

@@ -5,7 +5,7 @@
       <span>供应商列表</span>
     </div>
     <div class="search">
-      <search-header :outerKeyword="searchCode" :similarUrl="similarUrl" :type="'supplier'" @searchAction="search" :placeholder="'品牌/类目/型号/公司名'"></search-header>
+      <search-header :outerKeyword="searchCode" :similarUrl="similarUrl" :type="'supplier'" @searchAction="search" :placeholder="'品牌/物料名称/型号/公司名'"></search-header>
     </div>
   </div>
   <div class="list_info">
@@ -31,7 +31,9 @@
           </p>
           <p>
             <span>邮箱：</span><span v-text="item.enEmail ? item.enEmail : '暂无信息'">h</span>
+            <span class="split_line">|</span>
             <span>电话：</span><span v-text="item.enTel ? item.enTel : '暂无信息'">1</span>
+            <span class="split_line">|</span>
             <span>行业：</span><span v-text="item.enIndustry ? item.enIndustry : '暂无信息'">1</span>
           </p>
         </div>

components/supplier/resource.vue

@@ -51,7 +51,7 @@
           <th width="66">序号</th>
           <th width="1008">
             <span>原厂型号 / 品牌</span>
-            <span>类目（名称） / 单位</span>
+            <span>物料名称(类目) / 单位</span>
             <span>规格</span>
           </th>
           <th width="116">操作</th>
@@ -67,7 +67,7 @@
                   <p v-text="item.cmpCode ? spliceString(item.cmpCode, 95) : '暂无信息'">2</p>
                 </li>
                 <li class="item">
-                  <span class="fl">类目（产品名称）</span>
+                  <span class="fl">物料名称(类目)</span>
                   <p v-text="item.kind ? spliceString(item.kind, 95) : item.prodName ? spliceString(item.prodName, 95) : '暂无信息'">1</p>
                 </li>
                 <li class="item">

nuxt.config.js

@@ -185,7 +185,7 @@ module.exports = {
     '/commodity-service/**': baseUrl,
     '/background/**': baseUrl,
     '/goods/**': baseUrl,
-    // 公共物料匹配类目
+    // 公共物料匹配物料名称
     '/productuser/**': materialUrl,
     // 权限管理
     '/account/**': baseUrl,
@@ -197,6 +197,7 @@ module.exports = {
     '/cmsApi**': cmsUrl,
     '/mEmail/**': baseUrl,
     '/mPhone/**': baseUrl,
-    '/sso**': baseUrl
+    '/sso**': baseUrl,
+    '/webMessage/**': baseUrl
   }
 }

pages/mobile/applyPurchase/list/businessOpportunity.vue

@@ -3,7 +3,7 @@
     <div class="mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <div class="search-content">
-        <input type="text" v-model="seekKeyword" placeholder="品牌/类目/型号/规格/公司" @keyup.13="searchSeek">
+        <input type="text" v-model="seekKeyword" placeholder="品牌/物料名称(类目)/型号/规格/公司" @keyup.13="searchSeek">
         <span @click="searchSeek">
         <i class="iconfont icon-sousuo"></i>
         </span>

pages/mobile/applyPurchase/list/index.vue

@@ -3,7 +3,7 @@
     <div class="mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <div class="search-content">
-        <input type="text" v-model="seekKeyword" :placeholder="user.logged ? '品牌/类目/型号/规格/公司' : '品牌/类目/型号/规格'" @keyup.13="searchSeek">
+        <input type="text" v-model="seekKeyword" :placeholder="user.logged ? '品牌/物料名称(类目)/型号/规格/公司' : '品牌/物料名称(类目)/型号/规格'" @keyup.13="searchSeek">
         <span @click="searchSeek">
         <i class="iconfont icon-sousuo"></i>
         </span>

pages/mobile/center/index.vue

@@ -35,7 +35,7 @@
         </ul>
       </div>
       <div class="search-content">
-        <input type="text" :placeholder="userType == 'saler' ? '品牌/类目/型号/规格/公司' : '品牌/型号'" v-model="seekKeyword" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
+        <input type="text" :placeholder="userType == 'saler' ? '品牌/物料名称(类目)/型号/规格/公司' : '品牌/型号'" v-model="seekKeyword" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
         <span @click="searchSeek" >
         <i class="iconfont icon-sousuo"></i>
         </span>
@@ -856,7 +856,7 @@
         }
         return ''
       },
-      cnmpType() { // 类目
+      cnmpType() { // 物料名称
         if (this.chooseItem.kinden) {
           return this.chooseItem.kinden
         }

pages/mobile/center/user/cart.vue

@@ -13,30 +13,33 @@
           </div>
           <ul class="goods-list">
             <li class="goods-item" v-for="(goods, goodsIndex) in item.goods">
-              <label class="mobile-cart-check" :class="{'active': goods.$active}">
-                <input type="checkbox" @change="setActive('goods', storeIndex, goodsIndex)">
-              </label>
-              <div class="params inline-block">
-                <p class="param text-ellipse"><span class="title">品牌：</span>{{goods.goods.brandNameEn || '-'}}</p>
-                <p class="param text-ellipse"><span class="title">类目：</span>{{goods.kiName || '-'}}</p>
-                <p class="param text-ellipse"><span class="title">型号：</span>{{goods.code || '-'}}</p>
-                <p class="param text-ellipse"><span class="title">规格：</span>{{goods.spec || '-'}}</p>
-              </div>
-              <div class="inline-block params param-operate">
-                <p class="param text-ellipse"><span class="title">交期(天)：</span>{{goods.goods.b2cMinDelivery + '-' + goods.goods.b2cMaxDelivery}}</p>
-                <p class="param text-ellipse"><span class="title">单价：</span>{{baseUtils.getPriceByLevel(goods.goods.prices, goods.number, goods.currencyName)}}</p>
-                <p class="param"><span class="title">数量(PCS)：</span>
-                  <span class="input-line inline-block">
+              <div style="padding: .3rem .25rem">
+                <label class="mobile-cart-check" :class="{'active': goods.$active}">
+                  <input type="checkbox" @change="setActive('goods', storeIndex, goodsIndex)">
+                </label>
+                <div class="params inline-block">
+                  <p class="param text-ellipse"><span class="title">品牌：</span>{{goods.goods.brandNameEn || '-'}}</p>
+                  <p class="param text-ellipse"><span class="title">物料名称(类目)：</span>{{goods.kiName || '-'}}</p>
+                  <p class="param text-ellipse"><span class="title">型号：</span>{{goods.code || '-'}}</p>
+                  <p class="param text-ellipse"><span class="title">规格：</span>{{goods.spec || '-'}}</p>
+                </div>
+                <div class="inline-block params param-operate">
+                  <p class="param text-ellipse"><span class="title">交期(天)：</span>{{goods.goods.b2cMinDelivery + '-' + goods.goods.b2cMaxDelivery}}</p>
+                  <p class="param text-ellipse"><span class="title">单价：</span>{{baseUtils.getPriceByLevel(goods.goods.prices, goods.number, goods.currencyName)}}</p>
+                  <p class="param text-ellipse"><span class="title">起拍：</span>{{goods.goods.minBuyQty}}</p>
+                  <p class="param"><span class="title">数量(PCS)：</span>
+                    <span class="input-line inline-block">
                     <span class="inline-block" @click="setGoods('sub', goods)" :class="{disab: !goods.goods.canSub}">-</span>
                     <input type="number" v-model="goods.goods.purchaseNumber" @blur="setGoods('set', goods)">
                     <span class="inline-block" @click="setGoods('add', goods)" :class="{disab: !goods.goods.canAdd}">+</span>
                   </span>
-                </p>
-                <p class="param text-ellipse"><span class="title">小计：</span><span class="ol-price"><span>{{goods.currencyName | currencyFilter}}</span>{{goods.goods.currentPrice}}</span></p>
-                <!--<div class="price-line">
-                  <span>{{goods.currencyName | currencyFilter}}</span>{{goods.goods.currentPrice}}
-                </div>-->
+                  </p>
+                  <!--<div class="price-line">
+                    <span>{{goods.currencyName | currencyFilter}}</span>{{goods.goods.currentPrice}}
+                  </div>-->
+                </div>
               </div>
+              <div class="single-count text-ellipse"><span class="title">小计：</span><span class="ol-price"><span>{{goods.currencyName | currencyFilter}}</span>{{goods.goods.currentPrice}}</span></div>
             </li>
           </ul>
         </li>
@@ -352,12 +355,12 @@
     }
     .store-list {
       .store-item {
-        padding: 0 .25rem;
         background: #fff;
         margin: .19rem 0;
         .store-info {
           height: .9rem;
           line-height: .9rem;
+          padding: 0 .25rem;
           .store-tag {
             width: .54rem;
             height: .3rem;
@@ -377,8 +380,22 @@
         }
         .goods-list {
           .goods-item {
-            padding: .3rem 0;
             border-top: 1px solid #e4e4e4;
+            .single-count {
+              height: .61rem;
+              line-height: .61rem;
+              background: #ebebeb;
+              font-size: .28rem;
+              color: #666;
+              text-align: right;
+              padding: 0 .21rem 0 .25rem;
+              .ol-price {
+                font-size: .26rem;
+              }
+              .title {
+                float: left;
+              }
+            }
             .params {
               margin-left: .17rem;
               width: 3.03rem;

pages/mobile/center/user/pay/_orderId.vue

@@ -27,7 +27,7 @@
               <div class="clearfix" style="padding: .31rem .25rem;">
                 <div class="fl">
                   <div class="ps-goods-item text-ellipse"><span>品牌：</span>{{goods.brName || '-'}}</div>
-                  <div class="ps-goods-item text-ellipse"><span>类目：</span>{{goods.kiName || '-'}}</div>
+                  <div class="ps-goods-item text-ellipse"><span>物料名称(类目)：</span>{{goods.kiName || '-'}}</div>
                   <div class="ps-goods-item text-ellipse"><span>型号：</span>{{goods.cmpCode || '-'}}</div>
                   <div class="ps-goods-item text-ellipse"><span>规格：</span>{{goods.spec || '-'}}</div>
                 </div>

pages/mobile/center/vendor/attentionBus.vue

@@ -5,7 +5,7 @@
         <span :class="activeType==='isattention'?'mobile-switch-btn active':'mobile-switch-btn'" @click="ChangeTab('isattention')">未关注</span>
       </div>
       <div class="search-content" style="padding-bottom: 0.25rem">
-        <input type="text" placeholder="请输入您要搜索的物料名称(类目)" v-model="keyword" @keyup.13="searchSeek">
+        <input type="text" placeholder="请输入您要搜索的物料名称" v-model="keyword" @keyup.13="searchSeek">
         <span @click="searchSeek" >
           <i class="iconfont icon-sousuo"></i>
           </span>
@@ -32,7 +32,7 @@
         <nuxt-link to="/">返回首页</nuxt-link>
       </div>
       <div class="fixedAlert" v-show="isShowAlert">
-        关注类目，商机无限！
+        关注物料名称(类目)，商机无限！
         <i class="iconfont icon-guanbi" @click="isShowAlert = false"></i>
       </div>
       <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>

pages/mobile/center/vendor/product.vue

@@ -502,7 +502,7 @@
         }
         return '-'
       },
-      cnmpType() { // 类目
+      cnmpType() { // 物料名称
         return this.chooseItem.kind || this.chooseItem.kinden || '-'
       },
       cnmpBand() { // 品牌

pages/mobile/center/vendor/productList/index.vue

@@ -225,7 +225,7 @@
       cnmpCode() { // 型号
         return this.ItemInfo.pcmpcode || '-'
       },
-      cnmpType() { // 类目
+      cnmpType() { // 物料名称
         return this.ItemInfo.kind || this.ItemInfo.kinden || '-'
       },
       cnmpBand() { // 品牌

pages/mobile/order/details.vue

@@ -67,7 +67,7 @@
             </div>
             <div class="list-item clearfix">
               <div class="list-wrap-content-brand clearfix pull-left">
-                <div class="name pull-left">类目：</div>
+                <div class="name pull-left">物料名称(类目)：</div>
                 <div class="pull-left spec">{{details.kiName || '-'}}</div>
               </div>
               <div class="pull-left list-wrap-content-brand clearfix">

pages/mobile/order/index.vue

@@ -63,7 +63,7 @@
           </div>
           <div class="list-item clearfix">
             <div class="list-wrap-content-brand clearfix pull-left">
-              <div class="name pull-left">类目：</div>
+              <div class="name pull-left">物料名称(类目)：</div>
               <div class="pull-left spec">{{details.kiName || '-'}}</div>
             </div>
             <div class="pull-left list-wrap-content-brand clearfix">

pages/mobile/shop/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header @searchAction="onSearch" :outerKeyword="keyword" :placeholder="'品牌/类目/型号/店铺名'"></search-header>
+    <search-header @searchAction="onSearch" :useMatchRule="false" :outerKeyword="keyword" :placeholder="'品牌/物料名称(类目)/型号/店铺名'"></search-header>
     <div class="shop mobile-content">
       <div class="shop-top">
         <p><i class="iconfont icon-dianpu1"></i><span>{{list.totalElements || 0}}</span>家店铺</p>

pages/product/kind/_id.vue

@@ -7,7 +7,7 @@
         <component-goods :brandid="brandid" :propertyJSON="propertyJSON"></component-goods>
       </div>
       <div v-else>
-        <error-page :title="'类目'"></error-page>
+        <error-page :title="'物料名称(类目)'"></error-page>
       </div>
     </div>
   </div>

store/pcb.js

@@ -1,7 +1,7 @@
 import axios from '~plugins/axios'
 
 export const actions = {
-  // 获取pcb首页类目
+  // 获取pcb首页物料名称
   getPcbKinds ({ commit }, params = {}) {
     commit('kindsData/REQUEST_PCB_KINDS', params)
     return axios.get(`/api/product/kind/${params.parentId}/pcbchildren_all`)