| @@ -32,7 +32,6 @@ Page({ | |||||
| */ | */ | ||||
| onLoad: function(options) { | onLoad: function(options) { | ||||
| let that = this; | let that = this; | ||||
| console.log(options) | |||||
| if (options.orderId || options.orderId && options.from == 'discount') { | if (options.orderId || options.orderId && options.from == 'discount') { | ||||
| if (options.from) { | if (options.from) { | ||||
| that.setData({ | that.setData({ | ||||
| @@ -44,6 +43,7 @@ Page({ | |||||
| orderId: options.orderId | orderId: options.orderId | ||||
| }) | }) | ||||
| } | } | ||||
| app.globalData.wmorder = options.orderId | |||||
| that.pressOrderDetail(options.orderId); | that.pressOrderDetail(options.orderId); | ||||
| } | } | ||||
| this.getUserInfo() | this.getUserInfo() | ||||
| @@ -228,10 +228,6 @@ Page({ | |||||
| }, 1000) | }, 1000) | ||||
| }, | }, | ||||
| // 时间格式化输出,如11:03 25:19 每1s都会调用一次 | // 时间格式化输出,如11:03 25:19 每1s都会调用一次 | ||||
| dateformat(micro_second) { | dateformat(micro_second) { | ||||
| // 总秒数 | // 总秒数 | ||||
| @@ -728,18 +724,9 @@ Page({ | |||||
| */ | */ | ||||
| onPullDownRefresh: function(e) { | onPullDownRefresh: function(e) { | ||||
| let that = this; | let that = this; | ||||
| if (that.data.orderId || that.data.orderId && that.data.from == 'discount') { | |||||
| if (that.data.from) { | |||||
| that.setData({ | |||||
| orderId: that.data.orderId, | |||||
| from: "discount" | |||||
| }) | |||||
| } else { | |||||
| that.setData({ | |||||
| orderId: that.data.orderId | |||||
| }) | |||||
| } | |||||
| that.pressOrderDetail(that.data.orderId); | |||||
| console.log(app.globalData.wmorder); | |||||
| if (app.globalData.wmorder) { | |||||
| that.pressOrderDetail(app.globalData.wmorder); | |||||
| } | } | ||||
| }, | }, | ||||
| onShareAppMessage: function(options) { | onShareAppMessage: function(options) { | ||||