diff --git a/manifest.json b/manifest.json index 5ac2de2..7d4570f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起,人生不言弃", - "versionName" : "1.4.7", + "versionName" : "1.4.6", "versionCode" : 104, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/synthesize/entrustInfo.vue b/pages/synthesize/entrustInfo.vue index 3f6707a..a7a52cf 100644 --- a/pages/synthesize/entrustInfo.vue +++ b/pages/synthesize/entrustInfo.vue @@ -49,7 +49,7 @@ - 现金 + {{payType || '-'}} @@ -80,6 +80,7 @@ entrust : {}, params : [], createdAt: '', + payType : '', user : {}, lawyer : null, price : '0.00' @@ -91,10 +92,7 @@ mask : true }) entrustInfo(this.$Route.query.id).then(res => { - - console.log(res) - - let { entrust, params, created_at, user, order_no, total, lawyer } = res; + let { entrust, params, created_at, user, order_no, total, lawyer, pay_driver_text } = res; this.entrust = entrust this.params = params this.createdAt = created_at @@ -102,6 +100,7 @@ this.no = order_no this.price = total this.lawyer = lawyer + this.payType = pay_driver_text || '-' }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/synthesize/expandInfo.vue b/pages/synthesize/expandInfo.vue index bdc37ef..a0f8b61 100644 --- a/pages/synthesize/expandInfo.vue +++ b/pages/synthesize/expandInfo.vue @@ -48,7 +48,7 @@ - 现金 + {{payType || '-'}} @@ -80,6 +80,7 @@ params : [], createdAt: '', user : {}, + payType : '', lawyer : null, price : '0.00' }; @@ -90,7 +91,7 @@ mask : true }) expandInfo(this.$Route.query.id).then(res => { - let { expand, params, created_at, user, order_no, total, lawyer } = res; + let { expand, params, created_at, user, order_no, total, lawyer, pay_driver_text } = res; this.lawyer = lawyer this.expand = expand this.params = params @@ -98,6 +99,7 @@ this.user = user this.no = order_no this.price = total + this.payType = pay_driver_text || '' }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/synthesize/order.vue b/pages/synthesize/order.vue index 7f8da70..80cc220 100644 --- a/pages/synthesize/order.vue +++ b/pages/synthesize/order.vue @@ -419,7 +419,6 @@ this.status = page.has_more ? 'loading' : 'nomore' uni.hideLoading() }).catch(err => { - console.log(err) uni.showToast({ title: err.message, icon : 'none' diff --git a/pages/synthesize/servicesInfo.vue b/pages/synthesize/servicesInfo.vue index b59b998..ded7083 100644 --- a/pages/synthesize/servicesInfo.vue +++ b/pages/synthesize/servicesInfo.vue @@ -48,7 +48,7 @@ - 现金 + {{payType || '-'}} @@ -81,7 +81,8 @@ createdAt: '', user : {}, lawyer : null, - price : '0.00' + price : '0.00', + payType : '', }; }, created() { @@ -90,7 +91,7 @@ mask : true }) servicesInfo(this.$Route.query.id).then(res => { - let { service, params, created_at, user, order_no, total, lawyer } = res; + let { service, params, created_at, user, order_no, total, lawyer, pay_driver_text } = res; this.lawyer = lawyer this.service = service this.params = params @@ -98,6 +99,7 @@ this.user = user this.no = order_no this.price = total + this.payType = pay_driver_text || '' }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/synthesize/synthesisInfo.vue b/pages/synthesize/synthesisInfo.vue index 710ad0b..660f149 100644 --- a/pages/synthesize/synthesisInfo.vue +++ b/pages/synthesize/synthesisInfo.vue @@ -48,7 +48,7 @@ - 现金 + {{payType}} @@ -80,6 +80,7 @@ params : [], createdAt: '', user : {}, + payType : '', lawyer : null, price : '0.00' }; @@ -90,7 +91,7 @@ mask : true }) synthesisInfo(this.$Route.query.id).then(res => { - let { synthesis, params, created_at, user, order_no, price, lawyer } = res; + let { synthesis, params, created_at, user, order_no, price, lawyer, pay_driver_text } = res; this.synthesis = synthesis this.params = params this.createdAt = created_at @@ -98,6 +99,7 @@ this.no = order_no this.price = price this.lawyer = lawyer + this.payType = pay_driver_text || '-' }).catch(err => { uni.showToast({ title: err.message,