diff --git a/components/r-canvas/r-canvas.js b/components/r-canvas/r-canvas.js index 256a23d..509a80a 100644 --- a/components/r-canvas/r-canvas.js +++ b/components/r-canvas/r-canvas.js @@ -409,7 +409,6 @@ export default{ canvasId: this.canvas_id, quality: 1, success: (res)=>{ - console.log('res',res) resolve(res) callback && callback(res) }, @@ -462,7 +461,6 @@ export default{ this.setNativeBorderRadius(config) this.ctx.fill() }else{ - console.log('config.border_width',config.border_width) this.ctx.fillRect(this.compatibilitySize(config.x*this.scale),this.compatibilitySize(config.y*this.scale),this.compatibilitySize(parseFloat(config.w)*this.scale),this.compatibilitySize(parseFloat(config.h)*this.scale)) } resolve() diff --git a/pages/Healthitem/Healthitem.vue b/pages/Healthitem/Healthitem.vue index a37614a..53c9817 100644 --- a/pages/Healthitem/Healthitem.vue +++ b/pages/Healthitem/Healthitem.vue @@ -23,7 +23,6 @@ // this.item.informationContent = this.item.informationContent.replace(/\ { - console.log(res) + res.data.payType = "WECHAT_PAY" + res.data.paymentPrice = res.data.totalPrice + res.data.openid = this.openid + appletGoodsOrderPay(res.data).then(Response => { + // if (response.code == 200) { + // uni.requestPayment({ + // timeStamp: response.data.timeStamp, + // nonceStr: response.data.nonceStr, + // package: response.data.prepayId, + // signType: response.data.signType, + // paySign: response.data.paySign, + // success: function(res) { + // that.$refs.uToast.show({ + // title: '支付成功', + // type: 'success', + // duration: 1500, + // url: `/pages/paysuccess/paysuccess` + // }) + // }, + // fail: function(err) { + // that.$refs.uToast.show({ + // title: '取消支付', + // type: 'error', + // duration: 1500, + // }) + // } + // }); + // } else { + // that.$refs.uToast.show({ + // title: response.msg, + // type: 'error', + // duration: 2000 + // }) + // } + }) }) }, }, @@ -85,6 +123,10 @@ this.updata.totalPrice = Number(options.price) this.updata.hospitalPersonId = Number(options.hospitalPersonId) const value = uni.getStorageSync('patientId'); + const value2 = uni.getStorageSync('openid'); + if (value2) { + this.openid = value2 + } if (value) { that.updata.patientId = value informationConfirmation(value).then(res => { diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue index da02be0..1d71d52 100644 --- a/pages/Personal/Personal.vue +++ b/pages/Personal/Personal.vue @@ -125,7 +125,11 @@ 护理站服务订单 - + + 健康咨询订单 + + + 退出账号 diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index 8c43ebe..0682c35 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -241,7 +241,6 @@ //确认预约 updata() { var that = this - console.log(this.orderlist) this.orderlist.consumableTotalPrice = null this.orderlist.orderChannel = 'WECHAT_APPLET' if (this.radio == 1) { diff --git a/pages/customerservice/customerservice.vue b/pages/customerservice/customerservice.vue index b083eb2..23cc8da 100644 --- a/pages/customerservice/customerservice.vue +++ b/pages/customerservice/customerservice.vue @@ -33,12 +33,8 @@ // longPressActions:{ // itemList:[this.l('发送给朋友'),this.l] // }, - success: res => { - console.log('previewImage res', res); - }, - fail: err => { - console.log('previewImage err', err); - } + success: res => {}, + fail: err => {} }); }, }, diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index a529965..d34120e 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -260,7 +260,7 @@ -webkit-overflow-scrolling: touch; .container { - padding-top: 70rpx; + padding-top: 65rpx; background-color: #fff }