Skip to content

C
CFFP-HB
Commit e352e70a by kyle
Options

合并代码

parents 9e38b683 38772372
Showing with 103 additions and 31 deletions
api/api.ts
...@@ -229,13 +229,13 @@ export default { ...@@ -229,13 +229,13 @@ export default {
queryMyTeamInfo(params){ queryMyTeamInfo(params){
return request(`${cffpURL}/orgInfo/queryMyTeamInfo`, "POST", params) return request(`${cffpURL}/orgInfo/queryMyTeamInfo`, "POST", params)
}, },
// 我的团队展开LIST // 学习统计
userStudyCount(params){ userStudyCount(params){
return request(`${cffpURL}/orgInfo/teamDetail`, "POST", params) return request(`${cffpURL}/study/userStudyCount`, "POST", params)
}, },
// 学习统计 // 我的团队展开LIST
teamDetail(params){ teamDetail(params){
return request(`${cffpURL}/study/userStudyCount`, "POST", params) return request(`${cffpURL}/orgInfo/teamDetail`, "POST", params)
}, },
// 课程包学习进度明细 // 课程包学习进度明细
userCoursePackBar(params){ userCoursePackBar(params){
......
components/eSignature/eSignature.vue
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
}; };
}, },
props: ['showCanvas'], props: ['showCanvas'],
emits: ['sendImage'],
methods: { methods: {
//清除签名的图片 //清除签名的图片
obliterate() { obliterate() {
...@@ -136,16 +137,16 @@ ...@@ -136,16 +137,16 @@
canvasId: 'mycanvas', canvasId: 'mycanvas',
success: function(res) { success: function(res) {
if(!res || !res.tempFilePath) { if(!res || !res.tempFilePath) {
console.log('=====',res.tempFilePath); // console.log('=====',res.tempFilePath);
that.SignatureImg = res.tempFilePath; that.SignatureImg = res.tempFilePath;
that.$emit('closeCanvas', that.SignatureImg); that.$emit('sendImage', that.SignatureImg);
that.close(); that.close();
}else{ }else{
//用来解决安卓真机获取到的是canvas图片的临时路径，转成base64格式 //用来解决安卓真机获取到的是canvas图片的临时路径，转成base64格式
pathToBase64(res.tempFilePath).then(re => { pathToBase64(res.tempFilePath).then(re => {
console.log('base===============',re); // console.log('base===============',re);
that.SignatureImg = re; that.SignatureImg = re;
that.$emit('closeCanvas', that.SignatureImg); that.$emit('sendImage', that.SignatureImg);
that.close(); that.close();
}) })
} }
...@@ -178,7 +179,7 @@ ...@@ -178,7 +179,7 @@
width: 100%; width: 100%;
// height: calc(100vh - 200upx); // height: calc(100vh - 200upx);
height: calc(100vh - 400rpx); height: calc(100vh - 400rpx);
background-color: #fff; background-color: #f9f9f9;
border-radius: 10px 10px 0 0; border-radius: 10px 10px 0 0;
} }
//底部按钮 //底部按钮
......
pages.json
...@@ -407,16 +407,16 @@ ...@@ -407,16 +407,16 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, }
// { ,{
// "path" : "pages/sign/sign", "path" : "pages/receiptCycleDesc/receiptCycleDesc",
// "style" : "style" :
// { {
// "navigationBarTitleText": "签名", "navigationBarTitleText": "到账周期说明",
// "enablePullDownRefresh": false "enablePullDownRefresh": false
// } }
// } }
], ],
// "tabBar": { // "tabBar": {
// "color": "#7A7E83", // tab 上的文字默认颜色 // "color": "#7A7E83", // tab 上的文字默认颜色
......
pages/afterSaleDetail/afterSaleDetail.vue
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
<h3>{{courseInfoItem.orderStatusName}}</h3> <h3>{{courseInfoItem.orderStatusName}}</h3>
<text>{{courseInfoItem.refundTime}}</text> <text>{{courseInfoItem.refundTime}}</text>
</view> </view>
<view class="right">￥{{courseInfoItem.refundAmount}}</view> <view class="right">
<h3>￥{{courseInfoItem.refundAmount}}</h3>
<text @click="goDetail()">到账说明</text>
</view>
</view> </view>
<!-- 退款进度 --> <!-- 退款进度 -->
<view class="returnProcessContainer"> <view class="returnProcessContainer">
...@@ -30,7 +33,7 @@ ...@@ -30,7 +33,7 @@
<view class="returnDetailContainer"> <view class="returnDetailContainer">
<h4>退款详情</h4> <h4>退款详情</h4>
<template v-if="courseInfoItem"> <template v-if="courseInfoItem">
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item> <course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="courseInfoItem.fileLecturerId"></course-item>
</template> </template>
<view class="returnInfoContent"> <view class="returnInfoContent">
<view> <view>
...@@ -46,6 +49,14 @@ ...@@ -46,6 +49,14 @@
<text>￥{{courseInfoItem.refundAmount}}</text> <text>￥{{courseInfoItem.refundAmount}}</text>
</view> </view>
<view> <view>
<text>支付违约金：</text>
<text>{{courseInfoItem.breachCommission?'￥':''}}{{courseInfoItem.breachCommission}}</text>
</view>
<view>
<text>退还积分：</text>
<text>{{courseInfoItem.salesCommission}}</text>
</view>
<view>
<text>退款原因：</text> <text>退款原因：</text>
<text>{{courseInfoItem.orderRemark}}</text> <text>{{courseInfoItem.orderRemark}}</text>
</view> </view>
...@@ -75,6 +86,11 @@ ...@@ -75,6 +86,11 @@
}; };
}, },
methods:{ methods:{
goDetail(){
uni.navigateTo({
url:'/pages/receiptCycleDesc/receiptCycleDesc'
})
},
userAfterSalesDtl(){ userAfterSalesDtl(){
const params = { const params = {
userId:this.userId, userId:this.userId,
...@@ -140,8 +156,19 @@ ...@@ -140,8 +156,19 @@
} }
} }
.right{ .right{
font-size:40rpx; display: flex;
color: #FA322D; flex-direction: column;
justify-content: center;
align-items: center;
h3{
font-size:40rpx;
color: #FA322D;
}
text{
font-size: 24rpx;
color: #999;
}
} }
} }
.returnInfoContent{ .returnInfoContent{
......
pages/application-process/signature.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<text class="page_mark">8/8</text> <text class="page_mark">8/8</text>
</view> </view>
<view class="signatureContent"> <view class="signatureContent">
<e-signature :showCanvas="showCanvas" ref="signatureComponent"></e-signature> <e-signature :showCanvas="showCanvas" ref="signatureComponent" @sendImage="getImage"></e-signature>
</view> </view>
<view class="fixed" url="bank-card" @click="save()"> <view class="fixed" url="bank-card" @click="save()">
保存并下一步 保存并下一步
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
//打开canvas绘制签名 //打开canvas绘制签名
showCanvas: true, showCanvas: true,
//是否展示操作菜单 //是否展示操作菜单
completionSignPath: '' //签名 completionSignPath: '' ,//签名
} }
}, },
components:{eSignature}, components:{eSignature},
...@@ -32,6 +33,9 @@ ...@@ -32,6 +33,9 @@
methods: { methods: {
save(){ save(){
this.$refs.signatureComponent.finish() this.$refs.signatureComponent.finish()
},
getImage(e){
console.log(e)
} }
} }
} }
......
pages/myShare/myShare.vue
...@@ -44,18 +44,18 @@ ...@@ -44,18 +44,18 @@
<view class="courseInfoContent"> <view class="courseInfoContent">
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item> <course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item>
</view> </view>
<view class="countsContent" @click="goDetail(item.fileId)"> <view class="countsContent">
<view> <view @click="goDetail(item.fileId,1)">
<i class="iconfont icon-zhuanfa"></i> <i class="iconfont icon-zhuanfa"></i>
<text>分享</text> <text>分享</text>
<text>{{item.shareCount}}</text> <text>{{item.shareCount}}</text>
</view> </view>
<view> <view @click="goDetail(item.fileId,2)">
<i class="iconfont icon-yidu"></i> <i class="iconfont icon-yidu"></i>
<text>阅读</text> <text>阅读</text>
<text>{{item.readCount}}</text> <text>{{item.readCount}}</text>
</view> </view>
<view> <view @click="goDetail(item.fileId,3)">
<i class="iconfont icon-yifukuan"></i> <i class="iconfont icon-yifukuan"></i>
<text>购买</text> <text>购买</text>
<text>{{item.buyCount}}</text> <text>{{item.buyCount}}</text>
...@@ -113,9 +113,9 @@ ...@@ -113,9 +113,9 @@
}) })
}, },
// 查看详情 // 查看详情
goDetail(val){ goDetail(val,type){
uni.navigateTo({ uni.navigateTo({
url:`/pages/commonDetail/commonDetail?fileId=${val}&type=1` url:`/pages/commonDetail/commonDetail?fileId=${val}&type=${type}`
}) })
}, },
// 查看积分 // 查看积分
......
pages/receiptCycleDesc/receiptCycleDesc.vue 0 → 100644
<template>
<view class="container">
<view class="">根据交易方式不同，退款处理时间不同，请在对应的时间内注意查看到账情况：</view>
<view class="">
微信
</view>
<view class="">
1.零钱支付的用户，资金是实时到账，退款到微信->钱包； 2.储蓄卡支付的将在1-5个工作日内退款到储蓄卡； 3.信用卡支付的将在2-5个工作日内退款到信用卡（最长15工作日）。
</view>
<view class="">
支付宝
</view>
<view class="">
1.退回支付宝余额：资金是实时到账，请在支付宝中的【账户收支明细】查看； 2.退回到银行卡：一般3-7天入账，请在支付宝中的【进度中心】查看进度； 3.退回余额宝：资金实时入账，请在支付宝中的【余额宝明细】查询。
</view>
</view>
</template>
<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="scss">
.container{
height: 100%;
padding: 20rpx 40rpx;
background-color: #fff;
view{
margin-bottom: 10rpx;
color: #333;
font-size: 28rpx;
}
}
</style>
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