Browse Source

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

shenjj 7 years ago
parent
commit
9c3c8fc966

+ 5 - 39
components/applyPurchase/BatchPublish.vue

@@ -138,10 +138,10 @@
               <table>
                 <thead>
                 <tr>
-                  <th width="214">卖家</th>
+                  <th width="350">卖家</th>
                   <th width="83">交期(天)</th>
                   <th width="104">单价</th>
-                  <th width="137">生产日期</th>
+                  <!--<th width="137">生产日期</th>-->
                   <th width="111">库存</th>
                   <th width="142">购买数量</th>
                   <th width="186">操作</th>
@@ -152,10 +152,10 @@
                 <table>
                   <tbody>
                   <tr v-for="(spotGoods, index) in spotGoodsData">
-                    <td width="214" v-text="spotGoods.storeName"></td>
+                    <td width="350" v-text="spotGoods.storeName"></td>
                     <td width="83" class="red-text" v-text="spotGoods.b2cMinDelivery + '-' + spotGoods.b2cMaxDelivery">4-6</td>
                     <td width="104" class="red-text" v-text="spotGoods.currencyName == 'RMB' ? '¥' + spotGoods.prices[0].rMBPrice: '$' + spotGoods.prices[0].uSDPrice"></td>
-                    <td width="137" v-text="spotGoods.produceDate"></td>
+                    <!--<td width="137" v-text="spotGoods.produceDate"></td>-->
                     <td width="111" v-text="spotGoods.reserve">21412</td>
                     <td width="142" class="input-number">
                       <div>
@@ -1038,41 +1038,7 @@
         this.onInput(index)
       },
       buyNow: function (goods, index) {
-        this.$http.post('/trade/order/buyNow', [{
-          uuid: goods.uuid,
-          batchCode: goods.batchCode,
-          number: this.fragments[index].num,
-          storeid: goods.storeid ? goods.storeid : goods.storeId,
-          storeUuid: goods.storeid ? goods.storeid : goods.storeId,
-          currencyName: goods.currencyName,
-          minPackQty: goods.minPackQty
-        }])
-          .then(response => {
-            if (response.data.success) {
-              if (response.data.message) {
-                this.$message({
-                  message: response.data.message,
-                  type: 'success'
-                })
-                window.setTimeout(function () {
-                  window.open('/user#/order/pay/' + this.baseUtils.enidfilter(response.data.data.orderid))
-                }, 1000)
-              } else {
-                window.open('/user#/order/pay/' + this.baseUtils.enidfilter(response.data.data.orderid))
-              }
-            } else {
-              if (response.data.data && response.data.data.unvailable === 1) {
-                this.$message.error('产品信息已失效,请刷新页面')
-              } else {
-                this.$message.error(response.data.message)
-              }
-            }
-          }, err => {
-            console.log(err)
-            if (goods.minBuyQty > goods.reserve) {
-              this.$message.error('商品' + goods.code + '的库存已经不满足最小起订量')
-            }
-          })
+        this.baseUtils.buyOrCar(true, null, this, goods, '/user#/order/pay/', this.fragments[index].num)
       },
       linkSaler: function (commodity) {
         this.baseUtils.goLinkUser(this, commodity.enUU)

+ 1 - 0
components/applyPurchase/articleOne.vue

@@ -361,6 +361,7 @@
         return this.validObj.deadline
       },
       setDeadLineValid: function () {
+        if(this.applyObj.deadline === '') {return ''}
         this.applyObj.deadline = this.baseUtils.formatDate(this.baseUtils.getFullDay(new Date(this.applyObj.deadline)), 'yyyy-MM-dd hh:mm:ss')
         this.validObj.deadline = true
       },

+ 4 - 3
components/mobile/center/outOfStorage/StorageList.vue

@@ -2,7 +2,7 @@
   <div class="storage">
     <ul class="list-unstyled">
       <li v-for="item in listData" v-if="handleItem === 0">
-        <div class="linetext">{{switchType === 'INBOUND' ? '入库单' : '出库单'}}: <span v-text="item.inOutId || '-'">21324</span></div>
+        <div class="linetext">{{switchType === 'INBOUND' ? '入库单' : '出库单'}}: <span v-text="item.inOutId || '-'">21324</span></div>
         <div class="linetext">{{switchType === 'INBOUND' ? '卖家名称' : '买家名称'}}: <span v-text="item.affiliatedEnterprise || '-'">21324</span></div>
         <div class="linetext">类型: <span v-text="setFilterType(item.opertatorType)">21324</span></div>
         <div class="linetext">录入人: <span v-text="item.operaterUserName || '-'">21324</span></div>
