ios 首页任务我的修改

iOS 配置
版本
2024-12-30 22:30:10 +08:00 · 2024-12-27 15:47:22 +08:00 · 2024-12-25 11:21:55 +08:00 · 2024-12-24 14:22:29 +08:00 · 2024-12-24 14:19:08 +08:00
40 changed files with 3418 additions and 719 deletions
--- a/common/config.js
+++ b/common/config.js
@@ -1,15 +1,22 @@
-// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
-// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
+// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg/"; //
+// const ROOTPATH = "https://dj-api.hnsiyao.cn/czg/"; //后台服务域名
 // const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名

-const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
-const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 
+// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
+// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
+// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 

 // const ROOTPATH1 = "http://192.168.1.5:8100/sqx_fast/"; //
 // const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名
 // const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名 

+// const ROOTPATH1 = "http://192.168.1.41:8100/czg"; //
+const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg"; //
+const ROOTPATH = "https://web-api.hnsiyao.cn/czg"; //后台服务域名
+// const ROOTPATH = "http://192.168.1.41:8100/czg"; //后台服务域名
+const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
+
+
 module.exports = {
 	APIHOST: ROOTPATH,
 	APIHOST1: ROOTPATH1,
--- a/common/httpRequest.js
+++ b/common/httpRequest.js
@@ -308,7 +308,8 @@ module.exports = {
 				data: data,
 				method: "GET",
 				header: {
-					"content-type": header
+					"content-type": header,
+					token: uni.getStorageSync("token")	
 				},
 				success: function(result) {
 					if (result.data.code == 401) {
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
-    "name" : "斯耀短剧",
+    "name" : "诗谣短剧",
    "appid" : "__UNI__E0B05B1",
    "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
@@ -64,7 +64,7 @@
            /* ios打包配置 */
            "ios" : {
                "dSYMs" : false,
-                "urltypes" : "com.hnsiyao.duanju",
+                "urltypes" : "com.hunan.dj.video",
                "privacyDescription" : {
                    "NSPhotoLibraryUsageDescription" : "获取您的相册读取权限，目的是为了在我的资料页面使用相册读取功能，修改上传头像",
                    "NSCameraUsageDescription" : "获取您的摄像头权限，目的是为了在我的资料页面使用摄像头功能，修改上传头像"
@@ -83,15 +83,7 @@
                    },
                    "appleiap" : {}
                },
-                "oauth" : {
-                    "apple" : {},
-                    "univerify" : {},
-                    "weixin" : {
-                        "appid" : "wxeaffcaea958472d3",
-                        "appsecret" : "32f6f3ce599abff2fa0191a36780c66c",
-                        "UniversalLinks" : "https://maxiong.xianmxkj.com/"
-                    }
-                },
+                "oauth" : {},
                "ad" : {},
                "push" : {
                    "unipush" : {}
--- a/me/components/wm-poster/wm-posterorders.vue
+++ b/me/components/wm-poster/wm-posterorders.vue
@@ -291,6 +291,9 @@
 				uni.canvasToTempFilePath({
 						canvasId: _this.CanvasID,
 						quality: 1,
+						fail: (err) => {
+							console.log("-----", err);
+						},
 						complete: res => {
 							console.log(res)
 							if ( res.tempFilePath) {
--- a/me/detail/auditrecords.vue
+++ b/me/detail/auditrecords.vue
@@ -80,7 +80,6 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-datetime-picker :show="showpicker" mode="date" @cancel="showpicker = !showpicker" @confirm="confirmpicker"></u-datetime-picker>
 		<button style="visibility: hidden;" @click="gyqlWPSevVnclLaBUECO"></button>
 		<button style="visibility: hidden;" @click="fEJEnAgyqMtQoJgfGmVV"></button>
 		<button style="visibility: hidden;" @click="wAIaTsgyqKfOzJNuPsQX"></button>
--- a/me/detail/detailIOS.nvue
+++ b/me/detail/detailIOS.nvue
@@ -143,10 +143,10 @@
 						<image class="list-title-rsczg" src="../../static/images/me/closeIconss.png" mode=""></image>
 					</view>
 				</view>
-				<text class=""
+			<!-- 	<text class=""
 					style="font-size: 24rpx;color: #999;padding: 0 34rpx;margin: 20rpx 0; auto;text-align: left;width: 100%;">
 					{{getRedEnvelopeTips}}
-				</text>
+				</text> -->
 				<view class="pay-content">
 					<view class="pay-content-itemczg" @click="payVideo(1)">
 						<image class="pay-content-item-iconczg" src="../../static/images/me/rmIcon.png" mode=""></image>
@@ -154,11 +154,11 @@
 							{{countPrice*scale}}金币解锁整部视频
 						</text>
 					</view>
-					<view v-if="isShowMoneyPay" class="pay-content-itemczg" @click="payVideo(2)">
+<!-- 					<view v-if="isShowMoneyPay" class="pay-content-itemczg" @click="payVideo(2)">
 						<text class="pay-content-items">
 							{{countPrice}}元解锁单集视频
 						</text>
-					</view>
+					</view> -->
 					<!-- <view class="pay-content-itemczg" @click="goNav('/pages/me/vip/index')" v-if="isVips == '是'">
 						<image class="pay-content-item-iconczg" src="../../static/images/me/rmIcon.png" mode=""></image>
 						<text class="pay-content-items">
@@ -492,7 +492,7 @@

 			console.log('this bottom padding = ' + this.paddingBottom);

-			httpsRequest.getT("app/common/type/919", {}).then(res => {
+			httpsRequest.getT("/app/common/type/919", {}).then(res => {
 				if (res.code === 0) {
 					const sysInfo = uni.getSystemInfoSync();
 					let isIos = sysInfo.platform == 'ios'
--- a/me/feedback/orderinquiry.vue
+++ b/me/feedback/orderinquiry.vue
@@ -155,7 +155,6 @@
 				<view class="content_boxt_towtexts" @click="setClipboardData">复制</view>
 			</view>
 		</u-popup>
-		<u-datetime-picker :show="showpicker" mode="date" @cancel="showpicker = !showpicker" @confirm="confirmpicker"></u-datetime-picker>
 		<button style="visibility: hidden" @click="JXOvaUPLpHdhiOgyqBUm"></button>
 		<button style="visibility: hidden" @click="PgyqGOIbkdegBnnSXYva"></button>
 		<button style="visibility: hidden" @click="XZgyqqzuevfsuPrSTYLS"></button>
--- a/me/feedback/toexamine.vue
+++ b/me/feedback/toexamine.vue
@@ -141,7 +141,6 @@
 				<view class="content_boxt_towtexts" @click="setClipboardData">复制</view>
 			</view>
 		</u-popup>
-		<u-datetime-picker :show="showpicker" mode="date" @cancel="showpicker = !showpicker" @confirm="confirmpicker"></u-datetime-picker>
 		<button style="visibility: hidden" @click="gyqBLkzDTXwhnnksmnEj"></button>
 		<button style="visibility: hidden" @click="PgyqGOIbkdegBnnSXYva"></button>
 		<button style="visibility: hidden" @click="vEXpZydSjylUcgyqOGLk"></button>
--- a/me/helpDetail/auditrecords.vue
+++ b/me/helpDetail/auditrecords.vue
@@ -101,8 +101,6 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-datetime-picker :show="showpicker" mode="date" @cancel="showpicker = !showpicker"
-			@confirm="confirmpicker"></u-datetime-picker>
 	</view>
 </template>

--- a/me/yaoqing/ymf-yaoqing-home.vue
+++ b/me/yaoqing/ymf-yaoqing-home.vue
@@ -375,7 +375,8 @@
 				});
 			},
 			ymfposterSuccess(haibaoImg) {
-				this.haibaoImg = haibaoImg;
+				console.log("ssssssssssssssss", haibaoImg);
+				this.haibaoImg = haibaoImg.tempFilePath;
 				this.modalName = 'Image';
 				uni.hideLoading();
 			},
--- a/pages.json
+++ b/pages.json
@@ -212,7 +212,7 @@
 				// #endif
 			}

-		},{
+		}, {
 			"path": "pages/yodwbsHlmJ/aaacasadwqvb",
 			"style": {
 				"navigationBarTitleText": "追剧as",
@@ -290,6 +290,14 @@
 				"navigationBarTitleText": "图片s",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/index/index2",
+			"style": {
+				"navigationBarTitleText": "斯耀短剧",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"subPackages": [{
@@ -305,16 +313,17 @@
 					"style": {
 						"navigationBarTitleText": "我的余额"
 					}
-				}, {"path": "HEWZtgyqRH/YGivHgyqkI"
+				}, {
+					"path": "HEWZtgyqRH/YGivHgyqkI"
 				}, {
 					"path": "HEWZtgyqRH/EsBgyqacOi"
-				},{
+				}, {
 					"path": "feedbackIndexczgw/issuer"
-				},{
+				}, {
 					"path": "feedbackIndexczgw/Invoicedgoods"
-				},{
+				}, {
 					"path": "feedback/toexamine"
-				},{
+				}, {
 					"path": "feedback/orderinquiry"
 				}, {
 					"path": "feedbackIndexczgw/feedbackIndexczgw",
@@ -694,23 +703,23 @@
 						"enablePullDownRefresh": false
 					}

-				}, 
+				},
 				{
 					"path": "payOrder/new/index",
 					"style": {
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-				
-				}, 
+
+				},
 				{
 					"path": "payOrder/new/newindex",
 					"style": {
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-				
-				}, 
+
+				},
 				{
 					"path": "setting/logOff",
 					"style": {
@@ -747,7 +756,7 @@
 						"enablePullDownRefresh": true
 					}

-				},{
+				}, {
 					"path": "mFYpdwbMdk/mFYpdwbMdk",
 					"style": {
 						"navigationBarTitleText": "壁纸",
@@ -796,7 +805,9 @@
 						"navigationStyle": "custom"
 					}
 				},
-				{"path": "VjgyqAzklr/mEfjXGgyqJ"},
+				{
+					"path": "VjgyqAzklr/mEfjXGgyqJ"
+				},
 				{
 					"path": "VjgyqAzklr/YQqgyqeKub"
 				},
@@ -932,24 +943,25 @@
 		"borderStyle": "black",

 		"list": [{
+				"pagePath": "pages/index/index2",
+				"iconPath": "static/tabbar/index@2x.png",
+				"selectedIconPath": "static/tabbar/index_@2x.png",
+				"text": "首页"
+			},
+			{
 				"pagePath": "pages/task/index",
 				"iconPath": "static/tabbar/task@2x.png",
 				"selectedIconPath": "static/tabbar/task_@2x.png",
 				"text": "任务"
 			},
-			{
-				"pagePath": "pages/video/video",
-				"iconPath": "static/tabbar/index@2x.png",
-				"selectedIconPath": "static/tabbar/index_@2x.png",
-				"text": "刷剧"
-			}
-			// ,
 			// {
-			// 	"pagePath": "pages/index/index",
+			// 	"pagePath": "pages/video/video",
 			// 	"iconPath": "static/tabbar/index@2x.png",
 			// 	"selectedIconPath": "static/tabbar/index_@2x.png",
 			// 	"text": "刷剧"
 			// }
+			// ,
+
 			// {
 			// 	"pagePath": "pages/video/video",
 			// 	"iconPath": "static/tabbar/learn@2x.png",
@@ -963,12 +975,12 @@
 			// 	"selectedIconPath": "static/tabbar/zhuiju_.png",
 			// 	"text": "追剧"
 			// },
-			// {
-			// 	"pagePath": "pages/me/index",
-			// 	"iconPath": "static/tabbar/me@2x.png",
-			// 	"selectedIconPath": "static/tabbar/me_@2x.png",
-			// 	"text": "我的"
-			// }
+			{
+				"pagePath": "pages/me/index",
+				"iconPath": "static/tabbar/me@2x.png",
+				"selectedIconPath": "static/tabbar/me_@2x.png",
+				"text": "我的"
+			}
 		]
 	},
 	"condition": { //模式配置，仅开发期间生效
--- a/pages/index/components/contentlist.vue
+++ b/pages/index/components/contentlist.vue
@@ -0,0 +1,127 @@
+<template>
+	<view>
+		<view class="df" style=" justify-content: space-around;flex-wrap: wrap; margin-top: 10rpx;">
+			<view style="border-radius:21rpx 21rpx 21rpx 21rpx;width: 33%;text-align: center;margin-top: 20rpx;padding:0 26rpx;"
+				class="liststyle" v-for="item in $props.list" :key="item">
+				<image :src="item.titleImg" style="width: 188rpx;height: 247rpx;border-radius:21rpx 21rpx 21rpx 21rpx"
+					mode=""></image>
+				<view style="font-weight: 400;font-size: 25rpx;color: #333333;text-align: left;">
+					{{item.title.slice(0,6)}}
+				</view>
+				<view style="font-weight: 400;font-size: 21rpx;color: #999999;text-align: left;">
+					{{item.courseLabel}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+				default: []
+			},
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.zuijin {
+		width: 100%;
+		margin-top: 26rpx;
+
+		.GpkmladwbU {
+			width: 700rpx;
+			height: 100%;
+			flex-wrap: wrap;
+		}
+
+		.kjFVivdwbz {
+			width: calc((700rpx - 40rpx) / 3);
+			height: 100%;
+			margin-bottom: 30rpx;
+			margin-right: calc(40rpx / 2);
+		}
+
+		.kjFVivdwbz:nth-of-type(3n) {
+			margin-right: 0;
+		}
+
+		.MXdwbIHrMo {
+			width: 100%;
+			// height: 204rpx;
+			height: 204rpx;
+			border-radius: 24rpx 24rpx 0 0;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 24rpx 24rpx 0 0;
+			}
+
+			.kpdwbbDLKT {
+				position: absolute;
+				bottom: 10rpx;
+				right: 0;
+				max-width: 80%;
+				border-radius: 10rpx;
+				background-color: rgba(51, 51, 51, 0.7);
+				color: #FFFFFF;
+				font-size: 22rpx;
+				padding: 10rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+
+			}
+		}
+
+		.gSSSCWdwbD {
+			width: 100%;
+			height: 100rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 24rpx 24rpx;
+			align-content: center;
+		}
+
+		.dwbkFoLNxI {
+			width: 100%;
+			padding: 0 20rpx;
+			color: #333333;
+			font-size: 30rpx;
+			font-weight: bold;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+
+		}
+
+		.kemrdwbYSM {
+			width: 100%;
+			padding: 0 20rpx;
+			color: #999999;
+			font-size: 22rpx;
+		}
+	}
+
+	.liststyle:last-child {
+	margin-right: auto;
+ margin-left: 6rpx;
+}
+
+	.df {
+		display: flex;
+		align-items: center;
+	}
+</style>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -445,7 +445,7 @@
 				this.videoInfo = []
 			}

-			httpsRequest.getT("app/common/type/919", {}).then(res => {
+			httpsRequest.getT("/app/common/type/919", {}).then(res => {
 				if (res.code == 0) {
 					const sysInfo = uni.getSystemInfoSync();
 					let isIos = sysInfo.platform == 'ios'
--- a/pages/index/index2.vue
+++ b/pages/index/index2.vue
@@ -0,0 +1,159 @@
+<template>
+	<view>
+		<view style="height: 555rpx;position: relative;">
+			<image src="../../static/indexbh.png" style="width: 100%;height: 555rpx;position: absolute;" mode="">
+			</image>
+			<view style="display: flex;align-items: center;justify-content: space-between; padding: 88rpx 25rpx;">
+				<image src="../../static/logo.png" style="width: 187rpx;height:50rpx;" mode=""></image>
+				<view style="z-index: 50;width: 236rpx;line-height: 43rpx;background: rgba(255,255,255,0.29);border-radius: 7rpx 7rpx 7rpx 7rpx;
+				font-weight: 400;font-size: 21rpx;color: rgba(255,255,255,0.85);display: flex;align-items: center;"
+					@tap="moreVideo">
+					<uni-icons type="search" size="16" style="color: rgba(255,255,255,0.85);"></uni-icons>
+					点击搜索更多好剧
+				</view>
+			</view>
+
+			<template v-if="noticeList.length>0">
+				<view class="gongao">
+					<view class="gongaoicon">
+						公告
+					</view>
+					<swiper :autoplay="true" :vertical="true" :interval="4000" :circular="true" :indicator-dots="false"
+						class="swiperstyle">
+						<swiper-item @tap='goMsg(item.url)' v-for="(item, index) in noticeList">
+							<view style="height: 80rpx;line-height: 80rpx;">{{item.title}}</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</template>
+		</view>
+		<view style="display: flex;align-items: center;justify-content: space-between;padding:0 20rpx;">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('')">
+				最新
+			</view>
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('1')">
+				排行
+			</view>
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('2')">
+				最热
+			</view>
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('1')">
+				剧情
+			</view>
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('2')">
+				飙升
+			</view>
+		</view>
+		<view class="">
+			<contentlist :list='list'></contentlist>
+		</view>
+	</view>
+</template>
+
+<script>
+	import contentlist from './components/contentlist.vue'
+	export default {
+		components: {
+			contentlist
+		},
+		data() {
+			return {
+				noticeList: [], //公告列表
+				list: [],
+				page: 1
+			}
+		},
+		onShow() {
+			this.getMsg()
+			this.getrecomVideo()
+		},
+		onReachBottom() {
+			++this.page
+			this.getrecomVideo()
+		},
+		methods: {
+			moreVideo() {
+				uni.navigateTo({
+					url: '/pages/index/course/courseList?title=最新热播'
+				})
+			},
+			// 列表
+			//获取推荐视频
+			getrecomVideo(sort) {
+				if (sort) {
+					this.page = 1
+				}
+				let data = {
+					page: this.page,
+					limit: 12,
+					sort: sort,
+					classifyId: ''
+				}
+				this.$Request.getT('/app/course/selectCourse', data).then(res => {
+					if (res.code == 0) {
+						if (this.page == 1) {
+							this.list = res.data.list
+						} else {
+							this.list = [...this.list, ...res.data.list]
+						}
+
+
+					}
+				})
+			},
+			// 公告
+			getMsg() {
+				let data = {
+					page: 1,
+					limit: 5,
+					state: 1
+				}
+				this.$u.api.msg(data).then(res => {
+					if (res.code == 0) {
+						this.notice = res.data.list
+						res.data.list.forEach(res => {
+							this.noticeList.push(res)
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							duration: 1000,
+							icon: 'none'
+						});
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.gongao {
+		position: absolute;
+		bottom: 75rpx;
+		left: 70rpx;
+		border-radius: 21rpx 21rpx 21rpx 21rpx;
+		width: 611rpx;
+		height: 78rpx;
+		background-color: rgba(255, 255, 255, .65);
+		display: flex;
+		align-items: center;
+		padding: 12rpx;
+
+		.gongaoicon {
+			color: #ffffff;
+			width: 98rpx;
+			height: 50rpx;
+			line-height: 50rpx;
+			text-align: center;
+			background-image: url('../../static/gonggaobg.png');
+			background-size: 98rpx 50rpx;
+		}
+
+		.swiperstyle {
+			height: 78rpx;
+			width: 80%;
+		}
+	}
+</style>
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -1,9 +1,22 @@
 <template>
 	<view style="padding-bottom: 40rpx;">
-		<u-navbar  :background="background" :is-back="isBack" :title="title" :border-bottom="false">
-		</u-navbar>
+		<!-- <u-navbar  :background="background" :is-back="isBack" :title="title" :border-bottom="false">
+		</u-navbar> -->
 		<!-- 登录信息 -->
-		<view class="info flex align-center justify-center">
+		<view class="info  " style="padding: 20rpx;">
+			<view
+				style="background-color: #f5f1f1;padding: 20rpx; display: flex;align-items: center;justify-content: space-between;"
+				class="">
+				<image src="../../static/logo.png" style="width: 170rpx;height: 51rpx;z-index: 999;" mode=""></image>
+			<!-- 	<view class="">
+					<image src="../../static/dwbimgs/one.png" style="width: 46rpx;height: 46rpx;z-index: 999;" mode="">
+					</image>
+					<image src="../../static/dwbimgs/two.png" style="width: 46rpx;height: 46rpx;z-index: 999;" mode="">
+					</image>
+					<image src="../../static/dwbimgs/three.png" style="width: 46rpx;height: 46rpx;z-index: 999;"
+						mode=""></image>
+				</view> -->
+			</view>
 			<view class="info-box">
 				<view @click="token?goNav('/pages/me/userinfo'):goNav('/pages/login/login')"
 					class="info-box-c flex align-center justify-between">
@@ -15,9 +28,9 @@
 							<view class="info-box-c-l-name-t">
 								{{userName?userName:'未登录'}}
 							</view>
-							<view class="info-box-c-l-name-b" v-if="invitationCode">
+							<!-- 	<view class="info-box-c-l-name-b" v-if="invitationCode">
 								ID:{{invitationCode}}
-							</view>
+							</view> -->
 						</view>
 					</view>
 					<view class="info-box-c-r">
@@ -28,22 +41,22 @@
 		</view>
 		<!-- 统计 -->
 		<view class="statistics flex align-center justify-center">
-			<view class="statistics-box flex align-center justify-between">
+			<view class="statistics-box flex align-center justify-between" style="margin: 0 100rpx;">
 				<view class="statistics-box-item" @click="goNav('/me/jilu/duanju-love')">
-					<view class="statistics-box-item-top">
-						{{myLoveNum}}
-					</view>
 					<view class="statistics-box-item-btn">
 						我的喜欢
 					</view>
+					<view class="statistics-box-item-top">
+						{{myLoveNum}}
+					</view>
 				</view>
 				<view class="statistics-box-item" @click="goNav('/me/jilu/duanju-zhjuiju-jilu')">
-					<view class="statistics-box-item-top">
-						{{myZhui}}
-					</view>
 					<view class="statistics-box-item-btn">
 						我的追剧
 					</view>
+					<view class="statistics-box-item-top">
+						{{myZhui}}
+					</view>
 				</view>
 				<!-- <view class="statistics-box-item" @click="goNav('/me/jifen/duanju-jifen')">
 					<view class="statistics-box-item-top">
@@ -53,13 +66,14 @@
 						我的积分
 					</view>
 				</view> -->
-				<view v-if="isShowMoneyPay" class="statistics-box-item" @click="goNav('/me/yaoqing/ymg-yaoqing-tixian')">
-					<view class="statistics-box-item-top">
-						{{userInfo.amount || '0.00'}}
-					</view>
+				<view v-if="isShowMoneyPay" class="statistics-box-item"
+					@click="goNav('/me/yaoqing/ymg-yaoqing-tixian')">
 					<view class="statistics-box-item-btn">
 						我的红包
 					</view>
+					<view class="statistics-box-item-top">
+						{{userInfo.amount || '0.00'}}
+					</view>
 				</view>
 			</view>
 		</view>
@@ -85,16 +99,47 @@
 			</view>
 		</view> -->
 		<!-- 钱包 -->
-		<view class="money flex align-center justify-center" v-if="isWxIosPay == true">
+
+		<view class="money" v-if="isWxIosPay == true" style="position: relative;">
+		<!-- 	<view
+				style="position: relative;background-color: #f2b5b5;width: 700rpx;height: 74rpx;padding:20rpx;border-radius: 14rpx 14rpx 0rpx 0rpx;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: space-between;">
+				<view class="df">
+					<image src="../../static/dwbimgs/money.png" style="width:  47rpx;height: 47rpx;margin-right: 28rpx;"
+						mode=""></image>
+					<view style="font-weight: bold;font-size: 36rpx;color: #FFFFFF;">
+						{{formatNumber(moneyNum)}}
+						元
+					</view>
+				</view>
+				<view
+					style="font-weight: bold;font-size: 25rpx;color: #977641;width: 110rpx;text-align:center;line-height: 50rpx;background: linear-gradient( 90deg, #FEE7BC 0%, #FDCC89 100%);border-radius: 46rpx 46rpx 46rpx 46rpx;">
+					提现
+				</view>
+				<view style="position: absolute;background-color: #fff;width: 40rpx;height: 40rpx;transform: rotate(45deg);bottom: -10rpx;left: 48%;background-color: #f2b5b5;">
+					
+				</view>
+			</view> -->
+			<view style="margin-top: 0rpx;">观看历史</view>
+			<view class="df" style=" justify-content: space-between;margin-top: 28rpx;">
+				<view style="border-radius:21rpx 21rpx 21rpx 21rpx" v-for="item in list" :key="item">
+					<image :src="item.titleImg"
+						style="width: 188rpx;height: 247rpx;border-radius:21rpx 21rpx 21rpx 21rpx" mode=""></image>
+					<view style="font-weight: 400;font-size: 25rpx;color: #333333;">
+						{{item.title}}
+					</view>
+					<view style="font-weight: 400;font-size: 21rpx;color: #999999;">
+						看到{{item.courseDetailsName}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 		<view class="money flex align-center justify-center" v-if="isWxIosPay == true">
 			<view class="money-box flex align-center justify-between">
 				<view class="">
 					<view class="money-box-title flex align-center">
 						<view class="money-box-title-l">
 							金币余额
 						</view>
-						<!-- <view @click="isShoMoney = !isShoMoney" class="money-box-title-r" style="margin-left: 12rpx;">
-							<u-icon :name="isShoMoney?'eye':'eye-off'" color="#5A4A32" size="40"></u-icon>
-						</view> -->
 					</view>
 					<view class="money-box-price">
 						<block v-if="isShoMoney">
@@ -108,11 +153,8 @@
 				<view class="money-box-btn" @click="goNav('/me/yaoqing/redPack-mingxi?moneyType=2&viewType=2')">
 					金币明细
 				</view>
-				<!-- <view class="money-box-btn" @click="goNav('/me/wallet/wallet')">
-					立即充值
-				</view> -->
 			</view>
-		</view>
+		</view> -->
 		<!-- 常用工具 -->
 		<view class="tool flex align-center justify-center">
 			<view class="tool-box">
@@ -184,7 +226,8 @@
 							观看历史
 						</view>
 					</view>
-					<view v-if="rate>0 && isShowMoneyPay" class="tool-box-content-item flex align-center justify-center flex-wrap"
+					<view v-if="rate>0 && isShowMoneyPay"
+						class="tool-box-content-item flex align-center justify-center flex-wrap"
 						@click="goNav('/me/yaoqing/ymf-my-team')">
 						<view class="tool-box-content-item-img">
 							<image src="../../static/images/me/vtd.png" mode=""></image>
@@ -251,8 +294,8 @@
 		</u-popup>
 		<!-- 抖音im客服 -->
 		<ttMsg />
-		
-		
+
+
 		<other-xuanfu></other-xuanfu>
 	</view>
 </template>
@@ -261,11 +304,12 @@
 	import ttMsg from '../../components/ttMsg/ttMsg.vue'
 	import httpsRequest from '../../common/httpRequest.js'
 	import otherXuanfu from '@/components/other-xuafu.vue'
-	
-	
+
+
 	export default {
 		components: {
-			ttMsg,otherXuanfu
+			ttMsg,
+			otherXuanfu
 		},
 		data() {
 			return {
@@ -283,6 +327,7 @@
 				}],
 				isLogin: false,
 				userName: '未登录',
+				list: [],
 				isVIP: false,
 				invitationCode: '',
 				token: '',
@@ -295,7 +340,7 @@
 				showCard: false,
 				numCount: 0,
 				rate: 0,
-				twoRate:0,
+				twoRate: 0,
 				kmPaySel: '否',
 				isWxIosPay: true, //微信下是否显示支付功能
 				userInfo: {},
@@ -304,18 +349,18 @@
 		},
 		onLoad() {
 			this.getBannerList()
-			
-			this.zxczxczxczsw(1212,5) 
-			this.zzzzzzzzzzzzzzzzs(1212.5)  
-			this.zxcee(1212,5) 
-			this.aaaaccx(1212,5) 
-			 this.wwrqx(1212,5)
+
+			this.zxczxczxczsw(1212, 5)
+			this.zzzzzzzzzzzzzzzzs(1212.5)
+			this.zxcee(1212, 5)
+			this.aaaaccx(1212, 5)
+			this.wwrqx(1212, 5)
 		},
 		onShow() {
-			
+			this.ymfgetDataList()
 			const systemInfo = uni.getSystemInfoSync();
 			const isIOS = /iOS/.test(systemInfo.platform);
-			if ( !isIOS ) {
+			if (!isIOS) {
 				this.isBack = true
 			}
 			this.isWxIosPay = uni.getStorageSync('isWxIosPay')
@@ -335,8 +380,8 @@
 						this.userName = res.data.userName
 						this.avatar = res.data.avatar
 						this.invitationCode = res.data.invitationCode
-						this.rate = res.data.rate||0
-						this.twoRate = res.data.twoRate||0
+						this.rate = res.data.rate || 0
+						this.twoRate = res.data.twoRate || 0
 					}
 				})

@@ -374,7 +419,7 @@
 			}
 			this.avatar = uni.getStorageSync('avatar') ? uni.getStorageSync('avatar') : '../../static/images/logo.png'

-			httpsRequest.getT("app/common/type/919", {}).then(res => {
+			httpsRequest.getT("/app/common/type/919", {}).then(res => {
 				console.log(res);
 				if (res.code === 0) {
 					const sysInfo = uni.getSystemInfoSync();
@@ -464,6 +509,26 @@
 					}
 				})
 			},
+			//获取观看记录
+			ymfgetDataList() {
+				let data = {
+					page: 1,
+					limit: 3,
+					classify: 3
+				}
+				this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
+					if (res.code === 0) {
+						console.log(res,'debug')
+						let arr = []
+						res.data.records.forEach((ele, index) => {
+							if (index < 3) {
+								arr.push(ele)
+							}
+						})
+						this.list = arr
+					}
+				})
+			},
 			/**
 			 * 获取积分
 			 */
@@ -553,7 +618,7 @@
 				}
 				r1 = Number(arg1.toString().replace(".", ""));
 				r2 = Number(arg2.toString().replace(".", ""));
-				 
+
 			},
 			/**
 			 * 保留小数n位，不进行四舍五入
@@ -576,7 +641,7 @@
 					return parseFloat(num).toFixed(decimal);
 				}
 			},
-			
+
 			//乘法函数，用来得到精确的乘法结果
 			//说明：javascript的乘法结果会有误差，在两个浮点数相乘的时候会比较明显。这个函数返回较为精确的乘法结果。
 			//调用：mul(arg1,arg2)
@@ -689,7 +754,7 @@
 					// #endif
 				}
 			},
-			goNav(e,type) {
+			goNav(e, type) {
 				console.log(e)
 				let token = uni.getStorageSync('token')
 				if (token) {
@@ -702,7 +767,7 @@
 							url: e
 						})
 					}
-					
+
 				} else {
 					uni.navigateTo({
 						url: "/pages/login/login"
@@ -881,7 +946,7 @@
 		.statistics-box-item-btn {
 			width: 100%;
 			text-align: center;
-			color: #999999;
+			color: #333;
 			font-size: 26rpx;
 			// margin-top: 20rpx
 		}
@@ -933,41 +998,45 @@
 	}

 	.money {
-		width: 100%;
 		height: auto;
 		margin-top: 20rpx;
-
-		.money-box {
-			width: 686rpx;
-			height: 100%;
-			border-radius: 24rpx;
-			background: #ffffff;
-			padding: 30rpx;
-		}
-
-		.money-box-btn {
-			background: linear-gradient(90deg, #FF7581 0%, #F8A5AF 100%);
-			border-radius: 44rpx;
-			padding: 18rpx 30rpx;
-			font-size: 24rpx;
-			color: #ffffff;
-			font-weight: bold;
-		}
-
-		.money-box-title-l {
-			color: #333333;
-			font-size: 28rpx;
-			font-weight: normal;
-		}
-
-		.money-box-price {
-			color: #333333;
-			font-size: 48rpx;
-			font-weight: 800;
-			margin-top: 20rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+		margin: 30rpx;
+		padding: 55rpx 24rpx;


-		}
+		// .money-box {
+		// 	width: 686rpx;
+		// 	height: 100%;
+		// 	border-radius: 24rpx;
+		// 	background: #ffffff;
+		// 	padding: 30rpx;
+		// }
+
+		// .money-box-btn {
+		// 	background: linear-gradient(90deg, #FF7581 0%, #F8A5AF 100%);
+		// 	border-radius: 44rpx;
+		// 	padding: 18rpx 30rpx;
+		// 	font-size: 24rpx;
+		// 	color: #ffffff;
+		// 	font-weight: bold;
+		// }
+
+		// .money-box-title-l {
+		// 	color: #333333;
+		// 	font-size: 28rpx;
+		// 	font-weight: normal;
+		// }
+
+		// .money-box-price {
+		// 	color: #333333;
+		// 	font-size: 48rpx;
+		// 	font-weight: 800;
+		// 	margin-top: 20rpx;
+
+
+		// }


 	}
@@ -1015,4 +1084,9 @@
 			font-size: 24rpx;
 		}
 	}
+
+	.df {
+		display: flex;
+		align-items: center;
+	}
 </style>
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -8,7 +8,7 @@
 		<view class="navTitle">
 			<view></view>
 			<view class="title">任务大厅</view>
-			<image @click="goNav({jumpType:1,buttonUrl:'/pages/iSiAnfghCC/abKTySghjA'})" class="navTitleIcon"
+			<image @click="goNav({jumpType:1,buttonUrl:'/pages/me/index'})" class="navTitleIcon"
 				src="../../static/images/my.png"></image>
 		</view>
 		<view class="icon u-relative padding">
@@ -17,15 +17,14 @@
 			<image class="task_icon2 u-relative" src="../../static/images/me/task_icon2.png"></image>
 		</view>

-		<view class="content signIn margin-lr padding bg-white u-relative" style="margin-bottom: 32rpx;">
-			<view class="title flex justify-between">
-				<view>已连续签到 <text class="num">{{signDays}}</text> 天</view>
-				<!-- 	<view class="dk flex">
-					<text style="margin-right: 20rpx;">打卡提醒</text>
-					<u-switch v-model="checked" size="35" active-color="#EA9EA8 "></u-switch>
-				</view> -->
+		<view class="content signIn margin-lr  bg-white u-relative" style="margin-bottom: 32rpx;">
+			<view class="">
+				<image src="../../static/dwbimgs/renwubg.png"
+					style="width: 100%;height: 78rpx;position: absolute;left: 0;top: 0;z-index:1" mode=""></image>
+				<view style="z-index: 9999;position: absolute;text-align: center;width: 98%;">已连续签到 <text class="num"
+						style="color: #EC6F48;margin: 0 10rpx;">{{signDays}}</text> 天</view>
 			</view>
-			<view class="signInList flex justify-between">
+			<!-- 		<view class="signInList flex justify-between">
 				<text class="line"></text>
 				<view class="signIn-Item"
 					:class="{active: item.showText == '待签到'||item.showText == '未签到'||item.showText == '已签到'}"
@@ -39,9 +38,24 @@
 					<view class="radius"></view>
 					<view class="_label">{{item.showText}}</view>
 				</view>
+			</view> -->
+			<view style="margin-top: 100rpx; display: flex;align-items: center; justify-content: space-between;">
+				<view class="" v-for="item in signInList" :key="item" style="position: relative;"
+					:style="filterDate(item)=='已签到'?'color:#EFA765':'color:#999'">
+					{{filterDate(item)}}
+					<view
+						style="margin-top: 20rpx;;width: 80rpx;height: 94rpx;background: linear-gradient( 180deg, #FFF7E3 0%, #FFFFFF 100%);border-radius: 14rpx 14rpx 0rpx 0rpx;"
+						:style="filterDate(item)=='已签到'?'color:#999':'color:#EFA765'">
+						{{item.signDay.substr(5,8)}}
+					</view>
+					<image v-if="item.status==0" src="../../static/dwbimgs/xing (1).png"
+						style="width: 52rpx;height: 48rpx;position: absolute;top: 100rpx;left: 14rpx;" mode=""></image>
+					<image v-else src="../../static/dwbimgs/xing (2).png"
+						style="width: 52rpx;height: 48rpx;position: absolute;top: 100rpx;left: 14rpx;" mode="">
+					</image>
+				</view>
 			</view>
-
-			<view class="tishi">连续签到7天即可获得7元奖励</view>
+			<!-- <view class="tishi">连续签到7天即可获得7元奖励</view> -->

 			<!-- <view class="signInBtn" @click="goNav({jumpType: 0, id:15, buttonTitle: '去领取'})">
 				<view>{{signInBtn}}</view>
@@ -86,6 +100,10 @@
 </template>

 <script>
+	import {
+		data
+	} from '../../tuniao-ui/libs/mixin/mixin'
+
 	export default {

 		data() {
@@ -97,28 +115,7 @@
 				list: [],
 				checked: false,
 				signDays: 0,
-				signInList: [{
-						name: '第一天'
-					},
-					{
-						name: '第二天'
-					},
-					{
-						name: '第三天'
-					},
-					{
-						name: '第四天'
-					},
-					{
-						name: '第五天'
-					},
-					{
-						name: '第六天'
-					},
-					{
-						name: '第七天'
-					},
-				],
+				signInList: [],
 				signInBtn: '点击签到',
 				isShowMoneyPay: true,
 			}
@@ -131,7 +128,7 @@
 		onShow() {
 			this.getTaskdata()
 			this.getsignIn()
-			this.$Request.getT("app/common/type/919", {}).then(res => {
+			this.$Request.getT("/app/common/type/919", {}).then(res => {
 				if (res.code == 0) {
 					const sysInfo = uni.getSystemInfoSync();
 					let isIos = sysInfo.platform == 'ios'
@@ -144,7 +141,24 @@
 			//说明：javascript的乘法结果会有误差，在两个浮点数相乘的时候会比较明显。这个函数返回较为精确的乘法结果。
 			//调用：mul(arg1,arg2)
 			//返回值：arg1乘以arg2的精确结果
+			filterDate(d) {
+				// 获取当前时间
+				// 循环比较,返回字段
+				if (d.status == 1) {
+					return '已签到'
+				} else {
+					return '待签到'
+					// let time1 = d.signDay
+					// let date1 = new Date(time1);
+					// let date2 = new Date().getTime() + 8 * 60 * 60;
+					// if (date1.getTime() < date2) {
+					// 	return '未签到'
+					// } else if (date1.getTime() > date2) {
+					// 	return '待签到'
+					// }
+				}

+			},
 			mul(arg1, arg2) {
 				var m = 0,
 					s1 = arg1.toString(),
@@ -217,7 +231,7 @@
 				}
 				r1 = Number(arg1.toString().replace(".", ""));
 				r2 = Number(arg2.toString().replace(".", ""));
-				 
+
 			},
 			/**
 			 * 保留小数n位，不进行四舍五入
@@ -249,19 +263,19 @@


 			getsignIn() {
-				this.$Request.getT('app/userSignRecord/getUserSignData', {}).then(res => {
+				this.$Request.getT('/app/userSignRecord/getUserSignData', {}).then(res => {
 					if (res.code == 0) {
 						this.signInList = res.data.recordList
 						this.signDays = res.data.signDays
-						this.signInList.map((item, index) => {
-							if (item.showText == '待签到' && index > 0) {
-								this.signInBtn = this.signInList[index - 1].status == 0 ? '重新签到' : '点击签到'
-							}
-							let someDate = new Date(item.signDay); // 假设这是需要判断的日期
-							if (item.signDate && this.isToday(someDate)) {
-								this.signInBtn = '已签到'
-							}
-						})
+						// this.signInList.map((item, index) => {
+						// 	if (item.showText == '待签到' && index > 0) {
+						// 		this.signInBtn = this.signInList[index - 1].status == 0 ? '重新签到' : '点击签到'
+						// 	}
+						// 	let someDate = new Date(item.signDay); // 假设这是需要判断的日期
+						// 	if (item.signDate && this.isToday(someDate)) {
+						// 		this.signInBtn = '已签到'
+						// 	}
+						// })
 					} else {
 						// uni.showToast({
 						// 	title: res.msg,
@@ -339,7 +353,7 @@
 				let data = {
 					id: id
 				}
-				this.$Request.getT('app/taskCenter/taskReceive', data).then(res => {
+				this.$Request.getT('/app/taskCenter/taskReceive', data).then(res => {
 					if (res.code == 0) {
 						uni.showToast({
 							title: id == 15 ? '签到成功' : '领取成功',
@@ -362,7 +376,7 @@
 			 */
 			getTaskdata() {

-				this.$Request.getT('app/taskCenter/selectTaskCenter', {}).then(res => {
+				this.$Request.getT('/app/taskCenter/selectTaskCenter', {}).then(res => {
 					if (res.code == 0) {
 						this.list = res.data
 					}
@@ -596,6 +610,7 @@
 				font-weight: 400;
 				font-size: 20rpx;
 				color: #7F7F7F;
+				margin-top: 20rpx;
 			}

 			.signInBtn {
--- a/static/dwbimgs/money.png
+++ b/static/dwbimgs/money.png
--- a/static/dwbimgs/one.png
+++ b/static/dwbimgs/one.png
--- a/static/dwbimgs/renwubg.png
+++ b/static/dwbimgs/renwubg.png
--- a/static/dwbimgs/three.png
+++ b/static/dwbimgs/three.png
--- a/static/dwbimgs/two.png
+++ b/static/dwbimgs/two.png
--- a/static/dwbimgs/xing
+++ b/static/dwbimgs/xing
--- a/static/dwbimgs/xing
+++ b/static/dwbimgs/xing
--- a/static/gonggaobg.png
+++ b/static/gonggaobg.png
--- a/static/indexbh.png
+++ b/static/indexbh.png
--- a/static/logo.png
+++ b/static/logo.png
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,42 @@
+## 2.0.10（2024-06-07）
+- 优化 uni-app x 中，size 属性的类型
+## 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）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.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-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
+++ 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,String} 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: [Number, String],
+        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>
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,110 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
+	<!-- #endif -->
+</template>
+
+<script>
+	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;
+	}
+
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('" + iconUrl + "')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @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: 'UniIcons',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: fontData
+			}
+		},
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
+				}
+				return ''
+			},
+			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: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+</style>
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.css
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,664 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6d1";
+}
+
+.uniui-down:before {
+  content: "\e6b8";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowright:before {
+  content: "\e6d5";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-up:before {
+  content: "\e6b6";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowup:before {
+  content: "\e6d6";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
--- a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
+++ 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)
--- a/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
+++ 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)
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "2.0.10",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "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"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y",
+          "app-uvue": "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",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-icons/readme.md
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
--- a/uni_modules/uni-scss/styles/setting/_styles.scss
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -1,9 +1,9 @@
 /* #ifndef APP-NVUE */

-$-color-white:#ffffff;
+$-color-white:#fff;
 $-color-black:#000;
@mixin base-style($color) {
-	color: #ffffff;
+	color: #fff;
 	background-color: $color;
 	border-color: mix($-color-black, $color, 8%);
 	&:not([hover-class]):active {
--- a/uni_modules/uni-scss/variables.scss
+++ b/uni_modules/uni-scss/variables.scss
@@ -6,26 +6,26 @@ $uni-radius-root:5px;

 // 主色
 $uni-primary: #2979ff;
-$uni-primary-disable:mix(#ffffff,$uni-primary,50%);
-$uni-primary-light: mix(#ffffff,$uni-primary,80%);
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);

 // 辅助色
 // 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
 $uni-success: #18bc37;
-$uni-success-disable:mix(#ffffff,$uni-success,50%);
-$uni-success-light: mix(#ffffff,$uni-success,80%);
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);

 $uni-warning: #f3a73f;
-$uni-warning-disable:mix(#ffffff,$uni-warning,50%);
-$uni-warning-light: mix(#ffffff,$uni-warning,80%);
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);

 $uni-error: #e43d33;
-$uni-error-disable:mix(#ffffff,$uni-error,50%);
-$uni-error-light: mix(#ffffff,$uni-error,80%);
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);

 $uni-info: #8f939c;
-$uni-info-disable:mix(#ffffff,$uni-info,50%);
-$uni-info-light: mix(#ffffff,$uni-info,80%);
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);

 // 中性色
 // 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
--- a/utils/api.js
+++ b/utils/api.js
@@ -1,6 +1,6 @@
 import httpsRequest from '@/common/httpRequest.js'
 //是否处于审核中
-const $API_shenhe='app/common/type/919'
+const $API_shenhe='/app/common/type/919'
 export async function returnIsShenhe(data){
 	let isShenHe=false
 	const res=await httpsRequest.getT($API_shenhe,{...data})
--- a/uview-ui/components/u-navbar/u-navbar.vue
+++ b/uview-ui/components/u-navbar/u-navbar.vue
@@ -2,7 +2,7 @@
 	<view class="">
 		<view class="u-navbar" :style="[navbarStyle]" :class="{ 'u-navbar-fixed': isFixed, 'u-border-bottom': borderBottom }">
 			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
-			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
+	<!-- 		<view class="u-navbar-inner" :style="[navbarInnerStyle]">
 				<view class="u-back-wrap" v-if="isBack" @tap="goBack">
 					<view class="u-icon-wrap">
 						<u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon>
@@ -20,13 +20,13 @@
 						{{ title }}
 					</view>
 				</view>
-				<view class="u-slot-content">
+	 		<view class="u-slot-content">
 					<slot></slot>
-				</view>
+				</view> 
 				<view class="u-slot-right">
 					<slot name="right"></slot>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<!-- 解决fixed定位后导航栏塌陷的问题 -->
 		<view class="u-navbar-placeholder" v-if="isFixed && !immersive" :style="{ width: '100%', height: Number(navbarHeight) + statusBarHeight + 'px' }"></view>
Author	SHA1	Message	Date
duan	c978fab954	ios 首页任务我的修改	2024-12-30 22:30:10 +08:00
GYJ	9a52daeffe	iOS 配置	2024-12-27 15:47:22 +08:00
GYJ	be007cd908	版本	2024-12-25 11:21:55 +08:00
GYJ	8fec7cc90d	冲突修改	2024-12-24 14:22:29 +08:00
GYJ	a9078dd4eb	适配修改	2024-12-24 14:19:08 +08:00