修改测试问题

components/mobile/applyPurchase/PublishSeek.vue

@@ -59,7 +59,7 @@
 </template>
 <script>
   export default {
-    props: ['dataObj'],
+    props: ['dataObj', 'isNumberReg'],
     data () {
       return {
         applyObj: {
@@ -187,7 +187,7 @@
             this.setRemindText('品牌不能为空')
           } else if (!this.validObj.deadline) {
             this.setRemindText('截止日期不能为空')
-          } else if (!this.validObj.amount) {
+          } else if (!this.validObj.amount && !this.isNumberReg) {
             this.setRemindText('请输入正确的数值')
           }
         }
@@ -210,7 +210,11 @@
         }
       },
       checkAll: function () {
-        return this.checkBrand() && this.checkProdTitle() && this.checkCode() && this.checkDeadline() && this.checkSpec() && this.checkAmount()
+        if (this.isNumberReg) {
+          return this.checkBrand() && this.checkProdTitle() && this.checkCode() && this.checkDeadline() && this.checkSpec()
+        } else {
+          return this.checkBrand() && this.checkProdTitle() && this.checkCode() && this.checkDeadline() && this.checkSpec() && this.checkAmount()
+        }
       },
       checkCode: function () {
         this.validObj.code = this.applyObj.code && this.applyObj.code !== ''
@@ -396,13 +400,13 @@
         }
         .similar {
           position: absolute;
-          width: 3.52rem;
+          width: 3.49rem;
           max-height: 2.5rem;
           overflow-y: auto;
           z-index: 12;
           border: 1px solid #7e7e7e;
           border-radius: .05rem;
-          left: 2.25rem;
+          left: 2.5rem;
           top: .7rem;
           background: #fff;
           li {

components/mobile/search/MainSearch.vue

@@ -103,6 +103,9 @@
         this.associate.show = true
       },
       onSearch (item) {
+        if (item) {
+          this.keyword = item
+        }
         if (this.keyword) {
           this.$router.push(`/mobile/search/newkeycode?choosetype=${this.ChooseTop}&keyword=${encodeURIComponent(this.keyword)}`)
         }

pages/mobile/center/user/applyPurchase.vue

@@ -12,7 +12,7 @@
           <i class="iconfont icon-sousuo"></i>
       </span>
       </div>
-      <publish-seek v-if="showPublishBox" :dataObj="componentSeekObj" @remindAction="onRemind"></publish-seek>
+      <publish-seek v-if="showPublishBox" :dataObj="componentSeekObj" @remindAction="onRemind" :isNumberReg="true"></publish-seek>
       <template v-else>
         <ul v-if="compList && compList.length">
           <li v-for="comp in compList">

pages/mobile/center/vendor/product.vue

@@ -276,7 +276,7 @@
           </p>
         </div>
       </div>
-      <div class="update-materiel-wrapper">
+      <div class="update-materiel-wrapper" @click="clearInfo()">
         <!--<div class="clearfix">-->
           <!--<div class="update-materiel-wrapper-image pull-left">-->
             <!--<img :src="cmpImg || '/images/mobile/openStore/upload.png'"  style='width: 1.1rem; height: 1.1rem;display:block;margin: 0.2rem auto'/>-->
@@ -292,22 +292,22 @@
         <template v-else>
           <img class="imgUrl" src="/images/mobile/@2x/productDetail/isStrand.png" />
         </template>
-        <div class="update-materiel-wrapper-list clearfix overHidden">
+        <div class="update-materiel-wrapper-list clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
           <div class="name pull-left"><a class="red">*</a>品牌：</div>
           <template v-if="MaterielItem.standard === 1">
             {{MaterielItem.brand}}
           </template>
           <template v-else>
-            <div class="input pull-left clearfix overHidden">
-              <input type="text" v-model="MaterielItem.brand" placeholder="请勿填中文符号" @blur="checkBrand" @input="onBrandChange"/>
+            <div class="input pull-left clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
+              <input type="text" v-model="MaterielItem.brand" placeholder="请勿填中文符号" @blur.stop="checkBrand" @input.stop="onBrandChange"/>
               <ul class="similar brand-similar-list" v-show="showSimilarBrandList && MaterielItem.brand">
-                <li v-for="sBrand in similarBrand" @click="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
+                <li v-for="sBrand in similarBrand" @click.stop="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
               </ul>
-              <i class="iconfont icon-guanbi1" @click="MaterielItem.brand = ''"></i>
+              <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.brand = ''"></i>
             </div>
           </template>
         </div>
-        <div class="update-materiel-wrapper-list clearfix overHidden">
+        <div class="update-materiel-wrapper-list clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
           <div class="name pull-left"><a class="red">*</a>物料名称(类目)：</div>
           <template v-if="MaterielItem.standard === 1">
             {{MaterielItem.kind}}
@@ -316,7 +316,7 @@
             <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"/>
-              <i class="iconfont icon-guanbi1" @click="MaterielItem.kind = ''"></i>
+              <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.kind = ''"></i>
             </div>
           </template>
         </div>
@@ -327,12 +327,12 @@
           </template>
           <template v-else>
             <div class="input pull-left clearfix">
-              <input type="text" v-model="MaterielItem.cmpCode" @blur="checkCode" @input="onCodeChange" placeholder="请勿填中文符号">
+              <input type="text" v-model="MaterielItem.cmpCode" @blur.stop="checkCode" @input.stop="onCodeChange" placeholder="请勿填中文符号">
               <ul class="similar" v-show="showSimilarCodeList && MaterielItem.cmpCode">
-                <li v-for="sCode in similarCode" @click="setCode(sCode.code)">{{sCode.code}}</li>
+                <li v-for="sCode in similarCode" @click.stop="setCode(sCode.code)">{{sCode.code}}</li>
               </ul>
               <!--<input type="text" placeholder="请输入型号" v-model="MaterielItem.cmpCode"/>-->
-              <i class="iconfont icon-guanbi1" @click="MaterielItem.cmpCode = ''"></i>
+              <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.cmpCode = ''"></i>
             </div>
           </template>
         </div>
@@ -340,12 +340,12 @@
           <div class="name pull-left"><a class="red" style="opacity: 0">*</a>规格：</div>
           <div class="input pull-left clearfix">
             <input type="text" placeholder="请输入规格" v-model="MaterielItem.spec" @blur="checkSpec" @input="onSpecInput"/>
-            <i class="iconfont icon-guanbi1" @click="MaterielItem.spec = ''"></i>
+            <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.spec = ''"></i>
           </div>
         </div>
         <div class="update-materiel-wrapper-controll clearfix">
-          <div class="pull-left" @click="saveMateriel()">保存</div>
-          <div class="pull-right" @click="showMateriel = false">取消</div>
+          <div class="pull-left" @click.stop="saveMateriel()">保存</div>
+          <div class="pull-right" @click.stop="saveMateriel('a')">取消</div>
         </div>
       </div>
     </div>
@@ -385,6 +385,10 @@
       }
     },
     methods: {
+      clearInfo() {
+        this.showSimilarCodeList = false
+        this.showSimilarBrandList = false
+      },
       toAddpro(list) {
         let item = {
           brandNameEn: list.pbranden,
@@ -583,7 +587,8 @@
       },
       // 编辑物料
       updateMateriel(item) {
-        this.MaterielItem = this.baseUtils.deepCopy(item)
+        this.MaterielItem = item
+        this.$item = this.baseUtils.deepCopy(item)
         this.cmpImg = item.cmpImg || ''
         // this.MaterielItem.cmpImg = item.cmpImg || ''
         this.showMateriel = true
@@ -704,7 +709,16 @@
           this.MaterielItem.spec = this.baseUtils.cutOutString(this.MaterielItem.spec, 100)
         }
       },
-      saveMateriel() {
+      saveMateriel(str) {
+        if (str) {
+          let _key1 = Object.keys(this.$item)
+          let _key2 = Object.keys(this.MaterielItem)
+          for (let i = 0; i < _key1.length; i++) {
+            this.MaterielItem[_key2[i]] = this.$item[_key1[i]]
+          }
+          this.showMateriel = false
+          return
+        }
         if (this.MaterielItem.brand === '') {
           this.setRemindText('品牌不能为空')
           return

pages/mobile/search/newkeycode.vue

@@ -243,15 +243,15 @@
                  <div class="middle" v-for="(item, index) in resourceList.futures.content">
                    <div class="list">
                      <div class="name">品牌：</div>
-                     <div class="text overHidden">{{item.brandNameEn || '—'}}</div>
+                     <div class="text overHidden">{{item.brandNameEn || item.brand || '—'}}</div>
                    </div>
                    <div class="list">
                      <div class="name">物料名称(类目)：</div>
-                     <div class="text overHidden">{{item.kindNameCn || '-'}}</div>
+                     <div class="text overHidden">{{item.kindNameCn || item.kind || '-'}}</div>
                    </div>
                    <div class="list">
                      <div class="name">型号：</div>
-                     <div class="text overHidden">{{item.code || '-'}}</div>
+                     <div class="text overHidden">{{item.code || item.cmpCode || '-'}}</div>
                    </div>
                    <div class="list">
                      <div class="name">规格：</div>
@@ -381,7 +381,7 @@
    <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
    <!--<loading v-if="isSearchSearchingMore"></loading>-->
    <login-box @onLoginBoxClose="showLoginBox = false" v-if="showLoginBox" :url="url"></login-box>
-   <pull-up :fixId="'main-search-wrapper'" :searchMore="isSearchSearchingMore" :allPage="allPage" :page="page" @pullUpAction="onPullUp" :FixedEl="true"></pull-up>
+   <pull-up v-if="addShowPullup" :fixId="'main-search-wrapper'" :searchMore="isSearchSearchingMore" :allPage="allPage" :page="page" @pullUpAction="onPullUp" :FixedEl="true"></pull-up>
  </div>
 </template>
 
@@ -422,7 +422,8 @@
         associate: {
           show: false
         },
-        displayKeyword: ''
+        displayKeyword: '',
+        addShowPullup: true
       }
     },
     computed: {
@@ -525,13 +526,16 @@
         this.$http.get(`/search/201819`, {params: {count: 10, page: this.page, keyword: this.keyword, type: this.ChooseTop}}).then(res => {
           this.isSearchSearchingMore = false
           if (!this.brandIsAccurate && this.ChooseTop === 'brand') {
+            // 品牌模糊查询
             this.resourceList.content = [...this.resourceList.content, ...res.data.content]
             return
           }
           if (this.navType === 'hasStore') {
             this.resourceList.stock.content = [...this.resourceList.stock.content, ...res.data.stock.content]
+            this.allPage = Math.ceil(res.data.stock.total / 10) || 0
           } else {
             this.resourceList.futures.content = [...this.resourceList.futures.content, ...res.data.futures.content]
+            this.allPage = Math.ceil(res.data.futures.total / 10) || 0
           }
         }, err => {
           this.isSearchSearchingMore = false
@@ -560,7 +564,8 @@
       },
       // 切换顶部一级标题
       setChangelistHander(str) {
-        if (document.querySelector('#main-search-wrapper')) document.querySelector('#main-search-wrapper').scrollTop = 0
+        // if (document.querySelector('#main-search-wrapper')) document.querySelector('#main-search-wrapper').scrollTop = 0
+        this.addShowPullup = false
         this.ChooseTop = str
         this.page = 1
         if (!this.keyword) return
@@ -600,6 +605,7 @@
             }
           }
           this.associate.show = false
+          this.addShowPullup = true
         })
       },
       // 供应商详情
@@ -619,12 +625,14 @@
       publish: function (product) {
         if (this.user.logged) {
           let item = {
-            cmpCode: product.code,
-            pbranden: product.brandNameEn,
-            brand: product.brandNameEn,
+            cmpCode: product.cmpCode,
+            pbranden: product.brand,
+            brand: product.brand,
             spec: product.spec,
-            kind: product.kindNameCn
+            kind: product.cmpCode
           }
+          console.log(item)
+          console.log(product)
           this.currentProduct = item
           this.showPublishBox = true
         } else {
@@ -782,7 +790,7 @@
       }
     }
     .main-search-wrapper {
-      margin-top: 1.7rem;
+      margin-top: 1.71rem;
     }
     .search-title {
       font-size: 0.26rem;
@@ -814,8 +822,11 @@
     .search-content {
       padding-top: 0;
       margin-top: 0.2rem;
-      height: calc(100vh - 3.43rem);
+      height: calc(100vh - 3.41rem);
       overflow-y: auto;
+      position: absolute;
+      width: 100%;
+      bottom: 0;
       .middle {
         background: #fff;
         padding: 0.2rem;