Skip to content

C
CFFP-HB
Commit c8a7deeb by sunerhu
Options

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

2.修复被邀请人第一步调用接口重复
3.修复我的团队直属团队页面样式内容
4.pdf上传文件不成功代码提交
2.修复进入邀请加盟页面查询到上一个人填写信息。
3.修复个人中心页面头像显示不正确/修复个人中心修改页
parent 42192f24
Showing with 63 additions and 77 deletions
components/uploadFile/uploadFile.vue
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
methods: { methods: {
// 某文件上传结束回调(成功失败都回调) // 某文件上传结束回调(成功失败都回调)
onuploadEnd(item) { onuploadEnd(item) {
uni.hideLoading();
console.log(`${item.name}已上传结束，上传状态=${item.type}`); console.log(`${item.name}已上传结束，上传状态=${item.type}`);
// 更新当前状态变化的文件 // 更新当前状态变化的文件
...@@ -134,8 +135,6 @@ ...@@ -134,8 +135,6 @@
// 演示上传完成后取服务端数据 // 演示上传完成后取服务端数据
if (item['responseText']) { if (item['responseText']) {
console.log('演示服务器返回的字符串JSON转对象');
console.log(item.responseText)
// this.files.get(item.name).responseText = JSON.parse(item.responseText); // this.files.get(item.name).responseText = JSON.parse(item.responseText);
this.$emit('sendPath',JSON.stringify(item.responseText),item.name) this.$emit('sendPath',JSON.stringify(item.responseText),item.name)
} }
...@@ -174,6 +173,9 @@ ...@@ -174,6 +173,9 @@
}, },
// 文件选择回调 // 文件选择回调
onChange(files) { onChange(files) {
uni.showLoading({
title: '上传中...'
});
// 更新选择的文件 // 更新选择的文件
this.files = files; this.files = files;
// 强制更新视图 // 强制更新视图
......
pages/certifyDetail/uploadinformation.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</view> </view>
<text style="margin-left: 10rpx;" @click="exportTo">{{openForm.fileName}}</text> <text style="margin-left: 10rpx;" @click="exportTo">{{openForm.fileName}}</text>
</view> </view>
<view class="uploadpdf" @click="uploadFile()"> <view class="uploadpdf">
<view class="uploadimg"> <view class="uploadimg">
<view class="uploadFileBox" v-if="status != 3"> <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> <uploadFile :deformats="formats" :opacity="0" ref="uploadRef" :height="'320rpx'" :instantly="'true'" :requestVO="JSON.stringify(dataForm)" @sendPath="getPath"></uploadFile>
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
}, },
methods: { methods: {
// 上传成功回调方法
getPath(e,a){ getPath(e,a){
const param = JSON.parse(JSON.parse(e)); const param = JSON.parse(JSON.parse(e));
this.openForm.fileName = a; this.openForm.fileName = a;
...@@ -124,7 +125,6 @@ ...@@ -124,7 +125,6 @@
uni.navigateBack(1) uni.navigateBack(1)
}, },
exportTo(){ exportTo(){
console.log(this.openForm.planBookPdfUrl, 4451)
uni.navigateTo({ uni.navigateTo({
url: '/pages/personalCenter/accountoperation/phonebinding?fileUrl='+ encodeURIComponent(this.openForm.planBookPdfUrl) url: '/pages/personalCenter/accountoperation/phonebinding?fileUrl='+ encodeURIComponent(this.openForm.planBookPdfUrl)
}) })
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
this.loading = false this.loading = false
}) })
}, },
// 上传文件方法 // 上传文件方法 -- 废弃
uploadFile(event) { uploadFile(event) {
if(this.status == 3){ if(this.status == 3){
uni.showToast({ uni.showToast({
......
pages/invitationRegister/invitationRegister.vue
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
}, },
onLoad(options) { onLoad(options) {
this.shareId = options.shareId this.shareId = options.shareId
this.invitationCode = options.invitationCode
this.getqueryById() this.getqueryById()
}, },
methods:{ methods:{
...@@ -52,7 +53,7 @@ ...@@ -52,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}&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 @@ ...@@ -61,6 +61,7 @@
this.form.id = options.shareId?options.shareId:'' this.form.id = options.shareId?options.shareId:''
this.form.areaName = options.areaName this.form.areaName = options.areaName
this.form.areaId = options.areaId this.form.areaId = options.areaId
this.form.invitationCode = options.invitationCode
this.form.partnerLevel = options.partnerLevel this.form.partnerLevel = options.partnerLevel
// this.form =JSON.parse( options.form) // this.form =JSON.parse( options.form)
}, },
......
pages/inviteJoin/inviteJoin.vue
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<view class="ulBox"> <view class="ulBox">
<view class="liBox"> <view class="liBox">
<text>姓名：</text> <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>
<view class="liBox"> <view class="liBox">
<text>手机号：</text> <text>手机号：</text>
...@@ -27,10 +28,6 @@ ...@@ -27,10 +28,6 @@
</picker> </picker>
</text> </text>
</view> </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"> <view class="liBox">
<text>所属组织：</text> <text>所属组织：</text>
<text> <text>
...@@ -157,11 +154,12 @@ ...@@ -157,11 +154,12 @@
inviteLists: [], inviteLists: [],
orgList: [], orgList: [],
orgdataList: [], orgdataList: [],
queryList:[], queryList: [],
queryorgList: [], queryorgList: [],
shareId: '', shareId: '',
realName:'', realName: '',
partnerLevel:'' partnerLevel: '',
invitationCode:''
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -169,7 +167,7 @@ ...@@ -169,7 +167,7 @@
this.getqueryOrgList() this.getqueryOrgList()
let dataForm = uni.getStorageSync('userinfodataForm') let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName this.realName = dataForm.realName
console.log(dataForm, 1125) this.invitationCode = dataForm.invitationCode
}, },
methods: { methods: {
blueInput(name) { blueInput(name) {
...@@ -186,7 +184,7 @@ ...@@ -186,7 +184,7 @@
queryorgchange(e) { queryorgchange(e) {
this.orgindex = e.detail.value this.orgindex = e.detail.value
}, },
bindPChange(e){ bindPChange(e) {
this.index = e.detail.value this.index = e.detail.value
}, },
// 查询组织list // 查询组织list
...@@ -222,20 +220,13 @@ ...@@ -222,20 +220,13 @@
let that = this let that = this
let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1' let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1'
// that.orgdataList = [] // that.orgdataList = []
console.log(that.orgList, 1115) console.log(that.orgList, 1115)
that.queryList = 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
} }
}).filter(item2 => item2 != undefined) }).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) that.orgdataList = that.queryList.map((x) => x.areaName)
}, },
// 发起邀请事件 // 发起邀请事件
...@@ -246,14 +237,7 @@ ...@@ -246,14 +237,7 @@
this.dataForm.userId = this.userId this.dataForm.userId = this.userId
this.dataForm.areaName = this.isCross == false ? this.queryList[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 if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '') {
// if(this.applyIdentity == 'B1'){
// if(this.dataForm.b1Name ==''){
// }
// }
if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '' || this
.applyIdentity == 'B1' && this.dataForm.b1Name == '') {
uni.showToast({ uni.showToast({
title: '请将信息补充完整', title: '请将信息补充完整',
duration: 2000, duration: 2000,
...@@ -264,11 +248,10 @@ ...@@ -264,11 +248,10 @@
if (common.mobileNoValid(this.dataForm.mobileNumber)) { if (common.mobileNoValid(this.dataForm.mobileNumber)) {
api.saveApplyInfo(this.dataForm).then(res => { api.saveApplyInfo(this.dataForm).then(res => {
if (res['success']) { if (res['success']) {
// this.switchTab(2)
this.shareId = res.data.id this.shareId = res.data.id
this.$refs.share.open() this.$refs.share.open()
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId // url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId + '&invitationCode=' + this.invitationCode
// }) // })
} }
uni.showToast({ uni.showToast({
...@@ -290,41 +273,40 @@ ...@@ -290,41 +273,40 @@
this.$refs.share.open() this.$refs.share.open()
}, },
uniShare(type) { uniShare(type) {
if (type === 1) { uni.share({
uni.share({ provider: "weixin",
provider: "weixin", scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
scene: "WXSceneSession", 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,
this.shareId, 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", success: function(res) {
success: function(res) { console.log("success:" + JSON.stringify(res));
console.log("success:" + JSON.stringify(res)); },
}, fail: function(err) {
fail: function(err) { console.log("fail:" + JSON.stringify(err));
console.log("fail:" + JSON.stringify(err)); }
} });
}); // else if (type === 2) {
} else if (type === 2) { // uni.share({
uni.share({ // provider: "weixin",
provider: "weixin", // scene: ,
scene: "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,
this.shareId, // 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", // success: function(res) {
success: function(res) { // console.log("success:" + JSON.stringify(res));
console.log("success:" + JSON.stringify(res)); // },
}, // fail: function(err) {
fail: function(err) { // console.log("fail:" + JSON.stringify(err));
console.log("fail:" + JSON.stringify(err)); // }
} // });
}); // }
}
}, },
queryInviteList() { queryInviteList() {
api.queryInviteList({ api.queryInviteList({
......
pages/personalCenter/teamMembers/members.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</view> </view>
<view class=""> <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> --> <!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> -->
</view> </view>
</view> </view>
......
pages/personalCenter/teamPerformance/teamPerformance.vue
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
array: ['一季度', '二季度', '三季度', '四季度'], array: ['一季度', '二季度', '三季度', '四季度'],
mountdList: [], mountdList: [],
index: 0, index: 0,
totalOrder: Number, //总单数 totalOrder: '', //总单数
totalCoursePrice: Number, // 总销售额 totalCoursePrice: '', // 总销售额
totalIncome: Number, //总销售收入 totalIncome: '', //总销售收入
teListsort: true, teListsort: true,
multiArray: [{ multiArray: [{
name: '', name: '',
...@@ -157,9 +157,9 @@ ...@@ -157,9 +157,9 @@
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => { api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res) { if (res) {
this.dataList = res.data.list this.dataList = res.data.list
this.totalOrder = res.data.totalOrder this.totalOrder = res.data.totalOrder? res.data.totalOrder: '0'
this.totalCoursePrice = res.data.totalCoursePrice ? this.totalCoursePrice = res.data.totalCoursePrice? res.data.totalCoursePrice: '0'
this.totalIncome = res.data.totalIncome this.totalIncome = res.data.totalIncome?res.data.totalIncome: '0'
this.sortswitch() 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