diff --git a/manifest.json b/manifest.json
index 71c59c0..628b90b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -134,15 +134,15 @@
                 "ios" : {
                     "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
-                        "app" : "",
-                        "app@2x" : "",
-                        "notification" : "",
-                        "notification@2x" : "",
-                        "proapp@2x" : "",
-                        "settings" : "",
-                        "settings@2x" : "",
-                        "spotlight" : "",
-                        "spotlight@2x" : ""
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
                     "iphone" : {
                         "app@2x" : "unpackage/res/icons/120x120.png",
diff --git a/pages.json b/pages.json
index 0bf9f03..41c498a 100644
--- a/pages.json
+++ b/pages.json
@@ -254,6 +254,20 @@
 			{
 				"navigationBarTitleText" : "课程详细"
 			}
+		},
+		{
+			"path" : "pages/course/courseSet",
+			"style" : 
+			{
+				"navigationBarTitleText" : "课程设置"
+			}
+		},
+		{
+			"path" : "pages/course/illustrate",
+			"style" : 
+			{
+				"navigationBarTitleText" : "课程说明"
+			}
 		}		
 	],
 	"globalStyle": {
@@ -284,7 +298,7 @@
 				"text": "购物车"
 			},
 			{
-				"pagePath": "pages/news/news",
+				"pagePath": "pages/peanut/shopping",
 				"iconPath": "static/tab/tab_nor_03.png",
 				"selectedIconPath": "static/tab/tab_cur_03.png",
 				"text": "太湖公益"
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 36c090b..7a1c64e 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -4,96 +4,69 @@
 		<public-module></public-module>
 		<z-nav-bar :title="pageTitle ? pageTitle : '课程详情'"></z-nav-bar>
 		<view class="curseImg">
-			<image src="../../static/video.jpg" mode="widthFix"></image>
+			<image v-if="!course.image" src="/static/nobg.jpg" mode="widthFix"></image>
+			<image v-else :src="course.image" mode="widthFix"></image>
 		</view>
 		<view class="containerBg1">
-			<view class="courseTitle">
-				<text class="title">桃源探秘•陶渊明的魔域桃源</text>
-				<view class="tags flexbox">
-					<view class="tagsBox">
-						<uni-tag style="margin-right: 10rpx;" :inverted="true" text="高级" type="primary" />
-						<uni-tag style="margin-right: 10rpx;" :inverted="true" text="选修" type="success" />
-					</view>
-					<view class="price">
-						<text>￥<i>299</i>起</text>
-					</view>
-				</view>
-				<view class="btnContainer flexbox">
-					<view class="saveBtn flexbox">
-						<!-- star-fill -->
-						<u-icon name="star" color="#fff" size="28"></u-icon>
-						<text>加入收藏</text>
-					</view>
-					<view class="saveBtn buybtn flexbox">
-						<!-- bag-fill -->
-						<u-icon name="bag" color="#fff" size="28"></u-icon>
-						<text>购买整套课程</text>
-					</view>
-				</view>
+			<view class="courseTitle" v-if="course.id">
+				<text class="title">{{course.title}}</text>			
 			</view>
-			<view class="containerBg">				
+			<view class="containerBg">
 				<view class="prof">
 					<uni-section style="background: transparent;" title="课程介绍" type="line"></uni-section>
-					<view class="">
-						需要注意的是当使用插槽时，内置样式将会失效，只保留排版样式，此时的样式需要开发者自己实现 如果 uni-list-item
-						组件内置属性样式无法满足需求，可以使用插槽来自定义uni-list-item里的内容。 uni-list-item提供了3个可扩展的插槽：
+					<view class="" v-html="course.content">
 					</view>
 				</view>
 			</view>
 			<!-- <view class="containerBg"> -->
-			<view class="coursePart flexbox">
-				<view class="active item flexbox">
-					<view class="">上部</view>
-					<!-- <u-icon name="lock" color="#2979ff" size="28"></u-icon> -->
-				</view>
-				<view class="item flexbox">
-					<!-- bag-fill -->
-					<u-icon name="lock" color="#fff" size="28"></u-icon>
-					<text>下部</text>
+			<view class="coursePart flexbox" v-if="librayList.length > 1">
+				<view :class="['item','flexbox',curId == item.id? 'active': '' ]" v-for="(item, index) in librayList"
+					:key="index" @click="clicklib(item,index)">
+					<u-icon v-if="item.isBuy == 0 && curId == item.id" name="lock" color="#258feb" size="28"></u-icon>
+					<u-icon v-if="item.isBuy == 0 && curId != item.id" name="lock" color="#fff" size="28"></u-icon>
+					<view class="">{{item.title}}</view>
 				</view>
 			</view>
-			<view class="courseList">
-				<view class="item">
-					<text>一、概论</text>
+			<view class="courseList" v-if="courseList.length > 0">
+				<view class="item" v-for="(item, index) in courseList" :key="index">
+					<text>{{item.title}}</text>
 				</view>
-				<view class="item">
-					<text>二、阴阳应象大论（上）</text>
-				</view>
-				<view class="item">
-					<text>三、阴阳应象大论（下）</text>
-				</view>
-				<view class="item">
-					<text>四、阴阳离合论（一）</text>
-				</view>
-				<view class="item">
-					<text>一、概论</text>
-				</view>
-				<view class="item">
-					<text>二、阴阳应象大论（上）</text>
-				</view>
-				<view class="item">
-					<text>三、阴阳应象大论（下）</text>
-				</view>
-				<view class="item">
-					<text>四、阴阳离合论（一）</text>
-				</view>
-				<view class="item">
-					<text>一、概论</text>
-				</view>
-				<view class="item">
-					<text>二、阴阳应象大论（上）</text>
-				</view>
-				<view class="item">
-					<text>三、阴阳应象大论（下）</text>
-				</view>
-				<view class="item">
-					<text>四、阴阳离合论（一）</text>
+				<view class="buyBox flexbox" v-if="this.librayList[this.curIndex].isBuy == 0">
+					<!-- 普通未购买 -->
+					<view class="item">
+						<text>您还未购买此课程，开通 <text style="font-weight: bold;">超级VIP</text> 或 购买课程 均可观看课程</text>
+					</view>
+					<view class="item tbn flexbox">
+						<view class="saveBtn buybtn flexbox" @click="goBuy('halfFee')">
+							<u-icon name="bag" color="#fff" size="28"></u-icon>
+							<text>立即购买</text>
+						</view>
+						<view class="saveBtn vipBtn flexbox" @click="goBuy('halfFee')">
+							
+							<uni-icons type="vip" size="28" color="#fff"></uni-icons>
+							<text>开通超级VIP</text>
+						</view>
+					</view>
+					
 				</view>
 			</view>
-			<!-- 购买位置 -->
-			<view class="buyBox">
-
-			</view>
+			<u-divider v-else text="暂无数据"></u-divider>
+			<u-popup :show="pricespop" :round="10" @close="closePup">
+				<view class="proListPrice" v-if="proPriceList.length > 0">
+				<view class="title">
+					请选择您的购买时长
+				</view>
+				<view class="list">
+					<view class="item" v-for="(item,index) in proPriceList" 
+					:key="index"
+					@click="choosePrice(item)"
+					>
+						{{item.productName}} - ￥{{item.price}}
+					</view>
+				</view>
+					
+				</view>
+			</u-popup>
 			<view>
 				<u-back-top :scroll-top="scrollTop" bottom="150" :customStyle='bgiStyle'
 					:iconStyle="iconStyle"></u-back-top>
@@ -135,11 +108,16 @@
 					// backgroundColor: '#258feb'
 
 				},
