Skip to content

C
CFFP-HB
Commit a4914849 by sunerhu
Options

1.修改邀请加盟选择不了所属组织Bug 

2.修复进入邀请加盟页面查询到上一个人填写信息。
3.修复个人中心页面头像显示不正确/修复个人中心修改页
parent 55f4775c
Showing with 120 additions and 68 deletions
components/myteam/lazy-tree.vue
...@@ -25,26 +25,32 @@ ...@@ -25,26 +25,32 @@
size="12" size="12"
></uni-icons> ></uni-icons>
</view> </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)" v-if="item.level && !item.hasChildren" style="width: 24rpx;height: 26rpx;display: inline-block;"></view>
<view v-else @click="open(item, i)" :class="item.levelCode == 'B1' ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'"> <!-- <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'">
<!-- class="d-header" --> </view> -->
<!-- class="d-header" --> <view @click="open(item, i)" style="flex: 1;text-align: left;" class="content-box-title-a" v-else-if="item.levelCode == 'B1'&& item.itemType == '1'">
<!-- :class="item.levelCode == 'B1' ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'" --> <text >{{item.areaCenterName}}</text>
<!-- <view > -->
<text style="color: #000;" v-if="item.levelCode == 'A1'" >{{ item.name || '张麻花' }}</text>
<text style="color: #FFFFFF;" v-if="item.levelCode == 'B1'" >{{ item.name || '张麻花' }}</text>
<text v-else >{{ item.areaCenterName || '张麻花' }}</text>
<!-- </view> -->
</view> </view>
<view @click="open(item, i)" style="flex: 1;" class="content-box-title-b" v-else-if="item.levelCode == 'C3'&& item.itemType == '1'">
<text>{{item.areaCenterName}}</text>
</view>
<view style="flex: 1;" v-else>
<text>{{item.name}}</text>
</view>
</view> </view>
<!-- <text v-else class=""></text> --> <!-- <text v-else class=""></text> -->
<!-- </view> --> <!-- </view> -->
</view> </view>
<view class="d-td">{{ item.levelName }}</view> <view class="d-td" v-if="item.levelCode == 'A1'">{{ item.levelName }}</view>
<view class="d-td" v-else></view>
<view class="d-td" style="padding-right: 10rpx;">{{ item.count }}</view> <view class="d-td" style="padding-right: 10rpx;">{{ item.count }}</view>
</view> </view>
</block> </block>
...@@ -329,6 +335,8 @@ export default { ...@@ -329,6 +335,8 @@ export default {
.content-box-title-a { .content-box-title-a {
// min-width: 100rpx; // min-width: 100rpx;
flex: 1; flex: 1;
text-align: left;
margin-left: 40rpx;
// background: url('../../static/myteam/Group1660.png'); // background: url('../../static/myteam/Group1660.png');
// background: url('../../static/myteam/Group1660.png') no-repeat; // background: url('../../static/myteam/Group1660.png') no-repeat;
// background-repeat: no-repeat; // background-repeat: no-repeat;
...@@ -341,6 +349,8 @@ export default { ...@@ -341,6 +349,8 @@ export default {
.content-box-title-b{ .content-box-title-b{
// min-width: 100rpx; // min-width: 100rpx;
flex: 1; flex: 1;
margin-left: 40rpx;
text-align: left;
// min-height: 60rpx; // min-height: 60rpx;
// padding: 10rpx 0; // padding: 10rpx 0;
border: 2rpx solid #3F52B7; border: 2rpx solid #3F52B7;
......
manifest.json
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
"statusbar": { "statusbar" : {
"immersed": false "immersed" : false
}, },
"usingComponents" : true, "usingComponents" : true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler" : "uni-app",
......
pages/application-process/basic-info.vue
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>申请身份</text> <text>申请身份</text>
<picker @change="changeIdentity" :value="identityIdx" :range="identityArr" <text v-if="partnerLevelName">{{partnerLevelName}}</text>
<picker v-else @change="changeIdentity" :value="identityIdx" :range="identityArr"
range-key="name" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"> range-key="name" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<view class="uni-input">{{identityArr[identityIdx]['name']}} <view class="uni-input">{{identityArr[identityIdx]['name']}}
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
...@@ -48,7 +49,8 @@ ...@@ -48,7 +49,8 @@
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>所属组织</text> <text>所属组织</text>
<picker @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys" <text v-if="areaName">{{areaName}}</text>
<picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys"
range-key="areaName" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"> range-key="areaName" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<view class="uni-input">{{cffpAreaQuerys[areaIdIdx]['areaName']}} <view class="uni-input">{{cffpAreaQuerys[areaIdIdx]['areaName']}}
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
...@@ -57,12 +59,14 @@ ...@@ -57,12 +59,14 @@
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>姓名</text> <text>姓名</text>
<input type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名" <text v-if="applyParam.name">{{applyParam.name}}</text>
<input v-else type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
auto-blur=true @blur="checkInput(1,applyParam.name)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> auto-blur=true @blur="checkInput(1,applyParam.name)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>手机号</text> <text>手机号</text>
<input type="text" class="form-control" v-model="applyParam.mobileNumber" placeholder="请输入手机号" maxlength="11" <text v-if="applyParam.mobileNumber">{{applyParam.mobileNumber}}</text>
<input v-else type="text" class="form-control" v-model="applyParam.mobileNumber" placeholder="请输入手机号" maxlength="11"
auto-blur=true @blur="checkInput(2,applyParam.mobileNumber)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> auto-blur=true @blur="checkInput(2,applyParam.mobileNumber)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
...@@ -129,6 +133,10 @@ ...@@ -129,6 +133,10 @@
maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`, maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
cffpAreaQuerys:[{areaId:null,areaName:"请选择所属组织",levelOrder:null}], cffpAreaQuerys:[{areaId:null,areaName:"请选择所属组织",levelOrder:null}],
areaIdIdx:0, areaIdIdx:0,
areaName: null,
partnerLevelName: null,
name:null,
mobile:null,
cffp_userInfo:{ cffp_userInfo:{
name:'', name:'',
mobile:'' mobile:''
...@@ -137,6 +145,16 @@ ...@@ -137,6 +145,16 @@
}, },
components:{}, components:{},
onLoad(options){ onLoad(options){
console.log(options, 'suiuhshuhsuibhu')
if(options.dataForm){
let dataOneForm = JSON.parse(options.dataForm)
this.applyParam.name = dataOneForm.name
this.applyParam.mobileNumber = dataOneForm.mobile
this.areaName = dataOneForm.areaName
this.partnerLevelName = dataOneForm.partnerLevel == 'A1' ? '事业伙伴' : '工作室'
this.applyParam.areaId = dataOneForm.areaId
uni.setStorageSync('applyId','')
}
this.erpInitialize(); this.erpInitialize();
// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组 // let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由 // let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
...@@ -144,11 +162,11 @@ ...@@ -144,11 +162,11 @@
if(!uni.getStorageSync('applyId') && options.shareId){ if(!uni.getStorageSync('applyId') && options.shareId){
this.queryById(options.id,null) this.queryById(options.id,null)
} }
this.cffp_userInfo = uni.getStorageSync('cffp_userInfo'); // this.cffp_userInfo = uni.getStorageSync('cffp_userInfo');
if(this.cffp_userInfo){ // if(this.cffp_userInfo){
this.applyParam.name = JSON.parse(uni.getStorageSync('cffp_userInfo'))['name']; // this.applyParam.name = JSON.parse(uni.getStorageSync('cffp_userInfo'))['name'];
this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile']; // this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile'];
} // }
}, },
mounted() { mounted() {
setTimeout(()=>{ setTimeout(()=>{
......
pages/courseDetail/courseDetail.vue
<template> <template>
<view class="container"> <view class="container">
<view class="shareheader" style="" v-if="coursesharing != 1"> <view class="shareheader" style="" v-if="coursesharing != 1">
<view class="iconfont icon-youjiantou" @click="goBack()"> <view class="iconfont icon-youjiantou" style="margin-left: 30rpx;" @click="goBack()">
</view> </view>
<view class="share-entrance"> <view class="share-entrance">
<view style="z-index: 99999;"> <view style="z-index: 99999;">
...@@ -182,27 +182,29 @@ ...@@ -182,27 +182,29 @@
jumpapp() { jumpapp() {
let platform = uni.getSystemInfoSync().platform let platform = uni.getSystemInfoSync().platform
if (platform == 'ios') { if (platform == 'ios') {
var loadDateTime = new Date(); // var loadDateTime = new Date();
window.setTimeout(function() { //如果没有安装app,便会执行setTimeout跳转下载页
var timeOutDateTime = new Date();
if (timeOutDateTime - loadDateTime < 500) {
window.location.href = "https://mcffp.anjibao.cn/app/"; window.location.href = "https://mcffp.anjibao.cn/app/";
} else { // window.setTimeout(function() { //如果没有安装app,便会执行setTimeout跳转下载页
window.location = "www.baidu.com"; //ios下载地址 // var timeOutDateTime = new Date();
} // if (timeOutDateTime - loadDateTime < 500) {
}, 500); // window.location.href = "https://mcffp.anjibao.cn/app/";
// } else {
// window.location.href = "www.baidu.com"; //ios下载地址
// }
// }, 500);
} else if (platform == 'android') { } else if (platform == 'android') {
var loadDateTime = new Date();
window.setTimeout(function() { //如果没有安装app,便会执行setTimeout跳转下载页
var timeOutDateTime = new Date();
if (timeOutDateTime - loadDateTime < 500) {
window.open('cffpapp://'); window.open('cffpapp://');
} else { // var loadDateTime = new Date();
// window.location = "https://mdev.anjibao.cn/cffp/app.ipa"; //ios下载地址 // window.setTimeout(function() { //如果没有安装app,便会执行setTimeout跳转下载页
window.location = "www.baidu.com"; //ios下载地址 // var timeOutDateTime = new Date();
} // if (timeOutDateTime - loadDateTime < 500) {
}, 500);
// } else {
// // window.location = "https://mdev.anjibao.cn/cffp/app.ipa"; //ios下载地址
// window.location = "www.baidu.com"; //ios下载地址
// }
// }, 500);
} }
}, },
...@@ -482,6 +484,7 @@ ...@@ -482,6 +484,7 @@
this.shareCode = option.shareCode this.shareCode = option.shareCode
this.shareUserId = option.shareUserId this.shareUserId = option.shareUserId
this.getuserRead() this.getuserRead()
uni.setStorageSync('h5_coursesharing', this.coursesharing);
// this.getshareData() // this.getshareData()
} }
...@@ -585,12 +588,12 @@ ...@@ -585,12 +588,12 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-right: 30rpx;
.image { .image {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
margin-top: 10rpx; // margin-top: 10rpx;
margin-right: 25rpx; // margin-right: 25rpx;
} }
} }
......
pages/invitationRegister/invitationRegister.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="container"> <view class="container">
<view class="logo"> <view class="logo">
<view class="" style="width: 120rpx;"> <view class="" style="width: 120rpx;">
<image src="../../static/cffp_logo.jpg" alt="" mode="widthFix"></image> <image src="../../static/cffp_logo.png" alt="" mode="widthFix"></image>
</view> </view>
<text>欢迎使用CFFP</text> <text>欢迎使用CFFP</text>
</view> </view>
...@@ -36,10 +36,12 @@ ...@@ -36,10 +36,12 @@
getqueryById(){ getqueryById(){
api.queryById({id:this.shareId}).then(res =>{ api.queryById({id:this.shareId}).then(res =>{
this.areaName = res.data.data.areaName this.areaName = res.data.data.areaName
this.areaId = res.data.data.areaId
this.invitationName = res.data.data.invitationName this.invitationName = res.data.data.invitationName
this.name = res.data.data.name this.name = res.data.data.name
this.mobileNumber = res.data.data.mobileNumber this.mobileNumber = res.data.data.mobileNumber
this.levelaName = res.data.data.partnerLevel == 'B1' ?'工作室': '事业合作伙伴' this.levelaName = res.data.data.partnerLevel == 'B1' ?'工作室': '事业伙伴'
this.partnerLevel = res.data.data.partnerLevel
}) })
}, },
ckregister(){ ckregister(){
...@@ -50,7 +52,7 @@ ...@@ -50,7 +52,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}` url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&areaName=${this.areaName}&partnerLevel=${this.partnerLevel}&shareId=${this.shareId}&areaId=${this.areaId}`
}) })
} }
......
pages/invitationRegister/invitationlogin.vue
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
export default { export default {
data() { data() {
return { return {
imgSrc: '../../static/cffp_logo.jpg', imgSrc: '../../static/cffp_logo.png',
liginName: '登录', liginName: '登录',
disabledSendBtn:false, disabledSendBtn:false,
agreeFlag:false, agreeFlag:false,
...@@ -55,9 +55,13 @@ ...@@ -55,9 +55,13 @@
} }
}, },
onLoad(options) { onLoad(options) {
console.log(options, 54)
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.id?options.id:'' this.form.id = options.shareId?options.shareId:''
this.form.areaName = options.areaName
this.form.areaId = options.areaId
this.form.partnerLevel = options.partnerLevel
// this.form =JSON.parse( options.form) // this.form =JSON.parse( options.form)
}, },
methods:{ methods:{
...@@ -120,7 +124,7 @@ ...@@ -120,7 +124,7 @@
uni.setStorageSync('isLogin','1') uni.setStorageSync('isLogin','1')
uni.setStorageSync('cffp_userId',this.userId); uni.setStorageSync('cffp_userId',this.userId);
uni.navigateTo({ uni.navigateTo({
url:'/pages/application-process/basic-info?userId=' + this.userId url:'/pages/application-process/basic-info?userId=' + this.userId + '&dataForm=' + JSON.stringify(this.form) + '&shareId=' + this.form.id
}) })
}else{ }else{
uni.showToast({ uni.showToast({
...@@ -185,7 +189,7 @@ ...@@ -185,7 +189,7 @@
border-bottom: 1px solid #CECECE; border-bottom: 1px solid #CECECE;
padding: 20rpx; padding: 20rpx;
.grey{ .grey{
font-size: 28rpx; font-size: 24rpx;
color: #CECECE; color: #CECECE;
} }
} }
......
pages/inviteJoin/inviteJoin.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<text>是否跨区邀请：</text> <text>是否跨区邀请：</text>
<view class="isCrossBox"> <view class="isCrossBox">
<view :class="{checked:isCross}"> <view :class="{checked:isCross}">
<i class="circle" @click="isCross=true"></i> <i class="circle" @click="isCross = true"></i>
<text>是</text> <text>是</text>
</view> </view>
<view :class="{checked:!isCross}"> <view :class="{checked:!isCross}">
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
inviteLists: [], inviteLists: [],
orgList: [], orgList: [],
orgdataList: [], orgdataList: [],
queryList:[],
queryorgList: [], queryorgList: [],
shareId: '', shareId: '',
realName:'', realName:'',
...@@ -185,8 +186,8 @@ ...@@ -185,8 +186,8 @@
queryorgchange(e) { queryorgchange(e) {
this.orgindex = e.detail.value this.orgindex = e.detail.value
}, },
bindPChange(){ bindPChange(e){
console.log('1') this.index = e.detail.value
}, },
// 查询组织list // 查询组织list
getqueryOrgList() { getqueryOrgList() {
...@@ -198,6 +199,7 @@ ...@@ -198,6 +199,7 @@
api.queryOrgList(CffpAreaQueryReqVO).then(res => { api.queryOrgList(CffpAreaQueryReqVO).then(res => {
if (res['success']) { if (res['success']) {
this.queryorgList = res.data.cffpAreaQuerys this.queryorgList = res.data.cffpAreaQuerys
console.log(this.queryorgList, 121255)
this.orgList = res.data.cffpAreaQuerys this.orgList = res.data.cffpAreaQuerys
this.changeorgkey() this.changeorgkey()
...@@ -222,7 +224,7 @@ ...@@ -222,7 +224,7 @@
// that.orgdataList = [] // that.orgdataList = []
console.log(that.orgList, 1115) console.log(that.orgList, 1115)
const list = that.orgList.map((item) => { that.queryList = that.orgList.map((item) => {
if(item.partnerLevel == orgKey || item.partnerLevel == 'ALL'){ if(item.partnerLevel == orgKey || item.partnerLevel == 'ALL'){
return item return item
} }
...@@ -234,15 +236,15 @@ ...@@ -234,15 +236,15 @@
// } // }
// } // }
// console.log(list, 551) // console.log(list, 551)
that.orgdataList = list.map((x) => x.areaName) that.orgdataList = that.queryList.map((x) => x.areaName)
}, },
// 发起邀请事件 // 发起邀请事件
shareToggle() { shareToggle() {
this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1' this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0' this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
this.dataForm.areaId = this.isCross == true ? null : this.queryorgList[this.index].areaId this.dataForm.areaId = this.isCross == true ? null : this.queryList[this.index].areaId
this.dataForm.userId = this.userId this.dataForm.userId = this.userId
this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : this.dataForm this.dataForm.areaName = this.isCross == false ? this.queryList[this.index].areaName : this.dataForm
.areaName .areaName
// this.dataForm.b1Name = this.applyIdentity == 'B1' ? this.dataForm.b1Name : null // this.dataForm.b1Name = this.applyIdentity == 'B1' ? this.dataForm.b1Name : null
// if(this.applyIdentity == 'B1'){ // if(this.applyIdentity == 'B1'){
......
pages/personalCenter/personalCenter.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- 头部信息 --> <!-- 头部信息 -->
<view class="basicInfoBox"> <view class="basicInfoBox">
<view class="avatar"> <view class="avatar">
<image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:'../../static/myteam/Group1633.png'" alt="" srcset="" mode="widthFix"></image> <image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:'../../static/myteam/Group1633.png'" alt="" srcset="" ></image>
</view> </view>
<view class="infoBox"> <view class="infoBox">
<view class="firstLineBox"> <view class="firstLineBox">
...@@ -224,19 +224,32 @@ ...@@ -224,19 +224,32 @@
.container{ .container{
padding-bottom: 160rpx; padding-bottom: 160rpx;
} }
.avatar {
width: 90rpx;
height: 80rpx;
/* border: 1rpx solid aqua; */
margin-right: 17rpx;
border-radius: 50%;
}
.avatar image {
width: 100%;
height: 100%;
border-radius: 50%;
}
.basicInfoBox{ .basicInfoBox{
display: flex; display: flex;
padding: 67rpx 20rpx 60rpx 28rpx; padding: 67rpx 20rpx 60rpx 28rpx;
background:linear-gradient(26deg, #D8E2E5 0%, #F0E6DD 31%, #E7DBDF 100%); background:linear-gradient(26deg, #D8E2E5 0%, #F0E6DD 31%, #E7DBDF 100%);
.avatar{ // .avatar{
width: 0; // width: 0;
height: 80rpx; // height: 80rpx;
border-radius: 50%; // border-radius: 50%;
overflow: hidden; // margin-right: 17rpx;
margin-right: 17rpx; // background-color: #fff;
background-color: #fff; // flex: 0 0 80rpx;
flex: 0 0 80rpx;
} // }
.infoBox{ .infoBox{
width:100%; width:100%;
color: #666666; color: #666666;
......
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