处理搜索时页面归为首页的情况

components/supplier/details.vue

@@ -21,7 +21,7 @@
           <ul class="list-unstyled">
             <li class="item">
               <span>类目(名称)</span>
-              <p v-text="detail.prodName? spliceString(detail.prodName, 400) : '暂无信息'">2</p>
+              <p v-text="detail.prodName? spliceString(detail.prodName, 135) : '暂无信息'">2</p>
             </li>
             <li class="item">
               <span>品牌</span>
@@ -54,19 +54,19 @@
         <ul class="list-inline">
           <li class="form-item">
             <span>型号：</span>
-            <p v-text="detail.cmpCode">3</p>
+            <p v-text="detail.cmpCode ? spliceString(detail.cmpCode, 90) : '-'">3</p>
           </li>
           <li class="form-item">
             <span>类目：</span>
-            <p v-text="detail.prodName">3</p>
+            <p v-text="detail.prodName ? spliceString(detail.prodName, 90) : '-'">3</p>
           </li>
           <li class="form-item">
             <span>品牌：</span>
-            <p v-text="detail.brand">3</p>
+            <p v-text="detail.brand ? spliceString(detail.brand, 90) : '-'">3</p>
           </li>
           <li class="form-item">
             <span>规格：</span>
-            <p v-text="detail.spec">3</p>
+            <p v-text="detail.spec ? spliceString(detail.spec, 90) : '-'">3</p>
           </li>
           <li class="form-item">
             <span><i>*</i>截止日期：</span>
@@ -137,7 +137,7 @@
         },
         hasDialog: false,
         searchCode: '',
-        test: '322222222222222222222222222222222222222222222222222222'
+        test: '一二三四五六攻八怕址一二三四五六攻八怕址一二三四五六攻八怕址1234567890一二三四五六攻八怕址1234567890一二三四五六攻八怕址1234567890一二三四五六攻八怕址1234567890一二三四五六攻八怕址'
       }
     },
     computed: {

components/supplier/merchant.vue

@@ -111,6 +111,7 @@
         }
       },
       goodsSearch (type) {
+        this.pageParams.page = 1
         this.$store.dispatch('supplier/loadVendorList', {page: this.pageParams.page, size: this.pageParams.count, keyword: type})
       },
       handleCurrentChange (type) {
@@ -295,7 +296,6 @@
             top:99%;
             opacity:1;
             z-index:100;
-            min-height:125px;
           }
         }
         .popups{
@@ -305,7 +305,7 @@
           background: #6c6c6c;
           width:267px;
           min-height:20px;
-          padding:25px 15px 15px 10px;
+          padding:20px 15px 5px 10px;
           transition: all .5s ease;
           opacity: 0;
           color:#fff;
@@ -331,8 +331,8 @@
               width:155px;
             }
             &:nth-child(4){
-              max-height:40px;
-              overflow: auto;
+              max-height:38px;
+              overflow: hidden;
               white-space:pre-wrap;
               word-wrap:break-word;
             }

components/supplier/resource.vue

@@ -103,19 +103,19 @@
         <ul class="list-inline">
           <li class="form-item">
             <span>型号：</span>
-            <p v-text="applyObj.cmpCode">32432</p>
+            <p v-text="applyObj.cmpCode ? spliceString(applyObj.cmpCode, 90) : '-'">32432</p>
           </li>
           <li class="form-item">
             <span>类目：</span>
-            <p v-text="applyObj.prodName">32</p>
+            <p v-text="applyObj.prodName ? spliceString(applyObj.prodName, 90) : '-'">32</p>
           </li>
           <li class="form-item">
             <span>品牌：</span>
-            <p v-text="applyObj.brand">32432</p>
+            <p v-text="applyObj.brand ? spliceString(applyObj.brand, 90) : '-'">32432</p>
           </li>
           <li class="form-item">
             <span>规格：</span>
-            <p v-text="applyObj.spec">32432</p>
+            <p v-text="applyObj.spec ? spliceString(applyObj.spec, 90) : '-'">32432</p>
           </li>
           <li class="form-item">
             <span><i>*</i>截止日期：</span>
@@ -234,9 +234,10 @@
       },
       // 根据搜索信息获取数据
       goodsSearch (type) {
+        this.pageParams.page = 1
         this.$store.dispatch('supplier/loadMaterialList', {
-          page: 1,
-          size: 20,
+          page: this.pageParams.page,
+          size: this.pageParams.count,
           vendUU: this.$route.params.uuid,
           keyword: type
         })