+				pricespop:false,
 				subList: [],
 				scrollable: false,
 				pageTitle: null,
 				courseList: [],
-				// status: 3, // 0 不显示, 1 加载中，2 加载全部完成，3 暂无数据
+				course: {},
+				librayList: [], // 目录列表
+				curId: null,
+				curIndex: 0,
+				proPriceList:[],
 
 			};
 		},
@@ -147,11 +125,10 @@
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-			this.courseId = e.id
-			this.pageTitle = e.title
+			// this.pageTitle = e.title
 			console.log(e, '传入分类id')
 			// this.getCateList(this.courseId)
-			// this.getData(this.courseId)
+			this.getData(e.id)
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -174,17 +151,13 @@
 			// musicPlay
 		},
 		//方法
-		methods: {
+		methods: {				
 			getData(id) {
-				this.status = 1
-				this.flag = false
 				$http.request({
-						url: "medical/home/getMedicalCourseList",
+						url: "sociology/course/getCourseDetail",
 						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 						data: {
-							"id": id,
-							"limit": 12,
-							"page": this.page
+							"id": id
 						},
 						header: { //默认 无 说明：请求头
 							'Content-Type': 'application/json'
@@ -192,26 +165,98 @@
 					})
 					.then(res => {
 						if (res.code == 0) {
-							if (res.courses.records.length > 0) {
-								var list = res.courses.records
-								this.courseList = this.courseList.concat(list)
-								if (res.courses.pages > this.page) {
-									this.status = 0
-								} else {
-									this.status = 2
-								}
-							} else if (this.page > 1) {
-								this.status = 2 // 加载完成
-
-							} else {
-
-								this.status = 3 // 暂无数据
+							this.course = res.data.course
+							this.pageTitle = this.course.title
+							this.librayList = res.data.catalogues
+							if (this.librayList.length > 0) {
+								this.courseId = this.librayList[0].id
+								this.curId = this.librayList[0].id
+								this.curIndex = 0
+								this.getChapterList(this.courseId)
 							}
-							console.log('status', this.status)
 						}
-						this.flag = true
+
 					}).catch(e => {
-						console.log(e, '数据报错')
+						console.log(e, '获取目录数据报错')
+					});
+
+			},
+			goBuy() {
+				$http.request({
+						url: "sociology/product/getProductListForCourse",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"id": this.curId
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (res.productList.length > 0) {
+								this.proPriceList = res.productList								
+							} else {
+								this.proPriceList = []
+							}
+						}
+				
+					}).catch(e => {
+						console.log(e, '获取商品列表报错')
+					});
+					
+				this.pricespop = true
+			},
+			closePup(){
+				this.pricespop = false	
+				this.proPriceList = []
+			},
+			choosePrice(item){
+				console.log(item,'choosePrice')				
+				uni.showModal({
+					title: '提示',
+					cancelText: '再想想',
+					content: `您正在购买 ${item.productName}，价格是${item.price}元，是否继续？`,
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			clicklib(item, index) {
+				if (item.id == this.curId) {
+					return
+				}
+				this.curIndex = index
+				this.curId = item.id
+				this.getChapterList(item.id)
+			},
+			getChapterList(id) {
+				$http.request({
+						url: "sociology/course/getCourseCatalogueChapterList",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"id": id
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (res.chapterList.length > 0) {
+								this.courseList = res.chapterList
+								// console.log('status', res)
+							} else {
+								this.courseList = []
+							}
+						}
+
+					}).catch(e => {
+						console.log(e, '获取章节列表数据报错')
 					});
 			},
 			// 跳转
@@ -225,6 +270,34 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
+	.proListPrice{text-align: center; 
+	.title{font-size: 28rpx; margin: 10px 0; }
+	.list{padding-bottom: 20rpx;
+		.item{font-size: 26rpx;color: $themeColor;  line-height: 80rpx; border-bottom: 1px solid #eee; }
+		.item:last-child{border-bottom: none}
+	}
+	}
+	.vipBtn{
+		@include theme("vipbtnbg");
+		border-radius: 100rpx;  justify-content: center;
+		width: 150px; color:#fff;
+		margin: 10rpx auto;
+	}
+	.buyBox {
+		position: fixed; 
+		z-index: 2;
+		bottom: 100rpx;
+		left: 0;
+		padding: 20rpx 10rpx;
+		width: 100%; font-size: 28rpx;  flex-wrap: wrap;
+		background: rgba(255, 255, 255, 0.9);
+		.item{  width: 100%;
+			text-align: center;
+			
+		}
+		.tbn{align-items: center;}
+		.buybtn{color: #fff;}
+	}
 
 	.curseImg {
 		image {
@@ -293,12 +366,10 @@
 
 		.item.active {
 			background-color: #fbfbff;
-			color: $themeColor
-		}
-
-		.item:nth-child(1) {
+			color: $themeColor;
 			border-radius: 20rpx 20rpx 0 0;
 		}
+
 	}
 
 	.btnContainer {
@@ -307,25 +378,46 @@
 		padding-top: 20rpx;
 		justify-content: space-between;
 
-		.buybtn {
-			@include theme("btn_bg")
-		}
+
 
 		margin-bottom: 20rpx;
 	}
 
-	.tags {
+	.buybtn {
+		border-radius: 100rpx;  justify-content: center;
+		width: 150px;
+		margin: 10rpx auto;
+		@include theme("btn_bg")
+	}
+
+	.priceBox {
+		background: rgba(255, 255, 255, 0.8);
+		border-radius: 20rpx;
+		padding: 10px;
+		margin-bottom: 10px;
 		justify-content: space-between;
 		// border-top: 1rpx solid #e7e7e7;
 		// border-bottom: 1rpx solid #e7e7e7;
 		padding: 10px 0;
-	}
-.prof {
-			font-size: 26rpx; line-height: 50rpx;
-			padding: 10rpx 0;
-			color: #333;
-			margin-bottom: 20rpx;
+
+		.price {
+			width: 100%;
+			text-align: center;
 		}
+
+		.price:first-child {
+			border-right: 1px solid #cac6e1;
+		}
+	}
+
+	.prof {
+		font-size: 26rpx;
+		line-height: 50rpx;
+		padding: 10rpx 0;
+		color: #333;
+		margin-bottom: 20rpx;
+	}
+
 	.courseTitle {
 		overflow: hidden;
 		background-image: url(@/static/bg1.jpg);
@@ -345,7 +437,7 @@
 			}
 		}
 
-		
+
 
 		.title {
 			display: block;
@@ -359,9 +451,9 @@
 			justify-content: center;
 			height: 80rpx;
 			background-color: #00d8df;
-			width: 46%;
+			// width: 46%;
 			overflow: hidden;
-			border-radius: 20rpx;
+			border-radius: 30rpx;
 
 			text {
 				padding-left: 10rpx;
diff --git a/pages/course/courseSet.vue b/pages/course/courseSet.vue
new file mode 100644
index 0000000..e3f482a
--- /dev/null
+++ b/pages/course/courseSet.vue
@@ -0,0 +1,115 @@
+<template>
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="课程设置"></z-nav-bar>
+		
+		
+		<public-module></public-module>
+		<z-navigation></z-navigation>
+		<!-- <music-play :playData="playData"></music-play> -->
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	var clear;
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				tagId: null,				
+				
+				// status:0, // 0 不显示, 1 加载中，2 加载全部完成，3 暂无数据
+				// page:1,
+				// flag:true, // 函数是否执行完
+			};
+		},
+		//第一次加载
+		onLoad(e) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			// this.tagId = e.id
+			// this.pageTitle = e.title
+			// console.log(e, '传入分类id')
+			this.getData();
+		},
+		onReachBottom() {
+			if(this.status != 2){
+			this.page ++
+			this.getData()	}		
+			console.log('触底加载',this.page)
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		//页面显示
+		onShow() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			
+
+		},
+		components: {
+			musicPlay
+		},
+		//方法
+		methods: {
+			getData() {
+				if(!this.flag){
+					console.log('正在执行，未完成')
+					return
+				}
+				this.status = 1
+				this.flag = false
+				$http.request({
+						url: "medical/home/getMarketCourseList",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"id": this.tagId,
+							"limit": 12,
+							"page": this.page
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (res.courseList.records.length > 0) {
+								var list = res.courseList.records
+								this.courseList = this.courseList.concat(list)
+								if(res.courseList.pages > this.page){
+									this.status = 0
+								}else{
+									this.status = 2
+								}
+							} else if(this.page > 1){
+								this.status = 2 // 加载完成
+								
+							}else{
+							
+								this.status = 3 // 暂无数据
+							}
+							console.log('status',this.status)
+						}
+						this.flag = true
+					}).catch(e => {
+						console.log(e,'数据报错')
+					});
+			}
+		},
+	};
+</script>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+	.flexbox{display: flex; }
+	.imgcontainer {
+		background-color: $imgBg;
+	}
+
+</style>
\ No newline at end of file
diff --git a/pages/course/illustrate.vue b/pages/course/illustrate.vue
new file mode 100644
index 0000000..f9de287
--- /dev/null
+++ b/pages/course/illustrate.vue
@@ -0,0 +1,226 @@
+<template>
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="课程说明"></z-nav-bar>
+		<view class="containerBg">
+			<view class="proTitle">
+				<text>点击课程名称即可查看对应的课程说明</text>
+			</view>
+			<uni-collapse accordion v-model="accordionVal" @change="change" v-if="treeList.length > 0">
+				<uni-collapse-item v-for="(item, index) in treeList" :key="index" :title="item.title"
+					:show-animation="true">
+					<view class="content">
+						<!-- <text class="text">{{item.title}}</text> -->
+						<view class="sub1List">
+							<view class="item leve2" v-for="(item1, index1) in item.children" :key="index1"
+								@click="courseInfo(item1)">
+								<text> --- {{item1.title}}</text>
+								<view class="sub2List" v-if="item1.children">
+									<view class="item leve3" v-for="(item2, index2) in item1.children" :key="index2"
+										@click="courseInfo(item2)">
+										--- --- {{item2.title}}
+										<view class="sub3List" v-if="item2.children">
+											<view class="item leve4" v-for="(item3, index3) in item2.children"
+												:key="index3" @click="courseInfo(item3)">
+												--- --- --- {{item3.title}}
+											</view>
+										</view>
+									</view>
+
+								</view>
+							</view>
+
+						</view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
+		<u-popup :show="infopop" :round="10" @close="closePup">
+			<!-- {{pupContent}} -->
+			<view class="infoBox">
+				<text>超强树选择器、树组件、树插件、无限级联树、单选树、多选树、自定义样式树、树形选择 </text>
+				<view class="audio">
+					<audio style="text-align: left" :src="current.src" :poster="current.poster" :name="current.name"
+						:author="current.author" :action="audioAction" controls></audio>
+					<!-- <view class="audiobox">
+						<view class="audioinfo">
+							<image class="audioimg" :src="bookInfo.images" mode="aspectFit"></image>
+							<image class="audioimgstart" v-if="!this.paused" mode="aspectFit"
+								src="../../static/audiostart.png" @click="start"></image>
+							<image class="audioimgstart" v-else mode="aspectFit" src="../../static/audiostop.png"
+								@click="start"></image>
+							<view>
+								<view class="audiotitle">talkBookDetail.title</view>
+								<view class="audioauthor">bookInfo.author.authorName</view>
+								<view class="audioauthor">currentTime+'/'+duration秒</view>
+								<slider class="audioslider" block-size="12" v-model="currentTime" :max="duration"
+									@change="changeTime"></slider>
+								<!-- <view @click="start">点击播放/暂停</view> -->
+							<!-- </view>
+						</view>
+					</view> --> 
+				</view>
+
+				<view>
+					<video id="myVideo" src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4"
+						enable-danmu danmu-btn controls></video>
+				</view>
+			</view>
+
+		</u-popup>
+		<z-navigation></z-navigation>
+		<!-- <music-play :playData="playData"></music-play> -->
+	</view>
+</template>
+
+<script>
+	// import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	var clear;
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				value: ['0'],
+				accordionVal: '0',
+				// extraIcon:{
+				// 	color: '#4cd964',
+				// 	size: '100',		
+				// }
+				treeList: [],
+				pid: null,
+				infopop: false,
+				pupContent: {},
+				current: {
+					poster: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/music-a.png',
+					name: '致爱丽丝',
+					author: '暂无',
+					src: 'https://web-ext-storage.dcloud.net.cn/uni-app/ForElise.mp3',
+				},
+				audioAction: {
+					method: 'pause'
+				}
+			};
+		},
+		//第一次加载
+		onLoad(e) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			this.pid = e.pid
+			console.log(e, '------')
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		//页面显示
+		onShow() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			this.getData()
+		},
+		components: {
+			// musicPlay
+		},
+		//方法
+		methods: {
+			change() {},
+			getData() {
+				this.$http
+					.post('medical/home/getCourseMedicalTree')
+					.then(res => {
+						if (res.code == 0 && res.labels.length > 0) {
+							this.treeList = res.labels
+						} else {
+							this.treeList = []
+						}
+					}).catch(e => {
+						console.log(e, '报错')
+					});
+			},
+			closePup() {
+				this.infopop = false
+			},
+			courseInfo(item) {
+				this.$http
+					.post('medical/home/getCourseMedicalDetail', {
+						"id": item.id
+					})
+					.then(res => {
+						if (res.code == 0 && res.course.id) {
+							this.pupContent = res.course
+						} else {
+							this.pupContent = {}
+						}
+					}).catch(e => {
+						console.log(e, '报错')
+					});
+				this.infopop = true
+			}
+
+		},
+	};
+</script>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	::v-deep .containerBg {
+		.uni-collapse-item__title-box {
+			background-color: transparent !important;
+		}
+
+		.uni-collapse-item__title {
+			background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%) !important;
+
+			text {
+				color: #fff !important;
+				font-size: 28rpx !important;
+			}
+		}
+
+	}
+
+	.infoBox {
+		padding: 20rpx;
+		font-size: 26rpx;
+	}
+
+	// 	  .leve2{background-color: #71a5ff; }
+	// 	  .leve3{background-color: #9bbeff; }
+	// .leve4{background-color: #b6d0ff; }
+	.containerBg {
+		// background-color: $containerColor;
+		background-color: #fff;
+		padding: 0 20rpx;
+		min-height: calc(100vh - 270rpx);
+	}
+
+	.uni-collapse-item__title-text {
+		font-size: 30rpx;
+	}
+	.proTitle{text-align: center; padding:20rpx 0 ; margin-bottom: 20rpx; color: #666; font-size: 28rpx;}
+	.sub1List {
+		background-color: #f7f7f7;
+		padding-left: 20rpx;
+	}
+
+	.content {
+		.item {
+			line-height: 80rpx;
+			font-size: 28rpx;
+			color: #497387;
+			border-bottom: 1px solid #dae8f0;
+		}
+	}
+
+	#myVideo {
+		width: 100%;
+	}
+
+	audio {
+		width: 100% !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/course/index.vue b/pages/course/index.vue
index e7b7f1d..f69210e 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -2,7 +2,7 @@
 	<view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<z-nav-bar :title="pageTitle"></z-nav-bar>
+		<z-nav-bar :title="pageTitle"><view class="curseSet" slot="right" @click="shuomingPage('/pages/course/illustrate',tagId,pid)">课程说明</view></z-nav-bar>
 		<view class="tabsBox" :class="[fixed ? 'fixed' : '' ]">
 			<u-tabs v-if="tabList.length > 0" :class="['tabList']" @click="fatherClick" :current="curTagId"
 				:activeStyle="activeStyle" :scrollable="scrollable" :list="tabList"
@@ -41,8 +41,8 @@
 
 							</view>
 							<view class="tag-view">
-								<uni-tag style="margin-right: 10rpx;" text="高级" type="primary" size="small" />
-								<uni-tag style="margin-right: 10rpx;" text="选修" size="small" type="success" />
+								<uni-tag v-if="item.level != 0" style="margin-right: 10rpx;" :text="item.level == 1 ? '初级':'高级'" type="primary" size="small" />
+								<uni-tag v-if="item.selective != 0" style="margin-right: 10rpx;" :text="item.selective == 1 ? '必修':'选修'" size="small" type="success" />
 							</view>
 							<view class="btn_box">
 								<text>了解课程</text>
@@ -79,6 +79,7 @@
 			return {
 				playData: {},
 				tagId: null,
+				pid:null,
 				fixed: false,
 				fatherTabId: null,
 				subTabId: null, //
@@ -115,6 +116,7 @@
 			uni.hideTabBar();
 			this.tagId = e.id
 			this.pageTitle = e.title
+			this.pid = e.pid
 			console.log(e, '传入分类id')
 			this.getCateList(this.tagId)
 		},
@@ -193,6 +195,10 @@
 								}
 
 
