Skip to content

C
CFFP-HB
Commit c4dc0931 by sunchao
Options

合并冲突

parents 2f143cf2 589c8b01
Showing with 174 additions and 56 deletions
App.vue
......@@ -68,4 +68,7 @@
margin-top: 10%;
color: #999;
}
.container uni-slider .uni-slider-value{
width: 5ch;
}
</style>
api/api.ts
......@@ -140,5 +140,13 @@ export default {
//提现明细接口
findByUserIdForWithdralDtl(params){
return request(`${apiURL}/fortune/findByUserIdForWithdralDtl`, "POST", params)
},
// 我的售后
userAfterSales(params){
return request(`${cffpURL}/course/userAfterSales`, "POST", params)
},
// 售后详情
userAfterSalesDtl(params){
return request(`${cffpURL}/course/userAfterSalesDtl`, "POST", params)
}
}
components/courseItem/courseItem.vue
......@@ -47,8 +47,6 @@
},
methods:{
tagConcat(v1,v2){
console.log(v2)
console.log(v1)
if(v1 && v2 && v2.indexOf(',') > 0 && v1.indexOf(',') > 0){
return [].concat(v2.split(',').split(','),v1.split(','))
}else if(v1 && v1.indexOf(',') > 0){
......@@ -69,7 +67,6 @@
.thumbnailBox{
width: 200rpx;
height: 200rpx;
background-color: #888;
margin-right: 26rpx;
img{
max-width: 100%;
......
pages/afterSaleDetail/afterSaleDetail.vue
......@@ -2,15 +2,29 @@
<view class="container">
<view class="returnCountsContainer">
<view class="left">
<h3>退款中。。。。</h3>
<text>2022-XX-XX</text>
<h3>{{courseInfoItem.orderStatusName}}</h3>
<text>{{courseInfoItem.refundTime}}</text>
</view>
<view class="right">￥XXXXX</view>
<view class="right">￥{{courseInfoItem.refundAmount}}</view>
</view>
<!-- 退款进度 -->
<view class="returnProcessContainer">
<h4>退款进度</h4>
<uni-steps :options="options" direction="column" :active="1" active-color="#20269B" ></uni-steps>
<view class="stepContainer">
<view class="iconContainer">
<view v-for="(item,index) in options" :key="index" :class="{'actived':index===processIndex}">
<view class="icon"></view>
<view class="line"></view>
</view>
</view>
<view class="stepProcessContainer">
<view v-for="(item,index) in options" :key="index">
<text class="steps__column-title">{{item.title}}</text>
<text class="steps__column-desc">{{item.desc}}</text>
<text class="steps__column-desc">{{item.time}}</text>
</view>
</view>
</view>
</view>
<!-- 退款详情 -->
<view class="returnDetailContainer">
......@@ -21,19 +35,19 @@
<view class="returnInfoContent">
<view>
<text>退款单号：</text>
<text>XXXXXXX</text>
<text>{{courseInfoItem.orderNo}}</text>
</view>
<view>
<text>申请时间：</text>
<text>XXXXXXX</text>
<text>{{courseInfoItem.applyRefundTime}}</text>
</view>
<view>
<text>退款金额：</text>
<text>XXXXXXX</text>
<text>￥{{courseInfoItem.refundAmount}}</text>
</view>
<view>
<text>退款原因：</text>
<text>XXXXXXX</text>
<text>{{courseInfoItem.orderRemark}}</text>
</view>
</view>
</view>
......@@ -47,26 +61,53 @@
components:{courseItem},
data() {
return {
userId:'1',
orderNo:'',
afterSalesFlag:'',
courseInfoItem:{},
titleShowTime:'',
processIndex:0,
options:[
{title:'提交申请',desc:'退款将退回到您的支付宝/微信账号请注意查收'},
{title:'退款中',desc:'您的退款申请已通过，待财务退款'},
{title:'退款成功',desc:'您的退款申请已成功，待审核'}]
{title:'提交申请',desc:'退款将退回到您的支付宝/微信账号请注意查收',time:'XXXX'},
{title:'退款中',desc:'您的退款申请已通过，待财务退款',time:'XXXX'},
{title:'退款成功',desc:'您的退款申请已成功，待审核',time:'XXXX'},
]
};
},
methods:{
// 课程详情页面
courseDetail(){
api.courseDetail({fileId:3920,userId:1}).then(res=>{
console.log('课程详情',res);
userAfterSalesDtl(){
const params = {
userId:this.userId,
orderNo:this.orderNo,
afterSalesFlag:this.afterSalesFlag
}
api.userAfterSalesDtl(params).then(res=>{
console.log('售后详情',res);
if(res['success']){
this.courseInfoItem = res['data']['data'];
this.courseInfoItem = res['data']['userCourse'];
if(this.courseInfoItem.orderStatus == '4'){
this.titleShowTime = this.courseInfoItem.refundingTime;
this.processIndex = 1;
}else if(this.courseInfoItem.orderStatus == '3'){
this.titleShowTime = this.courseInfoItem.refundTime;
this.processIndex = 2;
}else{
this.titleShowTime = this.courseInfoItem.applyRefundTime;
this.processIndex = 0;
}
this.options = [
{title:'提交申请',desc:'退款将退回到您的支付宝/微信账号请注意查收',time:this.courseInfoItem.refundTime},
{title:'退款中',desc:'您的退款申请已通过，待财务退款',time:this.courseInfoItem.refundingTime},
{title:'退款成功',desc:'您的退款申请已成功，待审核',time:this.courseInfoItem.applyRefundTime},
]
}
})
},
}
},
onLoad() {
this.courseDetail()
onLoad(option) {
this.orderNo = option.orderNo;
this.afterSalesFlag = option.afterSalesFlag;
this.userAfterSalesDtl()
},
mounted() {
......@@ -111,5 +152,66 @@
font-size: 30rpx;
}
}
.stepContainer{
display: flex;
.iconContainer{
margin-right: 10rpx;
.icon{
position: relative;
width: 40rpx;
height: 40rpx;
border: 4rpx solid #20269B;
border-radius: 50%;
}
.line{
height: 100rpx;
border-left: 4rpx dashed #20269B;
transform: translateX(21rpx);
}
view{
&:last-child{
.line{
border: none;
}
}
&.actived{
.icon{
&::before{
content: '';
display: block;
position: absolute;
left: 50%;
top: 50%;
width: 24rpx;
height: 24rpx;
border-radius: 50%;
background-color: #20269B;
transform: translate(-50%,-50%);
}
}
}
}
}
.stepProcessContainer{
view{
display: flex;
flex-direction: column;
margin-bottom: 20rpx;
steps__column-title {
font-size: 30rpx;
color: #333;
margin-bottom: 10rpx;
line-height: 46rpx;
}
.steps__column-desc{
color: #666;
font-size: 28rpx;
line-height: 42rpx;
min-height: 42rpx;
}
}
}
}
}
</style>
pages/afterSales/afterSales.vue
<template>
<view class="container">
<ul>
<li>
<course-item></course-item>
<li v-for="item in userCourses" :key="item.orderId">
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}"></course-item>
<view class="statusBox">
<text>退款成功</text>
<text @click="goDetail()">查看详情></text>
</view>
</li>
<li>
<course-item></course-item>
<view class="statusBox">
<text>退款成功</text>
<text @click="goDetail()">查看详情></text>
<text>{{item.orderStatusName}}</text>
<text @click="goDetail(item)">查看详情></text>
</view>
</li>
</ul>
......@@ -28,15 +21,32 @@
},
data() {
return {
userId:'1',
userCourses:[],
afterSalesFlag:3
};
},
methods:{
goDetail(){
goDetail(item){
uni.navigateTo({
url:'/pages/afterSaleDetail/afterSaleDetail'
url:`/pages/afterSaleDetail/afterSaleDetail?orderNo=${item.orderNo}&afterSalesFlag=${this.afterSalesFlag}`
})
},
userAfterSales(){
const param = {
userId:this.userId,
afterSalesFlag:this.afterSalesFlag
}
api.userAfterSales(param).then(res=>{
if(res['success']){
console.log(res);
this.userCourses = res['data']['userCourses']
}
})
}
},
onLoad() {
this.userAfterSales()
}
}
</script>
......
pages/commonDetail/commonDetail.vue
......@@ -53,10 +53,10 @@
{no:4,name:'购买明细',width: '25%'}
];
this.lists = [
{id:1,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:'/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3',width: '25%'}]},
{id:2,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:'/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3',width: '25%'}]},
{id:3,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:'/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3',width: '25%'}]},
{id:4,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:'/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3',width: '25%'}]},
{id:1,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
{id:2,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
{id:3,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
{id:4,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
]
}else if(this.type=='3'){
this.title = [
......@@ -65,10 +65,10 @@
{no:3,name:'购买订单',width: '40%'},
];
this.lists = [
{id:1,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:'/pages/orderDetail/orderDetail',width: '40%'}]},
{id:2,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:'/pages/orderDetail/orderDetail',width: '40%'}]},
{id:3,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:'/pages/orderDetail/orderDetail',width: '40%'}]},
{id:4,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:'/pages/orderDetail/orderDetail',width: '40%'}]},
{id:1,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
{id:2,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
{id:3,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
{id:4,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
]
}
}
......
pages/courselist/courselist.vue
......@@ -35,7 +35,6 @@
},
courseList(){
api.courseList().then(res=>{
console.log(res)
if(res['success']){
this.cffpCourseInfos = res['data']['data'];
}else{
......
pages/myLearning/myLearning.vue
......@@ -115,7 +115,6 @@
.thumbnailBox{
width: 200rpx;
height: 200rpx;
background-color: #888;
margin-right: 26rpx;
img{
max-width: 100%;
......
pages/orderDetail/orderDetail.vue
......@@ -19,6 +19,7 @@
<script>
import api from "@/api/api";
import common from "@/common/common";
export default {
data() {
return {
......@@ -27,7 +28,7 @@
orderInfoList:[
{id:1,name:'订单编号',value:'111111',type:'string',alias:'orderNo',pageArea:1},
{id:2,name:'购买时间',value:'111111',type:'string',alias:'orderConfirmDate',pageArea:1},
{id:3,name:'课程类型',value:'111111',type:'string',alias:'courseClassify',pageArea:1},
{id:3,name:'课程类型',value:'111111',type:'string',alias:'courseClassifyName',pageArea:1},
{id:4,name:'课程名称',value:'111111',type:'string',alias:'fileTitle',pageArea:1},
{id:5,name:'购买人',value:'111111',type:'string',alias:'userName',pageArea:1},
{id:6,name:'课程讲师',value:'111111',type:'string',alias:'lecturerName',pageArea:1},
......@@ -36,9 +37,9 @@
{id:9,name:'实际支付',value:'111111',type:'currency',alias:'paymentAmount',pageArea:1},
{id:10,name:'获得积分',value:'111111',type:'currency',color:'#F15A1F',alias:'salesCommission',pageArea:2},
{id:11,name:'积分来源',value:'111111',type:'string',alias:'commissionSource',pageArea:2},
{id:12,name:'课程状态',value:'111111',type:'string',alias:'courseStatus',pageArea:2},
{id:12,name:'课程状态',value:'111111',type:'string',alias:'courseStatusName',pageArea:2},
{id:13,name:'观看截至',value:'111111',type:'string',alias:'effectiveEndDate',pageArea:2}
]
],
};
},
methods:{
......@@ -63,11 +64,10 @@
}
},
mounted() {
this.userCourseInfo()
this.userCourseInfo();
},
onLoad(option) {
this.orderId = option.id
console.log(option)
}
}
......
util/interceptor.ts
......@@ -10,7 +10,7 @@ export const interceptor = () => {
// 请求拦截器
invoke(args) {
console.log('请求拦截器',args);
// console.log('请求拦截器',args);
// 加载loading
uni.showLoading({
title: '加载中...'
......@@ -28,7 +28,7 @@ export const interceptor = () => {
uni.setStorageSync('uni-token',res.data['data']['token']);
window.location.href = window.location.href + '?' + 't_reload=' + new Date().getTime();
}
console.log(res)
// console.log(res)
},fail(err) {
reject(err);
},
......@@ -44,7 +44,7 @@ export const interceptor = () => {
'content-type': args.method === 'POST' ? 'application/json' : 'application/x-www-form-urlencoded',
'X-Authorization': uni.getStorageSync('uni-token')
}
console.log(args.header)
// console.log(args.header)
},
// 响应拦截器，可以对数据进行预处理
......@@ -53,8 +53,8 @@ export const interceptor = () => {
// console.log(args);
},
fail(err) {
console.log('interceptor-fail', err)
console.log('请求失败')
// console.log('interceptor-fail', err)
// console.log('请求失败')
uni.hideLoading()
},
complete(res) {
......
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