Skip to content

C
CFFP-HB
Commit 00c49ff6 by sunchao
Options

Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

parents a4139ef5 6349af9d
Showing with 321 additions and 206 deletions
components/listItem/listItem.vue
...@@ -8,8 +8,19 @@ ...@@ -8,8 +8,19 @@
<view v-for="subItem in listItem.children" :key="subItem.no" <view v-for="subItem in listItem.children" :key="subItem.no"
:style="{color:subItem.link ? '#2D56A7' : '#333',width:subItem.width}"> :style="{color:subItem.link ? '#2D56A7' : '#333',width:subItem.width}">
<view class="" style="overflow: hidden;"> <view class="" style="overflow: hidden;">
<text :style="{borderColor:subItem.link ? '#2D56A7' : 'transparent'}" <view class="" v-if="subItem.value == '阅读明细'" @click="link(subItem.name,subItem.readCount,listItem)">
@click="link(subItem.value,listItem)">{{subItem.value}}</text> <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> </view>
</view> </view>
...@@ -43,7 +54,7 @@ ...@@ -43,7 +54,7 @@
}, },
data() { data() {
return { return {
titleList: ['购买明细', '阅读明细', '购买订单']
}; };
}, },
mounted() { mounted() {
...@@ -53,23 +64,20 @@ ...@@ -53,23 +64,20 @@
}, },
methods: { methods: {
cklink() { link(val, value, list) {
console.log(val, value, 5141548)
}, let dataList = list.children
link(val, value) {
console.log(val, value, 1515)
let dataList = value.children
for (var i = 0; i < dataList.length; i++) { for (var i = 0; i < dataList.length; i++) {
if (val == dataList[i].value) { if (val == dataList[i].name) {
console.log(dataList[i], 54854) if (this.titleList.includes(val)) {
if (val == '阅读明细' || val == '购买明细') { if (value > 0) {
uni.navigateTo({ uni.navigateTo({
url: dataList[i].link url: dataList[i].link
}) })
}
} else { } else {
uni.showModal({ uni.showModal({
title: '分享链接', title: val,
content: dataList[i].value, content: dataList[i].value,
showCancel: false, showCancel: false,
success: function(res) { success: function(res) {
...@@ -81,6 +89,24 @@ ...@@ -81,6 +89,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/login/login.vue
<template> <template>
<view class="wrapper"> <view class="wrapper">
<view v-if="loginType=='resetpw'" @click="rpsdlogin()" class="psdlogin">
<image style="width: 40rpx;height: 40rpx;" src="../../static/rpsloging.png" mode=""></image>
</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>欢迎登录使用CFFP</view> <view>欢迎登录使用CFFP</view>
...@@ -101,6 +104,9 @@ ...@@ -101,6 +104,9 @@
} }
}, },
methods: { methods: {
rpsdlogin(){
this.loginType= 'codelogin'
},
getFile(type){ getFile(type){
uni.navigateTo({ uni.navigateTo({
url:`/components/clause/clause?type=${type}` url:`/components/clause/clause?type=${type}`
...@@ -331,6 +337,12 @@ ...@@ -331,6 +337,12 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.psdlogin{
margin: 40rpx;
width: 40rpx;
height: 40rpx;
// background: url('../../static/rpsloging.png') no-repeat;
}
.wrapper{ .wrapper{
background: #20279B; background: #20279B;
overflow: auto; overflow: auto;
......
components/myteam/lazy-tree.vue
<template> <template>
<view class="container"> <view class="container">
<view class="d-table"> <view class="d-table">
<view class="content-box"> <!-- <view class="d-box">
<view class="content-box-title" v-for="item in datatitleList"> <view class="d-td" v-for="item in datatitleList">
<span class="">{{item}}</span> <span class="">{{item}}</span>
</view> </view>
</view> </view> -->
<view class="d-tr"> <view class="d-tr">
<!-- <view class="d-th">姓名</view> <!-- <view class="d-th">姓名</view>
<view class="d-th">年龄</view> <view class="d-th">年龄</view>
...@@ -18,34 +18,50 @@ ...@@ -18,34 +18,50 @@
<!-- :class="`padding-left-${item.level * 5 + 10}`"--> <!-- :class="`padding-left-${item.level * 5 + 10}`"-->
<view class="d-td"> <view class="d-td">
<view class="" style="display: flex;"> <view class="" style="display: flex;">
<view class=""> <!-- <view class="">
<uni-icons v-if="item.hasChildren && !treeList[0]" <uni-icons v-if="item.hasChildren && !treeList[0]"
:type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'" :type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'"
size="12"></uni-icons> size="12"></uni-icons>
</view>
<!-- r -->
<!-- item.levelCode==A1 与 item.type == 2相关项-->
<!-- c3与type1 -->
<!-- B1与type1 -->
<!-- else -->
<!-- <view @click="open(item, i)" v-if="item.level && !item.hasChildren" style="width: 24rpx;height: 26rpx;display: inline-block;"></view> -->
<!-- <view @click="open(item, i)" :class="item.levelCode == 'B1'&& item.type ==1 ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'">
</view> --> </view> -->
<!-- :class="`padding-left-${item.level * 5 + 10}`" --> <view class="d-td" v-if="item.levelCode == 'B1'&& item.itemType == '1'"
<!-- --> @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}">
<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'}"> <view class="" style="display: flex;">
<text style="color: black;">{{item.areaCenterName}}</text> <text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image>
</view>
</view>
</view> </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'}"> <view class="d-td" @click="open(item, i)"
<text style="color: #FFFFFF;">{{item.areaCenterName}}</text> 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;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image>
</view>
</view>
</view> </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'}"> <view class="d-td" @click="open(item, i)"
<text style="color: #FFFFFF;">{{item.areaCenterName}}</text> 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;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx;">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image>
</view>
</view>
</view> </view>
<view @click="open(item, i)" style="flex: 1;" v-else> <view class="d-td" @click="open(item, i)" v-else :style="{'margin-left':(item.level * 20)+'rpx'}">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
<!-- <view class="content-box-title-a" @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}"> <!-- <view class="content-box-title-a" @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}">
<text style="color: black;">{{item.name}}</text> <text style="color: black;">{{item.name}}</text>
</view> --> </view> -->
<!-- <view @click="open(item, i)" style="flex: 1;text-align: left;" class="content-box-title-a" > <!-- <view @click="open(item, i)" style="flex: 1;text-align: left;" class="content-box-title-a" >
...@@ -57,18 +73,17 @@ ...@@ -57,18 +73,17 @@
<view @click="open(item, i)" style="flex: 1;" v-else> <view @click="open(item, i)" style="flex: 1;" v-else>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> --> </view> -->
</view> </view>
<!-- <text v-else class=""></text> --> <!-- <text v-else class=""></text> -->
<!-- </view> --> <!-- </view> -->
</view> </view>
<view class="d-td" > <view class="d-td" style="text-align: center;">
<text v-if="item.itemType == '2'">{{ item.levelName }}</text> <text v-if="item.itemType == '2'">{{ item.levelName }}</text>
<text v-else></text> <text v-else></text>
</view> </view>
<view class="d-td" style="padding-right: 10rpx;">{{ item.count }}</view> <view class="d-td" style="text-align: center;">{{ item.count }}</view>
</view> </view>
</block> </block>
</view> </view>
...@@ -113,7 +128,7 @@ ...@@ -113,7 +128,7 @@
computed: {}, computed: {},
data() { data() {
return { return {
pleft:'60rpx', pleft: '60rpx',
list: [], list: [],
openList: [], // 被展开数组 openList: [], // 被展开数组
lazyList: [], // 加载数组 lazyList: [], // 加载数组
...@@ -205,7 +220,7 @@ ...@@ -205,7 +220,7 @@
this.openList = list; this.openList = list;
}, },
async open(item, index) { async open(item, index) {
if(item.itemType == '2'){ if (item.itemType == '2') {
return false return false
} }
try { try {
...@@ -339,36 +354,40 @@ ...@@ -339,36 +354,40 @@
display: flex; display: flex;
font-weight: 600; font-weight: 600;
align-items: center; align-items: center;
// padding: 0 20rpx;
justify-content: space-between; justify-content: space-between;
} }
.content-box-title { .content-box-title {
// padding: 5px 0; // padding: 5px 0;
flex: 1; flex: 1;
justify-content: space-between; // justify-content: space-between;
align-items: center; align-items: center;
text-align: center; text-align: left;
padding: 0 20rpx;
} }
.content-box-title-a {
flex: 1; .d-box {
display: flex;
justify-content: space-between;
// padding: 0 20rpx;
font-size: 26rpx; font-size: 26rpx;
max-width: 246rpx; .d-td {
min-height: 60rpx; align-items: center;
margin-top: 5rpx; padding: 5rpx 10rpx;
line-height: 50rpx; }
background: url('../../static/myteam/Group1662.png') no-repeat;
background-size: 100%;
} }
.content-box-title-b {
flex: 1; .content-box-title-a {
// flex: 1;
// padding: 0 20rpx;
font-size: 26rpx; font-size: 26rpx;
max-width: 246rpx; max-width: 246rpx;
min-height: 60rpx; min-height: 60rpx;
margin-top: 5rpx; margin-top: 5rpx;
line-height: 50rpx; line-height: 50rpx;
background: url('../../static/myteam/Group1660.png') no-repeat;
background-size: 100%;
} }
.test { .test {
position: relative; position: relative;
width: 160rpx; width: 160rpx;
...@@ -408,24 +427,7 @@ ...@@ -408,24 +427,7 @@
border-bottom-color: transparent; border-bottom-color: transparent;
} }
} }
.d-box {
display: flex;
justify-content: space-between;
.d-header {
text-align: center;
font-size: 26rpx;
}
.d-td {
flex: 1;
font-size: 26rpx;
min-height: 60rpx;
margin-top: 5rpx;
line-height: 60rpx;
// padding: 10rpx 0;
}
}
.d-tr { .d-tr {
display: flex; display: flex;
......
components/uploadFile/uploadFile.vue
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
instantly: true, instantly: true,
// 必传宽高且宽高应与slot宽高保持一致 // 必传宽高且宽高应与slot宽高保持一致
width: '100%', width: '100%',
height: '100rpx', height: '320rpx',
// 限制允许选择的格式，空串=不限制，默认为空png,jpg,mp4,pdf,.docx // 限制允许选择的格式，空串=不限制，默认为空png,jpg,mp4,pdf,.docx
formats: this.deformats, formats: this.deformats,
// 文件上传大小限制 // 文件上传大小限制
......
pages/application-process/bank-card.vue
...@@ -104,9 +104,7 @@ ...@@ -104,9 +104,7 @@
} }
this.applyParam = { this.applyParam = {
...this.applyParam, ...this.applyParam,
applyType:2,
operatStep:5, operatStep:5,
userId:uni.getStorageSync('cffp_userId'),
} }
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){ if(res['success']){
......
pages/application-process/basic-info.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>所属组织</text> <text>所属组织</text>
<input type="text" v-if="applyParam.hasCrossDistrict == 1" class="form-control" v-model="applyParam.areaName" placeholder="请输入工作室名称" <input type="text" v-if="applyParam.applyType == 1" class="form-control" v-model="applyParam.areaName" placeholder="请输入工作室名称"
:disabled="this.display"/> :disabled="this.display"/>
<picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys" <picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys"
range-key="areaName" range-key="areaName"
...@@ -159,9 +159,9 @@ ...@@ -159,9 +159,9 @@
partnerLevelName: null, partnerLevelName: null,
name: null, name: null,
mobile: null, mobile: null,
userId:uni.getStorageSync('cffp_userId'),
shareId: null, shareId: null,
display: false, display: false,
hasCrossDistrict:'',
cffp_userInfo: { cffp_userInfo: {
name: '', name: '',
mobile: '' mobile: ''
...@@ -170,9 +170,7 @@ ...@@ -170,9 +170,7 @@
}, },
components: {}, components: {},
onLoad(options) { onLoad(options) {
console.log( options, 151551)
if (options.shareId) { if (options.shareId) {
this.hasCrossDistrict = options.hasCrossDistrict
this.shareId = options.shareId this.shareId = options.shareId
uni.setStorageSync('applyId', '') uni.setStorageSync('applyId', '')
} else { } else {
...@@ -214,8 +212,7 @@ ...@@ -214,8 +212,7 @@
}, },
queryOrgList() { queryOrgList() {
const param = { const param = {
userId: uni.getStorageSync('cffp_userId'), userId:uni.getStorageSync('H5_cffpUserId') ? uni.getStorageSync('H5_cffpUserId') :this.userId,
// userId:1,
partnerLevel: this.applyParam.partnerLevel partnerLevel: this.applyParam.partnerLevel
} }
console.log(param) console.log(param)
...@@ -307,6 +304,7 @@ ...@@ -307,6 +304,7 @@
if (res['success']) { if (res['success']) {
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
this.queryOrgList(); this.queryOrgList();
for (let m = 0; m < this.identityArr.length; m++) { for (let m = 0; m < this.identityArr.length; m++) {
if (this.applyParam.partnerLevel == this.identityArr[m].partnerLevel) { if (this.applyParam.partnerLevel == this.identityArr[m].partnerLevel) {
this.identityIdx = m; this.identityIdx = m;
...@@ -398,7 +396,7 @@ ...@@ -398,7 +396,7 @@
...this.applyParam, ...this.applyParam,
applyType: this.applyParam.inviterInvitationCode? '1': '2', applyType: this.applyParam.inviterInvitationCode? '1': '2',
operatStep: 1, operatStep: 1,
userId: uni.getStorageSync('cffp_userId'), userId:uni.getStorageSync('H5_cffpUserId') ? uni.getStorageSync('H5_cffpUserId') : this.userId,
hasCrossDistrict: this.applyParam.hasCrossDistrict?this.applyParam.hasCrossDistrict: '0' hasCrossDistrict: this.applyParam.hasCrossDistrict?this.applyParam.hasCrossDistrict: '0'
} }
api.saveApplyInfo(this.applyParam).then((res) => { api.saveApplyInfo(this.applyParam).then((res) => {
......
pages/application-process/education.vue
...@@ -161,9 +161,7 @@ ...@@ -161,9 +161,7 @@
} }
this.applyParam = { this.applyParam = {
...this.applyParam, ...this.applyParam,
applyType:2,
operatStep:4, operatStep:4,
userId:uni.getStorageSync('cffp_userId'),
} }
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){ if(res['success']){
......
pages/application-process/id-card.vue
...@@ -139,9 +139,7 @@ ...@@ -139,9 +139,7 @@
} }
this.applyParam = { this.applyParam = {
...this.applyParam, ...this.applyParam,
applyType:2,
operatStep:3, operatStep:3,
userId:uni.getStorageSync('cffp_userId'),
} }
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){ if(res['success']){
......
pages/application-process/work-experience.vue
...@@ -171,9 +171,7 @@ ...@@ -171,9 +171,7 @@
} }
this.applyParam = { this.applyParam = {
...this.applyParam, ...this.applyParam,
applyType:2,
operatStep:2, operatStep:2,
userId:uni.getStorageSync('cffp_userId'),
certificate:this.picList.join(',') certificate:this.picList.join(',')
} }
console.log(this.applyParam) console.log(this.applyParam)
......
pages/certifyDetail/uploadinformation.vue
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
</view> </view>
<view class="uploadpdf"> <view class="uploadpdf">
<view class="uploadimg"> <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;"> <view class="" style="width: 50px;">
<image class="image" src="../../static/myteam/Group1646.png"></image> <image class="image" src="../../static/myteam/Group1646.png"></image>
</view> </view>
<p>点击添加计划书</p> <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>
<view class="footer-text"> <view class="footer-text">
<text>(请上传pdf文件)</text> <text>(请上传pdf文件)</text>
...@@ -149,16 +149,16 @@ ...@@ -149,16 +149,16 @@
api.uploadSignUpUserInfo(requestVo).then(res => { api.uploadSignUpUserInfo(requestVo).then(res => {
if(res['success']){ if(res['success']){
// //
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
});
setTimeout(()=>{ setTimeout(()=>{
uni.navigateBack(1) uni.navigateBack(1)
},1000) },1000)
//this.getquerySignUpInfo() //this.getquerySignUpInfo()
} }
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
});
this.loading = false this.loading = false
}) })
}, },
......
pages/commonDetail/commonDetail.vue
...@@ -35,16 +35,17 @@ ...@@ -35,16 +35,17 @@
readId:this.readId?this.readId:undefined readId:this.readId?this.readId:undefined
} }
api[obj.req](params).then(res=>{ api[obj.req](params).then(res=>{
console.log(res)
if(res['success']){ if(res['success']){
const r = res['data'][obj.result]; const r = res['data'][obj.result];
if(r && r.length>0){ if(r && r.length>0){
for(let i=0;i<r.length;i++){ 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++){ 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']; 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){ if(this.lists[i]['children'][m].needParam){
this.lists[i]['children'][m]['link'] += r[i][obj.id] 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 @@ ...@@ -76,10 +77,11 @@
req:'userShareLinkList', req:'userShareLinkList',
result:'userShareLinks', result:'userShareLinks',
id:'shareId', id:'shareId',
readCount:'readCount',
children:[ children:[
{no:1,name:'分享时间',width: '40%',value:'',link:null,alias:'shareDate'}, {no:1,name:'分享时间',width: '40%',value:'',link:null,alias:'shareDate'},
{no:2,name:'分享链接',width: '35%',value:'',link:null,alias:'shareUrl'}, {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 @@ ...@@ -96,11 +98,12 @@
req:'userShareReadList', req:'userShareReadList',
result:'userShareReads', result:'userShareReads',
id:'readId', id:'readId',
buyCount:'buyCount',
children:[ children:[
{no:1,name:'用户',width: '20%',value:'',link:null,alias:'readName'}, {no:1,name:'用户',width: '20%',value:'',link:null,alias:'readName'},
{no:2,name:'阅读链接',width: '30%',value:'',link:null,alias:'readUrl'}, {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: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
...@@ -21,16 +21,23 @@ ...@@ -21,16 +21,23 @@
</view> </view>
<!-- 课程banner图 --> <!-- 课程banner图 -->
<!-- v-show="!sliceshare" --> <!-- v-show="!sliceshare" -->
<view class="courseBannerBox" v-show="!sliceshare"> <view class="courseBannerBox" v-if="!sliceshare">
<video id="myVideo" :src="courseInfo.filePathOss" :initial-time="videoPlaybackInfo.maxViewTime" <template v-if="isRenderVideo">
object-fit="contain" class="videoBox" :poster="courseInfo.fileFirstImage" :title="courseInfo.fileTitle" <view>
@loadedmetadata="loadedmetadata" @play="playVideo" @pause="pause" @ended="ended" <video id="myVideo" :src="courseInfo.filePathOss" :initial-time="videoPlaybackInfo.maxViewTime"
@timeupdate="timeupdate"></video> object-fit="contain" class="videoBox" :poster="courseInfo.fileFirstImage" :title="courseInfo.fileTitle"
@loadedmetadata="loadedmetadata" @play="playVideo" @pause="pause" @ended="ended"
@timeupdate="timeupdate"></video>
</view>
</template>
</view> </view>
<!-- 课程详情图 --> <!-- 课程详情图 -->
<view class="courseTitleContent"> <view class="courseTitleContent">
<view class="courseTitle"> <view class="courseTitle">
<h4>{{courseInfo.fileTitle}}</h4> <view class="" style="width: 70%;">
<h4>{{courseInfo.fileTitle}}</h4>
</view>
<view class="shareF"> <view class="shareF">
<view class="awakenApp" @click="jumpapp()" v-if="coursesharing == 1"> <view class="awakenApp" @click="jumpapp()" v-if="coursesharing == 1">
<view class="" style="width: 50rpx; height: 50rpx;"> <view class="" style="width: 50rpx; height: 50rpx;">
...@@ -43,7 +50,7 @@ ...@@ -43,7 +50,7 @@
<view class="dataBox"> <view class="dataBox">
<strong v-if="courseInfo.status==1">￥{{courseInfo.coursePrice}}</strong> <strong v-if="courseInfo.status==1">￥{{courseInfo.coursePrice}}</strong>
<text v-if="courseInfo.status==2" style="color: #F15A1F;margin-right: 20rpx;"><i <text v-if="courseInfo.status==2" style="color: #F15A1F;margin-right: 20rpx;"><i
class="iconfont icon-yifukuan"></i>已购</text> class="iconfont icon-yifukuan"></i>已购{{videoPlaybackInfo.maxViewTime}}</text>
<text>{{courseInfo.salesNumber}}人购买</text> <text>{{courseInfo.salesNumber}}人购买</text>
</view> </view>
...@@ -73,6 +80,7 @@ ...@@ -73,6 +80,7 @@
<view class="courseInfoContent"> <view class="courseInfoContent">
<h4>{{index + 1}}.{{item.fileTitle}}<text <h4>{{index + 1}}.{{item.fileTitle}}<text
class="courseType">{{item.fileType=='1' ? '必修' : '选修'}}</text></h4> class="courseType">{{item.fileType=='1' ? '必修' : '选修'}}</text></h4>
<view class="timeContent"> <view class="timeContent">
<view class=""> <view class="">
{{secondsTransferPipe(Number(item.maxViewTime))}}/{{secondsTransferPipe(Number(item.courseTotalTime))}} {{secondsTransferPipe(Number(item.maxViewTime))}}/{{secondsTransferPipe(Number(item.courseTotalTime))}}
...@@ -110,6 +118,7 @@ ...@@ -110,6 +118,7 @@
<view class="buyBox" @click="saveOrder()" v-if="courseInfo.status == 1"> <view class="buyBox" @click="saveOrder()" v-if="courseInfo.status == 1">
<text>{{loginType=='visitor' ? '登录/注册' : '购买'}}</text> <text>{{loginType=='visitor' ? '登录/注册' : '购买'}}</text>
</view> </view>
</view> </view>
</view> </view>
<boot-page v-if="sharelogin" ref="sharelogin" @close="close"></boot-page> <boot-page v-if="sharelogin" ref="sharelogin" @close="close"></boot-page>
...@@ -135,6 +144,7 @@ ...@@ -135,6 +144,7 @@
}, },
data() { data() {
return { return {
isRenderVideo:false,
fileId: null, fileId: null,
lecturerId: null, lecturerId: null,
tabType: 3, tabType: 3,
...@@ -176,8 +186,7 @@ ...@@ -176,8 +186,7 @@
this.userId = val this.userId = val
// uni.setStorageSync('cffp_userId', this.userId); // uni.setStorageSync('cffp_userId', this.userId);
localStorage.setItem('h5_userId', this.userId) localStorage.setItem('h5_userId', this.userId)
this.coursesharing = null this.getuserRead(1)
this.getuserRead()
} else { } else {
this.sharelogin = false this.sharelogin = false
} }
...@@ -251,7 +260,6 @@ ...@@ -251,7 +260,6 @@
url: '/components/login/login' url: '/components/login/login'
}) })
} else { } else {
// let h5userId = uni.getStorageSync('h5_userId')
if (this.coursesharing == '1') { if (this.coursesharing == '1') {
this.h5jump() this.h5jump()
} else { } else {
...@@ -261,7 +269,6 @@ ...@@ -261,7 +269,6 @@
}, },
h5jump() { h5jump() {
let h5userId = localStorage.getItem('h5_userId') let h5userId = localStorage.getItem('h5_userId')
console.log(h5userId, 26251)
if (h5userId) { if (h5userId) {
this.jumppurchase() this.jumppurchase()
} else { } else {
...@@ -272,7 +279,8 @@ ...@@ -272,7 +279,8 @@
const param = { const param = {
productType: '1', productType: '1',
productId: this.courseInfo.fileId, 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, shareUserId: this.shareUserId,
shareReadId: this.shareReadId, shareReadId: this.shareReadId,
shareCode: this.shareCode, shareCode: this.shareCode,
...@@ -282,8 +290,11 @@ ...@@ -282,8 +290,11 @@
console.log(res, 545415) console.log(res, 545415)
if (res['success']) { if (res['success']) {
this.orderId = res['data']['id']; this.orderId = res['data']['id'];
if(this.coursesharing == '1'){
this.userId = localStorage.getItem('h5_userId')?localStorage.getItem('h5_userId'): this.userId
}
uni.navigateTo({ uni.navigateTo({
url: `/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}` url: `/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}&userId=${this.userId}`
}) })
} else { } else {
uni.showToast({ uni.showToast({
...@@ -329,13 +340,12 @@ ...@@ -329,13 +340,12 @@
'cffp_userId'), 'cffp_userId'),
packFileId: this.courseInfo.packFileId packFileId: this.courseInfo.packFileId
}).then(res => { }).then(res => {
console.log('详情页面--res', res, 1251255)
if (res['success']) { if (res['success']) {
this.courseInfo = res['data']['data']; this.courseInfo = res['data']['data'];
this.lecturerId = res['data']['data']['fileLecturerId']; this.lecturerId = res['data']['data']['fileLecturerId'];
this.lecturerQuery(); this.lecturerQuery();
if (this.courseInfo.status === 2) { if (this.courseInfo.status === 2) {
this.findVideoPlayback() this.findVideoPlayback();
} }
} }
}) })
...@@ -344,6 +354,9 @@ ...@@ -344,6 +354,9 @@
relatedCoursesList() { relatedCoursesList() {
api.relatedCoursesList({ api.relatedCoursesList({
fileId: this.fileId, fileId: this.fileId,
userId: this.coursesharing == '1' ? uni.getStorageSync('h5_userId') : uni.getStorageSync(
'cffp_userId'),
orderId: this.courseInfo.orderId,
packFileId: this.courseInfo.packFileId packFileId: this.courseInfo.packFileId
}).then(res => { }).then(res => {
console.log('相关课程详情', res); console.log('相关课程详情', res);
...@@ -397,9 +410,10 @@ ...@@ -397,9 +410,10 @@
systemType: 1, systemType: 1,
userId: this.userId, userId: this.userId,
fileId: this.fileId, fileId: this.fileId,
packFileId: this.courseInfo.packFileId packFileId: this.courseInfo.packFileId,
} }
api.findVideoPlayback(param).then(res => { api.findVideoPlayback(param).then(res => {
this.isRenderVideo = true;
if (res['success']) { if (res['success']) {
this.videoPlaybackInfo = res['data'] this.videoPlaybackInfo = res['data']
} }
...@@ -464,7 +478,7 @@ ...@@ -464,7 +478,7 @@
} }
}, },
// 用户阅读 // 用户阅读
getuserRead() { getuserRead(type) {
let UserReadRequestVO = { let UserReadRequestVO = {
userId: this.userId ? this.userId : '', userId: this.userId ? this.userId : '',
serialsNo: this.serialsNo || 1, serialsNo: this.serialsNo || 1,
...@@ -474,10 +488,9 @@ ...@@ -474,10 +488,9 @@
api.userRead(UserReadRequestVO).then(res => { api.userRead(UserReadRequestVO).then(res => {
if (res['success']) { if (res['success']) {
this.shareReadId = res.data.id this.shareReadId = res.data.id
if (uni.getStorageSync('h5_userId')) { if (type == 1) {
this.jumppurchase() this.jumppurchase()
} }
} }
}) })
}, },
...@@ -494,8 +507,8 @@ ...@@ -494,8 +507,8 @@
// }, // },
}, },
onLoad(option) { onLoad(option) {
console.log(option, 1541515)
this.fileId = option.fileId; this.fileId = option.fileId;
this.courseInfo.packFileId = option.packFileId
if (option.coursesharing) { if (option.coursesharing) {
this.userId = '' this.userId = ''
this.coursesharing = option.coursesharing this.coursesharing = option.coursesharing
...@@ -504,9 +517,9 @@ ...@@ -504,9 +517,9 @@
this.shareUserId = option.shareUserId this.shareUserId = option.shareUserId
this.getuserRead() this.getuserRead()
let endTime = Date.parse(new Date()) / 1000; let endTime = Date.parse(new Date()) / 1000;
let startTime = localStorage.getItem('h5_startTime') let startTime = localStorage.getItem('h5_startTime')
if (endTime - startTime > 3600 * 24) { if (endTime - startTime > 3600 * 24) {
this.userId = '' localStorage.setItem('h5_userId', '')
} }
uni.setStorageSync('h5_coursesharing', this.coursesharing); uni.setStorageSync('h5_coursesharing', this.coursesharing);
// this.getshareData() // this.getshareData()
...@@ -752,6 +765,8 @@ ...@@ -752,6 +765,8 @@
justify-content: space-between; justify-content: space-between;
.courseInfoContent { .courseInfoContent {
width: 75%;
h4 { h4 {
color: #666; color: #666;
} }
......
pages/dropLists/dropLists.vue
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
<text>{{item.itemName}}</text> <text>{{item.itemName}}</text>
</view> </view>
<view class="ulBox"> <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>退课积分:</text>
<text>{{Math.abs(item.commissionAmount)}}</text> <text>{{Math.abs(item.commissionAmount)}}</text>
</view> </view>
...@@ -24,6 +20,10 @@ ...@@ -24,6 +20,10 @@
<text>{{item.commissionTypeContent}}</text> <text>{{item.commissionTypeContent}}</text>
</view> </view>
<view class="ulBox"> <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>退课时间:</text>
<text>{{item.refundTime}}</text> <text>{{item.refundTime}}</text>
</view> </view>
......
pages/index/index.vue
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
name: '邀请加盟', name: '邀请加盟',
icon: 'shareJoin', icon: 'shareJoin',
link: '/pages/inviteJoin/inviteJoin', link: '/pages/inviteJoin/inviteJoin',
isOpen: true isOpen: true,
isJoin: true
}, },
{ {
key: '05', key: '05',
...@@ -171,20 +172,18 @@ ...@@ -171,20 +172,18 @@
}) })
}, },
featureSelect(featureItem) { featureSelect(featureItem) {
console.log(featureItem) console.log(this.cffpUserInfo, 1544)
if (featureItem.isOpen && featureItem.link) { if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') {
if (this.cffpUserInfo.partnerType) { uni.showToast({
uni.navigateTo({ title: "您本人尚未加盟，您加盟后可邀请加盟",
url: featureItem.link duration: 2000,
}) icon: 'none'
}else { });
uni.showToast({ return false
title: "您本人尚未加盟，您加盟后可邀请加盟", } else if (featureItem.isOpen && featureItem.link) {
duration: 2000, uni.navigateTo({
icon: 'none' url: featureItem.link
}); })
return false
}
} else { } else {
uni.showToast({ uni.showToast({
title: '此功能暂未开放，敬请期待。', title: '此功能暂未开放，敬请期待。',
...@@ -329,7 +328,7 @@ ...@@ -329,7 +328,7 @@
margin: 10px 2%; margin: 10px 2%;
image { image {
max-width: 80%; max-width: 80%;
} }
} }
} }
......
pages/invitationRegister/invitationRegister.vue
...@@ -26,11 +26,9 @@ ...@@ -26,11 +26,9 @@
levelaName:'', levelaName:'',
mobileNumber:'', mobileNumber:'',
name:'', name:'',
hasCrossDistrict:''
} }
}, },
onLoad(options) { onLoad(options) {
this.hasCrossDistrict = options.hasCrossDistrict
this.shareId = options.shareId this.shareId = options.shareId
this.invitationCode = options.invitationCode this.invitationCode = options.invitationCode
this.getqueryById() this.getqueryById()
...@@ -55,7 +53,7 @@ ...@@ -55,7 +53,7 @@
// };' // };'
uni.navigateTo({ 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 + '&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 @@ ...@@ -47,7 +47,6 @@
remainTimes:60, remainTimes:60,
sendCodeHtml:'获取验证码', sendCodeHtml:'获取验证码',
userId: '', userId: '',
hasCrossDistrict:'',
form:{ form:{
name: '', name: '',
mobile: '', mobile: '',
...@@ -56,7 +55,6 @@ ...@@ -56,7 +55,6 @@
} }
}, },
onLoad(options) { onLoad(options) {
this.hasCrossDistrict = options.hasCrossDistrict
this.form.name = options.name?options.name:'' this.form.name = options.name?options.name:''
this.form.mobile = options.mobile? options.mobile: '' this.form.mobile = options.mobile? options.mobile: ''
this.form.id = options.shareId?options.shareId:'' this.form.id = options.shareId?options.shareId:''
...@@ -124,8 +122,9 @@ ...@@ -124,8 +122,9 @@
console.log(res, 5454) console.log(res, 5454)
this.userId = String(res['data']['userId']); this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1') uni.setStorageSync('isLogin','1')
uni.setStorageSync('H5_cffpUserId', this.userId)
uni.navigateTo({ 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{ }else{
uni.showToast({ uni.showToast({
......
pages/inviteJoin/inviteJoin.vue
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline", scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
type: 0, type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" + 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家庭财务策划师联盟邀您加入", title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`, summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg", imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
......
pages/learningStatistics/learningStatistics.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<view class="progressDetailBox"> <view class="progressDetailBox">
<view class="progressTitleBox"> <view class="progressTitleBox">
<h4><i class="iconfont icon-shalou"></i>进度明细</h4> <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> </view>
<template v-if="state.package"> <template v-if="state.package">
<view class="progressItemBox" v-for="(item,index) in userStudyCountList.barInfos" :key="index"> <view class="progressItemBox" v-for="(item,index) in userStudyCountList.barInfos" :key="index">
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</view> </view>
<view class="progressBottomBox"> <view class="progressBottomBox">
<text>{{item.fileTitle}}</text> <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>
</view> </view>
<!-- 小课 --> <!-- 小课 -->
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
.progressLine{ .progressLine{
position: relative; position: relative;
width: 90%; width: 90%;
height: 60rpx; height: 50rpx;
border-radius: 36rpx; border-radius: 36rpx;
border: 4rpx solid #0867F5; border: 4rpx solid #0867F5;
margin: 0 20rpx; margin: 0 20rpx;
......
pages/myLearning/myLearning.vue
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
}, },
viewDetail(item){ viewDetail(item){
uni.navigateTo({ uni.navigateTo({
url:`/pages/courseDetail/courseDetail?fileId=${item.fileId}` url:`/pages/courseDetail/courseDetail?fileId=${item.fileId}&packFileId=${item.packFileId}`
}) })
} }
}, },
......
pages/myPoints/pointsDetail.vue
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
// 查看订单详情 // 查看订单详情
viewDetail(id){ viewDetail(id){
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${id}&commissionType=${this.commissionType}` url:`/pages/orderDetail/orderDetail?id=${id}&commissionType=${this.commissionType}&type=drop`
}) })
} }
} }
......
pages/orderStatus/orderStatus.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
viewDetail(){ viewDetail(){
// 查看详情 // 查看详情
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${this.orderId}` url:`/pages/orderDetail/orderDetail?id=${this.orderId}&type=drop`
}) })
}, },
goToCourselist(){ goToCourselist(){
......
pages/personalCenter/accountoperation/resetpassword.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<text>{{usermobile}}</text> <text>{{usermobile}}</text>
</view> </view>
<view class="input-row"> <view class="input-row">
<input maxlength="11" type="text" v-model="form.password" placeholder="请输入新密码" /> <input maxlength="11" type="password" v-model="form.password" placeholder="请输入新密码" />
</view> </view>
<view class="input-row"> <view class="input-row">
<view style="width: 65%;"><input maxlength="11" type="text" v-model="form.code" placeholder="请输入验证码" /></view> <view style="width: 65%;"><input maxlength="11" type="text" v-model="form.code" placeholder="请输入验证码" /></view>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
data() { data() {
return { return {
form:{ form:{
mobile: "18335619247", mobile: uni.getStorageSync('user_mobile'),
code:'', code:'',
password:'', password:'',
}, },
...@@ -64,7 +64,10 @@ ...@@ -64,7 +64,10 @@
const params = { const params = {
...this.form ...this.form
} }
console.log(params) if(!common.passwordValid(this.form.password)){
common.errorDialog(2,'请输入6-12位数字字母组合');
return false;
}
api.resetPassword(params).then((res)=>{ api.resetPassword(params).then((res)=>{
if(res['success']){ if(res['success']){
uni.showToast({ uni.showToast({
......
pages/personalCenter/system/accontsetting.vue
...@@ -4,12 +4,7 @@ ...@@ -4,12 +4,7 @@
<menu-list :menuList="minorMenuLists"></menu-list> <menu-list :menuList="minorMenuLists"></menu-list>
</view> </view>
<view class="footer">
<view class="foter-btn">
<button class="btn" @click="outLing()">退出登录</button>
</view>
</view>
</view> </view>
</template> </template>
...@@ -55,42 +50,11 @@ ...@@ -55,42 +50,11 @@
} }
}, },
methods:{ methods:{
outLing(){
uni.showModal({
title: '退出登录',
content: '确定要退出登录吗?',
showCancel: true,
success: function(res) {
if (res.confirm) {
uni.clearStorageSync();
uni.reLaunch({
url:'/components/login/login'
})
uni.showToast({
title: '操作成功',
icon: 'none'
});
} else {
console.log('已取消')
}
}
});
},
} }
} }
</script> </script>
<style scoped> <style scoped>
.footer{
width: 100vw;
position: fixed;
bottom: 40rpx;
}
.foter-btn{
padding: 0 20rpx;
}
.btn{
background: #20269B;
border-radius: 40rpx;
}
</style> </style>
pages/personalCenter/system/settings.vue
<template> <template>
<view> <view style="display: flex;flex-direction: column;">
<menu-list v-if="menuList != 'undefined '" :menuList="minorMenuLists"></menu-list> <view>
<menu-list v-if="menuList != 'undefined '" :menuList="minorMenuLists"></menu-list>
</view>
<view class="footer">
<view class="foter-btn">
<button class="btn" @click="outLing()">退出登录</button>
</view>
</view>
</view> </view>
</template> </template>
<script> <script>
...@@ -37,9 +46,45 @@ import MenuList from "@/components/menuList/menuList.vue" ...@@ -37,9 +46,45 @@ import MenuList from "@/components/menuList/menuList.vue"
}, },
] ]
} }
} },
methods:{
outLing(){
uni.showModal({
title: '退出登录',
content: '确定要退出登录吗?',
showCancel: true,
success: function(res) {
if (res.confirm) {
uni.clearStorageSync();
uni.reLaunch({
url:'/components/login/login'
})
uni.showToast({
title: '操作成功',
icon: 'none'
});
} else {
console.log('已取消')
}
}
});
},
},
} }
</script> </script>
<style> <style scoped>
.footer{
width: 100vw;
position: fixed;
bottom: 40rpx;
}
.foter-btn{
padding: 0 20rpx;
}
.btn{
background: #20269B;
border-radius: 40rpx;
}
</style> </style>
pages/personalCenter/teamMembers/jurisdiction.vue
...@@ -10,6 +10,17 @@ ...@@ -10,6 +10,17 @@
合计：{{item.rank}} 合计：{{item.rank}}
</view> </view>
<view class=""> <view class="">
<view class="d-box">
<view class="d-td">
<text>辖下组织/成员</text>
</view>
<view class="d-td">
<text>职级</text>
</view>
<view class="d-td">
<text>成员数量</text>
</view>
</view>
<lazy-tree :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree> <lazy-tree :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree>
<!-- <myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> --> <!-- <myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> -->
<!-- <view class="table-content"> <!-- <view class="table-content">
...@@ -102,6 +113,23 @@ ...@@ -102,6 +113,23 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.d-box {
display: flex;
justify-content: space-between;
// padding: 0 20rpx;
font-size: 32rpx;
font-weight: 600;
.d-header {
text-align: center;
font-size: 26rpx;
}
.d-td {
align-items: center;
padding: 5rpx 10rpx;
}
}
.concent-title{ .concent-title{
width: 223px; width: 223px;
height: 40px; height: 40px;
......
pages/personalCenter/teamMembers/members.vue
<template> <template>
<view class="content"> <view class="content">
<view class="content-header"> <view class="content-header" v-if="levelName">
<view class="concent-title"> <view class="concent-title">
<text class="concent-text">{{levelName}}</text> <text class="concent-text">{{levelName}}</text>
</view> </view>
...@@ -10,6 +10,20 @@ ...@@ -10,6 +10,20 @@
</view> </view>
<view class=""> <view class="">
<view class="d-box">
<!-- <view class="d-td" v-for="item in datatitleList">
<span class="">{{item}}</span>
</view> -->
<view class="d-td">
<text>辖下组织/成员</text>
</view>
<view class="d-td">
<text>职级</text>
</view>
<view class="d-td">
<text>成员数量</text>
</view>
</view>
<lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree> <lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree>
<!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> --> <!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> -->
</view> </view>
...@@ -69,6 +83,23 @@ ...@@ -69,6 +83,23 @@
background: url('../../../static/Group 1623.png'); background: url('../../../static/Group 1623.png');
background-size: auto 100%; background-size: auto 100%;
} }
.d-box {
display: flex;
justify-content: space-between;
// padding: 0 20rpx;
font-size: 32rpx;
font-weight: 600;
.d-header {
text-align: center;
font-size: 26rpx;
}
.d-td {
align-items: center;
padding: 5rpx 10rpx;
}
}
.concent-text{ .concent-text{
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;
......
uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
text: '搜索', text: '搜索',
icon: 'iconfont icon-sousuo', icon: 'iconfont icon-sousuo',
name: 'searh', name: 'searh',
link:'/pages/index/index' link:'/pages/courselist/courselist'
}, },
{ {
text: '我的', 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