解决冲突

components/menuList/menuList.vue

@@ -30,7 +30,6 @@
 			return {}
 			return {}
 		},
 		},
 		mounted() {
 		mounted() {
-			console.log(this.minorMenuLists)
 		},
 		},
 		methods: {
 		methods: {
 			goDetail(item) {
 			goDetail(item) {

pages/courseDetail/courseDetail.vue

@@ -41,7 +41,7 @@
 					</view> -->
 					</view> -->
 					<!-- v-if="isWeixin == true" -->
 					<!-- v-if="isWeixin == true" -->
 					<view class="awakenApp" v-if="isWeixin == true">
 					<view class="awakenApp" v-if="isWeixin == true">
-						<wx-open-launch-app id="launch-btn" appid="wxb591d0034cdcf0cd" extinfo="extinfo">
+						<wx-open-launch-app id="launch-btn" appid="wxb591d0034cdcf0cd" extinfo="extinfo" v-if="isWeixin == true">
 							<view v-is="'script'" type="text/wxtag-template">
 							<view v-is="'script'" type="text/wxtag-template">
 								<!-- <view class="" style="width: 50rpx; height: 50rpx;">
 								<!-- <view class="" style="width: 50rpx; height: 50rpx;">
 									<image style="width: 50rpx; height: 50rpx;" src="../../static/Slice117.png" mode=""></image>
 									<image style="width: 50rpx; height: 50rpx;" src="../../static/Slice117.png" mode=""></image>

pages/inviteJoin/inviteJoin.vue

@@ -60,7 +60,7 @@
 						</text>
 						</text>
 					</view> -->
 					</view> -->
 				</view>
 				</view>
-				<share></share>
+				<!-- <share></share> -->
 				<button type="primary" plain="true" class="sendInvite" @click="shareToggle()">发出邀请</button>
 				<button type="primary" plain="true" class="sendInvite" @click="shareToggle()">发出邀请</button>
 			</view>
 			</view>
 			<!-- 邀请信息 -->
 			<!-- 邀请信息 -->
@@ -173,7 +173,7 @@
 			goBack(){
 			goBack(){
 				uni.navigateBack({  
 				uni.navigateBack({  
 					delta: 1  
 					delta: 1  
-				});	
+				})
 			},
 			},
 			// 暂时废弃
 			// 暂时废弃
 			// blueInput(name) {
 			// blueInput(name) {

pages/personalCenter/teamMembers/members.vue

@@ -42,7 +42,7 @@
 				type: String
 				type: String
 			},
 			},
 			count: {
 			count: {
-				type: String
+				type: Number
 			}
 			}
 		},
 		},
 		components:{
 		components:{

pages/personalCenter/teamMembers/teamMembers.vue

@@ -47,7 +47,7 @@
 				tabType: 1,
 				tabType: 1,
 				userStudyLists: [],
 				userStudyLists: [],
 				userId: uni.getStorageSync('cffp_userId'),
 				userId: uni.getStorageSync('cffp_userId'),
-				count:'',
+				count:0,
 				directList: null, //直属团队数组
 				directList: null, //直属团队数组
 				raiseList: null,  //所辖团队数组
 				raiseList: null,  //所辖团队数组
 				otherList: null, // 其他
 				otherList: null, // 其他

pages/personalCenter/teamPerformance/teamPerformance.vue

@@ -2,14 +2,14 @@
 	<view class="content">
 	<view class="content">
 		<view class="header">
 		<view class="header">
 			<view class="header-time" style="">
 			<view class="header-time" style="">
-				<time-picker @change="change" fields="month" icon="true">
+				<time-picker @change="change" fields="month" :icon="true">
 				</time-picker>
 				</time-picker>
 			</view>
 			</view>
 			<view style="margin: 10rpx 20rpx;">
 			<view style="margin: 10rpx 20rpx;">
 				<text>-</text>
 				<text>-</text>
 			</view>
 			</view>
 			<view class="header-time">
 			<view class="header-time">
-				<time-picker @change="changetimeend" fields="month" icon="true">
+				<time-picker @change="changetimeend" fields="month" :icon="true">
 				</time-picker>
 				</time-picker>
 			</view>
 			</view>
 			<!-- 			<view class="timeSelectContent">
 			<!-- 			<view class="timeSelectContent">