Merge branch 'uat' into 'master'

Uat

See merge request !53

pages.json

@@ -539,7 +539,7 @@
 			"style": {
 				"navigationBarTitleText": "协议"
 			}
-		},
+		}
 		]
 	},{
 		"root": "officialWebsite",

pages/courselist/courselist.vue

 <template>
 	<!-- :style="{paddingTop: showFlag ? '0' : '60rpx'}" -->
-	<view class="container" >
+	<view class="container" :style="{paddingTop: showFlag ? '0' : '60rpx'}">
 		<view class="homeHeader" v-if="showFlag">
 			<view class="one">
 				<text style="font-size: 80rpx;">01</text>
@@ -210,6 +210,9 @@
 				this.$refs.partnerTipPopup.close()
 			},
 			gotoShare(item){
+				if(uni.getStorageSync('cffp_userInfo')){
+					this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
+				}
 				this.shareItem = JSON.parse(JSON.stringify(item))
 				// 未登录去登录
 				if(uni.getStorageSync('loginType')!=='codelogin'){
@@ -224,7 +227,18 @@
 					this.sharelogin = true
 					return
 				}
-				
+				if(this.runEnv == 'browser'){
+					dataHandling.pocessTracking(
+					  '点击',
+					  `用户在产品中心浏览器端点击产品分享按钮`,
+					  '点击',
+					  2,
+					  '产品中心',
+					  'pages/courselist/courselist'
+					)
+					this.$refs.popup.open()
+					return
+				}
 				// 已登录，未成为合伙人
 				if(this.userInfo&&!this.userInfo['partnerType']) {
 					dataHandling.pocessTracking(

pages/index/index.vue

@@ -280,6 +280,7 @@
 		},
 		
 		onShow() {
+			console.log('11111');
 			this.loginType = uni.getStorageSync('loginType')
 			this.init();
 			this.showSearch = false;
@@ -325,6 +326,7 @@
 							nickName:res['data']['nickName'],
 						}
 						uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo));
+						console.log('cffp_userInfo.partnerType',cffp_userInfo.partnerType);
 						if(cffp_userInfo.partnerType){
 							this.featureLists = [{key: '00',name: '成交订单',icon:'icon-dingdan',link: '/pages/saleCourseLists/saleCourseLists',isOpen: true,enName:'order'},
 							{key: '01',name: '佣金',icon: 'icon-yongjin',link: '/pages/pointsExchange/pointsExchange',isOpen: true,isJoin: true},
@@ -390,6 +392,34 @@
 					 this.querySystemMessage()
 					 this.queryInfo()
 				}else {
+					this.featureLists =[
+						{
+							key: '02',
+							name: '申请加盟',
+							icon: 'icon-hezuo',
+							link: '/myPackageA/applyFranchise/applyFranchise',
+							isOpen: true,
+							isApply:true
+						},
+						{
+							key: '07',
+							name: '分享产品',
+							icon: 'icon-zhuanfa',
+							link: '/pages/courselist/courselist',
+							isOpen: true,
+						},
+						
+						{
+							key: '04',
+							name: '邀请加盟',
+							icon: 'icon-yaoqing',
+							link: '/pages/inviteJoin/inviteJoin',
+							isOpen: true,
+							isJoin: true
+						},
+						
+					]
+					console.log('this.featureLists',this.featureLists);
 					uni.removeTabBarBadge({ index: 3 });
 				}
 				if (uni.getStorageSync('isLogin')) {
@@ -398,6 +428,7 @@
 						this.loginornot = false
 					}else{
 						this.loginornot = true;
+						
 					}
 					this.queryAreaCenterInfo();
 				} else {