+							}else{
+								this.subList = []
+								this.subTabId = id
+								this.getData(id)
 							}
 							console.log(this.curTagId, '当前高亮')
 						}
@@ -278,6 +284,12 @@
 					url: `${url}?id=${id}`
 				});
 			},
+			
+			shuomingPage(url,id,pid){
+				uni.navigateTo({
+					url: `${url}?id=${id}&pid=${pid}`
+				});
+			}
 		},
 	};
 </script>
@@ -289,7 +301,7 @@
 		padding: 0 20rpx;
 
 	}
-
+	.curseSet{margin-right: 20rpx; font-size: 26rpx;}
 	.fixed {
 		position: fixed;
 		z-index: 1; width: 100%; background-color: #fff;
diff --git a/pages/news/news.vue b/pages/news/news.vue
index 51c390b..fb2d669 100644
--- a/pages/news/news.vue
+++ b/pages/news/news.vue
@@ -2,20 +2,22 @@
 	<view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<z-nav-bar title="消息详情"></z-nav-bar>
+		<z-nav-bar title="新闻详情"></z-nav-bar>
 		<view class="box">
 			<view class="title">
 				{{news.title}}
 			</view>
-			<view class="content" v-html="news.content"></view>
+			<!-- <view class="content" v-html="news.content"></view> -->
+			<rich-text v-if="news.content" class="content" 
+				:nodes="formatRichText(news.content)"></rich-text>
 		</view>
-
-		<music-play :playData="playData"></music-play>
+<web-view v-if="urlVisible"  :webview-styles="webviewStyles" :src="surl"></web-view>
+		<!-- <music-play :playData="playData"></music-play> -->
 	</view>
 </template>
 
 <script>
-	import musicPlay from '@/components/music.vue'
+	// import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
 	var clear;
 	import {
@@ -25,18 +27,28 @@
 		data() {
 			return {
 				playData: {},
-				newsId: null,
+				newsObj: null,
 				news: {
 					content: '',
 					title: ''
-				}
+				},
+				urlVisible:false,
+				surl:'',
+				type:null,				
+				webviewStyles: {
+					progress: {
+						color: '#FF3333'
+					}
+				},
 			};
 		},
 		//第一次加载
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-			this.newsId = e.newsid
+			this.newsId = e.newsId
+			this.type = e.type
+			this.surl = e.url
 			console.log(e, '------')
 		},
 		computed: {
@@ -46,11 +58,19 @@
 		onShow() {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-			this.getData();
+			if(this.type == 1 && this.surl != ''){
+				// this.surl = this.newsObj.url
+				this.urlVisible = true
+				this.news = {}
+			}else{
+				this.getData();
+				 this.urlVisible = false
+			}
+			
 
 		},
 		components: {
-			musicPlay
+			// musicPlay
 		},
 		//方法
 		methods: {
@@ -65,7 +85,28 @@
 					}).catch(e => {
 						console.log(e, '获取新闻详情报错')
 					});
