Browse Source

类目改为物料名称

Administrator 7 years ago
parent
commit
422142ebaf
34 changed files with 43 additions and 47 deletions
  1. 2 2
      components/applyPurchase/ApplyInfo.vue
  2. 3 3
      components/applyPurchase/BatchPublish.vue
  3. 2 2
      components/applyPurchase/articleOne.vue
  4. 1 1
      components/error/error.vue
  5. 1 1
      components/home/Search.vue
  6. 2 2
      components/main/Search.vue
  7. 1 1
      components/mobile/applyPurchase/PublishSeek.vue
  8. 3 3
      components/mobile/base/SearchHeader2.vue
  9. 1 1
      components/mobile/center/Seek.vue
  10. 1 1
      components/mobile/store/StoreDetail.vue
  11. 1 1
      components/mobile/supplier/List.vue
  12. 1 1
      components/mobile/supplier/List2.vue
  13. 1 1
      components/mobile/supplier/SupplierDetail.vue
  14. 0 4
      components/pcb/product/Detail.vue
  15. 1 1
      components/pcb/search/Kind.vue
  16. 1 1
      components/product/ComponentGoods.vue
  17. 1 1
      components/provider/Suppliers.vue
  18. 1 1
      components/search/Kind.vue
  19. 1 1
      components/store/CommodityInfo.vue
  20. 1 1
      components/supplier/merchant.vue
  21. 2 2
      components/supplier/resource.vue
  22. 1 1
      nuxt.config.js
  23. 1 1
      pages/mobile/applyPurchase/list/businessOpportunity.vue
  24. 1 1
      pages/mobile/applyPurchase/list/index.vue
  25. 2 2
      pages/mobile/center/index.vue
  26. 1 1
      pages/mobile/center/user/cart.vue
  27. 1 1
      pages/mobile/center/user/pay/_orderId.vue
  28. 2 2
      pages/mobile/center/vendor/attentionBus.vue
  29. 1 1
      pages/mobile/center/vendor/product.vue
  30. 1 1
      pages/mobile/center/vendor/productList/index.vue
  31. 1 1
      pages/mobile/order/details.vue
  32. 1 1
      pages/mobile/order/index.vue
  33. 1 1
      pages/product/kind/_id.vue
  34. 1 1
      store/pcb.js

+ 2 - 2
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">已报价

+ 3 - 3
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

+ 2 - 2
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

+ 1 - 1
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>

+ 1 - 1
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)"

+ 2 - 2
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 }}

+ 1 - 1
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
       },

+ 3 - 3
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:

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
components/mobile/supplier/List.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header @searchAction="search" :useMatchRule="false" :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)">

+ 1 - 1
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)">

+ 1 - 1
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>

+ 0 - 4
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>

+ 1 - 1
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)">

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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)">

+ 1 - 1
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>

+ 1 - 1
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">

+ 2 - 2
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">

+ 1 - 1
nuxt.config.js

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

+ 1 - 1
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>

+ 1 - 1
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>

+ 2 - 2
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
         }

+ 1 - 1
pages/mobile/center/user/cart.vue

@@ -19,7 +19,7 @@
                 </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.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>

+ 1 - 1
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>

+ 2 - 2
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>

+ 1 - 1
pages/mobile/center/vendor/product.vue

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

+ 1 - 1
pages/mobile/center/vendor/productList/index.vue

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

+ 1 - 1
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">

+ 1 - 1
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">

+ 1 - 1
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>

+ 1 - 1
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`)