Skip to content

C
CFFP-HB
Commit 3376ea39 by sunerhu
Options

修改了一些Bug

parent ab8ed886
Showing with 117 additions and 75 deletions
api/api.ts
...@@ -229,6 +229,10 @@ export default { ...@@ -229,6 +229,10 @@ export default {
queryMyTeamInfo(params){ queryMyTeamInfo(params){
return request(`${cffpURL}/orgInfo/queryMyTeamInfo`, "POST", params) return request(`${cffpURL}/orgInfo/queryMyTeamInfo`, "POST", params)
}, },
// 我的团队展开
queryTeamDetail(params){
return request(`${cffpURL}/orgInfo/teamDetail`, "POST", params)
},
// 学习统计 // 学习统计
userStudyCount(params){ userStudyCount(params){
return request(`${cffpURL}/study/userStudyCount`, "POST", params) return request(`${cffpURL}/study/userStudyCount`, "POST", params)
......
components/myteam/myteam-table.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<view class="content-sam-box"> <view class="content-sam-box">
<view class="" v-for="(pointItem,index) in dataList" :key="index"> <view class="" v-for="(pointItem,index) in dataList" :key="index">
<view class="" style="display: flex;" v-if="type == '1'"> <view class="" style="display: flex;" v-if="type == '1'">
<view class="content-box-title" v-if="pointItem.name" @click="subordinate(index,pointItem)"> <view class="content-box-title" v-if="pointItem.name" @click="subordinate(index,pointItem,1)">
<span>{{pointItem.name}}</span> <span>{{pointItem.name}}</span>
</view> </view>
<view class="content-box-title" v-if="pointItem.levelName"> <view class="content-box-title" v-if="pointItem.levelName">
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<view class="content-box-title" v-if="pointItem.levelName"> <view class="content-box-title" v-if="pointItem.levelName">
<span>{{pointItem.levelName}}</span> <span>{{pointItem.levelName}}</span>
</view> </view>
<view class="content-box-title" v-if="pointItem.courserNum !=null"> <view class="content-box-title">
<span>{{pointItem.courserNum}}</span> <span>{{pointItem.courserNum || '0'}}</span>
</view> </view>
</view> </view>
<view class="" style="display: flex;" v-if="type == '3'"> <view class="" style="display: flex;" v-if="type == '3'">
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<!-- 二级循环 --> <!-- 二级循环 -->
<view class="" v-if="table_index == index && this.tableone == true && pointItem.levelCode != 'A1'"> <view class="" v-if="table_index == index && this.tableone == true && pointItem.levelCode != 'A1'">
<view class="" v-for="(itq, index) in dtList"> <view class="" v-for="(itq, index) in twoList" :key="index">
<view style="display: flex;"> <view style="display: flex;">
<view class="content-box-title-a" @click="cktable(itq)"> <view class="content-box-title-a" @click="subordinate(index,itq,2)">
<span style="color: #FFFFFF;font-weight: 400;">{{itq.name}}</span> <span style="color: #FFFFFF;font-weight: 400;">{{itq.name}}</span>
</view> </view>
<view class="content-box-title"> <view class="content-box-title">
<span>{{itq.name}}</span> <!-- <span>{{itq.levelName}}</span> -->
</view> </view>
<view class="content-box-title"> <view class="content-box-title">
<span>{{itq.name}}</span> <span>{{itq.name}}</span>
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
</view> </view>
<!-- 三级循环 --> <!-- 三级循环 -->
<view class="" v-if="tablesubordinate == itq.id"> <view class="" v-if="threeindex == index && this.tablethree == true ">
<view class="" v-for="(itq, index) in dtList"> <view class="" v-for="(itq, index) in threeList">
<span>{{itq.name}}</span> <span>{{itq.name}}</span>
</view> </view>
</view> </view>
...@@ -89,48 +89,68 @@ ...@@ -89,48 +89,68 @@
type: String, type: String,
default: null default: null
}, },
type:{ type: {
type: String ,// 这里用来去区分是哪个页面传来的值 1直属团队 2.所辖团队 3.其他团队 type: String, // 这里用来去区分是哪个页面传来的值 1直属团队 2.所辖团队 3.其他团队
default: null default: null
}, },
}, },
name: "myteam-table", name: "myteam-table",
data() { data() {
return { return {
table_index: '', // 第一级 table_index: '', // 第二级
tableone: false, tableone: false,
tablesubordinate:'', // 第二级 threeindex: '',
dataFoList:[], tablethree: false, // 第三层收起
dataFoList: [],
twoList: [],
threeList: []
}; };
}, },
mounted() { mounted() {
console.log(this.type, 774557)
// if(this.type == 1){
// this.dataFoList = this.dataList.map((x,index) => ({
// name:x.name
// par:x.levelName
// data: x.courserNum
// }))
// }
}, },
methods: { methods: {
cktable(e) { subordinate(index, val, type) {
this.tablesubordinate = e.id console.log(index, 444)
}, if (this.tabletype == 1 || val.levelCode == 'A1') {
subordinate(index,val) {
console.log(val.levelCode, 7744)
if(this.tabletype == 1 || val.levelCode == 'A1') {
return return
} else { } else {
this.tableone = this.table_index == index ? !this.tableone : true let CffpOrgInfoReqVO = {
this.table_index = index id: val.id
api.userStudyCount().then(res=>{ }
console.log(res, 4455) api.queryTeamDetail(CffpOrgInfoReqVO).then(res => {
if (res['success']) {
this.listtype(index, type, res.data.list)
}
}) })
} }
}, },
listtype(index, val, list) {
console.log(index, val, list, 78787)
switch (val) {
case 1:
this.tableone = this.table_index == index ? !this.tableone : true
this.table_index = index
this.twoList = list
break
case 2:
console.log(!this.tablethree, 44114)
this.tablethree = !this.tablethree
// this.threeindex = this.threeindex == index ? !this.tablethree : true
this.threeindex = index
var list = [{
name: 5514
}]
this.threeList = list
break
// case 3:
// this.tableone = this.table_index == index ? !this.tableone : true
// this.table_index = index
// this.twoList = list
// break
}
}
} }
} }
</script> </script>
...@@ -165,9 +185,11 @@ ...@@ -165,9 +185,11 @@
.concent-footer { .concent-footer {
margin: 0 5px; margin: 0 5px;
} }
.content-box-title-a{
.content-box-title-a {
padding: 5px 0; padding: 5px 0;
flex: 1; flex: 1;
margin: 0 10px;
background: #3F52B7; background: #3F52B7;
border-radius: 5px; border-radius: 5px;
border: 1px solid #fff; border: 1px solid #fff;
......
pages/certifyDetail/uploadinformation.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<view class="" style="width: 20px;height: 30px;"> <view class="" style="width: 20px;height: 30px;">
<image class="imagegh" src="../../static/myteam/Pdf.png" mode=""></image> <image class="imagegh" src="../../static/myteam/Pdf.png" mode=""></image>
</view> </view>
<text style="margin-left: 10rpx;">{{openForm.fileName}}</text> <text style="margin-left: 10rpx;" @click="exportTo">{{openForm.fileName}}</text>
</view> </view>
<view class="uploadpdf" @click="uploadFile()"> <view class="uploadpdf" @click="uploadFile()">
<view class="uploadimg"> <view class="uploadimg">
...@@ -93,10 +93,6 @@ ...@@ -93,10 +93,6 @@
methods: { methods: {
async getquerySignUpInfo() { async getquerySignUpInfo() {
this.$refs.Loading.show()
setTimeout(() => {
this.$refs.Loading.hide()
}, 3000)
let UserSignUpInfoQueryRequestVO = { let UserSignUpInfoQueryRequestVO = {
userSignUpId:this.openForm.signupId userSignUpId:this.openForm.signupId
} }
...@@ -104,6 +100,12 @@ ...@@ -104,6 +100,12 @@
this.openForm = res.data this.openForm = res.data
this.openForm.signupId = res.data.id this.openForm.signupId = res.data.id
}, },
exportTo(){
console.log(this.openForm.planBookPdfUrl, 4451)
uni.navigateTo({
url: '/pages/personalCenter/accountoperation/phonebinding?fileUrl='+ encodeURIComponent(this.openForm.planBookPdfUrl)
})
},
// 获取证件类型 // 获取证件类型
async geterpInitialize() { async geterpInitialize() {
let res = await api.erpInitialize() let res = await api.erpInitialize()
......
pages/invitationRegister/invitationRegister.vue
<template> <template>
<view class="container"> <view class="container">
<view class="logo"> <view class="logo">
<view class="" style="width: 120rpx;">
<image src="../../static/cffp_logo.jpg" alt="" mode="widthFix"></image> <image src="../../static/cffp_logo.jpg" alt="" mode="widthFix"></image>
</view>
<text>欢迎使用CFFP</text> <text>欢迎使用CFFP</text>
</view> </view>
<view class="inviteInfo"> <view class="inviteInfo">
...@@ -33,11 +35,11 @@ ...@@ -33,11 +35,11 @@
padding-top: 100rpx; padding-top: 100rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center;
align-items: center; align-items: center;
border-radius: 30rpx; border-radius: 30rpx;
overflow: hidden; overflow: hidden;
font-size: 40rpx; font-size: 40rpx;
width:100rpx;
image{ image{
margin-bottom: 20rpx; margin-bottom: 20rpx;
width: 160rpx; width: 160rpx;
......
pages/inviteJoin/inviteJoin.vue
...@@ -144,7 +144,8 @@ ...@@ -144,7 +144,8 @@
isCross:true, isCross:true,
inviteLists:[], inviteLists:[],
orgList: [], orgList: [],
queryorgList:[] queryorgList:[],
shareId:''
}; };
}, },
onLoad() { onLoad() {
...@@ -179,6 +180,9 @@ ...@@ -179,6 +180,9 @@
// 发起邀请事件 // 发起邀请事件
shareToggle() { shareToggle() {
// uni.navigateTo({
// url:'/pages/invitationRegister/invitationRegister'
// })
this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'A1' : 'B1' this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'A1' : 'B1'
this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0' this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
this.dataForm.areaId = this.queryorgList[this.index].areaId this.dataForm.areaId = this.queryorgList[this.index].areaId
...@@ -194,7 +198,9 @@ ...@@ -194,7 +198,9 @@
api.saveApplyInfo(this.dataForm).then(res =>{ api.saveApplyInfo(this.dataForm).then(res =>{
if(res['success']){ if(res['success']){
this.switchTab(2) // this.switchTab(2)
this.$refs.share.open()
this.shareId = res.id
} }
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
...@@ -202,7 +208,6 @@ ...@@ -202,7 +208,6 @@
icon: 'none' icon: 'none'
}); });
}) })
// this.$refs.share.open()
}, },
closeShare(){ closeShare(){
this.$refs.share.close() this.$refs.share.close()
...@@ -213,7 +218,7 @@ ...@@ -213,7 +218,7 @@
provider: "weixin", provider: "weixin",
scene: "WXSceneSession", scene: "WXSceneSession",
type: 0, type: 0,
href: "https://mdev.zuihuibi.cn/cffp/", href: "https://mdev.zuihuibi.cn/cffp/?id="+this.shareId,
title: "uni-app分享", title: "uni-app分享",
summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！", summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！",
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg", imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
......
pages/personalCenter/accountoperation/phonebinding.vue
<template> <template>
<view class=""> <view class="">
<view @click="dia()">此页面暂时废弃</view> <web-view :src="allUrl"></web-view>
</view> </view>
</template> </template>
...@@ -8,16 +8,18 @@ ...@@ -8,16 +8,18 @@
export default { export default {
data() { data() {
return { return {
allUrl:''
} }
}, },
methods:{ onLoad(params) {
dia(){ console.log(params,777)
uni.showLoading({ // encodeURIComponent 函数可把字符串作为 URI 组件进行编码。decodeURIComponent解码
title:'jiazia' // 这里的 params.fileUrl 是另一个组件进入到该组件时通过 navigateTo 传进来的pdf文件路径
}) let fileUrl = decodeURIComponent(params.fileUrl);
} // 下面的路径合起来其实是：'/hybrid/html/web/viewer.html?file=' + 线上pdf路径
} this.allUrl = fileUrl
},
methods: {}
} }
</script> </script>
......
pages/personalCenter/personalCenter.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</view> </view>
</view> </view>
<view>昵称：{{customerBasicInfo.nickName}}</view> <view>昵称：{{customerBasicInfo.nickName}}</view>
<view>{{customerBasicInfo.nickName}}</view> <view>{{customerBasicInfo.userDescription}}</view>
</view> </view>
</view> </view>
<!-- 主要菜单 --> <!-- 主要菜单 -->
......
pages/personalCenter/teamMembers/jurisdiction.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view v-for="(item, index) in dataList" :key="index"> <view v-for="(item, index) in dataList" :key="index">
<view class="content-header"> <view class="content-header">
<view class="concent-title"> <view class="concent-title">
<text class="concent-text">{{item.name}}</text> <text class="concent-text">{{item.levelName}}</text>
</view> </view>
</view> </view>
<view style="text-align: right;margin: 20px;"> <view style="text-align: right;margin: 20px;">
...@@ -39,29 +39,34 @@ ...@@ -39,29 +39,34 @@
components:{ components:{
MyteamTable MyteamTable
}, },
mounted() {
this.dataList = this.raiseList
console.log(this.raiseList, 77777)
},
data() { data() {
return { return {
datatitleList:['辖下组织/成员','职级','合计'], datatitleList:['辖下组织/成员','职级','合计'],
dataList:[ dataList:[]
{ // dataList:[
name: 'shirley一级服务中心', // {
rank: '50', // name: 'shirley一级服务中心',
dataL:[ // rank: '50',
{name:'成员',rms:'2级别',smn:'111'}, // dataL:[
{name:'成员',rms:'2级别',smn:'111'}, // {name:'成员',rms:'2级别',smn:'111'},
{name:'成员',rms:'2级别',smn:'111'} // {name:'成员',rms:'2级别',smn:'111'},
] // {name:'成员',rms:'2级别',smn:'111'}
}, // ]
{ // },
name: '雪梨一级服务中心', // {
rank: '80', // name: '雪梨一级服务中心',
dataL:[ // rank: '80',
{name:'成员',rms:'2级别',smn:'111'}, // dataL:[
{name:'成员',rms:'2级别',smn:'111'}, // {name:'成员',rms:'2级别',smn:'111'},
{name:'成员',rms:'2级别',smn:'111'} // {name:'成员',rms:'2级别',smn:'111'},
] // {name:'成员',rms:'2级别',smn:'111'}
} // ]
] // }
// ]
// dataList:[{ // dataList:[{
// name:'', // name:'',
// total: '582', // total: '582',
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
return { return {
tabType: 1, tabType: 1,
userStudyLists: [], userStudyLists: [],
userId: '5', userId: '1',
directList: null, //直属团队数组 directList: null, //直属团队数组
raiseList: null, //所辖团队数组 raiseList: null, //所辖团队数组
otherList: null, // 其他 otherList: null, // 其他
......
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