-			}
+			},
+			formatRichText(html) { //控制图片大小
+				let newContent = html.replace(/<img[^>]*>/gi, function (match, capture) {
+					match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+					match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+					match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+					return match;
+				});
+				newContent = newContent.replace(/style="[^"]+"/gi, function (match, capture) {
+					match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
+						'max-width:100%;');
+					return match;
+				});
+				// newContent = newContent.replace(/<img[^>]*>/gi, function(match, capture) {
+				// 	match = match.replace(/<img[^>]*>/gi, "@click='1111'").replace(/<img[^>]*>/gi, "@click='1111'");
+				// 	return match;
+				// });
+				newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+				newContent = newContent.replace(/\<img/gi,
+					'<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+				return newContent;
+			},
 		},
 	};
 </script>
@@ -73,7 +114,7 @@
 	@import '@/style/mixin.scss';
 
 	.box {
-		background-color: #fff;
+		background-color: #fff;		
 		@include pleft_right(10px);
 		min-height: calc(100vh - 270rpx);
 	}
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 19c64eb..43d8b86 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -14,10 +14,6 @@
 		</view>		
 		<view class="fourBox">
 			<view class="fourIcon flexbox" style="justify-content: space-around;">
-				<div class="item flexbox" @click="onPageJump()">
-					<image src="../../static/my_01.png" mode="aspectFit"></image>
-					<text>课程设置</text>
-				</div>
 				<div class="item flexbox" @click="onPageJump()">
 					<image src="../../static/my_02.png" mode="aspectFit"></image>
 					<text>我的课程</text>
@@ -30,6 +26,10 @@
 					<image src="../../static/my_04.png" mode="aspectFit"></image>
 					<text>吴门医述</text>
 				</div>
+				<div class="item flexbox" @click="onPageJump('/pages/course/courseSet')">
+					<image src="../../static/my_01.png" mode="aspectFit"></image>
+					<text>学习大纲</text>
+				</div>
 			</view>
 		</view>
 		<view class="home_nar ">
@@ -174,7 +174,7 @@
 				<text>精彩试听</text>
 			</view>
 			<view class="learn flexbox shiting">
-				<view class="item" v-for="(item, index) in tryListenList" :key="index">
+				<view class="item" v-for="(item, index) in tryListenList" :key="index" @click="onPageJump('/pages/course/courseDetail',item.id, item.title)">
 					<view class="imgcontainer">
 						<image :src="item.image" mode="aspectFit"></image>
 					</view>
@@ -182,7 +182,7 @@
 						<view class="txt555">
 							{{item.title}}
 						</view>
-						<view class="buybtn" @click="onPageJump()">
+						<view class="buybtn" @click.stop="onPageJump()">
 							<span>购买</span>
 						</view>
 					</view>
@@ -197,14 +197,27 @@
 		<view>
 			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle' :iconStyle="iconStyle"></u-back-top>
 		</view>