@@ -12,8 +12,9 @@
         </div>
       </li>
       <li v-for="item in listData" v-if="handleItem === 2">
-        <div class="linetext">{{switchType === 'INBOUND' ? '入库单' : '出库单'}}: <span>系统自动生成</span></div>
-        <div class="linetext">订单号: <span v-text="item.purchaseid || '-'">21324</span></div>
+        <div class="linetext">{{switchType === 'INBOUND' ? '入库单号' : '出库单号'}}: <span>系统自动生成</span></div>
+        <div class="linetext" v-if="switchType === 'INBOUND'">发货单: <span v-text="item.invoiceid || '-'">21324</span></div>
+        <div class="linetext" v-if="switchType === 'OUTBOUND'">订单号: <span v-text="item.orderid || '-'">21324</span></div>
         <div class="linetext">{{switchType === 'INBOUND' ? '卖家名称' : '买家名称'}}: <span v-text="item.buyentername || item.buyerentername || item.buyername || '-'">21324</span></div>
         <div class="linetext">录入人: <span v-text="item.sellername || '-'">21324</span></div>
         <div class="linetext">录入时间: <span v-text="item.createtime ? baseUtils.formatDate(new Date(item.createtime), 'yyyy-MM-dd hh:mm:ss') : '-'">21324</span></div>

+ 66 - 17
components/mobile/center/outOfStorage/otherStorage.vue

@@ -23,11 +23,12 @@
         <div class="linetext width50 fl">品牌: <span v-text="item.brand">21324</span></div>
         <div class="linetext width50 fl">物料名称: <span v-text="item.pcmpcode">21324</span></div>
         <div class="linetext width50 fl">规格: <span v-text="item.spec">21324</span></div>
+        <div class="linetext width50 fl">库存数: <span v-text="item.erpReserve">21324</span></div>
         <div class="linetext width50 fl"><em>*</em>{{switchType === 'INBOUND' ? '入库数' : '出库数'}}(PCS): <span>
-          <input type="text" style="width:1rem;" v-model="item.qty" @input="onAmountInput(item, index)">
+          <input type="text" style="width:1.1rem;" v-model="item.qty" @input="onAmountInput(item, index)">
         </span></div>
-        <div class="linetext width50 fl">单价({{currency === 'RMB' ? '¥': '$'}}):<span>
-          <input type="text" style="width:2rem;" v-model="item.price" @blur="rMBPriceBlur(item, index)">
+        <div class="linetext width50 fl">{{switchType === 'INBOUND' ? '采购单价' : '销售单价'}}({{currency === 'RMB' ? '¥': '$'}}):<span>
+          <input type="text" style="width:1.2rem;" v-model="item.price" @blur="rMBPriceBlur(item, index)">
         </span></div>
         <div class="content-line" v-show="item.showSimilarCodeList && item.cmpCode">
           <ul class="similar">
