diff --git a/pages/course/index.vue b/pages/course/index.vue
index fca129d..38bf1a9 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -1,440 +1,465 @@
-<template>
-	<view class="konwledge-index index">
-		<!-- <view class="header header-search acea-row row-center-wrapper"> -->
-			<!-- <view @click="goGoodSearch()" class="search acea-row row-middle">
-				<text class="iconfont icon-xiazai5"></text>
-				搜索商品
-			</view> -->
-			<!-- #ifndef H5 -->
-			<!-- <view class="qr" @click="startQr()" v-if="$deviceType !== 'weixin'">
-				<image src="../../static/saoyisao-icon.png" />
-			</view> -->
-			<!-- #endif -->
-		<!-- </view> -->
-		<view class="content-box">
-			<view class="tab-box" :class="isFixedTop ? 'fixed' : ''">
-				<!-- <wuc-tab :tab-list="tabList" :tabCur.sync="TabCur" @change="tabChange"
-					tab-class="text-center text-black bg-white" select-class="text-orange text-xl">
-				</wuc-tab> -->
-				<view class="tabs">
-					<scroll-view class="scroll-view_H" scroll-x="true" scroll-with-animation :scroll-left='scrollLeft'>
-						<view class="tab-item scroll-item" :class="index == tabSelect ? 'tab-item-active' : ''"
-						 v-for="(item,index) in tabList" :key="item.id" 
-						 
-						 @click="tabChange(item,index)">{{item.categoryName}}</view>
-					</scroll-view>
-				</view>
-				<SecondMenu :menuList="secondMenu" :active.sync="active" @secondMenuClick="secondMenuClick" v-if="secondMenu.length > 0">
-				</SecondMenu>
-			</view>
-			<view class="bangdan-box" v-if="studyList.length > 0">
-			<view class="active-word">打卡榜</view>
-				<view class="bangdan-list">
-					<scroll-view class="scroll-view_H" scroll-x="true"  v-if="studyList.length > 0">
-						<view class="bangdan-item" 
-						:class="index%2 !== 0 ? 'bgR' : ''" 
-						v-for="(item,index) in studyList" :key="index"
-						@click="toStudyDetail(item.id)">
-							<view>
-								<view>{{item.listName}}</view>
-								<view class="time">{{item.listStartTime.split(' ')[0]}} 至 {{item.listEndTime.split(' ')[0]}}</view>
-							</view>
-							<view class="acea-row row-between-wrapper" style="width: 100%;margin-top: 30rpx;">
-								<view class="jifen">{{item.integral}}积分</view>
-								<view class="signin-btn">报名参加</view>
-							</view>
-						</view>
-					</scroll-view>
-					<!-- <view class="no-content" v-if="studyList.length == 0">暂无内容...</view> -->
-				</view>
-			</view>
-			<view class="knowledge-list">
-				<view class="active-word">课程</view>
-				<view class="no-content" v-if="courseList.length == 0">暂无内容...</view>
-				<view class="knowledge-item acea-row" v-for="(item,index) in courseList" :key="index" @click="toDetail(item.id)">
-					<view class="img-box">
-						<image :src="item.coverImg" mode="aspectFill"></image>
-					</view>
-					<view class="knowledge-info-box">
-						<view class="title line1">{{item.courseName}}</view>
-						<view class="time">{{utils.spl(item.courseStartTime)[0]}}至{{utils.spl(item.courseEndTime)[0]}}</view>
-						<view class="address">{{item.coursePlace}}</view>
-						<view class="type-box acea-row row-between row-middle">
-							<!-- <view class="price">￥{{item.courseCharge}}</view> -->
-							<!-- <view class="price">{{item.levelName}}</view> -->
-							<view></view>
-							<!-- <view class="price colG" v-if="item.chargeType == 0">免费</view> -->
-							<view class="signin-btn yellow">去报名</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script module="utils" lang="wxs" src="../../utils/subutil.wxs"></script>
-<script>
-	import WucTab from '@/components/wuc-tab/wuc-tab.vue';
-	import SecondMenu from '../knowledge/components/secondMenu.vue';
-	import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
-	import {
-		getCategory,
-		getArticle,
-		getStudyList,
-		getCourses
-	} from '@/api/knowledge';
-	export default {
-		computed: mapGetters(['userInfo']),
-		data() {
-			return {
-				windowWidth:'',
-				isFixedTop: false,
-				currentTab:null,
-				tabSelect:0,
-				scrollLeft:200,
-				tabList: [],
-				secondMenu: [],
-				active: null,
-				courseList: [],
-				studyList:[],
-				categoryTitle:'',
-			}
-		},
-		components: {
-			WucTab,
-			SecondMenu
-		},
-		onLoad() {
-			//获取节点距离顶部的距离
-			uni.createSelectorQuery().select('.tab-box').boundingClientRect((res) => {
-				if (res && res.top > 0) {
-					this.tabInitTop= res.top;
-				}
-			}).exec();
-			getCategory().then((res) => {
-				this.tabList = res.data
-				this.$set(this, 'secondMenu', res.data[0].categoryList)
-				this.$set(this, 'currentTab', res.data[0])
-				this.categoryTitle = res.data[0].categoryName;
-				if (res.data[0].categoryList.length > 0) {
-					this.$set(this, 'active', res.data[0].categoryList[0].id)
-					this.categoryTitle = this.categoryTitle +'·'+res.data[0].categoryList[0].categoryName
-				} else{
-					// this.$set(this, 'tabSelect', 0)
-					// this.scrollLeft = 0
-				}
-			}).then(() => {
-				this.getStudyList()
-				this.getCourses()
-			})
-		},
-		onShow() {
-			
-		},
-		mounted() {
-			uni.getSystemInfo({
-				success:(res)=>{
-					this.windowWidth = res.windowWidth;
-				}
-			})
-		},
-		methods: {
-			onPageScroll(res) {
-			 let scrollTop = res.scrollTop;
-				var isSatisfy = scrollTop >= this.tabInitTop? true : false;
-				//只有处于吸顶的临界值才会不相等
-				if (this.isFixedTop === isSatisfy) {
-					return false;
-				}
-				this.isFixedTop = isSatisfy
-			},
-			toStudyDetail(id) {
-				this.$yrouter.push({
-					path: '/pages/study/detail',
-					query: {
-						id: id,
-					},
-				})
-			},
-			toDetail(id) {
-				this.$yrouter.push({
-					path: '/pages/course/detail',
-					query: {
-						id: id,
-					},
-				})
-			},
-			getStudyList() {
-				uni.showLoading({
-					title:'正在加载中...'
-				})
-				var cid = null;
-				this.active == null ? cid = this.currentTab.id : cid = this.active
-				getStudyList({categoryId: cid,listState:0}).then((res) => {
-					if (res.success) {
-						this.studyList = res.data
-					}
-					uni.hideLoading()
-				})
-			},
-			getCourses() {
-				uni.showLoading({
-					title:'正在加载中...'
-				})
-				var cid = null;
-				this.active == null ? cid = this.currentTab.id : cid = this.active
-				getCourses({categoryId: cid,listState:0}).then((res) => {
-					if (res.success) {
-						this.courseList = res.data
-					}
-					uni.hideLoading()
-					uni.stopPullDownRefresh()
-				})
-			},
-			tabChange(item,index) {
-				this.tabSelect = index
-				this.currentTab = item
-				this.moveTo(index)
-				this.categoryTitle = item.categoryName;
-				if (item.categoryList.length > 0) {
-					this.$set(this, 'active', item.categoryList[0].id)
-					this.categoryTitle = item.categoryList[0].categoryName;
-				}
-				this.secondMenu = item.categoryList;
-				this.getStudyList()
-				this.getCourses()
-			},
-			// 将点击元素移动到中间
-			moveTo(index) { 
-				const query = uni.createSelectorQuery().in(this)
-				query.selectAll(`.scroll-item`).boundingClientRect(rect => {
-						const windowWidth = this.windowWidth	// 屏幕宽度
-						let width = 0
-						// 循环获取计算当前点击的标签项距离左侧的距离
-						for (let i = 0; i < index; i++) {
-							width += rect[i].width
-						}
-						// 当大于屏幕一半的宽度则滚动，否则就设置位置为0
-						if (width > windowWidth / 2) {
-							this.scrollLeft = width + rect[index].width / 2 - windowWidth / 2
-						} else {
-							this.scrollLeft = 0
-						}
-				}).exec()
-			},
-			secondMenuClick(item) {
-				this.active = item.id;
-				this.categoryTitle = item.categoryName;
-				this.getStudyList()
-				this.getCourses()
-			},
-			onPullDownRefresh() {
-				this.getStudyList()
-				this.getCourses()
-			}
-		}
-	}
-</script>
-
-<style scoped lang="less">
-.header{
-	.qr {
-		width: 36rpx;
-		height: 38rpx;
-		image{
-			width: 36rpx;
-			height: 38rpx;
-		}
-	}
-}
-.header-search {
-	transition: all linear 0.3s;
-	background: #fff;
-	.search {
-		border: 2rpx solid #EA533E;
-		background-color: #fff;
-	}
-}
-.colG{
-	color: #8FB85B !important;
-}
-.content-box{
-	width: 100%;
-	box-sizing: border-box;
-	.tab-box{
-		box-shadow: 0px 6px 12px 0px rgba(227,227,227,0.29);
-		.tabs{
-			width:auto;
-			height: 96rpx;
-			padding-left: 20rpx;
-			background: #fff;
-			.scroll-view_H{
-				white-space: nowrap;
-				width: 100%;
-				height: 96rpx;
-			}
-			.tab-item{
+<template>
+	<view class="konwledge-index index">
+		<view class="content-box">
+			<view class="tab-box" :class="isFixedTop ? 'fixed' : ''">
+				<view class="tabs">
+					<scroll-view class="scroll-view_H" scroll-x="true" scroll-with-animation :scroll-left='scrollLeft'>
+						<view class="tab-item scroll-item" :class="index == tabSelect ? 'tab-item-active' : ''" v-for="(item,index) in tabList"
+						 :key="item.id" @click="tabChange(item,index)">{{item.categoryName}}</view>
+					</scroll-view>
+				</view>
+				<SecondMenu :menuList="secondMenu" :active.sync="active" @secondMenuClick="secondMenuClick" v-if="secondMenu.length > 0">
+				</SecondMenu>
+			</view>
+			<view class="bangdan-box" v-if="studyList.length > 0">
+				<view class="active-word"><image src="../../static/tit5.png" mode=""></image></view>
+				<view class="bangdan-list">
+					<scroll-view class="scroll-view_H" scroll-x="true" v-if="studyList.length > 0">
+						<view class="bangdan-item" v-for="(item,index) in studyList" :key="index"
+						 @click="toStudyDetail(item.id)">
+							<view>
+								<view class="name">{{item.listName}}</view>
+								<view class="time">{{item.listStartTime.split(' ')[0]}} 至 {{item.listEndTime.split(' ')[0]}}</view>
+							</view>
+							<view class="acea-row row-between-wrapper" style="width: 100%;margin-top: 30rpx;">
+								<view class="jifen">
+									<text class="fz44">{{item.integral}}</text>
+									积分
+								</view>
+								<view class="signin-btn">报名参加</view>
+							</view>
+						</view>
+					</scroll-view>
+					<!-- <view class="no-content" v-if="studyList.length == 0">暂无内容...</view> -->
+				</view>
+			</view>
+			<view class="knowledge-list">
+				<view class="active-word2"><image src="../../static/tit6.png"></image></view>
+				<view class="no-content" v-if="courseList.length == 0">暂无内容...</view>
+				<view class="knowledge-item acea-row" v-for="(item,index) in courseList" :key="index" @click="toDetail(item.id)">
+					<view class="img-box">
+						<image :src="item.coverImg" mode="aspectFill"></image>
+					</view>
+					<view class="knowledge-info-box">
+						<view class="title line1">{{item.courseName}}</view>
+						<view class="time">{{utils.spl(item.courseStartTime)[0]}}至{{utils.spl(item.courseEndTime)[0]}}</view>
+						<view class="address">{{item.coursePlace}}</view>
+						<view class="type-box acea-row row-between row-middle">
+							<!-- <view class="price">￥{{item.courseCharge}}</view> -->
+							<!-- <view class="price">{{item.levelName}}</view> -->
+							<view></view>
+							<!-- <view class="price colG" v-if="item.chargeType == 0">免费</view> -->
+							<view class="signin-btn yellow">去报名</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script module="utils" lang="wxs" src="../../utils/subutil.wxs"></script>
+<script>
+	import WucTab from '@/components/wuc-tab/wuc-tab.vue';
+	import SecondMenu from '../knowledge/components/secondMenu.vue';
+	import {
+		mapState,
+		mapGetters,
+		mapMutations,
+		mapActions
+	} from 'vuex'
+	import {
+		getCategory,
+		getArticle,
+		getStudyList,
+		getCourses
+	} from '@/api/knowledge';
+	export default {
+		computed: mapGetters(['userInfo']),
+		data() {
+			return {
+				windowWidth: '',
+				isFixedTop: false,
+				currentTab: null,
+				tabSelect: 0,
+				scrollLeft: 200,
+				tabList: [],
+				secondMenu: [],
+				active: null,
+				courseList: [],
+				studyList: [],
+				categoryTitle: '',
+			}
+		},
+		components: {
+			WucTab,
+			SecondMenu
+		},
+		onLoad() {
+			//获取节点距离顶部的距离
+			uni.createSelectorQuery().select('.tab-box').boundingClientRect((res) => {
+				if (res && res.top > 0) {
+					this.tabInitTop = res.top;
+				}
+			}).exec();
+			getCategory().then((res) => {
+				this.tabList = res.data
+				this.$set(this, 'secondMenu', res.data[0].categoryList)
+				this.$set(this, 'currentTab', res.data[0])
+				this.categoryTitle = res.data[0].categoryName;
+				if (res.data[0].categoryList.length > 0) {
+					this.$set(this, 'active', res.data[0].categoryList[0].id)
+					this.categoryTitle = this.categoryTitle + '·' + res.data[0].categoryList[0].categoryName
+				} else {
+					// this.$set(this, 'tabSelect', 0)
+					// this.scrollLeft = 0
+				}
+			}).then(() => {
+				this.getStudyList()
+				this.getCourses()
+			})
+		},
+		onShow() {
+
+		},
+		mounted() {
+			uni.getSystemInfo({
+				success: (res) => {
+					this.windowWidth = res.windowWidth;
+				}
+			})
+		},
+		methods: {
+			onPageScroll(res) {
+				let scrollTop = res.scrollTop;
+				var isSatisfy = scrollTop >= this.tabInitTop ? true : false;
+				//只有处于吸顶的临界值才会不相等
+				if (this.isFixedTop === isSatisfy) {
+					return false;
+				}
+				this.isFixedTop = isSatisfy
+			},
+			toStudyDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/study/detail',
+					query: {
+						id: id,
+					},
+				})
+			},
+			toDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/course/detail',
+					query: {
+						id: id,
+					},
+				})
+			},
+			getStudyList() {
+				uni.showLoading({
+					title: '正在加载中...'
+				})
+				var cid = null;
+				this.active == null ? cid = this.currentTab.id : cid = this.active
+				getStudyList({
+					categoryId: cid,
+					listState: 0
+				}).then((res) => {
+					if (res.success) {
+						this.studyList = res.data
+					}
+					uni.hideLoading()
+				})
+			},
+			getCourses() {
+				uni.showLoading({
+					title: '正在加载中...'
+				})
+				var cid = null;
+				this.active == null ? cid = this.currentTab.id : cid = this.active
+				getCourses({
+					categoryId: cid,
+					listState: 0
+				}).then((res) => {
+					if (res.success) {
+						this.courseList = res.data
+					}
+					uni.hideLoading()
+					uni.stopPullDownRefresh()
+				})
+			},
+			tabChange(item, index) {
+				this.tabSelect = index
+				this.currentTab = item
+				this.moveTo(index)
+				this.categoryTitle = item.categoryName;
+				if (item.categoryList.length > 0) {
+					this.$set(this, 'active', item.categoryList[0].id)
+					this.categoryTitle = item.categoryList[0].categoryName;
+				}
+				this.secondMenu = item.categoryList;
+				this.getStudyList()
+				this.getCourses()
+			},
+			// 将点击元素移动到中间
+			moveTo(index) {
+				const query = uni.createSelectorQuery().in(this)
+				query.selectAll(`.scroll-item`).boundingClientRect(rect => {
+					const windowWidth = this.windowWidth // 屏幕宽度
+					let width = 0
+					// 循环获取计算当前点击的标签项距离左侧的距离
+					for (let i = 0; i < index; i++) {
+						width += rect[i].width
+					}
+					// 当大于屏幕一半的宽度则滚动，否则就设置位置为0
+					if (width > windowWidth / 2) {
+						this.scrollLeft = width + rect[index].width / 2 - windowWidth / 2
+					} else {
+						this.scrollLeft = 0
+					}
+				}).exec()
+			},
+			secondMenuClick(item) {
+				this.active = item.id;
+				this.categoryTitle = item.categoryName;
+				this.getStudyList()
+				this.getCourses()
+			},
+			onPullDownRefresh() {
+				this.getStudyList()
+				this.getCourses()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	page{
+		background: #fff;
+	}
+	.content-box {
+		width: 100%;
+		box-sizing: border-box;
+		.tab-box {
+			height: 96rpx;
+			box-shadow: 0px 6px 12px 0px rgba(227, 227, 227, 0.29);
+			.tabs{
+				width:100%;
 				height: 96rpx;
-				line-height: 96rpx;
-				display: inline-block;
-				margin-right: 40rpx;
-				font-size: 32rpx;
-				color: #999999;
-			}
-			.tab-item-active{
-				color: #F99C10;
-				border-bottom: 2px solid #F99C10;
-				font-weight: bold;
-			}
-		}
-	}
-	/deep/.second-menu-box{
-		padding: 30rpx 32rpx;
-	}
-	.fixed{
-		position: -webkit-sticky;
-		position: sticky;
-		top: 0;
-		z-index: 99;
-	}
-	
-}
-.active-word{
-	font-size: 34rpx;
-}
-.no-content{
-	font-size: 28rpx;
-	color: #666666;
-	text-align: center;
-	padding: 30rpx 0;
-}
-.bangdan-box{
-	width: 100%;
-	box-sizing: border-box;
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	.scroll-view_H{
-		white-space: nowrap;
-		width: 100%;
-	}
-	.bangdan-list{
-		padding: 16rpx 0 0;
-	}
-	.bangdan-item{
-		width: 514rpx;
-		height: 234rpx;
-		box-sizing: border-box;
-		padding: 20rpx;
-		color: #fff;
-		display: inline-block;
-		background: linear-gradient(165deg, #3ABFB8 0%, #7CE1DD 100%);
-		border-radius: 10rpx;
-		font-size: 34rpx;
-		margin-right: 20rpx;
-		display: inline-block;
-		.time{
-			font-size: 24rpx;
-			color: #FFFFFF;
-			line-height: 40rpx;
-			margin:10rpx 0 18rpx;
-			
-		}
-		.jifen{
-			font-size: 46rpx;
-			font-weight: 500;
-		}
-		.signin-btn{
-			width: 180rpx;
-			height: 68rpx;
-			background: #FFFFFF;
-			border-radius: 40rpx;
-			text-align: center;
-			line-height: 68rpx;
-			color: #222222;
-			font-size: 26rpx;
-		}
-	}
-	.bgR{
-		background: linear-gradient(165deg, #FF7563 0%, #FEABA0 100%);
-	}
-}
-.konwledge-index {
-	min-height: 100%;
-	width: 100%;
-	background: #fff;
-	.knowledge-list {
-		width: 100%;
-		padding:0 32rpx;
-		margin-top: 30rpx;
-		.knowledge-item {
-			background: #fff;
-			padding: 16rpx 0;
-			border-bottom: 1px solid #ECECEC;
-			.img-box {
-				width: 204rpx;
-				height: 200rpx;
-				margin-right: 30rpx;
-				image {
+				padding-left: 20rpx;
+				position: fixed;
+				top: 0;
+				background: #fff;
+				z-index: 10;
+				.scroll-view_H{
+					white-space: nowrap;
 					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
+					height: 96rpx;
 				}
-			}
-			.knowledge-info-box {
-				width: calc(100% - 234rpx);
-				.title {
+				.tab-item{
+					height: 96rpx;
+					line-height: 96rpx;
+					display: inline-block;
+					margin-right: 40rpx;
 					font-size: 32rpx;
-					color: #333;
-					font-size: 500;
-					line-height: 40rpx;
-				}
-				.time,.address{
-					color: #999;
-					font-size: 24rpx;
-					margin-top: 5rpx;
-					line-height: 34rpx;
-				}
-				.intro {
-					font-size: 28rpx;
 					color: #999999;
-					line-height: 40rpx;
-					margin: 8rpx 0 36rpx;
 				}
-				.type-box {
-					font-size: 24rpx;
-					color: #999;
-					margin-top: 20rpx;
-					.price{
-						font-size: 28rpx;
-						color: #EA533E;
-					}
-					.signin-btn{
-						width: 156rpx;
-						height: 60rpx;
-						text-align: center;
-						line-height: 60rpx;
-						background: #FFEAE7;
-						border-radius: 12rpx;
-						font-size: 32rpx;
-					}
-					.red{
-						background: #FFEAE7;
-						color: #EE7060;
-					}
-					.blue {
-						color: #6E85EB;
-						background: #ECEFFD;
-					}
-					.yellow {
-						color: #F99C10;
-						background: #FFEDCC;
-					}
+				.tab-item-active{
+					color: #F99C10;
+					border-bottom: 2px solid #F99C10;
+					font-weight: bold;
 				}
-			}
-		}
-		.knowledge-item:nth-last-child(1){
-			border: none;
-		}
+			}
+		}
+
+		/deep/.second-menu-box {
+			padding: 30rpx 32rpx;
+		}
+
+		.fixed {
+			position: -webkit-sticky;
+			position: sticky;
+			top: 0;
+			z-index: 99;
+		}
+
+	}
+
+	.active-word {
+		image {
+			width: 136rpx;
+			height: 46rpx;
+		}
 	}
-}
+	.active-word2{
+		image{
+			width: 108rpx;
+			height: 46rpx;
+		}
+	}
+
+	.no-content {
+		font-size: 28rpx;
+		color: #666666;
+		text-align: center;
+		padding: 30rpx 0;
+	}
+
+	.bangdan-box {
+		width: 100%;
+		box-sizing: border-box;
+		padding-left: 30rpx;
+		margin: 80rpx 0;
+		.scroll-view_H {
+			white-space: nowrap;
+			width: 100%;
+		}
+
+		.bangdan-list {
+			padding: 16rpx 0 0;
+		}
+
+		.bangdan-item {
+			width: 412rpx;
+			height: 224rpx;
+			box-sizing: border-box;
+			padding: 34rpx;
+			color: #191919;
+			display: inline-block;
+			background: url('https://download.cyjyyjy.com/bangdanbg.png');
+			background-size: 100% 100%;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+			display: inline-block;
+			
+			.name{
+				font-weight: bold;
+			}
+			
+			.time {
+				font-size: 24rpx;
+				line-height: 34rpx;
+				margin: 8rpx 0 10rpx;
+			}
+
+			.jifen {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #FCB047;
+				.fz44{
+					font-size: 44rpx;
+				}
+			}
+
+			.signin-btn {
+				width: 122rpx;
+				height: 48rpx;
+				background: linear-gradient(180deg, #FEECCB 0%, #FCAB3B 100%);
+				border-radius: 8rpx;
+				text-align: center;
+				line-height: 48rpx;
+				font-size: 24rpx;
+				color: #fff;
+			}
+		}
+	}
+
+	.konwledge-index {
+		min-height: 100%;
+		width: 100%;
+		background: #fff;
+
+		.knowledge-list {
+			width: 100%;
+			padding: 0 32rpx;
+			margin-top: 80rpx;
+			.knowledge-item {
+				width: 100%;
+				height: 208rpx;
+				margin-top: 20rpx;
+				background: #fff;
+				border-bottom: 1rpx solid #ECECEC;
+				position: relative;
+				.img-box {
+					width: 204rpx;
+					height: 200rpx;
+					margin-right: 30rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 10rpx;
+					}
+				}
+
+				.knowledge-info-box {
+					width: calc(100% - 234rpx);
+
+					.title {
+						font-size: 38rpx;
+						color: #333;
+						font-size: 500;
+						line-height: 52rpx;
+					}
+
+					.time,
+					.address {
+						color: #999;
+						font-size: 28rpx;
+						margin: 10rpx 0;
+						line-height: 38rpx;
+					}
+
+					.intro {
+						font-size: 28rpx;
+						color: #999999;
+						line-height: 40rpx;
+						margin: 8rpx 0 36rpx;
+					}
+
+					.type-box {
+						font-size: 24rpx;
+						color: #999;
+						margin-top: 20rpx;
+
+						.price {
+							font-size: 28rpx;
+							color: #EA533E;
+						}
+
+						.signin-btn {
+							width: 156rpx;
+							height: 60rpx;
+							text-align: center;
+							line-height: 60rpx;
+							background: #FFEAE7;
+							border-radius: 12rpx;
+							font-size: 32rpx;
+							position: absolute;
+							right: 4rpx;
+							bottom: 4rpx;
+						}
+
+						.red {
+							background: #FFEAE7;
+							color: #EE7060;
+						}
+
+						.blue {
+							color: #6E85EB;
+							background: #ECEFFD;
+						}
+
+						.yellow {
+							color: #F99C10;
+							background: #FFEDCC;
+						}
+					}
+				}
+			}
+
+			.knowledge-item:nth-last-child(1) {
+				border: none;
+			}
+		}
+	}
 </style>
diff --git a/pages/home/components/ArticleList.vue b/pages/home/components/ArticleList.vue
new file mode 100644
index 0000000..d1aeef6
--- /dev/null
+++ b/pages/home/components/ArticleList.vue
@@ -0,0 +1,108 @@
+<template>
+	<view class="article-list">
+		<view class="article-item" v-for="(item,index) in list" :key="index" @click="toArticleDetail(item.id)">
+			<image :src="item.imageInput"  mode="aspectFill"></image>
+			<view class="article-content">
+				<view class="article-title line1">{{item.title}}</view>
+				<view class="article-desc line1">{{item.synopsis}}</view>
+				<view class="author-box acea-row row-between">
+					<view class="acea-row">
+						<view class="author">{{item.author}}</view>
+						<view class="time">{{item.addTime.split(' ')[0]}}</view>
+						<view>{{item.visit}}人阅读</view>
+					</view>
+					<view class="tips" 
+						:class="item.chargeType == 0 ? 'free-bg' : item.chargeType == 1 ? '' : 'jifen'">
+						{{item.chargeType == 0 ? '免费' : item.chargeType == 1 ? '收费' : '积分'}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			list: {
+				type: Array,
+				default: []
+			}
+		},
+		methods:{
+			toArticleDetail(id){
+				this.$yrouter.push({
+				  path: '/pages/knowledge/detail',
+				  query: {
+				    id:id,
+				  },
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+.article-list{
+	width: 100%;
+	margin-top: 20rpx;
+	.article-item{
+		width: 100%;
+		background: #fff;
+		box-sizing: border-box;
+		margin-bottom: 52rpx;
+		box-shadow: 0px 2rpx 8rpx rgba(0, 0, 0, 0.16);
+		image{
+			width: 100%;
+			height: 266rpx;
+			border-radius: 10rpx;
+			margin-bottom: 20rpx;
+		}
+		.article-content{
+			padding: 28rpx 32rpx;
+		}
+		.article-title{
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #333333;
+			line-height: 50rpx;
+			margin-bottom: 8rpx;
+		}
+		.article-desc{
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			line-height: 40rpx;
+			margin-bottom: 30rpx;
+		}
+		.author-box{
+			font-size: 24rpx;
+			color: #999;
+			.author{
+				color: #EA533E;
+			}
+			.time{
+				margin: 0 12rpx;
+			}
+			.tips{
+				width: 100rpx;
+				font-size: 20rpx;
+				color: #FFAD3A;
+				height: 34rpx;
+				text-align: center;
+				line-height: 34rpx;
+				background: #fcd391;
+				border-radius: 44rpx;
+			}
+			.free-bg{
+				background: #8FB85B;
+				color: #D7FFA4;
+			}
+			.jifen{
+				background: #AAC8FA;
+				color: #5693F9;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/home/components/CourseList.vue b/pages/home/components/CourseList.vue
new file mode 100644
index 0000000..e4fd409
--- /dev/null
+++ b/pages/home/components/CourseList.vue
@@ -0,0 +1,124 @@
+<template>
+	<view class="recommend-list-box acea-row row-between">
+		<view class="recommend-item" v-for="(item,index) in list" :key="index" @click="toCourseDetail(item.id)">
+			<view class="img-box"><image :src="item.coverImg" mode="aspectFill"></image></view>
+			<view class="course-content">
+				<view class="course-title line1">{{item.courseName}}</view>
+				<view class="course-tips-box acea-row">
+					<view class="course-tip-item blue">{{item.categoryName}}</view>
+				</view>
+				<!-- <view class="price" v-if="item.level > 2">{{item.level}}级课程</view>
+				<view class="price" v-if="item.level == 2">￥{{item.courseCharge}}</view>
+				<view class="price colG" v-if="item.chargeType == 0 || item.level == 1">免费</view> -->
+				<view class="course-address acea-row row-between-wrapper">
+					<view class="address">{{item.coursePlace}}</view>
+					<view class="course-time">{{item.enterStartTime}}-{{item.enterEndTime}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props: {
+			list: {
+				type: Array,
+				default: []
+			}
+		},
+		data(){
+			return {
+				titImg: '../../../static/tit1.png',
+				titleWord: '查看更多课程'
+			}
+		},
+		methods:{
+			toCourseDetail(id){
+				this.$yrouter.push({
+				  path: '/pages/course/detail',
+				  query: {
+				    id:id,
+				  },
+				})
+			},
+			seeMoreClick(){
+				uni.switchTab({
+					url: "/pages/course/index"
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+.recommend-list-box{
+	width: 100%;
+	.recommend-item{
+		width: 334rpx;
+		background: #fff;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		color: #333;
+		margin-right: 22rpx;
+		margin-bottom: 22rpx;
+		box-shadow: 0px 2rpx 4rpx rgba(0, 0, 0, 0.16);
+		image{
+			width: 334rpx;
+			height: 216rpx;
+			border-top-left-radius: 10rpx;
+			border-top-right-radius: 10rpx;
+		}
+		.course-content{
+			width: 100%;
+			box-sizing: border-box;
+			padding:0 10rpx 20rpx;
+		}
+		.course-title{
+			line-height: 40rpx;
+		}
+		.course-tips-box{
+			margin: 12rpx 0 24rpx;
+			font-size: 24rpx;
+			color: #999;
+			.course-tip-item{
+				min-width: 60rpx;
+				height: 34rpx;
+				line-height: 32rpx;
+				text-align: center;
+				background: #EDEFF8;
+				border-radius: 4rpx;
+				border: 1px solid #6E85EB;
+				padding: 0 6rpx;
+				font-size: 22rpx;
+				margin-right: 20rpx;
+				box-sizing: border-box;
+				margin-right: 10rpx;
+			}
+			.blue{
+				color: #6E85EB;
+				background: #EDEFF8;
+				border-color: #6E85EB;
+			}
+			.yellow{
+				color: #F99C10;
+				background: #FFEDCC;
+				border-color: #F99C10;
+			}
+		}
+		.price{
+			font-size: 32rpx;
+			color: #EA533E;
+			font-weight: 500;
+			margin: 16rpx 0;
+		}
+		.course-address{
+			font-size: 24rpx;
+			color: #999999;
+		}
+	}
+	.recommend-item:nth-child(2n){
+		margin-right: 0;
+	}
+}
+</style>
diff --git a/pages/home/components/FirstNewProduct.vue b/pages/home/components/FirstNewProduct.vue
index 31bde33..14b5039 100644
--- a/pages/home/components/FirstNewProduct.vue
+++ b/pages/home/components/FirstNewProduct.vue
@@ -1,216 +1,214 @@
-<template>
-    <view class="group-goods pa20 mx20 mb10" v-if="detail.length>0">
-        <view class="title-box x-bc" @tap="$yrouter.push({ path: '/pages/shop/HotNewGoods/index',query:{type:3} })">
-            <text class="title">首发新品</text>
-            <view class="group-people x-f">
-                <text class="tip">更多</text>
-                <text class="cuIcon-right"></text>
-            </view>
-        </view>
-        <view class="goods-box swiper-box x-f">
-            <swiper class="carousel" circular @change="swiperChange" :autoplay="true" duration="2000">
-                <swiper-item v-for="(goods, index) in goodsList" :key="index" class="carousel-item">
-                    <view class="goods-list-box x-f">
-                        <block v-for="mgoods in goods" :key="mgoods.id">
-                            <view class="min-goods"
-                                @tap="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:mgoods.id} })">
-                                <view class="img-box">
-                                    <view class="tag">new</view>
-                                    <image class="img" :src="mgoods.image" mode="widthFix"></image>
-                                </view>
-                                <view class="price-box">
-                                    <view class="y-f">
-                                        <text class="seckill-current">￥{{  mgoods.price  }}</text>
-                                        <text class="original">销量{{ mgoods.sales }}{{mgoods.unitName}}</text>
-                                    </view>
-                                </view>
-                                <view class="title">
-                                    <slot name="titleText"></slot>
-                                </view>
-                            </view>
-                        </block>
-                    </view>
-                </swiper-item>
-            </swiper>
-            <view class="swiper-dots" v-if="goodsList.length > 1">
-                <text :class="swiperCurrent === index ? 'dot-active' : 'dot'" v-for="(dot, index) in goodsList.length"
-                    :key="index"></text>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import shActivityGoods from '@/components/sh-activity-goods.vue';
-
-    export default {
-        name: "FirstNewProduct",
-        components: {
-            shActivityGoods
-        },
-        data() {
-            return {
-                goodsList: [],
-                swiperCurrent: 0
-            };
-        },
-        props: {
-            detail: Array
-        },
-        computed: {},
-        created() {},
-        watch: {
-            detail(next) {
-                this.goodsList = this.sortData(next, 4);
-            }
-        },
-        methods: {
-            swiperChange(e) {
-                this.swiperCurrent = e.detail.current;
-            },
-            // 数据分层
-            sortData(oArr, length) {
-                let arr = [];
-                let minArr = [];
-                oArr.forEach(c => {
-                    if (minArr.length === length) {
-                        minArr = [];
-                    }
-                    if (minArr.length === 0) {
-                        arr.push(minArr);
-                    }
-                    minArr.push(c);
-                });
-
-                return arr;
-            },
-            jump(path, query) {
-                this.$yrouter.push({
-                    path,
-                    query,
-                });
-            },
-        }
-    }
-</script>
-
-
-<style lang="scss" scoped>
-    .group-goods {
-        position: relative;
-        z-index: 9;
-    }
-
-    .swiper-box,
-    .carousel {
-        width: 700rpx;
-        height: 240upx;
-        position: relative;
-        border-radius: 20rpx;
-
-        .carousel-item {
-            width: 100%;
-            height: 100%;
-            // padding: 0 28upx;
-            overflow: hidden;
-        }
-
-        .swiper-image {
-            width: 100%;
-            height: 100%;
-            // border-radius: 10upx;
-            background: #ccc;
-        }
-    }
-
-    .swiper-dots {
-        display: flex;
-        position: absolute;
-        left: 50%;
-        transform: translateX(-50%);
-        bottom: 0rpx;
-        z-index: 66;
-
-        .dot {
-            width: 45rpx;
-            height: 3rpx;
-            background: #eee;
-            border-radius: 50%;
-            margin-right: 10rpx;
-        }
-
-        .dot-active {
-            width: 45rpx;
-            height: 3rpx;
-            background: #a8700d;
-            border-radius: 50%;
-            margin-right: 10rpx;
-        }
-    }
-
-    // 今日必拼+限时抢购
-    .group-goods {
-        background: #fff;
-        border-radius: 20rpx;
-        overflow: hidden;
-
-        .title-box {
-            padding-bottom: 20rpx;
-
-            .title {
-                font-size: 32rpx;
-                font-weight: bold;
-            }
-
-            .group-people {
-                .time-box {
-                    font-size: 26rpx;
-                    color: #edbf62;
-
-                    .count-text-box {
-                        width: 30rpx;
-                        height: 34rpx;
-                        background: #edbf62;
-                        text-align: center;
-                        line-height: 34rpx;
-                        font-size: 24rpx;
-                        border-radius: 6rpx;
-                        color: rgba(#fff, 0.9);
-                        margin: 0 8rpx;
-                    }
-                }
-
-                .head-box {
-                    .head-img {
-                        width: 40rpx;
-                        height: 40rpx;
-                        border-radius: 50%;
-                        background: #ccc;
-                    }
-                }
-
-                .tip {
-                    font-size: 28rpx;
-                    padding-left: 30rpx;
-                    color: #666;
-                }
-
-                .cuIcon-right {
-                    font-size: 30rpx;
-                    line-height: 28rpx;
-                    color: #666;
-                }
-            }
-        }
-
-        .goods-box {
-            .goods-item {
-                margin-right: 22rpx;
-
-                &:nth-child(4n) {
-                    margin-right: 0;
-                }
-            }
-        }
-    }
+<template>
+	<view class="group-goods pa20 mx20 mb10" v-if="detail.length>0">
+		<view class="title-box x-bc" @tap="$yrouter.push({ path: '/pages/shop/HotNewGoods/index',query:{type:3} })">
+			<text class="title">首发新品</text>
+			<view class="group-people x-f">
+				<text class="tip">更多</text>
+				<text class="cuIcon-right"></text>
+			</view>
+		</view>
+		<view class="goods-box swiper-box x-f">
+			<swiper class="carousel" circular @change="swiperChange" :autoplay="true" duration="2000">
+				<swiper-item v-for="(goods, index) in goodsList" :key="index" class="carousel-item">
+					<view class="goods-list-box x-f">
+						<block v-for="mgoods in goods" :key="mgoods.id">
+							<view class="min-goods" @tap="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:mgoods.id} })">
+								<view class="img-box">
+									<view class="tag">new</view>
+									<image class="img" :src="mgoods.image" mode="widthFix"></image>
+								</view>
+								<view class="price-box">
+									<view class="y-f">
+										<text class="seckill-current">￥{{ mgoods.price  }}</text>
+										<text class="original">销量{{ mgoods.sales }}{{mgoods.unitName}}</text>
+									</view>
+								</view>
+								<view class="title">
+									<slot name="titleText"></slot>
+								</view>
+							</view>
+						</block>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="swiper-dots" v-if="goodsList.length > 1">
+				<text :class="swiperCurrent === index ? 'dot-active' : 'dot'" v-for="(dot, index) in goodsList.length" :key="index"></text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import shActivityGoods from '@/components/sh-activity-goods.vue';
+
+	export default {
+		name: "FirstNewProduct",
+		components: {
+			shActivityGoods
+		},
+		data() {
+			return {
+				goodsList: [],
+				swiperCurrent: 0
+			};
+		},
+		props: {
+			detail: Array
+		},
+		computed: {},
+		created() {},
+		watch: {
+			detail(next) {
+				this.goodsList = this.sortData(next, 4);
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				this.swiperCurrent = e.detail.current;
+			},
+			// 数据分层
+			sortData(oArr, length) {
+				let arr = [];
+				let minArr = [];
+				oArr.forEach(c => {
+					if (minArr.length === length) {
+						minArr = [];
+					}
+					if (minArr.length === 0) {
+						arr.push(minArr);
+					}
+					minArr.push(c);
+				});
+
+				return arr;
+			},
+			jump(path, query) {
+				this.$yrouter.push({
+					path,
+					query,
+				});
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	.group-goods {
+		position: relative;
+		z-index: 9;
+	}
+
+	.swiper-box,
+	.carousel {
+		width: 700rpx;
+		height: 240upx;
+		position: relative;
+		border-radius: 20rpx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			// padding: 0 28upx;
+			overflow: hidden;
+		}
+
+		.swiper-image {
+			width: 100%;
+			height: 100%;
+			// border-radius: 10upx;
+			background: #ccc;
+		}
+	}
+
+	.swiper-dots {
+		display: flex;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0rpx;
+		z-index: 66;
+
+		.dot {
+			width: 45rpx;
+			height: 3rpx;
+			background: #eee;
+			border-radius: 50%;
+			margin-right: 10rpx;
+		}
+
+		.dot-active {
+			width: 45rpx;
+			height: 3rpx;
+			background: #a8700d;
+			border-radius: 50%;
+			margin-right: 10rpx;
+		}
+	}
+
+	// 今日必拼+限时抢购
+	.group-goods {
+		background: #fff;
+		border-radius: 20rpx;
+		overflow: hidden;
+
+		.title-box {
+			padding-bottom: 20rpx;
+
+			.title {
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+
+			.group-people {
+				.time-box {
+					font-size: 26rpx;
+					color: #edbf62;
+
+					.count-text-box {
+						width: 30rpx;
+						height: 34rpx;
+						background: #edbf62;
+						text-align: center;
+						line-height: 34rpx;
+						font-size: 24rpx;
+						border-radius: 6rpx;
+						color: rgba(#fff, 0.9);
+						margin: 0 8rpx;
+					}
+				}
+
+				.head-box {
+					.head-img {
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						background: #ccc;
+					}
+				}
+
+				.tip {
+					font-size: 28rpx;
+					padding-left: 30rpx;
+					color: #666;
+				}
+
+				.cuIcon-right {
+					font-size: 30rpx;
+					line-height: 28rpx;
+					color: #666;
+				}
+			}
+		}
+
+		.goods-box {
+			.goods-item {
+				margin-right: 22rpx;
+
+				&:nth-child(4n) {
+					margin-right: 0;
+				}
+			}
+		}
+	}
 </style>
diff --git a/pages/home/components/ListTitleBox.vue b/pages/home/components/ListTitleBox.vue
new file mode 100644
index 0000000..e1e20e8
--- /dev/null
+++ b/pages/home/components/ListTitleBox.vue
@@ -0,0 +1,54 @@
+<template>
+	<view class="title-box acea-row row-between-wrapper">
+		<view class="title"><image :src="titImg"></image></view>
+		<view class="more" @click="seeMoreClick">{{titWord}}</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name: 'ListTitleBox',
+		props:{
+			// 标题图片
+			titImg:{
+				type: String,
+				default: ''
+			},
+			// 标题内容
+			titWord: {
+				type: String,
+				default: ''
+			},
+			// 图片尺寸
+			width: {  
+				type: String,
+				default: ''
+			},
+			height: {
+				type: String,
+				default: ''
+			}
+		},
+		
+		methods:{
+			seeMoreClick(){
+				this.$emit('seeMoreClick')
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+.title-box{
+	width: 100%;
+	margin-bottom: 28rpx;
+	image{
+		width: 206rpx;
+		height: 58rpx;
+	}
+	.more{
+		font-size: 28rpx;
+		color: #999;
+	}
+}
+</style>
diff --git a/pages/home/components/StadyList.vue b/pages/home/components/StadyList.vue
new file mode 100644
index 0000000..ac3b0ff
--- /dev/null
+++ b/pages/home/components/StadyList.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="study-list uni-padding-wrap uni-common-mt">
+		<scroll-view class="scroll-view_H" scroll-x="true">
+				<view class="study-item scroll-view-item_H" v-for="(item,index) in list" :key="index"  @click="toStudyDetail(item.id)">
+					<view class="day-box acea-row row-middle">
+						<image src="../../../static/date-icon.png" v-if="index%2 == 0"></image>
+						<image src="../../../static/date-icon2.png" v-if="index%2 != 0"></image>
+						<text>{{item.clockTimes}}</text>
+					</view>
+					<view class="study-content">
+						<view class="study-title line1">{{item.listName}}</view>
+						<view class="study-time acea-row-nowrap row-between-wrapper">
+							<view>{{item.listStartTime}}开始</view>
+							<view>{{item.enterNum}}人已参与</view>
+						</view>
+					</view>
+				</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			list: {
+				type: Array,
+				default: []
+			}
+		},
+		methods:{
+			toStudyDetail(id){
+				this.$yrouter.push({
+				  path: '/pages/study/detail',
+				  query: {
+				    id:id,
+				  },
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+.study-list{
+	width: 100%;
+	.scroll-view_H{
+		white-space: nowrap;
+		width: 100%;
+	}
+	.study-item{
+		width: 334rpx;
+		height: 180rpx;
+		display: inline-block;
+		background: linear-gradient(143deg, #FDAF97 0%, #ED5E48 100%);
+		box-shadow: 0px 4rpx 8rpx 4rpx rgba(250,194,183,0.32);
+		border-radius: 10rpx;
+		margin-right: 20rpx;
+		.day-box{
+			color: #E73D21;
+			font-size: 48rpx;
+			line-height: 58rpx;
+			margin-left: 10rpx;
+			image{
+				width: 34rpx;
+				height: 34rpx;
+				margin-right: 10rpx;
+			}
+		}
+		.study-content{
+			width: calc(100% - 12rpx);
+			background: #fff;
+			font-size: 24rpx;
+			color: #999;
+			box-shadow: 0px 4rpx 8rpx 4rpx rgba(250,194,183,0.32);
+			border-radius: 10rpx;
+			margin: 2rpx auto;
+			padding:16rpx 10rpx 10rpx;
+			box-sizing: border-box;
+			.study-title{
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #222222;
+				line-height: 40rpx;
+				margin-bottom: 12rpx;
+			}
+		}
+	}
+	.study-item:nth-child(2n){
+		background: linear-gradient(143deg, #C4DBFF 0%, #7FAAF2 100%);
+		.day-box{
+			color: #557AB3;
+		}
+	}
+}
+</style>
diff --git a/pages/home/index-copy.vue b/pages/home/index-copy.vue
index 1844cae..5f91eb7 100644
--- a/pages/home/index-copy.vue
+++ b/pages/home/index-copy.vue
@@ -12,13 +12,6 @@
 			<!-- #endif -->
 		</view>
     <view v-for="(item, index) in homeData" :key="index">
-     <!-- <view class="head_box" v-if="item.type == 'header'" :style="{ background: bgcolor }" :class="{ active: bgcolor }">
-        <cu-custom :isBack="true" :bgColor="bgcolor">
-          <block slot="backText">
-            <text class="nav-title shopro-selector-rect">{{ item.componentContent.title }}</text>
-          </block>
-        </cu-custom>
-      </view> -->
       <Banner v-if="item.type == 'banner'" :detail="item.componentContent.bannerData" @getbgcolor="getbgcolor"></Banner>
       <uni-notice-bar v-if="item.type == 'noticeBar'" scrollable="true" @click="goRoll(item.componentContent.roll[0])" single="true" :speed="10" showIcon="true" :text="item.componentContent.roll[0].info"></uni-notice-bar>
       <view class="content_box home_content_box" v-if="item.type == 'menu' && item.componentContent.menus">
diff --git a/pages/home/index.vue b/pages/home/index.vue
index e657272..3135aca 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,928 +1,837 @@
-<template>
-  <view class="index">
-		<view class="header header-search acea-row row-middle">
-		  <view @click="goGoodSearch()" class="search acea-row row-middle">
-		    <text class="iconfont icon-xiazai5"></text>
-		    搜索商品
-		  </view>
-		</view>
-		<view class="banner-box">
-			<swiper class="swiper-box">
-				<swiper-item>
-					<view class="swiper-item">
-						<image src="https://www.cyjyyjy.com:8081/static/home-banner.png" mode=""></image>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<!-- 每日一签 -->
-		<view class="today-fortune-content">
-			<view class="today-fortune-box">
-				<view class="top-box acea-row row-between-wrapper">
-					<view class="title">今日·宜忌</view>
-					<view>{{year}}年{{month}}月{{day}}日</view>
-				</view>
-				<view class="date-box acea-row row-middle row-center">
-					<view class="date-btn prev-btn"><image src="../../static/prev.png"></image></view>
-					<view class="time-box">{{todayDate}}</view>
-					<view class="date-btn next-btn"><image src="../../static/next.png"></image></view>
-				</view>
-				<view class="week-box">
-					<span class="week">星期{{week}}</span>
-					<span>{{suici}}</span>
-				</view>
-				<view class="fortune-detail"> 
-					<view class="fortune-n acea-row-nowrap mt20">
-						<view class="fortune-icon nice">宜</view>
-						<view class="fortune">{{yi}}</view>
-					</view>
-					<view class="fortune-b acea-row-nowrap mt20">
-						<view class="fortune-icon bad">忌</view>
-						<view class="fortune">{{ji}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="notice-box acea-row row-middle" @click="toNoticePage">
-			<view class="notice-t">公告</view>
-			<view class="notice">点击下载直播APP，在线观看！！</view>
-		</view> -->
-		<!-- 推荐课程 -->
-		<view class="recommend-box p30">
-			<view class="title-box acea-row row-between-wrapper">
-				<view class="title">今日推荐</view>
-				<view class="more" @click="toCourse">查看全部课程</view>
-			</view>
-			<view class="recommend-list-box acea-row">
-				<view class="recommend-item" v-for="(item,index) in courseList" :key="index" @click="toCourseDetail(item.id)">
-					<view class="img-box"><image :src="item.coverImg" mode="aspectFill"></image></view>
-					<view class="course-content">
-						<view class="course-title line1">{{item.courseName}}</view>
-						<view class="course-tips-box acea-row">
-							<view class="course-tip-item blue">{{item.categoryName}}</view>
-						</view>
-						<!-- <view class="price" v-if="item.level > 2">{{item.level}}级课程</view>
-						<view class="price" v-if="item.level == 2">￥{{item.courseCharge}}</view>
-						<view class="price colG" v-if="item.chargeType == 0 || item.level == 1">免费</view> -->
-						<view class="course-address acea-row row-between-wrapper">
-							<view class="address">{{item.coursePlace}}</view>
-							<view class="course-time">{{item.enterStartTime}}-{{item.enterEndTime}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 学习榜 -->
-		<view class="study-list-box">
-			<view class="title-box acea-row row-between-wrapper">
-				<view class="title">学习榜单</view>
-				<view class="more" @click="toCourse">查看全部榜单</view>
-			</view>
-			<view class="study-list uni-padding-wrap uni-common-mt">
-				<scroll-view class="scroll-view_H" scroll-x="true">
-						<view class="study-item scroll-view-item_H" v-for="(item,index) in studyList" :key="index"  @click="toStudyDetail(item.id)">
-							<view class="day-box acea-row row-middle">
-								<image src="../../static/date-icon.png" v-if="index%2 == 0"></image>
-								<image src="../../static/date-icon2.png" v-if="index%2 != 0"></image>
-								<text>{{item.clockTimes}}</text>
-							</view>
-							<view class="study-content">
-								<view class="study-title line1">{{item.listName}}</view>
-								<view class="study-time acea-row-nowrap row-between-wrapper">
-									<view>{{setDate(item.listStartTime)}}开始</view>
-									<view>{{item.enterNum}}人已参与</view>
-								</view>
-							</view>
-						</view>
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 都在看 -->
-		<view class="readyarticle-box">
-			<view class="title-box acea-row row-between-wrapper">
-				<view class="title">大家都在看</view>
-				<view class="more" @click="toKnowledge">查看全部文章</view>
-			</view>
-			<view class="article-list">
-				<view class="article-item" v-for="(item,index) in articleList" :key="index" @click="toArticleDetail(item.id)">
-					<image :src="item.imageInput"  mode="aspectFill"></image>
-					<view class="article-content">
-						<view class="article-title line1">{{item.title}}</view>
-						<view class="article-desc line1">{{item.synopsis}}</view>
-						<view class="author-box acea-row row-between">
-							<view class="acea-row">
-								<view class="author">{{item.author}}</view>
-								<view class="time">{{item.addTime.split(' ')[0]}}</view>
-								<view>{{item.visit}}人阅读</view>
-							</view>
-							<view class="tips" 
-								:class="item.chargeType == 0 ? 'free-bg' : item.chargeType == 1 ? '' : 'jifen'">
-								{{item.chargeType == 0 ? '免费' : item.chargeType == 1 ? '收费' : '积分'}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="no-more">没有更多内容了～</view>
-	</view>
-</template>
-<script>
-import { mapState, mapMutations, mapActions } from 'vuex'
-import GoodList from '@/components/GoodList'
-import PromotionGood from '@/components/PromotionGood'
-import CouponWindow from '@/components/CouponWindow'
-import Menu from '@/components/Menu'
-import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
-import Adv from '@/components/sh-adv'
-import Groupon from '@/components/sh-groupon.vue'
-import Banner from './components/Banner'
-import HotCommodity from './components/HotCommodity'
-import FirstNewProduct from './components/FirstNewProduct'
-import ProductsRecommended from './components/ProductsRecommended'
-// import Live from './components/Live'
-
-import { getHomeData, getShare, getCanvas } from '@/api/public'
-import cookie from '@/utils/store/cookie'
-import { isWeixin, handleUrlParam } from '@/utils/index'
-
-import { signCourse } from '@/api/knowledge'
-
-import { getWanniali , getBlessingFlag } from '@/api/diandeng'
-
-import { openShareAll } from '@/libs/wechat'
-
-const HAS_COUPON_WINDOW = 'has_coupon_window'
-
-export default {
-  name: 'Index',
-  components: {
-    UniNoticeBar,
-    GoodList,
-    PromotionGood,
-    CouponWindow,
-    Menu,
-    Adv,
-    Groupon,
-    Banner,
-    HotCommodity,
-    FirstNewProduct,
-    ProductsRecommended,
-  },
-  props: {},
-  data: function() {
-    return {
-      homeData: [],
-      CustomBar: this.CustomBar,
-      StatusBar: this.StatusBar,
-      formatMenus: [],
-      categoryCurrent: 0,
-      menuNum: 4,
-      bgcolor: '',
-      bgColor: '',
-      swiperCurrent: 0, //轮播下标
-      webviewId: 0,
-      showCoupon: false,
-      logoUrl: '',
-      banner: [],
-      menus: [],
-      combinationList: [],
-      roll: [],
-      activity: [],
-      activityOne: {},
-      bastList: [],
-      firstList: [],
-      info: {
-        fastList: [],
-        bastBanner: [],
-        bastList: [],
-      },
-      likeInfo: [],
-      live: [],
-      lovely: [],
-      benefit: [],
-      couponList: [],
-      bgImage: '',
-			week:'',
-			suici:'',
-			year:'',
-			month:'',
-			day:'',
-			ji:'',
-			yi:'',
-			dateStr:'',
-			todayDate:'',
-			courseList: [],
-			studyList: [],
-			articleList: [],
-			flag:0
-    }
-  },
-  computed: {
-    singNew() {
-      return this.roll.length > 0 ? this.roll[0] : '你还没添加通知哦！'
-    },
-    customStyle() {
-      var bgImage = this.bgImage
-      var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`
-      if (this.bgImage) {
-        style = `${style}background-image:url(${bgImage});`
-      }
-      return style
-    }
-  },
-  onLoad: function() {
-    this.getLocation()
-    let that = this
-		this.getDate();
-		uni.showLoading({
-			title:'正在加载中...'
-		})
-		getBlessingFlag().then((res)=>{
-			this.flag = res.data
-		})
-    this.getData()
-		
-		getWanniali(this.dateStr2).then((res)=>{
-			var data = res.data
-			if(res.success){
-				this.suici =  JSON.parse(data.huangli.suici).join(' ')
-				this.week = data.week
-				this.todayDate = data.lunarmonth + data.lunarday
-				this.year = data.year
-				this.month = data.month
-				this.day = data.day
-				this.ji = JSON.parse(data.huangli.ji).join(' ')
-				this.yi = JSON.parse(data.huangli.yi).join(' ')
-			}
-		})
-  },
-	onPullDownRefresh() {
-		this.getData()
-	},
-  methods: {
-    ...mapActions(['getLocation']),
-		
-		getData(){
-			var that = this;
-			getHomeData().then(res => {
-				uni.hideLoading()
-			  that.logoUrl = res.data.logoUrl
-			  res.data.banner.map(item => (item.bgcolor = item.color || ''))
-				res.data.lessionDtos.map(item => {
-					item.enterStartTime = this.setDate(item.enterStartTime)
-					item.enterEndTime = this.setDate(item.enterEndTime)
-				})
-			  that.$set(that, 'info', res.data.info)
-			  that.$set(that, 'firstList', res.data.firstList)
-			  that.$set(that, 'bastList', res.data.bastList)
-			  that.$set(that, 'likeInfo', res.data.likeInfo)
-			  that.$set(that, 'live', res.data.liveList)
-			  that.$set(that, 'lovely', res.data.lovely)
-			  that.$set(that, 'benefit', res.data.benefit)
-			  that.$set(that, 'couponList', res.data.couponList)
-			  that.$set(that, 'combinationList', res.data.combinationList)
-				that.$set(that, 'courseList', res.data.lessionDtos)
-				that.$set(that, 'studyList', res.data.studyLists)
-				that.$set(that, 'articleList', res.data.articleDtos)
-			  uni.hideLoading()
-			  that.setOpenShare()
-				uni.stopPullDownRefresh()
-			})
-		},
-		todiandeng(){
-			uni.navigateTo({
-				url:'/pages/diandeng/index'
-			})
-		},
-		setDate(t){
-			let str = t.split(" ")[0].split("-")[1] + "." + t.split(" ")[0].split("-")[2]
-			return str
-		},
-		getDate(){
-			var today = new Date();
-			var y = today.getFullYear().toString();
-			var m = (today.getMonth()+1).toString();
-			var d = today.getDate().toString();
-			var day = today.getDay();
-			this.dateStr = y + '年' + m + '月' + d + '日';
-			this.dateStr2 = y + '-' + m + '-' + d ;
-		},
-    onShareTimeline: function() {
-      return {
-        title: this.miniHomeRemark,
-        imageUrl: this.miniHomeImg,
-        path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
-      }
-    },
-    onShareAppMessage: function() {
-      return {
-        title: this.miniHomeRemark,
-        imageUrl: this.miniHomeImg,
-        path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
-      }
-    },
-		toNoticePage(){
-			this.$yrouter.push({
-			  path: '/pages/noticePage/index',
-			})
-		},
-		toCourseDetail(id){
-			this.$yrouter.push({
-			  path: '/pages/course/detail',
-			  query: {
-			    id:id,
-			  },
-			})
-		},
-		toStudyDetail(id){
-			this.$yrouter.push({
-			  path: '/pages/study/detail',
-			  query: {
-			    id:id,
-			  },
-			})
-		},
-		toArticleDetail(id){
-			this.$yrouter.push({
-			  path: '/pages/knowledge/detail',
-			  query: {
-			    id:id,
-			  },
-			})
-		},
-		toKnowledge(){
-			uni.switchTab({
-				url: "/pages/knowledge/index"
-			})
-		},
-		toCourse(){
-			uni.switchTab({
-				url: "/pages/course/index"
-			})
-		},
-    goRoll(item) {
-      if (item.uniapp_url) {
-        this.$yrouter.push(item.uniapp_url)
-      }
-    },
-    goGoodSearch() {
-      // this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
-      this.$yrouter.push('/pages/shop/GoodSearch/index')
-    },
-    goWxappUrl(item) {
-      this.$yrouter.push(item.uniapp_url)
-    },
-    goHotNewGoods(type) {
-      this.$yrouter.push({
-        path: '/pages/shop/HotNewGoods/index',
-        query: {
-          type,
-        },
-      })
-    },
-    goGoodsCon(item) {
-      this.$yrouter.push({
-        path: '/pages/shop/GoodsCon/index',
-        query: {
-          id: item.id,
-        },
-      })
-    },
-    goGoodsPromotion() {
-      this.$yrouter.push('/pages/shop/GoodsPromotion/index')
-    },
-    setOpenShare: function() {
-      if (this.$deviceType == 'weixin') {
-        getShare().then(res => {
-          var data = res.data.data
-          var configAppMessage = {
-            desc: data.synopsis,
-            title: data.title,
-            link: location.href,
-            imgUrl: data.img,
-          }
-          openShareAll(configAppMessage)
-        })
-      }
-    },
-    startQr: function() {
-			uni.showLoading({
-				title:'正在加载中...'
-			})
-      uni.scanCode({
-        success: res => {
-          // let option = handleUrlParam(res.result)
-					let id = res.result;
-					signCourse(id).then((res)=>{
-						uni.hideLoading()
-						if(res.success){
-							uni.showModal({
-								title:'提示!',
-								content:'签到成功！您的座位号是' + res.data,
-								
-							})
-						} else{
-							uni.showToast({
-								title:res.msg,
-								icon:'none',
-								duration:5000
-							})
-						}
-					})
-        },
-      })
-    },
-    getbgcolor(e) {
-      this.bgcolor = e
-    },
-  },
-}
-</script>
-<style scoped lang="less">
-.content_box {
-  background: #fff;
-}
-.colG{
-	color: #8FB85B !important;
-}
-.index {
-	padding-bottom: 68rpx;
-	background: #fff !important;
-	.header{
-		.qr {
-			width: 36rpx;
-			height: 38rpx;
-			image{
-				width: 36rpx;
-				height: 38rpx;
-			}
-		}
-	}
-}
-.header-search {
-	width: 690rpx;
-	height: 70rpx;
-	background: #F3F3F3;
-	color: #999999;
-	margin: 0 auto;
-	border-radius: 35rpx;
-	.search{
-		width: 100%;
-		background: #F3F3F3;
-		color: #999999;
-	}
-}
-.notice-box{
-	width: 690rpx;
-	height: 66rpx;
-	margin: 0rpx auto 36rpx;
-	border-radius: 8px;
-	background: #F9F9F9;
-	font-weight: 500;
-	.notice-t{
-		width: 120rpx;
-		height: 100%;
-		background: #FBE5A8;
-		color: #FF4224;
-		text-align: center;
-		line-height: 66rpx;
-		border-top-right-radius: 8rpx;
-		border-bottom-right-radius: 8rpx;
-	}
-	.notice{
-		font-size: 28rpx;
-		color: #411E04;
-		margin-left: 20rpx;
-	}
-}
-.swiper-item {
-  height: 100%;
-}
-.fixed-header {
-  position: fixed;
-  z-index: 99;
-  // #ifdef H5
-  top: 88rpx;
-  // #endif
-  // #ifndef H5
-  top: 0;
-  // #endif
-  left: 0;
-  right: 0;
-  background: #fff;
-  box-shadow: 0 0 20rpx -10rpx #aaa;
-  & + .fixed-header-box {
-    height: 98rpx;
-  }
-}
-.banner-box{
-	width: 688rpx;
-	height: 268rpx;
-	border-radius: 20rpx;
-	overflow: hidden;
-	margin: 32rpx auto;
-	.swiper-box{
-		height: 100%;
-	}
-}
-.today-fortune-content{
-	width: 100%;
-	padding: 0 30rpx;
-	box-sizing: border-box;
-	margin-bottom: 20rpx;
-	.today-fortune-box{
-		width: 100%;
-		background: #fff;
-		box-sizing: border-box;
-		padding: 30rpx 40rpx;
-		border-radius: 20rpx;
-		box-shadow: 0px 6rpx 14rpx rgba(80, 80, 80, 0.08);
-		font-size: 24rpx;
-	}
-	.date-box{
-		font-size: 72rpx;
-		color: #EA533E;
-		margin-top: 38rpx;
-		.time-box{
-			margin: 0 24rpx;
-		}
-		.date-btn{
-			width: 84rpx;
-			height: 84rpx;
-			font-weight: bold;
-			line-height: 100rpx;
-		}
-	}
-	.week-box{
-		width: 100%;
-		color: #7C7C7C;
-		text-align: center;
-		border-bottom: 1px solid #ECECEC;
-		padding: 30rpx 0;
-		.week{
-			display: inline-block;
-			margin-right: 12rpx;
-			color: #222;
-		}
-	}
-	.fortune-detail{
-		font-size: 30rpx;
-		color: #222;
-		.fortune-n{
-			color:#EA533E;
-		}
-		.fortune-icon{
-			width: 44rpx;
-			height: 44rpx;
-			text-align: center;
-			line-height: 44rpx;
-			border-radius: 25px;
-			font-size: 28rpx;
-			color: #fff;
-			margin-right: 20rpx;
-		}
-		.fortune{
-			width:calc(100% - 70rpx)
-		}
-		.nice{
-			background: #EA533E;
-		}
-		.bad{
-			background: #8FB85B;
-		}
-	}
-	.qiuqian-box{
-		width: 100%;
-		height: 124rpx;
-		position: relative;
-		margin-top: 40rpx;
-		image{
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			z-index: 1;
-		}
-		.txt-box{
-			width: 100%;
-			height: 100%;
-			padding:0 28rpx;
-			box-sizing: border-box;
-			font-size: 30rpx;
-			color: #EA533E;
-			position: absolute;
-			z-index: 3;
-		}
-		.qiuqin-btn{
-			width: 194rpx;
-			height: 68rpx;
-			background: linear-gradient(180deg, #EA533E 0%, #E5270F 100%);
-			box-shadow: 0px 4rpx 6rpx 2rpx rgba(255,213,208,0.59);
-			border-radius: 34rpx;
-			font-size: 32rpx;
-			color: #fff;
-			text-align: center;
-			line-height: 68rpx;
-		}
-	}
-	.fortune-menu-box{
-		.fortune-menu-item{
-			width: 216rpx;
-			height: 88rpx;
-			border-radius: 6rpx;
-			background: #fff;
-			font-size: 28rpx;
-			color: #222;
-			image{
-				width: 60rpx;
-				height: 60rpx;
-				margin-right: 12rpx;
-			}
-		}
-	}
-		
-}
-
-.p30{
-	width: 100%;
-	padding: 0 30rpx;
-	box-sizing: border-box;
-	margin-bottom: 40rpx;
-}
-.recommend-box{
-	.recommend-list-box{
-		width: 100%;
-		// margin-top: 20rpx;
-		.recommend-item{
-			width: 334rpx;
-			background: #fff;
-			border-radius: 10rpx;
-			font-size: 28rpx;
-			color: #333;
-			margin-right: 23rpx;
-			margin-top: 23rpx;
-			box-shadow: 0px 2rpx 4rpx rgba(0, 0, 0, 0.16);
-			image{
-				width: 334rpx;
-				height: 216rpx;
-			}
-			.course-content{
-				width: 100%;
-				box-sizing: border-box;
-				padding:0 10rpx 20rpx;
-			}
-			.course-title{
-				line-height: 40rpx;
-			}
-			.course-tips-box{
-				margin: 12rpx 0 24rpx;
-				font-size: 24rpx;
-				color: #999;
-				.course-tip-item{
-					min-width: 60rpx;
-					height: 34rpx;
-					line-height: 32rpx;
-					text-align: center;
-					background: #EDEFF8;
-					border-radius: 4rpx;
-					border: 1px solid #6E85EB;
-					padding: 0 6rpx;
-					font-size: 22rpx;
-					margin-right: 20rpx;
-					box-sizing: border-box;
-					margin-right: 10rpx;
-				}
-				.blue{
-					color: #6E85EB;
-					background: #EDEFF8;
-					border-color: #6E85EB;
-				}
-				.yellow{
-					color: #F99C10;
-					background: #FFEDCC;
-					border-color: #F99C10;
-				}
-			}
-			.price{
-				font-size: 32rpx;
-				color: #EA533E;
-				font-weight: 500;
-				margin: 16rpx 0;
-			}
-			.course-address{
-				font-size: 24rpx;
-				color: #999999;
-			}
-		}
-		.recommend-item:nth-child(2n){
-			margin-right: 0;
-		}
-	}
-	
-}
-.study-list-box,.readyarticle-box{
-	margin-bottom: 40rpx;
-	.title-box{
-		width: 100%;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-	}
-}
-.study-list{
-	width: 100%;
-	margin-top: 20rpx;
-	margin-bottom: 40rpx;
-	padding-left: 20rpx;
-	box-sizing: border-box;
-	.scroll-view_H{
-		white-space: nowrap;
-		width: 100%;
-	}
-	.study-item{
-		width: 334rpx;
-		height: 180rpx;
-		display: inline-block;
-		background: linear-gradient(143deg, #FDAF97 0%, #ED5E48 100%);
-		box-shadow: 0px 4rpx 8rpx 4rpx rgba(250,194,183,0.32);
-		border-radius: 10rpx;
-		margin-right: 20rpx;
-		.day-box{
-			color: #E73D21;
-			font-size: 48rpx;
-			line-height: 58rpx;
-			margin-left: 10rpx;
-			image{
-				width: 34rpx;
-				height: 34rpx;
-				margin-right: 10rpx;
-			}
-		}
-		.study-content{
-			width: calc(100% - 12rpx);
-			background: #fff;
-			font-size: 24rpx;
-			color: #999;
-			box-shadow: 0px 4rpx 8rpx 4rpx rgba(250,194,183,0.32);
-			border-radius: 10rpx;
-			margin: 2rpx auto;
-			padding:16rpx 10rpx 10rpx;
-			box-sizing: border-box;
-			.study-title{
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #222222;
-				line-height: 40rpx;
-				margin-bottom: 12rpx;
-			}
-		}
-	}
-	.study-item:nth-child(2n){
-		background: linear-gradient(143deg, #C4DBFF 0%, #7FAAF2 100%);
-		.day-box{
-			color: #557AB3;
-		}
-	}
-}
-.readyarticle-box{
-	.article-list{
-		width: 100%;
-		margin-top: 20rpx;
-		.article-item{
-			width: 100%;
-			background: #fff;
-			padding: 20rpx;
-			box-sizing: border-box;
-			margin-bottom: 12rpx;
-			image{
-				width: 710rpx;
-				height: 266rpx;
-				border-radius: 10rpx;
-				margin-bottom: 20rpx;
-			}
-			.article-title{
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				line-height: 50rpx;
-				margin-bottom: 8rpx;
-			}
-			.article-desc{
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #999999;
-				line-height: 40rpx;
-				margin-bottom: 30rpx;
-				text-indent: 1em;
-			}
-			.author-box{
-				font-size: 24rpx;
-				color: #999;
-				// text-indent: 1em;
-				.author{
-					color: #EA533E;
-				}
-				.time{
-					margin: 0 12rpx;
-				}
-				.tips{
-					width: 100rpx;
-					font-size: 20rpx;
-					color: #FFAD3A;
-					height: 34rpx;
-					text-align: center;
-					line-height: 34rpx;
-					background: #fcd391;
-					border-radius: 44rpx;
-				}
-				.free-bg{
-					background: #8FB85B;
-					color: #D7FFA4;
-				}
-				.jifen{
-					background: #AAC8FA;
-					color: #5693F9;
-				}
-			}
-		}
-	}
-}
-.title-box{
-	color: #222;
-	.title{
-		font-size: 40rpx;
-		font-weight: 500;
-	}
-	.more{
-		font-size: 24rpx;
-		color: #999;
-	}
-}
-image{
-	width: 100%;
-	height: 100%;
-}
-.no-more{
-	text-align: center;
-	color: #999;
-	font-size: 24rpx;
-}
-
-.head_box {
-  width: 750rpx;
-  // background: #fff;
-  transition: all linear 0.3s;
-
-  /deep/.cuIcon-back {
-    display: none;
-  }
-
-  .nav-title {
-    font-size: 38rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    color: #fff;
-  }
-}
-
-.cu-bar.fixed {
-  position: fixed;
-  width: 100%;
-  top: 0;
-  z-index: 1024;
-  // box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
-}
-
-.cu-bar {
-  box-sizing: border-box;
-  .index .header {
-    height: 64rpx;
-  }
-}
-
-
-.cu-bar .action {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-  height: 100%;
-  max-height: 100%;
-
-  &:first-child {
-    margin-left: 15px;
-    font-size: 15px;
-  }
-}
-
-.home_content_box {
-  margin-top: -20rpx;
-}
-
-.head_box {
-}
-
-.nav-title {
-  margin-left: 20rpx;
-  line-height: 40px;
-}
+<template>
+	<view class="index">
+		<view class="header header-search acea-row row-middle">
+			<view @click="goGoodSearch()" class="search acea-row row-middle">
+				<text class="iconfont icon-xiazai5"></text>
+				搜索商品
+			</view>
+		</view>
+		<view class="banner-box">
+			<swiper class="swiper-box">
+				<swiper-item>
+					<view class="swiper-item">
+						<image src="https://www.cyjyyjy.com:8081/static/home-banner.png" mode=""></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<!-- 每日一签 -->
+		<view class="today-fortune-content">
+			<view class="today-fortune-box">
+				<view class="top-box acea-row row-between-wrapper">
+					<view class="title">
+						<image src="../../static/idx-icon1.png"></image>
+					</view>
+					<view>{{year}}年{{month}}月{{day}}日</view>
+				</view>
+				<view class="date-box acea-row row-middle row-center">
+					<view class="date-btn prev-btn">
+						<image src="../../static/prev.png"></image>
+					</view>
+					<view class="time-box">{{todayDate}}</view>
+					<view class="date-btn next-btn">
+						<image src="../../static/next.png"></image>
+					</view>
+				</view>
+				<view class="week-box">
+					<span class="week">星期{{week}}</span>
+					<span>{{suici}}</span>
+				</view>
+				<view class="fortune-detail">
+					<view class="fortune-n acea-row-nowrap mt20">
+						<view class="fortune-icon nice">
+							<image src="../../static/yi.png"></image>
+						</view>
+						<view class="fortune">{{yi}}</view>
+					</view>
+					<view class="fortune-b acea-row-nowrap mt20">
+						<view class="fortune-icon bad">
+							<image src="../../static/ji.png"></image>
+						</view>
+						<view class="fortune">{{ji}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="notice-box acea-row row-middle" @click="toNoticePage">
+			<view class="notice-t">公告</view>
+			<view class="notice">点击下载直播APP，在线观看！！</view>
+		</view> -->
+		<!-- 推荐直播 -->
+		<view class="liveCourse-list-box p30">
+			<ListTitleBox :titImg="'../../../static/tit1.png'"> </ListTitleBox>
+			<view class="liveCourse-list acea-row row-between">
+				<view class="item" v-for="item in live" :key="item.id">
+					<image :src="item.coverImge" mode="aspectFill"></image>
+					<text>{{item.name}}</text>
+				</view>
+			</view>
+		</view>
+		<!-- 推荐课程 -->
+		<view class="recommend-box p30">
+			<ListTitleBox :titImg="'../../../static/tit2.png'" :titWord="'查看更多课程'" @seeMoreClick="toCourse">
+			</ListTitleBox>
+			<CourseList :list="courseList"></CourseList>
+		</view>
+		<!-- 学习榜 -->
+		<view class="study-list-box p30">
+			<ListTitleBox :titImg="'../../../static/tit3.png'" :titWord="'查看更多打卡榜单'" @seeMoreClick="toCourse">
+			</ListTitleBox>
+			<StadyList :list="studyList"></StadyList>
+		</view>
+		<!-- 都在看 -->
+		<view class="readyarticle-box p30">
+			<ListTitleBox :titImg="'../../../static/tit4.png'" :titWord="'查看全部文章'" @seeMoreClick="toKnowledge">
+			</ListTitleBox>
+			<ArticleList :list="articleList"></ArticleList>
+
+		</view>
+		<view class="no-more">没有更多内容了～</view>
+	</view>
+</template>
+<script>
+	import {
+		mapState,
+		mapMutations,
+		mapActions
+	} from 'vuex'
+	import GoodList from '@/components/GoodList'
+	import PromotionGood from '@/components/PromotionGood'
+	import CouponWindow from '@/components/CouponWindow'
+	import Menu from '@/components/Menu'
+	import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
+	import Adv from '@/components/sh-adv'
+	import Groupon from '@/components/sh-groupon.vue'
+	import Banner from './components/Banner'
+	import HotCommodity from './components/HotCommodity'
+	import FirstNewProduct from './components/FirstNewProduct'
+	import ProductsRecommended from './components/ProductsRecommended'
+	// import Live from './components/Live'
+	import CourseList from './components/CourseList.vue'
+	import ListTitleBox from './components/ListTitleBox.vue'
+	import StadyList from './components/StadyList.vue'
+	import ArticleList from './components/ArticleList.vue'
+	import {
+		getHomeData,
+		getShare,
+		getCanvas
+	} from '@/api/public'
+	import cookie from '@/utils/store/cookie'
+	import {
+		isWeixin,
+		handleUrlParam
+	} from '@/utils/index'
+	import {
+		signCourse
+	} from '@/api/knowledge'
+	import {
+		getWanniali,
+		getBlessingFlag
+	} from '@/api/diandeng'
+	import {
+		openShareAll
+	} from '@/libs/wechat'
+	const HAS_COUPON_WINDOW = 'has_coupon_window'
+
+	export default {
+		name: 'Index',
+		components: {
+			UniNoticeBar,
+			GoodList,
+			PromotionGood,
+			CouponWindow,
+			Menu,
+			Adv,
+			Groupon,
+			Banner,
+			HotCommodity,
+			FirstNewProduct,
+			ProductsRecommended,
+			CourseList,
+			ListTitleBox,
+			StadyList,
+			ArticleList,
+		},
+		props: {},
+		data: function() {
+			return {
+				homeData: [],
+				CustomBar: this.CustomBar,
+				StatusBar: this.StatusBar,
+				formatMenus: [],
+				categoryCurrent: 0,
+				menuNum: 4,
+				bgcolor: '',
+				bgColor: '',
+				swiperCurrent: 0, //轮播下标
+				webviewId: 0,
+				showCoupon: false,
+				logoUrl: '',
+				banner: [],
+				menus: [],
+				combinationList: [],
+				roll: [],
+				activity: [],
+				activityOne: {},
+				bastList: [],
+				firstList: [],
+				info: {
+					fastList: [],
+					bastBanner: [],
+					bastList: [],
+				},
+				likeInfo: [],
+				live: [],
+				lovely: [],
+				benefit: [],
+				couponList: [],
+				bgImage: '',
+				week: '',
+				suici: '',
+				year: '',
+				month: '',
+				day: '',
+				ji: '',
+				yi: '',
+				dateStr: '',
+				todayDate: '',
+				courseList: [],
+				studyList: [],
+				articleList: [],
+				flag: 0,
+				titImg1: '../../../static/tit1.png',
+				titleWord1: '查看更多课程',
+				titImg2: '../../../static/tit2.png',
+				titleWord2: '查看更多打卡榜单'
+			}
+		},
+		computed: {
+			singNew() {
+				return this.roll.length > 0 ? this.roll[0] : '你还没添加通知哦！'
+			},
+			customStyle() {
+				var bgImage = this.bgImage
+				var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`
+				if (this.bgImage) {
+					style = `${style}background-image:url(${bgImage});`
+				}
+				return style
+			}
+		},
+		onLoad: function() {
+			this.getLocation()
+			let that = this
+			this.getDate();
+			uni.showLoading({
+				title: '正在加载中...'
+			})
+			getBlessingFlag().then((res) => {
+				this.flag = res.data
+			})
+			this.getData()
+
+			getWanniali(this.dateStr2).then((res) => {
+				var data = res.data
+				if (res.success) {
+					this.suici = JSON.parse(data.huangli.suici).join(' ')
+					this.week = data.week
+					this.todayDate = data.lunarmonth + data.lunarday
+					this.year = data.year
+					this.month = data.month
+					this.day = data.day
+					this.ji = JSON.parse(data.huangli.ji).join(' ')
+					this.yi = JSON.parse(data.huangli.yi).join(' ')
+				}
+			})
+		},
+		onPullDownRefresh() {
+			this.getData()
+		},
+		methods: {
+			...mapActions(['getLocation']),
+			getData() {
+				var that = this;
+				getHomeData().then(res => {
+					uni.hideLoading()
+					that.logoUrl = res.data.logoUrl
+					res.data.banner.map(item => (item.bgcolor = item.color || ''))
+					res.data.lessionDtos.map(item => {
+						item.enterStartTime = this.setDate(item.enterStartTime)
+						item.enterEndTime = this.setDate(item.enterEndTime)
+					})
+					res.data.studyLists.map(item => {
+						item.listStartTime = this.setDate(item.listStartTime)
+					})
+					that.$set(that, 'info', res.data.info)
+					that.$set(that, 'firstList', res.data.firstList)
+					that.$set(that, 'bastList', res.data.bastList)
+					that.$set(that, 'likeInfo', res.data.likeInfo)
+					that.$set(that, 'live', res.data.liveList)
+					that.$set(that, 'lovely', res.data.lovely)
+					that.$set(that, 'benefit', res.data.benefit)
+					that.$set(that, 'couponList', res.data.couponList)
+					that.$set(that, 'combinationList', res.data.combinationList)
+					that.$set(that, 'courseList', res.data.lessionDtos)
+					that.$set(that, 'studyList', res.data.studyLists)
+					that.$set(that, 'articleList', res.data.articleDtos)
+					uni.hideLoading()
+					that.setOpenShare()
+					uni.stopPullDownRefresh()
+				})
+			},
+			todiandeng() {
+				uni.navigateTo({
+					url: '/pages/diandeng/index'
+				})
+			},
+			setDate(t) {
+				return t.split(" ")[0].split("-")[1] + "." + t.split(" ")[0].split("-")[2]
+			},
+			getDate() {
+				var today = new Date();
+				var y = today.getFullYear().toString()
+				var m = (today.getMonth() + 1).toString()
+				var d = today.getDate().toString()
+				var day = today.getDay()
+				this.dateStr = y + '年' + m + '月' + d + '日'
+				this.dateStr2 = y + '-' + m + '-' + d
+			},
+			onShareTimeline: function() {
+				return {
+					title: this.miniHomeRemark,
+					imageUrl: this.miniHomeImg,
+					path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
+				}
+			},
+			onShareAppMessage: function() {
+				return {
+					title: this.miniHomeRemark,
+					imageUrl: this.miniHomeImg,
+					path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
+				}
+			},
+			toNoticePage() {
+				this.$yrouter.push({
+					path: '/pages/noticePage/index',
+				})
+			},
+			toArticleDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/knowledge/detail',
+					query: {
+						id: id,
+					},
+				})
+			},
+			toKnowledge() {
+				uni.switchTab({
+					url: "/pages/knowledge/index"
+				})
+			},
+			toCourse() {
+				uni.switchTab({
+					url: "/pages/course/index"
+				})
+			},
+			goRoll(item) {
+				if (item.uniapp_url) {
+					this.$yrouter.push(item.uniapp_url)
+				}
+			},
+			goGoodSearch() {
+				// this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
+				this.$yrouter.push('/pages/shop/GoodSearch/index')
+			},
+			goWxappUrl(item) {
+				this.$yrouter.push(item.uniapp_url)
+			},
+			goHotNewGoods(type) {
+				this.$yrouter.push({
+					path: '/pages/shop/HotNewGoods/index',
+					query: {
+						type,
+					},
+				})
+			},
+			goGoodsCon(item) {
+				this.$yrouter.push({
+					path: '/pages/shop/GoodsCon/index',
+					query: {
+						id: item.id,
+					},
+				})
+			},
+			goGoodsPromotion() {
+				this.$yrouter.push('/pages/shop/GoodsPromotion/index')
+			},
+			setOpenShare: function() {
+				if (this.$deviceType == 'weixin') {
+					getShare().then(res => {
+						var data = res.data.data
+						var configAppMessage = {
+							desc: data.synopsis,
+							title: data.title,
+							link: location.href,
+							imgUrl: data.img,
+						}
+						openShareAll(configAppMessage)
+					})
+				}
+			},
+			startQr: function() {
+				uni.showLoading({
+					title: '正在加载中...'
+				})
+				uni.scanCode({
+					success: res => {
+						// let option = handleUrlParam(res.result)
+						let id = res.result;
+						signCourse(id).then((res) => {
+							uni.hideLoading()
+							if (res.success) {
+								uni.showModal({
+									title: '提示!',
+									content: '签到成功！您的座位号是' + res.data,
+
+								})
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 5000
+								})
+							}
+						})
+					},
+				})
+			},
+			getbgcolor(e) {
+				this.bgcolor = e
+			},
+		},
+	}
+</script>
+<style scoped lang="less">
+	.content_box {
+		background: #fff;
+	}
+
+	.colG {
+		color: #8FB85B !important;
+	}
+
+	.index {
+		padding-bottom: 68rpx;
+		background: #fff !important;
+
+		.header {
+			.qr {
+				width: 36rpx;
+				height: 38rpx;
+
+				image {
+					width: 36rpx;
+					height: 38rpx;
+				}
+			}
+		}
+	}
+
+	.header-search {
+		width: 690rpx;
+		height: 70rpx;
+		background: #F3F3F3;
+		color: #999999;
+		margin: 0 auto;
+		border-radius: 35rpx;
+
+		.search {
+			width: 100%;
+			background: #F3F3F3;
+			color: #999999;
+		}
+	}
+
+	.notice-box {
+		width: 690rpx;
+		height: 66rpx;
+		margin: 0rpx auto 36rpx;
+		border-radius: 8px;
+		background: #F9F9F9;
+		font-weight: 500;
+
+		.notice-t {
+			width: 120rpx;
+			height: 100%;
+			background: #FBE5A8;
+			color: #FF4224;
+			text-align: center;
+			line-height: 66rpx;
+			border-top-right-radius: 8rpx;
+			border-bottom-right-radius: 8rpx;
+		}
+
+		.notice {
+			font-size: 28rpx;
+			color: #411E04;
+			margin-left: 20rpx;
+		}
+	}
+
+	.swiper-item {
+		height: 100%;
+	}
+
+	.fixed-header {
+		position: fixed;
+		z-index: 99;
+		// #ifdef H5
+		top: 88rpx;
+		// #endif
+		// #ifndef H5
+		top: 0;
+		// #endif
+		left: 0;
+		right: 0;
+		background: #fff;
+		box-shadow: 0 0 20rpx -10rpx #aaa;
+
+		&+.fixed-header-box {
+			height: 98rpx;
+		}
+	}
+
+	.banner-box {
+		width: 688rpx;
+		height: 268rpx;
+		border-radius: 20rpx;
+		overflow: hidden;
+		margin: 32rpx auto;
+
+		.swiper-box {
+			height: 100%;
+		}
+	}
+
+	.today-fortune-content {
+		width: 100%;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-bottom: 20rpx;
+
+		.today-fortune-box {
+			width: 100%;
+			background: #fff;
+			box-sizing: border-box;
+			padding: 30rpx 40rpx;
+			border-radius: 20rpx;
+			box-shadow: 0px 6rpx 14rpx rgba(80, 80, 80, 0.08);
+			font-size: 24rpx;
+
+			.top-box {
+				color: #999999;
+
+				.title {
+					width: 208rpx;
+					height: 62rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.date-box {
+			font-size: 72rpx;
+			color: #EA533E;
+			margin-top: 38rpx;
+
+			.time-box {
+				margin: 0 24rpx;
+			}
+
+			.date-btn {
+				width: 84rpx;
+				height: 84rpx;
+				font-weight: bold;
+				line-height: 100rpx;
+			}
+		}
+
+		.week-box {
+			width: 100%;
+			color: #7C7C7C;
+			text-align: center;
+			// border-bottom: 1px solid #ECECEC;
+			padding: 30rpx 0;
+
+			.week {
+				display: inline-block;
+				margin-right: 12rpx;
+				color: #222;
+			}
+		}
+
+		.fortune-detail {
+			font-size: 30rpx;
+			color: #222;
+
+			.fortune-n {
+				color: #EA533E;
+			}
+
+			.fortune-icon {
+				width: 64rpx;
+				height: 52rpx;
+				margin-right: 24rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.fortune {
+				width: calc(100% - 88rpx)
+			}
+		}
+
+		.qiuqian-box {
+			width: 100%;
+			height: 124rpx;
+			position: relative;
+			margin-top: 40rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				z-index: 1;
+			}
+
+			.txt-box {
+				width: 100%;
+				height: 100%;
+				padding: 0 28rpx;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				color: #EA533E;
+				position: absolute;
+				z-index: 3;
+			}
+
+			.qiuqin-btn {
+				width: 194rpx;
+				height: 68rpx;
+				background: linear-gradient(180deg, #EA533E 0%, #E5270F 100%);
+				box-shadow: 0px 4rpx 6rpx 2rpx rgba(255, 213, 208, 0.59);
+				border-radius: 34rpx;
+				font-size: 32rpx;
+				color: #fff;
+				text-align: center;
+				line-height: 68rpx;
+			}
+		}
+
+		.fortune-menu-box {
+			.fortune-menu-item {
+				width: 216rpx;
+				height: 88rpx;
+				border-radius: 6rpx;
+				background: #fff;
+				font-size: 28rpx;
+				color: #222;
+
+				image {
+					width: 60rpx;
+					height: 60rpx;
+					margin-right: 12rpx;
+				}
+			}
+		}
+	}
+
+	.p30 {
+		width: 100%;
+		padding: 0 30rpx;
+		margin-bottom: 40rpx;
+	}
+
+	.liveCourse-list {
+		.item {
+			width: 334rpx;
+			font-size: 28rpx;
+			color: #000;
+			font-weight: bold;
+			overflow: hidden;
+			margin-right: 18rpx;
+
+			image {
+				width: 100%;
+				height: 224rpx;
+				margin-bottom: 18rpx;
+				border-radius: 12rpx;
+			}
+		}
+	}
+
+	.readyarticle-box {
+		.article-list {
+			width: 100%;
+			margin-top: 20rpx;
+
+			.article-item {
+				width: 100%;
+				background: #fff;
+				box-sizing: border-box;
+				margin-bottom: 12rpx;
+
+				image {
+					width: 100%;
+					height: 266rpx;
+					border-radius: 10rpx;
+					margin-bottom: 20rpx;
+				}
+
+				.article-title {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 50rpx;
+					margin-bottom: 8rpx;
+				}
+
+				.article-desc {
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #999999;
+					line-height: 40rpx;
+					margin-bottom: 30rpx;
+					// text-indent: 1em;
+				}
+
+				.author-box {
+					font-size: 24rpx;
+					color: #999;
+
+					// text-indent: 1em;
+					.author {
+						color: #EA533E;
+					}
+
+					.time {
+						margin: 0 12rpx;
+					}
+
+					.tips {
+						width: 100rpx;
+						font-size: 20rpx;
+						color: #FFAD3A;
+						height: 34rpx;
+						text-align: center;
+						line-height: 34rpx;
+						background: #fcd391;
+						border-radius: 44rpx;
+					}
+
+					.free-bg {
+						background: #8FB85B;
+						color: #D7FFA4;
+					}
+
+					.jifen {
+						background: #AAC8FA;
+						color: #5693F9;
+					}
+				}
+			}
+		}
+	}
+
+	.title-box {
+		width: 208rpx;
+		height: 62rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.more {
+			font-size: 24rpx;
+			color: #999;
+		}
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.no-more {
+		text-align: center;
+		color: #999;
+		font-size: 24rpx;
+	}
+
+	.head_box {
+		width: 750rpx;
+		// background: #fff;
+		transition: all linear 0.3s;
+
+		/deep/.cuIcon-back {
+			display: none;
+		}
+
+		.nav-title {
+			font-size: 38rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #fff;
+		}
+	}
+
+	.cu-bar.fixed {
+		position: fixed;
+		width: 100%;
+		top: 0;
+		z-index: 1024;
+		// box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
+	}
+
+	.cu-bar {
+		box-sizing: border-box;
+
+		.index .header {
+			height: 64rpx;
+		}
+	}
+
+
+	.cu-bar .action {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		align-items: center;
+		height: 100%;
+		max-height: 100%;
+
+		&:first-child {
+			margin-left: 15px;
+			font-size: 15px;
+		}
+	}
+
+	.home_content_box {
+		margin-top: -20rpx;
+	}
+
+	.head_box {}
+
+	.nav-title {
+		margin-left: 20rpx;
+		line-height: 40px;
+	}
 </style>
diff --git a/static/bangdanbg.png b/static/bangdanbg.png
new file mode 100644
index 0000000..27b1ea2
Binary files /dev/null and b/static/bangdanbg.png differ
diff --git a/static/idx-icon1.png b/static/idx-icon1.png
new file mode 100644
index 0000000..0e94886
Binary files /dev/null and b/static/idx-icon1.png differ
diff --git a/static/ji.png b/static/ji.png
new file mode 100644
index 0000000..b54175f
Binary files /dev/null and b/static/ji.png differ
diff --git a/static/tit1.png b/static/tit1.png
new file mode 100644
index 0000000..aeffca7
Binary files /dev/null and b/static/tit1.png differ
diff --git a/static/tit2.png b/static/tit2.png
new file mode 100644
index 0000000..a2d8a28
Binary files /dev/null and b/static/tit2.png differ
diff --git a/static/tit3.png b/static/tit3.png
new file mode 100644
index 0000000..9b8e7d9
Binary files /dev/null and b/static/tit3.png differ
diff --git a/static/tit4.png b/static/tit4.png
new file mode 100644
index 0000000..eef759a
Binary files /dev/null and b/static/tit4.png differ
diff --git a/static/tit5.png b/static/tit5.png
new file mode 100644
index 0000000..6fb0478
Binary files /dev/null and b/static/tit5.png differ
diff --git a/static/tit6.png b/static/tit6.png
new file mode 100644
index 0000000..c5970c3
Binary files /dev/null and b/static/tit6.png differ
diff --git a/static/yi.png b/static/yi.png
new file mode 100644
index 0000000..e601d32
Binary files /dev/null and b/static/yi.png differ