Merge remote-tracking branch 'origin/feature-201820-wangcz' into feature-201820-wangcz

components/applyPurchase/ApplyInfo.vue

@@ -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">已报价
@@ -50,7 +50,7 @@
                 <div class="content">{{baseUtils.filterStringEllipsis(purchaseMan.cmpCode, 54) || '-'}}</div>
               </div>
               <div :title="purchaseMan.prodTitle" class="fl item bottom size-middle">
-                <span>物料名称(类目)</span>
+                <span>物料名称</span>
                 <div class="content">{{(baseUtils.filterStringEllipsis(purchaseMan.prodTitle, 48) || '-') | nullFilter}}</div>
               </div>
               <div :title="purchaseMan.spec" class="fl item bottom item-right">
@@ -456,13 +456,13 @@ export default {
             margin-left: 25px;
           }
           &:nth-child(2) {
-            margin-left: 70px;
+            margin-left: 82px;
           }
           &:nth-child(3) {
-            margin-left: 90px;
+            margin-left: 110px;
           }
           &:nth-child(4) {
-            margin-left: 160px;
+            margin-left: 170px;
           }
           &:nth-child(5) {
             margin-left: 50px;

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>-->
@@ -44,7 +44,7 @@
                 <div class="pi-content over-ell" v-else="!item.unitPrice">-</div>
               </div>-->
               <div class="prod-item prod-item-large" :title="item.kind">
-                <span class="pi-title"><i class="red-text">*</i>物料名称(类目)：</span>
+                <span class="pi-title"><i class="red-text">*</i>物料名称：</span>
                 <div class="pi-content over-ell" v-if="item.kind && (!item.kindWord || item.kindWord.length == 0)" :title="item.kind">{{item.kind}}</div>
                 <div class="pi-content red-text" v-if="!item.kind">请完善信息</div>
                 <!--<div class="pi-content over-ell">{{item.kind || '-'}}</div>-->
@@ -166,7 +166,7 @@
                 </ul>
               </div>
               <div class="prod-item prod-item-large">
-                <span class="pi-title"><i class="red-text">*</i>物料名称(类目)：</span>
+                <span class="pi-title"><i class="red-text">*</i>物料名称：</span>
                 <input type="text" class="form-control" v-model="modifyObj.kind" :class="{'error': !validObj.kind}" @input="onProdTitleInput" @blur="checkKind">
               </div>
               <!--<div class="prod-item prod-item-small pi-select">
@@ -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/SayPrice.vue

@@ -16,7 +16,7 @@
           </div>
           <div class="content-line">
             <div class="form-item form-left text-line">
-              <span>物料名称(类目)：</span><span class="text" :title="purchaseManList.content[currentSayPriceIndex].prodTitle">{{purchaseManList.content[currentSayPriceIndex].prodTitle || '-'}}</span>
+              <span>物料名称：</span><span class="text" :title="purchaseManList.content[currentSayPriceIndex].prodTitle">{{purchaseManList.content[currentSayPriceIndex].prodTitle || '-'}}</span>
             </div>
           </div>
           <div class="content-line">

components/applyPurchase/SeekProduct.vue

@@ -10,7 +10,7 @@
             <p>{{productItem.brand}}</p>
           </li>
           <li class="form-item">
-            <span>物料名称(类目)：</span>
+            <span>物料名称：</span>
             <p>{{productItem.prodName}}</p>
           </li>
           <li class="form-item">

components/applyPurchase/articleOne.vue

@@ -19,7 +19,7 @@
         </div>
         <div class="form-item">
            <span>
-              <i>*</i>物料名称(类目)：
+              <i>*</i>物料名称：
             </span>
           <input type="text" class="form-control" :class="{'error': !validObj.prodTitle}" v-model="applyObj.prodTitle" @blur="checkProdTitle" @input="onProdTitleInput"/>
         </div>
@@ -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

@@ -15,7 +15,7 @@
         <li class="text-ellipse" v-for="brand in similarList.pBrandEn.slice(0, 4)" @click="onSearch(brand.nameEn, 'pBrandEn', $event)">{{brand.nameEn}}</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.kind, 'kind', $event)">{{kind.kind}}</li>
       </template>
       <template v-if="similarList.pCmpCode && similarList.pCmpCode.length">
