Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/index/index.vue

@@ -9,10 +9,10 @@
 		<view class="msg-view">
 			<view class="msg-title">最新消息</view>
 			<view class="msg-list-view">
-				<view class="msg-content" v-for="(item, index) in messageList" :key="index">
+				<view class="msg-content" v-for="(item, index) in messageList" :key="index" @click="toNewsDetail(item)">
 					<view class="msg-content-view">
 						<view class="left-view">
-							<image class="msg-icon" :src="msgStyleImage[item.content_type]"></image>
+							<image class="msg-icon" :src="msgStyleImage[item.is_top]"></image>
 							<text class="msg-text">{{ item.title }}</text>
 						</view>
 						<image class="right-icon" :src="shouyeyouImage"></image>
@@ -123,8 +123,8 @@
 			msgStyleImage() {
 				return {
 					'1': process.uniEnv.qn_base_url + "zhiding.png", // 置顶
-					'2': process.uniEnv.qn_base_url + "tongzhi.png", // 通知
-					'3': process.uniEnv.qn_base_url + "xiaoxi.png", // 消息
+					'0': process.uniEnv.qn_base_url + "tongzhi.png", // 通知
+					// '3': process.uniEnv.qn_base_url + "xiaoxi.png", // 消息
 				}
 			},
 			bannerImage() {
@@ -398,7 +398,15 @@
 					fail: function(err) {
 					}
 				});
-			},
+			},
+            toNewsDetail(item) {
+                wx.navigateTo({
+                    url: '/pages/learn/news-details',
+                    success: function(res) {
+                        res.eventChannel.emit('acceptDataFromLearn', item)
+                    }
+                });
+            }
 		},
 	};
 </script>

src/pages/index/learn.vue

@@ -744,7 +744,7 @@
     .notice {
         /* border: #808080 solid 2rpx; */
         width: 100%;
-        height: 370rpx;
+        min-height: 370rpx;
         margin-top: 36rpx;
         overflow: hidden;
         background-color: #ffffff;
@@ -868,7 +868,7 @@
     }
 
     swiper {
-        height: 920rpx;
+        height: 65vh;
     }
 
     .line-percent {