diff --git a/app.js b/app.js index 41d9c03..76d0440 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js App({ //----------------------------------------------globalData-------------------------------------- - release: true, + release: 1, httpUrl: 'https://api-test.qniao.cn', tmplIds: ['kg0T1ve0FpYrEtZ4ExbypHm8mtS7OJaehvqN_T9ypoI'], globalData: { diff --git a/pages/mall/order-info/index.js b/pages/mall/order-info/index.js index 23a1dce..181bfe7 100644 --- a/pages/mall/order-info/index.js +++ b/pages/mall/order-info/index.js @@ -181,15 +181,20 @@ Page({ if(this.checkSkuPrice(this.data.matchTag, element)){ this.data.form.unitPrice = Number(element.price) this.data.form.stockNumber = Number(element.stockNumber) + // 如果当前的数量大于所选规格的库存数量,那么就设置成库存数量; + if(this.data.form.number > this.data.form.stockNumber){ + this.data.form.number = Number(element.stockNumber) + } this.data.form.dividePrice = Number(element.dividePrice) this.data.form.skuId = element.id - console.log(element) + // console.log(element) break } } // 如果查询到了价格,进行价格计算 if(this.data.form.unitPrice){ this.setData({ + ['form.number']: this.data.form.number, ['form.unitPrice']: this.data.form.unitPrice, ['form.stockNumber']: this.data.form.stockNumber, amount: float.accMul(this.data.form.unitPrice, this.data.form.number) diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml index 0a6d738..0940a24 100644 --- a/pages/mall/order-info/index.wxml +++ b/pages/mall/order-info/index.wxml @@ -37,7 +37,7 @@ 购买数量 - + diff --git a/pages/mall/order-offer/index.js b/pages/mall/order-offer/index.js index 580da4f..dddc248 100644 --- a/pages/mall/order-offer/index.js +++ b/pages/mall/order-offer/index.js @@ -10,7 +10,7 @@ Page({ */ data: { form: { - payType: 1, + payType: 2, }, addressInfo: null, isIPhoneX: false @@ -21,7 +21,7 @@ Page({ onLoad: function (options) { if (options.json) { var form = JSON.parse(options.json) - form.payType = 1 + form.payType = 2 // form.totalPrice = float.accAdd(float.accMul(form.unitPrice, form.number), form.dividePrice) form.totalPrice = float.accMul(form.unitPrice, form.number).toFixed(2) form.preAmount = float.accMul(float.accMul(form.unitPrice, form.number), 0.1).toFixed(2) diff --git a/pages/mall/order-offer/index.wxml b/pages/mall/order-offer/index.wxml index 716339b..c606b8a 100644 --- a/pages/mall/order-offer/index.wxml +++ b/pages/mall/order-offer/index.wxml @@ -66,13 +66,13 @@ 付款方式 - + 货到付款