@@ -29,7 +29,7 @@
         <li class="text-ellipse" v-for="brand in similarList.brand.slice(0, 4)" @click="onSearch(brand.nameEn, 'brand', $event)">{{brand.nameEn}}</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>
       <template v-if="similarList.component && similarList.component.length">

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/floor/FloorList.vue

@@ -17,7 +17,7 @@
                   <span>发布时间</span>
                   <span>买家名称</span>
                   <span>品牌</span>
-                  <span>物料名称(类目)</span>
+                  <span>物料名称</span>
                   <span>型号</span>
                   <span>规格</span>
                   <span>操作</span>

components/main/Nav.vue

@@ -85,7 +85,7 @@
         if (this.user.logged) {
           window.location.href = `${process.env.uasUrl}#/index`
         } else {
-          this.login()
+          this.login(`${process.env.uasUrl}`)
         }
       }
     }

components/main/Search.vue

@@ -51,7 +51,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

@@ -9,7 +9,7 @@
         </ul>
       </div>
       <div class="content-line">
-        <span><i>*</i>物料名称(类目)：</span>
+        <span><i>*</i>物料名称：</span>
         <input type="text" v-model="applyObj.prodTitle" @blur="checkProdTitle" @input="onProdTitleInput">
       </div>
       <div class="content-line">
@@ -234,7 +234,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/applyPurchase/PublishSupplierSeek.vue

@@ -4,7 +4,7 @@
       <div class="mobile-modal-header">我要询价<i class="icon-guanbi iconfont" @click="cancel"></i></div>
       <div class="props">
         <div class="prop">品牌：{{applyObj.brand || '-'}}</div>
-        <div class="prop">物料名称(类目)：{{applyObj.prodTitle || '-'}}</div>
+        <div class="prop">物料名称：{{applyObj.prodTitle || '-'}}</div>
         <div class="prop">型号：{{applyObj.code || '-'}}</div>
         <div class="prop">规格：{{applyObj.spec || '-'}}</div>
       </div>

components/mobile/applyPurchase/SayPrice.vue

@@ -9,7 +9,7 @@
               品牌：<span>{{purchaseDetail.inbrand || '-'}}</span>
             </div>
             <div class="content-line">
-              物料名称(类目)：<span>{{purchaseDetail.prodTitle || '-'}}</span>
+              物料名称：<span>{{purchaseDetail.prodTitle || '-'}}</span>
             </div>
             <div class="content-line">
               型号：<span>{{purchaseDetail.cmpCode || '-'}}</span>

components/mobile/applyPurchase/SayPriceInfo.vue

@@ -15,7 +15,7 @@
                 品牌：<span>{{purchaseDetail.inbrand || '-'}}</span>
               </div>
               <div class="content-line">
-                物料名称(类目)：<span>{{purchaseDetail.prodTitle || '-'}}</span>
+                物料名称：<span>{{purchaseDetail.prodTitle || '-'}}</span>
               </div>
               <div class="content-line">
                 型号：<span>{{purchaseDetail.cmpCode || '-'}}</span>
@@ -156,7 +156,7 @@
                 品牌：<span>{{purchaseDetail.inbrand || '-'}}</span>
               </div>
               <div class="content-line">
-                物料名称(类目)：<span>{{purchaseDetail.prodTitle || '-'}}</span>
+                物料名称：<span>{{purchaseDetail.prodTitle || '-'}}</span>
               </div>
               <div class="content-line">
                 型号：<span>{{purchaseDetail.cmpCode || '-'}}</span>

components/mobile/applyPurchase/SeekList.vue

@@ -17,7 +17,7 @@
               <span>{{item.inbrand || '-'}}</span>
             </div>
             <div class="content">
-              物料名称(类目)：
+              物料名称：
               <span>{{item.title || item.prodTitle || '-'}}</span>
             </div>
             <div class="content">

