Skip to content

C
CFFP-HB
Commit bd8f3eaf by sunchao
Options

支付调试&积分查询条件切换&积分兑换

parent c5a78da9
Showing with 71 additions and 53 deletions
App.vue
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
/*每个页面公共css */ /*每个页面公共css */
uni-page-body{ uni-page-body{
height: 100%; height: 100%;
padding-top: 80rpx; padding-top: 100rpx;
} }
@font-face { @font-face {
font-family: 'iconfont'; font-family: 'iconfont';
......
manifest.json
...@@ -66,13 +66,13 @@ ...@@ -66,13 +66,13 @@
}, },
"ad" : {}, "ad" : {},
"payment" : { "payment" : {
"alipay" : {
"__platform__" : [ "ios", "android" ]
},
"weixin" : { "weixin" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ],
"appid" : "wxec09b9be6cff4eb3", "appid" : "wxec09b9be6cff4eb3",
"UniversalLinks" : "" "UniversalLinks" : ""
},
"alipay" : {
"__platform__" : [ "ios", "android" ]
} }
}, },
"oauth" : { "oauth" : {
......
pages/myPoints/myPoints.vue
...@@ -86,6 +86,9 @@ ...@@ -86,6 +86,9 @@
methods:{ methods:{
selectNav(navItem){ selectNav(navItem){
this.timeFlag = navItem.timeFlag; this.timeFlag = navItem.timeFlag;
if(this.timeFlag == 'D'){
this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
}
if(this.timeFlag == 'M'){ if(this.timeFlag == 'M'){
this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}` this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}`
} }
......
pages/orderConfirm/orderConfirm.vue
...@@ -173,15 +173,22 @@ ...@@ -173,15 +173,22 @@
api.aliAppPay(param).then(res=>{ api.aliAppPay(param).then(res=>{
if(res['success']){ if(res['success']){
const aliOrderString = res['data']['aliOrderString']; const aliOrderString = res['data']['aliOrderString'];
let _this = this
if(aliOrderString){ if(aliOrderString){
uni.requestPayment({ uni.requestPayment({
provider: 'alipay', provider: 'alipay',
orderInfo: aliOrderString, orderInfo: aliOrderString,
success: function (resp) { success: function (resp) {
alert('success:' + JSON.stringify(resp)); console.log('success:' + JSON.stringify(resp));
uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=2`
})
}, },
fail: function (err) { fail: function (err) {
alert('fail:' + JSON.stringify(err)); console.log('fail:' + JSON.stringify(err));
uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=1`
})
} }
}); });
}else{ }else{
...@@ -262,7 +269,7 @@ ...@@ -262,7 +269,7 @@
this.orderId = option.orderId; this.orderId = option.orderId;
this.courseDetail(); this.courseDetail();
this.queryByUserIdFortuneStatistic() this.queryByUserIdFortuneStatistic()
console.log(option)
}, },
mounted() { mounted() {
......
pages/orderStatus/orderStatus.vue
<template> <template>
<view class="container"> <view class="container">
<view class="statusBox"> <view class="statusBox">
<view class="successBox" v-if="orderStatus=='1'"> <view class="successBox" v-if="orderStatus=='2'">
<i class="iconfont icon-dengdai"></i> <i class="iconfont icon-dengdai"></i>
<text class="statusText">订单支付成功</text> <text class="statusText">订单支付成功</text>
<text @click="viewDetail()" class="viewOrder">查看订单 ></text> <text @click="viewDetail()" class="viewOrder">查看订单 ></text>
</view> </view>
<view class="failBox" v-if="orderStatus!='1'"> <view class="failBox" v-if="orderStatus=='1'">
<text style="color:#F04604"><i class="iconfont icon-guanbi"></i>订单支付失败</text> <text style="color:#F04604"><i class="iconfont icon-guanbi"></i>订单支付失败</text>
<view class="optionBox"> <view class="optionBox">
<text @click="cancelOrder()">取消订单</text> <text @click="cancelOrder()">取消订单</text>
...@@ -52,6 +52,8 @@ ...@@ -52,6 +52,8 @@
}) })
}, },
continuePay(){ continuePay(){
console.log('fileId',this.fileId)
console.log('orderId',this.orderId)
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}` url:`/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}`
}) })
...@@ -66,7 +68,7 @@ ...@@ -66,7 +68,7 @@
this.orderId = options.orderId; this.orderId = options.orderId;
this.orderStatus = options.orderStatus; this.orderStatus = options.orderStatus;
this.fileId = options.fileId; this.fileId = options.fileId;
console.log(this.orderStatus) console.log(options)
} }
} }
</script> </script>
......
pages/systemMsg/system_msg.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
if (res['success']) { if (res['success']) {
this.system_msgs_list = res['data']['dataList']; this.system_msgs_list = res['data']['dataList'];
}else{ }else{
this.system_msgs_list = null this.system_msgs_list = null;
} }
}); });
}, },
......
pages/withdrawal/withdrawal.vue
...@@ -120,50 +120,15 @@ ...@@ -120,50 +120,15 @@
aliWithdrawal(){ aliWithdrawal(){
this.aliWithdrawalResVO = { this.aliWithdrawalResVO = {
...this.aliWithdrawalResVO, ...this.aliWithdrawalResVO,
orderNo:this.partnerTradeNo orderNo:this.partnerTradeNo,
} amount:this.exchangeAmount,
api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{
alert(JSON.stringify(res))
console.log(res)
})
},
//微信去提现
wxWithdrawal(){
// APP：
// #ifdef APP-PLUS
uni.login({
provider: 'weixin',
success: function (loginRes) {
// 登录成功
// alert(JSON.stringify(loginRes))
uni.getUserInfo({
provider: 'weixin',
success: function(info) {
// 获取用户信息成功, info.authResult保存用户信息
console.log(info)
this.wxWithdrawalResVO.openId=info.openId;
const wxWithdrawalResVO = {
...this.wxWithdrawalResVO,
userId:uni.getStorageSync('cffp_userId'), userId:uni.getStorageSync('cffp_userId'),
userReName:'孙超'
} }
api.wxWithdrawal(wxWithdrawalResVO).then((res)=>{ console.log(JSON.stringify(this.aliWithdrawalResVO))
api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{
console.log(res) console.log(res)
}) if(res['data']['isAuth'] == 1){
}
})
},
fail: function (err) {
// 登录授权失败
// err.code是错误码
}
})
// #endif
},
confirmWithdrawal(){
if(this.paymentMethod == 1){
this.wxWithdrawal();
}
if(this.paymentMethod == 2){
// APP： // APP：
// #ifdef APP-PLUS // #ifdef APP-PLUS
let urls= this.aliWithdrawalResVO.aliAuthUrl; let urls= this.aliWithdrawalResVO.aliAuthUrl;
...@@ -203,9 +168,50 @@ ...@@ -203,9 +168,50 @@
'com.eg.android.AlipayGphone' 'com.eg.android.AlipayGphone'
); );
} }
// this.aliWithdrawal();
// #endif // #endif
} }
})
},
//微信去提现
wxWithdrawal(){
// APP：
// #ifdef APP-PLUS
uni.login({
provider: 'weixin',
success: function (loginRes) {
// 登录成功
// alert(JSON.stringify(loginRes))
uni.getUserInfo({
provider: 'weixin',
success: function(info) {
// 获取用户信息成功, info.authResult保存用户信息
console.log(info)
this.wxWithdrawalResVO.openId=info.openId;
const wxWithdrawalResVO = {
...this.wxWithdrawalResVO,
userId:uni.getStorageSync('cffp_userId'),
}
api.wxWithdrawal(wxWithdrawalResVO).then((res)=>{
console.log(res)
})
}
})
},
fail: function (err) {
// 登录授权失败
// err.code是错误码
}
})
// #endif
},
confirmWithdrawal(){
if(this.paymentMethod == 1){
this.wxWithdrawal();
}
if(this.paymentMethod == 2){
this.aliWithdrawal();
}
} }
} }
} }
......
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