Skip to content

C
CFFP-HB
Commit a44a6cbc by sunerhu
Options

1.修复课程详情页面传值问题 

2.修复分享页面样式问题。
3.修复首页邀请加盟校验问题。
4.修复课程学习页面详情传值问题。
5.修复上传个人信息上传文件位置偏移问题。
6.修改团队页面样式。
parent 94d94b1f
Showing with 116 additions and 79 deletions
components/listItem/listItem.vue
......@@ -7,9 +7,21 @@
<view v-for="listItem in lists" :key="listItem.id" class="line">
<view v-for="subItem in listItem.children" :key="subItem.no"
:style="{color:subItem.link ? '#2D56A7' : '#333',width:subItem.width}">
<view class="" style="overflow: hidden;">
<text :style="{borderColor:subItem.link ? '#2D56A7' : 'transparent'}"
@click="link(subItem.value,listItem)">{{subItem.value}}</text>
<view class="" style="overflow: hidden;" @click="link(subItem.name,subItem.readCount,listItem)">
<view class="" v-if="subItem.value == '阅读明细'">
<text v-if=" subItem.readCount > 0">{{subItem.value}}</text>
<text v-else> - </text>
</view>
<view class="" v-else-if="subItem.value == '购买明细'"
@click="link(subItem.name,subItem.buyCount,listItem)">
<text v-if=" subItem.buyCount > 0">{{subItem.value}}</text>
<text v-else> - </text>
</view>
<view v-else class="" @click="link(subItem.name,1,listItem)">
<text
:style="{borderColor:subItem.link ? '#2D56A7' : 'transparent'}">{{subItem.value}}</text>
</view>
</view>
</view>
</view>
......@@ -43,7 +55,7 @@
},
data() {
return {
titleList: ['购买明细', '阅读明细', '购买订单']
};
},
mounted() {
......@@ -53,23 +65,20 @@
},
methods: {
cklink() {
},
link(val, value) {
console.log(val, value, 1515)
let dataList = value.children
link(val, value, list) {
console.log(val, value, 5141548)
let dataList = list.children
for (var i = 0; i < dataList.length; i++) {
if (val == dataList[i].value) {
console.log(dataList[i], 54854)
if (val == '阅读明细' || val == '购买明细') {
if (val == dataList[i].name) {
if (this.titleList.includes(val)) {
if (value > 0) {
uni.navigateTo({
url: dataList[i].link
})
}
} else {
uni.showModal({
title: '分享链接',
title: val,
content: dataList[i].value,
showCancel: false,
success: function(res) {
......@@ -81,6 +90,24 @@
}
});
}
// if (val == '阅读明细' && dataList[i].readCount > 0) {
// this.jumpdetail(true)
// }
// if (val == '购买明细' && dataList[i].buyCount > 0) {
// this.jumpdetail(true)
// }
// if (val == '购买订单') {
// this.jumpdetail(true)
// }
// uni.navigateTo({
// url: dataList[i].link
// })
// [1, 2, 3].includes(2) // true
// if() {
// }
}
}
......
components/myteam/lazy-tree.vue
......@@ -34,15 +34,34 @@
<!-- :class="`padding-left-${item.level * 5 + 10}`" -->
<!-- -->
<view class="content-box-title-a" v-if="item.levelCode == 'B1'&& item.itemType == '1'" @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}">
<text style="color: black;">{{item.areaCenterName}}</text>
<!-- <text style="color: black;">{{item.areaCenterName}}</text> -->
<view class="" style="display: flex;align-items: center;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx; margin-left: 10rpx;">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" mode=""></image>
</view>
<view class="content-box-title-b" @click="open(item, i)" v-else-if="item.levelCode == 'C3'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}">
<text style="color: #FFFFFF;">{{item.areaCenterName}}</text>
</view>
<view class="content-box-title-b" @click="open(item, i)" v-else-if="item.levelCode == 'C2'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}">
<text style="color: #FFFFFF;">{{item.areaCenterName}}</text>
</view>
<view @click="open(item, i)" style="flex: 1;" v-else>
<view class="content-box-title-a" @click="open(item, i)" v-else-if="item.levelCode == 'C3'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}">
<!-- <text style="color: #FFFFFF;">{{item.areaCenterName}}</text> -->
<view class="" style="display: flex;align-items: center;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx; margin-left: 10rpx;">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" mode=""></image>
</view>
</view>
</view>
<view class="content-box-title-a" @click="open(item, i)" v-else-if="item.levelCode == 'C2'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}">
<!-- <text style="color: #FFFFFF;">{{item.areaCenterName}}</text> -->
<view class="" style="display: flex;align-items: center;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx; margin-left: 10rpx;">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" mode=""></image>
</view>
</view>
</view>
<view class="" @click="open(item, i)" style="flex: 1;" v-else>
<text>{{item.name}}</text>
</view>
<!-- <view class="content-box-title-a" @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}">
......@@ -356,18 +375,6 @@
min-height: 60rpx;
margin-top: 5rpx;
line-height: 50rpx;
background: url('../../static/myteam/Group1662.png') no-repeat;
background-size: 100%;
}
.content-box-title-b {
flex: 1;
font-size: 26rpx;
max-width: 246rpx;
min-height: 60rpx;
margin-top: 5rpx;
line-height: 50rpx;
background: url('../../static/myteam/Group1660.png') no-repeat;
background-size: 100%;
}
.test {
position: relative;
......
components/uploadFile/uploadFile.vue
......@@ -68,7 +68,7 @@
instantly: true,
// 必传宽高且宽高应与slot宽高保持一致
width: '100%',
height: '100rpx',
height: '320rpx',
// 限制允许选择的格式，空串=不限制，默认为空png,jpg,mp4,pdf,.docx
formats: this.deformats,
// 文件上传大小限制
......
pages/application-process/basic-info.vue
......@@ -161,7 +161,6 @@
mobile: null,
shareId: null,
display: false,
hasCrossDistrict:'',
cffp_userInfo: {
name: '',
mobile: ''
......@@ -170,9 +169,7 @@
},
components: {},
onLoad(options) {
console.log( options, 151551)
if (options.shareId) {
this.hasCrossDistrict = options.hasCrossDistrict
this.shareId = options.shareId
uni.setStorageSync('applyId', '')
} else {
......@@ -214,7 +211,7 @@
},
queryOrgList() {
const param = {
userId: uni.getStorageSync('cffp_userId'),
userId:this.shareId ? uni.getStorageSync('H5_cffpUserId') : uni.getStorageSync('cffp_userId'),
// userId:1,
partnerLevel: this.applyParam.partnerLevel
}
......@@ -398,7 +395,7 @@
...this.applyParam,
applyType: this.applyParam.inviterInvitationCode? '1': '2',
operatStep: 1,
userId: uni.getStorageSync('cffp_userId'),
userId:this.shareId ? uni.getStorageSync('H5_cffpUserId') : uni.getStorageSync('cffp_userId'),
hasCrossDistrict: this.applyParam.hasCrossDistrict?this.applyParam.hasCrossDistrict: '0'
}
api.saveApplyInfo(this.applyParam).then((res) => {
......
pages/certifyDetail/uploadinformation.vue
......@@ -41,13 +41,13 @@
</view>
<view class="uploadpdf">
<view class="uploadimg">
<view class="uploadFileBox" v-if="status != 3">
<uploadFile :deformats="formats" :opacity="0" ref="uploadRef" :height="'320rpx'" :instantly="'true'" :requestVO="JSON.stringify(dataForm)" @sendPath="getPath"></uploadFile>
</view>
<view class="" style="width: 50px;">
<image class="image" src="../../static/myteam/Group1646.png"></image>
</view>
<p>点击添加计划书</p>
<view class="uploadFileBox" v-if="status != 3">
<uploadFile :deformats="formats" :opacity="0" ref="uploadRef" :widt="'100%'" :height="'320rpx'" :instantly="'true'" :requestVO="JSON.stringify(dataForm)" @sendPath="getPath"></uploadFile>
</view>
</view>
<view class="footer-text">
<text>(请上传pdf文件)</text>
......@@ -149,16 +149,16 @@
api.uploadSignUpUserInfo(requestVo).then(res => {
if(res['success']){
//
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
});
setTimeout(()=>{
uni.navigateBack(1)
},1000)
//this.getquerySignUpInfo()
}
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
});
this.loading = false
})
},
......
pages/commonDetail/commonDetail.vue
......@@ -35,16 +35,17 @@
readId:this.readId?this.readId:undefined
}
api[obj.req](params).then(res=>{
console.log(res)
if(res['success']){
const r = res['data'][obj.result];
if(r && r.length>0){
for(let i=0;i<r.length;i++){
this.lists.push({id:r[i][obj.id],children:JSON.parse(JSON.stringify(obj.children))});
this.lists.push({id:r[i][obj.id],readCount:r[i][obj.readCount],children:JSON.parse(JSON.stringify(obj.children))});
for(let m=0;m<this.lists[i]['children'].length;m++){
this.lists[i]['children'][m]['value'] = r[i][this.lists[i]['children'][m]['alias']] ? r[i][this.lists[i]['children'][m]['alias']] : this.lists[i]['children'][m]['value'];
if(this.lists[i]['children'][m].needParam){
this.lists[i]['children'][m]['link'] += r[i][obj.id]
this.lists[i]['children'][m]['readCount'] += r[i][obj.readCount]
this.lists[i]['children'][m]['buyCount'] += r[i][obj.buyCount]
}
}
}
......@@ -76,10 +77,11 @@
req:'userShareLinkList',
result:'userShareLinks',
id:'shareId',
readCount:'readCount',
children:[
{no:1,name:'分享时间',width: '40%',value:'',link:null,alias:'shareDate'},
{no:2,name:'分享链接',width: '35%',value:'',link:null,alias:'shareUrl'},
{no:3,name:'阅读明细',width: '25%',value:'阅读明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2&shareId=`,needParam:true},
{no:3,name:'阅读明细',width: '25%',value:'阅读明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2&shareId=`,needParam:true,readCount: ''},
]
}
);
......@@ -96,11 +98,12 @@
req:'userShareReadList',
result:'userShareReads',
id:'readId',
buyCount:'buyCount',
children:[
{no:1,name:'用户',width: '20%',value:'',link:null,alias:'readName'},
{no:2,name:'阅读链接',width: '30%',value:'',link:null,alias:'readUrl'},
{no:3,name:'阅读时间',width: '25%',value:'',link:null,alias:'readDate'},
{no:3,name:'购买明细',width: '25%',value:'购买明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3&readId=`,needParam:true},
{no:3,name:'购买明细',width: '25%',value:'购买明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3&readId=`,needParam:true,buyCount:''},
]
}
);
......
pages/courseDetail/courseDetail.vue
......@@ -73,6 +73,7 @@
<view class="courseInfoContent">
<h4>{{index + 1}}.{{item.fileTitle}}<text
class="courseType">{{item.fileType=='1' ? '必修' : '选修'}}</text></h4>
<view class="timeContent">
<view class="">
{{secondsTransferPipe(Number(item.maxViewTime))}}/{{secondsTransferPipe(Number(item.courseTotalTime))}}
......@@ -272,7 +273,8 @@
const param = {
productType: '1',
productId: this.courseInfo.fileId,
userId: this.coursesharing == 1 ? localStorage.getItem('h5_userId') : uni.getStorageSync('cffp_userId'),
userId: this.coursesharing == 1 ? localStorage.getItem('h5_userId') : uni.getStorageSync(
'cffp_userId'),
shareUserId: this.shareUserId,
shareReadId: this.shareReadId,
shareCode: this.shareCode,
......@@ -344,6 +346,9 @@
relatedCoursesList() {
api.relatedCoursesList({
fileId: this.fileId,
userId: this.coursesharing == '1' ? uni.getStorageSync('h5_userId') : uni.getStorageSync(
'cffp_userId'),
orderId: this.courseInfo.orderId,
packFileId: this.courseInfo.packFileId
}).then(res => {
console.log('相关课程详情', res);
......@@ -494,8 +499,8 @@
// },
},
onLoad(option) {
console.log(option, 1541515)
this.fileId = option.fileId;
this.courseInfo.packFileId = option.packFileId
if (option.coursesharing) {
this.userId = ''
this.coursesharing = option.coursesharing
......@@ -752,6 +757,8 @@
justify-content: space-between;
.courseInfoContent {
width: 75%;
h4 {
color: #666;
}
......
pages/dropLists/dropLists.vue
......@@ -12,10 +12,6 @@
<text>{{item.itemName}}</text>
</view>
<view class="ulBox">
<text>课程状态:</text>
<text @click="viewDetail(item)" class="dropStatus">{{item.orderStatus}}<i class="iconfont icon-youjiantou" style="margin-left: 5rpx;font-size: 26rpx;"></i></text>
</view>
<view class="ulBox">
<text>退课积分:</text>
<text>{{Math.abs(item.commissionAmount)}}</text>
</view>
......@@ -24,6 +20,10 @@
<text>{{item.commissionTypeContent}}</text>
</view>
<view class="ulBox">
<text>课程状态:</text>
<text @click="viewDetail(item)" class="dropStatus">{{item.orderStatus}}<i class="iconfont icon-youjiantou" style="margin-left: 5rpx;font-size: 26rpx;"></i></text>
</view>
<view class="ulBox">
<text>退课时间:</text>
<text>{{item.refundTime}}</text>
</view>
......
pages/index/index.vue
......@@ -105,7 +105,8 @@
name: '邀请加盟',
icon: 'shareJoin',
link: '/pages/inviteJoin/inviteJoin',
isOpen: true
isOpen: true,
isJoin: true
},
{
key: '05',
......@@ -171,20 +172,18 @@
})
},
featureSelect(featureItem) {
console.log(featureItem)
if (featureItem.isOpen && featureItem.link) {
if (this.cffpUserInfo.partnerType) {
uni.navigateTo({
url: featureItem.link
})
}else {
console.log(this.cffpUserInfo, 1544)
if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') {
uni.showToast({
title: "您本人尚未加盟，您加盟后可邀请加盟",
duration: 2000,
icon: 'none'
});
return false
}
} else if (featureItem.isOpen && featureItem.link) {
uni.navigateTo({
url: featureItem.link
})
} else {
uni.showToast({
title: '此功能暂未开放，敬请期待。',
......
pages/invitationRegister/invitationRegister.vue
......@@ -26,11 +26,9 @@
levelaName:'',
mobileNumber:'',
name:'',
hasCrossDistrict:''
}
},
onLoad(options) {
this.hasCrossDistrict = options.hasCrossDistrict
this.shareId = options.shareId
this.invitationCode = options.invitationCode
this.getqueryById()
......@@ -55,7 +53,7 @@
// };'
uni.navigateTo({
// url:'/pages/invitationRegister/invitationlogin?name=' + this.name+'&mobile=' +this.mobileNumber + '&id=' + this.shareId
url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&shareId=${this.shareId}&hasCrossDistrict=${this.hasCrossDistrict}`
url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&shareId=${this.shareId}`
})
}
......
pages/invitationRegister/invitationlogin.vue
......@@ -47,7 +47,6 @@
remainTimes:60,
sendCodeHtml:'获取验证码',
userId: '',
hasCrossDistrict:'',
form:{
name: '',
mobile: '',
......@@ -56,7 +55,6 @@
}
},
onLoad(options) {
this.hasCrossDistrict = options.hasCrossDistrict
this.form.name = options.name?options.name:''
this.form.mobile = options.mobile? options.mobile: ''
this.form.id = options.shareId?options.shareId:''
......@@ -124,8 +122,9 @@
console.log(res, 5454)
this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1')
uni.setStorageSync('H5_cffpUserId', this.userId)
uni.navigateTo({
url:'/pages/application-process/basic-info?userId=' + this.userId + '&shareId=' + this.form.id + '&hasCrossDistrict=' + this.hasCrossDistrict
url:'/pages/application-process/basic-info?userId=' + this.userId + '&shareId=' + this.form.id
})
}else{
uni.showToast({
......
pages/inviteJoin/inviteJoin.vue
......@@ -279,7 +279,7 @@
scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId + '&invitationCode=' + this.invitationCode+'&hasCrossDistrict=' + this.dataForm.hasCrossDistrict,
this.shareId + '&invitationCode=' + this.invitationCode,
title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
......
pages/learningStatistics/learningStatistics.vue
......@@ -34,7 +34,7 @@
<view class="progressDetailBox">
<view class="progressTitleBox">
<h4><i class="iconfont icon-shalou"></i>进度明细</h4>
<i class="iconfont icon-youjiantou" @click="state.package=!state.package" :style="{transform: state.package ? 'rotate(90deg)' : 'rotate(-90deg)' }"></i>
<i class="iconfont icon-youjiantou" @click="state.package=!state.package" :style="{transform: state.package ? 'rotate(-90deg)' : 'rotate(90deg)' }"></i>
</view>
<template v-if="state.package">
<view class="progressItemBox" v-for="(item,index) in userStudyCountList.barInfos" :key="index">
......@@ -55,7 +55,7 @@
</view>
<view class="progressBottomBox">
<text>{{item.fileTitle}}</text>
<i class="iconfont icon-youjiantou" v-if="item.packFileId" @click="userCoursePackBar(item.packFileId,item.orderId,item.state)" :style="{transform: item['state'] ? 'rotate(90deg)' : 'rotate(-90deg)' }"></i>
<i class="iconfont icon-youjiantou" v-if="item.packFileId" @click="userCoursePackBar(item.packFileId,item.orderId,item.state)" :style="{transform: item['state'] ? 'rotate(-90deg)' : 'rotate(90deg)' }"></i>
</view>
</view>
<!-- 小课 -->
......@@ -358,7 +358,7 @@
.progressLine{
position: relative;
width: 90%;
height: 60rpx;
height: 50rpx;
border-radius: 36rpx;
border: 4rpx solid #0867F5;
margin: 0 20rpx;
......
pages/myLearning/myLearning.vue
......@@ -75,7 +75,7 @@
},
viewDetail(item){
uni.navigateTo({
url:`/pages/courseDetail/courseDetail?fileId=${item.fileId}`
url:`/pages/courseDetail/courseDetail?fileId=${item.fileId}&packFileId=${item.packFileId}`
})
}
},
......
pages/personalCenter/teamMembers/members.vue
<template>
<view class="content">
<view class="content-header">
<view class="content-header" v-if="levelName">
<view class="concent-title">
<text class="concent-text">{{levelName}}</text>
</view>
......
uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
......@@ -56,7 +56,7 @@
text: '搜索',
icon: 'iconfont icon-sousuo',
name: 'searh',
link:'/pages/index/index'
link:'/pages/courselist/courselist'
},
{
text: '我的',
......
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