components/mobile/base/SearchHeader.vue

@@ -9,7 +9,7 @@
         <li class="text-ellipse" v-for="brand in similarList.pBrandEn.slice(0, 4)" @click="onSearch(brand.nameEn, 'pBrandEn', $event)">{{brand.nameEn}}</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.kind, 'kind', $event)">{{kind.kind}}</li>
       </template>
       <template v-if="similarList.pCmpCode && similarList.pCmpCode.length">
@@ -23,7 +23,7 @@
         <li class="text-ellipse" v-for="brand in similarList.brand.slice(0, 4)" @click="onSearch(brand.nameEn, 'brand', $event)">{{brand.nameEn}}</li>
       </template>
       <template v-if="similarList.kind && similarList.kind.length && (similarType == 'all' || similarType == 'kind')">
-        <li class="title text-ellipse" v-if="similarType == 'all'">物料名称(类目)</li>
+        <li class="title text-ellipse" v-if="similarType == 'all'">物料名称</li>
         <li class="text-ellipse" v-for="kind in similarList.kind.slice(0, 4)" @click="onSearch(kind.nameCn, 'kind', $event)">{{kind.nameCn}}</li>
       </template>
       <template v-if="similarList.component && similarList.component.length && (similarType == 'all' || similarType == 'code')">

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>

components/mobile/brand/ComponentDetail.vue

@@ -6,7 +6,7 @@
         <span>{{component.brand.nameCn || '-'}}</span>
       </div>
       <div class="base-detail-item">
-        <span>物料名称(类目)：</span>
+        <span>物料名称：</span>
         <span>{{component.kind.nameCn || '-'}}</span>
       </div>
       <!--<div class="base-detail-item">-->
@@ -50,7 +50,7 @@
           </div>
           <div class="list">
             <div class="fl" style="width: 100%">
-              <div class="name">物料名称(类目)：</div>
+              <div class="name">物料名称：</div>
               <div class="text" style="color: #3f84f6">{{item.kindNameCn || '-'}}</div>
             </div>
 

components/mobile/store/StoreDetail.vue

@@ -107,7 +107,7 @@
             </div>
             <div class="list">
               <div class="fl">
-                <div class="name">物料名称(类目)：</div>
+                <div class="name">物料名称：</div>
                 <div class="text overHidden" style="width: 1rem">{{item.kindNameCn || '-'}}</div>
               </div>
               <div class="fl">

components/mobile/supplier/SupplierDetail.vue

@@ -49,7 +49,7 @@
       <ul v-if="productListData && productListData.length">
         <li v-for="product in productListData">
           <div class="prop">
-            <span class="head">品牌/物料名称(类目)：</span>
+            <span class="head">品牌/物料名称：</span>
             <span class="item">{{(product.standard == 1 ? product.pbranden : product.brand) || '—'}}</span>
             <span class="item">{{product.kind || product.prodName || '—'}}</span>
           </div>

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/product/brand/BrandComponent.vue

@@ -12,7 +12,7 @@
     <table class="table" v-if="activeTab == 0">
       <thead>
         <tr class="bgf7">
-          <th width="350">物料名称(类目)</th>
+          <th width="350">物料名称</th>
           <th width="350">型号</th>
           <th width="350">规格</th>
           <th width="250">规格书</th>

components/product/component/ComponentDetail.vue

@@ -20,7 +20,7 @@
               <div :title="list.brand ? list.brand.nameCn : ''"><a class="message-body blue" target="_blank" :href="`/product/brand/${list.brand.uuid}`">{{list.brand && list.brand.nameCn ?  list.brand.nameCn : ''}}</a></div>
             </div>
             <div class="message-detail">
-              <div class="message-item">物料名称(类目)</div>
+              <div class="message-item">物料名称</div>
               <div class="colon">:</div>
               <div class="message-body body-long">
                 {{list.kind && list.kind.nameCn ? list.kind.nameCn : '-'}}

components/search/ForwardGoodsList.vue

