Skip to content

C
CFFP-HB
Commit 16b77b37 by yuzhenWang
Options

Merge branch 'feature-20250616wyz-页面翻新' into 'dev' 

添加未加盟提示

See merge request !23
parents 2980958a d26508ec
Showing with 255 additions and 82 deletions
pages.json
......@@ -251,7 +251,7 @@
}, {
"path": "pages/applyDropClass/applyDropClass",
"style": {
"navigationBarTitleText": "申请退课",
"navigationBarTitleText": "申请退款",
"enablePullDownRefresh": false
}
}, {
......
pages/afterSaleDetail/afterSaleDetail.vue
<template>
<view class="container">
<!-- #ifdef APP -->
<view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text style="font-size: 30rpx;">退单详情</text>
</view>
<view class="returnCountsContainer">
<view class="left">
<h3 style="font-size: 40rpx;">{{courseInfoItem.orderStatusName}}</h3>
<text style="font-size: 26rpx;">{{courseInfoItem.refundTime}}</text>
</view>
<view class="right">
<h3>￥{{courseInfoItem.refundAmount}}</h3>
<text style="font-size: 26rpx;" @click="goDetail()">到账说明</text>
<!-- #endif -->
<view class="conentBox">
<view class="returnCountsContainer">
<view class="left">
<h3 style="font-size: 40rpx;">{{courseInfoItem.orderStatusName}}</h3>
<text style="font-size: 26rpx;">{{courseInfoItem.refundTime}}</text>
</view>
<view class="right">
<h3>￥{{courseInfoItem.refundAmount}}</h3>
<text style="font-size: 26rpx;" @click="goDetail()">到账说明</text>
</view>
</view>
</view>
<!-- 退款进度 -->
<view class="returnProcessContainer">
<h4>退款进度</h4>
<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 class="returnProcessContainer">
<h4>退款进度</h4>
<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>
<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 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>
<!-- 退款详情 -->
<view class="returnDetailContainer">
<h4>退款详情</h4>
<template v-if="courseInfoItem">
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="courseInfoItem.fileLecturerId"></course-item>
</template>
<view class="returnInfoContent">
<view>
<text>退款单号：</text>
<text>{{courseInfoItem.orderNo}}</text>
</view>
<view>
<text>申请时间：</text>
<text>{{courseInfoItem.applyRefundTime}}</text>
</view>
<view>
<text>退款金额：</text>
<text>￥{{courseInfoItem.refundAmount}}</text>
</view>
<view>
<text>支付违约金：</text>
<text>{{courseInfoItem.breachCommission?'￥':''}}{{courseInfoItem.breachCommission}}</text>
</view>
<view>
<text>退还积分：</text>
<text>{{courseInfoItem.refundIntegralExchange}}</text>
</view>
<view v-if="courseInfoItem.orderRemark">
<text >退款原因：</text>
<text>{{courseInfoItem.orderRemark}}</text>
<!-- 退款详情 -->
<view class="returnDetailContainer">
<h4>退款详情</h4>
<template v-if="courseInfoItem">
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="courseInfoItem.fileLecturerId"></course-item>
</template>
<view class="returnInfoContent">
<view>
<text>退款单号：</text>
<text>{{courseInfoItem.orderNo}}</text>
</view>
<view>
<text>申请时间：</text>
<text>{{courseInfoItem.applyRefundTime}}</text>
</view>
<view>
<text>退款金额：</text>
<text>￥{{courseInfoItem.refundAmount}}</text>
</view>
<view>
<text>支付违约金：</text>
<text>{{courseInfoItem.breachCommission?'￥':''}}{{courseInfoItem.breachCommission}}</text>
</view>
<view>
<text>退还积分：</text>
<text>{{courseInfoItem.refundIntegralExchange}}</text>
</view>
<view v-if="courseInfoItem.orderRemark">
<text >退款原因：</text>
<text>{{courseInfoItem.orderRemark}}</text>
</view>
</view>
</view>
</view>
</view>
</template>
......@@ -142,7 +147,11 @@
<style lang="scss" scoped>
.container{
height:100%;
padding-bottom: 50rpx;
box-sizing: border-box;
.conentBox{
padding: 20rpx;
box-sizing: border-box;
}
.top{
display: flex;
height: 80rpx;
......@@ -161,7 +170,7 @@
.returnCountsContainer,.returnProcessContainer,.returnDetailContainer{
background-color: #fff;
padding: 20rpx 40rpx;
margin: 20rpx 20rpx;
margin-bottom: 20rpx;
border-radius: 10rpx;
h4{
font-size: 32rpx;
......
pages/afterSales/afterSales.vue
......@@ -67,7 +67,14 @@
<style lang="scss" scoped>
.container{
height: 100%;
.noListTip{
display: flex;
align-items: center;
justify-content: center;
width: 100%;
margin-top: 0%;
padding-top: 20%;
}
.top{
display: flex;
height: 80rpx;
......
pages/applyDropClass/applyDropClass.vue
......@@ -2,8 +2,10 @@
<view class="container">
<view style="flex: 1;">
<view class="classInfo" style="padding-top:80rpx">
<view class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:18rpx">
</view>
<!-- #ifdef APP -->
<view class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:18rpx"></view>
<!-- #endif -->
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="courseInfoItem.fileLecturerId"></course-item>
</view>
<!-- 订单支付明细 -->
......
pages/myShare/myShare.vue
......@@ -80,6 +80,24 @@
</view>
</view>
<uni-popup ref="joinPopup" type="center" background-color="#fff">
<view class="joinContent">
<view class="joinHeader">
<view class="iconfont icon-hezuo" style="font-size: 35rpx;color: #fff;"></view>
</view>
<view class="joinCon">
<view class="one">
您还未加盟为合伙人
</view>
<view class="two">
成为合伙人后，分享商品，好友购物得收益
</view>
</view>
<view class="joinFotter" @click="gotoApply">
去加盟拿收益
</view>
</view>
</uni-popup>
</view>
</template>
......@@ -111,10 +129,19 @@
integralCount: 0,
shareSectionCount: 0
},
userShareCourses: []
userShareCourses: [],
partnerType:''
}
},
methods: {
// 去加盟
gotoApply(){
uni.navigateTo({
url: '/pages/application-process/basic-info'
})
this.$refs.joinPopup.close()
},
changeStartTime(obj){
this.startDate = obj
this.queryDate=`${obj.year}-${obj.month<10?`0${obj.month}`:obj.month}`
......@@ -172,17 +199,21 @@
url: `/pages/commonDetail/commonDetail?fileId=${val}&type=${type}&queryDate=${this.queryDate}`
})
},
// 查看积分
viewIntegral() {
// uni.navigateTo({
// url: `/pages/myPoints/myPoints`
// })
// 查看佣金
viewIntegral(){
if(this.partnerType == 'undefined'){
this.$refs.joinPopup.open()
return
}
uni.navigateTo({
url: `/pages/pointsExchange/pointsExchange`
url:`/pages/pointsExchange/pointsExchange`
})
}
},
},
onLoad() {
onLoad(options) {
if(options.partnerType){
this.partnerType = options.partnerType
}
this.userShareCount();
this.userShareQuery();
},
......@@ -197,6 +228,55 @@
padding-bottom: 20rpx;
display: flex;
flex-direction: column;
.joinContent{
width: 500rpx;
// height: 300rpx;
border-radius: 30rpx;
background-color: #ffff;
padding: 30rpx;
box-sizing: border-box;
display: flex;
align-items: center;
flex-direction: column;
.joinHeader{
width: 60rpx;
height: 60rpx;
border-radius: 50%;
background: rgba(54, 57, 169, 1);
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 20rpx;
}
.joinCon{
// padding: 20rpx 0;
.one{
font-size: 30rpx;
color: rgba(38, 41, 44, 1);
font-weight: 600;
text-align: center;
}
.two{
color: rgba(145, 144, 148, 1);
font-size: 26rpx;
text-align: center;
margin-top: 10rpx;
margin-bottom: 20rpx;
}
}
.joinFotter{
width: 100%;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
padding: 10rpx 0;
background: rgba(54, 57, 169, 1);
border-radius: 60rpx;
font-size: 28rpx;
}
}
.timeSelectContent {
background-color: #fff;
padding: 20rpx 0;
......
pages/personalCenter/personalCenter.vue
......@@ -334,7 +334,7 @@
url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode
});
}else{
item.link = `${item.link}?from=personalCenter`
item.link = `${item.link}?from=personalCenter&partnerType=${item.partnerType}`
if(item.isTab){
uni.switchTab({
url:`../../${item.link}`
......
pages/saleCourseLists/saleCourseLists.vue
......@@ -90,6 +90,24 @@
</view>
</template>
</view>
<uni-popup ref="joinPopup" type="center" background-color="#fff">
<view class="joinContent">
<view class="joinHeader">
<view class="iconfont icon-hezuo" style="font-size: 35rpx;color: #fff;"></view>
</view>
<view class="joinCon">
<view class="one">
您还未加盟为合伙人
</view>
<view class="two">
成为合伙人后，分享商品，好友购物得收益
</view>
</view>
<view class="joinFotter" @click="gotoApply">
去加盟拿收益
</view>
</view>
</uni-popup>
</view>
</template>
......@@ -116,10 +134,19 @@
userShareCourseOrders:[],
userCourseCountNum:0,
userShareCourseCount:0,
tabType:1
tabType:1,
partnerType:''
}
},
methods: {
// 去加盟
gotoApply(){
uni.navigateTo({
url: '/pages/application-process/basic-info'
})
this.$refs.joinPopup.close()
},
changeStartTime(obj){
this.startDate = obj
this.queryDate=`${obj.year}-${obj.month<10?`0${obj.month}`:obj.month}`
......@@ -182,23 +209,22 @@
}
},
// // 查看详情
// goDetail(val){
// uni.navigateTo({
// url:`/pages/commonDetail/commonDetail?fileId=${val}&type=1`
// })
// },
// 查看积分
// 查看佣金
viewIntegral(){
// uni.navigateTo({
// url:`/pages/myPoints/myPoints`
// })
if(this.partnerType == 'undefined'){
this.$refs.joinPopup.open()
return
}
uni.navigateTo({
url:`/pages/pointsExchange/pointsExchange`
})
},
},
onLoad() {
onLoad(options) {
if(options.partnerType){
this.partnerType = options.partnerType
}
this.userCourseCount()
this.userCourseList()
......@@ -216,6 +242,55 @@
// padding-bottom: 50rpx;
display: flex;
flex-direction: column;
.joinContent{
width: 500rpx;
// height: 300rpx;
border-radius: 30rpx;
background-color: #ffff;
padding: 30rpx;
box-sizing: border-box;
display: flex;
align-items: center;
flex-direction: column;
.joinHeader{
width: 60rpx;
height: 60rpx;
border-radius: 50%;
background: rgba(54, 57, 169, 1);
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 20rpx;
}
.joinCon{
// padding: 20rpx 0;
.one{
font-size: 30rpx;
color: rgba(38, 41, 44, 1);
font-weight: 600;
text-align: center;
}
.two{
color: rgba(145, 144, 148, 1);
font-size: 26rpx;
text-align: center;
margin-top: 10rpx;
margin-bottom: 20rpx;
}
}
.joinFotter{
width: 100%;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
padding: 10rpx 0;
background: rgba(54, 57, 169, 1);
border-radius: 60rpx;
font-size: 28rpx;
}
}
.top{
display: flex;
align-items: center;
......
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