Merge remote-tracking branch 'origin/release-201823-wangcz' into release-201823-wangcz

assets/scss/common.scss

@@ -902,3 +902,39 @@ img.new-animate{
 .block {
   display: block;
 }
+
+
+//求购搜索
+.apply-info .apply-info-title .search .search-content-pc {
+  position: relative;
+  input {
+    width: 283px!important;
+    height: 32px;
+    border: 1px solid #2496f1;
+    line-height: 32px;
+    font-size: 13px;
+    margin-top: 14px;
+    border: {
+      top-right-radius: 0;
+      bottom-right-radius: 0;
+    }
+  }
+  span.input-group-btn .btn{
+    top: 7px;
+    display: inline-block;
+    width: 69px;
+    color: #fff;
+    background: #2496f1;
+    text-align: center;
+    margin: 0 6px 0 -1px;
+    border: {
+      top-right-radius: 3px;
+      bottom-right-radius: 3px;
+    }
+    cursor: pointer;
+  }
+  ul{
+    left: 0 !important ;
+    top: 46px !important ;
+  }
+}

components/applyPurchase/ApplyInfo.vue

@@ -371,7 +371,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
   .apply-info {
     margin: 0 auto;
     .apply-info-title {
@@ -759,7 +759,7 @@ export default {
       }
     }
   }
-  .empty{
+  .apply-info .apply-info-list .empty{
     text-align: center;
     height: 1235px;
     line-height: 250px;
@@ -770,41 +770,4 @@ export default {
       margin-left: 10px;
     }
   }
-  .page-wrap {
-    text-align: right;
-    float: none;
-  }
-  .apply-info .apply-info-title .search .search-content-pc {
-    position: relative;
-    input {
-      width: 283px!important;
-      height: 32px;
-      border: 1px solid #2496f1;
-      line-height: 32px;
-      font-size: 13px;
-      margin-top: 14px;
-      border: {
-        top-right-radius: 0;
-        bottom-right-radius: 0;
-      }
-    }
-    span.input-group-btn .btn{
-      top: 7px;
-      display: inline-block;
-      width: 69px;
-      color: #fff;
-      background: #2496f1;
-      text-align: center;
-      margin: 0 6px 0 -1px;
-      border: {
-        top-right-radius: 3px;
-        bottom-right-radius: 3px;
-      }
-      cursor: pointer;
-    }
-    ul{
-      left: 0 !important ;
-      top: 46px !important ;
-    }
-  }
 </style>

components/mobile/applyPurchase/SayPrice.vue

@@ -5,11 +5,11 @@
       <div class="say-price" ref="mobileModalBox">
         <div>
           <div class="base-info">
-            <div class="content-line">
-              品牌：<span>{{purchaseDetail.inbrand || '-'}}</span>
+            <div class="content-line clearfix">
+              <div class="pull-left">品牌：</div><span class="pull-left">{{purchaseDetail.inbrand || '-'}}</span>
             </div>
-            <div class="content-line">
-              物料名称：<span>{{purchaseDetail.prodTitle || '-'}}</span>
+            <div class="content-line clearfix">
+              <div class="pull-left">物料名称：</div><span class="pull-left" style="width:5rem;">{{purchaseDetail.prodTitle || '-'}}</span>
             </div>
             <div class="content-line clearfix">
              <div class="pull-left"> 型号：</div><span class="pull-left">{{purchaseDetail.cmpCode || '-'}}</span>
@@ -126,15 +126,18 @@
       RemindBox
     },
     watch: {
-      showSayPriceBox: function (val, old) {
-         if (val) {
-           this.$nextTick(() => {
-             this._initscroll()
-             this.initScroll.scrollTo(0, 0, 0)
-           })
-         }
-        this.sayType = 'current'
-        this.resetSayPrice()
+      'showSayPriceBox': {
+        handler: function(val, old) {
+          if (val) {
+            this.$nextTick(() => {
+              this._initscroll()
+              this.initScroll.scrollTo(0, 0, 0)
+            })
+          }
+          this.sayType = 'current'
+          this.resetSayPrice()
+        },
+        deep: true
       }
     },
     mounted () {

components/mobile/applyPurchase/SeekList.vue

@@ -207,9 +207,10 @@ export default {
                 enuu: this.$store.state.option.user.data.enterprise
                   ? this.$store.state.option.user.data.enterprise.uu
                   : null
+              }).then(() => {
+                this.showSayPriceBox = true
+                this.activeIndex = index
               })
-              this.showSayPriceBox = true
-              this.activeIndex = index
             })
           } else {
             this.setRemindText('抱歉，您需开通卖家功能才可报价')

components/provider/Suppliers.vue

@@ -98,7 +98,7 @@ export default {
       this.pageParams.type = this.storeType === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION'
       this.pageParams.page = 1
       this.pageParams.keyword = obj.keyword === '' ? null : obj.keyword
-      this.pageParams.field = obj.type ? 'similar' : null
+      // this.pageParams.field = obj.type ? 'similar' : null
       this.pageCommodity(this.pageParams)
     },
     showLittleDescription (description) {

pages/mobile/center/user/invoice/index.vue

@@ -216,6 +216,10 @@
         this.showDeleteAlert = true
       },
       async addinvoiceFn(ty, item) {
+        if (this.invoiceList.length === 0) {
+          this.goLastPage()
+          return
+        }
         this.showAddinvoice = false
         if (ty) {
           let {data} = await axios.get('/trade/bill/list/personal')

pages/mobile/shop/index.vue

@@ -239,7 +239,7 @@
       onSearch: function (keyObj) {
 //        console.log(keyObj)
         this.keyword = keyObj.keyword
-        this.field = keyObj.type ? 'similar' : null
+        // this.field = keyObj.type ? 'similar' : null
         this.onDown('ORIGINAL_FACTORY-DISTRIBUTION-AGENCY-CONSIGNMENT')
         this.down = false
       }