修复未加盟看佣金bug

pages/index/index.vue

@@ -210,7 +210,8 @@
 						name: '成交订单',
 						icon:'icon-dingdan',
 						link: '/pages/saleCourseLists/saleCourseLists',
-						isOpen: true
+						isOpen: true,
+						enName:'order'
 					},
 					{
 						key: '01',
@@ -462,11 +463,7 @@
 				}
 				if (this.cffpUserInfo.partnerType == null && featureItem.isJoin) {
 					this.$refs.joinPopup.open()
-					// uni.showToast({
-					// 	title: "您本人尚未加盟，您加盟后可邀请加盟",
-					// 	duration: 2000,
-					// 	icon: 'none'
-					// });
+					
 					return false
 				} else if (featureItem.isOpen && featureItem.link) {
 					if (featureItem.key == '07') {
@@ -474,8 +471,10 @@
 							url: featureItem.link
 						})
 					} else {
+						const urlObj = JSON.parse(JSON.stringify(featureItem))
+						urlObj.link =urlObj.enName=='order'? `${urlObj.link}?partnerType=${this.cffpUserInfo.partnerType}`:urlObj.link
 						uni.navigateTo({
-							url: featureItem.link
+							url: urlObj.link
 						})
 					}
 				} else {

pages/myShare/myShare.vue

@@ -201,7 +201,7 @@
 			},
 			// 查看佣金
 			viewIntegral(){
-				if(this.partnerType == 'undefined'){
+				if(this.partnerType == 'null'){
 					this.$refs.joinPopup.open()
 					return
 				}
@@ -224,6 +224,10 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .uni-popup .uni-popup__wrapper{
+		 margin: 0 !important;
+		 border-radius: 30rpx;
+	 }
 	.container {
 		padding-bottom: 20rpx;
 		display: flex;

pages/personalCenter/personalCenter.vue

@@ -320,25 +320,21 @@
 			ckidentity(item){
 				if(item.identity == true && this.customerBasicInfo.partnerType ==null){
 					this.$refs.joinPopup.open()
-					// uni.showToast({
-					// 	title: "您本人尚未加盟，您加盟后可邀请加盟",
-					// 	duration: 2000,
-					// 	icon: 'none'
-					// });
 					return false
 				}else if(item.title == '邀请加盟'){
 					uni.navigateTo({
 						url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode
 					});
 				}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){
 						uni.switchTab({
-							url:`../../${item.link}`
+							url:`../../${urlObj.link}`
 						})
 					}else{
 						uni.navigateTo({
-							url: item.link
+							url: urlObj.link
 						});
 					}
 					

pages/saleCourseLists/saleCourseLists.vue

@@ -212,7 +212,7 @@
 			
 			// 查看佣金
 			viewIntegral(){
-				if(this.partnerType == 'undefined'){
+				if(this.partnerType == 'null'){
 					this.$refs.joinPopup.open()
 					return
 				}
@@ -238,6 +238,10 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .uni-popup .uni-popup__wrapper{
+		 margin: 0 !important;
+		 border-radius: 30rpx;
+	 }
 	.container{
 		// padding-bottom: 50rpx;
 		display: flex;