Skip to content

C
CFFP-HB
Commit c8a7deeb by sunerhu
Options

1.修复被邀请人邀请码没有带入页面 

2.修复被邀请人第一步调用接口重复
3.修复我的团队直属团队页面样式内容
4.pdf上传文件不成功代码提交
2.修复进入邀请加盟页面查询到上一个人填写信息。
3.修复个人中心页面头像显示不正确/修复个人中心修改页
parent 42192f24
Showing with 298 additions and 235 deletions
components/myteam/lazy-tree.vue
......@@ -16,32 +16,44 @@
<block v-for="(item, i) in treeList" :key="item.id">
<view class="d-box" v-if="item.level === 0 || checkOpen(item.pids[item.pids.length - 1])">
<!-- :class="`padding-left-${item.level * 5 + 10}`"-->
<view class="d-td" >
<view class="d-td">
<view class="" style="display: flex;">
<view class="" >
<uni-icons
v-if="item.hasChildren && !treeList[0]"
<view class="">
<uni-icons v-if="item.hasChildren && !treeList[0]"
: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)" 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 @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="`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>
</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: black;">{{item.areaCenterName}}</text>
</view>
<view @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'}">
<text style="color: black;">{{item.name}}</text>
</view> -->
<!-- <view @click="open(item, i)" style="flex: 1;text-align: left;" class="content-box-title-a" >
<text >{{item.areaCenterName}}</text>
</view>
<view @click="open(item, i)" style="flex: 1;" class="content-box-title-b" v-else-if="item.levelCode == 'C3'&& item.itemType == '1'">
<view @click="open(item, i)" style="flex: 1;" class="content-box-title-b" >
<text>{{item.areaCenterName}}</text>
</view>
<view style="flex: 1;" v-else>
<view @click="open(item, i)" style="flex: 1;" v-else>
<text>{{item.name}}</text>
</view>
</view> -->
</view>
......@@ -59,7 +71,7 @@
</template>
<script>
/**
/**
* @vdata list 原始数据列表
* @vdata openList 被展开数据的id列表
* @vdata treeList 重组后用于展示的树形结构列表
......@@ -73,9 +85,9 @@
* @vmethod setTreeNode 给list添加懒加载的数据
*/
import api from "../../api/api";
export default {
props:{
dataList:{
export default {
props: {
dataList: {
type: Array,
default: null
},
......@@ -93,10 +105,10 @@ export default {
this.setTree();
},
computed: {
},
computed: {},
data() {
return {
pleft:'60rpx',
list: [],
openList: [], // 被展开数组
lazyList: [], // 加载数组
......@@ -105,9 +117,9 @@ export default {
};
},
methods: {
pdleft(level){
pdleft(level) {
return (
"padding-left:" +level * 5 + 10
"padding-left:" + level * 5 + 10
);
},
treeToArray(nodes, ids = [0]) {
......@@ -136,6 +148,7 @@ export default {
// });
const list = this.deepClone(this.list);
this.treeList = this.treeToArray(list);
console.log(this.treeList, '打印一下树')
},
async lazyLoad(name) {
......@@ -144,16 +157,14 @@ export default {
try {
setTimeout(() => {
name += '-' + 1;
const list = [
{
const list = [{
name,
age: 17,
sex: 0,
id: this.guid(),
children: [],
hasChildren: true
}
];
}];
res(list);
}, 500);
} catch (e) {
......@@ -186,7 +197,7 @@ export default {
this.openList = list;
},
async open(item, index) {
if(index == 0 && this.type == 1){
if(index == 0 || item.itemType == '2'){
return false
}
try {
......@@ -199,7 +210,7 @@ export default {
}
api.queryTeamDetail(CffpOrgInfoReqVO).then(res => {
if (res['success']) {
if(res.data.list.length === 0){
if (res.data.list.length === 0) {
uni.showToast({
title: '职级下无数据',
duration: 1000,
......@@ -207,9 +218,9 @@ export default {
});
}
console.log(res, 7744)
res.data.list.forEach((x)=>{
this.$set(x, 'hasChildren' , true)
this.$set(x, 'children' , [])
res.data.list.forEach((x) => {
this.$set(x, 'hasChildren', true)
this.$set(x, 'children', [])
})
var list = this.deepClone(res.data.list);
this.historyList.push(item.id);
......@@ -313,7 +324,7 @@ export default {
}
}
}
};
};
</script>
<style lang="scss">
......@@ -333,56 +344,89 @@ export default {
text-align: center;
}
.content-box-title-a {
// min-width: 100rpx;
flex: 1;
text-align: left;
margin-left: 40rpx;
// background: url('../../static/myteam/Group1660.png');
// background: url('../../static/myteam/Group1660.png') no-repeat;
// background-repeat: no-repeat;
// background-color: #3F52B7;
background: #3F52B7;
font-size: 26rpx;
max-width: 246rpx;
min-height: 60rpx;
margin-top: 5rpx;
line-height: 50rpx;
background: url('../../static/myteam/Group1662.png') no-repeat;
background-size: 100%;
border-radius: 10rpx;
color: #FFFFFF;
}
.content-box-title-b{
// min-width: 100rpx;
.content-box-title-b {
flex: 1;
margin-left: 40rpx;
text-align: left;
// min-height: 60rpx;
// padding: 10rpx 0;
border: 2rpx solid #3F52B7;
border-radius: 10rpx;
// background: url('../../static/myteam/Group1662.png') no-repeat;
// background-repeat: no-repeat;
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;
width: 160rpx;
height: 52rpx;
background-color: #20269B;
display: flex;
justify-content: center;
align-items: center;
color: #fff;
margin-left: 50rpx;
// background-size: 100%;
color: #000;
border-radius: 10rpx;
// border: 1rpx solid #3F52B7;
&:before {
position: absolute;
left: -52rpx;
top: 0;
content: '';
width: 0;
height: 0;
border: 26rpx solid #20269B;
border-top-color: transparent;
border-left-color: transparent;
border-right-color: #20269B;
border-bottom-color: transparent;
}
.d-box{
&:after {
position: absolute;
left: 100%;
top: 0;
content: '';
width: 0;
height: 0;
border: 26rpx solid #20269B;
border-top-color: transparent;
border-left-color: #20269B;
border-right-color: transparent;
border-bottom-color: transparent;
}
}
.d-box {
display: flex;
justify-content: space-between;
.d-header{
text-align: center;font-size: 26rpx;
.d-header {
text-align: center;
font-size: 26rpx;
}
.d-td{
.d-td {
flex: 1;
font-size: 26rpx;
min-height: 60rpx;
margin-top: 10rpx;
margin-top: 5rpx;
line-height: 60rpx;
// padding: 10rpx 0;
}
}
.d-tr{
.d-tr {
display: flex;
width: 100%;
justify-content: space-between;
.d-th{
.d-th {
justify-content: center;
flex: 1
}
......
components/uploadFile/uploadFile.vue
......@@ -127,6 +127,7 @@
methods: {
// 某文件上传结束回调(成功失败都回调)
onuploadEnd(item) {
uni.hideLoading();
console.log(`${item.name}已上传结束，上传状态=${item.type}`);
// 更新当前状态变化的文件
......@@ -134,8 +135,6 @@
// 演示上传完成后取服务端数据
if (item['responseText']) {
console.log('演示服务器返回的字符串JSON转对象');
console.log(item.responseText)
// this.files.get(item.name).responseText = JSON.parse(item.responseText);
this.$emit('sendPath',JSON.stringify(item.responseText),item.name)
}
......@@ -174,6 +173,9 @@
},
// 文件选择回调
onChange(files) {
uni.showLoading({
title: '上传中...'
});
// 更新选择的文件
this.files = files;
// 强制更新视图
......
pages/application-process/basic-info.vue
......@@ -29,14 +29,16 @@
<view class="contentDetail employ">
<view class="contentItem">
<text>邀请码</text>
<input type="text" class="form-control" placeholder="非必填" v-model="applyParam.inviterInvitationCode"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
<input type="text" class="form-control" placeholder="非必填"
v-model="applyParam.inviterInvitationCode"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
</view>
<view class="contentItem">
<text>申请身份</text>
<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']}}
<text class="iconfont icon-youjiantou"></text>
</view>
......@@ -45,13 +47,14 @@
<view class="contentItem" v-if="applyParam.partnerLevel == 'B1'">
<text>工作室名称</text>
<input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
</view>
<view class="contentItem">
<text>所属组织</text>
<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']}}
<text class="iconfont icon-youjiantou"></text>
</view>
......@@ -61,18 +64,21 @@
<text>姓名</text>
<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 class="contentItem">
<text>手机号</text>
<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"/>
<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" />
</view>
<view class="contentItem">
<text>证件类型</text>
<picker @change="changeIdType" :value="idTypeIdx" :range="idTypesList"
range-key="name" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<picker @change="changeIdType" :value="idTypeIdx" :range="idTypesList" range-key="name"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<view class="uni-input">{{idTypesList[idTypeIdx]['name']}}
<text class="iconfont icon-youjiantou"></text>
</view>
......@@ -82,20 +88,24 @@
<text>证件号码</text>
<view>
<input type="text" class="form-control" v-model="applyParam.idNo" placeholder="请输入证件号码"
auto-blur=true @blur="checkInput(3,applyParam.idNo)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
auto-blur=true @blur="checkInput(3,applyParam.idNo)"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
</view>
</view>
<view class="contentItem">
<text>出生日期</text>
<picker mode="date" :value="applyParam.birthday" @change="bindBirthday"
:end="maxDate" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<picker mode="date" :value="applyParam.birthday" @change="bindBirthday" :end="maxDate"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<view v-if="!applyParam.birthday">请选择 <text class="iconfont icon-youjiantou"></text> </view>
<view class="uni-input" v-if="applyParam.birthday">{{this.applyParam.birthday}} <text class="iconfont icon-youjiantou"></text></view>
<view class="uni-input" v-if="applyParam.birthday">{{this.applyParam.birthday}} <text
class="iconfont icon-youjiantou"></text></view>
</picker>
</view>
<view class="contentItem">
<text>居住地址</text>
<view><input type="text" class="form-control" placeholder="请选择" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/></view>
<view><input type="text" class="form-control" placeholder="请选择" v-model="applyParam.liveAddress"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
</view>
</view>
</view>
</view>
......@@ -110,95 +120,115 @@
import api from "@/api/api";
import common from '@/common/common.ts';
import util from '@/util/dataHandling';
export default{
data(){
export default {
data() {
return {
identityIdx:0,
identityArr:[{partnerLevel:'A1',name:'事业伙伴'},{partnerLevel:'B1',name:'工作室'}],
applyParam:{
inviterInvitationCode:'',
name:'',
mobileNumber:'',
partnerLevel:'A1',
idType:'',
idNo:'',
birthday:'',
areaId:'',
approvalStatus:0,
b1Name:''
identityIdx: 0,
identityArr: [{
partnerLevel: 'A1',
name: '事业伙伴'
}, {
partnerLevel: 'B1',
name: '工作室'
}],
applyParam: {
inviterInvitationCode: '',
name: '',
mobileNumber: '',
partnerLevel: 'A1',
idType: '',
idNo: '',
birthday: '',
areaId: '',
approvalStatus: 0,
b1Name: '',
liveAddress:''
// birthday:`${new Date().getFullYear()}-${new Date().getMonth() + 1} -${new Date().getDate()}`,
},
idTypesList:[{id:null,name:'请选择'}],
idTypeIdx:0,
maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
cffpAreaQuerys:[{areaId:null,areaName:"请选择所属组织",levelOrder:null}],
areaIdIdx:0,
idTypesList: [{
id: null,
name: '请选择'
}],
idTypeIdx: 0,
maxDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
cffpAreaQuerys: [{
areaId: null,
areaName: "请选择所属组织",
levelOrder: null
}],
areaIdIdx: 0,
areaName: null,
partnerLevelName: null,
name:null,
mobile:null,
cffp_userInfo:{
name:'',
mobile:''
name: null,
mobile: null,
shareId: null,
cffp_userInfo: {
name: '',
mobile: ''
}
}
},
components:{},
onLoad(options){
console.log(options, 'suiuhshuhsuibhu')
if(options.dataForm){
components: {},
onLoad(options) {
if (options.dataForm) {
console.log(options, '唧唧哇哇')
let dataOneForm = JSON.parse(options.dataForm)
this.applyParam.name = dataOneForm.name
this.shareId = options.shareId
this.applyParam.inviterInvitationCode = dataOneForm.invitationCode
this.applyParam.mobileNumber = dataOneForm.mobile
this.areaName = dataOneForm.areaName
this.applyParam.partnerLevel = dataOneForm.partnerLevel
this.partnerLevelName = dataOneForm.partnerLevel == 'A1' ? '事业伙伴' : '工作室'
this.applyParam.areaId = dataOneForm.areaId
uni.setStorageSync('applyId','')
uni.setStorageSync('applyId', '')
} else {
this.cffp_userInfo = uni.getStorageSync('cffp_userInfo');
if (this.cffp_userInfo) {
this.applyParam.name = JSON.parse(uni.getStorageSync('cffp_userInfo'))['name'];
this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile'];
}
}
this.erpInitialize();
// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
// console.log('当前路由地址',curRoute)
if(!uni.getStorageSync('applyId') && options.shareId){
this.queryById(options.id,null)
}
// this.cffp_userInfo = uni.getStorageSync('cffp_userInfo');
// if(this.cffp_userInfo){
// this.applyParam.name = JSON.parse(uni.getStorageSync('cffp_userInfo'))['name'];
// this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile'];
// if(!uni.getStorageSync('applyId') && options.shareId){
// this.queryById(options.id,null)
// }
},
mounted() {
setTimeout(()=>{
if(uni.getStorageSync('applyId')){
this.queryById(uni.getStorageSync('applyId'),null)
}else{
this.queryById(null,uni.getStorageSync('cffp_userId'))
if (this.shareId) {
this.queryById(this.shareId, null)
} else if (uni.getStorageSync('applyId')) {
this.queryById(uni.getStorageSync('applyId'), null)
} else {
this.queryById(null, uni.getStorageSync('cffp_userId'))
}
},100)
},
methods:{
erpInitialize(){
api.erpInitialize({}).then((res)=>{
if(res['success']){
methods: {
erpInitialize() {
api.erpInitialize({}).then((res) => {
if (res['success']) {
this.idTypesList = this.idTypesList.concat(res['data']['idTypes']);
console.log(this.idTypesList)
}
})
},
queryOrgList(){
queryOrgList() {
const param = {
userId:uni.getStorageSync('cffp_userId'),
userId: uni.getStorageSync('cffp_userId'),
// userId:1,
partnerLevel:this.applyParam.partnerLevel
partnerLevel: this.applyParam.partnerLevel
}
console.log(param)
api.queryOrgList(param).then((res)=>{
api.queryOrgList(param).then((res) => {
console.log(res)
if(res['success']){
if (res['success']) {
this.cffpAreaQuerys = this.cffpAreaQuerys.concat(res['data']['cffpAreaQuerys'])
for(let j=0;j<this.cffpAreaQuerys.length;j++){
if(this.applyParam.areaId == this.cffpAreaQuerys[j].areaId){
for (let j = 0; j < this.cffpAreaQuerys.length; j++) {
if (this.applyParam.areaId == this.cffpAreaQuerys[j].areaId) {
this.areaIdIdx = j;
console.log(j)
}
......@@ -213,7 +243,7 @@
this.queryOrgList();
this.areaIdIdx = 0;
},
changeIdType:function(e){
changeIdType: function(e) {
this.idTypeIdx = e.detail.value;
this.applyParam.idType = this.idTypesList[this.idTypeIdx]['name'];
console.log(this.applyParam.idType)
......@@ -221,14 +251,14 @@
bindBirthday: function(e) {
this.applyParam.birthday = e.detail.value;
},
changeArea:function(e){
changeArea: function(e) {
this.areaIdIdx = e.detail.value;
this.applyParam.areaId = this.cffpAreaQuerys[this.areaIdIdx]['areaId'];
console.log(this.applyParam.areaId)
},
checkInput(type,code){
if(type==1){
if(code && !common.nameValid(code)){
checkInput(type, code) {
if (type == 1) {
if (code && !common.nameValid(code)) {
uni.showToast({
title: '请输入真实的姓名!',
duration: 2000,
......@@ -237,8 +267,8 @@
return;
}
}
if(type==2){
if(code && !common.mobileNoValid(code)){
if (type == 2) {
if (code && !common.mobileNoValid(code)) {
uni.showToast({
title: '请输入正确的手机号码!',
duration: 2000,
......@@ -247,9 +277,9 @@
return;
}
}
if(type == 3){
if(this.applyParam.idType === '身份证'){
if(code && !common.IdCodeValid(code).pass){
if (type == 3) {
if (this.applyParam.idType === '身份证') {
if (code && !common.IdCodeValid(code).pass) {
uni.showToast({
title: `${common.IdCodeValid(code).msg}`,
duration: 2000,
......@@ -257,10 +287,10 @@
})
return;
}
this.applyParam.birthday = util.dateFormat(common.IdCodeValid(code).birthDay,'yyyy-MM-dd');
this.applyParam.birthday = util.dateFormat(common.IdCodeValid(code).birthDay, 'yyyy-MM-dd');
console.log(this.applyParam)
}else{
if(code && !common.checkTaxNo(code)){
} else {
if (code && !common.checkTaxNo(code)) {
uni.showToast({
title: '证件号码只能是5-20位的数字字母组合',
duration: 2000,
......@@ -272,30 +302,33 @@
}
},
queryById(id,userId){
api.queryById({id:id,userId:userId}).then((res)=>{
if(res['success']){
queryById(id, userId) {
api.queryById({
id: id,
userId: userId
}).then((res) => {
if (res['success']) {
this.applyParam = res['data']['data'];
this.queryOrgList();
for(let m=0;m<this.identityArr.length;m++){
if(this.applyParam.partnerLevel == this.identityArr[m].partnerLevel){
for (let m = 0; m < this.identityArr.length; m++) {
if (this.applyParam.partnerLevel == this.identityArr[m].partnerLevel) {
this.identityIdx = m;
}
}
for(let i=0;i<this.idTypesList.length;i++){
if(this.applyParam.idType == this.idTypesList[i].name){
for (let i = 0; i < this.idTypesList.length; i++) {
if (this.applyParam.idType == this.idTypesList[i].name) {
this.idTypeIdx = i;
}
}
}else{
} else {
this.queryOrgList();
}
})
},
saveInfo(){
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
if(!this.applyParam.areaId){
saveInfo() {
if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if (!this.applyParam.areaId) {
uni.showToast({
title: '请选择所属组织',
duration: 2000,
......@@ -303,7 +336,7 @@
})
return;
}
if(!this.applyParam.name){
if (!this.applyParam.name) {
uni.showToast({
title: '请输入姓名',
duration: 2000,
......@@ -311,7 +344,7 @@
})
return;
}
if(!this.applyParam.mobileNumber){
if (!this.applyParam.mobileNumber) {
uni.showToast({
title: '请输入手机号',
duration: 2000,
......@@ -319,16 +352,16 @@
})
return;
}
if(!this.applyParam.partnerLevel){
if (!this.applyParam.partnerLevel) {
uni.showToast({
title: '请选择申请身份!',
duration: 2000,
icon: 'none'
})
return;
}else{
if(this.applyParam.partnerLevel == 'B1'){
if(!this.applyParam.b1Name){
} else {
if (this.applyParam.partnerLevel == 'B1') {
if (!this.applyParam.b1Name) {
uni.showToast({
title: '申请身份为工作室时,工作室名称必填!',
duration: 2000,
......@@ -338,7 +371,7 @@
}
}
}
if(!this.applyParam.idType){
if (!this.applyParam.idType) {
uni.showToast({
title: '请选择证件类型',
duration: 2000,
......@@ -346,7 +379,7 @@
})
return;
}
if(!this.applyParam.idNo){
if (!this.applyParam.idNo) {
uni.showToast({
title: '请输入证件号',
duration: 2000,
......@@ -354,7 +387,7 @@
})
return;
}
if(!this.applyParam.birthday){
if (!this.applyParam.birthday) {
uni.showToast({
title: '请选择出生日期',
duration: 2000,
......@@ -364,19 +397,19 @@
}
this.applyParam = {
...this.applyParam,
applyType:2,
operatStep:1,
userId:uni.getStorageSync('cffp_userId'),
hasCrossDistrict:0
applyType: 2,
operatStep: 1,
userId: uni.getStorageSync('cffp_userId'),
hasCrossDistrict: 0
}
api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){
api.saveApplyInfo(this.applyParam).then((res) => {
if (res['success']) {
uni.navigateTo({
// url:`work-experience?id=${res['data']['id']}`
url:`work-experience`
url: `work-experience`
});
uni.setStorageSync('applyId',String(res['data']['id']))
}else{
uni.setStorageSync('applyId', String(res['data']['id']))
} else {
uni.showToast({
title: res['message'],
duration: 2000,
......@@ -385,10 +418,10 @@
return;
}
})
}else{
} else {
uni.navigateTo({
// url:`work-experience?id=${res['data']['id']}`
url:`work-experience`
url: `work-experience`
});
}
}
......
pages/certifyDetail/uploadinformation.vue
......@@ -39,7 +39,7 @@
</view>
<text style="margin-left: 10rpx;" @click="exportTo">{{openForm.fileName}}</text>
</view>
<view class="uploadpdf" @click="uploadFile()">
<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>
......@@ -104,6 +104,7 @@
},
methods: {
// 上传成功回调方法
getPath(e,a){
const param = JSON.parse(JSON.parse(e));
this.openForm.fileName = a;
......@@ -124,7 +125,6 @@
uni.navigateBack(1)
},
exportTo(){
console.log(this.openForm.planBookPdfUrl, 4451)
uni.navigateTo({
url: '/pages/personalCenter/accountoperation/phonebinding?fileUrl='+ encodeURIComponent(this.openForm.planBookPdfUrl)
})
......@@ -162,7 +162,7 @@
this.loading = false
})
},
// 上传文件方法
// 上传文件方法 -- 废弃
uploadFile(event) {
if(this.status == 3){
uni.showToast({
......
pages/invitationRegister/invitationRegister.vue
......@@ -30,6 +30,7 @@
},
onLoad(options) {
this.shareId = options.shareId
this.invitationCode = options.invitationCode
this.getqueryById()
},
methods:{
......@@ -52,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}&areaName=${this.areaName}&partnerLevel=${this.partnerLevel}&shareId=${this.shareId}&areaId=${this.areaId}`
url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&areaName=${this.areaName}&partnerLevel=${this.partnerLevel}&shareId=${this.shareId}&areaId=${this.areaId}&invitationCode=${this.invitationCode}`
})
}
......
pages/invitationRegister/invitationlogin.vue
......@@ -61,6 +61,7 @@
this.form.id = options.shareId?options.shareId:''
this.form.areaName = options.areaName
this.form.areaId = options.areaId
this.form.invitationCode = options.invitationCode
this.form.partnerLevel = options.partnerLevel
// this.form =JSON.parse( options.form)
},
......
pages/inviteJoin/inviteJoin.vue
......@@ -12,7 +12,8 @@
<view class="ulBox">
<view class="liBox">
<text>姓名：</text>
<text><input v-model="dataForm.name" class="uni-input" maxlength="15" placeholder="姓名" @blur="blueInput(dataForm.name)" /></text>
<text><input v-model="dataForm.name" class="uni-input" maxlength="15" placeholder="姓名"
@blur="blueInput(dataForm.name)" /></text>
</view>
<view class="liBox">
<text>手机号：</text>
......@@ -27,10 +28,6 @@
</picker>
</text>
</view>
<view class="liBox" v-if="applyIdentity == 0">
<text>工作室名称：</text>
<text><input v-model="dataForm.b1Name" class="uni-input" placeholder="工作室名称" /></text>
</view>
<view class="liBox">
<text>所属组织：</text>
<text>
......@@ -157,11 +154,12 @@
inviteLists: [],
orgList: [],
orgdataList: [],
queryList:[],
queryList: [],
queryorgList: [],
shareId: '',
realName:'',
partnerLevel:''
realName: '',
partnerLevel: '',
invitationCode:''
};
},
onLoad(option) {
......@@ -169,7 +167,7 @@
this.getqueryOrgList()
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName
console.log(dataForm, 1125)
this.invitationCode = dataForm.invitationCode
},
methods: {
blueInput(name) {
......@@ -186,7 +184,7 @@
queryorgchange(e) {
this.orgindex = e.detail.value
},
bindPChange(e){
bindPChange(e) {
this.index = e.detail.value
},
// 查询组织list
......@@ -225,17 +223,10 @@
console.log(that.orgList, 1115)
that.queryList = that.orgList.map((item) => {
if(item.partnerLevel == orgKey || item.partnerLevel == 'ALL'){
if (item.partnerLevel == orgKey || item.partnerLevel == 'ALL') {
return item
}
}).filter(item2 => item2 != undefined)
// console.log(list, 41745)
// for (var i = 0; i < list.length; i++) {
// if (list[i] == undefined) {
// list.splice(i,1)
// }
// }
// console.log(list, 551)
that.orgdataList = that.queryList.map((x) => x.areaName)
},
// 发起邀请事件
......@@ -246,14 +237,7 @@
this.dataForm.userId = this.userId
this.dataForm.areaName = this.isCross == false ? this.queryList[this.index].areaName : this.dataForm
.areaName
// this.dataForm.b1Name = this.applyIdentity == 'B1' ? this.dataForm.b1Name : null
// if(this.applyIdentity == 'B1'){
// if(this.dataForm.b1Name ==''){
// }
// }
if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '' || this
.applyIdentity == 'B1' && this.dataForm.b1Name == '') {
if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '') {
uni.showToast({
title: '请将信息补充完整',
duration: 2000,
......@@ -264,11 +248,10 @@
if (common.mobileNoValid(this.dataForm.mobileNumber)) {
api.saveApplyInfo(this.dataForm).then(res => {
if (res['success']) {
// this.switchTab(2)
this.shareId = res.data.id
this.$refs.share.open()
// uni.navigateTo({
// url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
// url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId + '&invitationCode=' + this.invitationCode
// })
}
uni.showToast({
......@@ -290,30 +273,12 @@
this.$refs.share.open()
},
uniShare(type) {
if (type === 1) {
uni.share({
provider: "weixin",
scene: "WXSceneSession",
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
success: function(res) {
console.log("success:" + JSON.stringify(res));
},
fail: function(err) {
console.log("fail:" + JSON.stringify(err));
}
});
} else if (type === 2) {
uni.share({
provider: "weixin",
scene: "WXSceneTimeline",
scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
this.shareId + '&invitationCode=' + this.invitationCode,
title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
......@@ -324,7 +289,24 @@
console.log("fail:" + JSON.stringify(err));
}
});
}
// else if (type === 2) {
// uni.share({
// provider: "weixin",
// scene: ,
// type: 0,
// href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
// this.shareId,
// title: "CFFP家庭财务策划师联盟邀您加入",
// summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
// imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
// success: function(res) {
// console.log("success:" + JSON.stringify(res));
// },
// fail: function(err) {
// console.log("fail:" + JSON.stringify(err));
// }
// });
// }
},
queryInviteList() {
api.queryInviteList({
......
pages/personalCenter/teamMembers/members.vue
......@@ -10,7 +10,7 @@
</view>
<view class="">
<lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="1"></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> -->
</view>
</view>
......
pages/personalCenter/teamPerformance/teamPerformance.vue
......@@ -88,9 +88,9 @@
array: ['一季度', '二季度', '三季度', '四季度'],
mountdList: [],
index: 0,
totalOrder: Number, //总单数
totalCoursePrice: Number, // 总销售额
totalIncome: Number, //总销售收入
totalOrder: '', //总单数
totalCoursePrice: '', // 总销售额
totalIncome: '', //总销售收入
teListsort: true,
multiArray: [{
name: '',
......@@ -157,9 +157,9 @@
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res) {
this.dataList = res.data.list
this.totalOrder = res.data.totalOrder
this.totalCoursePrice = res.data.totalCoursePrice
this.totalIncome = res.data.totalIncome
this.totalOrder = res.data.totalOrder? res.data.totalOrder: '0'
? this.totalCoursePrice = res.data.totalCoursePrice? res.data.totalCoursePrice: '0'
this.totalIncome = res.data.totalIncome?res.data.totalIncome: '0'
this.sortswitch()
}
})
......
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