@@ -5,7 +5,7 @@
         <tr>
           <th width="25%">型号/品牌</th>
           <th width="25%">卖家名称</th>
-          <th width="25%">物料名称(类目)/单位</th>
+          <th width="25%">物料名称/单位</th>
           <th width="15%">规格</th>
           <th width="15%"></th>
         </tr>
@@ -30,7 +30,7 @@
           </td>
           <td>
             <div class="line">
-              <span class="title inline-block">物料名称(类目)</span>
+              <span class="title inline-block">物料名称</span>
               <span class="content inline-block" :title="item.kind || item.kinden">{{item.kind || item.kinden || '-'}}</span>
             </div>
             <div class="line">

components/search/GoodList.vue

@@ -41,7 +41,7 @@
           <thead>
           <tr style="height: 40px;">
             <!--<th width="80"></th>-->
-            <th width="200">品牌/物料名称(类目)/型号/规格</th>
+            <th width="200">品牌/物料名称/型号/规格</th>
             <th width="100">包装/生产日期</th>
             <th width="110">卖家名称</th>
             <th width="140">库存</th>

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

@@ -34,7 +34,7 @@
         <table class="goodslist" style="width: 955px;background:#fff;" >
           <thead>
           <tr>
-            <th width="165"><div>品牌/物料名称(类目)</div></th>
+            <th width="165"><div>品牌/物料名称</div></th>
             <th width="148"><div>型号/规格</div></th>
             <th width="114"><div>包装/生产日期</div></th>
             <th width="125"><div>库存</div></th>

components/supplier/details.vue

@@ -21,7 +21,7 @@
           <h4 v-text="detail.cmpCode">3</h4>
           <ul class="list-unstyled">
             <li class="item">
-              <span>物料名称(类目)</span>
+              <span>物料名称</span>
               <p v-text="detail.kind ? spliceString(detail.kind, 135) : detail.prodName ? spliceString(detail.prodName, 135) : '暂无信息'">1</p>
             </li>
             <li class="item">
@@ -66,7 +66,7 @@
             <p v-text="detail.standard !== 1 ? spliceString(detail.brand, 90) : spliceString(detail.pbranden, 90)">2</p>
           </li>
           <li class="form-item">
-            <span>物料名称(类目)：</span>
+            <span>物料名称：</span>
             <p v-text="detail.kind ? spliceString(detail.kind, 90) : detail.prodName ? spliceString(detail.prodName, 90) : '-'">1</p>
           </li>
           <li class="form-item">

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">
@@ -113,7 +113,7 @@
             <p v-text="applyObj.brand ? spliceString(applyObj.brand, 90) : '-'">32432</p>
           </li>
           <li class="form-item">
-            <span>物料名称(类目)：</span>
+            <span>物料名称：</span>
             <p v-text="applyObj.prodName ? spliceString(applyObj.prodName, 90) : '-'">32</p>
           </li>
           <li class="form-item">

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>
@@ -111,7 +111,7 @@
           </div>
           <div class="content">
             <div class="fl">
-              <div class="linetext">物料名称(类目)：
+              <div class="linetext">物料名称：
                 <template v-if="!item.kind">
                   {{item.kinden || '-'}}
                 </template>
@@ -143,7 +143,7 @@
           <div class="middle">
             <div class="list">
               <div class="fl">
-                <div class="name">物料名称(类目)：</div>
+                <div class="name">物料名称：</div>
                 <div class="text">{{item.kindNameCn || '-'}}</div>
               </div>
               <div class="fr">
@@ -276,7 +276,7 @@
         <div class="content">
           <div class="infob">
             <div class="info"><div class="name">型号：</div><div>{{cnmpCode}}</div></div>
-            <div class="info"><div class="name">物料名称(类目)：</div><div>{{cnmpType || '-'}}</div></div>
+            <div class="info"><div class="name">物料名称：</div><div>{{cnmpType || '-'}}</div></div>
             <div class="info"><div class="name">品牌：</div><div>{{cnmpBand}}</div></div>
           </div>
           <div class="content_sq" v-bind:key="item.id" v-for="(item, index) in vendorlist" >

