Skip to content

C
CFFP-HB
Commit 2ddbecb6 by sunchao
Options

合并配置项冲突

parents 6216c5dd 94c3a61b
Showing with 109 additions and 47 deletions
pages/courseDetail/courseDetail.vue
......@@ -163,9 +163,14 @@
loginType: '',
sliceshare: false,
nonRequiredCount: 0,
requiredCount: 0
requiredCount: 0,
realName: ''
};
},
onLoad(){
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName
},
methods: {
goBack() {
console.log(12121232)
......@@ -193,6 +198,43 @@
url:val.item.link
})
},
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",
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));
}
});
}
},
// 订单保存
saveOrder() {
if (this.loginType === 'visitor') {
......
pages/invitationRegister/invitationRegister.vue
......@@ -23,7 +23,9 @@
areaName:'',
invitationName:'',
shareId:'',
levelaName:''
levelaName:'',
mobileNumber:'',
name:''
}
},
onLoad(options) {
......@@ -41,13 +43,15 @@
})
},
ckregister(){
let dataForm = {
name: this.name,
mobile: this.mobileNumber,
id:this.shareId
};
// ' let dataForm = {
// name: this.name,
// mobile: this.mobileNumber,
// id:this.shareId
// };'
uni.navigateTo({
url:'/pages/invitationRegister/invitationlogin?form=' + JSON.stringify(dataForm)
// url:'/pages/invitationRegister/invitationlogin?name=' + this.name+'&mobile=' +this.mobileNumber + '&id=' + this.shareId
url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}`
})
}
}
......
pages/invitationRegister/invitationlogin.vue
......@@ -55,7 +55,10 @@
}
},
onLoad(options) {
this.form =JSON.parse( options.form)
this.form.name = options.name?options.name:''
this.form.mobile = options.mobile? options.mobile: ''
this.form.id = options.id?options.id:''
// this.form =JSON.parse( options.form)
},
methods:{
sendMessage(){
......@@ -65,7 +68,6 @@
}
if(common.mobileNoValid(this.form.mobile) && !this.disabledSendBtn){
api.verificationCode(params).then((res)=>{
console.log(res)
if(res['success']){
this.delayTime()
}
......@@ -112,9 +114,11 @@
...this.form
}
api.loginVerification(params).then((res)=>{
console.log(res, 5524)
if(res['success']){
console.log(res, 5454)
this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1')
uni.setStorageSync('cffp_userId',this.userId);
uni.navigateTo({
url:'/pages/application-process/basic-info?userId=' + this.userId
})
......
pages/inviteJoin/inviteJoin.vue
......@@ -153,21 +153,27 @@
identityArr: ['工作室', '事业伙伴'],
applyIdentity: 0,
index: 0,
isCross: true,
isCross: false,
inviteLists: [],
orgList: [],
orgdataList:[],
orgdataList: [],
queryorgList: [],
shareId: ''
shareId: '',
realName:''
};
},
onLoad() {
this.getqueryOrgList()
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName
},
methods: {
queryorgchange(e) {
this.orgindex = e.detail.value
},
bindPChange(){
console.log('1')
},
// 查询组织list
getqueryOrgList() {
let CffpAreaQueryReqVO = {
......@@ -180,7 +186,7 @@
this.queryorgList = res.data.cffpAreaQuerys
this.orgList = res.data.cffpAreaQuerys
this.changeorgkey()
// this.orgList = res.data.cffpAreaQuerys.map((x) => x.areaName)
// console.log(this.orgList, 22225)
}
......@@ -196,22 +202,23 @@
this.applyIdentity = e.detail.value
this.changeorgkey()
},
changeorgkey(){
changeorgkey() {
let that = this
let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1'
that.orgdataList = []
for(var i=0; i< that.orgList.length; i++){
if (that.orgList[i].partnerLevel == orgKey || that.orgList[i].partnerLevel == 'All') {
return that.orgdataList.push(that.orgList[i].areaName)
console.log(that.orgList, 1115)
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)
}
}
// this.orgdataList = this.orgList.filter((x) => {
// if (x.partnerLevel == orgKey || x.partnerLevel == 'All') {
// return x.areaName
// }
// })
// this.orgList = this.orgdataList.map((x) => x.areaName)
that.orgdataList = list.map((x) => x.areaName)
},
// 发起邀请事件
shareToggle() {
......@@ -241,10 +248,10 @@
if (res['success']) {
// this.switchTab(2)
this.shareId = res.data.id
this.$refs.share.open()
// uni.navigateTo({
// url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
// })
// this.$refs.share.open()
uni.navigateTo({
url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
})
}
uni.showToast({
title: res['message'],
......@@ -272,8 +279,8 @@
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
title: "uni-app分享",
summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！",
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));
......@@ -289,8 +296,8 @@
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
title: "uni-app分享",
summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！",
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));
......
pages/learnCertify/learnCertify.vue
......@@ -12,13 +12,15 @@
<!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'">
认证中
</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=='3'">通过认证</span>
</view>
<image :src="certifyItem.cerLogoUrl" mode="widthFix"></image>
<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 class="title">
......@@ -71,7 +73,8 @@
planFaqs:[],
boutiqueWelfares:[],
mask_flag:false,
qrCode:null
qrCode:null,
userId:uni.getStorageSync('cffp_userId')
}
},
components:{},
......@@ -80,7 +83,7 @@
},
methods:{
getLearnCertifyList(){
api.queryCertificateList({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
api.queryCertificateList({userId: 1}).then((res)=>{
console.log(res)
if(res['success']){
this.certificates = res['data']['certificates'];
......@@ -95,13 +98,13 @@
},
switchDetail(certifyItem){
//2通过跳到证书页，1跳到证书详情
if(certifyItem.isAdopt == 1){
if(certifyItem.isAdopt == 3){
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({
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 @@
},
userStudyTime(){
api.userStudyTime({userId:this.userId,month:this.month}).then(res=>{
console.log(res, 2555)
if(res['success']){
this.userStudyTimeList = res['data']['studyInfos'];
this.$nextTick(() => {
......
pages/myCertify/myCertify.vue
......@@ -58,7 +58,7 @@
tabType:1,
signupInfos:[],
userCertificates:[],
userId: uni.getStorageSync('user_mobile')
userId: uni.getStorageSync('user_mobile')
};
},
methods:{
......@@ -71,7 +71,7 @@
}
},
querySignupList(){
api.querySignupList({userId:this.userId}).then(res=>{
api.querySignupList({userId:1}).then(res=>{
console.log(res);
if(res['success']){
this.signupInfos = res['data']['signupInfos']
......
pages/personalCenter/system/accontsetting.vue
......@@ -62,7 +62,7 @@
showCancel: true,
success: function(res) {
if (res.confirm) {
uni.removeStorageSync('isLogin')
uni.clearStorageSync();
uni.reLaunch({
url:'/components/login/login'
})
......
util/router.js
//只要是未登录状态，想要跳转到名单内的路径时，直接跳到登录页
// 页面白名单，不受拦截
const whiteList = [
'/components/login/login'
'/components/login/login',
'/pages/invitationRegister/invitationlogin',
]
export default function initApp(){
uni.addInterceptor('navigateTo', {
......@@ -38,7 +39,7 @@ function hasPermission (url) {
let islogin = uni.getStorageSync("isLogin");//在这可以使用token、vuex
islogin = Boolean(Number(islogin));//返回布尔值
// 在白名单中或有登录判断条件可以直接跳转
if(whiteList.indexOf(url) !== -1 || islogin) {
if(whiteList.indexOf(url.slice(0,url.indexOf('?'))) !== -1 || islogin) {
return true
}
return false
......
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