品牌类目型号规格字段调整

assets/scss/mobileCommon.scss

@@ -418,3 +418,7 @@ html {
   background: #f1f3f6;
   overflow-y: auto;
 }
+
+.overflow-hidden {
+  overflow: hidden !important;
+}

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">已报价
@@ -41,17 +41,17 @@
           </div>
           <div class="il-item il-center">
             <div class="il-box-large il-box">
-              <div :title="purchaseMan.prodTitle | nullFilter" class="fl item size-middle">
-                <span>类目(产品名称)</span>
-                <div class="content">{{(purchaseMan.prodTitle || '-') | nullFilter}}</div>
+              <div :title="purchaseMan.inbrand" class="fl item size-middle">
+                <span>品牌</span>
+                <div class="content">{{purchaseMan.inbrand || '-'}}</div>
               </div>
-              <div :title="purchaseMan.cmpCode" class="fl item">
+              <div :title="purchaseMan.prodTitle | nullFilter" class="fl item">
                 <span>型号</span>
                 <div class="content">{{purchaseMan.cmpCode || '-'}}</div>
               </div>
-              <div :title="purchaseMan.inbrand" class="fl item bottom size-middle">
-                <span>品牌</span>
-                <div class="content">{{purchaseMan.inbrand || '-'}}</div>
+              <div :title="purchaseMan.cmpCode" class="fl item bottom size-middle">
+                <span>类目(产品名称)</span>
+                <div class="content">{{(purchaseMan.prodTitle || '-') | nullFilter}}</div>
               </div>
               <div :title="purchaseMan.spec" class="fl item bottom">
                 <span>规格</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>-->
@@ -30,15 +30,6 @@
           <td>
             <div class="prod-items">
               <div class="prod-item prod-item-large" :title="item.kind">
-                <span class="pi-title">类目(产品名称)：</span>
-                <div class="pi-content over-ell">{{item.kind || '-'}}</div>
-              </div>
-              <!--<div class="prod-item prod-item-small">
-                <span class="pi-title">单价预算：</span>
-                <div class="pi-content over-ell" v-if="item.unitPrice">{{(item.currency === 'RMB' ? '¥' : '$') + item.unitPrice}}</div>
-                <div class="pi-content over-ell" v-else="!item.unitPrice">-</div>
-              </div>-->
-              <div class="prod-item prod-item-large" :title="item.brand">
                 <span class="pi-title"><i class="red-text">*</i>品牌：</span>
                 <div class="pi-content over-ell" v-if="item.brand && (!item.brandWord || item.brandWord.length == 0)" :title="item.brand">{{item.brand}}</div>
                 <div class="pi-content red-text" v-if="!item.brand">请完善信息</div>
@@ -47,6 +38,15 @@
                   <li v-for="brand in item.brandWord" @click="modifyItemByWord(index, brand.nameEn, 'brand')" :title="brand.nameEn">{{brand.nameEn}}</li>
                 </ul>
               </div>
+              <!--<div class="prod-item prod-item-small">
+                <span class="pi-title">单价预算：</span>
+                <div class="pi-content over-ell" v-if="item.unitPrice">{{(item.currency === 'RMB' ? '¥' : '$') + item.unitPrice}}</div>
+                <div class="pi-content over-ell" v-else="!item.unitPrice">-</div>
+              </div>-->
+              <div class="prod-item prod-item-large" :title="item.brand">
+                <span class="pi-title">类目(产品名称)：</span>
+                <div class="pi-content over-ell">{{item.kind || '-'}}</div>
+              </div>
               <!--<div class="prod-item prod-item-small" :title="item.encapsulation">
                 <span class="pi-title">封装：</span>
                 <div class="pi-content over-ell">
@@ -156,10 +156,6 @@
            </td>-->
           <td>
             <div class="prod-items">
-              <div class="prod-item prod-item-large">
-                <span class="pi-title">类目(产品名称)：</span>
-                <input type="text" class="form-control" v-model="modifyObj.kind" @input="onProdTitleInput">
-              </div>
               <div class="prod-item prod-item-large">
                 <span class="pi-title"><i class="red-text">*</i>品牌：</span>
                 <input type="text" class="form-control" v-model="modifyObj.brand" :class="{'error': !validObj.brand}" @blur="checkBrand" @input="onBrandChange">