pages/mobile/center/user/applyPurchase.vue

@@ -21,7 +21,7 @@
           <li v-for="comp in compList">
             <div class="listInfo">
               <p>品牌：<span v-text="comp.brand || '-'"></span></p>
-              <p>物料名称(类目)：<span v-text="comp.kind || '-'"></span></p>
+              <p>物料名称：<span v-text="comp.kind || '-'"></span></p>
               <p>型号：<span v-text="comp.cmpCode || '-'"></span></p>
               <p>规格：<span v-text="comp.spec || '-'"></span></p>
               <p>单位：<span v-text="comp.unit || 'PCS'"></span></p>

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>

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

@@ -10,7 +10,7 @@
         <li class="clearfix" :key="comp.componentid" v-for="comp in compList" @click="goUrl('/mobile/brand/componentDetail/' + comp.componentinfo.uuid)">
           <div class="fl">
             <p>品牌：<span v-text="comp.componentinfo.brand.nameCn || '-'"></span></p>
-            <p>物料名称(类目)：<span v-text="comp.componentinfo.kind.nameCn || '-'"></span></p>
+            <p>物料名称：<span v-text="comp.componentinfo.kind.nameCn || '-'"></span></p>
             <p>型号：<span v-text="comp.componentinfo.code || '-'"></span></p>
             <p>规格：<span v-text="comp.componentinfo.spec || '-'"></span></p>
             <p>产品描述：<span v-text="comp.componentinfo.description || '-'"></span></p>

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>
@@ -173,7 +173,7 @@
               <span>品牌：</span>{{cGoods.brName}}
             </div>
             <div class="cg-param-line text-ellipse">
-              <span>物料名称(类目)：</span>{{cGoods.kiName}}
+              <span>物料名称：</span>{{cGoods.kiName}}
             </div>
             <div class="cg-param-line text-ellipse">
               <span>型号：</span>{{cGoods.cmpCode}}

pages/mobile/center/vendor/attentionBus.vue

@@ -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

@@ -19,7 +19,7 @@
           <div class="content">
             <div class="fl" :class="providerType === 'enterprise' ? 'fullWidth': ''">
               <div class="linetext">品牌：{{item.pbranden}}</div>
-              <div class="linetext">物料名称(类目)：
+              <div class="linetext">物料名称：
                 <template v-if="!item.kind">
                   {{item.kinden || '-'}}
                 </template>
@@ -70,7 +70,7 @@
             </div>
             <div class="list">
               <div class="fl">
-                <div class="name">物料名称(类目)：</div>
+                <div class="name">物料名称：</div>
                 <div class="text">{{item.kindNameCn || '-'}}</div>
               </div>
               <div class="fr">
@@ -155,7 +155,7 @@
           <div class="content">
             <div class="infob">
               <div class="info"><div class="name">品牌：</div><div>{{cnmpBand}}</div></div>
-              <div class="info"><div class="name">物料名称(类目)：</div><div>{{cnmpType || '-'}}</div></div>
+              <div class="info"><div class="name">物料名称：</div><div>{{cnmpType || '-'}}</div></div>
               <div class="info"><div class="name">型号：</div><div>{{cnmpCode}}</div></div>
             </div>
             <div class="content_sq" v-bind:key="item.id" v-for="(item, index) in vendorlist" >
@@ -308,14 +308,14 @@
           </template>
         </div>
         <div class="update-materiel-wrapper-list clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
-          <div class="name pull-left"><a class="red">*</a>物料名称(类目)：</div>
+          <div class="name pull-left"><a class="red">*</a>物料名称：</div>
           <template v-if="MaterielItem.standard === 1">
             {{MaterielItem.kind}}
           </template>
           <template v-else>
             <div class="input pull-left clearfix"  style="width: 4.09rem">
               <!--<input type="text" v-model="MaterielItem.kind" @blur="checkCode" @input="onCodeChange" placeholder="请勿填中文符号">-->
