Skip to content

M
mingPayMobile
Commit 8551d7d0 by fengzhaoyu
Options

MOD:修改token 下拉刷新

parent 95271782
Showing with 435 additions and 82 deletions
API/http.js
...@@ -14,8 +14,8 @@ const $http = (url, data, type, loadingType) => { ...@@ -14,8 +14,8 @@ const $http = (url, data, type, loadingType) => {
let refresh_token = hasToken.refresh_token // 刷新token let refresh_token = hasToken.refresh_token // 刷新token
let mingUserId = dd.getStorageSync({ key: 'mingUserId' }).data let mingUserId = dd.getStorageSync({ key: 'mingUserId' }).data
// 时间戳未过期 // 时间戳未过期
if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime < hasToken.expires_in * 1000)){ // if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime < hasToken.expires_in * 1000)){
// if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime)< 30 * 1000){ if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime)< 1 * 1000){
data.orgId = dd.corpId; data.orgId = dd.corpId;
let sendData = ''; let sendData = '';
for(let key in data){ for(let key in data){
...@@ -40,18 +40,68 @@ const $http = (url, data, type, loadingType) => { ...@@ -40,18 +40,68 @@ const $http = (url, data, type, loadingType) => {
// 修改系统繁忙时loading隐藏 // 修改系统繁忙时loading隐藏
dd.hideLoading(); dd.hideLoading();
dd.alert({ dd.alert({
content: '系统异常', content: '请检查网络并下拉重试',
buttonText: '确定' buttonText: '确定'
}); });
} }
}, },
fail: function(res) { fail: function(err) {
// 服务端没有token
if(err.status == 401 ) {
dd.httpRequest({
headers: {
'Authorization': 'Basic bWluZ3BheS1waG9uZTptaW5ncGF5LXBob25l',
'Content-Type': 'application/x-www-form-urlencoded'
},
data: {
grant_type: 'refresh_token',
refresh_token: refresh_token
},
url:`${app.globalData.globalUrl}/auth/oauth/token`,
method: 'POST',
dataType: 'json',
success: function(res) {
dd.setStorageSync({
key: 'token',
data: {
access_token: res.data.access_token,
expires_in: res.data.expires_in,
refresh_token: res.data.refresh_token,
loginTime: (new Date()).getTime()
}
})
$http(url, data, type).then(res => {
return resolve(res)
})
},
fail: function(err) {
dd.hideLoading()
if(err.status == 426) {
dd.removeStorageSync({
key:'token'
})
dd.redirectTo({
url: '/pages/reTry/reTry'
})
}
else {
dd.alert({
content:'请检查网络并下拉重试',
buttonText: '确定'
})
}
}
})
}
else {
dd.alert({ dd.alert({
content:'系统异常', content:'请检查网络并下拉重试',
buttonText:'确定' buttonText: '确定'
}) })
dd.hideLoading(); dd.hideLoading();
} }
}
}) })
}) })
} }
...@@ -72,9 +122,12 @@ const $http = (url, data, type, loadingType) => { ...@@ -72,9 +122,12 @@ const $http = (url, data, type, loadingType) => {
grant_type: 'refresh_token', grant_type: 'refresh_token',
refresh_token: refresh_token refresh_token: refresh_token
}, },
url:`${app.globalData.globalUrl}/mingpay-phone/auth/oauth/token`, url:`${app.globalData.globalUrl}/auth/oauth/token`,
method: 'POST', method: 'POST',
success: function(res) { success: function(res) {
dd.removeStorage({
key:'token'
})
dd.setStorageSync({ dd.setStorageSync({
key: 'token', key: 'token',
data: { data: {
...@@ -88,18 +141,29 @@ const $http = (url, data, type, loadingType) => { ...@@ -88,18 +141,29 @@ const $http = (url, data, type, loadingType) => {
return resolve(res) return resolve(res)
}) })
}, },
fail: function(res) { fail: function(err) {
if(err.status == 426) {
dd.hideLoading()
dd.removeStorageSync({
key:'token'
})
dd.redirectTo({
url: '/pages/reTry/reTry'
})
}
else {
dd.alert({ dd.alert({
content:'系统异常', content:'请检查网络并下拉重试',
buttonText:'确定' buttonText: '确定'
}) })
dd.hideLoading(); dd.hideLoading();
} }
}
}) })
} }
else { else {
dd.alert({ dd.alert({
content: '您暂时无网', content: '请检查网络并下拉重试',
buttonText: '确定' buttonText: '确定'
}); });
dd.hideLoading() dd.hideLoading()
......
API/login.js 0 → 100644
const login = () => {
const app = getApp()
let mingUserId = dd.getStorageSync({ key: 'mingUserId' }).data
// 有token
if((dd.getStorageSync({ key: 'token' }).data && dd.getStorageSync({ key: 'token' }).data.access_token)) {
let hasToken = dd.getStorageSync({ key: 'token' }).data; // token
let expires_in = hasToken.expires_in || ''; // 过期时效
let loginTime = hasToken.expires_in || ''; // 用户登陆时间
let token = hasToken.access_token || '';
let refresh_token = hasToken.refresh_token // 刷新token
// 判断token没有过期
if(((new Date()).getTime() - hasToken.loginTime < hasToken.expires_in * 1000)) {
// if(((new Date()).getTime() - hasToken.loginTime < 30 * 1000)) {
dd.redirectTo({
url:'/pages/index/index'
})
}
// 判断token过期
else {
return new Promise((resolve,reject) => {
// 判断有无网络
dd.getNetworkType({
success: (res) => {
if(res.networkAvailable) {
dd.httpRequest({
headers: {
'Authorization': 'Basic bWluZ3BheS1waG9uZTptaW5ncGF5LXBob25l',
'Content-Type': 'application/x-www-form-urlencoded'
},
dataType: 'json',
data: {
grant_type: 'refresh_token',
refresh_token: refresh_token
},
url:`${app.globalData.globalUrl}/auth/oauth/token`,
method: 'POST',
success: function(res) {
if(res.status == 200) {
dd.setStorageSync({
key: 'token',
data: {
access_token: res.data.access_token,
expires_in: res.data.expires_in,
refresh_token: res.data.refresh_token,
loginTime: (new Date()).getTime()
}
})
login()
}
},
fail: function(err) {
if(err.status == 426) {
dd.removeStorageSync({
key: 'token'
})
login()
}
else {
dd.hideLoading()
dd.redirectTo({
url: '/pages/reTry/reTry'
})
}
}
})
}
else {
dd.hideLoading()
dd.redirectTo({
url: '/pages/reTry/reTry'
})
}
}
})
})
}
}
// 无token
else {
return new Promise((resolve,reject) => {
dd.getNetworkType({
success: function(res) {
if(res.networkAvailable) {
dd.httpRequest({
headers: {
'Authorization': 'Basic bWluZ3BheS1waG9uZTptaW5ncGF5LXBob25l',
'Content-Type': 'application/x-www-form-urlencoded'
},
data: {
username: mingUserId,
password: mingUserId,
scope: 'server',
grant_type: 'password'
},
url:`${app.globalData.globalUrl}/auth/oauth/token`,
method: 'POST',
dataType: 'json',
success: function(res) {
dd.setStorageSync({
key: 'token',
data: {
access_token: res.data.access_token,
expires_in: res.data.expires_in,
refresh_token: res.data.refresh_token,
loginTime: (new Date()).getTime()
}
})
dd.redirectTo({
url:'/pages/index/index'
})
}
})
}
else {
dd.hideLoading()
dd.redirectTo({
url:'/pages/reTry/reTry'
})
}
}
})
})
}
}
export default {login}
\ No newline at end of file
pages/action/action.js
const app = getApp() const app = getApp()
import $login from './../../API/login'
Page({ Page({
onLoad(query) { onLoad(query) {
const _that = this; const _that = this;
...@@ -25,18 +26,14 @@ Page({ ...@@ -25,18 +26,14 @@ Page({
} }
// 无网络状态 // 无网络状态
else { else {
if (dd.getStorageSync({ key: 'token' }).data) { if (dd.getStorageSync({ key: 'token' }).data && dd.getStorageSync({ key: 'token' }).data.access_token) {
dd.redirectTo({ dd.redirectTo({
url: '/pages/index/index' url: '/pages/index/index'
}) })
} }
else { else {
dd.alert({
content: '登录超时，请连接网络重试',
buttonText: '确定'
});
dd.redirectTo({ dd.redirectTo({
url:'/pages/reTry/reTry' url: '/pages/reTry/reTry'
}) })
dd.hideLoading() dd.hideLoading()
} }
...@@ -71,16 +68,17 @@ Page({ ...@@ -71,16 +68,17 @@ Page({
key: 'avatar', key: 'avatar',
data: data.oapiUser.avatar data: data.oapiUser.avatar
}) })
_that.getUserToken(data.mingUserId) $login.login()
} }
else { else {
dd.redirectTo({ dd.redirectTo({
url:'pages/reTry/reTry' url:'/pages/reTry/reTry'
}) })
dd.hideLoading() dd.hideLoading()
} }
}, },
fail: function(res) { fail: function(res) {
dd.hideLoading();
console.log('err',res.errorMessage) console.log('err',res.errorMessage)
if(res.errorMessage == "NETWORK ERROR") { if(res.errorMessage == "NETWORK ERROR") {
dd.alert({ dd.alert({
...@@ -93,7 +91,6 @@ Page({ ...@@ -93,7 +91,6 @@ Page({
url:'/pages/reTry/reTry' url:'/pages/reTry/reTry'
}) })
} }
dd.hideLoading();
} }
}) })
......
pages/alipayRecharge/alipayRecharge.js
...@@ -7,7 +7,15 @@ Page({ ...@@ -7,7 +7,15 @@ Page({
messagedetail: '', messagedetail: '',
type: '' type: ''
}, },
recharg(){ recharg() {
let regPrice = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
if (!regPrice.test(this.data.inputValue) || this.data.inputValue == '' ) {
dd.alert({
content: '请输入正确的金钱格式',
buttonText: '确定'
})
}
else {
dd.showLoading({ dd.showLoading({
content: '加载中...' content: '加载中...'
}); });
...@@ -22,8 +30,11 @@ Page({ ...@@ -22,8 +30,11 @@ Page({
dd.hideLoading(); dd.hideLoading();
console.log('rechargError') console.log('rechargError')
}) })
}
}, },
changeRechargeNum(event){ changeRechargeNum(event) {
const _that = this; const _that = this;
switch (event.target.dataset.num) { switch (event.target.dataset.num) {
case '20': case '20':
...@@ -63,7 +74,7 @@ Page({ ...@@ -63,7 +74,7 @@ Page({
}) })
} }
}, },
ddPayFn(str){ ddPayFn(str) {
const _that = this; const _that = this;
console.log('调用成功') console.log('调用成功')
console.log(str) console.log(str)
...@@ -73,7 +84,7 @@ Page({ ...@@ -73,7 +84,7 @@ Page({
success: res => { success: res => {
console.log(JSON.stringify(res) + 'ddPayFnSuccess') console.log(JSON.stringify(res) + 'ddPayFnSuccess')
console.log(res) console.log(res)
if(res.resultStatus === "9000"){ if (res.resultStatus === "9000") {
dd.redirectTo({ dd.redirectTo({
url: `/pages/rechargeSuccess/rechargeSuccess?money=${this.data.inputValue}` url: `/pages/rechargeSuccess/rechargeSuccess?money=${this.data.inputValue}`
}) })
...@@ -91,7 +102,7 @@ Page({ ...@@ -91,7 +102,7 @@ Page({
resultStatus: '' // 本次操作的状态返回值，标识本次调用的结果 resultStatus: '' // 本次操作的状态返回值，标识本次调用的结果
}*/ }*/
}, },
fail: err =>{ fail: err => {
dd.alert({ dd.alert({
content: '充值失败', content: '充值失败',
buttonText: '确定' buttonText: '确定'
...@@ -115,7 +126,7 @@ Page({ ...@@ -115,7 +126,7 @@ Page({
onLoad(query) { onLoad(query) {
// 页面加载 // 页面加载
console.info(`Page onLoad with query: ${JSON.stringify(query)}`); console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
dd.setNavigationBar({title: '充值'}); dd.setNavigationBar({ title: '充值' });
}, },
onReady() { onReady() {
// 页面加载完成 // 页面加载完成
...@@ -128,16 +139,21 @@ Page({ ...@@ -128,16 +139,21 @@ Page({
}, },
onUnload() { onUnload() {
// 页面被关闭 // 页面被关闭
dd.stopPullDownRefresh()
}, },
onTitleClick() { onTitleClick() {
// 标题被点击 // 标题被点击
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
dd.redirectTo({ const _that = this
url:'/pages/alipayRecharge/alipayRecharge' _that.setData({
focus: false,
inputValue: '',
messagedetail: '',
type: ''
}) })
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
// 页面被拉到底部 // 页面被拉到底部
......
pages/allowanceList/allowanceList.js
...@@ -90,16 +90,25 @@ Page({ ...@@ -90,16 +90,25 @@ Page({
}, },
onUnload() { onUnload() {
// 页面被关闭 // 页面被关闭
dd.stopPullDownRefresh()
}, },
onTitleClick() { onTitleClick() {
// 标题被点击 // 标题被点击
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
dd.redirectTo({ const _that = this
url: '/pages/allowanceList/allowanceList' _that.setData({
type: '1',
available: 'YES',
dataList:[],
currentPage: 1,
pageNumber: 10,
totalCount: ''
}) })
this.querySubsidyList()
this.resetData()
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
let currentNum = ''; let currentNum = '';
......
pages/allowanceRecordList/allowanceRecordList.js
...@@ -7,14 +7,18 @@ Page({ ...@@ -7,14 +7,18 @@ Page({
currentPage: 1, currentPage: 1,
totalCount: '', totalCount: '',
pageNumber: 10, pageNumber: 10,
subsidyNo: '' subsidyNo: '',
query: ''
}, },
onLoad(query) { onLoad(query) {
this.resetData() this.resetData()
dd.setNavigationBar({title: '账单记录'}); dd.setNavigationBar({title: '账单记录'});
console.log(query,2222222222)
this.setData({ this.setData({
query: query,
subsidyNo: query.subsidyNo subsidyNo: query.subsidyNo
}) })
console.log(this.data.query,33333333333333333)
}, },
resetData(){ resetData(){
this.setData({ this.setData({
...@@ -93,9 +97,20 @@ Page({ ...@@ -93,9 +97,20 @@ Page({
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
// dd.redirectTo({ this.setData({
// url: '/pages/allowanceRecordList/allowanceRecordList' statusList: ['SUCCESS', 'WAITING_PERMIT', 'REFUND_SUCCESS'],
// }) recordAlliwanceListData: [],
currentPage: 1,
totalCount: '',
pageNumber: 10,
subsidyNo: ''
})
this.resetData()
this.setData({
subsidyNo: this.data.query.subsidyNo
})
this.queryListPaymentRecord()
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
let currentNum = ''; let currentNum = '';
...@@ -105,6 +120,7 @@ Page({ ...@@ -105,6 +120,7 @@ Page({
currentPage: currentNum currentPage: currentNum
}) })
this.queryListPaymentRecord(currentNum) this.queryListPaymentRecord(currentNum)
} }
}, },
onShareAppMessage() { onShareAppMessage() {
......
pages/allowanceRecordList/allowanceRecordList.json
{ {
"pullRefresh": false "pullRefresh": true
} }
\ No newline at end of file
pages/billDetails/billDetails.js
...@@ -3,13 +3,15 @@ import $http from './../../API/http' ...@@ -3,13 +3,15 @@ import $http from './../../API/http'
Page({ Page({
data:{ data:{
trxNo: '', trxNo: '',
recordData: {} recordData: {},
query: ''
}, },
onLoad(query) { onLoad(query) {
// 页面加载 // 页面加载
console.log(query); console.log(query);
this.setData({ this.setData({
trxNo: query.trxNo trxNo: query.trxNo,
query: query
}) })
dd.setNavigationBar({title: '账单详情'}); dd.setNavigationBar({title: '账单详情'});
}, },
...@@ -60,9 +62,15 @@ Page({ ...@@ -60,9 +62,15 @@ Page({
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
// dd.redirectTo({ this.setData({
// url: '/pages/billDetails/billDetails' trxNo: '',
// }) recordData: {},
})
this.setData({
trxNo: this.data.query.trxNo,
})
this.queryListPaymentRecord()
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
// 页面被拉到底部 // 页面被拉到底部
......
pages/billDetails/billDetails.json
{ {}
"pullRefresh": false \ No newline at end of file
}
\ No newline at end of file
pages/index/index.axml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</view> </view>
<view class="balanceBox"> <view class="balanceBox">
<view class="balancetitle">账户余额</view> <view class="balancetitle">账户余额</view>
<view>¥ <view class="balanceNum">{{name ? realityBalance.toFixed(2) : '--'}}</view></view> <view>¥ <view class="balanceNum">{{realityBalance ? realityBalance.toFixed(2) : '--'}}</view></view>
</view> </view>
<view class="indexItemList"> <view class="indexItemList">
<view touchStart="touchStyle" touchEnd="touchEnd" onTap="toPayment"><image mode="scaleToFill" src="./../../assets/QRcode.png"/>付款</view> <view touchStart="touchStyle" touchEnd="touchEnd" onTap="toPayment"><image mode="scaleToFill" src="./../../assets/QRcode.png"/>付款</view>
......
pages/index/index.js
...@@ -84,21 +84,49 @@ Page({ ...@@ -84,21 +84,49 @@ Page({
}, },
onUnload() { onUnload() {
// 页面被关闭 // 页面被关闭
dd.stopPullDownRefresh()
}, },
onTitleClick() { onTitleClick() {
// 标题被点击 // 标题被点击
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
const _that = this;
dd.redirectTo({ this.setData({
url: '/pages/index/index' src: './background.png',
name: '姓名',
avatar: '',
realityBalance: '',
cardNo: ''
}) })
this.setData({
avatar: dd.getStorageSync({ key: 'avatar' }).data
})
dd.getNetworkType({
success: (res) => {
if (res.networkAvailable) {
} else {
dd.showToast({
type: 'fail',
content: '未连网仅支持离线支付',
duration: 3000,
});
dd.hideLoading()
}
}
});
dd.getNetworkType({
success: (res) => {
if (res.networkAvailable) {
_that.getUserDetails()
}
else {
}
}
});
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
}, },
onShareAppMessage() { onShareAppMessage() {
// 返回自定义分享信息 // 返回自定义分享信息
......
pages/noPermission/noPermission.js
...@@ -22,6 +22,7 @@ Page({ ...@@ -22,6 +22,7 @@ Page({
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
}, },
......
pages/paySuccess/paySuccess.acss
.paymentSuccess {
width: 100%;
overflow: hidden
}
.paymentDetails{ .paymentDetails{
width: 686rpx; width: 686rpx;
height: 692rpx; height: 692rpx;
......
pages/paySuccess/paySuccess.axml
<view> <view class='paymentSuccess'>
<view class="paymentDetails"> <view class="paymentDetails">
<view><image mode="scaleToFill" src="./../../assets/paySure.png"/></view> <view><image mode="scaleToFill" src="./../../assets/paySure.png"/></view>
<view><text>支付成功</text></view> <view><text>支付成功</text></view>
......
pages/paySuccess/paySuccess.js
const app = getApp() const app = getApp()
Page({ Page({
data:{ data:{
money: '' money: '',
query: ''
}, },
onLoad(query) { onLoad(query) {
// 页面加载 // 页面加载
console.info(`Page onLoad with query: ${JSON.stringify(query)}`); console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
this.setData({ this.setData({
query: query,
money: query.money money: query.money
}) })
dd.setNavigationBar({title: '支付详情'}); dd.setNavigationBar({title: '支付详情'});
...@@ -31,10 +33,16 @@ Page({ ...@@ -31,10 +33,16 @@ Page({
onTitleClick() { onTitleClick() {
// 标题被点击 // 标题被点击
}, },
// onPullDownRefresh() { onPullDownRefresh() {
// // 页面被下拉 // 页面被下拉
// dd.stopPullDownRefresh() this.setData({
// }, money: ''
})
this.setData({
money: this.data.query.money
})
dd.stopPullDownRefresh()
},
onReachBottom() { onReachBottom() {
// 页面被拉到底部 // 页面被拉到底部
}, },
......
pages/paySuccess/paySuccess.json
{ {
"pullRefresh": false "pullRefresh": true
} }
\ No newline at end of file
pages/payment/payment.js
...@@ -38,13 +38,14 @@ Page({ ...@@ -38,13 +38,14 @@ Page({
let token = dd.getStorageSync({ key: 'token' }).data.access_token; let token = dd.getStorageSync({ key: 'token' }).data.access_token;
let expires_in = dd.getStorageSync({ key: 'token' }).data.expires_in; let expires_in = dd.getStorageSync({ key: 'token' }).data.expires_in;
let refresh_token = dd.getStorageSync({ key: 'token' }).data.refresh_token; let refresh_token = dd.getStorageSync({ key: 'token' }).data.refresh_token;
let mingUserId = dd.getStorageSync({ key: 'mingUserId' }).data
if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime < (hasToken.expires_in - 60) * 1000)) { if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime < (hasToken.expires_in - 300) * 1000)) {
// if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime < 30 * 1000)) { // if(!!hasToken && ((new Date()).getTime() - hasToken.loginTime < 1* 1000)) {
let timestamp = (new Date()).getTime(); let timestamp = (new Date()).getTime();
let url = aes.getAES(JSON.stringify({ let url = aes.getAES(JSON.stringify({
"token": token, "token": token,
"timestamp": timestamp, "timestamp": timestamp
})) }))
let size = 272 let size = 272
let ecc = 2 let ecc = 2
...@@ -57,6 +58,9 @@ Page({ ...@@ -57,6 +58,9 @@ Page({
success: (res => { success: (res => {
// 网络可用的情况下 刷新token // 网络可用的情况下 刷新token
if(res.networkAvailable) { if(res.networkAvailable) {
dd.showLoading({
content: '加载中...'
});
dd.httpRequest({ dd.httpRequest({
headers: { headers: {
'Authorization': 'Basic bWluZ3BheS1waG9uZTptaW5ncGF5LXBob25l', 'Authorization': 'Basic bWluZ3BheS1waG9uZTptaW5ncGF5LXBob25l',
...@@ -70,7 +74,9 @@ Page({ ...@@ -70,7 +74,9 @@ Page({
}, },
method: 'POST', method: 'POST',
success: function(res) { success: function(res) {
console.log(res) dd.removeStorage({
key:'token'
})
dd.setStorageSync({ dd.setStorageSync({
key: 'token', key: 'token',
data: { data: {
...@@ -80,13 +86,14 @@ Page({ ...@@ -80,13 +86,14 @@ Page({
loginTime: (new Date()).getTime() loginTime: (new Date()).getTime()
} }
}) })
dd.hideLoading()
_that.setData({ _that.setData({
isTimeOut: true isTimeOut: true
}) })
hasToken = dd.getStorageSync({ key: 'token' }).data; // hasToken = dd.getStorageSync({ key: 'token' }).data;
token = dd.getStorageSync({ key: 'token' }).data.access_token; // token = dd.getStorageSync({ key: 'token' }).data.access_token;
expires_in = dd.getStorageSync({ key: 'token' }).data.expires_in; // expires_in = dd.getStorageSync({ key: 'token' }).data.expires_in;
refresh_token = dd.getStorageSync({ key: 'token' }).data.refresh_token; // refresh_token = dd.getStorageSync({ key: 'token' }).data.refresh_token;
let timestamp = (new Date()).getTime(); let timestamp = (new Date()).getTime();
let url = aes.getAES(JSON.stringify({ let url = aes.getAES(JSON.stringify({
...@@ -100,18 +107,25 @@ Page({ ...@@ -100,18 +107,25 @@ Page({
QR.draw(url, ctx, size, Number(ecc)); QR.draw(url, ctx, size, Number(ecc));
}, },
fail: function(res) { fail: function(err) {
if(err.status == 426) {
dd.redirectTo({
url: '/pages/reTry/reTry'
})
}
else {
dd.alert({ dd.alert({
content: '系统繁忙', content: '请检查网络并下拉重试',
buttonText: '确定' buttonText: '确定'
}) })
dd.hideLoading() dd.hideLoading()
} }
}
}) })
} }
else { else {
dd.alert({ dd.alert({
content: '请连接网络后重新进入', content: '请检查网络设置并下拉重试',
buttonText: '确定' buttonText: '确定'
}) })
_that.setData({ _that.setData({
...@@ -196,18 +210,41 @@ Page({ ...@@ -196,18 +210,41 @@ Page({
const _that = this; const _that = this;
clearInterval(timeRefreshQRcode); clearInterval(timeRefreshQRcode);
webSocket.closeSocket(); webSocket.closeSocket();
// dd.closeSocket();
// dd.offSocketMessage()
}, },
onTitleClick() { onTitleClick() {
// 标题被点击 // 标题被点击
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
dd.redirectTo({ this.setData({
url: '/pages/payment/payment' src: './background.png',
title: '123123123123',
imgPath: '',
className: '',
size: 272,
url: '',
ecc: 2,
isTimeOut: true
}) })
const _that = this;
setTimeout(function (){
clearInterval(timeRefreshQRcode);
_that.refreshQRcode();
timeRefreshQRcode = setInterval(function () {
_that.refreshQRcode();
}, 55000);
},500)
dd.getNetworkType({
success: (res) => {
// 有网络状态
if (res.networkAvailable) {
// 获取免登授权码
webSocket.connectSocket();
webSocket.onSocketMessageCallback = this.onSocketMessageCallback;
}
}
});
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
// 页面被拉到底部 // 页面被拉到底部
......
pages/reTry/reTry.axml
<view> <view>
<view class="noPermissionContent"> <view class="noPermissionContent">
<image mode="scaleToFill" src="../../../assets/noPermission.png"/> <image mode="scaleToFill" src="../../../assets/noPermission.png"/>
<text>登录失败，请重试</text> <text>请检查网络设置并单击重试</text>
<button class='reTry' onTap="reTry">重试</button> <button class='reTry' onTap="reTry">重试</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/rechargeSuccess/rechargeSuccess.acss
.rechargeSucess {
width: 100%;
overflow: hidden
}
.paymentDetails{ .paymentDetails{
width: 686rpx; width: 686rpx;
height: 692rpx; height: 692rpx;
......
pages/rechargeSuccess/rechargeSuccess.axml
<view> <view class='rechargeSucess'>
<view class="paymentDetails"> <view class="paymentDetails">
<view><image mode="scaleToFill" src="./../../assets/paySure.png"/></view> <view><image mode="scaleToFill" src="./../../assets/paySure.png"/></view>
<view><text>支付成功</text></view> <view><text>支付成功</text></view>
......
pages/rechargeSuccess/rechargeSuccess.js
const app = getApp() const app = getApp()
Page({ Page({
data:{ data:{
money: '' money: '',
query: ''
}, },
onLoad(query) { onLoad(query) {
// 页面加载 // 页面加载
console.info(`Page onLoad with query: ${JSON.stringify(query)}`); console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
this.setData({ this.setData({
query:query,
money: query.money money: query.money
}) })
dd.setNavigationBar({title: '充值详情'}); dd.setNavigationBar({title: '充值详情'});
...@@ -33,6 +35,11 @@ Page({ ...@@ -33,6 +35,11 @@ Page({
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
this.setData({
money:'',
money: this.data.query.money
})
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
// 页面被拉到底部 // 页面被拉到底部
......
pages/rechargeSuccess/rechargeSuccess.json
{ {
"pullRefresh": false "pullRefresh": true
} }
\ No newline at end of file
pages/recordList/recordList.js
...@@ -225,9 +225,33 @@ Page({ ...@@ -225,9 +225,33 @@ Page({
}, },
onPullDownRefresh() { onPullDownRefresh() {
// 页面被下拉 // 页面被下拉
dd.redirectTo({ this.setData({
url:'/pages/recordList/recordList' time: '',
orderStartTime: '',
orderEndTime: '',
orderType: '',
orderStatus: '',
sceneType: '',
statusList: ['SUCCESS', 'REFUND_SUCCESS'],
recordListData: [],
currentPage: 1,
totalCount: '',
pageNumber: 20,
})
this.resetData()
dd.setNavigationBar({title: '账单记录'});
let date = new Date();
let year = date.getFullYear();
let month = date.getMonth()+1;
let day = (new Date(year,month,0).getDate().toString()).length > 1 ? new Date(year,month,0).getDate() : '0' + new Date(year,month,0).getDate()
this.setData({
// 刚进入账单记录页面，时间不够两位补0
time: `${year}-${month.toString().length > 1 ? month : '0' + month}`,
orderStartTime: `${year}-${month.toString().length > 1 ? month : '0' + month}-01`,
orderEndTime: `${year}-${month.toString().length > 1 ? month : '0' + month}-${ day }`
}) })
this.queryListPaymentRecord()
dd.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
// dd.alert({ // dd.alert({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment