Skip to content

C
CFFP-HB
Commit 20e4495f by yuzhenWang
Options

提交520版本所作修改

parent 963ad6ed
Showing with 259 additions and 153 deletions
components/courseItem/courseItem.vue
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.itemContent { .itemContent {
display: flex; display: flex;
height: 100%; height: 100%;
......
components/login/login.vue
<template> <template>
<view class="wrapper"> <view class="wrapper">
<view v-if="loginType=='resetpw'" @click="rpsdlogin()" class="psdlogin"> <view v-if="loginType=='resetpw' || goBack" @click="rpsdlogin()" class="psdlogin">
<image style="width: 40rpx;height: 40rpx;" src="../../static/rpsloging.png" mode=""></image> <image style="width: 40rpx;height: 40rpx;" src="../../static/rpsloging.png" mode=""></image>
</view> </view>
<view class="logo"> <view class="logo">
<image :src="imgSrc" alt="logo" srcset="" class="iconBox" mode="widthFix"></image> <image :src="imgSrc" alt="logo" srcset="" class="iconBox" mode="widthFix"></image>
<view>欢迎登录使用{{companyName}}APP</view> <!-- <view>欢迎登录使用{{companyName}}APP</view> -->
<view>欢迎登录使用{{companyName}}</view>
</view> </view>
<view class="content"> <view class="content">
<view class="login_title"> <view class="login_title">
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
</view> </view>
<view class="login_type"> <view class="login_type">
<text @click="loginType='visitor';initForm();loginIn(1)">游客</text> <text @click="loginType='visitor';initForm();loginIn(1)">游客</text>
<text @click="loginType = 'agentlogin';loginTypeName = '管理账号登录';">代理商</text> <!-- <text @click="loginType = 'agentlogin';loginTypeName = '管理账号登录';">代理商</text> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -101,16 +102,59 @@ ...@@ -101,16 +102,59 @@
agreeFlag:false, agreeFlag:false,
userId:null, userId:null,
imgSrc:companyInfo.companyLogo, imgSrc:companyInfo.companyLogo,
fileType:null fileType:null,
goBack:true
} }
}, },
methods: { methods: {
c_agreeFlag(){ c_agreeFlag(){
this.agreeFlag=!this.agreeFlag; this.agreeFlag=!this.agreeFlag;
}, },
rpsdlogin(){ // rpsdlogin(){
this.loginType= 'codelogin' // if(this.loginType== 'resetpw'){
}, // this.loginType= 'codelogin'
// return
// }else {
// // uni.navigateBack({ delta: 1 });
// const pages = getCurrentPages();
// console.log('pages',pages);
// if (pages.length > 1) {
// uni.navigateBack({ delta: 1 });
// }
// }
// },
rpsdlogin() {
if (this.loginType == 'resetpw') {
this.loginType = 'codelogin';
return;
}
// 获取跳转来源（通过路由参数）
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
const from = currentPage.options.from; // 获取 url 中的 from 参数
console.log('currentPage',currentPage);
// 从 TabBar 页跳转过来，用 switchTab 返回
if (from === 'index') {
uni.switchTab({
url:'/pages/index/index'
})
} else if (from === 'personalCenter') {
uni.switchTab({
url:'/pages/personalCenter/personalCenter'
})
} else if (pages.length > 1) {
// 从普通页跳转过来，且页面栈中有上一页，直接返回
uni.navigateBack({ delta: 1 });
}else {
// 默认情况（如直接打开登录页），跳转到首页
uni.switchTab({
url: '/pages/index/index'
});
}
},
getFile(type){ getFile(type){
uni.navigateTo({ uni.navigateTo({
url:`/components/clause/clause?type=${type}` url:`/components/clause/clause?type=${type}`
...@@ -344,7 +388,7 @@ ...@@ -344,7 +388,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.psdlogin{ .psdlogin{
margin: 40rpx; margin: 40rpx;
width: 40rpx; width: 40rpx;
...@@ -353,6 +397,7 @@ ...@@ -353,6 +397,7 @@
} }
.wrapper{ .wrapper{
background: #20279B; background: #20279B;
position: relative;
overflow: auto; overflow: auto;
height: 100vh; height: 100vh;
.logo{ .logo{
......
components/unipopup/loginPopup.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="loginPopupBox"> <view class="loginPopupBox">
<view class="loginPopupTitle"> <view class="loginPopupTitle">
<view> <view>
<text>预约课程</text> <text>产品预约</text>
</view> </view>
<view class="iconGuanbi"> <view class="iconGuanbi">
<text @click="canle" class="iconfont icon-guanbi"></text> <text @click="canle" class="iconfont icon-guanbi"></text>
......
environments/environment.ts
...@@ -35,7 +35,7 @@ const config = { ...@@ -35,7 +35,7 @@ const config = {
stage, stage,
prod prod
} }
let env = 'prod'; let env = 'dev';
let baseURL = config[env].base_url; let baseURL = config[env].base_url;
let apiURL = config[env].api_url; let apiURL = config[env].api_url;
......
pages.json
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
}, { }, {
"path": "pages/courseDetail/courseDetail", "path": "pages/courseDetail/courseDetail",
"style": { "style": {
"navigationBarTitleText": "课程详情", "navigationBarTitleText": "产品详情",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"app-plus": { "app-plus": {
"softinputMode": "adjustResize" "softinputMode": "adjustResize"
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
}, { }, {
"path": "pages/saleCourseLists/saleCourseLists", "path": "pages/saleCourseLists/saleCourseLists",
"style": { "style": {
"navigationBarTitleText": "销售课程", "navigationBarTitleText": "销售中心",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { }, {
...@@ -518,7 +518,7 @@ ...@@ -518,7 +518,7 @@
"pagePath": "pages/product/product", // 页面路径，必须在 pages 中先定义 "pagePath": "pages/product/product", // 页面路径，必须在 pages 中先定义
"iconPath": "static/tabbar/sfp.png", // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px "iconPath": "static/tabbar/sfp.png", // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
"selectedIconPath": "static/tabbar/sfp_active.png", // 选中时的图片路径 "selectedIconPath": "static/tabbar/sfp_active.png", // 选中时的图片路径
"text": "SFP智能财策" // tab 上按钮文字 "text": "金融工具" // tab 上按钮文字
}, },
{ // 最少2个、最多5个 tab { // 最少2个、最多5个 tab
"pagePath": "pages/courselist/courselist", // 页面路径，必须在 pages 中先定义 "pagePath": "pages/courselist/courselist", // 页面路径，必须在 pages 中先定义
......
pages/afterSaleDetail/afterSaleDetail.vue
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height:100%; height:100%;
.top{ .top{
......
pages/afterSales/afterSales.vue
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height: 100%; height: 100%;
.top{ .top{
......
pages/announcement/announcement.vue
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.top{ .top{
display: flex; display: flex;
height: 80rpx; height: 80rpx;
......
pages/announcement/announcement_detail.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.top{ .top{
display: flex; display: flex;
height: 80rpx; height: 80rpx;
......
pages/applyDropClass/applyDropClass.vue
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
}); });
}, },
bindPickerChange(e){ bindPickerChange(e){
console.log('执行了');
this.dropIndex = e.detail.value; this.dropIndex = e.detail.value;
}, },
showModal(){ showModal(){
...@@ -206,7 +207,7 @@ ...@@ -206,7 +207,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
height: 100%; height: 100%;
......
pages/authentication-query/authentication-query.vue
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.wrapper{ .wrapper{
padding: 60rpx 30rpx; padding: 60rpx 30rpx;
.content{ .content{
......
pages/authentication-query/authentication-result.vue
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.others{ .others{
padding:30rpx; padding:30rpx;
margin-top: 30rpx; margin-top: 30rpx;
......
pages/certifyDetail/certifyDetail.vue
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
// padding-top: 40rpx; // padding-top: 40rpx;
.certifyIntro{ .certifyIntro{
......
pages/certifyDetail/uploadinformation.vue
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content { .content {
width: 100vw; width: 100vw;
padding-top: 80rpx; padding-top: 80rpx;
......
pages/commonDetail/commonDetail.vue
...@@ -140,6 +140,6 @@ ...@@ -140,6 +140,6 @@
} }
</script> </script>
<style> <style lang="scss" scoped>
</style> </style>
pages/courseDetail/courseDetail.vue
...@@ -75,12 +75,10 @@ ...@@ -75,12 +75,10 @@
<!-- 课程介绍，相关课程，讲师 --> <!-- 课程介绍，相关课程，讲师 -->
<view class="courseProBox"> <view class="courseProBox">
<!-- tab区域 --> <!-- tab区域 -->
<view class="tab"> <!-- <view class="tab">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">详情</text> <text :class="{'actived': tabType===1}" @click="switchTab(1)">详情</text>
<!-- <text :class="{'actived': tabType===2}" @click="switchTab(2)">相关课程</text> -->
<!-- <text :class="{'actived': tabType===4}" @click="switchTab(4)">服务流程</text> -->
<text :class="{'actived': tabType===3}" @click="switchTab(3)">讲师</text> <text :class="{'actived': tabType===3}" @click="switchTab(3)">讲师</text>
</view> </view> -->
<!-- tabContent区域 --> <!-- tabContent区域 -->
<view class="tabContent"> <view class="tabContent">
<!-- 课程介绍 --> <!-- 课程介绍 -->
...@@ -431,7 +429,8 @@ ...@@ -431,7 +429,8 @@
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' + '&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", this.userId + '&jumpUrl=' + jumptime + "&",
title: this.courseInfo.fileTitle, title: this.courseInfo.fileTitle,
summary: `加入我们开启学习之旅`, // summary: `加入我们开启学习之旅`,
summary: this.courseInfo.fileSynopsis,
imageUrl: this.courseInfo.displayImage, imageUrl: this.courseInfo.displayImage,
fileId: this.fileId, fileId: this.fileId,
shareCode: shareCode shareCode: shareCode
...@@ -783,7 +782,8 @@ ...@@ -783,7 +782,8 @@
getshareData2(shareCode,jumptime) { getshareData2(shareCode,jumptime) {
let data = { let data = {
title: this.courseInfo.fileTitle, title: this.courseInfo.fileTitle,
desc: '加入我们开启学习之旅', // desc: '加入我们开启学习之旅',
desc:this.courseInfo.fileSynopsis,
link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId + link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' + '&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", //分享链接 this.userId + '&jumpUrl=' + jumptime + "&", //分享链接
...@@ -809,7 +809,8 @@ ...@@ -809,7 +809,8 @@
getshareData() { getshareData() {
let data = { let data = {
title: this.courseInfo.fileTitle, title: this.courseInfo.fileTitle,
desc: '加入我们开启学习之旅', // desc: '加入我们开启学习之旅',
desc:this.courseInfo.fileSynopsis,
link: window.location.href, //分享链接 link: window.location.href, //分享链接
imgUrl: this.courseInfo.displayImage, //图片 imgUrl: this.courseInfo.displayImage, //图片
} }
...@@ -993,7 +994,7 @@ ...@@ -993,7 +994,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
page { page {
padding: 0; padding: 0;
} }
......
pages/courselist/courselist.vue
...@@ -8,10 +8,17 @@ ...@@ -8,10 +8,17 @@
<carousel :carouselList="fileUploadItemCFFPList"></carousel> <carousel :carouselList="fileUploadItemCFFPList"></carousel>
</view> </view>
</view> </view>
<h4 v-if="cffpCourseInfos.length<=0" class="noListTip">暂无课程列表</h4> <h4 v-if="cffpCourseInfos.length<=0" class="noListTip">暂无产品列表</h4>
<view class="ulBox" v-if="cffpCourseInfos.length>0"> <view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)"> <view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<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> <!-- :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}" -->
<course-item
:thumbnailPath="item.displayImage"
:title="item.fileTitle"
:summaryBox="item.fileSynopsis"
:dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}"
></course-item>
</view> </view>
</view> </view>
</view> </view>
...@@ -103,7 +110,7 @@ ...@@ -103,7 +110,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.ulBox,.liBox{ .ulBox,.liBox{
padding-bottom: 30rpx; padding-bottom: 30rpx;
display: flex; display: flex;
...@@ -120,11 +127,13 @@ ...@@ -120,11 +127,13 @@
} }
.pad{ .pad{
padding:0 30rpx 20rpx 30rpx; padding:0 30rpx 20rpx 30rpx;
.banner { .banner {
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
margin-bottom: 30rpx;
.swiper{ .swiper{
height: 200rpx; height: 250rpx;
} }
} }
} }
......
pages/dropLists/dropLists.vue
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height: 100%; height: 100%;
margin-bottom: 20rpx; margin-bottom: 20rpx;
......
pages/exchangeRecord/exchangeRecord.vue
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height:100%; height:100%;
.top{ .top{
......
pages/index/index.vue
...@@ -40,16 +40,17 @@ ...@@ -40,16 +40,17 @@
</view> </view>
<view class="course_content"> <view class="course_content">
<view class="tag"> <view class="tag">
<h4>精品课程</h4> <h4>推荐产品</h4>
<view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view> <view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view>
</view> </view>
<!-- <courselist :onlyShowList="0"></courselist> --> <!-- <courselist :onlyShowList="0"></courselist> -->
<view class="ulBox" v-if="cffpCourseInfos.length>0"> <view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)"> <view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<!-- :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}" -->
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" <course-item :thumbnailPath="item.displayImage" :title="item.fileTitle"
:summaryBox="item.fileSynopsis" :summaryBox="item.fileSynopsis"
:dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}"
:tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}"></course-item> ></course-item>
</view> </view>
</view> </view>
</view> </view>
...@@ -106,13 +107,13 @@ ...@@ -106,13 +107,13 @@
link: '/pages/application-process/basic-info', link: '/pages/application-process/basic-info',
isOpen: true isOpen: true
}, },
{ // {
key: '03', // key: '03',
name: '学习认证', // name: '学习认证',
icon: 'learningCertify', // icon: 'learningCertify',
link: '/pages/learnCertify/learnCertify', // link: '/pages/learnCertify/learnCertify',
isOpen: true // isOpen: true
}, // },
{ {
key: '04', key: '04',
name: '邀请加盟', name: '邀请加盟',
...@@ -121,27 +122,27 @@ ...@@ -121,27 +122,27 @@
isOpen: true, isOpen: true,
isJoin: true isJoin: true
}, },
{ // {
key: '05', // key: '05',
name: '我的分享', // name: '我的分享',
icon: 'share', // icon: 'share',
link: '/pages/myShare/myShare', // link: '/pages/myShare/myShare',
isOpen: true // isOpen: true
}, // },
{ // {
key: '06', // key: '06',
name: '我的团队', // name: '我的团队',
icon: 'team', // icon: 'team',
link: '/pages/personalCenter/myTeam', // link: '/pages/personalCenter/myTeam',
isOpen: true // isOpen: true
}, // },
{ // {
key: '07', // key: '07',
name: '更多功能', // name: '更多功能',
icon: 'more', // icon: 'more',
link: '/pages/personalCenter/personalCenter', // link: '/pages/personalCenter/personalCenter',
isOpen: true // isOpen: true
} // }
], ],
cffpUserInfo: { cffpUserInfo: {
address: '', address: '',
...@@ -254,8 +255,11 @@ ...@@ -254,8 +255,11 @@
icon: 'none' icon: 'none'
}); });
uni.clearStorageSync(); uni.clearStorageSync();
uni.redirectTo({ // uni.redirectTo({
url: '/components/login/login' // url: '/components/login/login'
// })
uni.navigateTo({
url: '/components/login/login?from=index'
}) })
return false return false
} }
...@@ -375,6 +379,10 @@ ...@@ -375,6 +379,10 @@
.banner { .banner {
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
margin-bottom: 30rpx;
.swiper{
height: 250rpx;
}
} }
} }
......
pages/invitationRegister/invitationRegister.vue
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height: 100vh; height: 100vh;
background: url('../../static/app-plus/registerBg.png') 100% 100%; background: url('../../static/app-plus/registerBg.png') 100% 100%;
......
pages/invitationRegister/invitationlogin.vue
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content { .content {
height: 100vh; height: 100vh;
background: #20279B; background: #20279B;
......
pages/inviteJoin/inviteJoin.vue
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container { .container {
position: relative; position: relative;
height: 100vh; height: 100vh;
......
pages/learnCertify/learnCertify.vue
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.certify_content { .certify_content {
background: #F1F6FF; background: #F1F6FF;
border-radius: 24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
......
pages/learningStatistics/learningStatistics.vue
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height: 100%; height: 100%;
.dataCountBox{ .dataCountBox{
......
pages/myCertify/myCertify.vue
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
position: relative; position: relative;
height: 100%; height: 100%;
......
pages/myLearning/myLearning.vue
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
position: relative; position: relative;
height: 100%; height: 100%;
......
pages/myPoints/myPoints.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<h4>积分明细</h4> <h4>积分明细</h4>
</view> </view>
<view class="point_content_list"> <view class="point_content_list">
<view>课程大类</view> <view>产品名称</view>
<view>积分来源</view> <view>积分来源</view>
<view>获得积分</view> <view>获得积分</view>
<view>操作</view> <view>操作</view>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`, maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
navList:[{name:'日积分',timeFlag:'D'},{name:'月积分',timeFlag:'M'},{name:'年积分',timeFlag:'Y'}], navList:[{name:'日积分',timeFlag:'D'},{name:'月积分',timeFlag:'M'},{name:'年积分',timeFlag:'Y'}],
timeFlag:'D', timeFlag:'D',
pointList:[{name:'课程大类',id:1,source:'销售收入',classify:'家组信托',score:100}], // pointList:[{name:'课程大类',id:1,source:'销售收入',classify:'家组信托',score:100}],
sumCommissionAmount:'',//总积分 sumCommissionAmount:'',//总积分
nowSumCommissionAmount:'', //当前（日月年）积分 nowSumCommissionAmount:'', //当前（日月年）积分
prePercent:'',//比前日、上月，上年多或少的百分比数据 prePercent:'',//比前日、上月，上年多或少的百分比数据
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
.top{ .top{
background: linear-gradient(179deg, #F8B588 0%, rgba(255,239,216,0.2) 100%); background: linear-gradient(179deg, #F8B588 0%, rgba(255,239,216,0.2) 100%);
......
pages/myPoints/pointsDetail.vue
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
.top{ .top{
padding: 30rpx; padding: 30rpx;
......
pages/myShare/myShare.vue
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container { .container {
height: 100%; height: 100%;
......
pages/orderConfirm/orderConfirm.vue
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<h3>{{popupTitle}}</h3> <h3>{{popupTitle}}</h3>
<i class="iconfont icon-guanbi" @click="closePopup(1)"></i> <i class="iconfont icon-guanbi" @click="closePopup(1)"></i>
</view> </view>
<view v-if="popupType===1"><text>1积分=1元,积分抵扣如同现金,所有课程均可使用.</text></view> <view v-if="popupType===1"><text>1积分=1元,积分抵扣如同现金,所有产品均可使用.</text></view>
<view v-if="popupType===2"> <view v-if="popupType===2">
<view class="deductionInfoItem" :class="{'actived':isDeduction == 'true'}" @click="selectDeduction(true)"> <view class="deductionInfoItem" :class="{'actived':isDeduction == 'true'}" @click="selectDeduction(true)">
<view style="display: flex;"> <view style="display: flex;">
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<view class="tips"> <view class="tips">
<!-- <view class="text-center">请点击右上角菜单</view> --> <!-- <view class="text-center">请点击右上角菜单</view> -->
<view style="line-height: 60rpx;">戳这里，点击<text class="iconfont icon-liulanqi"></text> <view style="line-height: 60rpx;">戳这里，点击<text class="iconfont icon-liulanqi"></text>
按钮，使用系统浏览器打开页面完成支付，完成后请返回微信，到【销售课程】下，查看购买订单。</view> 按钮，使用系统浏览器打开页面完成支付，完成后请返回微信，到【销售中心】下，查看购买订单。</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container { .container {
position: relative; position: relative;
height: 95vh; height: 95vh;
......
pages/orderDetail/orderDetail.vue
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<script> <script>
import api from "@/api/api"; import api from "@/api/api";
import common from "@/common/common"; import common from "@/common/common";
import dataHandling from "@/util/dataHandling";
export default { export default {
data() { data() {
return { return {
...@@ -74,14 +75,14 @@ ...@@ -74,14 +75,14 @@
alias: 'userName', alias: 'userName',
pageArea: 1 pageArea: 1
}, },
{ // {
id: 6, // id: 6,
name: '商品讲师', // name: '商品讲师',
value: '/', // value: '/',
type: 'string', // type: 'string',
alias: 'lecturerName', // alias: 'lecturerName',
pageArea: 1 // pageArea: 1
}, // },
{ {
id: 7, id: 7,
name: '订单现价', name: '订单现价',
...@@ -164,12 +165,20 @@ ...@@ -164,12 +165,20 @@
api.userCourseInfo(param).then(res => { api.userCourseInfo(param).then(res => {
if (res['success']) { if (res['success']) {
const data = this.orderDetail = res['data']['orderDetail']; const data = this.orderDetail = res['data']['orderDetail'];
if(this.orderDetail.effectiveEndDate){
this.orderDetail.effectiveEndDate = dataHandling.dateFormat(this.orderDetail.effectiveEndDate)
}
if(this.orderDetail.orderConfirmDate){
this.orderDetail.orderConfirmDate = dataHandling.dateFormat(this.orderDetail.orderConfirmDate)
}
this.fileId = data.fileId; this.fileId = data.fileId;
Object.keys(data).map((key, item) => { Object.keys(data).map((key, item) => {
this.orderInfoList.forEach(val => { this.orderInfoList.forEach(val => {
if (val.alias == key) { if (val.alias == key) {
val.value = data[key]; val.value = data[key];
} }
}) })
}) })
} }
...@@ -206,7 +215,7 @@ ...@@ -206,7 +215,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container { .container {
height: 100%; height: 100%;
......
pages/orderStatus/orderStatus.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<view class="courlistBox"> <view class="courlistBox">
<view class="course_content"> <view class="course_content">
<view class="tag"> <view class="tag">
<h4>精品课程</h4> <h4>推荐产品</h4>
<view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view> <view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view>
<!-- <view v-if="this.isRedirect == 1" @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view> --> <!-- <view v-if="this.isRedirect == 1" @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view> -->
</view> </view>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.ulBox{ .ulBox{
flex-direction: column; flex-direction: column;
} }
......
pages/personalCenter/accountoperation/aboutcffp.vue
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content{ .content{
width: 100%; width: 100%;
......
pages/personalCenter/accountoperation/confirmResetpassword.vue
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.top{ .top{
display: flex; display: flex;
height: 80rpx; height: 80rpx;
......
pages/personalCenter/accountoperation/phonebinding.vue
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
} }
</script> </script>
<style> <style lang="scss" scoped>
</style> </style>
pages/personalCenter/myTeam.vue
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height: 100%; height: 100%;
background: #FFFFFF; background: #FFFFFF;
......
pages/personalCenter/personalCenter.vue
...@@ -107,8 +107,8 @@ ...@@ -107,8 +107,8 @@
}, },
{id:'02',categoryName:'活动管理', {id:'02',categoryName:'活动管理',
children:[ children:[
{title:'我的学习',icon:'myLearning',link:'/pages/myLearning/myLearning',isOpen:true,isShow:true}, // {title:'我的学习',icon:'myLearning',link:'/pages/myLearning/myLearning',isOpen:true,isShow:true},
{title:'学习认证',icon:'learningCertify',link:'/pages/learnCertify/learnCertify',isOpen:true,isShow:true,islogin:true}, // {title:'学习认证',icon:'learningCertify',link:'/pages/learnCertify/learnCertify',isOpen:true,isShow:true,islogin:true},
{title:'我的分享',icon:'share',link:'/pages/myShare/myShare',isOpen:true,isShow:true} {title:'我的分享',icon:'share',link:'/pages/myShare/myShare',isOpen:true,isShow:true}
], ],
}, },
...@@ -126,9 +126,9 @@ ...@@ -126,9 +126,9 @@
} }
], ],
minorMenuLists:[ minorMenuLists:[
{title:'我的邀请码',icon:'shareEcode',link:'',isOpen:true,isShow:true}, // {title:'我的邀请码',icon:'shareEcode',link:'',isOpen:true,isShow:true},
{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:'setting',link:'',isOpen:true,isShow:false}, {title:'申请修改公司周边',icon:'setting',link:'',isOpen:true,isShow:false},
{title:'我的消息',icon:'message',link:'/pages/systemMsg/system_msg',isOpen:true,isShow:true,islogin:true}, {title:'我的消息',icon:'message',link:'/pages/systemMsg/system_msg',isOpen:true,isShow:true,islogin:true},
{title:'系统设置',icon:'setting',link:'/pages/personalCenter/system/settings',isOpen:true,isShow:true} {title:'系统设置',icon:'setting',link:'/pages/personalCenter/system/settings',isOpen:true,isShow:true}
...@@ -180,8 +180,11 @@ ...@@ -180,8 +180,11 @@
duration: 2000, duration: 2000,
icon: 'none' icon: 'none'
}); });
// uni.redirectTo({
// url:'/components/login/login?from=personalCenter'
// })
uni.redirectTo({ uni.redirectTo({
url:'/components/login/login' url: '/components/login/login?from=personalCenter'
}) })
try { try {
uni.clearStorageSync(); uni.clearStorageSync();
...@@ -193,8 +196,12 @@ ...@@ -193,8 +196,12 @@
}, },
// 菜单跳转页面 // 菜单跳转页面
goDetail(item){ goDetail(item){
if(!this.loginornot&& !item.islogin){ if(!this.loginornot&& !item.islogin){
console.log('详情方法',item);
this.isLogin() this.isLogin()
return
} }
if(item.isShow && item.isOpen){ if(item.isShow && item.isOpen){
if(item.title==='我的邀请码'){ if(item.title==='我的邀请码'){
...@@ -219,6 +226,7 @@ ...@@ -219,6 +226,7 @@
url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode
}); });
}else{ }else{
item.link = `${item.link}?from=personalCenter`
uni.navigateTo({ uni.navigateTo({
url: item.link url: item.link
}); });
...@@ -278,7 +286,7 @@ ...@@ -278,7 +286,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
// padding-bottom: 160rpx; // padding-bottom: 160rpx;
} }
......
pages/personalCenter/system/accontsetting.vue
...@@ -60,6 +60,6 @@ ...@@ -60,6 +60,6 @@
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
</style> </style>
pages/personalCenter/system/cancellation.vue
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<text style="font-size: 28rpx;">注销账号后不可恢复，该账号绑定的所有权益、积分、记录等数据也将都被清空且无法恢复，包括：</text> <text style="font-size: 28rpx;">注销账号后不可恢复，该账号绑定的所有权益、积分、记录等数据也将都被清空且无法恢复，包括：</text>
</view> </view>
<ul class="tips"> <ul class="tips">
<li>所有积分权益不可使用</li> <li>所有积分权益不可使用；</li>
<li>已购买的课程无法观看</li> <li>所有分享数据被清空；</li>
<li>已获得认证的证书无法查看</li> <li>所有订单数据被清空；</li>
<li>学习数据将被清除</li> <li>其他未列数据被清空且无法恢复</li>
</ul> </ul>
<view class="footer" style=""> <view class="footer" style="">
<view class="footer-submitbtn" style="" @click="sunmit()"> <view class="footer-submitbtn" style="" @click="sunmit()">
...@@ -63,8 +63,10 @@ ...@@ -63,8 +63,10 @@
title: '操作成功', title: '操作成功',
icon: 'none' icon: 'none'
}); });
// 清空全部本地存储
uni.clearStorageSync();
uni.redirectTo({ uni.redirectTo({
url:'/components/login/login' url:'/components/login/login?from=index'
}) })
} }
}) })
...@@ -73,7 +75,7 @@ ...@@ -73,7 +75,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
padding: 0 20rpx; padding: 0 20rpx;
} }
......
pages/personalCenter/system/menulist.vue
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.personalInfo { .personalInfo {
background: #fff; background: #fff;
width: 95%; width: 95%;
......
pages/personalCenter/teamMembers/jurisdiction.vue
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content{ .content{
height: 100%; height: 100%;
width: 100vw; width: 100vw;
......
pages/personalCenter/teamMembers/members.vue
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content{ .content{
height: 100%; height: 100%;
width: 100vw; width: 100vw;
......
pages/personalCenter/teamMembers/otherteam.vue
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content{ .content{
height: 100%; height: 100%;
width: 100vw; width: 100vw;
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container { .container {
position: relative; position: relative;
height: 100%; height: 100%;
......
pages/personalCenter/teamPerformance/teamPerformance.vue
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content { .content {
width: 100vw; width: 100vw;
height: 100%; height: 100%;
......
pages/pointsExchange/pointsExchange.vue
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
.top{ .top{
width: 100%; width: 100%;
......
pages/pointsExchange/pointsStatus.vue
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
.top{ .top{
width: 100%; width: 100%;
......
pages/product/product.vue
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.header { .header {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
pages/saleCourseLists/saleCourseLists.vue
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<!-- 分享明细 --> <!-- 分享明细 -->
<view class="saleDetailContent"> <view class="saleDetailContent">
<view class="courseTab"> <view class="courseTab">
<text :class="{'actived':tabType===1}" @click="switchTab(1)">我的课程</text> <text :class="{'actived':tabType===1}" @click="switchTab(1)">我的订单</text>
<text :class="{'actived':tabType===2}" @click="switchTab(2)">分享课程</text> <text :class="{'actived':tabType===2}" @click="switchTab(2)">分享订单</text>
</view> </view>
<view class="totalCountBox">合计（单）：<text>{{userCourseCountNum}}</text></view> <view class="totalCountBox">合计（单）：<text>{{userCourseCountNum}}</text></view>
<h4 class="noListTip" v-if="!userCourses || userCourses.length<=0 && tabType===1">暂无购买记录！</h4> <h4 class="noListTip" v-if="!userCourses || userCourses.length<=0 && tabType===1">暂无购买记录！</h4>
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
</view> </view>
</template> </template>
<template v-if="userCourses && tabType===2"> <template v-if="userCourses && tabType===2">
<view class="orderItemDetailBox" v-for="item in userShareCourseOrders"> <view class="orderItemDetailBox" v-for="item in userShareCourseOrders" :key="index">
<view><text>订单编号</text><text>{{item.orderNo}}</text></view> <view><text>订单编号</text><text>{{item.orderNo}}</text></view>
<view><text>课程名称</text><text>{{item.fileTitle}}</text></view> <view><text>产品名称</text><text>{{item.fileTitle}}</text></view>
<view><text>购买人</text><text>{{item.userName}}</text></view> <view><text>购买人</text><text>{{item.userName}}</text></view>
<view class="orderDetailLine"> <view class="orderDetailLine">
<text></text> <text></text>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height: 100%; height: 100%;
.top{ .top{
......
pages/shareFriend/shareFriend.vue
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
</style> </style>
pages/systemMsg/system_msg.vue
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.top{ .top{
display: flex; display: flex;
height: 100rpx; height: 100rpx;
......
pages/systemMsg/system_msg_detail.vue
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.top{ .top{
display: flex; display: flex;
height: 80rpx; height: 80rpx;
......
pages/taxRules/taxRules.vue
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content_wrapper{ .content_wrapper{
padding: 30rpx; padding: 30rpx;
h4{ h4{
......
pages/withdrawal/withdrawal.vue
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.top{ .top{
width: 100%; width: 100%;
text-align: center; text-align: center;
......
pages/withdrawal/withdrawalDetail.vue
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container{ .container{
height:100%; height:100%;
.top{ .top{
......
sfp/childEdu/childEdu.vue
...@@ -525,7 +525,7 @@ ...@@ -525,7 +525,7 @@
} }
</script> </script>
<style> <style scoped>
@import '../sfpCommon.css'; @import '../sfpCommon.css';
@import url("childEdu.css"); @import url("childEdu.css");
</style> </style>
util/dataHandling.ts
...@@ -34,6 +34,7 @@ export default{ ...@@ -34,6 +34,7 @@ export default{
}, },
// 日期格式化 // 日期格式化
dateFormat(val:number,format='yyyy-MM-dd hh:mm:ss'){ dateFormat(val:number,format='yyyy-MM-dd hh:mm:ss'){
console.log('val',val);
if(val){ if(val){
const date = new Date(val); const date = new Date(val);
const year = date.getFullYear(); const year = date.getFullYear();
......
util/router.js
...@@ -7,31 +7,36 @@ const whiteList = [ ...@@ -7,31 +7,36 @@ const whiteList = [
'/pages/orderDetail/orderDetail', '/pages/orderDetail/orderDetail',
'/pages/courseDetail/courseDetail', '/pages/courseDetail/courseDetail',
'/pages/courselist/courselist', '/pages/courselist/courselist',
'/pages/index/index', '/pages/index/index'
] ]
export default function initApp(){ export default function initApp(){
uni.addInterceptor('navigateTo', { uni.addInterceptor('navigateTo', {
// 页面跳转前进行拦截, invoke根据返回值进行判断是否继续执行跳转 // 页面跳转前进行拦截, invoke根据返回值进行判断是否继续执行跳转
invoke (e) { invoke (e) {
let whiteArr = ['index','personalCenter','courselist','product']
// 1. 解析 URL 中的 from 参数
const getQueryParam = (url, key) => {
const queryString = url.split('?')[1];
if (!queryString) return null;
const params = new URLSearchParams(queryString);
return params.get(key);
};
const fromParam = getQueryParam(e.url, 'from');
if(!hasPermission(e.url)){ if(!hasPermission(e.url)){
uni.redirectTo({ // 如果 from 参数在 whiteArr 中，说明是tabbar页带着tabbar的标志参数跳转到登录页，以便未登录状态下回到对应的tabbar页
url: '/components/login/login' if (fromParam && whiteArr.includes(fromParam)) {
}) uni.redirectTo({
return false url: `/components/login/login?from=${fromParam}`
} })
return true }else {
}, uni.redirectTo({
success (e) { url: '/components/login/login'
} })
}) }
uni.addInterceptor('switchTab', {
// tabbar页面跳转前进行拦截
invoke (e) {
if(!hasPermission(e.url)){
uni.redirectTo({
url: '/components/login/login'
})
return false return false
} }
return true return true
...@@ -39,11 +44,28 @@ export default function initApp(){ ...@@ -39,11 +44,28 @@ export default function initApp(){
success (e) { success (e) {
} }
}) })
//最新 修改 tabbar页面跳转前不进行拦截
// uni.addInterceptor('switchTab', {
//
// invoke (e) {
// console.log('!hasPermission(e.url)',e.url);
// if(!hasPermission(e.url)){
// uni.redirectTo({
// url: '/components/login/login'
// })
// return false
// }
// return true
// },
// success (e) {
// }
// })
} }
function hasPermission (url) { function hasPermission (url) {
let islogin = uni.getStorageSync("isLogin");//在这可以使用token、vuex let islogin = uni.getStorageSync("isLogin");//在这可以使用token、vuex
// islogin = Boolean(Number(islogin));//返回布尔值 // islogin = Boolean(Number(islogin));//返回布尔值
// 在白名单中或有登录判断条件可以直接跳转 // 在白名单中或有登录判断条件可以直接跳转
console.log(whiteList.indexOf(url.slice(0,url.indexOf('?'))) !== -1);
if(whiteList.indexOf(url.slice(0,url.indexOf('?'))) !== -1 || islogin) { if(whiteList.indexOf(url.slice(0,url.indexOf('?'))) !== -1 || islogin) {
return true return true
} }
......
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