@@ -145,12 +146,23 @@
               if(response.data.length > 0){
                 this.similarCode = response.data
               } else {
-                this.onRemind('没有找到产品信息')
+                this.similarCode = []
+                this.allObj[type].cmpCode = ''
+                this.allObj[type].brand = ''
+                this.allObj[type].pcmpcode = ''
+                this.allObj[type].spec = ''
+                this.allObj[type].productId = ''
+                this.onRemind('产品库中没有找到相应产品信息')
               }
               this.allObj[type].showSimilarCodeList = response.data.length > 0
             }).catch((err) => {
               this.similarCode = []
-              this.onRemind('没有找到产品信息')
+              this.allObj[type].cmpCode = ''
+              this.allObj[type].brand = ''
+              this.allObj[type].pcmpcode = ''
+              this.allObj[type].spec = ''
+              this.allObj[type].productId = ''
+              this.onRemind('产品库中没有找到相应产品信息')
             })
         } else {
           this.allObj[type].showSimilarCodeList = false
@@ -162,7 +174,11 @@
         this.allObj[type].pcmpcode = data.kind
         this.allObj[type].spec = data.spec
         this.allObj[type].productId = data.id
+        this.allObj[type].erpReserve = data.erpReserve
         this.allObj[type].showSimilarCodeList = false
+        if(data.erpReserve <= 0 && this.switchType === 'OUTBOUND') {
+          this.onRemind('当前产品库存为0,不能出库!')
+        }
       },
       addClick (type) {
         if(type) {
@@ -230,24 +246,56 @@
           this.initData()
         }else {
           let arr = []
-          let falg = false;
+          let flag = 0;
           this.allObj.forEach(val => {
             if(val.productId) {
-              if(!val.price && !val.qty) {
-                this.onRemind('请将数据补充完整')
+              if((val.erpReserve <= 0) && this.switchType === 'OUTBOUND'){
+                flag = 1
+              } else if((val.erpReserve < val.qty) && this.switchType === 'OUTBOUND') {
+                flag = 2
+              } else if(val.qty && Number(val.qty) <= 0) {
+                flag = 3
+              } else if(val.qty) {
+                val.price ?
+                  arr.push({price: Number(val.price), productId: val.productId, qty:Number(val.qty)}) :
+                  arr.push({productId: val.productId, qty:Number(val.qty)})
+              } else {
+                flag = 4
               }
-              falg = true;
-              arr.push({price: val.price, productId: val.productId, qty:val.qty})
             }
           })
-          if(falg) {
-            this.$http.post(`/CommodityInOutbound/${this.switchType === 'INBOUND'? 'inBound': 'outBound'}/other?enName=${this.enName}`, arr)
-              .then(response => {
-                if(response.data.code === 1){
-                  this.onRemind('保存信息成功')
-                }
-              })
+          if(flag === 1) {
+            this.onRemind('产品库中库存数量为0将不能出库!')
+            return;
+          }
+          if(flag === 2) {
+            this.onRemind('出库量数量不能大于库存数!')
+            return;
+          }
+          if(flag === 3) {
+            this.onRemind('填写的数量不能小于0!')
+            return;
+          }
+          if(flag === 4) {
+            this.onRemind('请填写数量!')
+            return;
+          }
+          if(arr.length <= 0) {
+            this.onRemind('至少填写一条数据!')
+            return;
           }
+          this.$http.post(`/CommodityInOutbound/${this.switchType === 'INBOUND'? 'inBound': 'outBound'}/other?enName=${this.enName}`, arr)
+            .then(response => {
+              if(response.data.code === 1){
+                this.onRemind('保存信息成功')
+                this.initData()
+              } else {
+                this.onRemind(response.data)
+              }
+            })
+            .catch(err => {
+              this.onRemind('保存信息失败')
+            })
         }
       }
     }
@@ -266,6 +314,7 @@
       bottom: 1rem;
       left: 0;
       right: 0;
+      z-index:100;
       text-align: center;
       span{
         display:inline-block;

+ 23 - 1
components/mobile/register-saler/register/StepThird.vue

@@ -247,6 +247,22 @@
               </div>
             </div>
             <!--经销商 end-->
+            <!--主营产品 begin-->
+            <div role="tabpanel" class="tab-pane">
+              <div class="row com_row">
+                <div class="custom_col">
+                  <div class="wrap-title"><span class="line"></span>主营产品</div>
+                  <div class="" style="margin: 0 0.25rem">
+                    <textarea v-model="description"
+                              rows="5"
+                              maxlength="500"
+                              class="form-control"
+                              placeholder="例:本店主营Panasonic、IT、三星等知名品牌的触控IC、显示驱动IC、液晶屏、功率模块类、电源芯片、高压熔断、被动器件等产品。"></textarea>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!--主营产品 end-->
           </div>
           <!-- Submit button -->
          <!-- <div style="padding: 28px 40px;">
@@ -339,7 +355,8 @@
         isSelfRegisterSuccess: true,
         selectFlag: 'open',
         showLoading: false,
-        btnDisabled: false
+        btnDisabled: false,
+        description: ''
       }
     },
     props: [
@@ -530,6 +547,10 @@
           this.collectResult = '请上传营业执照'
           this.timeoutCount++
           this.showLoading = false
+        } else if (this.description === '') {
+          this.collectResult = '请填写主营产品信息'
+          this.timeoutCount++
+          this.showLoading = false
         } else {
           if (this.brands[0].name === '') {
             validCode = 1
@@ -566,6 +587,7 @@
             })
             // 申请开店
             this.$http.post('/store-service/applications', {
+              applyDescription: this.description,
               brands: tmpBrands,
               qualifications: qualifications,
               type: this.tab

+ 4 - 4
pages/mobile/center/vendor/index.vue

@@ -20,10 +20,10 @@
             <img src="/images/mobile/center/vendor/material-person.png" alt="">
             <p>出入库</p>
           </nuxt-link>
-          <nuxt-link tag="li" to="/mobile/center/vendor/product?providerType=onLine">
-            <img src="/images/mobile/center/vendor/onsale.png" alt="">
-            <p>在售产品</p>
-          </nuxt-link>
+          <!--<nuxt-link tag="li" to="/mobile/center/vendor/product?providerType=onLine">-->
+            <!--<img src="/images/mobile/center/vendor/onsale.png" alt="">-->
+            <!--<p>在售产品</p>-->
+          <!--</nuxt-link>-->
         </ul>
       </div>
       <div class="block-wrap seek-operation">

+ 10 - 44
pages/mobile/center/vendor/outOfStorage/index.vue

@@ -14,7 +14,7 @@
         <div class="storage-record">
           <div class="search-content clearfix">
             <div class="search">
-              <input type="text" v-model="filterParams.keyword" :placeholder="switchType ==='OUTBOUND' ? '订单号/买家名称' : (handleItem === 0 ? '入库单/卖家名称':'发货单/卖家名称')" class="staff-search" @keyup.13="filterRecord">
+              <input type="text" v-model="filterParams.keyword" :placeholder="switchType ==='OUTBOUND' ? (handleItem === 0 ? '出库单号/买家名称':'订单号/买家名称') : (handleItem === 0 ? '入库单/卖家名称':'发货单/卖家名称')" class="staff-search" @keyup.13="filterRecord">
               <span @click="filterRecord"><i class="iconfont icon-sousuo"></i></span>
             </div>
           </div>
@@ -23,7 +23,7 @@
             <span :class="{'active': handleItem === 1}" @click="setHandleItem(1)">{{switchType === 'INBOUND' ? '其它入库' : '其它出库'}}</span>
             <span :class="{'active': handleItem === 2}" @click="setHandleItem(2)">{{switchType === 'INBOUND' ? '采购入库' : '销售出库'}}</span>
           </div>
-          <div class="filters-wrap" v-if="handleItem !== 1">
+          <div class="filters-wrap" v-show="handleItem !== 1">
             <base-filter
               v-for="filterOption in filterOptions"
               :key="filterOption.selectOption"
@@ -35,8 +35,8 @@
             </base-filter>
           </div>
           <div class="list-content">
-            <storage-list :listData="storageList" :switchType="switchType" :handleItem="handleItem" v-show="handleItem !== 1"></storage-list>
-            <other-storage :switchType="switchType" v-show="handleItem === 1"></other-storage>
+            <storage-list :listData="storageList" :switchType="switchType" :handleItem="handleItem" v-if="handleItem !== 1"></storage-list>
+            <other-storage :switchType="switchType" v-else></other-storage>
           </div>
           <empty-status  v-if="isEmpty && handleItem !== 1" :type="'collect'" :showLink="true" :text="'抱歉,没有相关信息'"></empty-status>
           <pull-up :fixId="'mobile-storage-center'" :searchMore="fetching" :allPage="allPage" :page="page" @pullUpAction="onPullUpAction"></pull-up>
@@ -103,51 +103,17 @@
     created () {
       this.switchType = this.$route.query.type ? this.$route.query.type : 'INBOUND'
       this.handleItem = this.$route.query.handleItem ? Number(this.$route.query.handleItem) : 0
-      let currentTime = this.baseUtils.getClearDay(new Date())
-      let fromDate = currentTime - 29 * 24 * 60 * 60 * 1000
-      let toDate = currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000
-      if(this.handleItem === 0) {
-        this.$store.dispatch('product/getLoadStorageData', {
-          count: 10,
-          page: 1,
-          fromDate: fromDate,
-          toDate: toDate,
-          type: this.switchType
-        })
-      } else if(this.handleItem === 2) {
-        if(this.switchType === 'INBOUND') {
-          this.filterParams.type = null
-          this.$store.dispatch('product/getLoadEnterpriseData', {
-            count: 10,
-            page: 1,
-            fromDate: fromDate,
-            toDate: toDate
-          })
-        } else if(this.switchType === 'OUTBOUND'){
-          this.$store.dispatch('product/getLoadPurchaseData', {
-            count: 10,
-            page: 1,
-            startMils: fromDate,
-            endMils: toDate,
-            type: this.switchType,
-            sorting: {"createtime":"DESC"},
-            status: '502-406'
-          })
-        } else {
-          this.$router.push('/mobile/center/vendor/outOfStorage?providerType=person')
-        }
-      } else {
-        this.$router.push('/mobile/center/vendor/outOfStorage?providerType=person')
-      }
     },
     watch: {
       'storageData': {
         handler: function (val) {
           if (val && val.content) {
-            this.storageList = val.content
-            this.isChange = false
+            if(this.isChange){
+              this.storageList = []
+              this.isChange = false
+            }
+            this.storageList = [...this.storageList, ...val.content]
           }
-          this.storageList = [...this.storageList, ...val.content]
         }
       }
     },
@@ -162,7 +128,7 @@
         return this.allStorageData.fetching
       },
       allPage () {
-        return this.allStorageData.totalPages
+        return this.storageData.totalPages
       },
       isEmpty () {
         return this.storageList.length === 0

+ 24 - 9
pages/mobile/center/vendor/outOfStorage/purchase/_storeid.vue

@@ -14,7 +14,7 @@
         <div class="storage-info">
           <div class="linetext">入库单: <span>系统自动生成</span></div>
           <div class="linetext">卖家名称: <span v-text="storageList.buyentername || storageList.buyername">21324</span></div>
-          <div class="linetext">所属订单: <span v-text="storageList.purchaseid || '-'">21324</span></div>
+          <div class="linetext">所属订单: <span v-text="storageList.orid || '-'">21324</span></div>
           <div class="linetext" v-if="allObj.logistics">物流公司:<span v-text="allObj.logistics.companyName"></span></div>
           <div class="linetext" v-if="allObj.logistics">物流单号:<span v-text="allObj.logistics.number"></span></div>
           <div class="linetext">录入人: <span v-text="storageList.sellername || '-'">21324</span></div>
@@ -28,7 +28,7 @@
             <div class="linetext width50 fl">物料名称: <span v-text="item.kiName || '-'">21324</span></div>
             <div class="linetext width50 fl">规格: <span v-text="item.spec || '-'">21324</span></div>
             <div class="linetext width50 fl">入库数(PCS):<span v-text="item.qty || '-'">-</span></div>
-            <div class="linetext width50 fl">单价({{currency === 'RMB' ? '¥': '$'}}): <span class="base-color" v-text="item.price || '-'">21324</span></div>
+            <div class="linetext width50 fl">单价({{currency === 'RMB' ? '¥': '$'}}): <span class="base-color" v-text="item.taxUnitprice || '-'">21324</span></div>
           </li>
         </ul>
       </div>
@@ -38,17 +38,17 @@
           <span class="clear" @click="saveClick('clear')">取消</span>
         </div>
         <div class="storage-info">
-          <div class="logistics-line" v-show="showLogistics && logisticsCode.content">
+          <div class="logistics-line" v-show="showLogistics && logisticsCode">
             <ul class="similar">
-              <li v-for="sCode in logisticsCode.content" @click.stop="setLogisticsCode(sCode.companyName)">
+              <li v-for="sCode in logisticsCode" @click.stop="setLogisticsCode(sCode.companyName)">
                 <span v-text="sCode.companyName"></span>
               </li>
-              <li v-if="logisticsCode.content.length <= 0"><span>请去PC端物流管理维护物流信息</span></li>
+              <li v-if="logisticsCode.length <= 0"><span>请去PC端物流管理维护物流信息</span></li>
             </ul>
           </div>
           <div class="linetext">出库单: <span>系统自动生成</span></div>
           <div class="linetext">买家名称: <span v-text="storageList.buyentername || storageList.buyername">21324</span></div>
-          <div class="linetext">所属订单: <span v-text="storageList.purchaseid || '-'">21324</span></div>
+          <div class="linetext">所属订单: <span v-text="storageList.orderid || '-'">21324</span></div>
           <div class="linetext"><em>*</em>物流公司:<span>
             <input style="width:3rem;" type="text" readonly placeholder="请选择物流公司" v-model="allObj.logisticsInfo.companyName" @click.stop="showLogistics = !showLogistics">
           </span></div>
@@ -71,7 +71,7 @@
               <span v-if="item.qty === item.number">-</span>
               <input style="width:1.2rem;" v-else type="text" v-model="item.qty" @blur="ChangeSendCount(item, item.qty)">
             </div>
-            <div class="linetext width50 fl">单价(¥): <span class="base-color" v-text="item.price || '-'">21324</span></div>
+            <div class="linetext width50 fl">单价(¥): <span class="base-color" v-text="item.taxUnitPrice || '-'">21324</span></div>
           </li>
         </ul>
       </div>
@@ -175,15 +175,23 @@
             if(arr.length <= 0) {
               this.onRemind('最少填写一个发货数量')
             } else {
-              this.allObj.sendType = type.sendType
+              console.log(type)
+              this.allObj.sendType = this.storageList.sendType
               this.allObj.map = arr
               this.allObj.jsonSdAddress = this.storageList.jsonAddress
               this.$http.post(`/trade/invoice/inFpu/save?id=${this.storageList.id}`, this.allObj)
                 .then(response => {
                   if(response.data.code === 1){
                     this.onRemind('保存信息成功')
+                    setTimeout(() => {
+                      this.$router.push(`/mobile/center/vendor/outOfStorage?providerType=person&handleItem=2&type=${this.$route.query.type}`)
+                    }, 1000)
+                  } else {
+                    this.onRemind('保存信息失败')
                   }
-                })
+                }).catch(err => {
+                  this.onRemind('保存信息失败')
+              })
             }
           }
         } else if(type === 'INBOUND') {
@@ -191,7 +199,14 @@
             .then(response => {
               if(response.data.code === 1){
                 this.onRemind('保存信息成功')
+                setTimeout(() => {
+                  this.$router.push(`/mobile/center/vendor/outOfStorage?providerType=person&handleItem=2&type=${this.$route.query.type}`)
+                }, 1000)
+              } else {
+                this.onRemind('保存信息失败')
               }
+            }).catch(err => {
+              this.onRemind('保存信息失败')
             })
         }
       }

