From 366af69ec2fb30610494f1a73dd3a3c5db425461 Mon Sep 17 00:00:00 2001
From: yixiudong <827231259@qq.com>
Date: Tue, 19 Aug 2025 15:28:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=91=E7=9A=84-=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=E6=A8=A1=E5=9D=97=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/leaderBoard.js                        |  38 +
 src/pages/charts/index.vue                    | 941 ++++++++++++++++++
 src/static/images/charts/01.svg               |   9 +
 src/static/images/charts/02.svg               |   9 +
 src/static/images/charts/03.svg               |   9 +
 src/static/images/charts/avator.png           | Bin 0 -> 12840 bytes
 src/uni_modules/uni-list/changelog.md         |  48 +
 .../components/uni-list-ad/uni-list-ad.vue    | 107 ++
 .../uni-list-chat/uni-list-chat.scss          |  58 ++
 .../uni-list-chat/uni-list-chat.vue           | 593 +++++++++++
 .../uni-list-item/uni-list-item.vue           | 534 ++++++++++
 .../uni-list/components/uni-list/uni-list.vue | 123 +++
 .../components/uni-list/uni-refresh.vue       |  65 ++
 .../components/uni-list/uni-refresh.wxs       |  87 ++
 src/uni_modules/uni-list/package.json         |  91 ++
 src/uni_modules/uni-list/readme.md            |  46 +
 src/uni_modules/uni-table/changelog.md        |  27 +
 .../components/uni-table/uni-table.vue        | 455 +++++++++
 .../components/uni-tbody/uni-tbody.vue        |  29 +
 .../uni-table/components/uni-td/uni-td.vue    |  90 ++
 .../components/uni-th/filter-dropdown.vue     | 511 ++++++++++
 .../uni-table/components/uni-th/uni-th.vue    | 285 ++++++
 .../components/uni-thead/uni-thead.vue        | 129 +++
 .../components/uni-tr/table-checkbox.vue      | 179 ++++
 .../uni-table/components/uni-tr/uni-tr.vue    | 171 ++++
 src/uni_modules/uni-table/i18n/en.json        |   9 +
 src/uni_modules/uni-table/i18n/es.json        |   9 +
 src/uni_modules/uni-table/i18n/fr.json        |   9 +
 src/uni_modules/uni-table/i18n/index.js       |  12 +
 src/uni_modules/uni-table/i18n/zh-Hans.json   |   9 +
 src/uni_modules/uni-table/i18n/zh-Hant.json   |   9 +
 src/uni_modules/uni-table/package.json        |  83 ++
 src/uni_modules/uni-table/readme.md           |  13 +
 33 files changed, 4787 insertions(+)
 create mode 100644 src/api/leaderBoard.js
 create mode 100644 src/pages/charts/index.vue
 create mode 100644 src/static/images/charts/01.svg
 create mode 100644 src/static/images/charts/02.svg
 create mode 100644 src/static/images/charts/03.svg
 create mode 100644 src/static/images/charts/avator.png
 create mode 100644 src/uni_modules/uni-list/changelog.md
 create mode 100644 src/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
 create mode 100644 src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
 create mode 100644 src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
 create mode 100644 src/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
 create mode 100644 src/uni_modules/uni-list/components/uni-list/uni-list.vue
 create mode 100644 src/uni_modules/uni-list/components/uni-list/uni-refresh.vue
 create mode 100644 src/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
 create mode 100644 src/uni_modules/uni-list/package.json
 create mode 100644 src/uni_modules/uni-list/readme.md
 create mode 100644 src/uni_modules/uni-table/changelog.md
 create mode 100644 src/uni_modules/uni-table/components/uni-table/uni-table.vue
 create mode 100644 src/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue
 create mode 100644 src/uni_modules/uni-table/components/uni-td/uni-td.vue
 create mode 100644 src/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
 create mode 100644 src/uni_modules/uni-table/components/uni-th/uni-th.vue
 create mode 100644 src/uni_modules/uni-table/components/uni-thead/uni-thead.vue
 create mode 100644 src/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
 create mode 100644 src/uni_modules/uni-table/components/uni-tr/uni-tr.vue
 create mode 100644 src/uni_modules/uni-table/i18n/en.json
 create mode 100644 src/uni_modules/uni-table/i18n/es.json
 create mode 100644 src/uni_modules/uni-table/i18n/fr.json
 create mode 100644 src/uni_modules/uni-table/i18n/index.js
 create mode 100644 src/uni_modules/uni-table/i18n/zh-Hans.json
 create mode 100644 src/uni_modules/uni-table/i18n/zh-Hant.json
 create mode 100644 src/uni_modules/uni-table/package.json
 create mode 100644 src/uni_modules/uni-table/readme.md