@@ -167,6 +163,10 @@
                   <li v-for="sBrand in similarBrand" @click="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
                 </ul>
               </div>
+              <div class="prod-item prod-item-large">
+                <span class="pi-title">类目(产品名称)：</span>
+                <input type="text" class="form-control" v-model="modifyObj.kind" @input="onProdTitleInput">
+              </div>
               <!--<div class="prod-item prod-item-small pi-select">
                 <span class="pi-title">单价预算：</span>
                 <select class="form-control" v-model="modifyObj.currency">

components/applyPurchase/PublishApply.vue

@@ -15,6 +15,21 @@
       <div class="publish-form-area">
         <p>单个求购</p>
         <div>
+          <div class="form-item">
+            <span>
+              <i>*</i>品牌：
+            </span>
+            <input type="text" class="form-control" :class="{'error': !validObj.brand}" v-model="applyObj.brand" @blur="checkBrand" @input="onBrandChange" placeholder="请勿填中文符号" />
+            <ul class="brand-similar-list" v-show="showSimilarBrandList && applyObj.brand">
+              <li v-for="sBrand in similarBrand" @click="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
+            </ul>
+          </div>
+          <div class="form-item">
+           <span>
+              类目(产品名称)：
+            </span>
+            <input type="text" class="form-control" v-model="applyObj.prodTitle" @input="onProdTitleInput"/>
+          </div>
           <div class="form-item">
             <span>
               <i>*</i>型号：
@@ -25,13 +40,10 @@
             </ul>
           </div>
           <div class="form-item">
-            <span>
-              <i>*</i>品牌：
+           <span>
+              规格：
             </span>
-            <input type="text" class="form-control" :class="{'error': !validObj.brand}" v-model="applyObj.brand" @blur="checkBrand" @input="onBrandChange" placeholder="请勿填中文符号" />
-            <ul class="brand-similar-list" v-show="showSimilarBrandList && applyObj.brand">
-              <li v-for="sBrand in similarBrand" @click="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
-            </ul>
+            <input type="text" class="form-control" :class="{'error': !validObj.spec}" v-model="applyObj.spec" @blur="checkSpec" @input="onSpecInput"/>
           </div>
           <div class="form-item">
             <span>
@@ -59,18 +71,6 @@
             </select>
             <input type="number" class="form-control" :class="{'error': !validObj.unitPrice}" v-model="applyObj.unitPrice" @blur="checkUnitPrice" @input="onUnitPriceInput" />
           </div>-->
-          <div class="form-item">
-           <span>
-              类目(产品名称)：
-            </span>
-            <input type="text" class="form-control" v-model="applyObj.prodTitle" @input="onProdTitleInput"/>
-          </div>
-          <div class="form-item">
-           <span>
-              规格：
-            </span>
-            <input type="text" class="form-control" :class="{'error': !validObj.spec}" v-model="applyObj.spec" @blur="checkSpec" @input="onSpecInput"/>
-          </div>
           <!--<div class="form-item">
            <span>
               封装：

components/applyPurchase/SayPrice.vue

@@ -9,6 +9,16 @@
           <i class="fa fa-close" @click="cancelSayPrice"></i>
         </div>
         <div class="content">
+          <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>
+            </div>
+          </div>
+          <div class="content-line">
+            <div class="form-item form-left text-line">
+              <span>规格：</span><span class="text"  :title="purchaseManList.content[currentSayPriceIndex].spec">{{purchaseManList.content[currentSayPriceIndex].spec || '-'}}</span>
+            </div>
+          </div>
           <div class="content-line">
             <div class="form-item form-left text-line">
               <span>型号：</span><span class="text" :title="purchaseManList.content[currentSayPriceIndex].cmpCode">{{purchaseManList.content[currentSayPriceIndex].cmpCode}}</span>

components/mobile/applyPurchase/PublishSupplierSeek.vue

