Skip to content

C
CFFP-HB
Commit 5e6b8a2a by kyle
Options

个人中心对接

parent 8fda25ff
Showing with 51 additions and 48 deletions
api/api.ts
......@@ -164,6 +164,10 @@ export default {
//去提现接口
goFortuneWithdrawal(params){
return request(`${apiURL}/fortune/goFortuneWithdrawal`, "POST", params)
},
// 支付宝支付
aliAppPay(params){
return request(`${apiURL}/aliPay/aliAppPay`, "POST", params)
}
}
manifest.json
......@@ -2,7 +2,7 @@
"name" : "CFFP财富中心",
"appid" : "__UNI__65C4CDC",
"description" : "",
"versionName" : "1.0.6",
"versionName" : "1.1.0",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
......
pages/orderConfirm/orderConfirm.vue
......@@ -11,7 +11,7 @@
<h4>价格明细</h4>
<view><text>现价</text><text>￥{{courseInfoItem.coursePrice}}</text></view>
<view>
<text @click="toggle(1,'bottom')">积分抵扣<i class="iconfont icon-31tishi"></i></text>
<text @click="toggle(1,'bottom')">积分抵扣<i class="iconfont icon-31tishi"></i></text>
<text class="integralBox" @click="toggle(2,'bottom')">未选积分，可抵扣{{deductionCore}}<i class="iconfont icon-youjiantou"></i></text>
</view>
<view><text>合计</text><text>￥{{totalPrice}}</text></view>
......@@ -19,22 +19,22 @@
<!-- 支付方式 -->
<view class="paymentMethodContent">
<h4>选择支付方式</h4>
<view class="paymentItem" @click="selectPaymentMethod(1)">
<view class="paymentItem" @click="selectPaymentMethod(2)">
<view>
<i class="iconfont icon-zhifubao"></i>
<text>支付宝支付</text>
</view>
<view class="selectRadio" :class="{'actived':paymentMethod===1}">
<view class="selectRadio" :class="{'actived':paymentMethod===2}">
<i class="iconfont icon-duihao"></i>
</view>
</view>
<view class="paymentItem" @click="selectPaymentMethod(2)">
<view class="paymentItem" @click="selectPaymentMethod(1)">
<view>
<i class="iconfont icon-py_weixinzhifu"></i>
<text>微信支付</text>
</view>
<view class="selectRadio" :class="{'actived':paymentMethod===2}">
<view class="selectRadio" :class="{'actived':paymentMethod===1}">
<i class="iconfont icon-duihao"></i>
</view>
</view>
......@@ -125,7 +125,7 @@
return {
courseInfoItem:{},
fileId:null,
paymentMethod:1,
paymentMethod:2,
popupTitle:'积分抵扣规则',
popupType:1,
isDeduction:true,
......@@ -153,39 +153,35 @@
methods: {
// 支付
pay(){
// if(this.paymentMethod===1){
// const param = {
// orderId:this.orderId,
// amount:this.totalPrice,
// paymentMethod:this.paymentMethod,
// userId:this.userId
// }
// api.wxAppPay(param).then(res=>{
// console.log(res)
// })
// }
uni.requestPayment({
<<<<<<< HEAD
provider: 'alipay',
orderInfo: 'alipay_root_cert_sn=687b59193f3f462dd5336e5abf83c5d8_02941eef3187dddf3d3b83462e1dfcf6&alipay_sdk=alipay-sdk-java-dynamicVersionNo&app_cert_sn=f974d178cb6bd0cd2c4e3dca07825e92&app_id=2021003161624312&biz_content=%7B%22out_trade_no%22%3A%22YD2022101000001%22%2C%22product_code%22%3A%22FACE_TO_FACE_PAYMENT%22%2C%22subject%22%3A%22%E6%88%91%E6%98%AF%E6%B5%8B%E8%AF%95%E6%95%B0%E6%8D%AE%22%2C%22total_amount%22%3A%220.00%22%7D&charset=UTF-8&format=json&method=alipay.trade.app.pay&notify_url=https%3A%2F%2Fmdev.zuihuibi.cn%2Fapi%2Fpay%2FwxPayNotify&sign=RyxnIM9pBC4V4sfFXZc2ksb0nwRWtbJjQQ%2BzNOJ083AA0rl%2BP206AWerCJatS2D%2BWUjarSc8nZXfqbJ9CX0xZwWoDv6QelM5SOZmzcnPUyh4i3H8K6tj6fo2eFbv%2Bn%2F7Mep%2BfXmepAfArzzxedoSLnwIN%2Bp%2Fsiw6c%2Fkg4asBIoT4g%2FRHjdgMuycm%2B5zOGOGvzzGA2DOuD%2F8mnsnGSgu0gRGMXY9PfPNPULRKPosHw4%2Bc%2BkWzcKvy2j7izUGcGscixNdtbwjQVrfS2jrsVoVc6OCmKGGJEklIRG%2F3SWnyoIPCwO42KAbJOtb6vxZ0C8a7wvo%2B%2BBtRjZ2%2Fqv7SGZexWA%3D%3D&sign_type=RSA2&timestamp=2022-11-18+09%3A32%3A58&version=1.0', //支付宝订单数据
success: function (res) {
alert('success:' + JSON.stringify(res));
},
fail: function (err) {
alert('fail:' + JSON.stringify(err));
}
});
=======
provider: 'alipay',
orderInfo: 'alipay_root_cert_sn=687b59193f3f462dd5336e5abf83c5d8_02941eef3187dddf3d3b83462e1dfcf6&alipay_sdk=alipay-sdk-java-dynamicVersionNo&app_cert_sn=f974d178cb6bd0cd2c4e3dca07825e92&app_id=2021003161624312&biz_content=%7B%22out_trade_no%22%3A%22YD2022101000001%22%2C%22product_code%22%3A%22FACE_TO_FACE_PAYMENT%22%2C%22subject%22%3A%22%E6%88%91%E6%98%AF%E6%B5%8B%E8%AF%95%E6%95%B0%E6%8D%AE%22%2C%22total_amount%22%3A%220.00%22%7D&charset=UTF-8&format=json&method=alipay.trade.app.pay&notify_url=https%3A%2F%2Fmdev.zuihuibi.cn%2Fapi%2Fpay%2FwxPayNotify&sign=RyxnIM9pBC4V4sfFXZc2ksb0nwRWtbJjQQ%2BzNOJ083AA0rl%2BP206AWerCJatS2D%2BWUjarSc8nZXfqbJ9CX0xZwWoDv6QelM5SOZmzcnPUyh4i3H8K6tj6fo2eFbv%2Bn%2F7Mep%2BfXmepAfArzzxedoSLnwIN%2Bp%2Fsiw6c%2Fkg4asBIoT4g%2FRHjdgMuycm%2B5zOGOGvzzGA2DOuD%2F8mnsnGSgu0gRGMXY9PfPNPULRKPosHw4%2Bc%2BkWzcKvy2j7izUGcGscixNdtbwjQVrfS2jrsVoVc6OCmKGGJEklIRG%2F3SWnyoIPCwO42KAbJOtb6vxZ0C8a7wvo%2B%2BBtRjZ2%2Fqv7SGZexWA%3D%3D&sign_type=RSA2&timestamp=2022-11-18+09%3A32%3A58&version=1.0', //支付宝订单数据
success: function (res) {
console.log('success:' + JSON.stringify(res));
},
fail: function (err) {
console.log('fail:' + JSON.stringify(err));
}
});
>>>>>>> 36c1cfa72e8ba79a7dd87f1cc10c0daf10dbc49d
const param = {
orderId:this.orderId,
amount:this.totalPrice,
paymentMethod:this.paymentMethod,
userId:this.userId
}
if(this.paymentMethod==1){
api.wxAppPay(param).then(res=>{
console.log(res)
})
}else if(this.paymentMethod==2){
api.aliAppPay(param).then(res=>{
if(res['success']){
const aliOrderString = res['data']['aliOrderString'];
uni.requestPayment({
provider: 'alipay',
orderInfo: aliOrderString,
success: function (resp) {
alert('success:' + JSON.stringify(resp));
},
fail: function (err) {
alert('fail:' + JSON.stringify(err));
}
});
}
})
}
},
// 积分查询
queryByUserIdFortuneStatistic(){
......@@ -262,7 +258,7 @@
<style lang="scss">
.container{
position: relative;
height: 100%;
height: 95vh;
.courseItemBox{
padding: 20rpx 30rpx;
background-color: #fff;
......@@ -312,7 +308,7 @@
}
}
.selectRadio{
color: transparent;
color: #D8D8D8;
width: 40rpx;
height: 40rpx;
border: 1px solid #D8D8D8;
......
pages/personalCenter/personalCenter.vue
......@@ -3,21 +3,21 @@
<!-- 头部信息 -->
<view class="basicInfoBox">
<view class="avatar">
<image src="/static/cffp_logo.jpg" alt="" srcset="" mode="widthFix"></image>
<image :src="customerBasicInfo.headPicture" alt="" srcset="" mode="widthFix"></image>
</view>
<view class="infoBox">
<view class="firstLineBox">
<view>
<strong>XXX</strong>
<text class="csTag">推广人</text>
<strong>{{customerBasicInfo.realName}}</strong>
<text class="csTag">{{customerBasicInfo.partnerType}}</text>
</view>
<view class="personalInfoBtn">
<text>个人资料</text>
<i class="iconfont icon-bianji"></i>
</view>
</view>
<view>昵称：XXXX</view>
<view>CFFPxxxxx</view>
<view>昵称：{{customerBasicInfo.nickName}}</view>
<view>{{customerBasicInfo.nickName}}</view>
</view>
</view>
<!-- 主要菜单 -->
......@@ -165,6 +165,7 @@
queryInfo(){
api.queryInfo({userId:this.userId}).then(res=>{
if(res['success']){
this.customerBasicInfo = res['data'];
console.log(res)
}
})
......@@ -185,11 +186,13 @@
padding: 67rpx 20rpx 60rpx 28rpx;
background:linear-gradient(26deg, #D8E2E5 0%, #F0E6DD 31%, #E7DBDF 100%);
.avatar{
width: 80rpx;
width: 0;
height: 80rpx;
border-radius: 50%;
overflow: hidden;
margin-right: 17rpx;
background-color: #fff;
flex: 0 0 80rpx;
}
.infoBox{
width:100%;
......
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