+ 1 - 1
store/product.js

@@ -297,7 +297,7 @@ export const actions = {
   // 获取销售出库物流信息
   getLoadLogistics({commit}, params = {}) {
     commit('storage/REQUEST_LOGISTICS')
-    return axios.get('/kdn/logistics/page', { params })
+    return axios.get('/trade/distributor/selected', { params })
       .then(res => {
         commit('storage/GET_LOGISTICS_SUCCESS', res.data)
       }, err => {

+ 2 - 0
store/shop.js

@@ -54,6 +54,8 @@ export const actions = {
               commit('storeInfo/GET_COMPONENT_FAILURE', err)
             })
         } else {
+          // 如果是非标,清除上一次请求带出的器件信息
+          commit('storeInfo/GET_COMPONENT_SUCCESS', {})
           return findStoreInfoFromUuid({ commit }, {uuid: commodity.storeid})
         }
       }, err => {

+ 5 - 3
utils/baseUtils.js

@@ -6,8 +6,10 @@ const NULL_ARR = ['空', '没', '无', '-', '—', 'null', '#N/A']
  *  event: 触发事件
  *  $this: 当前对象
  *  item: 操作对象
+ *  url: 购买跳转的结算页地址
+ *  buyCount: 购买数量,不填则选择起订量
  * */
-const _buyOrCar = function (isBuy, event, $this, item, url = '/user#/order/pay/') {
+const _buyOrCar = function (isBuy, event, $this, item, url = '/user#/order/pay/', buyCount) {
   if (event) event.stopPropagation()
   if (!$this.$store.state.option.user.logged) {
     $this.$http.get('/login/page', {params: {returnUrl: window.location.href}}).then(response => {
@@ -21,7 +23,7 @@ const _buyOrCar = function (isBuy, event, $this, item, url = '/user#/order/pay/'
         $this.$http.post('/trade/order/buyNow', [{
           uuid: item.uuid,
           batchCode: item.batchCode,
-          number: item.minBuyQty,
+          number: buyCount || item.minBuyQty,
           storeid: item.storeid ? item.storeid : item.storeId,
           storeUuid: item.storeid ? item.storeid : item.storeId,
           currencyName: item.currencyName,
@@ -59,7 +61,7 @@ const _buyOrCar = function (isBuy, event, $this, item, url = '/user#/order/pay/'
         $this.$http.post('/trade/cart/add', {
           uuid: item.uuid,
           batchCode: item.batchCode,
-          number: item.minBuyQty,
+          number: buyCount || item.minBuyQty,
           storeid: item.storeid ? item.storeid : item.storeId,
           storeUuid: item.storeid ? item.storeid : item.storeId,
           currencyName: item.currencyName,