@@ -3,9 +3,9 @@
     <div class="mobile-modal-box">
       <div class="mobile-modal-header">我要询价<i class="icon-guanbi iconfont" @click="cancel"></i></div>
       <div class="props">
-        <div class="prop">型号：{{applyObj.code || '-'}}</div>
         <div class="prop">品牌：{{applyObj.brand || '-'}}</div>
         <div class="prop">类目(产品名称)：{{applyObj.prodTitle || '-'}}</div>
+        <div class="prop">型号：{{applyObj.code || '-'}}</div>
         <div class="prop">规格：{{applyObj.spec || '-'}}</div>
       </div>
       <div class="publish-seek">
@@ -69,7 +69,7 @@
             this.applyObj.brand = isStandard ? val.pbranden : val.brand
             this.applyObj.spec = val.spec
 //            this.applyObj.unit = val.unit || 'PCS'
-            this.applyObj.prodTitle = isStandard ? val.kind : val.prodName
+            this.applyObj.prodTitle = val.kind || val.prodName
           }
         },
         immediate: true

components/mobile/base/SearchHeader.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="search-content com-mobile-header">
     <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
-    <input type="text" v-model="keyword" @input="getSimilarList()" :placeholder="placeholder" @keyup.13="onSearch()">
+    <input type="text" v-model="keyword" @input="onKeywordInput()" :placeholder="placeholder" @keyup.13="onSearch()">
     <span @click="onSearch()"><i class="iconfont icon-sousuo"></i></span>
     <ul v-if="emptyStatus && type == 'supplier' && keyword && keyword !== '' && showSimilarWord">
       <template v-if="similarList.pCmpCode && similarList.pCmpCode.length">
@@ -10,7 +10,7 @@
       </template>
       <template v-if="similarList.pBrandEn && similarList.pBrandEn.length">
         <li class="title text-ellipse">品牌</li>
