Commit 99142224 by kyle

个人中心冲突解决

parents 1c63d3fb c4dc0931
...@@ -129,6 +129,18 @@ export default { ...@@ -129,6 +129,18 @@ export default {
userShareCourseList(params){ userShareCourseList(params){
return request(`${cffpURL}/course/userShareCourseList`, "POST", params) return request(`${cffpURL}/course/userShareCourseList`, "POST", params)
}, },
//积分兑换查询
queryByUserIdFortuneStatistic(params){
return request(`${apiURL}/fortune/queryByUserIdFortuneStatistic`, "POST", params)
},
//积分兑换记录查询
findByUserIdForWithdralHis(params){
return request(`${apiURL}/fortune/findByUserIdForWithdralHis`, "POST", params)
},
//提现明细接口
findByUserIdForWithdralDtl(params){
return request(`${apiURL}/fortune/findByUserIdForWithdralDtl`, "POST", params)
},
// 我的售后 // 我的售后
userAfterSales(params){ userAfterSales(params){
return request(`${cffpURL}/course/userAfterSales`, "POST", params) return request(`${cffpURL}/course/userAfterSales`, "POST", params)
......
{ {
"name" : "cffp", "name" : "CFFP财富中心",
"appid" : "__UNI__65C4CDC", "appid" : "__UNI__65C4CDC",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
......
...@@ -203,6 +203,41 @@ ...@@ -203,6 +203,41 @@
"navigationBarTitleText": "积分明细", "navigationBarTitleText": "积分明细",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{
"path" : "pages/pointsExchange/pointsStatus",
"style" :
{
"navigationBarTitleText": "积分状态",
"enablePullDownRefresh": false
}
},{
"path" : "pages/pointsExchange/pointsExchange",
"style" :
{
"navigationBarTitleText": "积分兑换",
"enablePullDownRefresh": false
}
},{
"path" : "pages/withdrawal/withdrawal",
"style" :
{
"navigationBarTitleText": "兑换提现",
"enablePullDownRefresh": false
}
},{
"path" : "pages/exchangeRecord/exchangeRecord",
"style" :
{
"navigationBarTitleText": "兑换记录",
"enablePullDownRefresh": false
}
},{
"path" : "pages/withdrawal/withdrawalDetail",
"style" :
{
"navigationBarTitleText": "提现详情",
"enablePullDownRefresh": false
}
} }
], ],
// "tabBar": { // "tabBar": {
......
<template>
<view class="container">
<view class="record_wrapper">
<view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index">
<image :src="item.deductionUrl" mode="widthFix"></image>
<view class="detail">
<h4>{{item.productTypeName}}</h4>
<view class="">
{{item.deductionDate}}
</view>
</view>
<view class="score" @click="toWithdralDtl(item)">
-{{item.integralExchange}}积分
<text v-if="item.productType=='2' || item.productTypeName=='兑换提现'">></text>
</view>
</view>
</view>
</view>
</template>
<script>
import api from '../../api/api';
export default{
data(){
return {
cffpFortuneDeductionList:[]
}
},
components:{},
onLoad(){
this.findByUserIdForWithdralHis()
},
methods:{
findByUserIdForWithdralHis(){
api.findByUserIdForWithdralHis({userId:1}).then((res)=>{
console.log(res)
if(res['success']){
this.cffpFortuneDeductionList = res['data']['cffpFortuneDeductionList']
}
})
},
toWithdralDtl(item){
if(item.productType || item.productTypeName =='兑换提现' ){
uni.navigateTo({
url:`/pages/withdrawal/withdrawalDetail?partnerTradeNo=${item.partnerTradeNo}`
})
}
}
}
}
</script>
<style lang="scss">
.record_wrapper{
.recordContent{
display: flex;
margin-bottom: 20rpx;
background: #fff;
justify-content: space-between;
padding: 30rpx;
align-items: center;
uni-image {
width: 28%!important;
border-radius: 10rpx;
}
.detail{
width: 40%;
h4{
margin-bottom: 20rpx;
}
view{
color: #666;
}
}
.score{
width: 28%;
color: #06A632;
text-align: right;
}
}
}
</style>
\ No newline at end of file
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<view class="container"> <view class="container">
<view class="top"> <view class="top">
<view class="exchange_wrapper"> <view class="exchange_wrapper">
<view>可兑换积分 <text style="color: #FF7704;">{{yesExchangeFortune}}积分</text></view> <navigator url="../pointsExchange/pointsStatus">可兑换积分 <text style="color: #FF7704;">{{yesExchangeFortune}}积分 > </text></navigator>
<view style="color:#C85E04;text-decoration: underline;">可兑换提现{{yesExchangeFortune}}</view> <navigator url="../pointsExchange/pointsExchange" style="color:#C85E04;text-decoration: underline;">可兑换提现{{yesExchangeFortune}} > </navigator>
</view> </view>
<view class="bg"> <view class="bg">
<image src="/static/mypoint_pic.png" mode="widthFix"></image> <image src="/static/mypoint_pic.png" mode="widthFix"></image>
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
changeCommissionType: function(e) { changeCommissionType: function(e) {
this.commissionTypeIdx = e.detail.value; this.commissionTypeIdx = e.detail.value;
this.commissionType = this.commissionTypeList[this.commissionTypeIdx]['dropOptionCode']; this.commissionType = this.commissionTypeList[this.commissionTypeIdx]['dropOptionCode'];
console.log(this.commissionType)
this.getDetail(); this.getDetail();
}, },
changeProductType: function(e) { changeProductType: function(e) {
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
{id:'01',categoryName:'积分管理', {id:'01',categoryName:'积分管理',
children:[ children:[
{title:'我的积分',icon:'integral',link:'/pages/myPoints/myPoints',isOpen:true,isShow:true}, {title:'我的积分',icon:'integral',link:'/pages/myPoints/myPoints',isOpen:true,isShow:true},
{title:'积分兑换',icon:'integralShopping',link:'',isOpen:true,isShow:true} {title:'积分兑换',icon:'integralShopping',link:'/pages/pointsExchange/pointsExchange',isOpen:true,isShow:true}
], ],
}, },
{id:'02',categoryName:'活动管理', {id:'02',categoryName:'活动管理',
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
{title:'我的卡包',icon:'card',link:'',isOpen:true,isShow:false}, {title:'我的卡包',icon:'card',link:'',isOpen:true,isShow:false},
{title:'我的认证',icon:'myCertify',link:'/pages/myCertify/myCertify',isOpen:true,isShow:true}, {title:'我的认证',icon:'myCertify',link:'/pages/myCertify/myCertify',isOpen:true,isShow:true},
{title:'申请修改公司周边',icon:'message',link:'',isOpen:true,isShow:true}, {title:'申请修改公司周边',icon:'message',link:'',isOpen:true,isShow:true},
{title:'我的消息',icon:'message',link:'',isOpen:true,isShow:true}, {title:'我的消息',icon:'message',link:'/pages/systemMsg/system_msg',isOpen:true,isShow:true},
{title:'系统设置',icon:'setting',link:'',isOpen:true,isShow:false} {title:'系统设置',icon:'setting',link:'',isOpen:true,isShow:false}
] ]
......
<template>
<view class="container">
<view class="top">
<view>
{{yesExchangeFortune?yesExchangeFortune:0}}
</view>
<view>
可兑换积分
</view>
</view>
<view class="content_wrapper">
<view class="item">
<text>A.可兑换</text>
<text>{{yesExchangeFortune?yesExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>B.待兑换</text>
<text>{{notExchangeFortune?notExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>C.兑换中</text>
<text>{{inExchangeFortune?inExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>D.已兑换</text>
<text>{{alreadyExchangeFortune?alreadyExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>E.已退课</text>
<text>{{returnFortune?returnFortune:0}}积分</text>
</view>
</view>
<view class="total">
<view class="description">
<text>总积分:</text>
<text>(A+B+C+D+E)</text>
</view>
<view class="">
{{totalFortune?totalFortune:0}}积分
</view>
</view>
<view class="record" @click="toRecord()">
兑换记录
</view>
<view class="withdrawal_btn" @click="toWithdrawal()">
去提现
</view>
</view>
</template>
<script>
import api from '../../api/api';
export default{
data(){
return {
yesExchangeFortune:'',
notExchangeFortune:'',
inExchangeFortune:'',
alreadyExchangeFortune:'',
returnFortune:'',
totalFortune:'',
}
},
components:{},
onLoad(){
this.queryByUserIdFortuneStatistic();
},
methods:{
queryByUserIdFortuneStatistic(){
// uni.getStorageSync('cffp_userId')
api.queryByUserIdFortuneStatistic({userId:1}).then((res)=>{
if(res['success']){
this.yesExchangeFortune = res['data']['yesExchangeFortune'];
this.notExchangeFortune = res['data']['notExchangeFortune'];
this.inExchangeFortune = res['data']['inExchangeFortune'];
this.alreadyExchangeFortune = res['data']['alreadyExchangeFortune'];
this.returnFortune = res['data']['returnFortune'];
this.totalFortune = res['data']['totalFortune'];
}
})
},
toWithdrawal(){
uni.navigateTo({
url:'/pages/withdrawal/withdrawal'
})
},
toRecord(){
uni.navigateTo({
url:'/pages/exchangeRecord/exchangeRecord'
})
}
}
}
</script>
<style lang="scss">
.container{
.top{
width: 100%;
text-align: center;
background: #fff;
padding: 20rpx 0;
view:nth-child(1){
font-size: 40rpx;
color: #F15A1F;
}
view:nth-child(2){
font-size: 32rpx;
color: #666666;
}
}
.content_wrapper{
background: #fff;
margin: 20rpx auto;
padding:0 30rpx;
.item{
display: flex;
padding: 20rpx 0;
border-bottom: 2rpx solid #F2F2F2;
justify-content: space-between;
text:nth-child(2){
font-size: 32rpx;
}
}
.item:last-child{
border-bottom: 0;
}
.item:nth-child(1) text:nth-child(2){
color: #0A2F99;
}
}
.total{
background: #fff;
padding: 30rpx;
display: flex;
justify-content: space-between;
color: #0A2F99;
font-size: 36rpx;
.description{
width: 40%;
text:nth-child(2){
font-size: 32rpx;
color: #666666;
}
}
}
.record{
color: #0A2F99;
font-size: 30rpx;
padding-right: 30rpx;
float: right;
}
.withdrawal_btn{
background: #3671F4;
color: #fff;
width: 80%;
margin: 0 auto;
height: 80rpx;
line-height: 80rpx;
text-align: center;
border-radius: 40rpx;
position: absolute;
bottom: 0;
left: 0;
right: 0;
}
}
</style>
\ No newline at end of file
<template>
<view class="container">
<view class="top">
<view>
{{yesExchangeFortune?yesExchangeFortune:0}}
</view>
<view>
可兑换积分
</view>
</view>
<view class="status_wrapper">
<view class="status_item">
<text>A.可兑换</text>
<text>{{yesExchangeFortune?yesExchangeFortune:0}}积分</text>
</view>
<view class="status_item">
<text>B.待兑换</text>
<text>{{notExchangeFortune?notExchangeFortune:0}}积分</text>
</view>
<view class="status_item">
<text>C.兑换中</text>
<text>{{inExchangeFortune?inExchangeFortune:0}}积分</text>
</view>
<view class="status_item">
<text>D.已兑换</text>
<text>{{alreadyExchangeFortune?alreadyExchangeFortune:0}}积分</text>
</view>
<view class="status_item">
<text>E.已退课</text>
<text>{{returnFortune?returnFortune:0}}积分</text>
</view>
</view>
<view class="total">
<view class="description">
<text>总积分:</text>
<text>(A+B+C+D+E)</text>
</view>
<view class="">
{{totalFortune?totalFortune:0}}积分
</view>
</view>
</view>
</template>
<script>
import api from '../../api/api';
export default{
data(){
return {
yesExchangeFortune:'',
notExchangeFortune:'',
inExchangeFortune:'',
alreadyExchangeFortune:'',
returnFortune:'',
totalFortune:'',
}
},
components:{},
onLoad(){
this.queryByUserIdFortuneStatistic();
},
methods:{
queryByUserIdFortuneStatistic(){
api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
if(res['success']){
this.yesExchangeFortune = res['data']['yesExchangeFortune'];
this.notExchangeFortune = res['data']['notExchangeFortune'];
this.inExchangeFortune = res['data']['inExchangeFortune'];
this.alreadyExchangeFortune = res['data']['alreadyExchangeFortune'];
this.returnFortune = res['data']['returnFortune'];
this.totalFortune = res['data']['totalFortune'];
}
})
}
}
}
</script>
<style lang="scss">
.container{
.top{
width: 100%;
text-align: center;
background: #fff;
padding: 20rpx 0;
view:nth-child(1){
font-size: 40rpx;
color: #F15A1F;
}
view:nth-child(2){
font-size: 32rpx;
color: #666666;
}
}
.status_wrapper{
background: #fff;
margin: 20rpx auto;
padding:0 30rpx;
.status_item{
display: flex;
padding: 20rpx 0;
border-bottom: 2rpx solid #F2F2F2;
justify-content: space-between;
text:nth-child(2){
font-size: 32rpx;
}
}
.status_item:last-child{
border-bottom: 0;
}
.status_item:nth-child(1) text:nth-child(2){
color: #0A2F99;
}
}
.total{
background: #fff;
padding: 30rpx;
display: flex;
justify-content: space-between;
color: #0A2F99;
font-size: 36rpx;
.description{
width: 40%;
text:nth-child(2){
font-size: 32rpx;
color: #666666;
}
}
}
}
</style>
\ No newline at end of file
<template>
<view class="container">
<view class="top">
<view>
可兑换
</view>
<view>
6,666积分
</view>
</view>
<view class="content_wrapper">
<view class="item">
<text>提现金额(税前)</text>
<text></text>
</view>
<view class="item">
<text>代缴税</text>
<text></text>
</view>
<view class="item">
<text>实际到账</text>
<text></text>
</view>
</view>
<view class="content_wrapper">
<h4>提现到</h4>
<view class="withdrawal_content">
<view style="display: flex;align-items: center;">
<text class="iconfont icon-py_weixinzhifu"></text>
<h4>微信钱包</h4>
</view>
<text class="iconfont icon-gou"></text>
</view>
<view class="tips_wrapper">
<view class="">
提示:
</view>
<view class="">
1、金额低于1元时无法提现 ;
</view>
<view class="">
2、当前可提金额是您的税前收入,具体计税规则可参考《劳务报酬税缴纳规则》;
</view>
<view class="">
3、如需帮助,请联系CFFP财富中心客服电话:12345678 ;
</view>
</view>
</view>
</view>
</template>
<script>
export default{
data(){
return {
}
},
components:{},
onLoad(){
},
methods:{
}
}
</script>
<style lang="scss">
.top{
width: 100%;
text-align: center;
padding: 20rpx 0;
view:nth-child(1){
font-size: 36rpx;
color: #666;
margin-bottom: 10rpx;
}
view:nth-child(2){
font-size: 40rpx;
color: #0A2F99;
}
}
.content_wrapper{
background: #fff;
margin: 20rpx auto;
padding:0 30rpx;
.item{
display: flex;
padding: 20rpx 0;
border-bottom: 2rpx solid #F2F2F2;
justify-content: space-between;
}
.withdrawal_content{
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20rpx;
margin-bottom: 20rpx;
.icon-py_weixinzhifu{
color:#09BB07;
font-size: 80rpx;
margin-right: 30rpx;
}
.icon-gou{
font-size: 48rpx;
color: #0A2F99;
}
}
.tips_wrapper{
font-size: 26rpx;
view{
color: #666666;
margin-bottom: 10rpx;
}
}
}
</style>
\ No newline at end of file
<template>
<view class="container">
<view class="recordContent">
<image :src="deductionUrl" mode="widthFix"></image>
<view class="detail">
<h4>{{productTypeName}}</h4>
<view class="">
{{deductionDate}}
</view>
</view>
</view>
<view class="withdrawalDetail">
<view class="item">
<text>兑换积分:</text>
<text>{{integralExchange}}积分</text>
</view>
<view class="item">
<text>提现金额(税前):</text>
<text>{{exchangeAmount}}</text>
</view>
<view class="item">
<text>代缴税:</text>
<text>{{taxAmount}}</text>
</view>
<view class="item">
<text>实际到账:</text>
<text>{{noTaxAmount}}</text>
</view>
</view>
</view>
</template>
<script>
import api from '../../api/api';
export default{
data(){
return {
partnerTradeNo:null,
deductionName:null,
integralExchange:null,
deductionDate:null,
deductionUrl:null,
partnerTradeNo:null,
taxAmount:null,
exchangeBeforeAmount:null,
exchangeAmount:null,
exchangeAfterAmount:null,
noTaxAmount:null
}
},
components:{},
onLoad(options){
this.partnerTradeNo = options.partnerTradeNo;
console.log(this.partnerTradeNo)
this.findByUserIdForWithdralDtl();
},
methods:{
findByUserIdForWithdralDtl(){
const params = {
partnerTradeNo:this.partnerTradeNo,
userId:uni.getStorageSync('cffp_userId')
// userId:1
}
api.findByUserIdForWithdralDtl(params).then((res)=>{
console.log(res)
if(res['success']){
const data = res['data']['cffpFortuneExchangeVO'];
this.productTypeName = data['productTypeName'];
this.integralExchange = data['integralExchange'];
this.deductionDate = data['deductionDate'];
this.deductionUrl = data['deductionUrl'];
this.partnerTradeNo = data['partnerTradeNo'];
this.taxAmount = data['taxAmount'];
this.exchangeBeforeAmount = data['exchangeBeforeAmount'];
this.exchangeAmount = data['exchangeAmount'];
this.exchangeAfterAmount = data['exchangeAfterAmount'];
this.noTaxAmount = data['noTaxAmount'];
}
})
}
}
}
</script>
<style lang="scss">
.recordContent{
display: flex;
margin-bottom: 20rpx;
background: #fff;
justify-content: space-between;
padding: 30rpx;
align-items: center;
uni-image {
width: 30%!important;
border-radius: 10rpx;
}
.detail{
width: 65%;
h4{
margin-bottom: 20rpx;
}
view{
color: #666;
}
}
}
.withdrawalDetail{
background: #fff;
padding: 20rpx;
.item{
display: flex;
justify-content: space-between;
align-items: center;
padding: 20rpx;
border-bottom: 2rpx #F2F2F2 solid;
text:nth-child(2){
color: #0A2F99;
}
}
}
</style>
\ No newline at end of file
...@@ -55,6 +55,18 @@ ...@@ -55,6 +55,18 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe60a;</span>
<div class="name"></div>
<div class="code-name">&amp;#xe60a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xebe5;</span>
<div class="name">空心对勾</div>
<div class="code-name">&amp;#xebe5;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe719;</span> <span class="icon iconfont">&#xe719;</span>
<div class="name">已付款</div> <div class="name">已付款</div>
<div class="code-name">&amp;#xe719;</div> <div class="code-name">&amp;#xe719;</div>
...@@ -276,9 +288,9 @@ ...@@ -276,9 +288,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont'; font-family: 'iconfont';
src: url('iconfont.woff2?t=1668154480160') format('woff2'), src: url('iconfont.woff2?t=1668588671294') format('woff2'),
url('iconfont.woff?t=1668154480160') format('woff'), url('iconfont.woff?t=1668588671294') format('woff'),
url('iconfont.ttf?t=1668154480160') format('truetype'); url('iconfont.ttf?t=1668588671294') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
...@@ -305,6 +317,24 @@ ...@@ -305,6 +317,24 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-gou"></span>
<div class="name">
</div>
<div class="code-name">.icon-gou
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-kongxinduigou"></span>
<div class="name">
空心对勾
</div>
<div class="code-name">.icon-kongxinduigou
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-yifukuan"></span> <span class="icon iconfont icon-yifukuan"></span>
<div class="name"> <div class="name">
已付款 已付款
...@@ -639,6 +669,22 @@ ...@@ -639,6 +669,22 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-gou"></use>
</svg>
<div class="name"></div>
<div class="code-name">#icon-gou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-kongxinduigou"></use>
</svg>
<div class="name">空心对勾</div>
<div class="code-name">#icon-kongxinduigou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yifukuan"></use> <use xlink:href="#icon-yifukuan"></use>
</svg> </svg>
<div class="name">已付款</div> <div class="name">已付款</div>
......
@font-face { @font-face {
font-family: "iconfont"; /* Project id 3749283 */ font-family: "iconfont"; /* Project id 3749283 */
src: url('iconfont.woff2?t=1668154480160') format('woff2'), src: url('iconfont.woff2?t=1668588671294') format('woff2'),
url('iconfont.woff?t=1668154480160') format('woff'), url('iconfont.woff?t=1668588671294') format('woff'),
url('iconfont.ttf?t=1668154480160') format('truetype'); url('iconfont.ttf?t=1668588671294') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +13,14 @@ ...@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-gou:before {
content: "\e60a";
}
.icon-kongxinduigou:before {
content: "\ebe5";
}
.icon-yifukuan:before { .icon-yifukuan:before {
content: "\e719"; content: "\e719";
} }
......
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "1249047",
"name": "勾",
"font_class": "gou",
"unicode": "e60a",
"unicode_decimal": 58890
},
{
"icon_id": "4583613",
"name": "空心对勾",
"font_class": "kongxinduigou",
"unicode": "ebe5",
"unicode_decimal": 60389
},
{
"icon_id": "7090083", "icon_id": "7090083",
"name": "已付款", "name": "已付款",
"font_class": "yifukuan", "font_class": "yifukuan",
......
No preview for this file type
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