diff --git a/src/api/leaderBoard.js b/src/api/leaderBoard.js
new file mode 100644
index 00000000..c504f9ab
--- /dev/null
+++ b/src/api/leaderBoard.js
@@ -0,0 +1,38 @@
+import request from '@/api/request'
+
+const base_url = '/traapp'
+
+
+// 学习时长
+export const getLeaderBoardStdyTmApi = (data) => {
+	return request({
+		url: base_url + '/myLeaderBoard/stdyTmLen',
+		method: 'post',
+		data
+	});
+};
+// 练习次数
+export const getLeaderBoardPractCntApi = (data) => {
+	return request({
+		url: base_url + '/myLeaderBoard/practCnt',
+		method: 'post',
+		data
+	});
+};
+// 考试次数
+export const getLeaderBoardExamCntApi = (data) => {
+	return request({
+		url: base_url + '/myLeaderBoard/examCnt',
+		method: 'post',
+		data
+	});
+};
+//  通关课程数
+export const getLeaderBoardCrsCntApi = (data) => {
+	return request({
+		url: base_url + '/myLeaderBoard/crsCnt',
+		method: 'post',
+		data
+	});
+};
+
diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue
new file mode 100644
index 00000000..d87c9df2
--- /dev/null
+++ b/src/pages/charts/index.vue
@@ -0,0 +1,941 @@
+<template>
+	<view class="max_page detail-main">
+		<nav-bar :is_seat="false"></nav-bar>
+		<view class="fixed_search_div">
+			<view class="back_div" @click="common.navigateBack()">
+				<view class="back-icon"></view>
+			</view>
+			<view class="title font_pf">排行榜</view>
+		</view>
+		<view class="detail-body">
+			<view class="body-tabs">
+				<view class="tabs-sty">
+					<view :class="tabAct == index ?'active-tabs-item-sty':'tabs-item-sty'"
+						v-for="(item,index) in tabList" @click="tabChange(index,item)">{{item.name}}</view>
+				</view>
+			</view>
+			<view class="date-body">
+				<view class="date-sty">
+					<view :class="itemIndex == index ?'active-date-item-sty':'date-item-sty'"
+						v-for="(item,index) in dateTabList" @click="itemFun(index,item)">{{item.name}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="rank-style">
+			<view class="rank-top3">
+				<view class="rank-content rank-content-backgound-color1" v-if="chartsList.length > 1">
+					<image src="/static/images/charts/02.svg" class="crown1"></image>
+					<image src="/static/images/charts/avator.png" class="top-avator"></image>
+					<view class="content1">top·2</view>
+					<view class="content2">{{chartsList[1].userName}}</view>
+					<view class="content3">{{chartsList[1].score}}</view>
+					<view class="content4">{{chartsList[1].dept}}</view>
+				</view>
+				<view class="rank-content rank-content-backgound-color2" v-if="chartsList.length > 0">
+					<image src="/static/images/charts/01.svg" class="crown2"></image>
+					<image src="/static/images/charts/avator.png" class="top-avator"></image>
+					<view class="content11">top·1</view>
+					<view class="content2">{{chartsList[0].userName}}</view>
+					<view class="content33">{{chartsList[0].score}}</view>
+					<view class="content44">{{chartsList[0].dept}}</view>
+				</view>
+				<view class="rank-content rank-content-backgound-color3" v-if="chartsList.length > 2">
+					<image src="/static/images/charts/03.svg" class="crown3"></image>
+					<image src="/static/images/charts/avator.png" class="top-avator"></image>
+					<view class="content111">top·3</view>
+					<view class="content2">{{chartsList[2].userName}}</view>
+					<view class="content333">{{chartsList[2].score}}</view>
+					<view class="content444">{{chartsList[2].dept}}</view>
+				</view>
+			</view>
+			<!-- table形式排名 -->
+			<!-- <view class="rank-other">
+				<uni-table ref="table">
+					<uni-tr>
+						<uni-th align="center" width="100">排名</uni-th>
+						<uni-th align="left" width="180">用户名/所属机构</uni-th>
+						<uni-th align="center" >{{tableLastName}}</uni-th>
+					</uni-tr>
+					<uni-tr v-for="(item, index) in newChartsList" :key="index">
+						<uni-td :class="item.name == '江月心'?'active-rank-sty':'rank-sty'" align="center">{{ item.rank }}</uni-td>
+						<uni-td align="center">
+							<image src="/static/images/charts/avator.png" class="avator"></image>
+							<view style="float: left;margin-left: 18rpx;">
+								<view :class="item.name == '江月心'?'active-name':'name'">{{ item.name }}</view>
+								<view class="belong">{{ item.belong }}</view>
+							</view>
+						</uni-td>
+						<uni-td class="score-sty" align="center">{{ item.score }}</uni-td>
+					</uni-tr>
+				</uni-table>
+				<view style="width: 100%;height: 200rpx;"></view>
+			</view>
+			<view class="rank-mine">
+				<view class="rank-mine-content">
+					<view style="font-size: 26rpx;font-weight: 400;color: #999999;margin-left: 10rpx;">我的排名</view>
+					<view style="width: 100%;">
+						<view style="width: 100rpx;font-size: 40rpx;color: #0066FF;font-style: italic;;font-weight: 600;float: left;margin-top:30rpx;margin-left: 18rpx;">44</view>
+						<view style="width: 200rpx;float: left;margin-left: 46rpx;margin-top: 12rpx;width: 370rpx;">
+							<image src="/static/images/charts/avator.png" class="my-avator"></image>
+							<view style="font-size: 30rpx;font-weight: 600;color:#000000;">张伟</view>
+							<view style="font-size: 26rpx;font-weight: 400;color: #999999;margin-top:8rpx;">吉林银行大连分行</view>
+						</view>
+						<view style="width: 170rpx;font-size: 32rpx;text-align: center;color: #333333;font-weight: 600;float: left;margin-top: 32rpx;">91</view>
+					</view>
+				</view>
+			</view> -->
+			<!-- list形式排名 -->
+			<uni-list class="rank-other">
+				<uni-list-item>
+					<!-- 自定义 header -->
+					<template v-slot:header>
+						<text class="rank-other-rank-sty rank-uni-sty">排名</text>
+					</template>
+					<!-- 自定义 body -->
+					<template v-slot:body>
+						<text class="rank-other-user-sty rank-uni-sty">用户名/所属机构</text>
+					</template>
+					<!-- 自定义 footer-->
+					<template v-slot:footer>
+						<text class="rank-other-last-sty rank-uni-sty">{{tableLastName}}</text>
+					</template>
+				</uni-list-item>
+				<uni-list-item :key="index" v-if="newChartsList.length == 0">
+					<template v-slot:header>
+						<text style="width:100%;text-align: center;color: #999999;">暂无数据</text>
+					</template>
+				</uni-list-item>
+				<uni-list-item v-for="(item, index) in newChartsList" :key="index" v-else>
+					<!-- 自定义 header -->
+					<template v-slot:header>
+						<text style="width: 20%;text-align: center;margin-top:15rpx"
+							:class="item.userId == userId?'active-rank-sty':'rank-sty'">{{index + 4}}</text>
+					</template>
+					<!-- 自定义 body -->
+					<template v-slot:body>
+						<view style="width: 50%;text-align: center;">
+							<image :src="item.imgAddr" class="avator"></image>
+							<view style="float: left;margin-left: 18rpx;">
+								<view :class="item.userId == userId?'active-name':'name'">{{ item.userName }}</view>
+								<view class="belong">{{ item.dept }}</view>
+							</view>
+						</view>
+					</template>
+					<!-- 自定义 footer-->
+					<template v-slot:footer>
+						<text class="score-sty score-sty-footer">{{ item.score }}</text>
+					</template>
+				</uni-list-item>
+				<view style="width: 100%;height: 200rpx;"></view>
+				<uni-list-item class="rank-mine" v-if="myselfList.length < 1">
+					<!-- 自定义 header -->
+					<template v-slot:header>
+						<text class="rank-sty my-rank-title">我的排名</text>
+						<view style="width: 100%;text-align: center;color: #999999;font-size: 28rpx;">暂无排名</view>
+					</template>
+				</uni-list-item>
+				<uni-list-item class="rank-mine" v-else>
+					<!-- 自定义 header -->
+					<template v-slot:header>
+						<text class="rank-sty my-rank-title">我的排名</text>
+						<view class="my-rank-content">11</view>
+					</template>
+					<!-- 自定义 body -->
+					<template v-slot:body>
+						<view style="width: 50%;text-align: center;">
+							<image src="/static/images/charts/avator.png" class="avator"></image>
+							<view style="float: left;margin-left: 18rpx;">
+								<view class="my-rank-name">{{myselfList[0].userName}}</view>
+								<view class="my-rank-belong">{{myselfList[0].dept}}</view>
+							</view>
+						</view>
+					</template>
+					<!-- 自定义 footer-->
+					<template v-slot:footer>
+						<text class="my-rank-score">{{myselfList[0].score}}</text>
+					</template>
+				</uni-list-item>
+			</uni-list>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		getLeaderBoardStdyTmApi,
+		getLeaderBoardPractCntApi,
+		getLeaderBoardExamCntApi,
+		getLeaderBoardCrsCntApi
+	} from "@/api/leaderBoard.js"
+	// 我的排行榜
+	import {
+		reactive,
+		ref,
+		computed,
+		nextTick,
+		onMounted,
+		watch
+	} from 'vue';
+	import common from '@/common/common';
+	const userId = ("USER001");
+	const itemIndex = ref(0);
+	const learnTimeList = ref([])
+	const practCntList = ref([])
+	const examCntList = ref([])
+	const crsCntList = ref([])
+	const myselfList = ref([])
+	const tableLastName = ref("学习时长(h)");
+	const taskRef = ref(null);
+	const tabAct = ref(0);
+	const tabDateAct = ref(0);
+	const allChartsList = ref([]);
+	const newChartsList = ref([]);
+	const tabList = ref([{
+		name: '学习时长'
+	}, {
+		name: '练习次数'
+	}, {
+		name: '考试次数'
+	}, {
+		name: '通关课程数'
+	}]);
+	const dateTabList = ref([{
+		name: '本年',
+		value: 'annual'
+	}, {
+		name: '本月',
+		value: 'month'
+	}, {
+		name: '本周',
+		value: 'week'
+	}]);
+	const chartsList = ref([]);
+	const tabChange = (index, item) => {
+		itemIndex.value = 0;
+		tabAct.value = index;
+		tableLastName.value = item.name;
+		if (tableLastName.value == '学习时长') {
+			tableLastName.value = '学习时长(h)'
+		}
+		if (tableLastName.value == '学习时长') {
+			allChartsList.value = learnTimeList.value;
+			chartsList.value = learnTimeList.value.annual || [];
+			chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen || "";
+		} else if (tableLastName.value == '练习次数') {
+			allChartsList.value = practCntList.value;
+			chartsList.value = practCntList.value.annual || [];
+			chartsList.value.score = practCntList.value.annual.annlPractCnt || "";
+		} else if (tableLastName.value == '考试次数') {
+			allChartsList.value = examCntList.value;
+			chartsList.value = examCntList.value.annual || [];
+			chartsList.value.score = examCntList.value.annual.annlExamCnt || "";
+		} else if (tableLastName.value == '通关课程数') {
+			allChartsList.value = crsCntList.value;
+			chartsList.value = crsCntList.value.annual || [];
+			chartsList.value.score = crsCntList.value.annual.annlCrsCnt || "";
+		}
+		//我的排名---接口待联调
+		// myselfList.value = chartsList.value.myselfList || [];
+		if (chartsList.value.length > 3) {
+			newChartsList.value = chartsList.value.slice(3).concat();
+		} else {
+			newChartsList.value = chartsList.value;
+		}
+		console.log(tableLastName.value, 'tablelastname')
+	};
+	const itemFun = (index, item) => {
+		itemIndex.value = index;
+		if (item.value == 'annual') {
+			chartsList.value = allChartsList.value.annual ? allChartsList.value.annual : [];
+			if (tableLastName.value == '学习时长') {
+				chartsList.value.score = chartsList.value.annlStdyTmLen || "";
+			} else if (tableLastName.value == '练习次数') {
+				chartsList.value.score = chartsList.value.annlPractCnt || "";
+			} else if (tableLastName.value == '考试次数') {
+				chartsList.value.score = chartsList.value.annlExamCnt || "";
+			} else if (tableLastName.value == '通关课程数') {
+				chartsList.value.score = chartsList.value.annlCrsCnt || "";
+			}
+		} else if (item.value == 'month') {
+			chartsList.value = allChartsList.value.month ? allChartsList.value.month : [];
+			if (tableLastName.value == '学习时长') {
+				chartsList.value.score = chartsList.value.thisMonthStdyTmLen || "";
+			} else if (tableLastName.value == '练习次数') {
+				chartsList.value.score = chartsList.value.thisMonthPractCnt || "";
+			} else if (tableLastName.value == '考试次数') {
+				chartsList.value.score = chartsList.value.thisMonthExamCnt || "";
+			} else if (tableLastName.value == '通关课程数') {
+				chartsList.value.score = chartsList.value.thisMonthCrsCnt || "";
+			}
+		} else if (item.value == 'week') {
+			chartsList.value = allChartsList.value.week ? allChartsList.value.week : [];;
+			if (tableLastName.value == '学习时长') {
+				chartsList.value.score = chartsList.value.thisWeekStdyTmLen || "";
+			} else if (tableLastName.value == '练习次数') {
+				chartsList.value.score = chartsList.value.thisWeekPractCnt || "";
+			} else if (tableLastName.value == '考试次数') {
+				chartsList.value.score = chartsList.value.thisWeekExamCnt || "";
+			} else if (tableLastName.value == '通关课程数') {
+				chartsList.value.score = chartsList.value.thisWeekCrsCnt || "";
+			}
+		}
+		//我的排名---接口待联调
+		// myselfList.value = chartsList.value.myselfList || [];
+	}
+	onMounted(() => {
+		
+		//挡板数据代码
+		let tempList = {
+			annual: [{
+					userName: "江心",
+					score: 94,
+					dept: "吉林银行吉林分行",
+					userId: "USER001",
+					imgAddr: "/static/images/charts/avator.png"
+				},
+				{
+					userName: "李婉儿",
+					score: 98,
+					dept: "吉林银行吉林分行"
+				},
+				{
+					userName: "百里里",
+					score: 88,
+					dept: "吉林银行吉林分行"
+				},
+				{
+					userName: "黎明",
+					score: 94,
+					dept: "吉林银行吉林分行",
+					imgAddr: "/static/images/charts/avator.png"
+				},
+				{
+					userName: "张伟",
+					score: 91,
+					dept: "吉林银行吉林分行"
+				},
+				{
+					userName: "俞小凡",
+					score: 89,
+					dept: "吉林银行吉林分行",
+					imgAddr: "/static/images/charts/avator.png"
+				},
+				{
+					userName: "黎明",
+					score: 94,
+					dept: "吉林银行吉林分行"
+				},
+				{
+					userName: "张伟",
+					score: 91,
+					dept: "吉林银行吉林分行"
+				},
+				{
+					userName: "俞小凡",
+					score: 89,
+					dept: "吉林银行吉林分行"
+				},
+				{
+					userName: "江月心",
+					score: 10,
+					dept: "吉林银行吉林分行"
+				}
+			]
+		}
+		learnTimeList.value = tempList;
+		allChartsList.value = learnTimeList.value;
+		chartsList.value = tempList.annual;
+		console.log(chartsList.value, '1111111')
+		chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen;
+		console.log(chartsList.value, '222222')
+		myselfList.value = chartsList.value.filter(item => item.userId == userId)
+		console.log(myselfList.value, '3333')
+		myselfList.value[0].rank = "待定888888";
+		if (chartsList.value.length > 3) {
+			newChartsList.value = chartsList.value.slice(3).concat();
+		} else {
+			newChartsList.value = chartsList.value;
+		}
+		console.log(learnTimeList.value, 'learnTimeList')
+		//挡板数据代码
+		
+		getLeaderBoardStdyTmApi().then(res => {
+			console.log(res, 'getLeaderBoardStdyTmApi')
+			
+			//挡板数据代码
+			let tempList = {
+				annual: [{
+						userName: "江心",
+						score: 94,
+						dept: "吉林银行吉林分行",
+						userId: "USER001",
+						imgAddr: "/static/images/charts/avator.png"
+					},
+					{
+						userName: "李婉儿",
+						score: 98,
+						dept: "吉林银行吉林分行"
+					},
+					{
+						userName: "百里里",
+						score: 88,
+						dept: "吉林银行吉林分行"
+					},
+					{
+						userName: "黎明",
+						score: 94,
+						dept: "吉林银行吉林分行",
+						imgAddr: "/static/images/charts/avator.png"
+					},
+					{
+						userName: "张伟",
+						score: 91,
+						dept: "吉林银行吉林分行"
+					},
+					{
+						userName: "俞小凡",
+						score: 89,
+						dept: "吉林银行吉林分行"
+					},
+					{
+						userName: "黎明",
+						score: 94,
+						dept: "吉林银行吉林分行"
+					},
+					{
+						userName: "张伟",
+						score: 91,
+						dept: "吉林银行吉林分行"
+					},
+					{
+						userName: "俞小凡",
+						score: 89,
+						dept: "吉林银行吉林分行"
+					},
+					{
+						userName: "江月心",
+						score: 10,
+						dept: "吉林银行吉林分行"
+					}
+				]
+			}
+			learnTimeList.value = tempList;
+			allChartsList.value = learnTimeList.value;
+			chartsList.value = tempList.annual;
+			console.log(chartsList.value, '1111111')
+			chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen;
+			console.log(chartsList.value, '222222')
+			myselfList.value = chartsList.value.filter(item => item.userId == userId)
+			console.log(myselfList.value, '3333')
+
+			myselfList.value[0].rank = "待定888888";
+			//挡板数据代码
+
+
+			// learnTimeList.value = res.body || [];
+			// allChartsList.value = learnTimeList.value;
+			// chartsList.value = allChartsList.value.annual?allChartsList.value.annual:[];
+			// chartsList.value.score = learnTimeList.value.annual?learnTimeList.value.annual.annlStdyTmLen:"";
+			if (chartsList.value.length > 3) {
+				newChartsList.value = chartsList.value.slice(3).concat();
+			} else {
+				newChartsList.value = chartsList.value;
+			}
+			console.log(learnTimeList.value, 'learnTimeList')
+		})
+		getLeaderBoardPractCntApi().then(res => {
+			console.log(res, 'getLeaderBoardPractCntApi')
+			practCntList.value = res.body || [];
+			console.log(practCntList.value, 'practCntList')
+		})
+		getLeaderBoardExamCntApi().then(res => {
+			console.log(res, 'getLeaderBoardExamCntApi')
+			examCntList.value = res.body || [];
+			console.log(examCntList.value, 'examCntList')
+		})
+		getLeaderBoardCrsCntApi().then(res => {
+			console.log(res, 'getLeaderBoardCrsCntApi')
+			crsCntList.value = res.body || [];
+			console.log(crsCntList.value, 'crsCntList')
+		})
+
+	})
+</script>
+
+<style lang="scss" scoped>
+	$bg-margin-left: 50rpx;
+	.my_tabs {
+		// 解决这个圆角的图片，开穿透
+		:deep(.uv-tabs__wrapper__nav__line) {
+			height: 26rpx !important;
+			left: 70rpx;
+			background-size: 28rpx !important;
+			background-repeat: no-repeat !important;
+		}
+	}
+	.detail-body {
+		background: #ffffff;
+		border-radius: 15rpx;
+		z-index: 101;
+		overflow: hidden;
+
+		.body-tab {
+			height: 88rpx;
+			border-bottom: 1rpx solid #BBBBBB;
+		}
+
+		.body-tabs {
+			width: 100%;
+			height: 99rpx;
+			line-height: 96rpx;
+			border-bottom: 1rpx solid #BBBBBB;
+		}
+	}
+
+	.detail-main {
+		background-color: #F6F8FF;
+		overflow: hidden;
+	}
+
+	.title {
+		color: #000000;
+		font-size: 34rpx;
+		height: 34rpx;
+		font-weight: 600;
+		line-height: 34rpx;
+	}
+
+	.fixed_search_div {
+		padding: calc(20rpx + var(--status-bar-height)) 15rpx 24rpx 30rpx;
+		display: flex;
+		align-items: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #fff;
+
+		.back_div {
+			position: absolute;
+			left: 20rpx;
+			padding: 10rpx;
+
+			.back-icon {
+				position: relative;
+				width: 50rpx;
+				height: 50rpx;
+				cursor: pointer;
+				display: flex;
+				align-items: center;
+			}
+
+			.back-icon::before,
+			.back-icon::after {
+				content: '';
+				position: absolute;
+				transition: all 0.3s ease;
+			}
+
+			.back-icon::after {
+				top: 25%;
+				left: 25%;
+				width: 40%;
+				height: 40%;
+				border-top: 4rpx solid #000000;
+				border-left: 4rpx solid #000000;
+				transform: rotate(-45deg);
+			}
+		}
+	}
+
+	.date-body {
+		height: 114rpx;
+		line-height: 114rpx;
+	}
+
+	.date-sty {
+		margin-left: 32rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		display: inline-block;
+
+		.date-item-sty {
+			display: inline-block;
+			width: 56rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			color: #040404;
+			text-align: center;
+			font-size: 28rpx;
+			margin-left: 42rpx;
+			margin-right: 42rpx;
+		}
+
+		.active-date-item-sty {
+			display: inline-block;
+			width: 140rpx;
+			height: 60rpx;
+			color: #FFFFFF;
+			text-align: center;
+			font-size: 28rpx;
+			border-radius: 38rpx;
+			background-color: #4080FF;
+		}
+	}
+
+	// 墨刀样式
+	// .tabs-sty{
+	// 	font-size: 28rpx;
+	// 	font-weight: 600;
+	// 	display: flex;
+	// 	flex-direction: row;
+	// 	align-items: center;
+	// 	justify-content: center;
+	// 	position: relative;
+	// }
+	// .tabs-item-sty{
+	// 	width: 25%;
+	// 	text-align: center;
+	// 	height: 100rpx;
+	// 	justify-content: center;
+	// }
+	// .active-tabs-item-sty{
+	// 	color: #2572F0;
+	// 	width: 25%;
+	// 	text-align: center;
+	// 	background-color: #E6F7FF;
+	// 	border-bottom: 2px solid #2572F0;
+	// }
+	// 蓝湖样式
+	.tabs-sty {
+		font-size: 28rpx;
+		font-weight: 600;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+	}
+
+	.tabs-item-sty {
+		color: #999999;
+		font-weight: 500;
+		width: 25%;
+		text-align: center;
+		height: 100rpx;
+	}
+
+	.active-tabs-item-sty {
+		position: relative;
+		font-size: 30rpx;
+		color: #333333;
+		font-weight: 600;
+		width: 25%;
+		text-align: center;
+	}
+
+	.active-tabs-item-sty::after {
+		content: "";
+		position: absolute;
+		width: 90rpx;
+		height: 1rpx;
+		border-bottom: 4rpx solid #4080FF;
+		top: 91rpx;
+		left: 25%;
+	}
+
+	.uni-table th {
+		border: none;
+	}
+
+	.uni-table td {
+		// border: none;
+	}
+
+	.rank-style {
+		width: 100%;
+
+		.rank-top3 {
+			background-color: #FFFFFF;
+			padding: 0 32rpx 36rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.rank-content {
+				text-align: center;
+				border-radius: 32rpx;
+				padding-top: 24rpx;
+				position: relative;
+
+				.crown1 {
+					width: 32rpx;
+					height: 24rpx;
+					position: absolute;
+					top: 10rpx;
+					left: 130rpx;
+				}
+
+				.crown2 {
+					width: 32rpx;
+					height: 24rpx;
+					position: absolute;
+					top: 10rpx;
+					left: 140rpx;
+				}
+
+				.crown3 {
+					width: 32rpx;
+					height: 24rpx;
+					position: absolute;
+					top: 16rpx;
+					left: 130rpx;
+				}
+
+				.top-avator {
+					width: 158rpx;
+					height: 158rpx;
+				}
+
+				.content1 {
+					font-size: 28rpx;
+					color: #737FA6;
+					font-weight: 500;
+				}
+
+				.content11 {
+					font-size: 28rpx;
+					color: #AFA455;
+					font-weight: 500;
+				}
+
+				.content111 {
+					font-size: 28rpx;
+					color: #B07653;
+					font-weight: 500;
+				}
+
+				.content2 {
+					font-size: 32rpx;
+					color: #000000;
+					font-weight: 700;
+				}
+
+				.content3 {
+					font-size: 28rpx;
+					color: #436197;
+					font-weight: 600;
+				}
+
+				.content33 {
+					font-size: 28rpx;
+					color: #986C1A;
+					font-weight: 600;
+				}
+
+				.content333 {
+					font-size: 28rpx;
+					color: #8A4815;
+					font-weight: 600;
+				}
+
+				.content4 {
+					font-size: 24rpx;
+					color: #6682B7;
+					font-weight: 400;
+					width: 158rpx;
+					margin: 0 auto;
+				}
+
+				.content44 {
+					font-size: 24rpx;
+					color: #986C1A;
+					font-weight: 400;
+					width: 158rpx;
+					margin: 0 auto;
+				}
+
+				.content444 {
+					font-size: 24rpx;
+					color: #986C1A;
+					font-weight: 400;
+					width: 158rpx;
+					margin: 0 auto;
+				}
+			}
+
+			.rank-content-backgound-color1 {
+				margin-top: 32rpx;
+				width: 206rpx;
+				height: 418rpx;
+				background-color: #E8F3FF;
+			}
+
+			.rank-content-backgound-color2 {
+				width: 220rpx;
+				height: 432rpx;
+				background: linear-gradient(180deg, #FEEFB7 0%, #FADB66 100%);
+			}
+
+			.rank-content-backgound-color3 {
+				margin-top: 42rpx;
+				width: 206rpx;
+				height: 418rpx;
+				background: linear-gradient(180deg, #FCDAB7 0%, #F9B16C 100%);
+			}
+		}
+	}
+
+	.rank-other {
+		width: 100%;
+
+		:deep(.uni-table) {
+			min-width: 0 !important;
+		}
+
+		.rank-uni-sty {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #999999;
+		}
+
+		.rank-other-rank-sty {
+			width: 20%;
+			text-align: center;
+		}
+
+		.rank-other-user-sty {
+			width: 50%;
+		}
+
+		.rank-other-last-sty {
+			width: 30%;
+			text-align: center;
+		}
+
+		.rank-sty {
+			font-size: 40rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+
+		.active-rank-sty {
+			font-size: 40rpx;
+			font-weight: 600;
+			color: #0066FF;
+		}
+
+		.score-sty {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+
+		.score-sty-footer {
+			width: 30%;
+			text-align: center;
+			margin-top: 15rpx
+		}
+
+		.avator {
+			width: 80rpx;
+			height: 80rpx;
+			float: left;
+		}
+
+		.name {
+			font-size: 30rpx;
+			font-weight: 600;
+			text-align: left;
+			color: #000000;
+		}
+
+		.active-name {
+			font-size: 30rpx;
+			font-weight: 600;
+			text-align: left;
+			color: #0066FF;
+		}
+
+		.belong {
+			font-size: 26rpx;
+			text-align: left;
+			font-weight: 400;
+			color: #999999;
+		}
+
+		:deep(.uni-table-th-content) {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #999999;
+		}
+	}
+
+	.rank-mine {
+		width: 100%;
+		height: 176rpx;
+		background-color: #f5f9ff !important;
+		box-shadow: 0rpx 1rpx 0rpx 0rpx #EFEFEF;
+		position: fixed;
+		bottom: 0;
+
+		.rank-mine-content {
+			width: 100%;
+			margin-left: 46rpx;
+			margin-top: 14rpx;
+
+			.my-avator {
+				width: 80rpx;
+				height: 80rpx;
+				float: left;
+				margin-right: 18rpx;
+			}
+		}
+		:deep(.uni-list-item__container) {
+			align-items: center;
+			height: 100%;
+		}
+		.my-rank-title {
+			position: absolute;
+			width: 20%;
+			top: 16rpx;
+			left: 32rpx;
+			text-align: center;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #999999;
+		}
+
+		.my-rank-content {
+			width: 20%;
+			text-align: center;
+			font-size: 40rpx;
+			color: #0066FF;
+			font-style: italic;
+			font-weight: 600;
+			margin-top: 15rpx
+		}
+
+		.my-rank-name {
+			font-size: 30rpx;
+			font-weight: 600;
+			color: #000000;
+			text-align: left;
+		}
+
+		.my-rank-belong {
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #999999;
+		}
+
+		.my-rank-score {
+			width: 30%;
+			text-align: center;
+			font-size: 32rpx;
+			text-align: center;
+			color: #333333;
+			font-weight: 600;
+			margin-top: 15rpx;
+		}
+	}
+</style>
diff --git a/src/static/images/charts/01.svg b/src/static/images/charts/01.svg
new file mode 100644
index 00000000..262985af
--- /dev/null
+++ b/src/static/images/charts/01.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="194px" height="175px" viewBox="0 0 194 175" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>01</title>
+    <g id="教培-后管" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="01" fill="#FFB800" fill-rule="nonzero">
+            <path d="M171.857648,114.858363 L122.119529,174.114571 L6.26580896e-15,103.612374 L26.4554078,30.9088131 C20.2676729,25.8867427 18.6400822,17.115952 22.6140044,10.2081886 C25.5201119,5.17372566 30.8913201,2.07207997 36.7043466,2.07161146 C42.5173732,2.07114294 47.8890812,5.17192276 50.7960002,10.2059172 C53.7029193,15.2399116 53.7034192,21.4423371 50.7973116,26.4768001 C48.8688346,29.7838905 45.8274173,32.2976444 42.2163878,33.5689971 L59.6515753,64.2270075 L109.55077,31.2797745 C106.198036,24.7447391 106.391039,16.954779 110.063282,10.5937934 C116.137498,0.399782423 129.274535,-3.02311561 139.550908,2.91069558 C149.827281,8.84450678 153.430061,21.9333547 147.637771,32.2901563 C143.965861,38.6500231 137.317611,42.712128 129.982935,43.0773244 L126.400229,102.767948 L161.665971,102.533657 C160.961993,98.7703139 161.61944,94.8792657 163.520778,91.556127 C166.427757,86.5225359 171.799306,83.4221609 177.612014,83.4228834 C183.424721,83.4236059 188.795499,86.5253161 191.701227,91.5596298 C194.606955,96.5939435 194.606184,102.796029 191.699204,107.82962 C187.70604,114.723799 179.300199,117.701514 171.857648,114.858363 Z" id="路径"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/static/images/charts/02.svg b/src/static/images/charts/02.svg
new file mode 100644
index 00000000..d8bf43d3
--- /dev/null
+++ b/src/static/images/charts/02.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="194px" height="175px" viewBox="0 0 194 175" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>02</title>
+    <g id="教培-后管" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="02" fill="#A8C3D6" fill-rule="nonzero">
+            <path d="M171.857648,114.858363 L122.119529,174.114571 L6.26580896e-15,103.612374 L26.4554078,30.9088131 C20.2676729,25.8867427 18.6400822,17.115952 22.6140044,10.2081886 C25.5201119,5.17372566 30.8913201,2.07207997 36.7043466,2.07161146 C42.5173732,2.07114294 47.8890812,5.17192276 50.7960002,10.2059172 C53.7029193,15.2399116 53.7034192,21.4423371 50.7973116,26.4768001 C48.8688346,29.7838905 45.8274173,32.2976444 42.2163878,33.5689971 L59.6515753,64.2270075 L109.55077,31.2797745 C106.198036,24.7447391 106.391039,16.954779 110.063282,10.5937934 C116.137498,0.399782423 129.274535,-3.02311561 139.550908,2.91069558 C149.827281,8.84450678 153.430061,21.9333547 147.637771,32.2901563 C143.965861,38.6500231 137.317611,42.712128 129.982935,43.0773244 L126.400229,102.767948 L161.665971,102.533657 C160.961993,98.7703139 161.61944,94.8792657 163.520778,91.556127 C166.427757,86.5225359 171.799306,83.4221609 177.612014,83.4228834 C183.424721,83.4236059 188.795499,86.5253161 191.701227,91.5596298 C194.606955,96.5939435 194.606184,102.796029 191.699204,107.82962 C187.70604,114.723799 179.300199,117.701514 171.857648,114.858363 Z" id="路径"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/static/images/charts/03.svg b/src/static/images/charts/03.svg
new file mode 100644
index 00000000..47ab1271
--- /dev/null
+++ b/src/static/images/charts/03.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="194px" height="175px" viewBox="0 0 194 175" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>03</title>
+    <g id="教培-后管" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="03" fill="#EB9750" fill-rule="nonzero">
+            <path d="M171.857648,114.858363 L122.119529,174.114571 L6.26580896e-15,103.612374 L26.4554078,30.9088131 C20.2676729,25.8867427 18.6400822,17.115952 22.6140044,10.2081886 C25.5201119,5.17372566 30.8913201,2.07207997 36.7043466,2.07161146 C42.5173732,2.07114294 47.8890812,5.17192276 50.7960002,10.2059172 C53.7029193,15.2399116 53.7034192,21.4423371 50.7973116,26.4768001 C48.8688346,29.7838905 45.8274173,32.2976444 42.2163878,33.5689971 L59.6515753,64.2270075 L109.55077,31.2797745 C106.198036,24.7447391 106.391039,16.954779 110.063282,10.5937934 C116.137498,0.399782423 129.274535,-3.02311561 139.550908,2.91069558 C149.827281,8.84450678 153.430061,21.9333547 147.637771,32.2901563 C143.965861,38.6500231 137.317611,42.712128 129.982935,43.0773244 L126.400229,102.767948 L161.665971,102.533657 C160.961993,98.7703139 161.61944,94.8792657 163.520778,91.556127 C166.427757,86.5225359 171.799306,83.4221609 177.612014,83.4228834 C183.424721,83.4236059 188.795499,86.5253161 191.701227,91.5596298 C194.606955,96.5939435 194.606184,102.796029 191.699204,107.82962 C187.70604,114.723799 179.300199,117.701514 171.857648,114.858363 Z" id="路径"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/static/images/charts/avator.png b/src/static/images/charts/avator.png
new file mode 100644
index 0000000000000000000000000000000000000000..03b34b96580130020b96d2181e029140c4885fa2
GIT binary patch
literal 12840
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
GLSTYtj+#LL

literal 0
HcmV?d00001

diff --git a/src/uni_modules/uni-list/changelog.md b/src/uni_modules/uni-list/changelog.md
new file mode 100644
index 00000000..ddf45a47
--- /dev/null
+++ b/src/uni_modules/uni-list/changelog.md
@@ -0,0 +1,48 @@
+## 1.2.15（2025-01-08）
+- 修复 示例中过期图片地址
+## 1.2.14（2023-04-14）
+- 优化 uni-list-chat 具名插槽`header` 非app端套一层元素，方便使用时通过外层元素定位实现样式修改
+## 1.2.13（2023-03-03）
+- uni-list-chat 新增 支持具名插槽`header`
+## 1.2.12（2023-02-01）
+- 新增 列表图标新增 customPrefix 属性 ，用法 [详见](https://uniapp.dcloud.net.cn/component/uniui/uni-icons.html#icons-props)
+## 1.2.11（2023-01-31）
+- 修复 无反馈效果呈现的bug
+## 1.2.9（2022-11-22）
+- 修复 uni-list-chat 在vue3下跳转报错的bug
+## 1.2.8（2022-11-21）
+- 修复 uni-list-chat avatar属性 值为本地路径时错误的问题
+## 1.2.7（2022-11-21）
+- 修复 uni-list-chat avatar属性 在腾讯云版uniCloud下错误的问题
+## 1.2.6（2022-11-18）
+- 修复 uni-list-chat note属性 支持：“草稿”字样功能 文本少1位的问题
+## 1.2.5（2022-11-15）
+- 修复 uni-list-item 的 customStyle 属性 padding值在 H5端 无效的bug
+## 1.2.4（2022-11-15）
+- 修复 uni-list-item 的 customStyle 属性 padding值在nvue（vue2）下无效的bug
+## 1.2.3（2022-11-14）
+- uni-list-chat 新增 avatar 支持 fileId
+## 1.2.2（2022-11-11）
+- uni-list 新增属性 render-reverse 详情参考：[https://uniapp.dcloud.net.cn/component/list.html](https://uniapp.dcloud.net.cn/component/list.html)
+- uni-list-chat note属性 支持：“草稿”字样 加红显示 详情参考uni-im：[https://ext.dcloud.net.cn/plugin?name=uni-im](https://ext.dcloud.net.cn/plugin?name=uni-im)
+- uni-list-item 新增属性 customStyle 支持设置padding、backgroundColor
+## 1.2.1（2022-03-30）
+- 删除无用文件
+## 1.2.0（2021-11-23）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-list](https://uniapp.dcloud.io/component/uniui/uni-list)
+## 1.1.3（2021-08-30）
+- 修复 在vue3中to属性在发行应用的时候报错的bug
+## 1.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.1（2021-07-21）
+- 修复 与其他组件嵌套使用时，点击失效的Bug
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.17（2021-05-12）
+- 新增 组件示例地址
+## 1.0.16（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.15（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 uni-list-chat 角标显示不正常的问题
diff --git a/src/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue b/src/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
new file mode 100644
index 00000000..b9349c29
--- /dev/null
+++ b/src/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
@@ -0,0 +1,107 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+		<view class="uni-list-ad">
+			<view v-if="borderShow" :class="{'uni-list--border':border,'uni-list-item--first':isFirstChild}"></view>
+			<ad style="width: 200px;height: 300px;border-width: 1px;border-color: red;border-style: solid;" adpid="1111111111"
+			 unit-id="" appid="" apid="" type="feed" @error="aderror" @close="closeAd"></ad>
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+	export default {
+		name: 'UniListAd',
+		props: {
+			title: {
+				type: String,
+				default: '',
+
+			}
+		},
+		// inject: ['list'],
+		data() {
+			return {
+				isFirstChild: false,
+				border: false,
+				borderShow: true,
+			}
+		},
+
+		mounted() {
+			this.list = this.getForm()
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true
+					this.isFirstChild = true
+				}
+				this.border = this.list.border
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			aderror(e) {
+				console.log("aderror: " + JSON.stringify(e.detail));
+			},
+			closeAd(e) {
+				this.borderShow = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-list-ad {
+		position: relative;
+		border: 1px red solid;
+	}
+
+	.uni-list--border {
+		position: relative;
+		padding-bottom: 1px;
+		/* #ifdef APP-PLUS */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+		margin-left: $uni-spacing-row-lg;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(.5);
+		transform: scaleY(.5);
+		background-color: $uni-border-color;
+	}
+
+	.uni-list-item--first:after {
+		height: 0px;
+	}
+
+	/* #endif */
+</style>
diff --git a/src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss b/src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
new file mode 100644
index 00000000..311f8d9f
--- /dev/null
+++ b/src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
@@ -0,0 +1,58 @@
+/**
+ * 这里是 uni-list 组件内置的常用样式变量
+ * 如果需要覆盖样式，这里提供了基本的组件样式变量，您可以尝试修改这里的变量，去完成样式替换，而不用去修改源码
+ *
+ */
+
+// 背景色
+$background-color : #fff;
+// 分割线颜色
+$divide-line-color : #e5e5e5;
+
+// 默认头像大小，如需要修改此值，注意同步修改 js 中的值 const avatarWidth = xx ，目前只支持方形头像
+// nvue 页面不支持修改头像大小
+$avatar-width : 45px ;
+
+// 头像边框
+$avatar-border-radius: 5px;
+$avatar-border-color: #eee;
+$avatar-border-width: 1px;
+
+// 标题文字样式
+$title-size : 16px;
+$title-color : #3b4144;
+$title-weight : normal;
+
+// 描述文字样式
+$note-size : 12px;
+$note-color : #999;
+$note-weight : normal;
+
+// 右侧额外内容默认样式
+$right-text-size : 12px;
+$right-text-color : #999;
+$right-text-weight : normal;
+
+// 角标样式
+// nvue 页面不支持修改圆点位置以及大小
+// 角标在左侧时，角标的位置，默认为 0 ，负数左/下移动，正数右/上移动
+$badge-left: 0px;
+$badge-top: 0px;
+
+// 显示圆点时，圆点大小
+$dot-width: 10px;
+$dot-height: 10px;
+
+// 显示角标时，角标大小和字体大小
+$badge-size : 18px;
+$badge-font : 12px;
+// 显示角标时，角标前景色
+$badge-color : #fff;
+// 显示角标时，角标背景色
+$badge-background-color : #ff5a5f;
+// 显示角标时，角标左右间距
+$badge-space : 6px;
+
+// 状态样式
+// 选中颜色
+$hover : #f5f5f5;
diff --git a/src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue b/src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
new file mode 100644
index 00000000..d49fd7c7
--- /dev/null
+++ b/src/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
@@ -0,0 +1,593 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+		<view :hover-class="!clickable && !link ? '' : 'uni-list-chat--hover'" class="uni-list-chat" @click.stop="onClick">
+			<view :class="{ 'uni-list--border': border, 'uni-list-chat--first': isFirstChild }"></view>
+			<view class="uni-list-chat__container">
+				<view class="uni-list-chat__header-warp">
+					<view v-if="avatarCircle || avatarList.length === 0" class="uni-list-chat__header" :class="{ 'header--circle': avatarCircle }">
+						<image class="uni-list-chat__header-image" :class="{ 'header--circle': avatarCircle }" :src="avatarUrl" mode="aspectFill"></image>
+					</view>
+					<!-- 头像组 -->
+					<view v-else class="uni-list-chat__header">
+						<view v-for="(item, index) in avatarList" :key="index" class="uni-list-chat__header-box" :class="computedAvatar"
+						 :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }">
+							<image class="uni-list-chat__header-image" :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }" :src="item.url"
+							 mode="aspectFill"></image>
+						</view>
+					</view>
+				</view>
+				<!-- #ifndef APP -->
+				<view class="slot-header">
+				<!-- #endif -->
+					<slot name="header"></slot>
+				<!-- #ifndef APP -->
+				</view>
+				<!-- #endif -->
+				<view v-if="badgeText && badgePositon === 'left'" class="uni-list-chat__badge uni-list-chat__badge-pos" :class="[isSingle]">
+					<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
+				</view>
+				<view class="uni-list-chat__content">
+					<view class="uni-list-chat__content-main">
+						<text class="uni-list-chat__content-title uni-ellipsis">{{ title }}</text>
+						<view style="flex-direction: row;">
+							<text class="draft" v-if="isDraft">[草稿]</text>
+							<text class="uni-list-chat__content-note uni-ellipsis">{{isDraft?note.slice(14):note}}</text>
+						</view>
+					</view>
+					<view class="uni-list-chat__content-extra">
+						<slot>
+							<text class="uni-list-chat__content-extra-text">{{ time }}</text>
+							<view v-if="badgeText && badgePositon === 'right'" class="uni-list-chat__badge" :class="[isSingle, badgePositon === 'right' ? 'uni-list-chat--right' : '']">
+								<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
+							</view>
+						</slot>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+</template>
+
+<script>
+	// 头像大小
+	const avatarWidth = 45;
+
+	/**
+	 * ListChat 聊天列表
+	 * @description 聊天列表,用于创建聊天类列表
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+	 * @property {String} 	title 							标题
+	 * @property {String} 	note 							描述
+	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈，默认为false
+	 * @property {String} 	badgeText						数字角标内容
+	 * @property {String}  	badgePositon = [left|right]		角标位置，默认为 right
+	 * @property {String} 	link = [false｜navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈，默认为false
+	 *  @value false	 	不开启
+	 *  @value navigateTo 	同 uni.navigateTo()
+	 * 	@value redirectTo 	同 uni.redirectTo()
+	 * 	@value reLaunch   	同 uni.reLaunch()
+	 * 	@value switchTab  	同 uni.switchTab()
+	 * @property {String | PageURIString} 	to  			跳转目标页面
+	 * @property {String} 	time							右侧时间显示
+	 * @property {Boolean} 	avatarCircle = [true|false]		是否显示圆形头像，默认为false
+	 * @property {String} 	avatar							头像地址，avatarCircle 不填时生效
+	 * @property {Array} 	avatarList 						头像组，格式为 [{url:''}]
+	 * @event {Function} 	click 							点击 uniListChat 触发事件
+	 */
+	export default {
+		name: 'UniListChat',
+		emits:['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			note: {
+				type: String,
+				default: ''
+			},
+			clickable: {
+				type: Boolean,
+				default: false
+			},
+			link: {
+				type: [Boolean, String],
+				default: false
+			},
+			to: {
+				type: String,
+				default: ''
+			},
+			badgeText: {
+				type: [String, Number],
+				default: ''
+			},
+			badgePositon: {
+				type: String,
+				default: 'right'
+			},
+			time: {
+				type: String,
+				default: ''
+			},
+			avatarCircle: {
+				type: Boolean,
+				default: false
+			},
+			avatar: {
+				type: String,
+				default: ''
+			},
+			avatarList: {
+				type: Array,
+				default () {
+					return [];
+				}
+			}
+		},
+		// inject: ['list'],
+		computed: {
+			isDraft(){
+				return this.note.slice(0,14) == '[uni-im-draft]'
+			},
+			isSingle() {
+				if (this.badgeText === 'dot') {
+					return 'uni-badge--dot';
+				} else {
+					const badgeText = this.badgeText.toString();
+					if (badgeText.length > 1) {
+						return 'uni-badge--complex';
+					} else {
+						return 'uni-badge--single';
+					}
+				}
+			},
+			computedAvatar() {
+				if (this.avatarList.length > 4) {
+					this.imageWidth = avatarWidth * 0.31;
+					return 'avatarItem--3';
+				} else if (this.avatarList.length > 1) {
+					this.imageWidth = avatarWidth * 0.47;
+					return 'avatarItem--2';
+				} else {
+					this.imageWidth = avatarWidth;
+					return 'avatarItem--1';
+				}
+			}
+		},
+		watch: {
+			avatar:{
+				handler(avatar) {
+					if(avatar.substr(0,8) == 'cloud://'){
+						uniCloud.getTempFileURL({
+							fileList: [avatar]
+						}).then(res=>{
+							// console.log(res);
+							// 兼容uniCloud私有化部署
+							let fileList = res.fileList || res.result.fileList
+							this.avatarUrl = fileList[0].tempFileURL
+						})
+					}else{
+						this.avatarUrl = avatar
+					}
+				},
+				immediate: true
+			}
+		},
+		data() {
+			return {
+				isFirstChild: false,
+				border: true,
+				// avatarList: 3,
+				imageWidth: 50,
+				avatarUrl:''
+			};
+		},
+		mounted() {
+			this.list = this.getForm()
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true;
+					this.isFirstChild = true;
+				}
+				this.border = this.list.border;
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			onClick() {
+				if (this.to !== '') {
+					this.openPage();
+					return;
+				}
+
+				if (this.clickable || this.link) {
+					this.$emit('click', {
+						data: {}
+					});
+				}
+			},
+			openPage() {
+				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
+					this.pageApi(this.link);
+				} else {
+					this.pageApi('navigateTo');
+				}
+			},
+			pageApi(api) {
+				let callback = {
+					url: this.to,
+					success: res => {
+						this.$emit('click', {
+							data: res
+						});
+					},
+					fail: err => {
+						this.$emit('click', {
+							data: err
+						});
+					}
+				}
+				switch (api) {
+					case 'navigateTo':
+						uni.navigateTo(callback)
+						break
+					case 'redirectTo':
+						uni.redirectTo(callback)
+						break
+					case 'reLaunch':
+						uni.reLaunch(callback)
+						break
+					case 'switchTab':
+						uni.switchTab(callback)
+						break
+					default:
+					uni.navigateTo(callback)
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	$uni-font-size-lg:16px;
+	$uni-spacing-row-sm: 5px;
+	$uni-spacing-row-base: 10px;
+	$uni-spacing-row-lg: 15px;
+	$background-color: #fff;
+	$divide-line-color: #e5e5e5;
+	$avatar-width: 45px;
+	$avatar-border-radius: 5px;
+	$avatar-border-color: #eee;
+	$avatar-border-width: 1px;
+	$title-size: 16px;
+	$title-color: #3b4144;
+	$title-weight: normal;
+	$note-size: 12px;
+	$note-color: #999;
+	$note-weight: normal;
+	$right-text-size: 12px;
+	$right-text-color: #999;
+	$right-text-weight: normal;
+	$badge-left: 0px;
+	$badge-top: 0px;
+	$dot-width: 10px;
+	$dot-height: 10px;
+	$badge-size: 18px;
+	$badge-font: 12px;
+	$badge-color: #fff;
+	$badge-background-color: #ff5a5f;
+	$badge-space: 6px;
+	$hover: #f5f5f5;
+
+	.uni-list-chat {
+		font-size: $uni-font-size-lg;
+		position: relative;
+		flex-direction: column;
+		justify-content: space-between;
+		background-color: $background-color;
+	}
+
+	// .uni-list-chat--disabled {
+	// 	opacity: 0.3;
+	// }
+
+	.uni-list-chat--hover {
+		background-color: $hover;
+	}
+
+	.uni-list--border {
+		position: relative;
+		margin-left: $uni-spacing-row-lg;
+		/* #ifdef APP-PLUS */
+		border-top-color: $divide-line-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $divide-line-color;
+	}
+
+	.uni-list-item--first:after {
+		height: 0px;
+	}
+
+	/* #endif */
+
+	.uni-list-chat--first {
+		border-top-width: 0px;
+	}
+
+	.uni-ellipsis {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+	}
+
+	.uni-ellipsis-2 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		/* #endif */
+
+		/* #ifdef APP-NVUE */
+		lines: 2;
+		/* #endif */
+	}
+
+	.uni-list-chat__container {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		padding: $uni-spacing-row-base $uni-spacing-row-lg;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__header-warp {
+		position: relative;
+	}
+
+	.uni-list-chat__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		align-content: center;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		flex-wrap: wrap-reverse;
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+
+		border-radius: $avatar-border-radius;
+		border-color: $avatar-border-color;
+		border-width: $avatar-border-width;
+		border-style: solid;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__header-box {
+		/* #ifndef APP-PLUS */
+		box-sizing: border-box;
+		display: flex;
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		overflow: hidden;
+		border-radius: 2px;
+	}
+
+	.uni-list-chat__header-image {
+		margin: 1px;
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list-chat__header-image {
+		display: block;
+		width: 100%;
+		height: 100%;
+	}
+
+	.avatarItem--1 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.avatarItem--2 {
+		width: 47%;
+		height: 47%;
+	}
+
+	.avatarItem--3 {
+		width: 32%;
+		height: 32%;
+	}
+
+	/* #endif */
+	.header--circle {
+		border-radius: 50%;
+	}
+
+	.uni-list-chat__content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		overflow: hidden;
+		padding: 2px 0;
+	}
+
+	.uni-list-chat__content-main {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: space-between;
+		padding-left: $uni-spacing-row-base;
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__content-title {
+		font-size: $title-size;
+		color: $title-color;
+		font-weight: $title-weight;
+		overflow: hidden;
+	}
+
+	.draft ,.uni-list-chat__content-note {
+		margin-top: 3px;
+		color: $note-color;
+		font-size: $note-size;
+		font-weight: $title-weight;
+		overflow: hidden;
+	}
+	.draft{
+		color: #eb3a41;
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		/* #endif */
+		padding-right: 3px;
+	}
+
+	.uni-list-chat__content-extra {
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: flex-end;
+		margin-left: 5px;
+	}
+
+	.uni-list-chat__content-extra-text {
+		color: $right-text-color;
+		font-size: $right-text-size;
+		font-weight: $right-text-weight;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__badge-pos {
+		position: absolute;
+		/* #ifdef APP-NVUE */
+		left: 55px;
+		top: 3px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		left: calc(#{$avatar-width} + 10px - #{$badge-space} + #{$badge-left});
+		top: calc(#{$uni-spacing-row-base}/ 2 + 1px + #{$badge-top});
+		/* #endif */
+	}
+
+	.uni-list-chat__badge {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		border-radius: 100px;
+		background-color: $badge-background-color;
+	}
+
+	.uni-list-chat__badge-text {
+		color: $badge-color;
+		font-size: $badge-font;
+	}
+
+	.uni-badge--single {
+		/* #ifndef APP-NVUE */
+		// left: calc(#{$avatar-width} + 7px + #{$badge-left});
+		/* #endif */
+		width: $badge-size;
+		height: $badge-size;
+	}
+
+	.uni-badge--complex {
+		/* #ifdef APP-NVUE */
+		left: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		height: $badge-size;
+		padding: 0 $badge-space;
+	}
+
+	.uni-badge--dot {
+		/* #ifdef APP-NVUE */
+		left: 60px;
+		top: 6px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		left: calc(#{$avatar-width} + 15px - #{$dot-width}/ 2 + 1px + #{$badge-left});
+		/* #endif */
+		width: $dot-width;
+		height: $dot-height;
+		padding: 0;
+	}
+
+	.uni-list-chat--right {
+		/* #ifdef APP-NVUE */
+		left: 0;
+		/* #endif */
+	}
+</style>
diff --git a/src/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/src/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
new file mode 100644
index 00000000..6402508b
--- /dev/null
+++ b/src/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
@@ -0,0 +1,534 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell :keep-scroll-position="keepScrollPosition">
+		<!-- #endif -->
+		<view :class="{ 'uni-list-item--disabled': disabled }" :style="{'background-color':customStyle.backgroundColor}"
+			:hover-class="(!clickable && !link) || disabled || showSwitch ? '' : 'uni-list-item--hover'"
+			class="uni-list-item" @click="onClick">
+			<view v-if="!isFirstChild" class="border--left" :class="{ 'uni-list--border': border }"></view>
+			<view class="uni-list-item__container"
+				:class="{ 'container--right': showArrow || link, 'flex--direction': direction === 'column'}"
+				:style="{paddingTop:padding.top,paddingLeft:padding.left,paddingRight:padding.right,paddingBottom:padding.bottom}">
+				<slot name="header">
+					<view class="uni-list-item__header">
+						<view v-if="thumb" class="uni-list-item__icon">
+							<image :src="thumb" class="uni-list-item__icon-img" :class="['uni-list--' + thumbSize]" />
+						</view>
+						<view v-else-if="showExtraIcon" class="uni-list-item__icon">
+							<uni-icons :customPrefix="extraIcon.customPrefix" :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" />
+						</view>
+					</view>
+				</slot>
+				<slot name="body">
+					<view class="uni-list-item__content"
+						:class="{ 'uni-list-item__content--center': thumb || showExtraIcon || showBadge || showSwitch }">
+						<text v-if="title" class="uni-list-item__content-title"
+							:class="[ellipsis !== 0 && ellipsis <= 2 ? 'uni-ellipsis-' + ellipsis : '']">{{ title }}</text>
+						<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
+					</view>
+				</slot>
+				<slot name="footer">
+					<view v-if="rightText || showBadge || showSwitch" class="uni-list-item__extra"
+						:class="{ 'flex--justify': direction === 'column' }">
+						<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
+						<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" :custom-style="badgeStyle" />
+						<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked"
+							@change="onSwitchChange" />
+					</view>
+				</slot>
+			</view>
+			<uni-icons v-if="showArrow || link" :size="16" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * ListItem 列表子组件
+	 * @description 列表子组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+	 * @property {String} 	title 							标题
+	 * @property {String} 	note 							描述
+	 * @property {String} 	thumb 							左侧缩略图，若thumb有值，则不会显示扩展图标
+	 * @property {String}  	thumbSize = [lg|base|sm]		略缩图大小
+	 * 	@value 	 lg			大图
+	 * 	@value 	 base		一般
+	 * 	@value 	 sm			小图
+	 * @property {String} 	badgeText						数字角标内容
+	 * @property {String} 	badgeType 						数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
+	 * @property {Object}   badgeStyle           数字角标样式
+	 * @property {String} 	rightText 						右侧文字内容
+	 * @property {Boolean} 	disabled = [true|false]			是否禁用
+	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈
+	 * @property {String} 	link = [navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈
+	 *  @value 	navigateTo 	同 uni.navigateTo()
+	 * 	@value redirectTo 	同 uni.redirectTo()
+	 * 	@value reLaunch   	同 uni.reLaunch()
+	 * 	@value switchTab  	同 uni.switchTab()
+	 * @property {String | PageURIString} 	to  			跳转目标页面
+	 * @property {Boolean} 	showBadge = [true|false] 		是否显示数字角标
+	 * @property {Boolean} 	showSwitch = [true|false] 		是否显示Switch
+	 * @property {Boolean} 	switchChecked = [true|false] 	Switch是否被选中
+	 * @property {Boolean} 	showExtraIcon = [true|false] 	左侧是否显示扩展图标
+	 * @property {Object} 	extraIcon 						扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
+	 * @property {String} 	direction = [row|column]		排版方向
+	 * @value row 			水平排列
+	 * @value column 		垂直排列
+	 * @event {Function} 	click 							点击 uniListItem 触发事件
+	 * @event {Function} 	switchChange 					点击切换 Switch 时触发
+	 */
+	export default {
+		name: 'UniListItem',
+		emits: ['click', 'switchChange'],
+		props: {
+			direction: {
+				type: String,
+				default: 'row'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			note: {
+				type: String,
+				default: ''
+			},
+			ellipsis: {
+				type: [Number, String],
+				default: 0
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			clickable: {
+				type: Boolean,
+				default: false
+			},
+			showArrow: {
+				type: [Boolean, String],
+				default: false
+			},
+			link: {
+				type: [Boolean, String],
+				default: false
+			},
+			to: {
+				type: String,
+				default: ''
+			},
+			showBadge: {
+				type: [Boolean, String],
+				default: false
+			},
+			showSwitch: {
+				type: [Boolean, String],
+				default: false
+			},
+			switchChecked: {
+				type: [Boolean, String],
+				default: false
+			},
+			badgeText: {
+				type: String,
+				default: ''
+			},
+			badgeType: {
+				type: String,
+				default: 'success'
+			},
+			badgeStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			rightText: {
+				type: String,
+				default: ''
+			},
+			thumb: {
+				type: String,
+				default: ''
+			},
+			thumbSize: {
+				type: String,
+				default: 'base'
+			},
+			showExtraIcon: {
+				type: [Boolean, String],
+				default: false
+			},
+			extraIcon: {
+				type: Object,
+				default () {
+					return {
+						type: '',
+						color: '#000000',
+						size: 20,
+						customPrefix: ''
+					};
+				}
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			customStyle: {
+				type: Object,
+				default () {
+					return {
+						padding: '',
+						backgroundColor: '#FFFFFF'
+					}
+				}
+			},
+			keepScrollPosition: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			'customStyle.padding': {
+				handler(padding) {
+					if(typeof padding == 'number'){
+						padding += ''
+					}
+					let paddingArr = padding.split(' ')
+					if (paddingArr.length === 1) {
+						const allPadding = paddingArr[0]
+						this.padding = {
+							"top": allPadding,
+							"right": allPadding,
+							"bottom": allPadding,
+							"left": allPadding
+						}
+					} else if (paddingArr.length === 2) {
+						const [verticalPadding, horizontalPadding] = paddingArr;
+						this.padding = {
+							"top": verticalPadding,
+							"right": horizontalPadding,
+							"bottom": verticalPadding,
+							"left": horizontalPadding
+						}
+					} else if (paddingArr.length === 4) {
+							const [topPadding, rightPadding, bottomPadding, leftPadding] = paddingArr;
+							this.padding = {
+								"top": topPadding,
+								"right": rightPadding,
+								"bottom": bottomPadding,
+								"left": leftPadding
+							}
+					}
+				},
+				immediate: true
+			}
+		},
+		// inject: ['list'],
+		data() {
+			return {
+				isFirstChild: false,
+				padding: {
+					top: "",
+					right: "",
+					bottom: "",
+					left: ""
+				}
+			};
+		},
+		mounted() {
+			this.list = this.getForm()
+			// 判断是否存在 uni-list 组件
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true;
+					this.isFirstChild = true;
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			onClick() {
+				if (this.to !== '') {
+					this.openPage();
+					return;
+				}
+				if (this.clickable || this.link) {
+					this.$emit('click', {
+						data: {}
+					});
+				}
+			},
+			onSwitchChange(e) {
+				this.$emit('switchChange', e.detail);
+			},
+			openPage() {
+				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
+					this.pageApi(this.link);
+				} else {
+					this.pageApi('navigateTo');
+				}
+			},
+			pageApi(api) {
+				let callback = {
+					url: this.to,
+					success: res => {
+						this.$emit('click', {
+							data: res
+						});
+					},
+					fail: err => {
+						this.$emit('click', {
+							data: err
+						});
+					}
+				}
+				switch (api) {
+					case 'navigateTo':
+						uni.navigateTo(callback)
+						break
+					case 'redirectTo':
+						uni.redirectTo(callback)
+						break
+					case 'reLaunch':
+						uni.reLaunch(callback)
+						break
+					case 'switchTab':
+						uni.switchTab(callback)
+						break
+					default:
+						uni.navigateTo(callback)
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-font-size-sm:12px;
+	$uni-font-size-base:14px;
+	$uni-font-size-lg:16px;
+	$uni-spacing-col-lg: 12px;
+	$uni-spacing-row-lg: 15px;
+	$uni-img-size-sm:20px;
+	$uni-img-size-base:26px;
+	$uni-img-size-lg:40px;
+	$uni-border-color:#e5e5e5;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-text-color-grey:#999;
+	$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
+
+	.uni-list-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		font-size: $uni-font-size-lg;
+		position: relative;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #fff;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-list-item--disabled {
+		opacity: 0.3;
+	}
+
+	.uni-list-item--hover {
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-list-item__container {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: $list-item-pd;
+		padding-left: $uni-spacing-row-lg;
+		flex: 1;
+		overflow: hidden;
+		// align-items: center;
+	}
+
+	.container--right {
+		padding-right: 0;
+	}
+
+	// .border--left {
+	// 	margin-left: $uni-spacing-row-lg;
+	// }
+	.uni-list--border {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		/* #ifdef APP-NVUE */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $uni-border-color;
+	}
+
+	/* #endif */
+	.uni-list-item__content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding-right: 8px;
+		flex: 1;
+		color: #3b4144;
+		// overflow: hidden;
+		flex-direction: column;
+		justify-content: space-between;
+		overflow: hidden;
+	}
+
+	.uni-list-item__content--center {
+		justify-content: center;
+	}
+
+	.uni-list-item__content-title {
+		font-size: $uni-font-size-base;
+		color: #3b4144;
+		overflow: hidden;
+	}
+
+	.uni-list-item__content-note {
+		margin-top: 6rpx;
+		color: $uni-text-color-grey;
+		font-size: $uni-font-size-sm;
+		overflow: hidden;
+	}
+
+	.uni-list-item__extra {
+		// width: 25%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.uni-list-item__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-list-item__icon {
+		margin-right: 18rpx;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-list-item__icon-img {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		height: $uni-img-size-base;
+		width: $uni-img-size-base;
+		margin-right: 10px;
+	}
+
+	.uni-icon-wrapper {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		padding: 0 10px;
+	}
+
+	.flex--direction {
+		flex-direction: column;
+		/* #ifndef APP-NVUE */
+		align-items: initial;
+		/* #endif */
+	}
+
+	.flex--justify {
+		/* #ifndef APP-NVUE */
+		justify-content: initial;
+		/* #endif */
+	}
+
+	.uni-list--lg {
+		height: $uni-img-size-lg;
+		width: $uni-img-size-lg;
+	}
+
+	.uni-list--base {
+		height: $uni-img-size-base;
+		width: $uni-img-size-base;
+	}
+
+	.uni-list--sm {
+		height: $uni-img-size-sm;
+		width: $uni-img-size-sm;
+	}
+
+	.uni-list-item__extra-text {
+		color: $uni-text-color-grey;
+		font-size: $uni-font-size-sm;
+	}
+
+	.uni-ellipsis-1 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	.uni-ellipsis-2 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 2;
+		text-overflow: ellipsis;
+		/* #endif */
+	}
+</style>
\ No newline at end of file
diff --git a/src/uni_modules/uni-list/components/uni-list/uni-list.vue b/src/uni_modules/uni-list/components/uni-list/uni-list.vue
new file mode 100644
index 00000000..6ef5972a
--- /dev/null
+++ b/src/uni_modules/uni-list/components/uni-list/uni-list.vue
@@ -0,0 +1,123 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view class="uni-list uni-border-top-bottom">
+		<view v-if="border" class="uni-list--border-top"></view>
+		<slot />
+		<view v-if="border" class="uni-list--border-bottom"></view>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<list :bounce="false" :scrollable="true" show-scrollbar :render-reverse="renderReverse" @scroll="scroll" class="uni-list" :class="{ 'uni-list--border': border }" :enableBackToTop="enableBackToTop"
+		loadmoreoffset="15">
+		<slot />
+	</list>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * List 列表
+	 * @description 列表组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+	 * @property {String} 	border = [true|false] 		标题
+	 */
+	export default {
+		name: 'uniList',
+		'mp-weixin': {
+			options: {
+				multipleSlots: false
+			}
+		},
+		props: {
+			stackFromEnd:{
+				type: Boolean,
+				default:false
+			},
+			enableBackToTop: {
+				type: [Boolean, String],
+				default: false
+			},
+			scrollY: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			renderReverse:{
+				type: Boolean,
+				default: false
+			}
+		},
+		// provide() {
+		// 	return {
+		// 		list: this
+		// 	};
+		// },
+		created() {
+			this.firstChildAppend = false;
+		},
+		methods: {
+			loadMore(e) {
+				this.$emit('scrolltolower');
+			},
+			scroll(e) {
+				this.$emit('scroll', e);
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	$uni-bg-color:#ffffff;
+	$uni-border-color:#e5e5e5;
+
+	.uni-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		background-color: $uni-bg-color;
+		position: relative;
+		flex-direction: column;
+	}
+
+	.uni-list--border {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 0.5px;
+		/* #endif */
+		z-index: -1;
+	}
+
+	/* #ifndef APP-NVUE */
+
+	.uni-list--border-top {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $uni-border-color;
+		z-index: 1;
+	}
+
+	.uni-list--border-bottom {
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $uni-border-color;
+	}
+
+	/* #endif */
+</style>
diff --git a/src/uni_modules/uni-list/components/uni-list/uni-refresh.vue b/src/uni_modules/uni-list/components/uni-list/uni-refresh.vue
new file mode 100644
index 00000000..3b4c5a23
--- /dev/null
+++ b/src/uni_modules/uni-list/components/uni-list/uni-refresh.vue
@@ -0,0 +1,65 @@
+<template>
+    <!-- #ifdef APP-NVUE -->
+    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
+        <slot />
+    </refresh>
+    <!-- #endif -->
+    <!-- #ifndef APP-NVUE -->
+    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
+        <slot />
+    </view>
+    <!-- #endif -->
+</template>
+
+<script>
+    export default {
+        name: 'UniRefresh',
+        props: {
+            display: {
+                type: [String],
+                default: "hide"
+            }
+        },
+        data() {
+            return {
+                pulling: false
+            }
+        },
+        computed: {
+            isShow() {
+                if (this.display === "show" || this.pulling === true) {
+                    return true;
+                }
+                return false;
+            }
+        },
+        created() {},
+        methods: {
+            onchange(value) {
+                this.pulling = value;
+            },
+            onrefresh(e) {
+                this.$emit("refresh", e);
+            },
+            onpullingdown(e) {
+                // #ifdef APP-NVUE
+                this.$emit("pullingdown", e);
+                // #endif
+                // #ifndef APP-NVUE
+                var detail = {
+                    viewHeight: 90,
+                    pullingDistance: e.height
+                }
+                this.$emit("pullingdown", detail);
+                // #endif
+            }
+        }
+    }
+</script>
+
+<style>
+    .uni-refresh {
+        height: 0;
+        overflow: hidden;
+    }
+</style>
diff --git a/src/uni_modules/uni-list/components/uni-list/uni-refresh.wxs b/src/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
new file mode 100644
index 00000000..818a6b72
--- /dev/null
+++ b/src/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
@@ -0,0 +1,87 @@
+var pullDown = {
+    threshold: 95,
+    maxHeight: 200,
+    callRefresh: 'onrefresh',
+    callPullingDown: 'onpullingdown',
+    refreshSelector: '.uni-refresh'
+};
+
+function ready(newValue, oldValue, ownerInstance, instance) {
+    var state = instance.getState()
+    state.canPullDown = newValue;
+    // console.log(newValue);
+}
+
+function touchStart(e, instance) {
+    var state = instance.getState();
+    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
+    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
+    if (!state.canPullDown) {
+        return
+    }
+
+    // console.log("touchStart");
+
+    state.height = 0;
+    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    state.refreshInstance.setStyle({
+        'height': 0
+    });
+    state.refreshInstance.callMethod("onchange", true);
+}
+
+function touchMove(e, ownerInstance) {
+    var instance = e.instance;
+    var state = instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    var oldHeight = state.height;
+    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    var height = endY - state.touchStartY;
+    if (height > pullDown.maxHeight) {
+        return;
+    }
+
+    var refreshInstance = state.refreshInstance;
+    refreshInstance.setStyle({
+        'height': height + 'px'
+    });
+
+    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
+    state.height = height;
+    refreshInstance.callMethod(pullDown.callPullingDown, {
+        height: height
+    });
+}
+
+function touchEnd(e, ownerInstance) {
+    var state = e.instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    state.refreshInstance.callMethod("onchange", false);
+
+    var refreshInstance = state.refreshInstance;
+    if (state.height > pullDown.threshold) {
+        refreshInstance.callMethod(pullDown.callRefresh);
+        return;
+    }
+
+    refreshInstance.setStyle({
+        'height': 0
+    });
+}
+
+function propObserver(newValue, oldValue, instance) {
+    pullDown = newValue;
+}
+
+module.exports = {
+    touchmove: touchMove,
+    touchstart: touchStart,
+    touchend: touchEnd,
+    propObserver: propObserver
+}
diff --git a/src/uni_modules/uni-list/package.json b/src/uni_modules/uni-list/package.json
new file mode 100644
index 00000000..5ebe1569
--- /dev/null
+++ b/src/uni_modules/uni-list/package.json
@@ -0,0 +1,91 @@
+{
+  "id": "uni-list",
+  "displayName": "uni-list 列表",
+  "version": "1.2.15",
+  "description": "List 组件 ，帮助使用者快速构建列表。",
+  "keywords": [
+    "",
+    "uni-ui",
+    "uniui",
+    "列表",
+    "",
+    "list"
+],
+  "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-badge",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+            "app-vue": "y",
+            "app-nvue": "y",
+            "app-harmony": "u",
+            "app-uvue": "u"
+        },
+        "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"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/uni_modules/uni-list/readme.md b/src/uni_modules/uni-list/readme.md
new file mode 100644
index 00000000..ae499e66
--- /dev/null
+++ b/src/uni_modules/uni-list/readme.md
@@ -0,0 +1,46 @@
+## List 列表
+> **组件名：uni-list**
+> 代码块： `uList`、`uListItem`
+> 关联组件：`uni-list-item`、`uni-badge`、`uni-icons`、`uni-list-chat`、`uni-list-ad`
+
+
+List 列表组件，包含基本列表样式、可扩展插槽机制、长列表性能优化、多端兼容。
+
+在vue页面里，它默认使用页面级滚动。在app-nvue页面里，它默认使用原生list组件滚动。这样的长列表，在滚动出屏幕外后，系统会回收不可见区域的渲染内存资源，不会造成滚动越长手机越卡的问题。
+
+uni-list组件是父容器，里面的核心是uni-list-item子组件，它代表列表中的一个可重复行，子组件可以无限循环。
+
+uni-list-item有很多风格，uni-list-item组件通过内置的属性，满足一些常用的场景。当内置属性不满足需求时，可以通过扩展插槽来自定义列表内容。
+
+内置属性可以覆盖的场景包括：导航列表、设置列表、小图标列表、通信录列表、聊天记录列表。
+
+涉及很多大图或丰富内容的列表，比如类今日头条的新闻列表、类淘宝的电商列表，需要通过扩展插槽实现。
+
+下文均有样例给出。
+
+uni-list不包含下拉刷新和上拉翻页。上拉翻页另见组件：[uni-load-more](https://ext.dcloud.net.cn/plugin?id=29)
+
+### [点击查看详细文档](https://uniapp.dcloud.io/component/uniui/uni-indexed-list)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+## 基于uni-list扩展的页面模板
+
+通过扩展插槽，可实现多种常见样式的列表
+
+**新闻列表类**
+
+1. 云端一体混合布局：[https://ext.dcloud.net.cn/plugin?id=2546](https://ext.dcloud.net.cn/plugin?id=2546)
+2. 云端一体垂直布局，大图模式：[https://ext.dcloud.net.cn/plugin?id=2583](https://ext.dcloud.net.cn/plugin?id=2583)
+3. 云端一体垂直布局，多行图文混排：[https://ext.dcloud.net.cn/plugin?id=2584](https://ext.dcloud.net.cn/plugin?id=2584)
+4. 云端一体垂直布局，多图模式：[https://ext.dcloud.net.cn/plugin?id=2585](https://ext.dcloud.net.cn/plugin?id=2585)
+5. 云端一体水平布局，左图右文：[https://ext.dcloud.net.cn/plugin?id=2586](https://ext.dcloud.net.cn/plugin?id=2586)
+6. 云端一体水平布局，左文右图：[https://ext.dcloud.net.cn/plugin?id=2587](https://ext.dcloud.net.cn/plugin?id=2587)
+7. 云端一体垂直布局，无图模式，主标题+副标题：[https://ext.dcloud.net.cn/plugin?id=2588](https://ext.dcloud.net.cn/plugin?id=2588)
+
+**商品列表类**
+
+1. 云端一体列表/宫格视图互切：[https://ext.dcloud.net.cn/plugin?id=2651](https://ext.dcloud.net.cn/plugin?id=2651)
+2. 云端一体列表（宫格模式）：[https://ext.dcloud.net.cn/plugin?id=2671](https://ext.dcloud.net.cn/plugin?id=2671)
+3. 云端一体列表（列表模式）：[https://ext.dcloud.net.cn/plugin?id=2672](https://ext.dcloud.net.cn/plugin?id=2672)
\ No newline at end of file
diff --git a/src/uni_modules/uni-table/changelog.md b/src/uni_modules/uni-table/changelog.md
new file mode 100644
index 00000000..9f87c67c
--- /dev/null
+++ b/src/uni_modules/uni-table/changelog.md
@@ -0,0 +1,27 @@
+## 1.2.3（2023-03-28）
+- 修复 在vue3模式下可能会出现错误的问题
+## 1.2.2（2022-11-29）
+- 优化 主题样式
+## 1.2.1（2022-06-06）
+- 修复 微信小程序存在无使用组件的问题
+## 1.2.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-table](https://uniapp.dcloud.io/component/uniui/uni-table)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-07-08）
+- 新增 uni-th 支持 date 日期筛选范围
+## 1.0.6（2021-07-05）
+- 新增 uni-th 支持 range 筛选范围
+## 1.0.5（2021-06-28）
+- 新增 uni-th 筛选功能
+## 1.0.4（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.3（2021-04-16）
+- 新增 sortable 属性，是否开启单列排序
+- 优化 表格多选逻辑
+## 1.0.2（2021-03-22）
+- uni-tr 添加 disabled 属性，用于 type=selection 时，设置某行是否可由全选按钮控制
+## 1.0.1（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/src/uni_modules/uni-table/components/uni-table/uni-table.vue b/src/uni_modules/uni-table/components/uni-table/uni-table.vue
new file mode 100644
index 00000000..21d9527f
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-table/uni-table.vue
@@ -0,0 +1,455 @@
+<template>
+	<view class="uni-table-scroll" :class="{ 'table--border': border, 'border-none': !noData }">
+		<!-- #ifdef H5 -->
+		<table class="uni-table" border="0" cellpadding="0" cellspacing="0" :class="{ 'table--stripe': stripe }" :style="{ 'min-width': minWidth + 'px' }">
+			<slot></slot>
+			<tr v-if="noData" class="uni-table-loading">
+				<td class="uni-table-text" :class="{ 'empty-border': border }">{{ emptyText }}</td>
+			</tr>
+			<view v-if="loading" class="uni-table-mask" :class="{ 'empty-border': border }"><div class="uni-table--loader"></div></view>
+		</table>
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<view class="uni-table" :style="{ 'min-width': minWidth + 'px' }" :class="{ 'table--stripe': stripe }">
+			<slot></slot>
+			<view v-if="noData" class="uni-table-loading">
+				<view class="uni-table-text" :class="{ 'empty-border': border }">{{ emptyText }}</view>
+			</view>
+			<view v-if="loading" class="uni-table-mask" :class="{ 'empty-border': border }"><div class="uni-table--loader"></div></view>
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+/**
+ * Table 表格
+ * @description 用于展示多条结构类似的数据
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=3270
+ * @property {Boolean} 	border 				是否带有纵向边框
+ * @property {Boolean} 	stripe 				是否显示斑马线
+ * @property {Boolean} 	type 					是否开启多选
+ * @property {String} 	emptyText 			空数据时显示的文本内容
+ * @property {Boolean} 	loading 			显示加载中
+ * @event {Function} 	selection-change 	开启多选时，当选择项发生变化时会触发该事件
+ */
+export default {
+	name: 'uniTable',
+	options: {
+		virtualHost: true
+	},
+	emits:['selection-change'],
+	props: {
+		data: {
+			type: Array,
+			default() {
+				return []
+			}
+		},
+		// 是否有竖线
+		border: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示斑马线
+		stripe: {
+			type: Boolean,
+			default: false
+		},
+		// 多选
+		type: {
+			type: String,
+			default: ''
+		},
+		// 没有更多数据
+		emptyText: {
+			type: String,
+			default: '没有更多数据'
+		},
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		rowKey: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			noData: true,
+			minWidth: 0,
+			multiTableHeads: []
+		}
+	},
+	watch: {
+		loading(val) {},
+		data(newVal) {
+			let theadChildren = this.theadChildren
+			let rowspan = 1
+			if (this.theadChildren) {
+				rowspan = this.theadChildren.rowspan
+			}
+			
+			// this.trChildren.length - rowspan
+			this.noData = false
+			// this.noData = newVal.length === 0 
+		}
+	},
+	created() {
+		// 定义tr的实例数组
+		this.trChildren = []
+		this.thChildren = []
+		this.theadChildren = null
+		this.backData = []
+		this.backIndexData = []
+	},
+
+	methods: {
+		isNodata() {
+			let theadChildren = this.theadChildren
+			let rowspan = 1
+			if (this.theadChildren) {
+				rowspan = this.theadChildren.rowspan
+			}
+			this.noData = this.trChildren.length - rowspan <= 0
+		},
+		/**
+		 * 选中所有
+		 */
+		selectionAll() {
+			let startIndex = 1
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			} else {
+				startIndex = theadChildren.rowspan - 1
+			}
+			let isHaveData = this.data && this.data.length > 0
+			theadChildren.checked = true
+			theadChildren.indeterminate = false
+			this.trChildren.forEach((item, index) => {
+				if (!item.disabled) {
+					item.checked = true
+					if (isHaveData && item.keyValue) {
+						const row = this.data.find(v => v[this.rowKey] === item.keyValue)
+						if (!this.backData.find(v => v[this.rowKey] === row[this.rowKey])) {
+							this.backData.push(row)
+						}
+					}
+					if (index > (startIndex - 1) && this.backIndexData.indexOf(index - startIndex) === -1) {
+						this.backIndexData.push(index - startIndex)
+					}
+				}
+			})
+			// this.backData = JSON.parse(JSON.stringify(this.data))
+			this.$emit('selection-change', {
+				detail: {
+					value: this.backData,
+					index: this.backIndexData
+				}
+			})
+		},
+		/**
+		 * 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+		 */
+		toggleRowSelection(row, selected) {
+			// if (!this.theadChildren) return
+			row = [].concat(row)
+
+			this.trChildren.forEach((item, index) => {
+				// if (item.keyValue) {
+
+				const select = row.findIndex(v => {
+					//
+					if (typeof v === 'number') {
+						return v === index - 1
+					} else {
+						return v[this.rowKey] === item.keyValue
+					}
+				})
+				let ischeck = item.checked
+				if (select !== -1) {
+					if (typeof selected === 'boolean') {
+						item.checked = selected
+					} else {
+						item.checked = !item.checked
+					}
+					if (ischeck !== item.checked) {
+						this.check(item.rowData||item, item.checked, item.rowData?item.keyValue:null, true)
+					}
+				}
+				// }
+			})
+			this.$emit('selection-change', {
+				detail: {
+					value: this.backData,
+					index:this.backIndexData
+				}
+			})
+		},
+
+		/**
+		 * 用于多选表格，清空用户的选择
+		 */
+		clearSelection() {
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			}
+			// if (!this.theadChildren) return
+			theadChildren.checked = false
+			theadChildren.indeterminate = false
+			this.trChildren.forEach(item => {
+				// if (item.keyValue) {
+					item.checked = false
+				// }
+			})
+			this.backData = []
+			this.backIndexData = []
+			this.$emit('selection-change', {
+				detail: {
+					value: [],
+					index: []
+				}
+			})
+		},
+		/**
+		 * 用于多选表格，切换所有行的选中状态
+		 */
+		toggleAllSelection() {
+			let list = []
+			let startIndex = 1
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			} else {
+				startIndex = theadChildren.rowspan - 1
+			}
+			this.trChildren.forEach((item, index) => {
+				if (!item.disabled) {
+					if (index > (startIndex - 1) ) {
+						list.push(index-startIndex)
+					}
+				}
+			})
+			this.toggleRowSelection(list)
+		},
+
+		/**
+		 * 选中\取消选中
+		 * @param {Object} child
+		 * @param {Object} check
+		 * @param {Object} rowValue
+		 */
+		check(child, check, keyValue, emit) {
+			let theadChildren = this.theadChildren
+			if (!this.theadChildren) {
+				theadChildren = this.trChildren[0]
+			}
+			
+			
+			
+			let childDomIndex = this.trChildren.findIndex((item, index) => child === item)
+			if(childDomIndex < 0){
+				childDomIndex = this.data.findIndex(v=>v[this.rowKey] === keyValue) + 1
+			}
+			const dataLen = this.trChildren.filter(v => !v.disabled && v.keyValue).length
+			if (childDomIndex === 0) {
+				check ? this.selectionAll() : this.clearSelection()
+				return
+			}
+
+			if (check) {
+				if (keyValue) {
+					this.backData.push(child)
+				}
+				this.backIndexData.push(childDomIndex - 1)
+			} else {
+				const index = this.backData.findIndex(v => v[this.rowKey] === keyValue)
+				const idx = this.backIndexData.findIndex(item => item === childDomIndex - 1)
+				if (keyValue) {
+					this.backData.splice(index, 1)
+				}
+				this.backIndexData.splice(idx, 1)
+			}
+
+			const domCheckAll = this.trChildren.find((item, index) => index > 0 && !item.checked && !item.disabled)
+			if (!domCheckAll) {
+				theadChildren.indeterminate = false
+				theadChildren.checked = true
+			} else {
+				theadChildren.indeterminate = true
+				theadChildren.checked = false
+			}
+
+			if (this.backIndexData.length === 0) {
+				theadChildren.indeterminate = false
+			}
+
+			if (!emit) {
+				this.$emit('selection-change', {
+					detail: {
+						value: this.backData,
+						index: this.backIndexData
+					}
+				})
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+$border-color: #ebeef5;
+
+.uni-table-scroll {
+	width: 100%;
+	/* #ifndef APP-NVUE */
+	overflow-x: auto;
+	/* #endif */
+}
+
+.uni-table {
+	position: relative;
+	width: 100%;
+	border-radius: 5px;
+	// box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.1);
+	background-color: #fff;
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	display: table;
+	overflow-x: auto;
+	::v-deep .uni-table-tr:nth-child(n + 2) {
+		&:hover {
+			background-color: #f5f7fa;
+		}
+	}
+	::v-deep .uni-table-thead {
+		.uni-table-tr {
+			// background-color: #f5f7fa;
+			&:hover {
+				background-color:#fafafa;
+			}
+		}
+	}
+	/* #endif */
+}
+
+.table--border {
+	border: 1px $border-color solid;
+	border-right: none;
+}
+
+.border-none {
+	/* #ifndef APP-NVUE */
+	border-bottom: none;
+	/* #endif */
+}
+
+.table--stripe {
+	/* #ifndef APP-NVUE */
+	::v-deep .uni-table-tr:nth-child(2n + 3) {
+		background-color: #fafafa;
+	}
+	/* #endif */
+}
+
+/* 表格加载、无数据样式 */
+.uni-table-loading {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: table-row;
+	/* #endif */
+	height: 50px;
+	line-height: 50px;
+	overflow: hidden;
+	box-sizing: border-box;
+}
+.empty-border {
+	border-right: 1px $border-color solid;
+}
+.uni-table-text {
+	position: absolute;
+	right: 0;
+	left: 0;
+	text-align: center;
+	font-size: 14px;
+	color: #999;
+}
+
+.uni-table-mask {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: rgba(255, 255, 255, 0.8);
+	z-index: 99;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	margin: auto;
+	transition: all 0.5s;
+	/* #endif */
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-table--loader {
+	width: 30px;
+	height: 30px;
+	border: 2px solid #aaa;
+	// border-bottom-color: transparent;
+	border-radius: 50%;
+	/* #ifndef APP-NVUE */
+	animation: 2s uni-table--loader linear infinite;
+	/* #endif */
+	position: relative;
+}
+
+@keyframes uni-table--loader {
+	0% {
+		transform: rotate(360deg);
+	}
+
+	10% {
+		border-left-color: transparent;
+	}
+
+	20% {
+		border-bottom-color: transparent;
+	}
+
+	30% {
+		border-right-color: transparent;
+	}
+
+	40% {
+		border-top-color: transparent;
+	}
+
+	50% {
+		transform: rotate(0deg);
+	}
+
+	60% {
+		border-top-color: transparent;
+	}
+
+	70% {
+		border-left-color: transparent;
+	}
+
+	80% {
+		border-bottom-color: transparent;
+	}
+
+	90% {
+		border-right-color: transparent;
+	}
+
+	100% {
+		transform: rotate(-360deg);
+	}
+}
+</style>
diff --git a/src/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue b/src/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue
new file mode 100644
index 00000000..fbe1bdcb
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue
@@ -0,0 +1,29 @@
+<template>
+	<!-- #ifdef H5 -->
+	<tbody>
+		<slot></slot>
+	</tbody>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view><slot></slot></view>
+	<!-- #endif -->
+</template>
+
+<script>
+export default {
+	name: 'uniBody',
+	options: {
+		virtualHost: true
+	},
+	data() {
+		return {
+			
+		}
+	},
+	created() {},
+	methods: {}
+}
+</script>
+
+<style>
+</style>
diff --git a/src/uni_modules/uni-table/components/uni-td/uni-td.vue b/src/uni_modules/uni-table/components/uni-td/uni-td.vue
new file mode 100644
index 00000000..9ce93e93
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-td/uni-td.vue
@@ -0,0 +1,90 @@
+<template>
+	<!-- #ifdef H5 -->
+	<td class="uni-table-td" :rowspan="rowspan" :colspan="colspan" :class="{'table--border':border}" :style="{width:width + 'px','text-align':align}">
+		<slot></slot>
+	</td>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<!-- :class="{'table--border':border}"  -->
+	<view class="uni-table-td" :class="{'table--border':border}" :style="{width:width + 'px','text-align':align}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	
+</template>
+
+<script>
+	/**
+	 * Td 单元格
+	 * @description 表格中的标准单元格组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3270
+	 * @property {Number} 	align = [left|center|right]	单元格对齐方式
+	 */
+	export default {
+		name: 'uniTd',
+		options: {
+			virtualHost: true
+		},
+		props: {
+			width: {
+				type: [String, Number],
+				default: ''
+			},
+			align: {
+				type: String,
+				default: 'left'
+			},
+			rowspan: {
+				type: [Number,String],
+				default: 1
+			},
+			colspan: {
+					type: [Number,String],
+				default: 1
+			}
+		},
+		data() {
+			return {
+				border: false
+			};
+		},
+		created() {
+			this.root = this.getTable()
+			this.border = this.root.border
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getTable() {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== 'uniTable') {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$border-color:#EBEEF5;
+
+	.uni-table-td {
+		display: table-cell;
+		padding: 8px 10px;
+		font-size: 14px;
+		border-bottom: 1px $border-color solid;
+		font-weight: 400;
+		color: #606266;
+		line-height: 23px;
+		box-sizing: border-box;
+	}
+
+	.table--border {
+		border-right: 1px $border-color solid;
+	}
+</style>
diff --git a/src/uni_modules/uni-table/components/uni-th/filter-dropdown.vue b/src/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
new file mode 100644
index 00000000..df22a714
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
@@ -0,0 +1,511 @@
+<template>
+	<view class="uni-filter-dropdown">
+		<view class="dropdown-btn" @click="onDropdown">
+			<view class="icon-select" :class="{active: canReset}" v-if="isSelect || isRange"></view>
+			<view class="icon-search" :class="{active: canReset}" v-if="isSearch">
+				<view class="icon-search-0"></view>
+				<view class="icon-search-1"></view>
+			</view>
+			<view class="icon-calendar" :class="{active: canReset}" v-if="isDate">
+				<view class="icon-calendar-0"></view>
+				<view class="icon-calendar-1"></view>
+			</view>
+		</view>
+		<view class="uni-dropdown-cover" v-if="isOpened" @click="handleClose"></view>
+		<view class="dropdown-popup dropdown-popup-right" v-if="isOpened" @click.stop>
+			<!-- select-->
+			<view v-if="isSelect" class="list">
+				<label class="flex-r a-i-c list-item" v-for="(item,index) in dataList" :key="index"
+					@click="onItemClick($event, index)">
+					<check-box class="check" :checked="item.checked" />
+					<view class="checklist-content">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+					</view>
+				</label>
+			</view>
+			<view v-if="isSelect" class="flex-r opera-area">
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSelectReset">
+					{{resource.reset}}</view>
+				<view class="flex-f btn btn-submit" @click="handleSelectSubmit">{{resource.submit}}</view>
+			</view>
+			<!-- search -->
+			<view v-if="isSearch" class="search-area">
+				<input class="search-input" v-model="filterValue" />
+			</view>
+			<view v-if="isSearch" class="flex-r opera-area">
+				<view class="flex-f btn btn-submit" @click="handleSearchSubmit">{{resource.search}}</view>
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSearchReset">
+					{{resource.reset}}</view>
+			</view>
+			<!-- range -->
+			<view v-if="isRange">
+				<view class="input-label">{{resource.gt}}</view>
+				<input class="input" v-model="gtValue" />
+				<view class="input-label">{{resource.lt}}</view>
+				<input class="input" v-model="ltValue" />
+			</view>
+			<view v-if="isRange" class="flex-r opera-area">
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleRangeReset">
+					{{resource.reset}}</view>
+				<view class="flex-f btn btn-submit" @click="handleRangeSubmit">{{resource.submit}}</view>
+			</view>
+			<!-- date -->
+			<view v-if="isDate">
+				<uni-datetime-picker ref="datetimepicker" :value="dateRange" type="datetimerange" return-type="timestamp" @change="datetimechange" @maskClick="timepickerclose">
+					<view></view>
+				</uni-datetime-picker>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import checkBox from '../uni-tr/table-checkbox.vue'
+
+	const resource = {
+		"reset": "重置",
+		"search": "搜索",
+		"submit": "确定",
+		"filter": "筛选",
+		"gt": "大于等于",
+		"lt": "小于等于",
+		"date": "日期范围"
+	}
+
+	const DropdownType = {
+		Select: "select",
+		Search: "search",
+		Range: "range",
+		Date: "date",
+		Timestamp: "timestamp"
+	}
+
+	export default {
+		name: 'FilterDropdown',
+		emits:['change'],
+		components: {
+			checkBox
+		},
+		options: {
+			virtualHost: true
+		},
+		props: {
+			filterType: {
+				type: String,
+				default: DropdownType.Select
+			},
+			filterData: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			map: {
+				type: Object,
+				default () {
+					return {
+						text: 'text',
+						value: 'value'
+					}
+				}
+			},
+			filterDefaultValue: {
+				type: [Array,String],
+				default () {
+					return ""
+				}
+			}
+		},
+		computed: {
+			canReset() {
+				if (this.isSearch) {
+					return this.filterValue.length > 0
+				}
+				if (this.isSelect) {
+					return this.checkedValues.length > 0
+				}
+				if (this.isRange) {
+					return (this.gtValue.length > 0 && this.ltValue.length > 0)
+				}
+				if (this.isDate) {
+					return this.dateSelect.length > 0
+				}
+				return false
+			},
+			isSelect() {
+				return this.filterType === DropdownType.Select
+			},
+			isSearch() {
+				return this.filterType === DropdownType.Search
+			},
+			isRange() {
+				return this.filterType === DropdownType.Range
+			},
+			isDate() {
+				return (this.filterType === DropdownType.Date || this.filterType === DropdownType.Timestamp)
+			}
+		},
+		watch: {
+			filterData(newVal) {
+				this._copyFilters()
+			},
+			indeterminate(newVal) {
+				this.isIndeterminate = newVal
+			}
+		},
+		data() {
+			return {
+				resource,
+				enabled: true,
+				isOpened: false,
+				dataList: [],
+				filterValue: this.filterDefaultValue,
+				checkedValues: [],
+				gtValue: '',
+				ltValue: '',
+				dateRange: [],
+				dateSelect: []
+			};
+		},
+		created() {
+			this._copyFilters()
+		},
+		methods: {
+			_copyFilters() {
+				let dl = JSON.parse(JSON.stringify(this.filterData))
+				for (let i = 0; i < dl.length; i++) {
+					if (dl[i].checked === undefined) {
+						dl[i].checked = false
+					}
+				}
+				this.dataList = dl
+			},
+			openPopup() {
+				this.isOpened = true
+				if (this.isDate) {
+					this.$nextTick(() => {
+						if (!this.dateRange.length) {
+							this.resetDate()
+						}
+						this.$refs.datetimepicker.show()
+					})
+				}
+			},
+			closePopup() {
+				this.isOpened = false
+			},
+			handleClose(e) {
+				this.closePopup()
+			},
+			resetDate() {
+				let date = new Date()
+				let dateText = date.toISOString().split('T')[0]
+				this.dateRange = [dateText + ' 0:00:00', dateText + ' 23:59:59']
+			},
+			onDropdown(e) {
+				this.openPopup()
+			},
+			onItemClick(e, index) {
+				let items = this.dataList
+				let listItem = items[index]
+				if (listItem.checked === undefined) {
+					items[index].checked = true
+				} else {
+					items[index].checked = !listItem.checked
+				}
+
+				let checkvalues = []
+				for (let i = 0; i < items.length; i++) {
+					const item = items[i]
+					if (item.checked) {
+						checkvalues.push(item.value)
+					}
+				}
+				this.checkedValues = checkvalues
+			},
+			datetimechange(e) {
+				this.closePopup()
+				this.dateRange = e
+				this.dateSelect = e
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: e
+				})
+			},
+			timepickerclose(e) {
+				this.closePopup()
+			},
+			handleSelectSubmit() {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: this.checkedValues
+				})
+			},
+			handleSelectReset() {
+				if (!this.canReset) {
+					return;
+				}
+				var items = this.dataList
+				for (let i = 0; i < items.length; i++) {
+					let item = items[i]
+					this.$set(item, 'checked', false)
+				}
+				this.checkedValues = []
+				this.handleSelectSubmit()
+			},
+			handleSearchSubmit() {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: this.filterValue
+				})
+			},
+			handleSearchReset() {
+				if (!this.canReset) {
+					return;
+				}
+				this.filterValue = ''
+				this.handleSearchSubmit()
+			},
+			handleRangeSubmit(isReset) {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: isReset === true ? [] : [parseInt(this.gtValue), parseInt(this.ltValue)]
+				})
+			},
+			handleRangeReset() {
+				if (!this.canReset) {
+					return;
+				}
+				this.gtValue = ''
+				this.ltValue = ''
+				this.handleRangeSubmit(true)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #1890ff !default;
+	
+	.flex-r {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.flex-f {
+		flex: 1;
+	}
+
+	.a-i-c {
+		align-items: center;
+	}
+
+	.j-c-c {
+		justify-content: center;
+	}
+
+	.icon-select {
+		width: 14px;
+		height: 16px;
+		border: solid 6px transparent;
+		border-top: solid 6px #ddd;
+		border-bottom: none;
+		background-color: #ddd;
+		background-clip: content-box;
+		box-sizing: border-box;
+	}
+
+	.icon-select.active {
+		background-color: $uni-primary;
+		border-top-color: $uni-primary;
+	}
+
+	.icon-search {
+		width: 12px;
+		height: 16px;
+		position: relative;
+	}
+
+	.icon-search-0 {
+		border: 2px solid #ddd;
+		border-radius: 8px;
+		width: 7px;
+		height: 7px;
+	}
+
+	.icon-search-1 {
+		position: absolute;
+		top: 8px;
+		right: 0;
+		width: 1px;
+		height: 7px;
+		background-color: #ddd;
+		transform: rotate(-45deg);
+	}
+
+	.icon-search.active .icon-search-0 {
+		border-color: $uni-primary;
+	}
+
+	.icon-search.active .icon-search-1 {
+		background-color: $uni-primary;
+	}
+
+	.icon-calendar {
+		color: #ddd;
+		width: 14px;
+		height: 16px;
+	}
+
+	.icon-calendar-0 {
+		height: 4px;
+		margin-top: 3px;
+		margin-bottom: 1px;
+		background-color: #ddd;
+		border-radius: 2px 2px 1px 1px;
+		position: relative;
+	}
+	.icon-calendar-0:before, .icon-calendar-0:after {
+		content: '';
+		position: absolute;
+		top: -3px;
+		width: 4px;
+		height: 3px;
+		border-radius: 1px;
+		background-color: #ddd;
+	}
+	.icon-calendar-0:before {
+		left: 2px;
+	}
+	.icon-calendar-0:after {
+		right: 2px;
+	}
+
+	.icon-calendar-1 {
+		height: 9px;
+		background-color: #ddd;
+		border-radius: 1px 1px 2px 2px;
+	}
+
+	.icon-calendar.active {
+		color: $uni-primary;
+	}
+
+	.icon-calendar.active .icon-calendar-0,
+	.icon-calendar.active .icon-calendar-1,
+	.icon-calendar.active .icon-calendar-0:before,
+	.icon-calendar.active .icon-calendar-0:after {
+		background-color: $uni-primary;
+	}
+
+	.uni-filter-dropdown {
+		position: relative;
+		font-weight: normal;
+	}
+
+	.dropdown-popup {
+		position: absolute;
+		top: 100%;
+		background-color: #fff;
+		box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d;
+		min-width: 150px;
+		z-index: 1000;
+	}
+
+	.dropdown-popup-left {
+		left: 0;
+	}
+
+	.dropdown-popup-right {
+		right: 0;
+	}
+
+	.uni-dropdown-cover {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: transparent;
+		z-index: 100;
+	}
+
+	.list {
+		margin-top: 5px;
+		margin-bottom: 5px;
+	}
+
+	.list-item {
+		padding: 5px 10px;
+		text-align: left;
+	}
+
+	.list-item:hover {
+		background-color: #f0f0f0;
+	}
+
+	.check {
+		margin-right: 5px;
+	}
+
+	.search-area {
+		padding: 10px;
+	}
+
+	.search-input {
+		font-size: 12px;
+		border: 1px solid #f0f0f0;
+		border-radius: 3px;
+		padding: 2px 5px;
+		min-width: 150px;
+		text-align: left;
+	}
+
+	.input-label {
+		margin: 10px 10px 5px 10px;
+		text-align: left;
+	}
+
+	.input {
+		font-size: 12px;
+		border: 1px solid #f0f0f0;
+		border-radius: 3px;
+		margin: 10px;
+		padding: 2px 5px;
+		min-width: 150px;
+		text-align: left;
+	}
+
+	.opera-area {
+		cursor: default;
+		border-top: 1px solid #ddd;
+		padding: 5px;
+	}
+
+	.opera-area .btn {
+		font-size: 12px;
+		border-radius: 3px;
+		margin: 5px;
+		padding: 4px 4px;
+	}
+
+	.btn-default {
+		border: 1px solid #ddd;
+	}
+
+	.btn-default.disable {
+		border-color: transparent;
+	}
+
+	.btn-submit {
+		background-color: $uni-primary;
+		color: #ffffff;
+	}
+</style>
diff --git a/src/uni_modules/uni-table/components/uni-th/uni-th.vue b/src/uni_modules/uni-table/components/uni-th/uni-th.vue
new file mode 100644
index 00000000..14889dd8
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-th/uni-th.vue
@@ -0,0 +1,285 @@
+<template>
+	<!-- #ifdef H5 -->
+	<th :rowspan="rowspan" :colspan="colspan" class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }">
+		<view class="uni-table-th-row">
+			<view class="uni-table-th-content" :style="{ 'justify-content': contentAlign }" @click="sort">
+				<slot></slot>
+				<view v-if="sortable" class="arrow-box">
+					<text class="arrow up" :class="{ active: ascending }" @click.stop="ascendingFn"></text>
+					<text class="arrow down" :class="{ active: descending }" @click.stop="descendingFn"></text>
+				</view>
+			</view>
+			<dropdown v-if="filterType || filterData.length" :filterDefaultValue="filterDefaultValue" :filterData="filterData" :filterType="filterType" @change="ondropdown"></dropdown>
+		</view>
+	</th>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }"><slot></slot></view>
+	<!-- #endif -->
+</template>
+
+<script>
+	// #ifdef H5
+	import dropdown from './filter-dropdown.vue'
+	// #endif
+/**
+ * Th 表头
+ * @description 表格内的表头单元格组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=3270
+ * @property {Number | String} 	width 	单元格宽度（支持纯数字、携带单位px或rpx）
+ * @property {Boolean} 	sortable 					是否启用排序
+ * @property {Number} 	align = [left|center|right]	单元格对齐方式
+ * @value left   	单元格文字左侧对齐
+ * @value center	单元格文字居中
+ * @value right		单元格文字右侧对齐
+ * @property {Array}	filterData 筛选数据
+ * @property {String}	filterType	[search|select] 筛选类型
+ * @value search	关键字搜素
+ * @value select	条件选择
+ * @event {Function} sort-change 排序触发事件
+ */
+export default {
+	name: 'uniTh',
+	options: {
+		virtualHost: true
+	},
+	components: {
+		// #ifdef H5
+		dropdown
+		// #endif
+	},
+	emits:['sort-change','filter-change'],
+	props: {
+		width: {
+			type: [String, Number],
+			default: ''
+		},
+		align: {
+			type: String,
+			default: 'left'
+		},
+		rowspan: {
+			type: [Number, String],
+			default: 1
+		},
+		colspan: {
+			type: [Number, String],
+			default: 1
+		},
+		sortable: {
+			type: Boolean,
+			default: false
+		},
+		filterType: {
+			type: String,
+			default: ""
+		},
+		filterData: {
+			type: Array,
+			default () {
+				return []
+			}
+		},
+		filterDefaultValue: {
+			type: [Array,String],
+			default () {
+				return ""
+			}
+		}
+	},
+	data() {
+		return {
+			border: false,
+			ascending: false,
+			descending: false
+		}
+	},
+	computed: {
+		// 根据props中的width属性 自动匹配当前th的宽度(px)
+		customWidth(){
+			if(typeof this.width === 'number'){
+				return this.width
+			} else if(typeof this.width === 'string') {
+				let regexHaveUnitPx = new RegExp(/^[1-9][0-9]*px$/g)
+				let regexHaveUnitRpx = new RegExp(/^[1-9][0-9]*rpx$/g)
+				let regexHaveNotUnit = new RegExp(/^[1-9][0-9]*$/g)
+				if (this.width.match(regexHaveUnitPx) !== null) { // 携带了 px
+					return this.width.replace('px', '')
+				} else if (this.width.match(regexHaveUnitRpx) !== null) { // 携带了 rpx
+					let numberRpx = Number(this.width.replace('rpx', ''))
+					let widthCoe = uni.getSystemInfoSync().screenWidth / 750
+					return Math.round(numberRpx * widthCoe)
+				} else if (this.width.match(regexHaveNotUnit) !== null) { // 未携带 rpx或px 的纯数字 String
+					return this.width
+				} else { // 不符合格式
+					return ''
+				}
+			} else {
+				return ''
+			}
+		},
+		contentAlign() {
+			let align = 'left'
+			switch (this.align) {
+				case 'left':
+					align = 'flex-start'
+					break
+				case 'center':
+					align = 'center'
+					break
+				case 'right':
+					align = 'flex-end'
+					break
+			}
+			return align
+		}
+	},
+	created() {
+		this.root = this.getTable('uniTable')
+		this.rootTr = this.getTable('uniTr')
+		this.rootTr.minWidthUpdate(this.customWidth ? this.customWidth : 140)
+		this.border = this.root.border
+		this.root.thChildren.push(this)
+	},
+	methods: {
+		sort() {
+			if (!this.sortable) return
+			this.clearOther()
+			if (!this.ascending && !this.descending) {
+				this.ascending = true
+				this.$emit('sort-change', { order: 'ascending' })
+				return
+			}
+			if (this.ascending && !this.descending) {
+				this.ascending = false
+				this.descending = true
+				this.$emit('sort-change', { order: 'descending' })
+				return
+			}
+
+			if (!this.ascending && this.descending) {
+				this.ascending = false
+				this.descending = false
+				this.$emit('sort-change', { order: null })
+			}
+		},
+		ascendingFn() {
+			this.clearOther()
+			this.ascending = !this.ascending
+			this.descending = false
+			this.$emit('sort-change', { order: this.ascending ? 'ascending' : null })
+		},
+		descendingFn() {
+			this.clearOther()
+			this.descending = !this.descending
+			this.ascending = false
+			this.$emit('sort-change', { order: this.descending ? 'descending' : null })
+		},
+		clearOther() {
+			this.root.thChildren.map(item => {
+				if (item !== this) {
+					item.ascending = false
+					item.descending = false
+				}
+				return item
+			})
+		},
+		ondropdown(e) {
+			this.$emit("filter-change", e)
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getTable(name) {
+			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">
+$border-color: #ebeef5;
+$uni-primary: #007aff !default;
+
+.uni-table-th {
+	padding: 12px 10px;
+	/* #ifndef APP-NVUE */
+	display: table-cell;
+	box-sizing: border-box;
+	/* #endif */
+	font-size: 14px;
+	font-weight: bold;
+	color: #909399;
+	border-bottom: 1px $border-color solid;
+}
+
+.uni-table-th-row {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.table--border {
+	border-right: 1px $border-color solid;
+}
+.uni-table-th-content {
+	display: flex;
+	align-items: center;
+	flex: 1;
+}
+.arrow-box {
+}
+.arrow {
+	display: block;
+	position: relative;
+	width: 10px;
+	height: 8px;
+	// border: 1px red solid;
+	left: 5px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.down {
+	top: 3px;
+	::after {
+		content: '';
+		width: 8px;
+		height: 8px;
+		position: absolute;
+		left: 2px;
+		top: -5px;
+		transform: rotate(45deg);
+		background-color: #ccc;
+	}
+	&.active {
+		::after {
+			background-color: $uni-primary;
+		}
+	}
+}
+.up {
+	::after {
+		content: '';
+		width: 8px;
+		height: 8px;
+		position: absolute;
+		left: 2px;
+		top: 5px;
+		transform: rotate(45deg);
+		background-color: #ccc;
+	}
+	&.active {
+		::after {
+			background-color: $uni-primary;
+		}
+	}
+}
+</style>
diff --git a/src/uni_modules/uni-table/components/uni-thead/uni-thead.vue b/src/uni_modules/uni-table/components/uni-thead/uni-thead.vue
new file mode 100644
index 00000000..0dd18cd8
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-thead/uni-thead.vue
@@ -0,0 +1,129 @@
+<template>
+	<!-- #ifdef H5 -->
+	<thead class="uni-table-thead">
+		<tr class="uni-table-tr">
+			<th :rowspan="rowspan" colspan="1" class="checkbox" :class="{ 'tr-table--border': border }">
+				<table-checkbox :indeterminate="indeterminate" :checked="checked" @checkboxSelected="checkboxSelected"></table-checkbox>
+			</th>
+		</tr>
+		<slot></slot>
+	</thead>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view class="uni-table-thead"><slot></slot></view>
+	<!-- #endif -->
+</template>
+
+<script>
+import tableCheckbox from '../uni-tr/table-checkbox.vue'
+export default {
+	name: 'uniThead',
+	components: {
+		tableCheckbox
+	},
+	options: {
+		virtualHost: true
+	},
+	data() {
+		return {
+			border: false,
+			selection: false,
+			rowspan: 1,
+			indeterminate: false,
+			checked: false
+		}
+	},
+	created() {
+		this.root = this.getTable()
+		// #ifdef H5
+		this.root.theadChildren = this
+		// #endif
+		this.border = this.root.border
+		this.selection = this.root.type
+	},
+	methods: {
+		init(self) {
+			this.rowspan++
+		},
+		checkboxSelected(e) {
+			this.indeterminate = false
+			const backIndexData = this.root.backIndexData
+			const data = this.root.trChildren.filter(v => !v.disabled && v.keyValue)
+			if (backIndexData.length === data.length) {
+				this.checked = false
+				this.root.clearSelection()
+			} else {
+				this.checked = true
+				this.root.selectionAll()
+			}
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getTable(name = 'uniTable') {
+			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">
+$border-color: #ebeef5;
+
+.uni-table-thead {
+	display: table-header-group;
+}
+
+.uni-table-tr {
+	/* #ifndef APP-NVUE */
+	display: table-row;
+	transition: all 0.3s;
+	box-sizing: border-box;
+	/* #endif */
+	border: 1px red solid;
+	background-color: #fafafa;
+}
+
+.checkbox {
+	padding: 0 8px;
+	width: 26px;
+	padding-left: 12px;
+	/* #ifndef APP-NVUE */
+	display: table-cell;
+	vertical-align: middle;
+	/* #endif */
+	color: #333;
+	font-weight: 500;
+	border-bottom: 1px $border-color solid;
+	font-size: 14px;
+	// text-align: center;
+}
+
+.tr-table--border {
+	border-right: 1px $border-color solid;
+}
+
+/* #ifndef APP-NVUE */
+.uni-table-tr {
+	::v-deep .uni-table-th {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+
+	::v-deep .uni-table-td {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+}
+
+/* #endif */
+</style>
diff --git a/src/uni_modules/uni-table/components/uni-tr/table-checkbox.vue b/src/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
new file mode 100644
index 00000000..1089187e
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
@@ -0,0 +1,179 @@
+<template>
+	<view class="uni-table-checkbox" @click="selected">
+		<view v-if="!indeterminate" class="checkbox__inner" :class="{'is-checked':isChecked,'is-disable':isDisabled}">
+			<view class="checkbox__inner-icon"></view>
+		</view>
+		<view v-else class="checkbox__inner checkbox--indeterminate">
+			<view class="checkbox__inner-icon"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'TableCheckbox',
+		emits:['checkboxSelected'],
+		props: {
+			indeterminate: {
+				type: Boolean,
+				default: false
+			},
+			checked: {
+				type: [Boolean,String],
+				default: false
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			index: {
+				type: Number,
+				default: -1
+			},
+			cellData: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		watch:{
+			checked(newVal){
+				if(typeof this.checked === 'boolean'){
+					this.isChecked = newVal
+				}else{
+					this.isChecked = true
+				}
+			},
+			indeterminate(newVal){
+				this.isIndeterminate = newVal
+			}
+		},
+		data() {
+			return {
+				isChecked: false,
+				isDisabled: false,
+				isIndeterminate:false
+			}
+		},
+		created() {
+			if(typeof this.checked === 'boolean'){
+				this.isChecked = this.checked
+			}
+			this.isDisabled = this.disabled
+		},
+		methods: {
+			selected() {
+				if (this.isDisabled) return
+				this.isIndeterminate = false
+				this.isChecked = !this.isChecked
+				this.$emit('checkboxSelected', {
+					checked: this.isChecked,
+					data: this.cellData
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+	$border-color: #DCDFE6;
+	$disable:0.4;
+
+	.uni-table-checkbox {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		margin: 5px 0;
+		cursor: pointer;
+
+		// 多选样式
+		.checkbox__inner {
+			/* #ifndef APP-NVUE */
+			flex-shrink: 0;
+			box-sizing: border-box;
+			/* #endif */
+			position: relative;
+			width: 16px;
+			height: 16px;
+			border: 1px solid $border-color;
+			border-radius: 2px;
+			background-color: #fff;
+			z-index: 1;
+
+			.checkbox__inner-icon {
+				position: absolute;
+				/* #ifdef APP-NVUE */
+				top: 2px;
+				/* #endif */
+				/* #ifndef APP-NVUE */
+				top: 2px;
+				/* #endif */
+				left: 5px;
+				height: 7px;
+				width: 3px;
+				border: 1px solid #fff;
+				border-left: 0;
+				border-top: 0;
+				opacity: 0;
+				transform-origin: center;
+				transform: rotate(45deg);
+				box-sizing: content-box;
+			}
+
+			&.checkbox--indeterminate {
+				border-color: $uni-primary;
+				background-color: $uni-primary;
+
+				.checkbox__inner-icon {
+					position: absolute;
+					opacity: 1;
+					transform: rotate(0deg);
+					height: 2px;
+					top: 0;
+					bottom: 0;
+					margin: auto;
+					left: 0px;
+					right: 0px;
+					bottom: 0;
+					width: auto;
+					border: none;
+					border-radius: 2px;
+					transform: scale(0.5);
+					background-color: #fff;
+				}
+			}
+			&:hover{
+				border-color: $uni-primary;
+			}
+			// 禁用
+			&.is-disable {
+				/* #ifdef H5 */
+				cursor: not-allowed;
+				/* #endif */
+				background-color: #F2F6FC;
+				border-color: $border-color;
+			}
+
+			// 选中
+			&.is-checked {
+				border-color: $uni-primary;
+				background-color: $uni-primary;
+
+				.checkbox__inner-icon {
+					opacity: 1;
+					transform: rotate(45deg);
+				}
+
+				// 选中禁用
+				&.is-disable {
+					opacity: $disable;
+				}
+			}
+			
+		}
+	}
+</style>
diff --git a/src/uni_modules/uni-table/components/uni-tr/uni-tr.vue b/src/uni_modules/uni-table/components/uni-tr/uni-tr.vue
new file mode 100644
index 00000000..f9b96716
--- /dev/null
+++ b/src/uni_modules/uni-table/components/uni-tr/uni-tr.vue
@@ -0,0 +1,171 @@
+<template>
+	<!-- #ifdef H5 -->
+	<tr class="uni-table-tr">
+		<th v-if="selection === 'selection' && ishead" class="checkbox" :class="{ 'tr-table--border': border }">
+			<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled" @checkboxSelected="checkboxSelected"></table-checkbox>
+		</th>
+		<slot></slot>
+		<!-- <uni-th class="th-fixed">123</uni-th> -->
+	</tr>
+	<!-- #endif -->
+	<!-- #ifndef H5 -->
+	<view class="uni-table-tr">
+		<view v-if="selection === 'selection' " class="checkbox" :class="{ 'tr-table--border': border }">
+			<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled" @checkboxSelected="checkboxSelected"></table-checkbox>
+		</view>
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	import tableCheckbox from './table-checkbox.vue'
+/**
+ * Tr 表格行组件
+ * @description 表格行组件 仅包含 th,td 组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=
+ */
+export default {
+	name: 'uniTr',
+	components: { tableCheckbox },
+	props: {
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		keyValue: {
+			type: [String, Number],
+			default: ''
+		}
+	},
+	options: {
+		virtualHost: true
+	},
+	data() {
+		return {
+			value: false,
+			border: false,
+			selection: false,
+			widthThArr: [],
+			ishead: true,
+			checked: false,
+			indeterminate:false
+		}
+	},
+	created() {
+		this.root = this.getTable()
+		this.head = this.getTable('uniThead')
+		if (this.head) {
+			this.ishead = false
+			this.head.init(this)
+		}
+		this.border = this.root.border
+		this.selection = this.root.type
+		this.root.trChildren.push(this)
+		const rowData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
+		if(rowData){
+			this.rowData = rowData
+		}
+		this.root.isNodata()
+	},
+	mounted() {
+		if (this.widthThArr.length > 0) {
+			const selectionWidth = this.selection === 'selection' ? 50 : 0
+			this.root.minWidth = this.widthThArr.reduce((a, b) => Number(a) + Number(b)) + selectionWidth
+		}
+	},
+	// #ifndef VUE3
+	destroyed() {
+		const index = this.root.trChildren.findIndex(i => i === this)
+		this.root.trChildren.splice(index, 1)
+		this.root.isNodata()
+	},
+	// #endif
+	// #ifdef VUE3
+	unmounted() {
+		const index = this.root.trChildren.findIndex(i => i === this)
+		this.root.trChildren.splice(index, 1)
+		this.root.isNodata()
+	},
+	// #endif
+	methods: {
+		minWidthUpdate(width) {
+			this.widthThArr.push(width)
+		},
+		// 选中
+		checkboxSelected(e) {
+			let rootData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
+			this.checked = e.checked
+			this.root.check(rootData||this, e.checked,rootData? this.keyValue:null)
+		},
+		change(e) {
+			this.root.trChildren.forEach(item => {
+				if (item === this) {
+					this.root.check(this, e.detail.value.length > 0 ? true : false)
+				}
+			})
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getTable(name = 'uniTable') {
+			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">
+$border-color: #ebeef5;
+
+.uni-table-tr {
+	/* #ifndef APP-NVUE */
+	display: table-row;
+	transition: all 0.3s;
+	box-sizing: border-box;
+	/* #endif */
+}
+
+.checkbox {
+	padding: 0 8px;
+	width: 26px;
+	padding-left: 12px;
+	/* #ifndef APP-NVUE */
+	display: table-cell;
+	vertical-align: middle;
+	/* #endif */
+	color: #333;
+	font-weight: 500;
+	border-bottom: 1px $border-color solid;
+	font-size: 14px;
+	// text-align: center;
+}
+
+.tr-table--border {
+	border-right: 1px $border-color solid;
+}
+
+/* #ifndef APP-NVUE */
+.uni-table-tr {
+	::v-deep .uni-table-th {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+
+	::v-deep .uni-table-td {
+		&.table--border:last-child {
+			// border-right: none;
+		}
+	}
+}
+
+/* #endif */
+</style>
diff --git a/src/uni_modules/uni-table/i18n/en.json b/src/uni_modules/uni-table/i18n/en.json
new file mode 100644
index 00000000..e32023cc
--- /dev/null
+++ b/src/uni_modules/uni-table/i18n/en.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Reset",
+	"filter-dropdown.search": "Search",
+	"filter-dropdown.submit": "Submit",
+	"filter-dropdown.filter": "Filter",
+	"filter-dropdown.gt": "Greater or equal to",
+	"filter-dropdown.lt": "Less than or equal to",
+	"filter-dropdown.date": "Date"
+}
diff --git a/src/uni_modules/uni-table/i18n/es.json b/src/uni_modules/uni-table/i18n/es.json
new file mode 100644
index 00000000..9afd04bb
--- /dev/null
+++ b/src/uni_modules/uni-table/i18n/es.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Reiniciar",
+	"filter-dropdown.search": "Búsqueda",
+	"filter-dropdown.submit": "Entregar",
+	"filter-dropdown.filter": "Filtrar",
+	"filter-dropdown.gt": "Mayor o igual a",
+	"filter-dropdown.lt": "Menos que o igual a",
+	"filter-dropdown.date": "Fecha"
+}
diff --git a/src/uni_modules/uni-table/i18n/fr.json b/src/uni_modules/uni-table/i18n/fr.json
new file mode 100644
index 00000000..b0062371
--- /dev/null
+++ b/src/uni_modules/uni-table/i18n/fr.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Réinitialiser",
+	"filter-dropdown.search": "Chercher",
+	"filter-dropdown.submit": "Soumettre",
+	"filter-dropdown.filter": "Filtre",
+	"filter-dropdown.gt": "Supérieur ou égal à",
+	"filter-dropdown.lt": "Inférieur ou égal à",
+	"filter-dropdown.date": "Date"
+}
diff --git a/src/uni_modules/uni-table/i18n/index.js b/src/uni_modules/uni-table/i18n/index.js
new file mode 100644
index 00000000..2469dd02
--- /dev/null
+++ b/src/uni_modules/uni-table/i18n/index.js
@@ -0,0 +1,12 @@
+import en from './en.json'
+import es from './es.json'
+import fr from './fr.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	es,
+	fr,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/src/uni_modules/uni-table/i18n/zh-Hans.json b/src/uni_modules/uni-table/i18n/zh-Hans.json
new file mode 100644
index 00000000..862af179
--- /dev/null
+++ b/src/uni_modules/uni-table/i18n/zh-Hans.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "重置",
+	"filter-dropdown.search": "搜索",
+	"filter-dropdown.submit": "确定",
+	"filter-dropdown.filter": "筛选",
+	"filter-dropdown.gt": "大于等于",
+	"filter-dropdown.lt": "小于等于",
+	"filter-dropdown.date": "日期范围"
+}
diff --git a/src/uni_modules/uni-table/i18n/zh-Hant.json b/src/uni_modules/uni-table/i18n/zh-Hant.json
new file mode 100644
index 00000000..64f80615
--- /dev/null
+++ b/src/uni_modules/uni-table/i18n/zh-Hant.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "重置",
+	"filter-dropdown.search": "搜索",
+	"filter-dropdown.submit": "確定",
+	"filter-dropdown.filter": "篩選",
+	"filter-dropdown.gt": "大於等於",
+	"filter-dropdown.lt": "小於等於",
+	"filter-dropdown.date": "日期範圍"
+}
diff --git a/src/uni_modules/uni-table/package.json b/src/uni_modules/uni-table/package.json
new file mode 100644
index 00000000..7c2f91cd
--- /dev/null
+++ b/src/uni_modules/uni-table/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "uni-table",
+  "displayName": "uni-table 表格",
+  "version": "1.2.3",
+  "description": "表格组件，多用于展示多条结构类似的数据，如",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "table",
+    "表格"
+],
+  "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-datetime-picker"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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",
+          "字节跳动": "n",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/uni_modules/uni-table/readme.md b/src/uni_modules/uni-table/readme.md
new file mode 100644
index 00000000..bb08c791
--- /dev/null
+++ b/src/uni_modules/uni-table/readme.md
@@ -0,0 +1,13 @@
+
+
+## Table 表单
+> 组件名：``uni-table``，代码块： `uTable`。
+
+用于展示多条结构类似的数据
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-table)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+

From 561e5675e5b12c2c9b6de3d65843e1adedfa1c66 Mon Sep 17 00:00:00 2001
From: yixiudong <827231259@qq.com>
Date: Tue, 19 Aug 2025 15:34:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E8=B7=B3=E8=BD=AC=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=8F=8A=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json         | 9 +++++++++
 src/pages/me/index.vue | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index b7ca8b0a..9c98f24b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -145,6 +145,15 @@
                 }
             }
         },
+		{
+			"path": "pages/charts/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
         {
             "path": "pages/favorites/index",
             "style": {
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index b31a8bc2..357f3c86 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -111,8 +111,7 @@
 			<uv-cell-group :border="false">
 				<uv-cell title="消息通知" :isLink="true" @click="common.navigateTo('/pages/messageNotification/index')"></uv-cell>
 				<uv-cell title="我的收藏" :isLink="true" @click="common.navigateTo('/pages/favorites/index')"></uv-cell>
-				<uv-cell title="排行榜" :isLink="true" :clickable="false" :border="false"
-					@click="common.navigateTo('/pages/me/preview')"></uv-cell>
+				<uv-cell title="排行榜"   :isLink="true"   @click="common.navigateTo('/pages/charts/index')"></uv-cell>
 				<uv-cell title="我的预览" :isLink="true" :clickable="false" :border="false"
 					@click="common.navigateTo('/pages/preview/index')"></uv-cell>
 			</uv-cell-group>

From 4e5c17fe3de88cadc4ae1d5b0c0214e8e415ee6f Mon Sep 17 00:00:00 2001
From: yixiudong <827231259@qq.com>
Date: Tue, 19 Aug 2025 16:57:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/charts/index.vue | 316 ++++++++++++++++---------------------
 1 file changed, 133 insertions(+), 183 deletions(-)

diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue
index d87c9df2..47921944 100644
--- a/src/pages/charts/index.vue
+++ b/src/pages/charts/index.vue
@@ -100,7 +100,7 @@
 						<text class="rank-other-last-sty rank-uni-sty">{{tableLastName}}</text>
 					</template>
 				</uni-list-item>
-				<uni-list-item :key="index" v-if="newChartsList.length == 0">
+				<uni-list-item :key="index" v-if="chartsList.length < 4">
 					<template v-slot:header>
 						<text style="width:100%;text-align: center;color: #999999;">暂无数据</text>
 					</template>
@@ -127,7 +127,7 @@
 					</template>
 				</uni-list-item>
 				<view style="width: 100%;height: 200rpx;"></view>
-				<uni-list-item class="rank-mine" v-if="myselfList.length < 1">
+				<uni-list-item class="rank-mine" v-if="!myselfObj.userName">
 					<!-- 自定义 header -->
 					<template v-slot:header>
 						<text class="rank-sty my-rank-title">我的排名</text>
@@ -138,21 +138,21 @@
 					<!-- 自定义 header -->
 					<template v-slot:header>
 						<text class="rank-sty my-rank-title">我的排名</text>
-						<view class="my-rank-content">11</view>
+						<view class="my-rank-content">{{myselfObj.position}}</view>
 					</template>
 					<!-- 自定义 body -->
 					<template v-slot:body>
 						<view style="width: 50%;text-align: center;">
 							<image src="/static/images/charts/avator.png" class="avator"></image>
 							<view style="float: left;margin-left: 18rpx;">
-								<view class="my-rank-name">{{myselfList[0].userName}}</view>
-								<view class="my-rank-belong">{{myselfList[0].dept}}</view>
+								<view class="my-rank-name">{{myselfObj.userName}}</view>
+								<view class="my-rank-belong">{{myselfObj.dept}}</view>
 							</view>
 						</view>
 					</template>
 					<!-- 自定义 footer-->
 					<template v-slot:footer>
-						<text class="my-rank-score">{{myselfList[0].score}}</text>
+						<text class="my-rank-score">{{myselfObj.score}}</text>
 					</template>
 				</uni-list-item>
 			</uni-list>
@@ -184,7 +184,7 @@
 	const practCntList = ref([])
 	const examCntList = ref([])
 	const crsCntList = ref([])
-	const myselfList = ref([])
+	const myselfObj = ref({})
 	const tableLastName = ref("学习时长(h)");
 	const taskRef = ref(null);
 	const tabAct = ref(0);
@@ -220,23 +220,26 @@
 		}
 		if (tableLastName.value == '学习时长') {
 			allChartsList.value = learnTimeList.value;
-			chartsList.value = learnTimeList.value.annual || [];
-			chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen || "";
+			chartsList.value = learnTimeList.value.annual.list || [];
+			myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
+			myselfObj.value.score = allChartsList.value.annual.self.annlStdyTmLen;
+			chartsList.value.forEach(item => item.score = item.annlStdyTmLen)
 		} else if (tableLastName.value == '练习次数') {
 			allChartsList.value = practCntList.value;
-			chartsList.value = practCntList.value.annual || [];
-			chartsList.value.score = practCntList.value.annual.annlPractCnt || "";
+			chartsList.value = practCntList.value.annual.list || [];
+			myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
+			myselfObj.value.score = allChartsList.value.annual.self.annlPractCnt;
 		} else if (tableLastName.value == '考试次数') {
 			allChartsList.value = examCntList.value;
-			chartsList.value = examCntList.value.annual || [];
-			chartsList.value.score = examCntList.value.annual.annlExamCnt || "";
+			chartsList.value = examCntList.value.annual.list || [];
+			myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
+			myselfObj.value.score = allChartsList.value.annual.self.annlExamCnt;
 		} else if (tableLastName.value == '通关课程数') {
 			allChartsList.value = crsCntList.value;
-			chartsList.value = crsCntList.value.annual || [];
-			chartsList.value.score = crsCntList.value.annual.annlCrsCnt || "";
+			chartsList.value = crsCntList.value.annual.list || [];
+			myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
+			myselfObj.value.score = allChartsList.value.annual.self.annlCrsCnt;
 		}
-		//我的排名---接口待联调
-		// myselfList.value = chartsList.value.myselfList || [];
 		if (chartsList.value.length > 3) {
 			newChartsList.value = chartsList.value.slice(3).concat();
 		} else {
@@ -247,202 +250,149 @@
 	const itemFun = (index, item) => {
 		itemIndex.value = index;
 		if (item.value == 'annual') {
-			chartsList.value = allChartsList.value.annual ? allChartsList.value.annual : [];
-			if (tableLastName.value == '学习时长') {
-				chartsList.value.score = chartsList.value.annlStdyTmLen || "";
+			chartsList.value = allChartsList.value.annual ? allChartsList.value.annual.list : [];
+			myselfObj.value = allChartsList.value.annual ? allChartsList.value.annual.self : {};
+			if (tableLastName.value.includes('学习时长')) {
+				chartsList.value.forEach(item => item.score = item.annlStdyTmLen);
+				myselfObj.value.score = myselfObj.value.annlStdyTmLen;
 			} else if (tableLastName.value == '练习次数') {
-				chartsList.value.score = chartsList.value.annlPractCnt || "";
+				chartsList.value.forEach(item => item.score = item.annlPractCnt);
+				myselfObj.value.score = myselfObj.value.annlPractCnt;
 			} else if (tableLastName.value == '考试次数') {
-				chartsList.value.score = chartsList.value.annlExamCnt || "";
+				chartsList.value.forEach(item => item.score = item.annlExamCnt);
+				myselfObj.value.score = myselfObj.value.annlExamCnt;
 			} else if (tableLastName.value == '通关课程数') {
-				chartsList.value.score = chartsList.value.annlCrsCnt || "";
+				chartsList.value.forEach(item => item.score = item.annlCrsCnt);
+				myselfObj.value.score = myselfObj.value.annlCrsCnt;
 			}
 		} else if (item.value == 'month') {
-			chartsList.value = allChartsList.value.month ? allChartsList.value.month : [];
+			chartsList.value = allChartsList.value.month ? allChartsList.value.month.list : [];
+			myselfObj.value = allChartsList.value.month ? allChartsList.value.month.self : {};
 			if (tableLastName.value == '学习时长') {
-				chartsList.value.score = chartsList.value.thisMonthStdyTmLen || "";
+				chartsList.value.forEach(item => item.score = item.thisMonthStdyTmLen);
+				myselfObj.value.score = myselfObj.value.thisMonthStdyTmLen;
 			} else if (tableLastName.value == '练习次数') {
-				chartsList.value.score = chartsList.value.thisMonthPractCnt || "";
+				chartsList.value.forEach(item => item.score = item.thisMonthPractCnt);
+				myselfObj.value.score = myselfObj.value.thisMonthPractCnt;
 			} else if (tableLastName.value == '考试次数') {
-				chartsList.value.score = chartsList.value.thisMonthExamCnt || "";
+				chartsList.value.forEach(item => item.score = item.thisMonthExamCnt);
+				myselfObj.value.score = myselfObj.value.thisMonthExamCnt;
 			} else if (tableLastName.value == '通关课程数') {
-				chartsList.value.score = chartsList.value.thisMonthCrsCnt || "";
+				chartsList.value.forEach(item => item.score = item.thisMonthCrsCnt);
+				myselfObj.value.score = myselfObj.value.thisMonthCrsCnt;
 			}
 		} else if (item.value == 'week') {
-			chartsList.value = allChartsList.value.week ? allChartsList.value.week : [];;
+			chartsList.value = allChartsList.value.week ? allChartsList.value.week.list : [];
+			myselfObj.value = allChartsList.value.week ? allChartsList.value.week.self : {};
 			if (tableLastName.value == '学习时长') {
-				chartsList.value.score = chartsList.value.thisWeekStdyTmLen || "";
+				chartsList.value.forEach(item => item.score = item.thisWeekStdyTmLen);
+				myselfObj.value.score = myselfObj.value.thisWeekStdyTmLen;
 			} else if (tableLastName.value == '练习次数') {
-				chartsList.value.score = chartsList.value.thisWeekPractCnt || "";
+				chartsList.value.forEach(item => item.score = item.thisWeekPractCnt);
+				myselfObj.value.score = myselfObj.value.thisWeekPractCnt;
 			} else if (tableLastName.value == '考试次数') {
-				chartsList.value.score = chartsList.value.thisWeekExamCnt || "";
+				chartsList.value.forEach(item => item.score = item.thisWeekExamCnt);
+				myselfObj.value.score = myselfObj.value.thisWeekExamCnt;
 			} else if (tableLastName.value == '通关课程数') {
-				chartsList.value.score = chartsList.value.thisWeekCrsCnt || "";
+				chartsList.value.forEach(item => item.score = item.thisWeekCrsCnt);
+				myselfObj.value.score = myselfObj.value.thisWeekCrsCnt;
 			}
 		}
-		//我的排名---接口待联调
-		// myselfList.value = chartsList.value.myselfList || [];
 	}
 	onMounted(() => {
 		
 		//挡板数据代码
-		let tempList = {
-			annual: [{
-					userName: "江心",
-					score: 94,
-					dept: "吉林银行吉林分行",
-					userId: "USER001",
-					imgAddr: "/static/images/charts/avator.png"
-				},
-				{
-					userName: "李婉儿",
-					score: 98,
-					dept: "吉林银行吉林分行"
-				},
-				{
-					userName: "百里里",
-					score: 88,
-					dept: "吉林银行吉林分行"
-				},
-				{
-					userName: "黎明",
-					score: 94,
-					dept: "吉林银行吉林分行",
-					imgAddr: "/static/images/charts/avator.png"
-				},
-				{
-					userName: "张伟",
-					score: 91,
-					dept: "吉林银行吉林分行"
-				},
-				{
-					userName: "俞小凡",
-					score: 89,
-					dept: "吉林银行吉林分行",
-					imgAddr: "/static/images/charts/avator.png"
-				},
-				{
-					userName: "黎明",
-					score: 94,
-					dept: "吉林银行吉林分行"
-				},
-				{
-					userName: "张伟",
-					score: 91,
-					dept: "吉林银行吉林分行"
-				},
-				{
-					userName: "俞小凡",
-					score: 89,
-					dept: "吉林银行吉林分行"
-				},
-				{
-					userName: "江月心",
-					score: 10,
-					dept: "吉林银行吉林分行"
-				}
-			]
-		}
-		learnTimeList.value = tempList;
-		allChartsList.value = learnTimeList.value;
-		chartsList.value = tempList.annual;
-		console.log(chartsList.value, '1111111')
-		chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen;
-		console.log(chartsList.value, '222222')
-		myselfList.value = chartsList.value.filter(item => item.userId == userId)
-		console.log(myselfList.value, '3333')
-		myselfList.value[0].rank = "待定888888";
-		if (chartsList.value.length > 3) {
-			newChartsList.value = chartsList.value.slice(3).concat();
-		} else {
-			newChartsList.value = chartsList.value;
-		}
-		console.log(learnTimeList.value, 'learnTimeList')
+		// let tempList = {
+		// 	annual: [{
+		// 			userName: "江心",
+		// 			score: 94,
+		// 			dept: "吉林银行吉林分行",
+		// 			userId: "USER001",
+		// 			imgAddr: "/static/images/charts/avator.png"
+		// 		},
+		// 		{
+		// 			userName: "李婉儿",
+		// 			score: 98,
+		// 			dept: "吉林银行吉林分行"
+		// 		},
+		// 		{
+		// 			userName: "百里里",
+		// 			score: 88,
+		// 			dept: "吉林银行吉林分行"
+		// 		},
+		// 		{
+		// 			userName: "黎明",
+		// 			score: 94,
+		// 			dept: "吉林银行吉林分行",
+		// 			imgAddr: "/static/images/charts/avator.png"
+		// 		},
+		// 		{
+		// 			userName: "张伟",
+		// 			score: 91,
+		// 			dept: "吉林银行吉林分行"
+		// 		},
+		// 		{
+		// 			userName: "俞小凡",
+		// 			score: 89,
+		// 			dept: "吉林银行吉林分行",
+		// 			imgAddr: "/static/images/charts/avator.png"
+		// 		},
+		// 		{
+		// 			userName: "黎明",
+		// 			score: 94,
+		// 			dept: "吉林银行吉林分行"
+		// 		},
+		// 		{
+		// 			userName: "张伟",
+		// 			score: 91,
+		// 			dept: "吉林银行吉林分行"
+		// 		},
+		// 		{
+		// 			userName: "俞小凡",
+		// 			score: 89,
+		// 			dept: "吉林银行吉林分行"
+		// 		},
+		// 		{
+		// 			userName: "江月心",
+		// 			score: 10,
+		// 			dept: "吉林银行吉林分行"
+		// 		}
+		// 	]
+		// }
+		// learnTimeList.value = tempList;
+		// allChartsList.value = learnTimeList.value;
+		// chartsList.value = tempList.annual;
+		// console.log(chartsList.value, '1111111')
+		// chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen;
+		// console.log(chartsList.value, '222222')
+		// myselfObj.value = chartsList.value.filter(item => item.userId == userId)
+		// console.log(myselfObj.value, '3333')
+		// if (chartsList.value.length > 3) {
+		// 	newChartsList.value = chartsList.value.slice(3).concat();
+		// } else {
+		// 	newChartsList.value = chartsList.value;
+		// }
+		// console.log(learnTimeList.value, 'learnTimeList')
 		//挡板数据代码
-		
+		console.log(myselfObj.value,'78787878')
 		getLeaderBoardStdyTmApi().then(res => {
 			console.log(res, 'getLeaderBoardStdyTmApi')
-			
-			//挡板数据代码
-			let tempList = {
-				annual: [{
-						userName: "江心",
-						score: 94,
-						dept: "吉林银行吉林分行",
-						userId: "USER001",
-						imgAddr: "/static/images/charts/avator.png"
-					},
-					{
-						userName: "李婉儿",
-						score: 98,
-						dept: "吉林银行吉林分行"
-					},
-					{
-						userName: "百里里",
-						score: 88,
-						dept: "吉林银行吉林分行"
-					},
-					{
-						userName: "黎明",
-						score: 94,
-						dept: "吉林银行吉林分行",
-						imgAddr: "/static/images/charts/avator.png"
-					},
-					{
-						userName: "张伟",
-						score: 91,
-						dept: "吉林银行吉林分行"
-					},
-					{
-						userName: "俞小凡",
-						score: 89,
-						dept: "吉林银行吉林分行"
-					},
-					{
-						userName: "黎明",
-						score: 94,
-						dept: "吉林银行吉林分行"
-					},
-					{
-						userName: "张伟",
-						score: 91,
-						dept: "吉林银行吉林分行"
-					},
-					{
-						userName: "俞小凡",
-						score: 89,
-						dept: "吉林银行吉林分行"
-					},
-					{
-						userName: "江月心",
-						score: 10,
-						dept: "吉林银行吉林分行"
-					}
-				]
-			}
-			learnTimeList.value = tempList;
+			learnTimeList.value = res.body || [];
 			allChartsList.value = learnTimeList.value;
-			chartsList.value = tempList.annual;
-			console.log(chartsList.value, '1111111')
-			chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen;
-			console.log(chartsList.value, '222222')
-			myselfList.value = chartsList.value.filter(item => item.userId == userId)
-			console.log(myselfList.value, '3333')
-
-			myselfList.value[0].rank = "待定888888";
-			//挡板数据代码
-
-
-			// learnTimeList.value = res.body || [];
-			// allChartsList.value = learnTimeList.value;
-			// chartsList.value = allChartsList.value.annual?allChartsList.value.annual:[];
-			// chartsList.value.score = learnTimeList.value.annual?learnTimeList.value.annual.annlStdyTmLen:"";
+			chartsList.value = allChartsList.value.annual?allChartsList.value.annual.list:[];
+			myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
+			// chartsList.value[0].dept = "吉林银行吉林分行"
+			// myselfObj.value.dept = "吉林银行吉林分行"
+			console.log(chartsList.value,'chartsList.value')
+			console.log(myselfObj.value,myselfObj.value,'myselfObj.value')
+			chartsList.value.forEach(item => item.score = item.annlStdyTmLen);
+			myselfObj.value.score = myselfObj.value.annlStdyTmLen;
 			if (chartsList.value.length > 3) {
 				newChartsList.value = chartsList.value.slice(3).concat();
 			} else {
 				newChartsList.value = chartsList.value;
 			}
-			console.log(learnTimeList.value, 'learnTimeList')
+			console.log(newChartsList.value, 'newChartsList')
 		})
 		getLeaderBoardPractCntApi().then(res => {
 			console.log(res, 'getLeaderBoardPractCntApi')

From b885a6600cd10cf7bd3fc03f712ff51aaa3c31c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 19 Aug 2025 18:27:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E7=AD=94=E9=A2=98=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../examination/radio-subject-item.vue        |  6 +-
 src/components/examination/radio-subject.vue  | 61 +++++++++++--------
 src/pages/course/components/talkingItem.vue   | 18 +++++-
 src/pages/course/study.vue                    | 10 ++-
 4 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/src/components/examination/radio-subject-item.vue b/src/components/examination/radio-subject-item.vue
index 9d4149b9..66f5be7c 100644
--- a/src/components/examination/radio-subject-item.vue
+++ b/src/components/examination/radio-subject-item.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="option_item" @click.stop="click_option()" :class="select_status">
 		<view class="option_text">
-			{{props.analysisVo.itemContent}}
+			{{props.analysisVo.itemNo}}. {{props.analysisVo.itemContent}}
 		</view>
 		<!-- 	<image v-show="select_status==='primary'" class="img" src="@/static/images/common/primary.png" mode="heightFix">
 		</image>
@@ -47,9 +47,9 @@
 	});
 	const select_status = computed(() => {
 		if (props.backend_answer.length === 0) {
-			return props.my_answer.includes(props.analysisVo.itemId) ? 'primary' : 'info';
+			return (props.my_answer||[]).includes(props.analysisVo.itemId) ? 'primary' : 'info';
 		} else {
-			return props.my_answer.includes(props.analysisVo.itemId) ? 'success' :
+			return (props.my_answer||[]).includes(props.analysisVo.itemId) ? 'success' :
 				'error';
 		}
 	})
diff --git a/src/components/examination/radio-subject.vue b/src/components/examination/radio-subject.vue
index d7bb0200..a1c85507 100644
--- a/src/components/examination/radio-subject.vue
+++ b/src/components/examination/radio-subject.vue
@@ -4,13 +4,13 @@
 			<view class="type">
 				{{subject_type_text}}
 			</view>
-			<view class="score">
+			<view class="score" v-if="mode !== 'study'">
 				5分
 			</view>
-			<view class="fl1">
+			<view class="fl1" v-if="mode !== 'study'">
 
 			</view>
-			<view class="right">
+			<view class="right" v-if="mode !== 'study'">
 				<view class="mark_and_feedback_div">
 					<image :src="markIcon(props.item.mark?'#0066FF':'#ABABAB')" class="img" @click="mark_click()"></image>
 					<image :src="feedbackIcon()" class="img" @click="feedback_click()"></image>
@@ -23,13 +23,13 @@
 			{{subject_data.qnsContent}}
 		</view>
 		<view class="option_div">
-			<radioSubjectItem v-for="(analysisVo,index) in subject_data.itemVos" @click_option="click_option"
-				:key="index" :analysisVo="analysisVo" :my_answer="props.item.my_answer"
-				:backend_answer="props.item.backend_answer"></radioSubjectItem>
+			<radioSubjectItem v-for="(analysisVo,index) in subject_data.itemVos" @click_option="click_option" :key="index"
+				:analysisVo="analysisVo" :my_answer="props.item.my_answer" :backend_answer="props.item.backend_answer">
+			</radioSubjectItem>
 		</view>
-		<view class="option_div_button" v-if="subject_data.qnsTyp==='MU' && props.mode=='practice'" >
+		<view class="option_div_button" v-if="subject_data.qnsTyp==='MU' &&  ['practice','study'].includes(props.mode)">
 			<uv-button type="primary" class="send_evaluate" :custom-style="customStyle" :throttleTime="300"
-				:hairline="false" >确定</uv-button>
+				@click="muCheckbox" :hairline="false">确定</uv-button>
 		</view>
 	</view>
 </template>
@@ -44,7 +44,8 @@
 	} from 'vue'
 	import radioSubjectItem from './radio-subject-item.vue'
 	import {
-		markIcon,feedbackIcon
+		markIcon,
+		feedbackIcon
 	} from '@/common/imgSvg'
 	import {
 		SUBJECT_TYPE
@@ -66,14 +67,14 @@
 			required: true,
 		}
 	});
-	
-	const feedback_click = () =>{
+
+	const feedback_click = () => {
 		emit('subject_click', 'feedback', props.item)
 	}
-	const mark_click = () =>{
+	const mark_click = () => {
 		emit('subject_click', 'mark', props.item)
 	}
-	
+
 	const subject_data = reactive({
 		qnsId: '',
 		qnsContent: '',
@@ -97,35 +98,45 @@
 		// // 无论什么类型如果表里已经有了，再次点击就是弹出
 		if (props.item.my_answer.includes(analysisVo.itemId)) {
 			props.item.my_answer = props.item.my_answer.filter(id => id !== analysisVo.itemId);
-		} 
-		else if (props.item.qnsTyp === 'SN') { // 单选
+		} else if (props.item.qnsTyp === 'SN') { // 单选
 			// 单选插入，并且移除其他
 			props.item.my_answer[0] = analysisVo.itemId
-		} 
-		else if (props.item.qnsTyp === 'MU') { // 多选题
+			muCheckbox()
+		} else if (props.item.qnsTyp === 'MU') { // 多选题
 			// 多选直接插入
 			props.item.my_answer.push(analysisVo.itemId)
 		} else if (props.item.qnsTyp === 'JD') { // 判断题
 			// 判断插入，并且移除其他
 			props.item.my_answer = [analysisVo.itemId]
+			muCheckbox()
 		}
 	}
+	const muCheckbox = () => {
+		emit('subject_click', 'answer', {
+			qnsTyp: props.item.qnsTyp,
+			qnsId: props.item.qnsId,
+			answer: props.item.my_answer,
+			answerItems: subject_data.itemVos.filter(t=> props.item.my_answer.includes(t.itemId))
+		})
+	}
 </script>
 
 <style scoped lang="scss">
-	.mark_and_feedback_div{
+	.mark_and_feedback_div {
 		display: flex;
 		height: 100%;
 		justify-content: end;
 		align-items: center;
-		.img{
+
+		.img {
 			width: 38rpx;
 			height: 38rpx;
 			margin-left: 4rpx;
 			padding: 4rpx;
 		}
 	}
-	.option_div_button{
+
+	.option_div_button {
 		width: 100%;
 		height: 84rpx;
 		padding-top: 30rpx;
@@ -134,16 +145,18 @@
 		flex-direction: column;
 		align-items: center;
 	}
+
 	.item {
 		// height: 170rpx;
 		overflow: hidden;
 		display: flex;
 		flex-direction: column;
 		padding-bottom: 40rpx;
-		
+
 		.top {
 			display: flex;
 			align-items: center;
+
 			.type {
 				width: 108rpx;
 				height: 46rpx;
@@ -168,7 +181,7 @@
 			.right {
 				display: flex;
 				align-items: center;
-				
+
 				.right_text {
 					font-family: PingFangSC;
 					font-weight: 600;
@@ -178,9 +191,9 @@
 					font-style: normal;
 				}
 			}
-			
+
 		}
-		
+
 		.question_text {
 			font-family: PingFangSC;
 			font-weight: 500;
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 737e9149..7b7b6e08 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -19,10 +19,11 @@
 				<text class="talking-text" v-if="[3, 5, 6].indexOf(type) >= 0  && !dataInfo.isLoading">
 					{{ showContent }}
 				</text>
-				<text class="talking-text" v-if="[4].indexOf(type) >= 0">
+				<text class="talking-text" v-if="[4].indexOf(type) >= 0 && dataInfo.qnsTyp === 'ES'">
 					<!-- 请您思考并作答:<br> -->
 					{{ showContent }}
 				</text>
+				<RadioSubject v-if="[4].indexOf(type) >= 0 && dataInfo.qnsTyp !== 'ES'" :item="dataInfo" :mode="mode" @subject_click="subject_click" />
 				<view v-if="type === 3" style="overflow: hidden;">
 					<ImagePreview class="cont-img-box" v-if="(dataInfo.imageAddrs||[]).length>0" :imgId="dataInfo.imageAddrs[0]" :previewDetail="true"></ImagePreview>
 					<VideoPreview class="cont-img-box" v-if="(dataInfo.vidoAddrs||[]).length>0" :fileId="dataInfo.vidoAddrs[0]"></VideoPreview>
@@ -199,6 +200,8 @@ import { getUserInfo } from '@/common/common';
 import { useStorageStore } from "@/store/storage.js"
 import { onUnload } from '@dcloudio/uni-app'
 
+import RadioSubject from '@/components/examination/radio-subject.vue'
+
 const storageStore = useStorageStore()
 const audioCacheObj = computed(() => storageStore.audioObj)
 	const props = defineProps({
@@ -249,13 +252,15 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 	})
 	
 	const { type, dataInfo, activeVoiceId, isPlaying, isLast, lastQuestionInfo, teacherInfo} = toRefs(props)
-	const emit = defineEmits(['changePlay', 'nextQuestion', 'withdraw', 'finishQuestion'])
+	const emit = defineEmits(['changePlay', 'nextQuestion', 'withdraw', 'finishQuestion', 'answerQuestion'])
 	// 声音播放初始化
 	const talkVoiceObj = ref(uni.createInnerAudioContext())
 	talkVoiceObj.value.playbackRate = Number(props.voiceRate)
 	const userInfo = computed(() => getUserInfo())
 	const itemVoice = ref('')
 	
+	const mode = ref('study') // 考试 examination 练习practice 学习study
+	
 	const showWithdraw = computed(()=>{
 		let _isMe = unref(lastQuestionInfo).qstLogId === unref(dataInfo).qstLogId
 		let _isQuestion = unref(lastQuestionInfo).isQuestion
@@ -316,6 +321,7 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 		return str.replace(/\/n/g,"\n")
 	}
 	const voiceTime = ref('')
+	const itemInfo = ref({})
 	onMounted(()=>{
 		console.log()
 		initVoice()
@@ -504,6 +510,13 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 	const finishQuestion = (data) => {
 		emit('finishQuestion',data)
 	}
+	// 答题 选择
+	const subject_click = (type,data) => {
+		if(type === 'answer'){
+			emit('answerQuestion', data)
+		}
+	}
+	
 </script>
 
 <style lang="scss">
@@ -546,6 +559,7 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 			background-color: #fff;
 			overflow: hidden;
 			padding-bottom: 30rpx;
+			width: 100%;
 			&.talking-info-less{
 				float: left;
 				min-width: 400rpx;
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 89471330..fe4a82ed 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -73,6 +73,7 @@
 					@changePlay="changePlayItemId"
 					@nextQuestion="nextQuestionSuccess"
 					@withdraw="withdrawNow"
+					@answerQuestion="answerQuestionNow"
 					@finishQuestion="finishQuestionNow"
 					:id="'item' + item.id"
 					:isLast="talkingList.length === (index+1)"
@@ -440,6 +441,7 @@ const getQuestionInfoUnStudy = (pgrphId) => {
 			}).finally(() => {})	
 			return
 		}
+		console.log(_body.chatBody)
 		if(_body.chatBody && _body.chatBody?.stdyStat !== 'N'){
 			let _id = new Date().getTime() + 'id'
 			lastTalkingInfo.value = {
@@ -454,8 +456,11 @@ const getQuestionInfoUnStudy = (pgrphId) => {
 				type: 4,
 				userInfo: {...choiceTeacherInfo.value},
 				id: _id,
-				isQuestion: true
+				isQuestion: true,
+				my_answer:[],
+				backend_answer: []
 			}
+		console.log(lastTalkingInfo.value)
 			talkingList.value.push(JSON.parse(JSON.stringify(lastTalkingInfo.value)))
 			qstLogId.value = _body.chatBody?.qstLogId
 			scrollToBottomNow()
@@ -827,6 +832,9 @@ const withdrawNow = (data) => {
 	})
 }
 const loadingQstLogId = ref('')
+const answerQuestionNow = (data) => {
+	console.log(data,1111111111)
+}
 // 完成 
 const finishQuestionNow = (data) => {
 	textChartApi({