Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/mobile into stat

App.vue

@@ -93,7 +93,12 @@
 			 }
 		 }  
 	}
-	
+	uni-toast .uni-toast{
+		img{
+			width: 38px;
+			height: 18px;
+		}
+	}
 	/**统一样式*/
 	.fixed-field{
 		width: 180px;

pages/login/nickName.vue

@@ -34,7 +34,8 @@
 					if(res.status==200){
 						uni.showToast({
 						    title:"修改成功" ,
-							duration: 1000
+							duration: 1000,
+							image:'../../static/images/icon/ok-icon.png'
 						});
 						setTimeout(()=>{
 							uni.navigateTo({

pages/my/myFavorites.vue

@@ -338,15 +338,9 @@ export default {
 			
 		},
 		toCourseDetail(citem) {
-			if (citem.contentType == 10) {
 				uni.navigateTo({
-					url: '/pages/resource/microDetail?id=' + citem.objId
+					url: '/pages/study/courseStudy?id=' + citem.objId
 				});
-			} else if (citem.contentType == 20 || citem.contentType == 21) {
-				uni.navigateTo({
-					url: '/pages/resource/courseDetail?id=' + citem.objId
-				});
-			}
 		},
 		toArticleDetail(item) {
 			uni.navigateTo({

pages/my/myQa.vue

@@ -190,9 +190,9 @@
 		 },
 		 
 		 // 实例被激活时使用，用于重复激活一个实例的时候
-		 activated () {
+		 // activated () {
-			this.findData(true);
+			// this.findData(true);
-		 },
+		 // },
 		 
 		 
 		 methods:{
@@ -244,7 +244,9 @@
 			 				  .then(res => {
 			 				    if (res.status == 200) {
 									uni.showToast({
-									      title:'删除成功'
+									      title:'删除成功',
+										  // duration:500000
+										  image:'../../static/images/icon/ok-icon.png'
 									     })
 			 				      // $this.$refs.articleToast.show({message:'删除成功',type:'success'});
 			 					  $this.findAnData(true);
@@ -292,7 +294,8 @@
 			 				apiQa.del(item.id).then(res=>{
 			 					if(res.status=200){
 									uni.showToast({
-									      title:'删除成功'
+									      title:'删除成功',
+										  image:'../../static/images/icon/ok-icon.png'
 									     })
 			 						// $this.$refs.articleToast.show({message:'删除成功',type:'success'});
 									let event = {

pages/my/myShares.vue

@@ -285,15 +285,16 @@ export default {
 			});
 		},
 		toCourseDetail(citem) {
-			if (citem.contentType == 10) {
+			// if (citem.contentType == 10) {
+				// uni.navigateTo({
+				// 	url: '/pages/resource/microDetail?id=' + citem.objId
+				// });
+			// } else {
+				
 				uni.navigateTo({
-					url: '/pages/resource/microDetail?id=' + citem.objId
+					url: '/pages/study/courseStudy?id=' + citem.id
 				});
-			} else if (citem.contentType == 20 || citem.contentType == 21) {
+			// }
-				uni.navigateTo({
-					url: '/pages/resource/courseDetail?id=' + citem.objId
-				});
-			}
 		},
 		toArticleDetail(item) {
 			uni.navigateTo({

pages/my/setting.vue

@@ -128,7 +128,8 @@
 										this.$store.dispatch('InitData');
 										// uni.navigateBack(-1);
 										uni.showToast({
-											title:'更新成功'
+											title:'更新成功',
+											image:'../../static/images/icon/ok-icon.png'
 										})
 									} else {
 										uni.showToast({

pages/resource/search.vue

@@ -84,7 +84,7 @@
 									<course-image :course="c" width="308upx" height="192upx"></course-image>
 								</view>
 								<view class="coures-conent">
-									<view class="conent-title" v-html="c.name">
+									<view class="conent-title" v-html="$keywordActiveShow(c.name,keyword)">
 									</view>
 									<!-- <view class="con-au"> -->
 										<!-- <view v-else style="font-size: 24upx; color: #666666;padding-top: 10upx;"> -->
@@ -101,7 +101,7 @@
 											</view>
 										{{converToScore(c.score)}}
 										</text>
-										<text>{{ c.score }}<text class="statuy-num">{{c.studies}}+</text>人学习</text>
+										<text><text class="statuy-num">{{c.studies}}+</text>人学习</text>
 									</view>
 								</view>
 							</view>
@@ -713,15 +713,9 @@
 			},
 			toCoursePage(coure){
 				if(coure.source ==1){
-				 uni.navigateTo({
 				 uni.navigateTo({
-				 });
+				 	url: '/pages/study/studydetail?id='+coure.id+'&type='+coure.type
 				 });
-				if(coure.type==10){
-					uni.navigateTo({
-						url: '/pages/resource/microDetail?id='+coure.id
-					})
-				}else if(coure.type==20){
 				} else {
 					uni.navigateTo({
 						url: '/pages/study/courseStudy?id='+coure.id