-		<!-- <web-view :webview-styles="webviewStyles" src="weburl"></web-view> -->
-		<!-- 公共组件-每个页面必须引入 -->
+			
+		<!-- 公共组件-每个页面必须引入 -->		
 		<public-module></public-module>
 		<z-navigation></z-navigation>
 		<music-play :playList="myList"></music-play>
 	</view>
 </template>
 
+<script>
+	export default {
+		methods: {
+			getWebViewMessage(e) {
+				uni.showModal({
+					content: JSON.stringify(e.detail),
+					showCancel: false
+				})
+			}
+		}
+	}
+</script>
+
 <script>
 	import musicPlay from '@/components/music.vue'
 	import repciptData from '@/static/json/repcipt.json'
@@ -217,6 +230,7 @@
 		data() {
 			return {
 				myList: [],
+				
 				showEbook: false, // 显示电子书相关
 				transaction: { // 成功回调
 
@@ -315,6 +329,12 @@
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
+			getWebViewMessage(e) {
+				uni.showModal({
+					content: JSON.stringify(e.detail),
+					showCancel: false
+				})
+			},
 			requestAll() {
 				this.getUserInfo()
 				this.tjProList = []
@@ -474,17 +494,26 @@
 					});
 			},
 			newsClick(item) {
-				if (item.type == 1) { // url跳转
-					if (item.url != '') {
-						this.openURL(item.url)
-					} else {
-						console.log('跳转链接为空')
-					}
-				} else { // 内部跳转
+				// if (item.type == 1) { // url跳转
+				// 	if (item.url != '') {
+				// 		// this.openURL(item.url)						
+				// 		this.surl = item.url
+				// 		this.urlVisible = true						
+				// 	} else {
+						
+				// 	}
+				// } else { // 内部跳转
+					// uni.navigateTo({
+					// 	url: 'pages/news/news'
+					// });
+					// uni.navigateTo({
+					// 	url: `/pages/news/news?newsId=1&title=1`
+					// });
+					console.log('item',item)
 					uni.navigateTo({
-						url: '/pages/news/news?newsid=' + item.id
+						url: `/pages/news/news?newsId=${item.id}&url=${item.url}&type=${item.type}`
 					})
-				}
+				// }
 			},
 			openURL(url) {
 				// #ifdef APP-PLUS
@@ -504,14 +533,14 @@
 					}
 				} else {
 					uni.navigateTo({
-						url: `/pages/course/index?id=${this.tabsid}&title=${item.title}`
+						url: `/pages/course/index?id=${this.tabsid}&title=${item.title}&pid=${this.tabsid}`
 					});
 				}
 			},
 			curseClickJump(item){
 				uni.navigateTo({
 					// url: `/pages/course/index?id=${item.id}&title=中医学`
-					url: `/pages/course/index?id=${item.id}&title=${item.title}`
+					url: `/pages/course/index?id=${item.id}&title=${item.title}&pid=${item.pid}`
 				});
 			},
 			// 获取用户详情
