Skip to content

C
CFFP-HB
Commit 112a6cf2 by sunerhu
Options

1.修改了一些Bug

parent 7cd97c70
Showing with 42 additions and 32 deletions
manifest.json
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
"sdkConfigs" : { "sdkConfigs" : {
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "wxec09b9be6cff4eb3", "appid" : "wxb591d0034cdcf0cd",
"UniversalLinks" : "" "UniversalLinks" : ""
} }
}, },
...@@ -71,13 +71,13 @@ ...@@ -71,13 +71,13 @@
}, },
"weixin" : { "weixin" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ],
"appid" : "wxec09b9be6cff4eb3", "appid" : "wxb591d0034cdcf0cd",
"UniversalLinks" : "" "UniversalLinks" : ""
} }
}, },
"oauth" : { "oauth" : {
"weixin" : { "weixin" : {
"appid" : "wxec09b9be6cff4eb3", "appid" : "wxb591d0034cdcf0cd",
"UniversalLinks" : "" "UniversalLinks" : ""
} }
} }
......
pages/inviteJoin/inviteJoin.vue
...@@ -153,21 +153,26 @@ ...@@ -153,21 +153,26 @@
identityArr: ['工作室', '事业伙伴'], identityArr: ['工作室', '事业伙伴'],
applyIdentity: 0, applyIdentity: 0,
index: 0, index: 0,
isCross: true, isCross: false,
inviteLists: [], inviteLists: [],
orgList: [], orgList: [],
orgdataList:[], orgdataList: [],
queryorgList: [], queryorgList: [],
shareId: '' shareId: ''
}; };
}, },
onLoad() { onLoad() {
this.getqueryOrgList() this.getqueryOrgList()
console.log(uni.getStorageSync('userinfodataForm'),74174)
let dataForm = uni.getStorageSync('userinfodataForm')
}, },
methods: { methods: {
queryorgchange(e) { queryorgchange(e) {
this.orgindex = e.detail.value this.orgindex = e.detail.value
}, },
bindPChange(){
console.log('1')
},
// 查询组织list // 查询组织list
getqueryOrgList() { getqueryOrgList() {
let CffpAreaQueryReqVO = { let CffpAreaQueryReqVO = {
...@@ -180,7 +185,7 @@ ...@@ -180,7 +185,7 @@
this.queryorgList = res.data.cffpAreaQuerys this.queryorgList = res.data.cffpAreaQuerys
this.orgList = res.data.cffpAreaQuerys this.orgList = res.data.cffpAreaQuerys
this.changeorgkey() this.changeorgkey()
// this.orgList = res.data.cffpAreaQuerys.map((x) => x.areaName) // this.orgList = res.data.cffpAreaQuerys.map((x) => x.areaName)
// console.log(this.orgList, 22225) // console.log(this.orgList, 22225)
} }
...@@ -196,22 +201,23 @@ ...@@ -196,22 +201,23 @@
this.applyIdentity = e.detail.value this.applyIdentity = e.detail.value
this.changeorgkey() this.changeorgkey()
}, },
changeorgkey(){ changeorgkey() {
let that = this let that = this
let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1' let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1'
that.orgdataList = [] that.orgdataList = []
for(var i=0; i< that.orgList.length; i++){
if (that.orgList[i].partnerLevel == orgKey || that.orgList[i].partnerLevel == 'All') { console.log(that.orgList, 1115)
return that.orgdataList.push(that.orgList[i].areaName) const list = that.orgList.map(item => {
if(item.partnerLevel == orgKey || item.partnerLevel == 'ALL'){
return item
}
});
for (var i = 0; i < list.length; i++) {
if (list[i] == undefined) {
list.splice(i,1)
} }
} }
that.orgdataList = list.map((x) => x.areaName)
// this.orgdataList = this.orgList.filter((x) => {
// if (x.partnerLevel == orgKey || x.partnerLevel == 'All') {
// return x.areaName
// }
// })
// this.orgList = this.orgdataList.map((x) => x.areaName)
}, },
// 发起邀请事件 // 发起邀请事件
shareToggle() { shareToggle() {
...@@ -272,8 +278,8 @@ ...@@ -272,8 +278,8 @@
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: "uni-app分享", title: "CFFP家庭财务策划师联盟邀您加入",
summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！", summary: `我是家庭财务策划师${uni.getStorageSync('cffp_userId')}正在使用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));
...@@ -289,8 +295,8 @@ ...@@ -289,8 +295,8 @@
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: "uni-app分享", title: "CFFP家庭财务策划师联盟邀您加入",
summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！", summary: "我是家庭财务策划师***正在使用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));
......
pages/learnCertify/learnCertify.vue
...@@ -12,13 +12,15 @@ ...@@ -12,13 +12,15 @@
<!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'"> <!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'">
认证中 认证中
</view> --> </view> -->
<view :class="certifyItem.isAdopt=='1' ? 'isUnder' : 'isAdopt'" > <view :class="certifyItem.isAdopt=='1' ? 'isUnder' : certifyItem.isAdopt=='3' ? 'isAdopt' : ''" >
<span v-if="certifyItem.isAdopt=='1'">认证中</span> <span v-if="certifyItem.isAdopt=='1'">认证中</span>
<span v-if="certifyItem.isAdopt=='3'">通过认证</span> <span v-if="certifyItem.isAdopt=='3'">通过认证</span>
</view> </view>
<image :src="certifyItem.cerLogoUrl" mode="widthFix"></image> <image :src="certifyItem.cerLogoUrl" mode="widthFix"></image>
<text class="certify_name">{{certifyItem.cerName}}</text> <text class="certify_name">{{certifyItem.cerName}}</text>
<view class="view_btn" @click="switchDetail(certifyItem)">{{certifyItem.isAdopt=='2'?'查看证书':'认证详情'}}</view> <view class="view_btn" @click="switchDetail(certifyItem)">
<span>{{certifyItem.isAdopt=='3'?'查看证书':'认证详情'}}</span>
</view>
</view> </view>
</view> </view>
<view class="title"> <view class="title">
...@@ -71,7 +73,8 @@ ...@@ -71,7 +73,8 @@
planFaqs:[], planFaqs:[],
boutiqueWelfares:[], boutiqueWelfares:[],
mask_flag:false, mask_flag:false,
qrCode:null qrCode:null,
userId:uni.getStorageSync('cffp_userId')
} }
}, },
components:{}, components:{},
...@@ -80,7 +83,7 @@ ...@@ -80,7 +83,7 @@
}, },
methods:{ methods:{
getLearnCertifyList(){ getLearnCertifyList(){
api.queryCertificateList({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{ api.queryCertificateList({userId: 1}).then((res)=>{
console.log(res) console.log(res)
if(res['success']){ if(res['success']){
this.certificates = res['data']['certificates']; this.certificates = res['data']['certificates'];
...@@ -95,13 +98,13 @@ ...@@ -95,13 +98,13 @@
}, },
switchDetail(certifyItem){ switchDetail(certifyItem){
//2通过跳到证书页，1跳到证书详情 //2通过跳到证书页，1跳到证书详情
if(certifyItem.isAdopt == 1){ if(certifyItem.isAdopt == 3){
uni.navigateTo({ uni.navigateTo({
url:`../certifyDetail/certifyDetail?certificateId=${certifyItem.certificateId}&userSignupId=null` url:`../authentication-query/authentication-result?queryType=1`
}) })
}else if(certifyItem.isAdopt == 2){ }else{
uni.navigateTo({ uni.navigateTo({
url:`../authentication-query/authentication-result?queryType=1` url:`../certifyDetail/certifyDetail?certificateId=${certifyItem.certificateId}&userSignupId=null&status=${certifyItem.isAdopt}`
}) })
} }
}, },
......
pages/learningStatistics/learningStatistics.vue
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
}, },
userStudyTime(){ userStudyTime(){
api.userStudyTime({userId:this.userId,month:this.month}).then(res=>{ api.userStudyTime({userId:this.userId,month:this.month}).then(res=>{
console.log(res, 2555)
if(res['success']){ if(res['success']){
this.userStudyTimeList = res['data']['studyInfos']; this.userStudyTimeList = res['data']['studyInfos'];
this.$nextTick(() => { this.$nextTick(() => {
......
pages/myCertify/myCertify.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
tabType:1, tabType:1,
signupInfos:[], signupInfos:[],
userCertificates:[], userCertificates:[],
userId: uni.getStorageSync('user_mobile') userId: uni.getStorageSync('user_mobile')
}; };
}, },
methods:{ methods:{
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
} }
}, },
querySignupList(){ querySignupList(){
api.querySignupList({userId:this.userId}).then(res=>{ api.querySignupList({userId:1}).then(res=>{
console.log(res); console.log(res);
if(res['success']){ if(res['success']){
this.signupInfos = res['data']['signupInfos'] this.signupInfos = res['data']['signupInfos']
......
pages/personalCenter/system/accontsetting.vue
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
showCancel: true, showCancel: true,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.removeStorageSync('isLogin') uni.clearStorageSync();
uni.reLaunch({ uni.reLaunch({
url:'/components/login/login' url:'/components/login/login'
}) })
......
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