-              <input type="text" placeholder="请输入物料名称(类目)" v-model="MaterielItem.kind"/>
+              <input type="text" placeholder="请输入物料名称" v-model="MaterielItem.kind"/>
               <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.kind = ''"></i>
             </div>
           </template>

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

@@ -5,7 +5,7 @@
         <div class="content">
           <div class="infob">
             <div class="info"><div class="name">品牌：</div><div>{{cnmpBand}}</div></div>
-            <div class="info"><div class="name">物料名称(类目)：</div><div>{{cnmpType || '-'}}</div></div>
+            <div class="info"><div class="name">物料名称：</div><div>{{cnmpType || '-'}}</div></div>
             <div class="info"><div class="name">型号：</div><div>{{cnmpCode}}</div></div>
             <div class="info"><div class="name">规格：</div><div>{{cnmpSpec}}</div></div>
             <div class="info"><div class="name">单位：</div><div>{{cnmpUnit}}</div></div>

pages/mobile/center/vendor/productdetails.vue

@@ -12,7 +12,7 @@
         <span>{{chooseItem.brandNameEn}}</span>
       </div>
       <div class="over list">
-        <span class="name">物料名称(类目):</span>
+        <span class="name">物料名称:</span>
         <span>{{chooseItem.kindNameCn || '-'}}</span>
       </div>
       <div class="over list clearfix">

pages/mobile/order/details.vue

@@ -73,7 +73,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" style="width: 1.79rem">{{details.kiName || '-'}}</div>
               </div>
               <div class="pull-left list-wrap-content-brand clearfix">

pages/mobile/order/index.vue

@@ -77,7 +77,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" style="width: 1.79rem;">{{details.kiName || '-'}}</div>
             </div>
             <div class="pull-left list-wrap-content-brand clearfix">

pages/mobile/product/_batchCode.vue

@@ -21,7 +21,7 @@
         </div>
         <div class="list">
           <div class="fl">
-            <div class="name">物料名称(类目)：</div>
+            <div class="name">物料名称：</div>
             <div class="text">{{commodity.kindNameCn || '-'}}</div>
           </div>
         </div>

pages/mobile/search/_keycode.vue

@@ -35,7 +35,7 @@
         <div class="brand-item" @click="goComponent(item)">
           <p>卖家名称：<span>{{item.storeName || '-'}}</span></p>
           <p>品牌：<span>{{item.brandEn || item.brand.nameCn || '-'}}</span></p>
-          <p>物料名称(类目)：<span>{{item.kind ? item.kind.nameCn : '-'}}</span></p>
+          <p>物料名称：<span>{{item.kind ? item.kind.nameCn : '-'}}</span></p>
           <p>型号：<span>{{item.code || '-'}}</span></p>
           <p>规格：<span>{{item.spec || '-'}}</span></p>
           <p>产品描述：<span>{{item.description || '-'}}</span></p>

pages/mobile/search/newkeycode.vue

@@ -124,7 +124,7 @@
                        <div class="text overHidden">{{item.brand && item.brand.nameEn || '-'}}</div>
                      </div>
                      <div class="list">
-                       <div class="name">物料名称(类目)：</div>
+                       <div class="name">物料名称：</div>
                        <div class="text overHidden">{{item.kindNameCn || '-'}}</div>
                      </div>
                      <div class="list">
@@ -251,7 +251,7 @@
                      <div class="text overHidden">{{item.brandNameEn || item.brand || '—'}}</div>
                    </div>
                    <div class="list">
-                     <div class="name">物料名称(类目)：</div>
+                     <div class="name">物料名称：</div>
                      <div class="text overHidden">{{item.kindNameCn || item.kind || '-'}}</div>
                    </div>
                    <div class="list">

pages/mobile/share/purChase/_uuid.vue

@@ -13,7 +13,7 @@
         <div class="brand">品牌：
           <span>{{purchaseDetail.inbrand || '-'}}</span>
         </div>
-        <div class="size">物料名称(类目)：
+        <div class="size">物料名称：
           <span>{{purchaseDetail.prodTitle}}</span>
         </div>
         <div class="size">规格：

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>