diff --git a/project.private.config.json b/project.private.config.json
new file mode 100644
index 0000000..55d010a
--- /dev/null
+++ b/project.private.config.json
@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "medicine_app",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}
\ No newline at end of file
diff --git a/static/course_01.png b/static/course_01.png
deleted file mode 100644
index cef1019..0000000
Binary files a/static/course_01.png and /dev/null differ
diff --git a/static/course_02.png b/static/course_02.png
deleted file mode 100644
index ce221ce..0000000
Binary files a/static/course_02.png and /dev/null differ
diff --git a/static/course_03.png b/static/course_03.png
deleted file mode 100644
index b62af1e..0000000
Binary files a/static/course_03.png and /dev/null differ
diff --git a/static/course_04.png b/static/course_04.png
deleted file mode 100644
index de2788c..0000000
Binary files a/static/course_04.png and /dev/null differ
diff --git a/static/nobg.jpg b/static/nobg.jpg
new file mode 100644
index 0000000..e2580cd
Binary files /dev/null and b/static/nobg.jpg differ
diff --git a/static/tapy_01.png b/static/tapy_01.png
deleted file mode 100644
index b33e7d9..0000000
Binary files a/static/tapy_01.png and /dev/null differ
diff --git a/static/tapy_02.png b/static/tapy_02.png
deleted file mode 100644
index 678c989..0000000
Binary files a/static/tapy_02.png and /dev/null differ
diff --git a/static/tapy_03.png b/static/tapy_03.png
deleted file mode 100644
index 03272ac..0000000
Binary files a/static/tapy_03.png and /dev/null differ
diff --git a/static/tapy_04.png b/static/tapy_04.png
deleted file mode 100644
index 1b18038..0000000
Binary files a/static/tapy_04.png and /dev/null differ
diff --git a/style/mixin.scss b/style/mixin.scss
index dd7ea18..a3f8c54 100644
--- a/style/mixin.scss
+++ b/style/mixin.scss
@@ -9,7 +9,11 @@ $imgBg: #edf3ff;
 @mixin theme($type,$path:''){
 	@if $type == "btn_bg" {
 		background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
-	} @else if $type == "unselected_img" {
+	} 
+	@else if $type == "vipbtnbg" {
+		background-image: linear-gradient(-90deg, #576afc 0%, #97a1ff 100%);
+	}
+	@else if $type == "unselected_img" {
 		background-image: url($path + "static/icon/ic_gender_unselected.png");
 	} @else if $type == "check_img" {
 		background-image: url($path + "static/icon/ic_agreed.png");
diff --git a/uni_modules/uni-collapse/changelog.md b/uni_modules/uni-collapse/changelog.md
new file mode 100644
index 0000000..455308a
--- /dev/null
+++ b/uni_modules/uni-collapse/changelog.md
@@ -0,0 +1,38 @@
+## 1.4.4（2024-03-20）
+- 修复 titleBorder类型修正
+## 1.4.3（2022-01-25）
+- 修复 初始化的时候 ，open 属性失效的bug
+## 1.4.2（2022-01-21）
+- 修复 微信小程序resize后组件收起的bug
+## 1.4.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.4.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-collapse](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+## 1.3.3（2021-08-17）
+- 优化 show-arrow 属性默认为true
+## 1.3.2（2021-08-17）
+- 新增 show-arrow 属性，控制是否显示右侧箭头
+## 1.3.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.3.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.2（2021-07-21）
+- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+## 1.2.1（2021-07-21）
+- 优化 组件示例
+## 1.2.0（2021-07-21）
+- 新增 组件折叠动画
+- 新增 value\v-model 属性 ，动态修改面板折叠状态
+- 新增 title 插槽 ，可定义面板标题
+- 新增 border 属性 ，显示隐藏面板内容分隔线
+- 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- 修复 resize 方法失效的Bug
+- 修复 change 事件返回参数不正确的Bug
+- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.1.5（2021-02-05）
+- 调整为uni_modules目录规范
\ No newline at end of file
diff --git a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
new file mode 100644
index 0000000..2f0862e
--- /dev/null
+++ b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
@@ -0,0 +1,402 @@
+<template>
+	<view class="uni-collapse-item">
+		<!-- onClick(!isOpen) -->
+		<view @click="onClick(!isOpen)" class="uni-collapse-item__title"
+			:class="{'is-open':isOpen &&titleBorder === 'auto' ,'uni-collapse-item-border':titleBorder !== 'none'}">
+			<view class="uni-collapse-item__title-wrap">
+				<slot name="title">
+					<view class="uni-collapse-item__title-box" :class="{'is-disabled':disabled}">
+						<image v-if="thumb" :src="thumb" class="uni-collapse-item__title-img" />
+						<text class="uni-collapse-item__title-text">{{ title }}</text>
+					</view>
+				</slot>
+			</view>
+			<view v-if="showArrow"
+				:class="{ 'uni-collapse-item__title-arrow-active': isOpen, 'uni-collapse-item--animation': showAnimation === true }"
+				class="uni-collapse-item__title-arrow">
+				<uni-icons :color="disabled?'#ddd':'#bbb'" size="14" type="bottom" />
+			</view>
+		</view>
+		<view class="uni-collapse-item__wrap" :class="{'is--transition':showAnimation}"
+			:style="{height: (isOpen?height:0) +'px'}">
+			<view :id="elId" ref="collapse--hook" class="uni-collapse-item__wrap-content"
+				:class="{open:isheight,'uni-collapse-item--border':border&&isOpen}">
+				<slot></slot>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom')
+	// #endif
+	/**
+	 * CollapseItem 折叠面板子组件
+	 * @description 折叠面板子组件
+	 * @property {String} title 标题文字
+	 * @property {String} thumb 标题左侧缩略图
+	 * @property {String} name 唯一标志符
+	 * @property {Boolean} open = [true|false] 是否展开组件
+	 * @property {Boolean} titleBorder = [true|false] 是否显示标题分隔线
+	 * @property {String} border = ['auto'|'show'|'none'] 是否显示分隔线
+	 * @property {Boolean} disabled = [true|false] 是否展开面板
+	 * @property {Boolean} showAnimation = [true|false] 开启动画
+	 * @property {Boolean} showArrow = [true|false] 是否显示右侧箭头
+	 */
+	export default {
+		name: 'uniCollapseItem',
+		props: {
+			// 列表标题
+			title: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// #ifdef APP-PLUS
+			// 是否显示动画,app 端默认不开启动画，卡顿严重
+			showAnimation: {
+				type: Boolean,
+				default: false
+			},
+			// #endif
+			// #ifndef APP-PLUS
+			// 是否显示动画
+			showAnimation: {
+				type: Boolean,
+				default: true
+			},
+			// #endif
+			// 是否展开
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 缩略图
+			thumb: {
+				type: String,
+				default: ''
+			},
+			// 标题分隔线显示类型
+			titleBorder: {
+				type: String,
+				default: 'auto'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			showArrow: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				isOpen: false,
+				isheight: null,
+				height: 0,
+				elId,
+				nameSync: 0
+			}
+		},
+		watch: {
+			open(val) {
+				this.isOpen = val
+				this.onClick(val, 'init')
+			}
+		},
+		updated(e) {
+			this.$nextTick(() => {
+				this.init(true)
+			})
+		},
+		created() {
+			this.collapse = this.getCollapse()
+			this.oldHeight = 0
+			this.onClick(this.open, 'init')
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+		mounted() {
+			if (!this.collapse) return
+			if (this.name !== '') {
+				this.nameSync = this.name
+			} else {
+				this.nameSync = this.collapse.childrens.length + ''
+			}
+			if (this.collapse.names.indexOf(this.nameSync) === -1) {
+				this.collapse.names.push(this.nameSync)
+			} else {
+				console.warn(`name 值 ${this.nameSync} 重复`);
+			}
+			if (this.collapse.childrens.indexOf(this) === -1) {
+				this.collapse.childrens.push(this)
+			}
+			this.init()
+		},
+		methods: {
+			init(type) {
+				// #ifndef APP-NVUE
+				this.getCollapseHeight(type)
+				// #endif
+				// #ifdef APP-NVUE
+				this.getNvueHwight(type)
+				// #endif
+			},
+			uninstall() {
+				if (this.collapse) {
+					this.collapse.childrens.forEach((item, index) => {
+						if (item === this) {
+							this.collapse.childrens.splice(index, 1)
+						}
+					})
+					this.collapse.names.forEach((item, index) => {
+						if (item === this.nameSync) {
+							this.collapse.names.splice(index, 1)
+						}
+					})
+				}
+			},
+			onClick(isOpen, type) {
+				if (this.disabled) return
+				this.isOpen = isOpen
+				if (this.isOpen && this.collapse) {
+					this.collapse.setAccordion(this)
+				}
+				if (type !== 'init') {
+					this.collapse.onChange(isOpen, this)
+				}
+			},
+			getCollapseHeight(type, index = 0) {
+				const views = uni.createSelectorQuery().in(this)
+				views
+					.select(`#${this.elId}`)
+					.fields({
+						size: true
+					}, data => {
+						// TODO 百度中可能获取不到节点信息 ，需要循环获取
+						if (index >= 10) return
+						if (!data) {
+							index++
+							this.getCollapseHeight(false, index)
+							return
+						}
+						// #ifdef APP-NVUE
+						this.height = data.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = data.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.isOpen, 'init')
+					})
+					.exec()
+			},
+			getNvueHwight(type) {
+				const result = dom.getComponentRect(this.$refs['collapse--hook'], option => {
+					if (option && option.result && option.size) {
+						// #ifdef APP-NVUE
+						this.height = option.size.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = option.size.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.open, 'init')
+					}
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getCollapse(name = 'uniCollapse') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-collapse-item {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+
+		/* #endif */
+		&__title {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			width: 100%;
+			box-sizing: border-box;
+			/* #endif */
+			flex-direction: row;
+			align-items: center;
+			transition: border-bottom-color .3s;
+
+			// transition-property: border-bottom-color;
+			// transition-duration: 5s;
+			&-wrap {
+				width: 100%;
+				flex: 1;
+
+			}
+
+			&-box {
+				padding: 0 15px;
+				/* #ifndef APP-NVUE */
+				display: flex;
+				width: 100%;
+				box-sizing: border-box;
+				/* #endif */
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+				height: 48px;
+				line-height: 48px;
+				background-color: #fff;
+				color: #303133;
+				font-size: 13px;
+				font-weight: 500;
+				/* #ifdef H5 */
+				cursor: pointer;
+				outline: none;
+
+				/* #endif */
+				&.is-disabled {
+					.uni-collapse-item__title-text {
+						color: #999;
+					}
+				}
+
+			}
+
+			&.uni-collapse-item-border {
+				border-bottom: 1px solid #ebeef5;
+			}
+
+			&.is-open {
+				border-bottom-color: transparent;
+			}
+
+			&-img {
+				height: 22px;
+				width: 22px;
+				margin-right: 10px;
+			}
+
+			&-text {
+				flex: 1;
+				font-size: 14px;
+				/* #ifndef APP-NVUE */
+				white-space: nowrap;
+				color: inherit;
+				/* #endif */
+				/* #ifdef APP-NVUE */
+				lines: 1;
+				/* #endif */
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			&-arrow {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				box-sizing: border-box;
+				/* #endif */
+				align-items: center;
+				justify-content: center;
+				width: 20px;
+				height: 20px;
+				margin-right: 10px;
+				transform: rotate(0deg);
+
+				&-active {
+					transform: rotate(-180deg);
+				}
+			}
+
+
+		}
+
+		&__wrap {
+			/* #ifndef APP-NVUE */
+			will-change: height;
+			box-sizing: border-box;
+			/* #endif */
+			background-color: #fff;
+			overflow: hidden;
+			position: relative;
+			height: 0;
+
+			&.is--transition {
+				// transition: all 0.3s;
+				transition-property: height, border-bottom-width;
+				transition-duration: 0.3s;
+				/* #ifndef APP-NVUE */
+				will-change: height;
+				/* #endif */
+			}
+
+
+
+			&-content {
+				position: absolute;
+				font-size: 13px;
+				color: #303133;
+				// transition: height 0.3s;
+				border-bottom-color: transparent;
+				border-bottom-style: solid;
+				border-bottom-width: 0;
+
+				&.uni-collapse-item--border {
+					border-bottom-width: 1px;
+					border-bottom-color: red;
+					border-bottom-color: #ebeef5;
+				}
+
+				&.open {
+					position: relative;
+				}
+			}
+		}
+
+		&--animation {
+			transition-property: transform;
+			transition-duration: 0.3s;
+			transition-timing-function: ease;
+		}
+
+	}
+</style>
diff --git a/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
new file mode 100644
index 0000000..384c39a
--- /dev/null
+++ b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="uni-collapse">
+		<slot />
+	</view>
+</template>
+<script>
+	/**
+	 * Collapse 折叠面板
+	 * @description 展示可以折叠 / 展开的内容区域
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=23
+	 * @property {String|Array} value 当前激活面板改变时触发(如果是手风琴模式，参数类型为string，否则为array)
+	 * @property {Boolean} accordion = [true|false] 是否开启手风琴效果是否开启手风琴效果
+	 * @event {Function} change 切换面板时触发，如果是手风琴模式，返回类型为string，否则为array
+	 */
+	export default {
+		name: 'uniCollapse',
+		emits:['change','activeItem','input','update:modelValue'],
+		props: {
+			value: {
+				type: [String, Array],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Array],
+				default: ''
+			},
+			accordion: {
+				// 是否开启手风琴效果
+				type: [Boolean, String],
+				default: false
+			},
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			// TODO 兼容 vue2 和 vue3
+			dataValue() {
+				let value = (typeof this.value === 'string' && this.value === '') ||
+					(Array.isArray(this.value) && this.value.length === 0)
+				let modelValue = (typeof this.modelValue === 'string' && this.modelValue === '') ||
+					(Array.isArray(this.modelValue) && this.modelValue.length === 0)
+				if (value) {
+					return this.modelValue
+				}
+				if (modelValue) {
+					return this.value
+				}
+
+				return this.value
+			}
+		},
+		watch: {
+			dataValue(val) {
+				this.setOpen(val)
+			}
+		},
+		created() {
+			this.childrens = []
+			this.names = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.setOpen(this.dataValue)
+			})
+		},
+		methods: {
+			setOpen(val) {
+				let str = typeof val === 'string'
+				let arr = Array.isArray(val)
+				this.childrens.forEach((vm, index) => {
+					if (str) {
+						if (val === vm.nameSync) {
+							if (!this.accordion) {
+								console.warn('accordion 属性为 false ,v-model 类型应该为 array')
+								return
+							}
+							vm.isOpen = true
+						}
+					}
+					if (arr) {
+						val.forEach(v => {
+							if (v === vm.nameSync) {
+								if (this.accordion) {
+									console.warn('accordion 属性为 true ,v-model 类型应该为 string')
+									return
+								}
+								vm.isOpen = true
+							}
+						})
+					}
+				})
+				this.emit(val)
+			},
+			setAccordion(self) {
+				if (!this.accordion) return
+				this.childrens.forEach((vm, index) => {
+					if (self !== vm) {
+						vm.isOpen = false
+					}
+				})
+			},
+			resize() {
+				this.childrens.forEach((vm, index) => {
+					// #ifndef APP-NVUE
+					vm.getCollapseHeight()
+					// #endif
+					// #ifdef APP-NVUE
+					vm.getNvueHwight()
+					// #endif
+				})
+			},
+			onChange(isOpen, self) {
+				let activeItem = []
+
+				if (this.accordion) {
+					activeItem = isOpen ? self.nameSync : ''
+				} else {
+					this.childrens.forEach((vm, index) => {
+						if (vm.isOpen) {
+							activeItem.push(vm.nameSync)
+						}
+					})
+				}
+				this.$emit('change', activeItem)
+				this.emit(activeItem)
+			},
+			emit(val){
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-collapse {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		flex-direction: column;
+		background-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-collapse/package.json b/uni_modules/uni-collapse/package.json
new file mode 100644
index 0000000..65c5c2e
--- /dev/null
+++ b/uni_modules/uni-collapse/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-collapse",
+  "displayName": "uni-collapse 折叠面板",
+  "version": "1.4.4",
+  "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
+  "keywords": [
+    "uni-ui",
+    "折叠",
+    "折叠面板",
+    "手风琴"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-collapse/readme.md b/uni_modules/uni-collapse/readme.md
new file mode 100644
index 0000000..bc758eb
--- /dev/null
+++ b/uni_modules/uni-collapse/readme.md
@@ -0,0 +1,12 @@
+
+
+## Collapse 折叠面板
+> **组件名：uni-collapse**
+> 代码块： `uCollapse`
+> 关联组件：`uni-collapse-item`、`uni-icons`。
+
+
+折叠面板用来折叠/显示过长的内容或者是列表。通常是在多内容分类项使用，折叠不重要的内容，显示重要内容。点击可以展开折叠部分。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index 6449885..620ab02 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -1,3 +1,21 @@
+## 2.0.9（2024-01-12）
+fix: 修复图标大小默认值错误的问题
+## 2.0.8（2023-12-14）
+- 修复 项目未使用 ts 情况下，打包报错的bug
+## 2.0.7（2023-12-14）
+- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
+## 2.0.6（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.5（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.4（2023-12-06）
+- 优化 uni-app x 下示例项目图标排序
+## 2.0.3（2023-12-06）
+- 修复 nvue下引入组件报错的bug
+## 2.0.2（2023-12-05）
+-优化 size 属性支持单位
+## 2.0.1（2023-12-05）
+- 新增 uni-app x 支持定义图标
 ## 1.3.5（2022-01-24）
 - 优化 size 属性可以传入不带单位的字符串数值
 ## 1.3.4（2022-01-24）
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
new file mode 100644
index 0000000..398678e
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -0,0 +1,91 @@
+<template>
+	<text class="uni-icons" :style="styleObj">
+		<slot>{{unicode}}</slot>
+	</text>
+</template>
+
+<script>
+	import { fontData, IconsDataItem } from './uniicons_file'
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icon 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: "uni-icons",
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: Object,
+				default: 16
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			unicode() : string {
+				let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+				if (codes !== null) {
+					return codes.unicode
+				}
+				return ''
+			},
+			iconSize() : string {
+				const size = this.size
+				if (typeof size == 'string') {
+					const reg = /^[0-9]*$/g
+					return reg.test(size as string) ? '' + size + 'px' : '' + size;
+					// return '' + this.size
+				}
+				return this.getFontSize(size as number)
+			},
+			styleObj() : UTSJSONObject {
+				if (this.fontFamily !== '') {
+					return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+				}
+				return { color: this.color, fontSize: this.iconSize }
+			}
+		},
+		created() { },
+		methods: {
+			/**
+			 * 字体大小
+			 */
+			getFontSize(size : number) : string {
+				return size + 'px';
+			},
+		},
+	}
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: UniIconsFontFamily;
+		src: url('./uniicons.ttf');
+	}
+
+	.uni-icons {
+		font-family: UniIconsFontFamily;
+		font-size: 18px;
+		font-style: normal;
+		color: #333;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
index 86e7444..7da5356 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -1,24 +1,28 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
 	<!-- #endif -->
 	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
 	<!-- #endif -->
 </template>
 
 <script>
-	import icons from './icons.js';
+	import { fontData } from './uniicons_file_vue.js';
+
 	const getVal = (val) => {
 		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
-	} 
+		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
+	}
+
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
 	domModule.addRule('fontFace', {
 		'fontFamily': "uniicons",
-		'src': "url('"+iconUrl+"')"
+		'src': "url('" + iconUrl + "')"
 	});
 	// #endif
 
@@ -34,7 +38,7 @@
 	 */
 	export default {
 		name: 'UniIcons',
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			type: {
 				type: String,
@@ -48,26 +52,36 @@
 				type: [Number, String],
 				default: 16
 			},
-			customPrefix:{
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
 				type: String,
 				default: ''
 			}
 		},
 		data() {
 			return {
-				icons: icons.glyphs
+				icons: fontData
 			}
 		},
-		computed:{
-			unicode(){
-				let code = this.icons.find(v=>v.font_class === this.type)
-				if(code){
-					return unescape(`%u${code.unicode}`)
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
 				}
 				return ''
 			},
-			iconSize(){
+			iconSize() {
 				return getVal(this.size)
+			},
+			styleObj() {
+				if (this.fontFamily !== '') {
+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
+				}
+				return `color: ${this.color}; font-size: ${this.iconSize};`
 			}
 		},
 		methods: {
@@ -81,9 +95,10 @@
 <style lang="scss">
 	/* #ifndef APP-NVUE */
 	@import './uniicons.css';
+
 	@font-face {
 		font-family: uniicons;
-		src: url('./uniicons.ttf') format('truetype');
+		src: url('./uniicons.ttf');
 	}
 
 	/* #endif */
@@ -92,5 +107,4 @@
 		text-decoration: none;
 		text-align: center;
 	}
-
 </style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
index 2f56eab..0a6b6fe 100644
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.css
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -1,3 +1,12 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
 .uniui-color:before {
   content: "\e6cf";
 }
@@ -58,10 +67,6 @@
   content: "\e6c3";
 }
 
-.uniui-gift-filled:before {
-  content: "\e6c4";
-}
-
 .uniui-fire-filled:before {
   content: "\e6c5";
 }
@@ -82,6 +87,18 @@
   content: "\e698";
 }
 
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
 .uniui-back:before {
   content: "\e6b9";
 }
@@ -94,55 +111,43 @@
   content: "\e6bb";
 }
 
-.uniui-arrowthinright:before {
-  content: "\e6bb";
-}
-
 .uniui-arrow-left:before {
   content: "\e6bc";
 }
 
-.uniui-arrowthinleft:before {
-  content: "\e6bc";
-}
-
 .uniui-arrow-up:before {
   content: "\e6bd";
 }
 
-.uniui-arrowthinup:before {
-  content: "\e6bd";
-}
-
 .uniui-arrow-down:before {
   content: "\e6be";
 }
 
-.uniui-arrowthindown:before {
-  content: "\e6be";
+.uniui-arrowthinright:before {
+  content: "\e6d1";
+}
+
+.uniui-down:before {
+  content: "\e6b8";
 }
 
 .uniui-bottom:before {
   content: "\e6b8";
 }
 
-.uniui-arrowdown:before {
-  content: "\e6b8";
+.uniui-arrowright:before {
+  content: "\e6d5";
 }
 
 .uniui-right:before {
   content: "\e6b5";
 }
 
-.uniui-arrowright:before {
-  content: "\e6b5";
-}
-
-.uniui-top:before {
+.uniui-up:before {
   content: "\e6b6";
 }
 
-.uniui-arrowup:before {
+.uniui-top:before {
   content: "\e6b6";
 }
 
@@ -150,8 +155,8 @@
   content: "\e6b7";
 }
 
-.uniui-arrowleft:before {
-  content: "\e6b7";
+.uniui-arrowup:before {
+  content: "\e6d6";
 }
 
 .uniui-eye:before {
@@ -638,10 +643,6 @@
   content: "\e627";
 }
 
-.uniui-cart-filled:before {
-  content: "\e629";
-}
-
 .uniui-checkbox:before {
   content: "\e62b";
 }
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
index 835f33b..14696d0 100644
Binary files a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
new file mode 100644
index 0000000..98e93aa
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
@@ -0,0 +1,664 @@
+
+export type IconsData = {
+	id : string
+	name : string
+	font_family : string
+	css_prefix_text : string
+	description : string
+	glyphs : Array<IconsDataItem>
+}
+
+export type IconsDataItem = {
+	font_class : string
+	unicode : string
+}
+
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+] as IconsDataItem[]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
new file mode 100644
index 0000000..1cd11e1
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
@@ -0,0 +1,649 @@
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
index d1c4e77..397be83 100644
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.5",
+  "version": "2.0.9",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": ["uni-scss"],
@@ -50,7 +47,8 @@
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y"
+          "app-nvue": "y",
+          "app-uvue": "y"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -70,11 +68,15 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y"
+          "QQ": "y",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
         },
         "快应用": {
-          "华为": "u",
-          "联盟": "u"
+          "华为": "y",
+          "联盟": "y"
         },
         "Vue": {
             "vue2": "y",
@@ -83,4 +85,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/unpackage/debug/android_debug.apk b/unpackage/debug/android_debug.apk
index dcb5b9b..b686d4e 100644
Binary files a/unpackage/debug/android_debug.apk and b/unpackage/debug/android_debug.apk differ
diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png
index 4086b83..3d78dba 100644
Binary files a/unpackage/res/icons/1024x1024.png and b/unpackage/res/icons/1024x1024.png differ
diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png
index 60dc42b..275370d 100644
Binary files a/unpackage/res/icons/120x120.png and b/unpackage/res/icons/120x120.png differ
diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png
index c721c82..6299da7 100644
Binary files a/unpackage/res/icons/144x144.png and b/unpackage/res/icons/144x144.png differ
diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png
index 88b7128..b733d61 100644
Binary files a/unpackage/res/icons/152x152.png and b/unpackage/res/icons/152x152.png differ
diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png
index cc34d35..eda4ed5 100644
Binary files a/unpackage/res/icons/167x167.png and b/unpackage/res/icons/167x167.png differ
diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png
index e8e952d..70fe819 100644
Binary files a/unpackage/res/icons/180x180.png and b/unpackage/res/icons/180x180.png differ
diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png
index 250de1a..73548b5 100644
Binary files a/unpackage/res/icons/192x192.png and b/unpackage/res/icons/192x192.png differ
diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png
index 0722d6b..ca97cb8 100644
Binary files a/unpackage/res/icons/20x20.png and b/unpackage/res/icons/20x20.png differ
diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png
index f1b3f32..f79d1f4 100644
Binary files a/unpackage/res/icons/29x29.png and b/unpackage/res/icons/29x29.png differ
diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png
index 6ba6a1d..191c4e7 100644
Binary files a/unpackage/res/icons/40x40.png and b/unpackage/res/icons/40x40.png differ
diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png
index 48430e1..57417e2 100644
Binary files a/unpackage/res/icons/58x58.png and b/unpackage/res/icons/58x58.png differ
diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png
index 1a05101..0add3eb 100644
Binary files a/unpackage/res/icons/60x60.png and b/unpackage/res/icons/60x60.png differ
diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png
index 3dcf6ed..75f4505 100644
Binary files a/unpackage/res/icons/72x72.png and b/unpackage/res/icons/72x72.png differ
diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png
index 3bcd85e..ee89e67 100644
Binary files a/unpackage/res/icons/76x76.png and b/unpackage/res/icons/76x76.png differ
diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png
index 10ca08d..a0db3b0 100644
Binary files a/unpackage/res/icons/80x80.png and b/unpackage/res/icons/80x80.png differ
diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png
index 7e84a76..5df95d2 100644
Binary files a/unpackage/res/icons/87x87.png and b/unpackage/res/icons/87x87.png differ
diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png
index d89d34e..c21813d 100644
Binary files a/unpackage/res/icons/96x96.png and b/unpackage/res/icons/96x96.png differ