Merge branch 'xingao_master' into 'master'

修改对应的外连打开问题和学习数据加载控制问题

See merge request !2

pages/study/courseStudy.vue

@@ -88,9 +88,15 @@
 				</div>
 			 	<view v-if="curContent.contentType==52">
 			 		<!--外连接-->
-			 		<view v-if="conLink.url!=''" style="min-height: 400px;position: relative;">
-			 			<web-view :src="conLink.url"></web-view>
-			 		</view>
+			 		<view v-if="conLink.openType == 1">
+						<view v-if="conLink.url!=''" style="min-height: 400px;position: relative;">
+							<web-view :src="conLink.url"></web-view>
+						</view>
+					</view>
+					<view v-else>
+						<div style="text-align: center;padding: 20px;">{{ curContent.contentName }}</div>
+						<div style="text-align: center;padding: 20px;">{{ conLink.url }}</div>
+					</view>
 			 	</view>
 			 	<!--作业-->
 			 	<view v-if="curContent.contentType==60">
@@ -908,6 +914,10 @@
 					   this.conLink.url=con.content;
 					   this.conLink.openType=1;
 					}
+					if (this.conLink.openType == 2) {
+						//新的窗口直接打开
+						location.href=this.conLink.url
+					}
 				} else if(con.contentType==10 || con.contentType==20) {
 					
 					if(con.content.startsWith('\{')){

pages/study/index.vue

@@ -262,8 +262,6 @@
 			//document.cookie = "mytest=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
 		},
 		onLoad() {
-			this.loadBoeData(true);
-			
 			let $this = this;
 			uni.getSystemInfo({
 				success: (res) => {
@@ -285,6 +283,12 @@
 		 apiManage.getTaskNum().then(res => {
 			 if(res.code==200){
 				this.value=res.data.todoTaskCounts;
+				if(this.value>0){
+					this.loadBoeData(true);
+				}else{
+					this.tabIndex = 1;//切换到我报名的
+					this.getLearning(true);
+				}
 			 }
 		  });
 		},
@@ -545,13 +549,10 @@
 							this.taskHasMore = false;
 							this.loadStatus='noMore';
 						}
-						//下面的isOne没有看太明白，后续要去掉
-						if (this.isOne) {
-							//this.value = this.taskCount;
-						}
-						if (this.isOne && res.data.records.length == 0) {
-							this.tabIndex = 1;
-						}
+						//检查是否是第一次加载，这里的控制已经移到 初次加载中了
+						// if (this.isOne && res.data.records.length == 0) {
+						// 	this.tabIndex = 1;
+						// }
 						this.isOne = false;
 					}else{
 						uni.showToast({