diff --git a/app.js b/app.js index fbf3d08..5d7a5d7 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js App({ //----------------------------------------------globalData-------------------------------------- - release: 1, + release: 0, httpUrl: 'https://api.qniao.cn', tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], diff --git a/components/dialog/index.js b/components/dialog/index.js index 520638a..2a88dfe 100644 --- a/components/dialog/index.js +++ b/components/dialog/index.js @@ -110,7 +110,6 @@ baseComponent({ runCallbacks(e, method) { const { index } = e.currentTarget.dataset const button = this.originalButtons[index] - if (!button.disabled) { this.hide(() => typeof button[method] === 'function' && button[method](e)) } @@ -260,7 +259,7 @@ baseComponent({ } } if(opts.step){ - this.$$setData({ step: Number(opts.step), min: Number(opts.value) }) + this.$$setData({ step: Number(opts.step), min: Number(opts.min) }) } return this.open(Object.assign({ prompt: prompt, diff --git a/components/dialog/index.wxml b/components/dialog/index.wxml index f25af7a..5bfef6d 100644 --- a/components/dialog/index.wxml +++ b/components/dialog/index.wxml @@ -14,7 +14,7 @@ {{ content }} - + diff --git a/components/input-number/index.js b/components/input-number/index.js index a8f915a..4661c29 100644 --- a/components/input-number/index.js +++ b/components/input-number/index.js @@ -283,7 +283,7 @@ baseComponent({ attached() { const { defaultValue, value, controlled } = this.data const inputValue = controlled ? value : defaultValue - + this.setValue(inputValue, false) }, detached() { diff --git a/pages/mall/detail/index.js b/pages/mall/detail/index.js index 650501c..7f1a7e4 100644 --- a/pages/mall/detail/index.js +++ b/pages/mall/detail/index.js @@ -242,10 +242,12 @@ Page({ } else { var that = this // this.biddingDialog.showBidding(this.data.orderInfo) + var price = this.data.offered || that.data.orderInfo.unitPrice this.wuxDialog.prompt({ offer: true, title: '商品报价', - value: that.formatePrice(that.data.orderInfo.unitPrice, app.globalData.kg), + min: that.formatePrice(that.data.orderInfo.unitPrice, app.globalData.kg), + value: that.formatePrice(price, app.globalData.kg), step: that.formatePrice(that.data.orderInfo.biddingRange, app.globalData.kg), content: '请输入您的报价(元/' + (app.globalData.kg ? 'KG' : '吨') + ')', fieldtype: app.globalData.kg ? 'digit' : 'numger',