Skip to content

C
CFFP-HB
Commit 3b7ed26c by sunchao
Options

merge

parents ec0b050f 1495f4ac
Showing with 134 additions and 65 deletions
App.vue
......@@ -3,39 +3,54 @@
export default {
onLaunch: function() {
console.log('App Launch');
uni.getSystemInfo({
success:(systemInfo)=> {
uni.request({
url: '/api/appVersion/checkIsUpdate',
method:'POST',
data: {
appType: 1,
version: systemInfo.appVersion,
systemType:systemInfo.osName === 'android' ? 1 : 2
},
success: (result) => {
const data = result.data.data['appVersionInfo'];
if (data.isForceUpdate && data.wgtUrl) {
uni.downloadFile({
url: data.wgtUrl,
success: (downloadResult) => {
if (downloadResult.statusCode === 200) {
plus.runtime.install(downloadResult.tempFilePath, {
force: false
}, function() {
console.log('install success...');
plus.runtime.restart();
}, function(e) {
console.error('install fail...');
});
}
}
});
}
}
});
}
})
uni.downloadFile({
url: '/cffpUpdate/__UNI__65C4CDC.wgt',
success: (downloadResult) => {
if (downloadResult.statusCode === 200) {
plus.runtime.install(downloadResult.tempFilePath, {
force: true
}, function() {
console.log('install success...');
plus.runtime.restart();
}, function(e) {
console.error('install fail...');
});
}
}
});
// uni.getSystemInfo({
// success:(systemInfo)=> {
// uni.request({
// url: '/api/appVersion/checkIsUpdate',
// method:'POST',
// data: {
// appType: 1,
// version: systemInfo.appVersion,
// systemType:systemInfo.osName.toLowerCase() === 'ios' ? 2 : 1
// },
// success: (result) => {
// const data = result.data.data['appVersionInfo'];
// if (data.isForceUpdate && data.wgtUrl) {
// uni.downloadFile({
// url: data.wgtUrl,
// success: (downloadResult) => {
// if (downloadResult.statusCode === 200) {
// plus.runtime.install(downloadResult.tempFilePath, {
// force: true
// }, function() {
// console.log('install success...');
// plus.runtime.restart();
// }, function(e) {
// console.error('install fail...');
// });
// }
// }
// });
// }
// }
// });
// }
// })
initApp()
},
onShow: function() {
......
api/api.ts
......@@ -197,8 +197,14 @@ export default {
erpInitialize(params){
return request(`${apiURL}/erp/erpInitialize`, "POST", params)
},
<<<<<<< HEAD
//获取职业类别
occupationQry(params){
return request(`${apiURL}/metadata/occupationQry`, "POST", params)
=======
// 邀请列表查询
queryInviteList(params){
return request(`${cffpURL}/partner/queryInviteList`, "POST", params)
>>>>>>> 1495f4acafaf8fff342343694c14365381fa09b9
}
}
components/courseItem/courseItem.vue
......@@ -23,9 +23,16 @@
</template>
<script>
import api from "@/api/api";
export default {
name:"courseItem",
props:{
courseInfoItem:{
type:Object
},
fileLecturerId:{
type:String
},
thumbnailPath:{
type:String
},
......@@ -35,9 +42,6 @@
summaryBox:{
type:String
},
tagList:{
type:Object
},
dataList:{
type:Object
},
......@@ -46,6 +50,9 @@
},
orderId:{
type:Number
},
tagList:{
type:Object
}
},
......@@ -70,7 +77,17 @@
uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${this.orderId}&type=drop`
})
},
lecturerQuery(){
api.lecturerQuery({id:this.fileLecturerId}).then(res=>{
console.log(res);
})
}
},
mounted() {
console.log(this.fileLecturerId,66666)
console.log(this.courseInfoItem)
}
}
</script>
......
manifest.json
......@@ -2,9 +2,8 @@
"name" : "CFFP财富中心",
"appid" : "__UNI__65C4CDC",
"description" : "",
"versionName" : "1.1.2",
"versionName" : "1.1.10",
"versionCode" : "100",
"versionName" : "1.1.12",
"versionCode" : "102",
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......
pages/afterSaleDetail/afterSaleDetail.vue
......@@ -30,7 +30,7 @@
<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}" :tagList="{v1:courseInfoItem.fileLecturerRanks,v2:courseInfoItem.fileLecturerName}"></course-item>
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item>
</template>
<view class="returnInfoContent">
<view>
......
pages/afterSales/afterSales.vue
......@@ -2,7 +2,7 @@
<view class="container">
<view class="ulBox">
<view class="liBox" 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>
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item>
<view class="statusBox">
<text>{{item.orderStatusName}}</text>
<text @click="goDetail(item)">查看详情></text>
......
pages/applyDropClass/applyDropClass.vue
<template>
<view class="container">
<view class="classInfo">
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :tagList="{v1:courseInfoItem.fileLecturerRanks,v2:courseInfoItem.fileLecturerName}"></course-item>
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item>
</view>
<!-- 订单支付明细 -->
<view class="payInfoBox">
......
pages/certifyDetail/certifyDetail.vue
......@@ -11,7 +11,7 @@
<view class="liBox"><text>考试方式：</text><text>{{certificateInfo.examinationType == 1 ? '线上考试' : '/'}}</text></view>
<view class="liBox"><text>及格分数：</text><text>{{certificateInfo.passScore}}</text></view>
</view>
<view class="eqrocdeContent">
<view class="eqrocdeContent" v-if="certificateInfo.wechatCodeUrl">
<image :src="certificateInfo.wechatCodeUrl" alt="" srcset="" mode="widthFix"></image>
<text>请扫二维码进群学习~</text>
</view>
......
pages/courseDetail/courseDetail.vue
......@@ -34,10 +34,13 @@
</view>
<!-- 相关课程列表 -->
<view class="relationCourseListsContent" v-show="tabType===2">
<view class="totalCourseCount">共{{relatedCoursesLists ? relatedCoursesLists.length : 0}}节</view>
<view class="totalCourseCount">
<text v-if="requiredCount">{{requiredCount}}节必修</text>
<text v-if="nonRequiredCount">{{nonRequiredCount}}节必修</text>
</view>
<view class="courseItemContent" v-for="(item,index) in relatedCoursesLists" :key="item.fileId">
<view class="courseInfoContent">
<h4>{{index + 1}}.{{item.fileTitle}}</h4>
<h4>{{index + 1}}.{{item.fileTitle}}<text class="courseType">{{item.fileType=='1' ? '必修' : '选修'}}</text></h4>
<view class="timeContent">
<view class="">00:00/{{secondsTransferPipe(Number(item.courseTotalTime))}}</view>
</view>
......@@ -91,7 +94,9 @@
shareUserId:'',
shareCode:'',
shareReadId:'',
dataSource:'1'
dataSource:'1',
requiredCount:0,
nonRequiredCount:0
};
},
methods:{
......@@ -163,7 +168,9 @@
api.relatedCoursesList({fileId:this.fileId}).then(res=>{
console.log('相关课程详情',res);
if(res['success']){
this.relatedCoursesLists = res['data']['data'];
this.relatedCoursesLists = res['data']['data']['relatedCourseList'];
this.nonRequiredCount = res['data']['data']['nonRequiredCount'];
this.requiredCount = res['data']['data']['requiredCount'];
console.log(this.relatedCoursesLists)
}
})
......@@ -291,6 +298,14 @@
box-sizing: border-box;
}
.relationCourseListsContent{
.courseType{
background-color: #5359CD;
color: #fff;
border-radius: 2rpx;
padding: 2rpx 10rpx;
font-size: 16rpx;
margin-left: 10rpx;
}
.totalCourseCount{
color: #20269B;
font-size: 1rem;
......
pages/courselist/courselist.vue
......@@ -69,11 +69,11 @@
return [].concat(v2,val)
}
},
getCourseList: function(res){
getCourseList(res){
console.log("res=========",res)
this.queryName = res;
this.courseList()
}
}
},
mounted() {
this.courseList();
......
pages/inviteJoin/inviteJoin.vue
......@@ -49,30 +49,32 @@
</view>
<!-- 邀请信息 -->
<view class="inviteListsBox" v-if="tabType===2">
<view class="listUl ulBox">
<view class="listUl ulBox" v-for="item in inviteLists" >
<view class="liBox">
<text>姓名：</text>
<text></text>
<text>{{item.name}}</text>
</view>
<view class="liBox">
<text>手机号：</text>
<text></text>
<text>{{item.mobileNumber}}</text>
</view>
<view class="liBox">
<text>申请身份：</text>
<text></text>
<text>{{item.partnerLevel == '1'? '事业伙伴' : '工作室'}}</text>
</view>
<view class="liBox">
<text>所属组织：</text>
<text></text>
<text>{{item.orgName}}</text>
</view>
<view class="liBox">
<text>是否跨区邀请：</text>
<text></text>
<text>{{item.hasCrossDistrict==1 ? '是' : '否'}}</text>
</view>
<view class="liBox">
<text>邀请状态：</text>
<text></text>
<text v-if="item.approvalStatus=='0'">审核中</text>
<text v-else-if="item.approvalStatus=='1'" class="success">邀请成功</text>
<text v-else class="fail">邀请失败</text>
</view>
</view>
</view>
......@@ -105,18 +107,24 @@
</template>
<script>
import api from "@/api/api"
export default {
data() {
return {
userId:'1',
tabType:1,
identityArr:['工作室','事业伙伴'],
applyIdentity:0,
isCross:true
isCross:true,
inviteLists:[]
};
},
methods:{
switchTab(type){
this.tabType = type;
if(this.tabType===2){
this.queryInviteList()
}
},
bindPickerChange: function(e) {
this.applyIdentity = e.detail.value
......@@ -162,6 +170,13 @@
});
}
},
queryInviteList(){
api.queryInviteList({userId:this.userId}).then(res=>{
if(res['success']){
this.inviteLists = res['data']['data']
}
})
},
}
......
pages/myShare/myShare.vue
......@@ -42,7 +42,7 @@
<view class="shareOrderInfoItem" v-for="item in userShareCourses" :key="item.fileId">
<view class="timeBox">{{item.shareDate}}</view>
<view class="courseInfoContent">
<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>
<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 class="countsContent" @click="goDetail(item.fileId)">
<view>
......
pages/orderConfirm/orderConfirm.vue
......@@ -3,7 +3,7 @@
<!-- 课程详情 -->
<template v-if="courseInfoItem">
<view class="courseItemBox">
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :tagList="{v1:courseInfoItem.fileLecturerRanks,v2:courseInfoItem.fileLecturerName}"></course-item>
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="courseInfoItem.fileLecturerId" :courseInfoItem="courseInfoItem"></course-item>
</view>
</template>
<!-- 价格明细 -->
......@@ -144,7 +144,7 @@
},
deductionCore(){
if(this.courseInfoItem.coursePrice / this.intergralInfo.preFortune < this.intergralInfo.yesExchangeFortune){
return (this.courseInfoItem.coursePrice / this.intergralInfo.preFortune).toFixed(2)
return parseFloat((this.courseInfoItem.coursePrice / this.intergralInfo.preFortune)).toFixed(2)
}else{
return this.intergralInfo.yesExchangeFortune
}
......@@ -197,7 +197,9 @@
api.courseDetail({fileId:this.fileId,userId:1}).then(res=>{
console.log('课程详情',res);
if(res['success']){
console.log(res, 4567)
this.courseInfoItem = res['data']['data'];
console.log(this.courseInfoItem,55555)
}
})
},
......@@ -243,14 +245,14 @@
}
},
onLoad(option){
console.log(option)
this.fileId = option.fileId;
this.orderId = option.orderId;
this.courseDetail();
this.queryByUserIdFortuneStatistic()
},
mounted() {
this.courseDetail();
this.queryByUserIdFortuneStatistic()
}
}
</script>
......
pages/saleCourseLists/saleCourseLists.vue
......@@ -46,10 +46,10 @@
<template v-if="userCourses && tabType===1">
<view class="saleOrderInfoItem" v-for="item in userCourses" :key="item.fileId">
<view class="courseInfoContent">
<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}" :isNeedViewDetail="true" :orderId="item.orderId"></course-item>
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :fileLecturerId="item.fileLecturerId" :isNeedViewDetail="true" :orderId="item.orderId"></course-item>
</view>
<view class="countsContent">
<text>实际支付：￥{{item.paymentAmount.toFixed(2)}}</text>
<text>实际支付：￥{{parseFloat(item.paymentAmount).toFixed(2)}}</text>
</view>
</view>
</template>
......
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