diff --git a/common/api.js b/common/api.js index 8f90698..b38583f 100644 --- a/common/api.js +++ b/common/api.js @@ -69,4 +69,6 @@ export const API_WXBILL = '/api/salesman/qrcode'//微信小程序太阳码 /* 商户相关 */ -export const API_CONFIRM_CODE = '/api/confirm/code'; // 扫码核销 \ No newline at end of file +export const API_CONFIRM_CODE = '/api/confirm/code'; // 扫码核销 + +export const API_WIDTHDRAW = '/api/income/extract'; // 提现 \ No newline at end of file diff --git a/pages/center/invite.vue b/pages/center/invite.vue index 10db0b7..3621fa0 100644 --- a/pages/center/invite.vue +++ b/pages/center/invite.vue @@ -6,7 +6,7 @@ - + @@ -118,10 +118,10 @@ var context = wx.createCanvasContext('mycanvas'); console.log('画布', that.backgroundImg) var path = that.backgroundImg; - context.drawImage(path, 0, 0, 375, 667); + context.drawImage(path, 0, 0, 375, 600); //绘制二维码 let wxcode = that.onceCode - context.drawImage(wxcode, 18, 530, 120, 120); + context.drawImage(wxcode, 18, 460, 120, 120); //绘制名字 // context.setFontSize(24); // context.setFillStyle('#fff'); diff --git a/pages/center/wallet.vue b/pages/center/wallet.vue index a492199..a2c3ab4 100644 --- a/pages/center/wallet.vue +++ b/pages/center/wallet.vue @@ -27,12 +27,12 @@ @refresherrefresh="onRefresherrefresh"> - +¥{{item.add_price}} - 结余 ¥{{item.final_price}} + +¥{{item.add_price || 0}} + 结余 ¥{{item.final_price || 0}} - {{item.reffer}} - {{item.created_at}} + {{item.reffer || 0}} + {{item.created_at || 0}} @@ -51,12 +51,12 @@ @refresherrefresh="onRefresherrefresh"> - +¥{{item.extract_price}} - {{item.state}} + +¥{{item.extract_price || 0}} + {{item.state || 0}} - 流水号 {{item.order_no}} - {{item.created_at}} + 流水号 {{item.order_no || 0}} + {{item.created_at || 0}} diff --git a/pages/center/widthdraw.vue b/pages/center/widthdraw.vue index eb33514..5f4a747 100644 --- a/pages/center/widthdraw.vue +++ b/pages/center/widthdraw.vue @@ -1,6 +1,74 @@ @@ -8,16 +76,60 @@ export default { data() { return { - userInfoToken: '' + userInfo: '', + info: '', + name: '', + account: '', + num: '' + } + }, + computed: { + ifshow() { + if(Number(this.num) > Number(this.info.income)) { + return true + }else { + return false + } } }, methods: { - + getData(){ + this.$http(this.API.API_USER_CENTER).then(res => { + this.info = res.data; + console.log(this.info) + }) + }, + clearAble() { + this.num = '' + this.showClean = false + }, + submitWidthdraw() { + if(!this.name) { + this.$msg('请输入支付宝姓名!') + return + } + if(!this.account) { + this.$msg('请输入支付宝账号!') + return + } + if(!this.num) { + this.$msg('请输入提现金额!') + return + } + this.$http(this.API.API_WIDTHDRAW, { + account: this.account, + username: this.name, + extract_price:this.num, + channel:this.alipay, + token: this.userInfo.token + }).then(res => { + console.log(res) + }) + } }, onLoad(e) { - let userInfo = uni.getStorageSync('userinfo') || {}; - this.userInfoToken = userInfo.token - console.log(this.userInfoToken) + this.userInfo = uni.getStorageSync('userinfo') || {}; + this.getData() } } diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue index 8da1897..7e04a17 100644 --- a/pages/goodsDetail/index.vue +++ b/pages/goodsDetail/index.vue @@ -10,7 +10,7 @@ @click="lookImg(index)"> - + @@ -265,13 +265,13 @@ let goodsBackground = that.goodShare - context.drawImage(path, 0, 0, 375, 500); + context.drawImage(path, 0, 0, 375, 496); context.drawImage(goodsBackground, 10, 10, 355, 300); //绘制二维码 let wxcode = that.onceCode - context.drawImage(wxcode, 238, 324, 120, 120); + context.drawImage(wxcode, 244, 324, 120, 120); let message = '长按识别小程序码' context.setFontSize(16); context.setFillStyle('#999'); diff --git a/pages/order/pay-success.vue b/pages/order/pay-success.vue index 50ef8db..656c959 100644 --- a/pages/order/pay-success.vue +++ b/pages/order/pay-success.vue @@ -5,7 +5,7 @@ 订单支付成功 - + 您可以在我的订单中查询订单详情 @@ -14,7 +14,7 @@ 订单支付失败 - + 您可以在我的订单中查询订单详情