-        <li class="text-ellipse" v-for="brand in similarList.pBrandEn.slice(0, 4)" @click="onSearch(brand.nameCn, 'pBrandEn', $event)">{{brand.nameCn}}</li>
+        <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>
@@ -52,6 +52,10 @@
       showSimilar: { // 是否显示联想词
         type: Boolean,
         default: true
+      },
+      outerKeyword: {
+        type: String,
+        default: ''
       }
     },
     data () {
@@ -59,7 +63,16 @@
         keyword: '',
         similarList: {},
         showSimilarWord: false,
-        searchKeyword: ''
+        searchKeyword: '',
+        clickCount: 0
+      }
+    },
+    watch: {
+      outerKeyword: {
+        handler: function (val) {
+          this.keyword = val
+        },
+        immediate: true
       }
     },
     mounted () {
@@ -99,10 +112,10 @@
           })
         } else {
           let sType = null
-          if (this.type === 'supplier') {
+          if (this.type === 'supplier' && this.keyword && this.keyword !== '') {
             if (this.similarList.pCmpCode[0] && this.keyword === this.similarList.pCmpCode[0].pCmpCode) {
               sType = 'pCmpCode'
-            } else if (this.similarList.pBrandEn[0] && this.keyword === this.similarList.pBrandEn[0].nameCn) {
+            } else if (this.similarList.pBrandEn[0] && this.keyword === this.similarList.pBrandEn[0].nameEn) {
               sType = 'pBrandEn'
             } else if (this.similarList.kind[0] && this.keyword === this.similarList.kind[0].kind) {
               sType = 'kind'
@@ -112,8 +125,8 @@
                 if (arr[0].pCmpCode) {
                   this.keyword = arr[0].pCmpCode
                   sType = 'pCmpCode'
-                } else if (arr[0].nameCn) {
-                  this.keyword = arr[0].nameCn
+                } else if (arr[0].nameEn) {
+                  this.keyword = arr[0].nameEn
                   sType = 'pBrandEn'
                 } else if (arr[0].kind) {
                   this.keyword = arr[0].kind
@@ -131,8 +144,16 @@
         scrollTo('body', 10)
         this.showSimilarWord = false
       },
-      getSimilarList: function () {
-        if (this.showSimilar && this.keyword && this.keyword !== '') {
+      onKeywordInput: function () {
+        this.clickCount ++
+        let count = this.clickCount
+        let timer = setTimeout(() => {
+          this.getSimilarList(count, timer)
+        }, 300)
+      },
+      getSimilarList: function (clickCount, timer) {
+        clearTimeout(timer)
+        if (this.showSimilar && this.keyword && this.keyword !== '' && clickCount === this.clickCount) {
           this.$http.get(this.similarUrl, {params: {keyword: this.keyword}}).then(
             res => {
               this.similarList = res.data

components/mobile/center/Seek.vue

@@ -2,7 +2,7 @@
   <div class="seek">
     <div class="com-mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
-      <p>{{seekType === 'wait' ? '待报价' : '已报价'}}</p>
+      <p>{{seekTitle}}</p>
     </div>
     <div class="mobile-fix-content" id="mobileFixContent">
       <div class="search-content">
@@ -63,6 +63,18 @@
       },
       allPage () {
         return Math.floor(this.purchase.data.totalElements / this.purchase.data.size) + Math.floor(this.purchase.data.totalElements % this.purchase.data.size > 0 ? 1 : 0)
+      },
+      seekTitle () {
+        if (this.seekType === 'wait') {
+          if (this.userType === 'saler') {
+            return '我的商机'
+          } else {
+            return '待报价'
+          }
+        } else if (this.seekType === 'done') {
+          return '已报价'
+        }
+        return '已报价'
       }
     },
     methods: {

components/mobile/supplier/SupplierDetail.vue

@@ -49,13 +49,13 @@
       <ul v-if="productListData && productListData.length">
         <li v-for="product in productListData">
           <div class="prop">
-            <span class="head">型号/品牌：</span>
-            <span class="item">{{product.cmpCode || '—'}}</span>
+            <span class="head">品牌/类目：</span>
             <span class="item">{{(product.standard == 1 ? product.pbranden : product.brand) || '—'}}</span>
+            <span class="item">{{(product.standard == 1 ? product.kind : product.prodName) || '—'}}</span>
           </div>
           <div class="prop">
-            <span class="head">类目/规格：</span>
-            <span class="item">{{(product.standard == 1 ? product.kind : product.prodName) || '—'}}</span>
+            <span class="head">型号/规格：</span>
+            <span class="item">{{product.cmpCode || '—'}}</span>
             <span class="item">{{product.spec || '—'}}</span>
           </div>
           <div class="prop">

components/product/brand/BrandComponent.vue

@@ -12,16 +12,16 @@
     <table class="table" v-if="activeTab == 0">
       <thead>
         <tr class="bgf7">
-          <th width="300">型号</th>
           <th width="300">类目(产品名称)</th>
+          <th width="300">型号</th>
           <th width="200">数据手册</th>
           <th width="200">操作</th>
         </tr>
       </thead>
       <tbody>
         <tr class="text-center" v-for="item in list.content">
-          <td><nuxt-link :to="'/product/component/' + item.uuid"><span>{{item.code}}</span></nuxt-link></td>
           <td><nuxt-link :to="'/product/kind/' + item.kindid"><span>{{item.kind.nameCn || '-'}}</span></nuxt-link></td>
+          <td><nuxt-link :to="'/product/component/' + item.uuid"><span>{{item.code}}</span></nuxt-link></td>
           <td><a @click="toAttach(item.attach)"><button class="btn btn-default"  :disabled="!item.attach" :class="{'disabledbtn':!item.attach}">Datasheet手册</button></a></td>
           <td>
             <button class="btn btn-default disabledbtn" :disabled="true">申请样片</button>

components/search/GoodList.vue

@@ -41,7 +41,7 @@
           <thead>
           <tr style="height: 40px;">
             <!--<th width="80"></th>-->
-            <th width="140">品牌/型号/类目</th>
+            <th width="140">品牌/类目/型号</th>
             <th width="100">包装/生产日期</th>
             <th width="110">商家名称</th>
             <th width="140">库存</th>
@@ -66,13 +66,13 @@
               <img v-if="item.status === 602" class="sellout-flag" src="/images/search/sellout-search.png" alt="">
               <div class="brand" v-if="item.brand&&item.brand.nameEn"><nuxt-link :to="`/product/brand/${item.brand.uuid}`" class="text-num" v-text="item.brand.nameEn"></nuxt-link></div>
               <div class="brand" v-if="!item.brand||!item.brand.nameEn">{{item.brandEn||'—'}}</div>
+              <div class="brand"  v-if="item.kind&&item.kind.nameCn"><nuxt-link :to="`/product/kind/${item.kindid}`" v-text="item.kind.nameCn"></nuxt-link></div>
+              <div class="brand" v-if="!item.kind||!item.kind.nameCn">{{item.kindName || '—'}}</div>
               <div class="code"  v-if="item.code">
                 <nuxt-link v-if="item.uuid" :to="`/product/component/${item.uuid}`" class="f16 text-bold text-num" v-text="item.code"></nuxt-link>
                 <span v-if="!item.uuid">{{item.code}}</span>
               </div>
               <div class="brand" v-if="!item.code">—</div>
-              <div class="brand"  v-if="item.kind&&item.kind.nameCn"><nuxt-link :to="`/product/kind/${item.kindid}`" v-text="item.kind.nameCn"></nuxt-link></div>
-              <div class="brand" v-if="!item.kind||!item.kind.nameCn">{{item.kindName || '—'}}</div>
             </td>
             <td>
               <div class="package" v-text="item.packaging"></div>

components/store/CommodityInfo.vue

@@ -37,16 +37,16 @@
               <span class="name">品&nbsp;牌</span>：<span v-text="commodity.brandNameEn"></span>
             </div>
             <div class="com-info">
-              <span class="name">类&nbsp;目</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>：<a @click="toAttach(component.attach)" v-if="component.attach">规格书</a><span v-if="!component.attach">暂无信息</span>
+              <span class="name">规&nbsp;格</span>：<span v-text="commodity.spec || '无规格信息'"></span>
             </div>
             <div class="com-info">
-              <span class="name">包&nbsp;装</span>：<span v-text="commodity.packaging || '无包装信息'"></span>
+              <span class="name">下&nbsp;载</span>：<a @click="toAttach(component.attach)" v-if="component.attach">规格书</a><span v-if="!component.attach">暂无信息</span>
             </div>
             <div class="com-info">
-              <span class="name">规&nbsp;格</span>：<span v-text="commodity.spec || '无规格信息'"></span>
+              <span class="name">包&nbsp;装</span>：<span v-text="commodity.packaging || '无包装信息'"></span>
             </div>
             <div class="com-info">
               <span class="name" style="letter-spacing: 1.5px;">最小包装数</span>：<span v-text="commodity.minPackQty || '无最小包装数信息'"></span>
@@ -586,6 +586,9 @@
   .content .com-info .name {
     letter-spacing: 15px;
   }
+  .content .com-info .no-letter {
+    letter-spacing: 1.5px;
+  }
   .content .com-info a{
     color: #1162a4;
   }

components/store/CommodityList.vue

@@ -35,7 +35,7 @@
           <thead>
           <tr style="height: 40px;">
             <!--<th width="90"></th>-->
-            <th width="140">品牌/型号/类目</th>
+            <th width="140">品牌/类目/型号/规格</th>
             <th width="100">包装/生产日期</th>
             <th width="110">库存</th>
             <th width="90">梯度/pcs</th>
@@ -58,10 +58,11 @@
                 <span v-if="commodity.brandEn">{{commodity.brandEn}}</span>
               </div>
               <div class="brand" v-if="!commodity.brandNameEn && !commodity.brandEn">—</div>
-              <div class="code" v-if="commodity.code" v-text="commodity.code"></div>
-              <div class="code" v-if="!commodity.code">—</div>
               <a v-if="commodity.kindNameCn" @click="goBrandDetail('/product/kind/' + commodity.kindUuid, $event)" v-text="commodity.kindNameCn"></a>
               <div class="brand" v-if="!commodity.kindNameCn">—</div>
+              <div class="code" v-if="commodity.code" v-text="commodity.code"></div>
+              <div class="code" v-if="!commodity.code">—</div>
+              <div class="brand" v-text="commodity.spec || '—'"></div>
             </td>
             <td>
               <div class="package" v-if="commodity.packaging" v-text="commodity.packaging"></div>

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

@@ -8,9 +8,9 @@
       <ul v-if="compList && compList.length">
         <li :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.code"></span></p>
             <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>
           </div>
           <div class="vir"></div>
           <div class="fr">

pages/mobile/center/vendor/product.vue

@@ -25,6 +25,7 @@
           </div>
           <div class="content">
             <div class="fl">
+              <div class="linetext">品牌：{{item.pbranden}}</div>
               <div class="linetext">类目(产品名称)：
                 <template v-if="!item.kind">
                   {{item.kinden || '-'}}
@@ -33,7 +34,7 @@
                   {{item.kind || '-'}}
                 </template>
               </div>
-              <div class="linetext">品牌：{{item.pbranden}}</div>
+              <div class="linetext">规格：{{item.spec}}</div>
               <div class="linetext">单位：PCS</div>
             </div>
             <div class="fr" :class="providerType == 'enterprise' && item.batchCount > 0 ? '' : 'addtop'" >
@@ -58,8 +59,8 @@
           <div class="middle">
             <div class="list list-long">
               <div class="fl">
-                <div class="name">规格：</div>
-                <div class="text">{{item.spec || '-'}}</div>
+                <div class="name">品牌：</div>
+                <div class="text">{{item.brandNameEn}}</div>
               </div>
             </div>
             <div class="list">
@@ -73,8 +74,8 @@
             </div>
             <div class="list">
               <div class="fl">
-                <div class="name">品牌：</div>
-                <div class="text">{{item.brandNameEn}}</div>
+                <div class="name">规格：</div>
+                <div class="text">{{item.spec || '-'}}</div>
               </div>
               <div class="fr">
                 <div class="name">交期(天)：</div>
@@ -137,91 +138,94 @@
       </div>
     </div>
     <!-- 企业产品库 查看信息 -->
-    <div class="deleteKuang" v-show="showMoreinfn">
+    <div class="deleteKuang" v-show="showMoreinfn" @touchmove="preventTouchMove($event)">
       <div class="Kuang">
-        <div class="title">产品信息<i data-v-4faa6b2d="" @click="closeMoreinfo()" class="icon-guanbi iconfont"></i></div>
-        <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>{{cnmpBand}}</div></div>
-          </div>
-          <div class="content_sq" v-bind:key="item.id" v-for="(item, index) in vendorlist" >
-            <div class="labelBg">
-              <div class="labelinfo" style="margin-left: -0.1rem">
-                <div class="labelicon" style="vertical-align:top;margin-top: 0.09rem">标签</div>
-                <div class="labeltext">{{item.tag}}</div>
-              </div>
-              <div class="middle">
-                <div class="list">
-                  <div class="fl">
-                    <div class="name">
-                      <div class="pms">
-                        {{item.storeid === '33069557578d44e69bd91ad12d28a8d4' ? '寄售' : '自营'}}
+        <div class="title">产品信息<i @click="closeMoreinfo()" class="icon-guanbi iconfont"></i></div>
+        <div class="overflow-hidden" ref="mobileModalBox">
+          <div class="content overflow-hidden">
+            <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>{{cnmpCode}}</div></div>
+              <div class="info"><div class="name">规格：</div><div>{{cnmpSpec}}</div></div>
+            </div>
+            <div class="content_sq" v-bind:key="item.id" v-for="(item, index) in vendorlist" >
+              <div class="labelBg">
+                <div class="labelinfo" style="margin-left: -0.1rem">
+                  <div class="labelicon" style="vertical-align:top;margin-top: 0.09rem">标签</div>
+                  <div class="labeltext">{{item.tag}}</div>
+                </div>
+                <div class="middle">
+                  <div class="list">
+                    <div class="fl">
+                      <div class="name">
+                        <div class="pms">
+                          {{item.storeid === '33069557578d44e69bd91ad12d28a8d4' ? '寄售' : '自营'}}
+                        </div>
                       </div>
                     </div>
+                    <div class="fr">
+                      <div class="textinfo" v-if="item.breakUp">可拆卖</div>
+                    </div>
                   </div>
-                  <div class="fr">
-                    <div class="textinfo" v-if="item.breakUp">可拆卖</div>
-                  </div>
-                </div>
-                <div class="list list-long">
-                  <div class="fl">
-                    <div class="name">规格：</div>
-                    <div class="text">{{item.spec || '-'}}</div>
-                  </div>
-                </div>
-                <div class="list">
-                  <div class="fl">
-                    <div class="name">最小包装数：</div>
-                    <div class="text">{{item.minPackQty}}</div>
+                  <div class="list list-long">
+                    <div class="fl">
+                      <div class="name">规格：</div>
+                      <div class="text">{{item.spec || '-'}}</div>
+                    </div>
                   </div>
-                  <div class="fr">
-                    <div class="name">交期(天)：</div>
-                    <div class="text" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery != item.b2cMinDelivery)" v-text="item.b2cMinDelivery + '-'+ item.b2cMaxDelivery"></div>
-                    <div class="text" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery == item.b2cMinDelivery)" v-text="item.b2cMinDelivery"></div>
+                  <div class="list">
+                    <div class="fl">
+                      <div class="name">最小包装数：</div>
+                      <div class="text">{{item.minPackQty}}</div>
+                    </div>
+                    <div class="fr">
+                      <div class="name">交期(天)：</div>
+                      <div class="text" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery != item.b2cMinDelivery)" v-text="item.b2cMinDelivery + '-'+ item.b2cMaxDelivery"></div>
+                      <div class="text" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery == item.b2cMinDelivery)" v-text="item.b2cMinDelivery"></div>
+                    </div>
                   </div>
-                </div>
 
-                <div class="list">
-                  <div class="fl">
-                    <div class="name">包装方式：</div>
-                    <div class="text">{{item.packaging || '无包装信息'}}</div>
-                  </div>
-                  <div class="fr">
-                    <div class="name">库存：</div>
-                    <div class="text">{{item.reserve}}</div>
+                  <div class="list">
+                    <div class="fl">
+                      <div class="name">包装方式：</div>
+                      <div class="text">{{item.packaging || '无包装信息'}}</div>
+                    </div>
+                    <div class="fr">
+                      <div class="name">库存：</div>
+                      <div class="text">{{item.reserve}}</div>
+                    </div>
                   </div>
-                </div>
 
-                <div class="list">
-                  <div class="fl">
-                    <div class="name">生产日期：</div>
-                    <div class="text" :title="item.produceDate">{{item.produceDate || '-'}}</div>
-                  </div>
-                  <div class="fr">
-                    <div class="name">最小起订量：</div>
-                    <div class="text" style="color: #f31919">{{item.minBuyQty}}</div>
+                  <div class="list">
+                    <div class="fl">
+                      <div class="name">生产日期：</div>
+                      <div class="text" :title="item.produceDate">{{item.produceDate || '-'}}</div>
+                    </div>
+                    <div class="fr">
+                      <div class="name">最小起订量：</div>
+                      <div class="text" style="color: #f31919">{{item.minBuyQty}}</div>
+                    </div>
                   </div>
-                </div>
 
-                <div class="list">
-                  <div class="name left">价格梯度：</div>
-                  <div class="table left">
-                    <ul>
-                      <li class="title">
-                        <div>分段数量/PCS</div>
-                        <div>分段单价</div>
-                      </li>
-                      <li v-for="price in item.prices">
-                        <div>{{price.start}}+</div>
-                        <div v-if="item.currencyName == 'RMB'">¥{{price.rMBPrice}}</div>
-                        <div v-else>${{price.rMBPrice}}</div>
-                      </li>
-                    </ul>
+                  <div class="list">
+                    <div class="name left">价格梯度：</div>
+                    <div class="table left">
+                      <ul>
+                        <li class="title">
+                          <div>分段数量/PCS</div>
+                          <div>分段单价</div>
+                        </li>
+                        <li v-for="price in item.prices">
+                          <div>{{price.start}}+</div>
+                          <div v-if="item.currencyName == 'RMB'">¥{{price.rMBPrice}}</div>
+                          <div v-else>${{price.rMBPrice}}</div>
+                        </li>
+                      </ul>
+                    </div>
                   </div>
-                </div>
 
+                </div>
               </div>
             </div>
           </div>
@@ -387,21 +391,18 @@
             this.GetEnterpriseListData = this.GetEnterpriseListData.concat(res.data.content)
             this.EnterprisePage = res.data.totalPages
             this.isSearchSearchingMore = false
-            console.log(this.GetEnterpriseListData)
           })
         } else if (this.providerType === 'person') {
           this.GetPersonList().then(res => {
             this.GetEnterpriseListData = this.GetEnterpriseListData.concat(res.data.content)
             this.EnterprisePage = res.data.totalPages
             this.isSearchSearchingMore = false
-            console.log(this.GetEnterpriseListData)
           })
         } else if (this.providerType === 'onLine') {
           this.GetOnlineList().then(res => {
             this.GetEnterpriseListData = this.GetEnterpriseListData.concat(res.data.content)
             this.EnterprisePage = res.data.totalPages
             this.isSearchSearchingMore = false
-            console.log(this.GetEnterpriseListData)
           })
         }
       },
@@ -409,6 +410,7 @@
       lookProductitem: function(id, item) {
         this.chooseItem = item
         this.$http.get(`/trade/products/goods/productid/${id}`).then(res => {
+          this._initscroll()
           this.showMoreinfn = true
           this.vendorlist = res.data
         })
@@ -446,7 +448,7 @@
         if (this.chooseItem.pcmpcode) {
           return this.chooseItem.pcmpcode
         }
-        return ''
+        return '-'
       },
       cnmpType() { // 类目
         return this.chooseItem.kind || this.chooseItem.kinden || '-'
@@ -455,7 +457,13 @@
         if (this.chooseItem.pbranden) {
           return this.chooseItem.pbranden
         }
-        return ''
+        return '-'
+      },
+      cnmpSpec() { // 规格
+        if (this.chooseItem.spec) {
+          return this.chooseItem.spec
+        }
+        return '-'
       },
       shopuuid() {
         return this.$store.state.option.storeStatus.data
@@ -464,6 +472,7 @@
     mounted: function () {
       this.$nextTick(() => {
         window.addEventListener('scroll', this.scroll, false)
+        this._initscroll()
       })
     },
     created() {

pages/mobile/search/_keycode.vue

@@ -34,8 +34,10 @@
       <div class="detail-brand" v-for="(item, index) in searchLists" :style="index == 0 ? 'padding-top: .2rem;' : ''" v-if="item">
         <div class="brand-item" @click="goComponent(item.uuid)">
           <p>商家名称：<span>{{item.storeName || '-'}}</span></p>
-          <p>型号：<span>{{item.code || '-'}}</span></p>
           <p>品牌：<span>{{item.brandEn || item.brand.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>
           <i class="iconfont icon-shoucang" :style="(item.isFocus)?'color:#ff7800':'color:#bbb'" @click="collect(item, $event)"></i>
         </div>

pages/mobile/shop/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-header @searchAction="onSearch" :placeholder="'可通过型号/品牌/类目/名称查找店铺'"></search-header>
+    <search-header @searchAction="onSearch" :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>
@@ -75,7 +75,7 @@
         showStoreInfo: false,
         enterpriseInfo: {},
         showLoginBox: false,
-        keyword: '',
+        keyword: this.$route.query.keyword,
         url: ''
       }
     },
@@ -98,7 +98,7 @@
 //    },
     fetch ({ store, query }) {
       return Promise.all([
-        store.dispatch('provider/findStoreListInMobil', { page: 1, count: 10, type: 'ORIGINAL_FACTORY-DISTRIBUTION-AGENCY-CONSIGNMENT' })
+        store.dispatch('provider/findStoreListInMobil', { page: 1, count: 10, type: 'ORIGINAL_FACTORY-DISTRIBUTION-AGENCY-CONSIGNMENT', keyword: query.keyword })
       ])
     },
     computed: {