合并分支 'yan' 到 'master'
提现 + 支付 查看合并请求 !14
正在显示
5 个修改的文件
包含
35 行增加
和
6 行删除
@@ -2,13 +2,22 @@ | @@ -2,13 +2,22 @@ | ||
2 | var wx = require('jweixin-module') | 2 | var wx = require('jweixin-module') |
3 | import {authorization,getOpenid } from '@/api/send' | 3 | import {authorization,getOpenid } from '@/api/send' |
4 | export default { | 4 | export default { |
5 | + // http://localhost:8080/ | ||
5 | onLaunch: function(e) { | 6 | onLaunch: function(e) { |
6 | const openId = uni.getStorageSync('openId') | 7 | const openId = uni.getStorageSync('openId') |
8 | + console.log(openId); | ||
7 | if(!openId && !e.query.code){ | 9 | if(!openId && !e.query.code){ |
8 | getApp().authorization() | 10 | getApp().authorization() |
9 | }else if(e.query.code) { | 11 | }else if(e.query.code) { |
12 | + console.log(2); | ||
10 | getApp().getOpenid(e.query.code) | 13 | getApp().getOpenid(e.query.code) |
11 | } | 14 | } |
15 | + // else { | ||
16 | + // uni.showModal({ | ||
17 | + // content: 'open:'+openId + 'code:'+e.query.code, | ||
18 | + // showCancel: false | ||
19 | + // }); | ||
20 | + // } | ||
12 | console.log(e.query.code); | 21 | console.log(e.query.code); |
13 | console.log('App Launch') | 22 | console.log('App Launch') |
14 | }, | 23 | }, |
@@ -164,7 +164,7 @@ | @@ -164,7 +164,7 @@ | ||
164 | if(!this.lastInfo.buyer_wechat) return toa.toast('请输入微信号') | 164 | if(!this.lastInfo.buyer_wechat) return toa.toast('请输入微信号') |
165 | // console.log(this.lastInfo, "000000") | 165 | // console.log(this.lastInfo, "000000") |
166 | let obj = { | 166 | let obj = { |
167 | - openid:uni.getStorageSync('token'), | 167 | + openid:uni.getStorageSync('openId'), |
168 | product_id: this.product_id, | 168 | product_id: this.product_id, |
169 | buyer_package: this.lastInfo.buyer_package, | 169 | buyer_package: this.lastInfo.buyer_package, |
170 | buyer_wechat: this.lastInfo.buyer_wechat, | 170 | buyer_wechat: this.lastInfo.buyer_wechat, |
@@ -21,8 +21,8 @@ | @@ -21,8 +21,8 @@ | ||
21 | <input type="text" v-model="form.withdraw_name" placeholder="请输入" value="" /> | 21 | <input type="text" v-model="form.withdraw_name" placeholder="请输入" value="" /> |
22 | </view> | 22 | </view> |
23 | <view class="list"> | 23 | <view class="list"> |
24 | - <view class="input">支付宝绑定的手机号:</view> | ||
25 | - <input type="number" v-model="form.withdraw_mobile" maxlength="11" placeholder="请输入" value="" /> | 24 | + <view class="input">支付宝绑定的账号:</view> |
25 | + <input type="text" v-model="form.withdraw_mobile" maxlength="11" placeholder="请输入" value="" /> | ||
26 | </view> | 26 | </view> |
27 | </view> | 27 | </view> |
28 | <view class="payInput" v-if="form.withdraw_type==3"> | 28 | <view class="payInput" v-if="form.withdraw_type==3"> |
@@ -203,6 +203,24 @@ | @@ -203,6 +203,24 @@ | ||
203 | uni.showToast({ title:err,icon:'none' }) | 203 | uni.showToast({ title:err,icon:'none' }) |
204 | console.log('takeMoney', err) | 204 | console.log('takeMoney', err) |
205 | } | 205 | } |
206 | + }, | ||
207 | + async takeBail(){ | ||
208 | + try { | ||
209 | + const res = await takeBail(this.form) | ||
210 | + setTimeout(()=>{ | ||
211 | + toa.success('提现提交成功,请等待审核') | ||
212 | + },200) | ||
213 | + for (let key in this.form) { | ||
214 | + this.form[key]='' | ||
215 | + } | ||
216 | + this.form.withdraw_type = 1 | ||
217 | + this.getUserInfo() | ||
218 | + console.log('takeMoney', res) | ||
219 | + // 保存数据 | ||
220 | + } catch (err) { | ||
221 | + uni.showToast({ title:err,icon:'none' }) | ||
222 | + console.log('takeMoney', err) | ||
223 | + } | ||
206 | } | 224 | } |
207 | 225 | ||
208 | }, | 226 | }, |
1 | <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>元届印象</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) | 1 | <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>元届印象</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) |
2 | - document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.5c54ce65.js></script></body></html> | ||
2 | + document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.9fa833af.js></script></body></html> |
@@ -18,9 +18,11 @@ export const request = (options) => { | @@ -18,9 +18,11 @@ export const request = (options) => { | ||
18 | } else { | 18 | } else { |
19 | if(res.data.code== 401){ | 19 | if(res.data.code== 401){ |
20 | uni.navigateTo({ | 20 | uni.navigateTo({ |
21 | - url:'/login/login' | 21 | + url:'/pages/login/login' |
22 | }) | 22 | }) |
23 | - uni.clearStorageSync() | 23 | + // uni.clearStorageSync() |
24 | + uni.removeStorageSync('token') | ||
25 | + uni.removeStorageSync('userInfo') | ||
24 | } | 26 | } |
25 | reject(res.data.msg) | 27 | reject(res.data.msg) |
26 | } | 28 | } |
-
请 注册 或 登录 后发表评论