Commit 6b6bae6f by yuzhenWang

修复未加盟看佣金bug

parent 1cc7e75f
...@@ -210,7 +210,8 @@ ...@@ -210,7 +210,8 @@
name: '成交订单', name: '成交订单',
icon:'icon-dingdan', icon:'icon-dingdan',
link: '/pages/saleCourseLists/saleCourseLists', link: '/pages/saleCourseLists/saleCourseLists',
isOpen: true isOpen: true,
enName:'order'
}, },
{ {
key: '01', key: '01',
...@@ -462,11 +463,7 @@ ...@@ -462,11 +463,7 @@
} }
if (this.cffpUserInfo.partnerType == null && featureItem.isJoin) { if (this.cffpUserInfo.partnerType == null && featureItem.isJoin) {
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
// uni.showToast({
// title: "您本人尚未加盟,您加盟后可邀请加盟",
// duration: 2000,
// icon: 'none'
// });
return false return false
} else if (featureItem.isOpen && featureItem.link) { } else if (featureItem.isOpen && featureItem.link) {
if (featureItem.key == '07') { if (featureItem.key == '07') {
...@@ -474,8 +471,10 @@ ...@@ -474,8 +471,10 @@
url: featureItem.link url: featureItem.link
}) })
} else { } else {
const urlObj = JSON.parse(JSON.stringify(featureItem))
urlObj.link =urlObj.enName=='order'? `${urlObj.link}?partnerType=${this.cffpUserInfo.partnerType}`:urlObj.link
uni.navigateTo({ uni.navigateTo({
url: featureItem.link url: urlObj.link
}) })
} }
} else { } else {
......
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
}, },
// 查看佣金 // 查看佣金
viewIntegral(){ viewIntegral(){
if(this.partnerType == 'undefined'){ if(this.partnerType == 'null'){
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
return return
} }
...@@ -224,6 +224,10 @@ ...@@ -224,6 +224,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
margin: 0 !important;
border-radius: 30rpx;
}
.container { .container {
padding-bottom: 20rpx; padding-bottom: 20rpx;
display: flex; display: flex;
......
...@@ -320,25 +320,21 @@ ...@@ -320,25 +320,21 @@
ckidentity(item){ ckidentity(item){
if(item.identity == true && this.customerBasicInfo.partnerType ==null){ if(item.identity == true && this.customerBasicInfo.partnerType ==null){
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
// uni.showToast({
// title: "您本人尚未加盟,您加盟后可邀请加盟",
// duration: 2000,
// icon: 'none'
// });
return false return false
}else if(item.title == '邀请加盟'){ }else if(item.title == '邀请加盟'){
uni.navigateTo({ uni.navigateTo({
url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode
}); });
}else{ }else{
item.link = `${item.link}?from=personalCenter&partnerType=${item.partnerType}` const urlObj = JSON.parse(JSON.stringify(item))
urlObj.link = `${urlObj.link}?from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`
if(item.isTab){ if(item.isTab){
uni.switchTab({ uni.switchTab({
url:`../../${item.link}` url:`../../${urlObj.link}`
}) })
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: item.link url: urlObj.link
}); });
} }
......
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
// 查看佣金 // 查看佣金
viewIntegral(){ viewIntegral(){
if(this.partnerType == 'undefined'){ if(this.partnerType == 'null'){
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
return return
} }
...@@ -238,6 +238,10 @@ ...@@ -238,6 +238,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
margin: 0 !important;
border-radius: 30rpx;
}
.container{ .container{
// padding-bottom: 50rpx; // padding-bottom: 50rpx;
display: flex; display: flex;
......
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