1

App.vue

@@ -0,0 +1,42 @@
+<script>
+	import pageAnimation from './components/page-animation'
+	export default {
+		mixins: [pageAnimation],
+		onLaunch: function() {
+			console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
+			console.log('App Launch')
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
+<style lang="scss">
+	/*每个页面公共css */
+	@import '@/uni_modules/uni-scss/index.scss';
+	/* #ifndef APP-NVUE */
+	@import '@/static/customicons.css';
+
+	// 设置整个项目的背景色
+	page {
+		background-color: #f5f5f5;
+		overflow: auto;
+		font-size: 16px;
+
+	}
+
+	/* #endif */
+	.example-info {
+		font-size: 14px;
+		color: #333;
+		padding: 10px;
+	}
+
+	/deep/.uni-input-input {
+		font-size: 16px
+	}
+</style>

components/bottom.vue

@@ -0,0 +1,41 @@
+<template>
+	<view class="bottom">
+		<view class="row1">
+			Copyright changyuntong56.com All Right Reserved @黑龙江畅运通物流供应链有限公司
+		</view>
+		<view class="">
+			<a href="https://beian.miit.gov.cn">黑ICP备2022004661号</a>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'bottom',
+		data() {
+			return {
+
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+<style lang="scss" lang="scss">
+	.bottom {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 100rpx 0;
+	}
+
+	a {
+		text-decoration: none;
+		color: black;
+	}
+</style>

components/page-animation/index.css

@@ -0,0 +1,28 @@
+/* #ifdef H5 */
+uni-page {
+	opacity: 0;
+}
+
+uni-page.animation-before {
+	/* 在页面上使用 transform 会导致页面内的 fixed 定位渲染为 absolute，需要在动画完成后移除 */
+	transform: translateY(20px);
+}
+
+uni-page.animation-leave {
+	transition: all .3s ease;
+}
+
+uni-page.animation-enter {
+	transition: all .3s ease;
+}
+
+uni-page.animation-show {
+	opacity: 1;
+}
+
+uni-page.animation-after {
+	/* 在页面上使用 transform 会导致页面内的 fixed 定位渲染为 absolute，需要在动画完成后移除 */
+	transform: translateY(0);
+}
+
+/* #endif */

components/page-animation/index.vue

@@ -0,0 +1,37 @@
+<script>
+	import './index.css'
+	export default {
+		// #ifdef H5
+		onLaunch: function() {
+			this.show()
+			this.$router.beforeEach((to, from, next) => {
+				this.hide(next)
+			})
+			this.$router.afterEach(() => {
+				setTimeout(this.show, 50)
+			})
+		},
+		methods: {
+			hide(callback) {
+				const classList = document.querySelector('uni-page').classList
+				classList.add('animation-before', 'animation-leave')
+				classList.remove('animation-show')
+				setTimeout(() => {
+					classList.remove('animation-before', 'animation-leave')
+					callback && callback()
+				}, 300)
+			},
+			show() {
+				const classList = document.querySelector('uni-page').classList
+				classList.add('animation-before')
+				setTimeout(() => {
+					classList.add('animation-enter', 'animation-after', 'animation-show')
+					setTimeout(() => {
+						classList.remove('animation-before', 'animation-after', 'animation-enter')
+					}, 300)
+				}, 20)
+			}
+		},
+		// #endif
+	}
+</script>

components/top.vue

@@ -0,0 +1,194 @@
+<template>
+	<view class="top">
+		<view class="left">
+			<image src="../static/logo.png" mode="widthFix" class="img"></image>
+			<view class="nav">
+				<text class="text" @click="clickIndex" :class="type=='index'?'navactive':''">首页</text>
+				<text class="text" @click="toProduct" :class="type=='product'?'navactive':''">产品介绍</text>
+				<text class="text" @click="toAboutUs" :class="type=='aboutUs'?'navactive':''">关于我们</text>
+				<text class="text" @click="toSupport" :class="type=='support'?'navactive':''">技术支持</text>
+			</view>
+		</view>
+
+		<view class="right-content" v-if='hasLogin'>
+			<view class="phone" @click="phoneClick">
+				<image :src="userInfo.avatarUrl" class="img"></image>
+				<view class="">
+					{{userInfo.phone}}
+				</view>
+			</view>
+			<view class="out-view" v-if="isSHowUser">
+				<view class="text" @click="userClick">
+					个人中心
+				</view>
+				<view class="text" @click="logOut">
+					退出
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: 'top',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				isSHowPhone: true,
+				isSHowUser: false,
+			}
+		},
+		watch: {
+			title(newVal) {
+				if (uni.report && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		methods: {
+			logOut() {
+				uni.clearStorageSync();
+				var that = this
+
+				this.$store.commit('logout')
+				uni.navigateTo({
+					url: `/pages/index/index`
+				})
+			},
+			phoneClick() {
+				this.isSHowUser = !this.isSHowUser
+			},
+			onClick() {
+				this.$emit('click')
+			},
+			clickIndex() {
+				uni.navigateTo({
+					url: "/pages/index/index"
+				})
+			},
+			userClick() {
+				uni.navigateTo({
+					url: "/pages/index/user"
+				})
+			},
+			toProduct() {
+				uni.navigateTo({
+					url: "/pages/index/product"
+				})
+			},
+			toAboutUs() {
+				uni.navigateTo({
+					url: "/pages/index/aboutUs"
+				})
+			},
+			toSupport() {
+				uni.navigateTo({
+					url: "/pages/index/support"
+				})
+			},
+		}
+	}
+</script>
+<style lang="scss">
+	.navactive {
+		color: #2F54EF !important;
+	}
+
+	.img {
+		width: 200rpx;
+	}
+
+	.right-content {
+		position: relative;
+
+		.phone {
+			display: flex;
+			align-items: center;
+			position: relative;
+			cursor: pointer;
+		}
+
+		.img {
+			width: 64rpx;
+			height: 64rpx;
+			border-radius: 50%;
+			margin-right: 10px;
+		}
+
+		.out-view {
+			position: absolute;
+			bottom: -80px;
+			left: 45px;
+			z-index: 2;
+			width: 182rpx;
+			height: 148rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
+			border-radius: 12px;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			.text {
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #333333;
+				line-height: 20px;
+				cursor: pointer;
+			}
+		}
+	}
+
+	.top {
+		display: flex;
+		align-items: center;
+		background: white;
+		justify-content: space-between;
+		padding: 66rpx 10%;
+		min-width: 1200px;
+		box-sizing: border-box;
+
+		.left {
+			display: flex;
+
+			.nav {
+				margin-left: 200rpx;
+			}
+		}
+
+		// color: white;
+		// background: black
+
+	}
+
+	.title {
+		margin: 0 40rpx;
+	}
+
+	.nav {
+		display: flex;
+		align-items: center;
+
+		.text {
+			font-size: 16px;
+			color: #65676B;
+			margin-right: 200rpx;
+			cursor: pointer;
+		}
+	}
+</style>

components/uni-section/uni-section.vue

@@ -0,0 +1,140 @@
+<template>
+	<view class="uni-section">
+		<view class="uni-section-header" nvue>
+			<view v-if="type" class="uni-section__head">
+				<view :class="type" class="uni-section__head-tag"/>
+			</view>
+			<view class="uni-section__content">
+				<text :class="{'distraction':!subTitle}" :style="{color:color}" class="uni-section__content-title">{{ title }}</text>
+				<text v-if="subTitle" class="uni-section__content-sub">{{ subTitle }}</text>
+			</view>
+		</view>
+		<view :style="{padding: padding ? '10px' : ''}">
+			<slot/>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * Section 标题栏
+	 * @description 标题栏
+	 * @property {String} type = [line|circle] 标题装饰类型
+	 * 	@value line 竖线
+	 * 	@value circle 圆形
+	 * @property {String} title 主标题
+	 * @property {String} subTitle 副标题
+	 */
+
+	export default {
+		name: 'UniSection',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			color:{
+				type: String,
+				default: '#333'
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+			padding: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {}
+		},
+		watch: {
+			title(newVal) {
+				if (uni.report && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	$uni-primary: #2979ff !default;
+	
+	.uni-section {
+		background-color: #fff;
+		// overflow: hidden;
+		margin-top: 10px;
+	}
+	.uni-section-header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 12px 10px;
+		// height: 50px;
+		font-weight: normal;
+	}
+	.uni-section__head {
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		margin-right: 10px;
+	}
+
+	.line {
+		height: 12px;
+		background-color: $uni-primary;
+		border-radius: 10px;
+		width: 4px;
+	}
+
+	.circle {
+		width: 8px;
+		height: 8px;
+		border-top-right-radius: 50px;
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: $uni-primary;
+	}
+
+	.uni-section__content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		flex: 1;
+		color: #333;
+	}
+
+	.uni-section__content-title {
+		font-size: 14px;
+		color: $uni-primary;
+	}
+
+	.distraction {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-section__content-sub {
+		font-size: 12px;
+		color: #999;
+		line-height: 16px;
+		margin-top: 2px;
+	}
+</style>

config/index.js

@@ -0,0 +1,11 @@
+const dev = {
+	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'http://localhost:8099',
+	h5Appid: 'wxb66b599f7f61b46f',
+	debug: false
+}
+
+export function def() {
+	return dev
+}

index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>黑龙江畅运通物流供应链有限公司官网</title>
+		<!--preload-links-->
+		<!--app-context-->
+	</head>
+	<body>
+		<div id="app">
+			<!--app-html-->
+		</div>
+		<script type="module" src="/main.js"></script>
+	</body>
+</html>

main.js

@@ -0,0 +1,34 @@
+// #ifndef VUE3
+import Vue from 'vue'
+import App from './App'
+import store from './store'
+import uView from '@/uni_modules/uview-ui'
+import request from '@/util/request.js'
+import utils from '@/util/util.js'
+Vue.prototype.$request = request
+Vue.prototype.$utils = utils
+Vue.prototype.$store = store
+Vue.use(uView)
+Vue.config.productionTip = false
+
+App.mpType = 'app'
+
+const app = new Vue({
+	...App
+})
+app.$mount()
+// #endif
+
+// #ifdef VUE3
+import {
+	createSSRApp
+} from 'vue'
+import App from './App.vue'
+export function createApp() {
+	const app = createSSRApp(App)
+	return {
+		store,
+		...app
+	}
+}
+// #endif

manifest.json

@@ -0,0 +1,57 @@
+{
+    "name" : "cytWebsite",
+    "appid" : "__UNI__1EDE80F",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "template" : ""
+    }
+}

pages.json

@@ -0,0 +1,81 @@
+{
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "黑龙江畅运通物流供应链有限公司官网"
+			}
+		}, {
+			"path": "pages/index/info",
+			"style": {
+				"navigationBarTitleText": "ptgs"
+			}
+		}, {
+			"path": "pages/index/infoDetail",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/user",
+			"style": {
+				"navigationBarTitleText": "个人中心",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/zx",
+			"style": {
+				"navigationBarTitleText": "资讯",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/zxDetail",
+			"style": {
+				"navigationBarTitleText": "资讯详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/product",
+			"style": {
+				"navigationBarTitleText": "产品",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/aboutUs",
+			"style": {
+				"navigationBarTitleText": "关于我们",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/support",
+			"style": {
+				"navigationBarTitleText": "技术支持",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/index/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationStyle": "custom",
+		"backgroundColor": "#F8F8F8",
+		"app-plus": {
+			"background": "#efeff4"
+		}
+	}
+}

pages/index/aboutUs.vue

@@ -0,0 +1,196 @@
+<template>
+	<view class="content">
+		<top :type="pageType"></top>
+		<view class="content1">
+			<view class="banner">
+				关于我们
+			</view>
+			<view class="content2">
+				<view class="left">
+					<image src="../../static/logo1.png" style="width: 279px;height: 93px;"></image>
+				</view>
+				<view class="text">
+					黑龙江中天昊元贸易有限公司自2019年7月成立至今，从仅2名员工的人资力量以及从俭的办公条件，到现以发展转型为员工的70余人，年贸易周转量150余万吨的规模性粮食贸易公司。
+					企业依靠稳定的资金链体系，清晰的业务思路，作为经营发展的基本条件。依靠快速的市场反应能力，抢占市场先机。依靠不断攀升的贸易周转量和持续稳定的供货能力，成为了各用粮企业的明星供应商。依靠很能吃苦的专业团队，实现了库存动态化及财务清晰化。
+					“四个依靠”结合固态仓储贸易后盾百万吨仓储库房，积极开展了多元化粮食贸易经营，公司业务已涉及包括粮食代收、代储、代销，自收、自储、自销等多种经营模式。
+
+				</view>
+			</view>
+			<view class="content3">
+				<view class="left">
+					<view class="title">
+						销售体系的完善与健全
+					</view>
+					<view class="text">
+						经过很能吃苦的业务团队全体员工共同努力，企业已与上下游客户展开了采销一体化的合作，并形成了稳定长久的供求关系及战略合作伙伴。在北方主要粮食中转港口鲅鱼圈港、布局了港口粮食中转库及销售团队，为整个公司贸易流转提供了重要的销售前沿的业务支撑，形成了动态库存逐步向销售终端前移，多节点实现销售的重要战略目标。并实现高资金周转率、零坏账、无亏损、利润逐步递增的财务目标。
+					</view>
+				</view>
+				<view class="right">
+					<image src="../../static/tu2x.png" style="width: 456px;height: 342px;"></image>
+				</view>
+			</view>
+			<view class="content4">
+				<view class="left">
+					<image src="../../static/tu.png" style="width: 512px;height: 420px;margin-right: 100px;"></image>
+
+				</view>
+				<view class=" right">
+					<view class="title">
+						铁路及公路粮食集散中心的成功布局
+					</view>
+					<view class="text">
+						通过量价互保的合作方式，成功布局运行了仓储及铁路发运为一体的粮食集散发运中心，结合仓储院内铁路专用线路，业务以辐射到区域内产区的烘干代加工、与收购单位合作收购、自主独立收购网点等模式，建立了稳定库存体系，以强大的自有月20万吨动态库存为经营基础，成为了广大用粮企业的诚信、稳定的供应商。
+						中转仓储网络现以辐射覆盖至黑龙江克东、克山、讷河、龙江、甘南、富裕、绥化、青冈、肇东、呼兰、双城、依兰、海伦、佳木斯、五大连池、嫩江、吉林洮南、白城、镇赉、农安、榆树、德惠、扶余，内蒙扎赉特旗、乌兰浩特、兴安盟、辽宁台安、黑山、新民，辽中等黑、吉、辽、内蒙北部等主要粮食产区，强大的收购网络为企业奠定了坚实的销售基础
+						。
+
+					</view>
+				</view>
+			</view>
+			<view class="content5">
+				<view class="title">
+					未来企业经营方向
+				</view>
+				<view class="f-title">
+					向企业品牌化、价值化迈步前进
+				</view>
+				<view class="text">
+					企业在不断夯实管理基础、积累业务经验、总结经营现状的过程中不断成长的同时，对未来企业的发展定位进行了认真规划，思路与方向也逐渐清晰，谋求企业健康及长久经营发展下去，品牌化的经营思路是未来企业经营的重中之重，与上下游客户进行资源整合、优势互补、互利共赢，合作经营是市场趋势，开发、使用、运营，粮食行业E+互联网产品，是经营创新，创造企业的社会价值，是经营目标，在保证资金利用率，贸易中转率的同时，做具有强大的市场供应份额、长久稳定供求关系、有市场价值及存在意义的贸易商，做对地方经济有贡献的明星企业，做有大发展、大觉悟、大智慧的稳定经营企业便是未来N年“中天人的昊元梦”。
+
+				</view>
+			</view>
+			<view class="content6">
+				<view class="left">
+					<view class="title">
+						联系我们
+					</view>
+					<view class="phone">
+						客服电话：4006688647
+					</view>
+					<!-- <view class="phone">
+						传真：010-1234567
+					</view> -->
+					<view class="phone">
+						Email：ccjgmwz@foxmail.com
+					</view>
+				</view>
+				<view class="right">
+					<!-- <image src="../../static/aboutus.png" style="width: 512px;height: 197px;"></image> -->
+				</view>
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				pageType: 'aboutUs'
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.banner {
+		width: 100%;
+		height: 840rpx;
+		background: url('../../static/banner1.png') no-repeat center;
+		background-size: cover;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: white;
+		font-size: 64rpx;
+	}
+
+	.content2 {
+		display: flex;
+		width: 70%;
+		margin: 242rpx auto;
+		justify-content: space-between;
+
+		.left {
+			margin-right: 290rpx;
+		}
+	}
+
+	.text {
+		font-size: 32rpx;
+		color: #101010;
+		line-height: 64rpx;
+	}
+
+	.title {
+		font-size: 80rpx;
+		font-weight: 600;
+		color: #0B0B0B;
+		line-height: 112rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.content3 {
+		background: red;
+		background: url('../../static/bg2x.png') no-repeat center;
+		background-size: cover;
+		height: 1160rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 15%;
+		box-sizing: border-box;
+	}
+
+	.content4 {
+		background: red;
+		background: white;
+		background-size: cover;
+		height: 1160rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 15%;
+		box-sizing: border-box;
+	}
+
+	.content5 {
+		background: url('../../static/banner.png') no-repeat center;
+		background-size: cover;
+		flex-direction: column;
+		justify-content: center;
+		height: 1160rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 15%;
+		box-sizing: border-box;
+		color: white;
+
+		.title,
+		.text {
+			color: white;
+		}
+
+		.f-title {
+			margin: 40rpx 0 180rpx 0;
+		}
+	}
+
+	.content6 {
+		background: white;
+		justify-content: center;
+		height: 1160rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 15%;
+		box-sizing: border-box;
+
+		.tilte {
+			margin-bottom: 100rpx;
+		}
+	}
+</style>

pages/index/index.vue

@@ -0,0 +1,991 @@
+<template>
+	<view class="">
+		<top :type="pageType"></top>
+		<view class="index-page">
+			<view class="content1" :class="isSM?'bgc-sm':''">
+				<view class="login" v-if="!isHaveUser||!hasLogin">
+					<view class="row1">
+						<view class="">
+							登录
+						</view>
+						<view class="line">
+						</view>
+						<view class="sm" @click="smClick(1)" :class="isSM?'text-active':''">
+							扫码登录
+						</view>
+						<view class="dx" @click="smClick(2)" :class="!isSM?'text-active':''">
+							短信登录
+						</view>
+						<!-- <view class="left">
+							{{isSM?'扫码登录':'短信登录'}}
+						</view>
+						<u-icon name="photo" color="#2979ff" size="60" class='ewm' @click="smClick"></u-icon> -->
+					</view>
+					<view class="bottom-view" v-if="!isSM">
+						<view class="row2">
+							<input placeholder="请输入手机号" v-model="phone" @change="change" maxlength="11"
+								style="border: 1px solid #EBEBEB;height: 52px;font-size: 16px;padding:0 20px;width: 100%;">
+							</input>
+						</view>
+						<view class="row2">
+							<input placeholder="请输入验证码" v-model="verifyCode" @change="change"
+								style="border: 1px solid #EBEBEB;height: 52px;font-size: 16px;padding:0 20px;width: 100%;">
+							</input>
+							<view class="wrap">
+								<u-toast ref="uToast"></u-toast>
+								<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange">
+								</u-code>
+								<view @tap="getCode" class="get-code">{{tips}}</view>
+							</view>
+						</view>
+						<view class="row3">
+							<u-button type="primary" text="确定" color="#2F54EF" class='btn' @click="submit"></u-button>
+						</view>
+					</view>
+					<view class="ewm-style" v-if="isSM">
+						<!-- <image src="../../static/ewm.png" mode="widthFix" class="img"></image> -->
+						<div class="q-login">
+							<div class="success-login" v-if="sessionStatus==3">
+								√&nbsp;登录成功，{{username}}
+							</div>
+							<div class="qcode-img" v-else>
+								<template v-if="sessionStatus==-2">
+									<div class="qr-expire" @click="resetRefresh()">
+										二维码过期,重新刷新
+									</div>
+								</template>
+								<template v-else>
+									<img :src="base64Code" class='erm-img' :class="sessionStatus==1?'swidth':''" />
+									<div v-if="sessionStatus==1" class="qcode-tips">手机已扫描,等待确认</div>
+								</template>
+							</div>
+						</div>
+					</view>
+					<view class="row4-text" v-show="isShowText" v-if="!isSM">
+						下载畅运通货主端，注册并完成身份认证，认证通过后可使用注册的账号登录本网站
+					</view>
+					<view class="row4" @click="showText" v-show="!isShowText">
+						{{isSM?'请使用畅运通货主端APP扫码登录':'获取账号'}}
+					</view>
+				</view>
+			</view>
+			<view class="content2-bgc">
+				<view class="content2">
+					<view class="title" @click="toZXPage" style="cursor: pointer;">
+						<view class="">
+							行业资讯
+							<image src="../../static/jt2.png" mode="widthFix" class="img"></image>
+						</view>
+					</view>
+					<view class="zx-content">
+						<view class="left">
+							<view class="row1">
+								<image :src="zxList[0].cover?zxList[0].cover:''" mode="widthFix" class="img"></image>
+								<view class="date">
+									<view class="day">
+										{{zxList[0].date2}}
+									</view>
+									<view class="year">
+										{{zxList[0].date1}}
+									</view>
+								</view>
+							</view>
+							<view class="title row2">
+								{{zxList[0].title}}
+							</view>
+							<view class="row3">
+								{{zxList[0].content}}
+							</view>
+							<view class="row4">
+								<view class="detaiil" style="cursor: pointer;" @click="toDetail(zxList[0].id,'zx')">
+									了解详情 <image src="../../static/jt1.png" mode="widthFix" class="img"></image>
+								</view>
+								<view class="right-text">
+									来源：{{zxList[0].issuingAgency}}
+								</view>
+							</view>
+						</view>
+						<view class="right">
+							<!-- zxLixt -->
+							<view class="row" v-for="item in zxRightList">
+								<view class="left-view">
+									<view class="date">
+										<view class="day">
+											{{item.date2}}
+										</view>
+										<view class="year">
+											{{item.date1}}
+										</view>
+									</view>
+
+								</view>
+								<view class="right-view">
+									<view class="row1">
+										{{item.title}}
+									</view>
+									<view class="row2">
+										{{item.content}}
+									</view>
+									<view class="row3">
+										<view class="text-left">
+											来源：{{item.issuingAgency}}
+										</view>
+										<view class="text-right" @click="toDetail(item.id,'zx')">
+											了解详情<image src="../../static/jt1.png" mode="widthFix" class="img"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="content3-bgc">
+				<view class="content3">
+					<view class="left">
+						<view class="title" @click="toPage(1)" style="cursor: pointer;">
+							平台公告
+							<image src="../../static/jt2.png" mode="widthFix" class="img"></image>
+						</view>
+						<!-- ggList -->
+						<view class="gg-content">
+							<view class="item" v-for="item in ggList" @click="toDetail(item.id,'公告')">
+								<view class="left">
+									<view class="point">
+
+									</view>
+									<view class="text">
+										{{item.title}}
+									</view>
+								</view>
+								<view class="date">
+									{{item.issuingDate}}
+								</view>
+							</view>
+
+						</view>
+					</view>
+					<view class="right">
+						<view class="title" @click="toPage(2)" style="cursor: pointer;">
+							处理公示
+							<image src="../../static/jt2.png" mode="widthFix" class="img"></image>
+						</view>
+						<view class="gs-content">
+							<view class="item" v-for="item in gsList" @click="toDetail(item.id,'公示')">
+								<view class="point"></view>
+								<view class="right-view">
+									<view class="text">
+										{{item.title}}
+									</view>
+									<view class="date">
+										{{item.issuingDate}}
+									</view>
+								</view>
+
+							</view>
+
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				pageType: 'index',
+				requestIp: 'http://localhost',
+				base64Code: '',
+				sessionId: '',
+				sessionStatus: 0,
+				username: '',
+				isShowText: false,
+				isSM: false,
+				items1: ['行业资讯'],
+				items: ['平台公告', '处理公示'],
+				styles: [{
+						value: 'button',
+						text: '按钮',
+						checked: true
+					},
+					{
+						value: 'text',
+						text: '文字'
+					}
+				],
+				colors: ['#2F54EF', '#4cd964', '#dd524d'],
+				current: 0,
+				colorIndex: 0,
+				activeColor: '#2F54EF',
+				styleType: 'button',
+				show: false,
+				title: '获取账号',
+				content: '下载畅运通货主端，注册并完成身份认证，认证通过后可使用注册的账号登录本网站',
+				value: '',
+				tips: '',
+				// refCode: null,
+				seconds: 10,
+				count: 0,
+				checkLogin: null,
+				user: {},
+				isHaveUser: false,
+				verifyCode: null,
+				phone: '',
+				zxList: [{
+					cover: ''
+				}],
+				zxRightList: [],
+				ggList: [],
+				gsList: []
+			}
+		},
+		onLoad() {
+			this.user = uni.getStorageSync('userInfo');
+			if (this.user) {
+				this.isHaveUser = true
+				this.$store.commit('login', this.user)
+			} else {}
+			this.getNews()
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		methods: {
+			// 获取富文本的纯文字内容
+			convertIdeogramToNormalCharacter(val) {
+				const arrEntities = {
+					'lt': '<',
+					'gt': '>',
+					'nbsp': ' ',
+					'amp': '&',
+					'quot': '"'
+				};
+				return val.replace(/&(lt|gt|nbsp|amp|quot);/ig, function(all, t) {
+					return arrEntities[t];
+				});
+			},
+			getPlainText(richCont) {
+				const str = richCont;
+				let value = richCont;
+				if (richCont) {
+					// 方法一： 
+					value = value.replace(/\s*/g, ""); //去掉空格
+					value = value.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+					value = value.replace(/↵/g, ""); //去掉所有的↵符号
+					value = value.replace(/[\r\n]/g, "") //去掉回车换行
+					value = value.replace(/&nbsp;/g, "") //去掉空格
+					value = this.convertIdeogramToNormalCharacter(value);
+					return value;
+				} else {
+					return null;
+				}
+			},
+			getNews() {
+				this.$request.baseRequest('get', '/hyPublicConsultation/selectHyPublicConsultationList').then(res => {
+						if (res.code == 200) {
+							console.log("res", res)
+							// this.$store.commit('login', res.data)
+							// this.isHaveUser = true
+							this.zxList = res.data.publicConsultations1
+							this.ggList = res.data.publicConsultations
+							this.gsList = res.data.publicConsultations2
+
+							for (let i = 0; i < this.zxList.length; i++) {
+								this.zxList[i].date1 = this.zxList[i].issuingDate.substring(0, this.zxList[i]
+									.issuingDate
+									.lastIndexOf('-'))
+								this.zxList[i].date2 = this.zxList[i].issuingDate.substring(this.zxList[i].issuingDate
+									.lastIndexOf('-') + 1, this.zxList[i].issuingDate.length)
+								this.zxList[i].content = this.getPlainText(this.zxList[i].releaseContent)
+							}
+							console.log('this.zxListt', this.zxList)
+							this.zxRightList = this.zxList.splice(1)
+							console.log('this.zxRightList', this.zxRightList)
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			submit() {
+				this.$request.baseRequest('get', '/commonUser/loginVerifyCode', {
+						phone: this.phone,
+						verifyCode: this.verifyCode,
+						loginFlag: 1,
+						identification: 2
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							console.log("res", res)
+							this.$store.commit('login', res.data)
+							this.isHaveUser = true
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			//加载
+			loadQrCode() {
+				this.$request.baseRequest('get', '/login/loginQrCode').then(res => {
+						this.base64Code = res.data.src;
+						this.sessionId = res.data.token;
+						this.startQrCodeListener();
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			//开启sse长连接
+			startQrCodeListener() {
+				let that = this
+				this.checkLogin = setInterval(() => {
+					that.$request.baseRequest('get', '/login/getLoginStatus', {
+							token: that.sessionId
+						}).then(res => {
+							that.count++;
+							console.log(that.count)
+							if (res.message == '扫描成功！') {
+								this.sessionStatus = 1
+
+							} else if (res.message == '未登录！') {
+								this.sessionStatus = 0
+							} else if (res.message == '二维码失效！') {
+								this.sessionStatus = 2
+							} else if (typeof(res.message) == 'object') {
+								this.sessionStatus = 3
+								clearInterval(this.checkLogin)
+								this.isHaveUser = true
+								that.username = res.message.userName
+								that.$store.commit('login', res.message)
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				}, 5000)
+				// let sseObj = null
+				// //发送Http长连接
+				// sseObj = new EventSource('http://192.168.110.82:8099' + "/login/getLoginStatus?token=" + this.sessionId);
+				// //回调方法
+				// sseObj.onmessage = (evt) => {
+				// 	let resultJson = JSON.parse(evt.data);
+				// 	//session状态
+				// 	this.sessionStatus = resultJson.data.status;
+				// 	//等于-1表示sessionId过期
+				// 	if (this.sessionStatus == -1) {
+				// 		sseObj.close();
+				// 		return;
+				// 	} else if (this.sessionStatus == 2) {
+				// 		this.username = resultJson.data.username;
+				// 		sseObj.close();
+				// 	}
+				// 	console.log(evt.data);
+				// }
+
+				// sseObj.error = (evt) => {
+				// 	sseObj.close();
+				// }
+			},
+			//重新刷新二维码
+			resetRefresh() {
+				// sseObj.close();
+				clearInterval(this.checkLogin)
+				this.loadQrCode();
+			},
+			toDetail(id, type) {
+				debugger
+				let _src = ''
+				if (type == 'zx') {
+					_src = "/pages/index/zxDetail?id=" + id
+				} else {
+					_src = "/pages/index/infoDetail?id=" + id + '&type=' + type
+				}
+				uni.navigateTo({
+					url: _src
+				})
+			},
+			showText() {
+				this.isShowText = true
+			},
+			toZXPage() {
+				uni.navigateTo({
+					url: "/pages/index/zx"
+				})
+			},
+			toPage(type) {
+				uni.navigateTo({
+					url: "/pages/index/info?type=" + type
+				})
+			},
+
+			smClick(type) {
+				if (type == 1) {
+					this.isSM = true
+					this.loadQrCode()
+				} else {
+					clearInterval(this.checkLogin)
+					this.isSM = false
+				}
+
+			},
+			onClickItem(e) {
+				if (this.current !== e.currentIndex) {
+					this.current = e.currentIndex
+				}
+			},
+
+			codeChange(text) {
+				this.tips = text;
+			},
+			getCode() {
+				if (this.phone.length == 11 && /^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)) {} else if (this.phone
+					.length == 0) {
+					uni.showToast({
+						title: '手机号不能为空',
+						icon: 'none'
+					})
+					return
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.$refs.uCode.canGetCode) {
+					// 模拟向后端请求验证码
+					uni.showLoading({
+						title: '正在获取验证码'
+					})
+					this.$request.baseRequest('get', '/commonUser/sendVerifyCode', {
+							phone: this.phone
+						}).then(res => {
+							uni.hideLoading();
+							uni.$u.toast('验证码已发送');
+							this.$refs.uCode.start()
+							console.log(res);
+						})
+						.catch(res => {
+							uni.hideLoading();
+							uni.showToast({
+								title: res.errMsg,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+
+					// setTimeout(() => {
+					// 	uni.hideLoading();
+					// 	// 这里此提示会被this.start()方法中的提示覆盖
+					// 	uni.$u.toast('验证码已发送');
+					// 	// 通知验证码组件内部开始倒计时
+					// 	this.$refs.uCode.start();
+					// }, 2000);
+				} else {
+					uni.$u.toast('倒计时结束后再发送');
+				}
+			},
+			end() {
+				uni.$u.toast('倒计时结束');
+			},
+			start() {
+				uni.$u.toast('倒计时开始');
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	body {
+		overflow: auto;
+	}
+
+	.bgc-sm {
+		background: url('@/static/bgc-sm.png') center no-repeat !important;
+		background-size: cover !important;
+	}
+
+	.content1 {
+		width: 100%;
+		height: 840px;
+		background: url('@/static/bgc1.png') center no-repeat;
+		background-size: cover;
+		position: relative;
+		min-width: 1200px;
+
+		.text-active {
+			color: #2F54EF !important;
+		}
+
+		.bgc1 {
+			width: 100vw;
+		}
+
+		.get-code {
+			color: #2F54EF;
+			position: absolute;
+			right: 13px;
+			top: 30%;
+		}
+
+		.bottom-view {
+			margin: 28px;
+		}
+
+		.login {
+			position: absolute;
+			right: 20%;
+			top: 26%;
+			background: white;
+			width: 388px;
+			height: 450px;
+			box-sizing: border-box;
+			border-radius: 20px;
+
+			.row1,
+			.row2 {
+				display: flex;
+			}
+
+			.row1 {
+				border-radius: 10px 10px 0 0;
+				position: relative;
+				background: #F6F6F6;
+				height: 86px;
+				box-sizing: border-box;
+				font-size: 22px;
+				display: flex;
+				align-items: center;
+				padding-left: 20px;
+			}
+
+			.line {
+				margin: 0 27px 0 20px;
+				width: 1px;
+				height: 34px;
+				background: #BBBBBB;
+			}
+
+			.sm {
+				margin-right: 20px;
+				color: #999999;
+				font-size: 18px;
+			}
+
+			.dx {
+				color: #999999;
+				font-size: 18px;
+			}
+
+		}
+
+		.row2 {
+			margin-top: 20rpx;
+			position: relative;
+		}
+
+		.row3 {
+			margin-top: 65px;
+
+			.btn {
+				height: 56px;
+				background: #2828FF;
+				border-radius: 6px;
+			}
+		}
+
+		.row4-text {
+			margin-top: 37px;
+			padding: 0 28px;
+			font-size: 14px;
+		}
+
+		.row4 {
+			display: flex;
+			justify-content: center;
+			margin-top: 53px;
+		}
+	}
+
+	.ewm-style {
+		width: 167px;
+		height: 167px;
+		background: #FFFFFF;
+		border-radius: 10px;
+		border: 1px solid #979797;
+		overflow: hidden;
+		padding: 5px;
+		margin: 40px auto;
+
+		.img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.content2-bgc {
+		background: #fff;
+		padding: 100rpx 400rpx;
+		min-width: 1200px;
+		box-sizing: border-box;
+	}
+
+	.title {
+		font-size: 56rpx;
+		font-weight: 500;
+		color: #0B0B0B;
+		display: flex;
+		align-items: center;
+
+		.img {
+			width: 48rpx;
+			margin-left: 40rpx;
+		}
+	}
+
+	.content2 {
+		// width: 1600px;
+		// min-width: 1200px;
+		margin: auto;
+
+
+
+		.zx-content {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 86rpx;
+
+			.left,
+			.right {
+				width: 49%;
+			}
+
+			.left {
+				.row1 {
+					position: relative;
+
+					.img {
+						width: 100%;
+						height: 880rpx !important;
+					}
+
+					.date {
+						position: absolute;
+						top: 0;
+						left: 0;
+						width: 214rpx;
+						height: 214rpx;
+						background: #2F54EF;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						color: white;
+
+						.day {
+							font-size: 92rpx;
+							font-weight: bold;
+							color: #FFFFFF;
+						}
+
+						.year {
+							font-size: 36rpx;
+							font-weight: 500;
+							margin-top: 30rpx;
+						}
+					}
+				}
+
+				.row2 {
+					font-size: 52rpx;
+					font-weight: 500;
+					color: #333333;
+					position: relative;
+					margin-top: 40rpx;
+				}
+
+				.row2::after {
+					position: absolute;
+					content: "";
+					bottom: -20px;
+					left: 0;
+					width: 35px;
+					height: 4px;
+					background: #333333;
+				}
+
+				.row3 {
+					margin-top: 60rpx;
+					font-size: 32rpx;
+					color: #7A8189;
+				}
+
+				.row4 {
+					margin-top: 68rpx;
+					display: flex;
+					justify-content: space-between;
+
+
+					.right-text {
+						font-size: 36rpx;
+						color: #90969B;
+					}
+
+					.detaiil {
+						display: flex;
+						align-items: center;
+						font-size: 36rpx;
+						color: #2F54EF;
+
+						.img {
+							width: 28rpx;
+							margin-left: 20rpx;
+						}
+					}
+				}
+			}
+
+			.right {
+				.row {
+					display: flex;
+					border-bottom: 1px solid #F5F5F5;
+					padding-bottom: 62rpx;
+					margin-top: 62rpx;
+
+					.left-view {
+						width: 148rpx;
+						height: 148rpx;
+						background: #F5F6F9;
+						border-radius: 4px;
+						margin-right: 20rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						padding: 10rpx 20rpx;
+
+						.date {
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							justify-content: center;
+
+							.day {
+								font-size: 68rpx;
+								font-weight: bold;
+								color: #ADB1B5;
+							}
+
+							.year {
+								margin-top: 20rpx;
+								font-size: 24rpx;
+								font-weight: 500;
+								color: #ADB1B5;
+							}
+						}
+					}
+
+					.right-view {
+						.row1 {
+
+							color: #333333;
+
+							font-size: 36rpx
+						}
+
+						.row2 {
+
+							font-size: 32rpx;
+							color: #969CA1;
+
+							line-height: 64rpx;
+							margin-top: 20rpx;
+						}
+
+						.row3 {
+							display: flex;
+							justify-content: space-between;
+							margin-top: 64rpx;
+
+							.text-left {
+								font-size: 36rpx;
+								color: #90969B;
+							}
+
+							.text-right {
+								display: flex;
+								align-items: center;
+								font-size: 36rpx;
+								font-weight: 500;
+								color: #2F54EF;
+
+								.img {
+									width: 28rpx;
+									margin-left: 20rpx;
+								}
+							}
+						}
+					}
+				}
+
+				.row:nth-of-type(1) {
+					margin-top: 0;
+				}
+
+				.row:last-of-type {
+					border-bottom: 0;
+				}
+			}
+		}
+	}
+
+	.content3-bgc {
+		background-color: #FAFAFB;
+		padding: 198rpx 400rpx;
+
+		.content3 {
+			display: flex;
+
+			.point {
+				width: 6px;
+				height: 6px;
+				background: #D8D8D8;
+				margin-right: 40rpx;
+			}
+
+			.left {
+				.gg-content {
+					margin-top: 56rpx;
+					width: 2010rpx;
+					height: 1404rpx;
+					background: #FFFFFF;
+					box-shadow: 0px 2px 30px 0px rgba(0, 0, 0, 0.06);
+					border-radius: 4px;
+					padding: 30rpx 72rpx 88rpx 72rpx;
+					box-sizing: border-box;
+
+					.item {
+						display: flex;
+						justify-content: space-between;
+						border-bottom: 1px solid #F5F5F5;
+						line-height: 160rpx;
+
+						.left {
+							display: flex;
+							align-items: center;
+						}
+
+						.text {
+							font-size: 18px;
+							color: #333333;
+						}
+					}
+
+					.item:last-of-type {
+						border-bottom: 0;
+					}
+				}
+			}
+
+			.right {
+				padding-left: 96rpx;
+
+				.gs-content {
+					margin-top: 56rpx;
+					width: 984rpx;
+					height: 1404rpx;
+					background: #FFFFFF;
+					box-shadow: 0px 2px 30px 0px rgba(0, 0, 0, 0.06);
+					border-radius: 4px;
+
+					.item {
+						display: flex;
+						align-items: center;
+						padding: 0 46rpx;
+						font-size: 36rpx;
+						font-weight: 500;
+						border-bottom: 1px solid #F5F5F5;
+						line-height: 60rpx;
+						padding: 20px 0;
+						margin: 0 20px;
+
+						.text {
+							color: #333333;
+						}
+
+						.date {
+
+							color: #90969B;
+							line-height: 25px;
+							margin-top: 20rpx;
+						}
+					}
+
+					.item:last-of-type {
+						border-bottom: 0;
+					}
+				}
+			}
+
+		}
+	}
+
+	.erm-img {
+		width: 100%;
+	}
+
+	.swidth {
+		width: 80% !important;
+	}
+
+	.qcode-img {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background: white;
+	}
+
+	.qcode-tips {
+		margin-top: 10px;
+	}
+</style>

pages/index/info.vue

@@ -0,0 +1,206 @@
+<template>
+	<view class="container">
+		<top></top>
+		<view class="content1">
+			<view class="nav-title">
+				首页>{{navTitle}}
+			</view>
+			<view class="content-view">
+				<view @click='toDetail(item.id,navTitle)' class="item" v-for="item in tableData">
+					<view class="left-text"><text class="point"></text>{{item.title}}</view>
+					<view class="date">{{item.issuingDate}}</view>
+				</view>
+			</view>
+			<view class="uni-pagination-box">
+				<uni-pagination show-icon :page-size="pageSize" :current="currentPage" :total="total"
+					@change="change" />
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				type: '',
+				navTitle: '',
+				searchVal: '',
+				tableData: [],
+				// 每页数据量
+				pageSize: 10,
+				// 当前页
+				currentPage: 1,
+				// 数据总量
+				total: 200,
+				loading: false,
+				user: {}
+			}
+		},
+		onLoad(options) {
+			this.type = options.type
+			this.selectedIndexs = []
+			if (this.type == 1) {
+				this.navTitle = '公告'
+			} else {
+				this.navTitle = '公示'
+			}
+			this.user = uni.getStorageSync('userInfo');
+			if (this.user) {
+				this.$store.commit('login', this.user)
+
+				this.init()
+			}
+
+			// this.getData(1)
+		},
+		methods: {
+			// 获取富文本的纯文字内容
+			convertIdeogramToNormalCharacter(val) {
+				const arrEntities = {
+					'lt': '<',
+					'gt': '>',
+					'nbsp': ' ',
+					'amp': '&',
+					'quot': '"'
+				};
+				return val.replace(/&(lt|gt|nbsp|amp|quot);/ig, function(all, t) {
+					return arrEntities[t];
+				});
+			},
+			getPlainText(richCont) {
+				debugger
+				const str = richCont;
+				let value = richCont;
+				if (richCont) {
+					// 方法一： 
+					value = value.replace(/\s*/g, ""); //去掉空格
+					value = value.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+					value = value.replace(/↵/g, ""); //去掉所有的↵符号
+					value = value.replace(/[\r\n]/g, "") //去掉回车换行
+					value = value.replace(/&nbsp;/g, "") //去掉空格
+					value = this.convertIdeogramToNormalCharacter(value);
+					return value;
+				} else {
+					return null;
+				}
+			},
+			init() {
+				this.$request.baseRequest('get', '/hyPublicConsultation/selectHyPublicConsultation', {
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: '',
+						searchType: this.navTitle
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							debugger
+							this.tableData = res.data.records
+							this.total = res.data.total
+							for (let i = 0; i < this.tableData.length; i++) {
+								this.tableData[i].content = this.getPlainText(this.tableData[i].releaseContent)
+							}
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			toDetail(id, type) {
+				debugger
+				let _src = ''
+				if (type == 'zx') {
+					_src = "/pages/index/zxDetail?id=" + id
+				} else {
+					_src = "/pages/index/infoDetail?id=" + id + '&type=' + type
+				}
+				uni.navigateTo({
+					url: _src
+				})
+			},
+			change(val) {
+				console.log(val)
+				this.currentPage = val.current
+				this.init()
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content1 {
+		width: 80%;
+		background: white;
+		margin: 132rpx auto;
+		padding: 40rpx;
+
+		.nav-title {
+			font-size: 28rpx;
+			color: #66686C;
+			line-height: 20px;
+		}
+
+		.content-view {
+
+			.item {
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 1px solid #F5F5F5;
+				padding-right: 80rpx;
+				line-height: 55px;
+				height: 55px;
+
+				.point {
+					width: 12rpx;
+					height: 12rpx;
+					background: #D8D8D8;
+					margin: 0 6px;
+				}
+
+				.left-text {
+					font-size: 36rpx;
+					color: #333333;
+					line-height: 64rpx;
+					display: flex;
+					align-items: center;
+				}
+
+				.date {
+					font-size: 36rpx;
+					color: #90969B;
+				}
+			}
+
+			// .item:nth-last-of-type(1) {
+			// 	border-bottom: 0;
+			// }
+		}
+	}
+
+	.uni-pagination-box {
+		margin-top: 40rpx;
+	}
+</style>

pages/index/infoDetail.vue

@@ -0,0 +1,250 @@
+<template>
+	<view class="container">
+		<top></top>
+		<view class="content1">
+			<view class="left">
+				<view class="nav-title">
+					首页>平台{{navTitle}}>{{navTitle}}详情
+				</view>
+				<view class="content-title">
+					{{dataObj.title}}
+				</view>
+				<view class="ej-title">
+					<view class="fb-time">
+						{{dataObj.issuingDate}}
+					</view>
+					<view class="ly">
+						<view class="ly-text">
+							来源：
+						</view>
+
+						<view class="ly-name">
+							{{dataObj.issuingAgency}}
+						</view>
+					</view>
+				</view>
+				<u-line color="#F5F5F5" style='margin:44px 0'></u-line>
+				<view class="" v-html="dataObj.releaseContent"></view>
+			</view>
+			<view class="right">
+				<view class="right-title">
+					<view class="">
+						平台{{navTitle}}
+					</view>
+					<view class="more" @click="moreClick">
+						更多 >
+					</view>
+				</view>
+				<view class="list">
+					<view class="item" v-for="item in tableData">
+						<view class="point">
+
+						</view>
+						<view class="content-text">
+							<view class="row1">
+								{{item.title}}
+							</view>
+							<view class="date">
+								{{item.issuingDate}}
+							</view>
+						</view>
+
+					</view>
+				</view>
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				navTitle: '',
+				type: "",
+				dataObj: {},
+				tableData: [],
+				pageSize: 10,
+				// 当前页
+				currentPage: 1,
+			}
+		},
+		onLoad(options) {
+			this.navTitle = options.type
+			this.id = options.id
+			this.init()
+		},
+		methods: {
+			init() {
+				this.$request.baseRequest('get', '/hyPublicConsultation/getHyPublicConsultation', {
+						id: this.id,
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							debugger
+							this.dataObj = res.data
+
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+				this.$request.baseRequest('get', '/hyPublicConsultation/selectHyPublicConsultation', {
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: '',
+						searchType: this.navTitle
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							this.tableData = res.data.records
+							this.total = res.data.total
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			moreClick(type) {
+				uni.navigateTo({
+					url: "/pages/index/info?type=" + this.type
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content1 {
+		width: 80%;
+		// background: white;
+		margin: 80rpx auto;
+		padding: 40rpx 0;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+
+		.left {
+			width: 65%;
+			background: white;
+			padding: 40rpx 80rpx;
+		}
+
+		.right {
+			margin-left: 40rpx;
+			width: 30%;
+			background: white;
+		}
+
+		.nav-title {
+			font-size: 28rpx;
+			color: #66686C;
+			line-height: 20px;
+		}
+
+		.content-title {
+			display: flex;
+			justify-content: center;
+			font-size: 68rpx;
+			font-weight: 500;
+			color: #0B0B0B;
+			line-height: 48px;
+			margin: 40rpx 0;
+		}
+
+		.ej-title {
+			display: flex;
+
+			.ly {
+				margin-left: 40rpx;
+				display: flex;
+				font-size: 28rpx;
+				color: #A7A7A7;
+				line-height: 40rpx;
+
+				.ly-name {
+					color: #0B0B0B
+				}
+			}
+
+			.fb-time {
+				font-size: 28rpx;
+				color: #A7A7A7;
+				line-height: 40rpx;
+			}
+		}
+
+		.right {
+			.right-title {
+				background: #e9dcdc;
+				display: flex;
+				justify-content: space-between;
+				padding: 10px;
+			}
+
+			.more {
+				color: #2F54EF;
+			}
+
+			.item {
+				border-bottom: 1px solid #F5F5F5;
+			}
+
+			.content-text {
+				padding: 40rpx;
+				box-sizing: border-box;
+
+				.row1 {
+					font-size: 36rpx;
+					color: #333333;
+				}
+
+				.date {
+					font-size: 36rpx;
+					color: #90969B;
+					margin-top: 10rpx;
+				}
+			}
+
+			.item:nth-of-type(5) {
+				border: 0;
+			}
+
+		}
+
+
+	}
+</style>

pages/index/login.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/index/product.vue

@@ -0,0 +1,184 @@
+<template>
+	<view class="content">
+		<top :type="pageType"></top>
+		<view class="content1">
+			<view class="banner">
+				<!-- 关于我们 -->
+			</view>
+			<view class="content4">
+				<view class="left">
+					<image src="../../static/pt1.png" style="width: 579px;height: 660px;margin-right: 100px;"></image>
+
+				</view>
+				<view class=" right">
+					<view class="title">
+						司机端产品介绍
+					</view>
+					<view class="text">
+						经过很能吃苦的业务团队全体员工共同努力，企业已与上下游客户展开了采销一体化的合作，并形成了稳定长久的供求关系及战略合作伙伴。在北方主要粮食中转港口鲅鱼圈港、布局了港口粮食中转库及销售团队，为整个公司贸易流转提供了重要的销售前沿的业务支撑，形成了动态库存逐步向销售终端前移，多节点实现销售的重要战略目标。并实现高资金周转率、零坏账、无亏损、利润逐步递增的财务目标。
+					</view>
+				</view>
+			</view>
+			<view class="content3">
+				<view class="left">
+					<view class="title">
+						货主端产品介绍
+					</view>
+					<view class="text">
+						经过很能吃苦的业务团队全体员工共同努力，企业已与上下游客户展开了采销一体化的合作，并形成了稳定长久的供求关系及战略合作伙伴。在北方主要粮食中转港口鲅鱼圈港、布局了港口粮食中转库及销售团队，为整个公司贸易流转提供了重要的销售前沿的业务支撑，形成了动态库存逐步向销售终端前移，多节点实现销售的重要战略目标。并实现高资金周转率、零坏账、无亏损、利润逐步递增的财务目标。
+					</view>
+				</view>
+				<view class="right">
+					<image src="../../static/pt2.png" style="width: 579px;height: 660px;"></image>
+				</view>
+			</view>
+			<view class="content6">
+				<view class="left">
+					<image src="../../static/logo.png" style="width: 208px;height: 60px;"></image>
+				</view>
+				<view class="right">
+					<view class="btn">
+						<a href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/cyt.apk">下载司机端</a>
+					</view>
+					<view class="btn">
+						<a href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/cythz.apk">下载货主端</a>
+
+					</view>
+				</view>
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				pageType: 'product'
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.banner {
+		width: 100%;
+		height: 840rpx;
+		background: url('../../static/banner3.png') no-repeat center;
+		background-size: cover;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: white;
+		font-size: 64rpx;
+	}
+
+	.content2 {
+		display: flex;
+		width: 70%;
+		margin: 242rpx auto;
+		justify-content: space-between;
+
+		.left {
+			margin-right: 290rpx;
+		}
+	}
+
+	.text {
+		font-size: 32rpx;
+		color: #101010;
+		line-height: 64rpx;
+	}
+
+	.title {
+		font-size: 80rpx;
+		font-weight: 600;
+		color: #0B0B0B;
+		line-height: 112rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.content3 {
+		background: white;
+		background-size: cover;
+		display: flex;
+		align-items: center;
+		padding: 0 15%;
+		box-sizing: border-box;
+	}
+
+	.content4 {
+		background: white;
+		display: flex;
+		align-items: center;
+		padding: 0 15%;
+		box-sizing: border-box;
+	}
+
+	.content5 {
+		background: url('../../static/banner3.png') no-repeat center;
+		background-size: cover;
+		flex-direction: column;
+		justify-content: center;
+		height: 1160rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 15%;
+		box-sizing: border-box;
+		color: white;
+
+		.title,
+		.text {
+			color: white;
+		}
+
+		.f-title {
+			margin: 40rpx 0 180rpx 0;
+		}
+	}
+
+	.content6 {
+		// background: white;
+		// justify-content: center;
+		height: 200rpx;
+		display: flex;
+		background: red;
+		align-items: center;
+		padding: 200px 15%;
+		background: white;
+
+		.tilte {
+			margin-bottom: 100rpx;
+		}
+
+		.right {
+			display: flex;
+
+			.btn {
+				width: 116px;
+				height: 40px;
+				background: #3F414B;
+				border-radius: 20px;
+				color: white;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 0rpx 30rpx;
+				margin-left: 200rpx;
+
+				a {
+					color: white;
+					text-decoration: none;
+
+				}
+			}
+		}
+	}
+</style>

pages/index/support.vue

@@ -0,0 +1,229 @@
+<template>
+	<view class="container">
+		<top :type="pageType"></top>
+		<view class="content1">
+			<view class="title">
+				联系方式
+			</view>
+			<view class="row">
+				<text>微信：</text>
+				<text>ccjgmwz</text>
+			</view>
+			<view class="row">
+				<text>手机：</text>
+				<text>18241771147</text>
+			</view>
+			<view class="row">
+				<text>QQ：</text>
+				<text>841968545</text>
+			</view>
+			<view class="row">
+				<text>邮箱：</text>
+				<text>ccjgmwz@foxmail.com</text>
+			</view>
+			<view class="row">
+				<text>联系地址：</text>
+				<text>辽宁省营口市鲅鱼圈区</text>
+			</view>
+			<view class="row">
+				<text>联系人：</text>
+				<text>程长江</text>
+			</view>
+		</view>
+		<!-- <bottom></bottom> -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				pageType: 'support',
+				navTitle: '',
+				searchVal: '',
+				tableData: [],
+				// 每页数据量
+				pageSize: 10,
+				// 当前页
+				currentPage: 1,
+				// 数据总量
+				total: 200,
+				loading: false,
+				user: {}
+			}
+		},
+		onLoad(options) {
+			this.type = options.type
+			this.selectedIndexs = []
+			if (this.type == 1) {
+				this.navTitle = '公告'
+			} else {
+				this.navTitle = '公示'
+			}
+			this.user = uni.getStorageSync('userInfo');
+			if (this.user) {
+				this.$store.commit('login', this.user)
+
+				this.init()
+			}
+
+			// this.getData(1)
+		},
+		methods: {
+			// 获取富文本的纯文字内容
+			convertIdeogramToNormalCharacter(val) {
+				const arrEntities = {
+					'lt': '<',
+					'gt': '>',
+					'nbsp': ' ',
+					'amp': '&',
+					'quot': '"'
+				};
+				return val.replace(/&(lt|gt|nbsp|amp|quot);/ig, function(all, t) {
+					return arrEntities[t];
+				});
+			},
+			getPlainText(richCont) {
+				debugger
+				const str = richCont;
+				let value = richCont;
+				if (richCont) {
+					// 方法一： 
+					value = value.replace(/\s*/g, ""); //去掉空格
+					value = value.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+					value = value.replace(/↵/g, ""); //去掉所有的↵符号
+					value = value.replace(/[\r\n]/g, "") //去掉回车换行
+					value = value.replace(/&nbsp;/g, "") //去掉空格
+					value = this.convertIdeogramToNormalCharacter(value);
+					return value;
+				} else {
+					return null;
+				}
+			},
+			init() {
+				this.$request.baseRequest('get', '/hyPublicConsultation/selectHyPublicConsultation', {
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: '',
+						searchType: this.navTitle
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							debugger
+							this.tableData = res.data.records
+							this.total = res.data.total
+							for (let i = 0; i < this.tableData.length; i++) {
+								this.tableData[i].content = this.getPlainText(this.tableData[i].releaseContent)
+							}
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			toDetail(id, type) {
+				debugger
+				let _src = ''
+				if (type == 'zx') {
+					_src = "/pages/index/zxDetail?id=" + id
+				} else {
+					_src = "/pages/index/infoDetail?id=" + id + '&type=' + type
+				}
+				uni.navigateTo({
+					url: _src
+				})
+			},
+			change(val) {
+				console.log(val)
+				this.currentPage = val.current
+				this.init()
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content1 {
+		width: 80%;
+		background: white;
+		margin: 132rpx auto;
+		padding: 40rpx;
+
+		.nav-title {
+			font-size: 28rpx;
+			color: #66686C;
+			line-height: 20px;
+		}
+
+		.content-view {
+
+			.item {
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 1px solid #F5F5F5;
+				padding-right: 80rpx;
+				line-height: 55px;
+				height: 55px;
+
+				.point {
+					width: 12rpx;
+					height: 12rpx;
+					background: #D8D8D8;
+					margin: 0 6px;
+				}
+
+				.left-text {
+					font-size: 36rpx;
+					color: #333333;
+					line-height: 64rpx;
+					display: flex;
+					align-items: center;
+				}
+
+				.date {
+					font-size: 36rpx;
+					color: #90969B;
+				}
+			}
+
+			// .item:nth-last-of-type(1) {
+			// 	border-bottom: 0;
+			// }
+		}
+	}
+
+	.uni-pagination-box {
+		margin-top: 40rpx;
+	}
+
+	.title {
+		font-size: 42rpx;
+		font-weight: 700;
+	}
+
+	.row {
+		margin-top: 20rpx;
+	}
+</style>

pages/index/user.vue

@@ -0,0 +1,881 @@
+<template>
+	<view class="">
+		<top></top>
+		<view class="content">
+			<view class="user">
+				<view class="left">
+					<text class="item" :class="userIndex==index?'item-active':''" v-for="(item,index) in userNavList"
+						:key="index" @click="userChangeClick(index)">{{item}}</text>
+				</view>
+				<view class="right">
+					<view class="view1" v-if="userIndex==0">
+						<view class="header">
+							<view class="header-left">
+								<image :src="userInfo.avatarUrl" class="img"></image>
+								<view class="user-info">
+									<text class="name">{{user.name}}</text>
+									<text class="phone">{{user.phone}}</text>
+								</view>
+							</view>
+							<view class="header-right">
+								<view class="right-view1">
+									<view class="number">
+										{{user.shipmentsNumber?user.shipmentsNumber:0}}
+									</view>
+									<view class="text">
+										发运次数
+									</view>
+								</view>
+								<view class="right-view2">
+									<view class="number">
+										{{user.favorableRate?user.favorableRate:0}}%
+									</view>
+									<view class="text">
+										好评率
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="qy-content">
+							<view class="nav">
+								<view class="text" :class="isSHowDL?'qy-active':''" @click="qyClick(1)">代理企业
+									{{dlLength}}
+								</view>
+								<view class="text" :class="!isSHowDL?'qy-active':''" @click="qyClick(2)">拥有企业
+									{{ownLength}}
+								</view>
+							</view>
+							<view class="qy-list">
+								<view class="item" v-for="item in company">
+									<view class="qy-name">
+										{{item.companyName}}
+									</view>
+									<view class="fr-name">
+										法人：{{item.legalPersonName}}
+									</view>
+									<!-- <view class="zc-price">
+										注册资本：1,200万（元）
+									</view> -->
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="view2" v-if="userIndex==1">
+						<view class="top">
+							<view class="view2-left">
+								<view class="kyye">
+									<view class="text">
+										可用余额
+									</view>
+									<view class="number1">
+										¥10000.00
+									</view>
+								</view>
+								<view class="line">
+
+								</view>
+								<view class="djye">
+									<view class="text">
+										冻结余额
+									</view>
+									<view class="number2">
+										¥10000.00
+									</view>
+								</view>
+							</view>
+							<view class="right-btn" @click="zdClick">
+								账单
+							</view>
+						</view>
+						<view class="view2-content">
+							<view class="view2-content-left">
+								<view class="row">
+									<view class="left-text">
+										账户属性
+									</view>
+									<view class="right-text">
+										<uni-data-select v-model="value" :localdata="range" @change="change">
+										</uni-data-select>
+									</view>
+								</view>
+								<view class="row">
+									<view class="left-text">
+										打款账号
+									</view>
+									<view class="right-text">
+										6217888627725467329
+									</view>
+								</view>
+								<view class="row">
+									<view class="left-text">
+										开户行
+									</view>
+									<view class="right-text">
+										交通银行
+									</view>
+								</view>
+								<view class="row">
+									<view class="left-text">
+										开户支行
+									</view>
+									<view class="right-text">
+										哈尔滨支行
+									</view>
+								</view>
+							</view>
+							<view class="zd-content" v-if="isSHowZDInfo">
+								<view class="top-title">
+									<view class="zdxx">
+										账单信息
+									</view>
+									<view class="qp" @click="closeClick">
+										<image src="../../static/close.png" style="width: 12px;height: 12px;"></image>
+									</view>
+								</view>
+								<uni-table border stripe emptyText="暂无更多数据" ref="table">
+									<!-- 表头行 -->
+									<uni-tr>
+										<uni-th align="center">时间</uni-th>
+										<uni-th align="center">内容</uni-th>
+										<uni-th align="left">金额</uni-th>
+										<uni-th align="left">余额</uni-th>
+									</uni-tr>
+									<!-- 表格数据行 -->
+									<uni-tr>
+										<uni-td>2020-10-20</uni-td>
+										<uni-td>Jeson</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-21</uni-td>
+										<uni-td>HanMeiMei</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-22</uni-td>
+										<uni-td>LiLei</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-23</uni-td>
+										<uni-td>Danner</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-23</uni-td>
+										<uni-td>Danner</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-23</uni-td>
+										<uni-td>Danner</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-23</uni-td>
+										<uni-td>Danner</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-23</uni-td>
+										<uni-td>Danner</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-23</uni-td>
+										<uni-td>Danner</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+									<uni-tr>
+										<uni-td>2020-10-23</uni-td>
+										<uni-td>Danner</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+										<uni-td>北京市海淀区</uni-td>
+									</uni-tr>
+
+								</uni-table>
+								<view class="uni-pagination-box">
+									<uni-pagination show-icon :page-size="pageSize" :current="pageCurrent"
+										:total="total" @change="fyChange" />
+									<view class="close" @click="closeClick" style="cursor: pointer;">
+										关闭
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="view3" v-if="userIndex==2">
+						<view class="top1">
+							<input class="uni-input" focus placeholder="按订单编号或司机姓名查找" v-model="searchKeyWord" />
+							<view class="btn" @click="getSearch">搜索</view>
+						</view>
+						<view class="view3-content">
+							<uni-table emptyText="暂无更多数据" ref="table1">
+								<!-- 表头行 -->
+								<uni-tr>
+									<uni-th align="center" width='630'>订单详情</uni-th>
+									<uni-th align="center">运费</uni-th>
+									<uni-th align="center">状态</uni-th>
+								</uni-tr>
+								<!-- 表格数据行 -->
+								<uni-tr v-for="item in goods">
+									<uni-td>
+										<view class="row1">
+											<view class="row1-content1">
+												<view class="left-text">
+													时间：
+												</view>
+												<view class="">
+													{{item.createDate}}
+												</view>
+											</view>
+											<view class="row1-content1">
+												<view class="left-text">
+													订单编号：
+												</view>
+												<view class="">
+													{{item.orderNo}}
+												</view>
+											</view>
+											<view class="row1-content1">
+												<view class="left-text">
+													司机：
+												</view>
+												<view class="tx">
+													<image src="../../static/jt2.png"
+														style="width: 22px;height: 22px;margin-right: 10rpx;">
+													</image>
+													{{item.driverName}}
+												</view>
+											</view>
+										</view>
+										<view class="row2">
+											{{item.compName}}：{{item.goodsName}}
+										</view>
+										<view class="row3">
+											【发货地】{{item.sendPrivate}}{{item.sendCity}}{{item.sendArea}}
+										</view>
+										<view class="row4">
+											【卸货地】{{item.unloadPrivate}}{{item.unloadCity}}{{item.unloadArea}}
+										</view>
+									</uni-td>
+									<uni-td>
+										<view class="row1">
+
+										</view>
+										<view class="row2">
+
+										</view>
+										<view class="row3">
+											【装车预计运费】¥{{item.freight}}
+										</view>
+										<view class="row4">
+											【卸车确认运费】¥{{item.actualFreight}}
+										</view>
+									</uni-td>
+									<uni-td>
+										<view class="row1">
+
+										</view>
+										<view class="row2">
+
+										</view>
+										<view class="row3">
+											{{item.cargoOwnerStatus}}
+										</view>
+										<view class="row4">
+
+										</view>
+									</uni-td>
+								</uni-tr>
+
+							</uni-table>
+							<view class="uni-pagination-box">
+								<uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total"
+									@change="fyChange" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				goods: [],
+				isSHowZDInfo: false,
+				tableData: [],
+				// 每页数据量
+				pageSize: 10,
+				// 当前页
+				pageCurrent: 1,
+				// 数据总量
+				total: 0,
+				loading: false,
+				value: 0,
+				range: [{
+						value: 0,
+						text: "个人账户"
+					},
+					{
+						value: 1,
+						text: "企业对公账户"
+					},
+				],
+				isSHowDL: true,
+				orderList: [{
+					orderNumber: '1',
+					status: '1',
+					good: '1',
+					driver: '2',
+					startPlace: '1',
+					endPlace: '1',
+					price1: '1',
+					price2: '1'
+				}],
+				orderSearch: '',
+				isShowPrice: false,
+				candidates: ['北京', '南京', '东京', '武汉', '天津', '上海', '海口'],
+				userNavList: ['货主信息', '账户信息', '我的订单'],
+				userIndex: 0,
+				city: '',
+				user: {},
+				company: [],
+				dlLength: 0,
+				ownLength: 0,
+				searchKeyWord: ''
+			};
+		},
+		onLoad() {
+			this.user = uni.getStorageSync('userInfo');
+			if (this.user) {
+				this.$store.commit('login', this.user)
+				this.init()
+			}
+
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		methods: {
+			getSearch(e) {
+				this.getOrder()
+			},
+			getDLCompany() {
+				this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
+						commonId: this.userInfo.id
+					}).then(res => {
+						uni.hideLoading()
+						this.company = res.data.hyCargoOwnerCompInfoList
+						this.dlLength = res.data.hyCargoOwnerCompInfoList.length
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			init() {
+				this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+					phone: this.userInfo.phone
+				}).then(res => {
+					this.user = res.data
+				})
+				this.getDLCompany()
+
+			},
+			getOwnCompany() {
+				this.$request.baseRequest('get', '/companyInfo/selectCompany', {
+						commonId: this.userInfo.id
+					}).then(res => {
+						uni.hideLoading()
+						this.company = res.data
+						this.ownLength = res.data.length
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			closeClick() {
+				this.isSHowZDInfo = false
+			},
+			zdClick() {
+				this.isSHowZDInfo = true
+			},
+			fyChange(val) {
+				this.currentPage = val.current
+				this.getOrder()
+			},
+			change(val) {
+				console.log(val)
+				this.currentPage = val.current
+				this.init()
+			},
+			getOrder() {
+				this.$request.baseRequest('get', '/orderInfo/selectCargoOwnerOrder', {
+						cargoCommonId: this.userInfo.id,
+						searchKeyWord: this.searchKeyWord,
+						searchType: 0,
+						pageSize: this.pageSize,
+						currentPage: this.pageCurrent
+					}).then(res => {
+						if (this.pageCurrent == 1) this.goods = [];
+						this.goods = this.goods.concat(res.data.records);
+						this.total = res.data.total
+						uni.hideLoading()
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			qyClick(type) {
+				if (type == 1) {
+					this.getDLCompany()
+					this.isSHowDL = true
+				} else {
+					this.getOwnCompany()
+					this.isSHowDL = false
+				}
+			},
+			showPriceClick() {
+				this.isShowPrice = !this.isShowPrice
+			},
+			userChangeClick(index) {
+				this.userIndex = index
+				if (index == 2) {
+					this.getOrder()
+				}
+			},
+			change(val) {
+				debugger
+				his.currentPage = val.current
+				this.getOrder()
+			},
+			close(e) {
+				// console.log('close', e)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background: #FAFAFB;
+		padding-top: 66px;
+		;
+	}
+
+	.user {
+		margin: auto;
+		width: 3100rpx;
+		display: flex;
+
+		.left {
+			width: 280px;
+			height: 205px;
+			background: #FFFFFF;
+			border-radius: 10px;
+			display: flex;
+			flex-direction: column;
+			margin-right: 100rpx;
+
+			.item {
+				font-size: 16px;
+				font-weight: 500;
+				color: #0B0B0B;
+				line-height: 26px;
+				padding: 20px 40px;
+				position: relative;
+			}
+		}
+
+		.item-active:before {
+			content: '';
+			width: 4px;
+			height: 35px;
+			background: #2F54EF;
+			position: absolute;
+			left: 0;
+			top: 30rpx;
+			// background: green;
+		}
+
+		.right {
+			width: 1242px;
+			background: #FFFFFF;
+			border-radius: 10px;
+
+			.header {
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 1px solid red;
+				padding: 66rpx 162rpx 66rpx 98rpx;
+
+				.header-left {
+					display: flex;
+					align-items: center;
+
+					.img {
+						width: 88px;
+						height: 88px;
+						border-radius: 50%;
+						margin-right: 20px;
+					}
+
+					.user-info {
+						display: flex;
+						flex-direction: column;
+
+						.name {
+							font-size: 24px;
+							font-weight: 500;
+							color: #0B0B0B;
+							line-height: 33px;
+						}
+
+						.phone {
+							margin-top: 20rpx;
+							font-size: 14px;
+							font-weight: 500;
+							color: #999999;
+							line-height: 20px;
+						}
+					}
+				}
+
+				.header-right {
+					display: flex;
+					align-items: center;
+					text-align: center;
+
+					.number {
+						color: #0B0B0B;
+						font-weight: bold;
+						font-size: 56rpx;
+					}
+
+					.text {
+						margin-top: 20rpx;
+						color: #999999;
+						font-size: 28rpx;
+					}
+
+					.right-view1 {
+						margin-right: 160rpx;
+					}
+				}
+			}
+
+			.qy-content {
+				padding: 42rpx 122rpx;
+				box-sizing: border-box;
+
+				.nav {
+					display: flex;
+				}
+
+				.text {
+					font-size: 36rpx;
+					font-weight: 400;
+					color: #333333;
+					margin-right: 83px;
+				}
+
+				.qy-active {
+					color: #2F54EF;
+				}
+
+				.qy-list {
+					margin-top: 10px;
+
+					.item {
+						margin: 10px 20px 10px 0;
+						width: calc(35% - 40px);
+						padding: 20px;
+						box-sizing: border-box;
+						background: #FFFFFF;
+						box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.05);
+						border-radius: 6px;
+						display: inline-block;
+
+						.qy-name {
+							font-size: 40rpx;
+							font-weight: 500;
+							color: #0B0B0B;
+							line-height: 28px;
+						}
+
+						.fr-name,
+						.zc-price {
+							font-size: 16px;
+							font-weight: 400;
+							color: #9E9E9E;
+							line-height: 32px;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.view2 {
+		padding: 108rpx 132rpx;
+		height: 69vh;
+
+		.top {
+			width: 1110px;
+			height: 106px;
+			background: #d5dcfb33;
+			border-radius: 4px;
+			display: flex;
+			justify-content: space-between;
+			padding: 58rpx 118rpx;
+			box-sizing: border-box;
+			align-items: center;
+		}
+
+		.view2-left {
+			display: flex;
+
+			.text {
+				font-size: 28rpx;
+				color: #0B0B0B;
+				line-height: 40rpx;
+			}
+
+			.number1 {
+				font-size: 28rpx;
+				color: #2F54EF;
+			}
+
+			.number2 {
+				font-size: 28rpx;
+				color: #0B0B0B;
+			}
+
+			.kyye,
+			.djye {
+				display: flex;
+				align-content: center;
+				flex-direction: column;
+				justify-content: center;
+			}
+
+			.line {
+				width: 1px;
+				height: 108rpx;
+				background: rgba(47, 84, 239, 0.1);
+				margin: 0 144rpx;
+			}
+		}
+
+		.right-btn {
+			background: #2F54EF;
+			border-radius: 4px;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			padding: 10rpx 40rpx;
+		}
+	}
+
+	.view2-content {
+		position: relative;
+
+		.uni-stat__select {
+			padding: 0;
+		}
+
+		.view2-content-left {
+			.row {
+				display: flex;
+				align-items: center;
+				margin-top: 64rpx;
+
+				.left-text {
+					color: #A7A7A7;
+					line-height: 22px;
+					margin-right: 90rpx;
+					width: 128rpx;
+					text-align: center;
+				}
+
+				.right-text {
+					color: #0B0B0B;
+				}
+			}
+		}
+
+		.zd-content {
+			position: fixed;
+			width: 746px;
+			height: 630px;
+			background: #FFFFFF;
+			box-shadow: 0px 2px 24px 0px #C8C9CC;
+			border-radius: 4px;
+			padding: 40rpx;
+			box-sizing: border-box;
+			top: 0;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			margin: auto;
+
+			.top-title {
+				display: flex;
+				justify-content: space-between;
+			}
+
+			.zdxx {
+				font-size: 32rpx;
+				color: #323233;
+				line-height: 40rpx;
+				margin-bottom: 80rpx;
+			}
+
+			.uni-pagination-box {
+				display: flex;
+				position: absolute;
+				bottom: 30rpx;
+				right: 50px;
+				justify-content: center;
+				align-items: center;
+
+				.close {
+					background: #F1F3F4;
+					border-radius: 2px;
+					font-size: 28rpx;
+					color: #323233;
+					line-height: 20px;
+					margin-left: 40rpx;
+					padding: 10rpx 40rpx;
+				}
+			}
+
+			.uni-table-tr:nth-of-type(1) {
+				background: #F5F6F9;
+			}
+		}
+	}
+
+	.view3 {
+		padding: 40rpx;
+		box-sizing: border-box;
+
+		.top1 {
+			background: #F5F6F9;
+			border-radius: 4px;
+			display: flex;
+			align-items: center;
+			padding: 40rpx;
+			box-sizing: border-box;
+
+			input {
+				background: white;
+				padding: 10rpx 20rpx;
+				width: 672rpx;
+			}
+
+			.btn {
+				background: #2F54EF;
+				border-radius: 4px;
+				font-size: 14px;
+				color: #FFFFFF;
+				line-height: 20px;
+				padding: 10rpx 30rpx;
+				margin-left: 42rpx;
+			}
+		}
+
+		.view3-content {
+			.uni-pagination-box {
+				margin-top: 30rpx;
+			}
+
+			.uni-table-td {
+				padding: 0;
+				margin-top: 20px;
+			}
+
+			margin-top: 40rpx;
+
+			.uni-table-tr:nth-of-type(1) {
+				background: #F5F6F9;
+			}
+
+			.row1 {
+				display: flex;
+				// background: #FAFAFB;
+				background: #FAFAFB;
+				padding: 30rpx 74rpx;
+				box-sizing: border-box;
+				height: 50px;
+				margin-top: 20rpx;
+
+				.row1-content1 {
+					display: flex;
+					align-items: center;
+					margin-right: 40rpx;
+
+					.tx {
+						display: flex;
+						align-items: center;
+					}
+
+					.left-text {
+						color: #A7A7A7;
+
+					}
+
+				}
+			}
+
+			.row2,
+			.row3,
+			.row4 {
+				font-size: 32rpx;
+				color: #0B0B0B;
+				line-height: 22px;
+				margin: 20rpx 0;
+				padding: 0 80rpx;
+				height: 44rpx;
+			}
+		}
+	}
+</style>

pages/index/zx.vue

@@ -0,0 +1,221 @@
+<template>
+	<view class="">
+		<top></top>
+		<view class="content1">
+			<view class="nav-title">
+				首页>行业资讯
+			</view>
+			<view class="content-view">
+				<view @click='toDetail(item.id)' class="item" v-for="item in tableData">
+					<view class="left-text">
+						<image :src="item.cover" style="width: 230px;height: 158px;"></image>
+					</view>
+					<view class="right-content">
+						<view class="title">
+							{{item.title}}
+						</view>
+						<view class="row2">
+							{{item.content}}
+						</view>
+						<view class="row3">
+							<view class="ly">
+								来源：{{item.issuingAgency}} </view>
+							<view class="date">{{item.issuingDate}}</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+			<view class="uni-pagination-box">
+				<uni-pagination show-icon :page-size="pageSize" :current="currentPage" :total="total"
+					@change="change" />
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				type: '',
+				navTitle: '',
+				searchVal: '',
+				tableData: [],
+				// 每页数据量
+				pageSize: 10,
+				// 当前页
+				currentPage: 1,
+				// 数据总量
+				total: 200,
+				loading: false,
+				user: {}
+			}
+		},
+		onLoad(options) {
+			this.user = uni.getStorageSync('userInfo');
+			if (this.user) {
+				this.$store.commit('login', this.user)
+				this.init()
+			}
+		},
+		methods: {
+			// 获取富文本的纯文字内容
+			convertIdeogramToNormalCharacter(val) {
+				const arrEntities = {
+					'lt': '<',
+					'gt': '>',
+					'nbsp': ' ',
+					'amp': '&',
+					'quot': '"'
+				};
+				return val.replace(/&(lt|gt|nbsp|amp|quot);/ig, function(all, t) {
+					return arrEntities[t];
+				});
+			},
+			getPlainText(richCont) {
+				debugger
+				const str = richCont;
+				let value = richCont;
+				if (richCont) {
+					// 方法一： 
+					value = value.replace(/\s*/g, ""); //去掉空格
+					value = value.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+					value = value.replace(/↵/g, ""); //去掉所有的↵符号
+					value = value.replace(/[\r\n]/g, "") //去掉回车换行
+					value = value.replace(/&nbsp;/g, "") //去掉空格
+					value = this.convertIdeogramToNormalCharacter(value);
+					return value;
+				} else {
+					return null;
+				}
+			},
+			init() {
+				this.$request.baseRequest('get', '/hyPublicConsultation/selectHyPublicConsultation', {
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: '',
+						searchType: '资讯'
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							debugger
+							this.tableData = res.data.records
+							this.total = res.data.total
+							for (let i = 0; i < this.tableData.length; i++) {
+								this.tableData[i].content = this.getPlainText(this.tableData[i].releaseContent)
+							}
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			toDetail(id) {
+				uni.navigateTo({
+					url: "/pages/index/zxDetail?id=" + id
+				})
+			},
+			change(val) {
+				console.log(val)
+				this.currentPage = val.current
+				this.init()
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content1 {
+		width: 80%;
+		background: white;
+		margin: 40rpx auto;
+		padding: 40rpx;
+		box-sizing: border-box;
+
+		.nav-title {
+			font-size: 28rpx;
+			color: #66686C;
+			margin-bottom: 30rpx;
+		}
+
+		.content-view {
+
+			.item {
+				display: flex;
+				// justify-content: space-between;
+				border-bottom: 1px solid #F5F5F5;
+				padding-right: 80rpx;
+				padding-bottom: 68rpx;
+				margin-top: 68rpx;
+
+				.left-text {
+					font-size: 36rpx;
+					color: #333333;
+					line-height: 64rpx;
+					display: flex;
+					align-items: center;
+				}
+
+				.right-content {
+					margin-left: 40rpx;
+
+
+
+					.title {
+						font-size: 48rpx;
+						font-weight: 600;
+						color: #333333;
+						line-height: 66rpx;
+					}
+
+					.row2 {
+						margin-top: 20rpx;
+						font-size: 36rpx;
+						color: #969CA1;
+						line-height: 64rpx;
+					}
+
+					.row3 {
+						display: flex;
+						justify-content: space-between;
+						margin-top: 40rpx;
+						color: #969CA1;
+					}
+				}
+			}
+
+			// .item:nth-last-of-type(1) {
+			// 	border-bottom: 0;
+			// }
+		}
+	}
+
+	.uni-pagination-box {
+		margin-top: 40rpx;
+	}
+</style>

pages/index/zxDetail.vue

@@ -0,0 +1,254 @@
+<template>
+	<view class="container">
+		<top></top>
+		<view class="content1">
+			<view class="left">
+				<view class="nav-title">
+					首页 / 资讯 / 资讯详情
+				</view>
+				<view class="content-title">
+					{{dataObj.title}}
+				</view>
+				<view class="ej-title">
+					<view class="fb-time">
+						{{dataObj.issuingDate}}
+					</view>
+					<view class="ly">
+						<view class="ly-text">
+							来源：
+						</view>
+
+						<view class="ly-name">
+							{{dataObj.issuingAgency}}
+						</view>
+					</view>
+				</view>
+				<u-line color="#F5F5F5" style='margin:44px 0'></u-line>
+
+				<view class="" v-html="dataObj.releaseContent"></view>
+			</view>
+			<view class="right">
+				<view class="right-title">
+					<view class="">
+						行业资讯
+					</view>
+					<view class="more" @click="moreClick">
+						更多 >
+					</view>
+				</view>
+				<view class="list">
+					<view class="item" v-for="item in tableData">
+						<view class="point">
+
+						</view>
+						<view class="content-text">
+							<view class="row1">
+								{{item.title}}
+							</view>
+							<view class="date">
+								{{item.issuingDate}}
+							</view>
+						</view>
+
+					</view>
+				</view>
+			</view>
+		</view>
+		<bottom></bottom>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import top from '@/components/top.vue'
+	import bottom from '@/components/bottom.vue'
+	export default {
+		components: {
+			top,
+			bottom
+		},
+		data() {
+			return {
+				navTitle: '',
+				type: "",
+				id: '',
+				dataObj: {},
+				tableData: [],
+				pageSize: 10,
+				// 当前页
+				currentPage: 1,
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.init()
+		},
+		methods: {
+			init() {
+				this.$request.baseRequest('get', '/hyPublicConsultation/getHyPublicConsultation', {
+						id: this.id,
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							debugger
+							this.dataObj = res.data
+
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+				this.$request.baseRequest('get', '/hyPublicConsultation/selectHyPublicConsultation', {
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: '',
+						searchType: '资讯'
+					}).then(res => {
+						console.log("res", res)
+						if (res.code == 200) {
+							this.tableData = res.data.records
+							this.total = res.data.total
+							uni.hideLoading()
+
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			moreClick(type) {
+				uni.navigateTo({
+					url: "/pages/index/zx"
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content1 {
+		width: 80%;
+		// background: white;
+		margin: 80rpx auto;
+		padding: 40rpx 0;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+
+		.left {
+			width: 65%;
+			background: white;
+			padding: 40rpx 80rpx;
+		}
+
+		.right {
+			margin-left: 40rpx;
+			width: 30%;
+			background: white;
+		}
+
+		.nav-title {
+			font-size: 28rpx;
+			color: #66686C;
+			line-height: 20px;
+		}
+
+		.content-title {
+			display: flex;
+			justify-content: center;
+			font-size: 68rpx;
+			font-weight: 500;
+			color: #0B0B0B;
+			line-height: 48px;
+			margin: 40rpx 0;
+		}
+
+		.ej-title {
+			display: flex;
+
+			.ly {
+				margin-left: 40rpx;
+				display: flex;
+				font-size: 28rpx;
+				color: #A7A7A7;
+				line-height: 40rpx;
+
+				.ly-name {
+					color: #0B0B0B
+				}
+			}
+
+			.fb-time {
+				font-size: 28rpx;
+				color: #A7A7A7;
+				line-height: 40rpx;
+			}
+		}
+
+		.right {
+			.right-title {
+				background: #e9dcdc;
+				display: flex;
+				justify-content: space-between;
+				padding: 10px;
+			}
+
+			.more {
+				color: #2F54EF;
+			}
+
+			.item {
+				border-bottom: 1px solid #F5F5F5;
+			}
+
+			.content-text {
+				padding: 40rpx;
+				box-sizing: border-box;
+
+				.row1 {
+					font-size: 36rpx;
+					color: #333333;
+				}
+
+				.date {
+					font-size: 36rpx;
+					color: #90969B;
+					margin-top: 10rpx;
+				}
+			}
+
+			.item:nth-of-type(5) {
+				border: 0;
+			}
+
+		}
+
+
+	}
+</style>

static/customicons.css

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: "customicons"; /* Project id 2878519 */
+  src:url('/static/customicons.ttf') format('truetype');
+}
+
+.customicons {
+  font-family: "customicons" !important;
+}
+
+.youxi:before {
+  content: "\e60e";
+}
+
+.wenjian:before {
+  content: "\e60f";
+}
+
+.zhuanfa:before {
+  content: "\e610";
+}

store/index.js

@@ -0,0 +1,155 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+Vue.use(Vuex)
+let lifeData = {};
+
+try {
+	// 尝试获取本地是否存在lifeData变量，第一次启动APP时是不存在的
+	lifeData = uni.getStorageSync('lifeData');
+} catch (e) {}
+
+// 需要永久存储，且下次APP启动需要取出的，在state中的变量名
+let saveStateKeys = ['firendItem', 'userData', 'userInfo', 'firstAuthentication', 'enter', 'pushRes', 'myTip',
+	'taskTip', 'contractTip', 'liangxinTip', 'packet', 'linkItem', 'memberItem', 'memberItemIndex', 'chatItem',
+	'clientId', 'infoList'
+];
+
+// 保存变量到本地存储中
+const saveLifeData = function(key, value) {
+	// 判断变量名是否在需要存储的数组中
+	if (saveStateKeys.indexOf(key) != -1) {
+		// 获取本地存储的lifeData对象，将变量添加到对象中
+		let tmp = uni.getStorageSync('lifeData');
+		// 第一次打开APP，不存在lifeData变量，故放一个{}空对象
+		tmp = tmp ? tmp : {};
+		// if(key == 'contractTip' && tmp[key] < value){
+		// 	uni.vibrateLong({
+		// 	    success: function () {
+		// 	        console.log('震动成功');
+		// 	    }
+		// 	});
+		// }
+		// if(key == 'taskTip' && tmp[key] < value){
+		// 	uni.vibrateLong({
+		// 	    success: function () {
+		// 	        console.log('震动成功');
+		// 	    }
+		// 	});
+		// }
+		tmp[key] = value;
+		// 执行这一步后，所有需要存储的变量，都挂载在本地的lifeData对象中
+		uni.setStorageSync('lifeData', tmp);
+	}
+}
+
+
+const store = new Vuex.Store({
+	modules: {},
+	state: {
+		sysinfo: uni.getSystemInfoSync(), //系统信息
+		enter: {},
+		hasLogin: false,
+		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
+		pushRes: lifeData.pushRes ? lifeData.pushRes : {},
+		//期货数据获取
+		infoList: lifeData.infoList ? lifeData.infoList : [],
+		//我的气泡提示
+		myTip: lifeData.myTip ? lifeData.myTip : 0,
+		//我的气泡提示
+		taskTip: lifeData.taskTip ? lifeData.taskTip : 0,
+		//我的气泡提示
+		contractTip: lifeData.contractTip ? lifeData.contractTip : 0,
+		//粮信气泡提示
+		liangxinTip: lifeData.liangxinTip ? lifeData.liangxinTip : 0,
+		// 链接
+		linkItem: lifeData.linkItem ? lifeData.linkItem : [],
+		userData: lifeData.userData ? lifeData.userData : {},
+		userInfo: lifeData.userInfo ? lifeData.userInfo : {},
+		//群成员 有索引A~Z
+		memberItem: lifeData.memberItem ? lifeData.memberItem : [],
+		//群成员 没有索引
+		memberItemIndex: lifeData.memberItemIndex ? lifeData.memberItemIndex : [],
+		// 消息列表
+		chatItem: lifeData.chatItem ? lifeData.chatItem : [],
+		//我的朋友
+		firendItem: lifeData.firendItem ? lifeData.firendItem : {},
+		// 红包
+		packet: lifeData.packet ? lifeData.packet : {},
+		// 消息体
+		chatObj: {
+			chatId: '',
+			chatType: 0,
+			chatName: '测试'
+		},
+		// 版本
+		vuex_version: '1.0.1',
+		//朋友圈展示信息
+		circleData: [],
+		//内置朋友圈相册banner图
+		circleBgList: [],
+		clientId: lifeData.clientId ? lifeData.clientId : "",
+		// 确定收货
+		isConfigfreightTransport: true,
+		choice: "",
+		firstAuthentication: {}
+	},
+	mutations: {
+		$uStore(state, payload) {
+			// 判断是否多层级调用，state中为对象存在的情况，诸如user.info.score = 1
+			let nameArr = payload.name.split('.');
+			let saveKey = '';
+			let len = nameArr.length;
+			if (nameArr.length >= 2) {
+				let obj = state[nameArr[0]];
+				for (let i = 1; i < len - 1; i++) {
+					obj = obj[nameArr[i]];
+				}
+				obj[nameArr[len - 1]] = payload.value;
+				saveKey = nameArr[0];
+			} else {
+				// 单层级变量，在state就是一个普通变量的情况
+				state[payload.name] = payload.value;
+				saveKey = payload.name;
+			}
+			// 保存变量到本地，见顶部函数定义
+			saveLifeData(saveKey, state[saveKey])
+		},
+		login(state, provider) {
+			state.hasLogin = true;
+			state.userInfo = provider;
+			// state.firstAuthentication = uni.getStorageSync('firstAuthentication');
+			uni.setStorageSync('userInfo', provider)
+		},
+
+		logout(state) {
+			state.hasLogin = false;
+			state.userInfo = {};
+			state.firstAuthentication = {};
+			uni.removeStorageSync('userInfo')
+		},
+		configfreightTransport(state, flag) {
+			state.isConfigfreightTransport = flag
+		},
+		configfreightChoice(state, val) {
+			state.choice = val
+		},
+		enterchange(state, provider) {
+			console.log(state)
+			console.log(provider)
+			state.enter = provider
+			console.log(state)
+		},
+
+
+	},
+	actions: {
+
+	},
+	getters: {
+		getUserInfo(state) {
+			return state.userInfo
+		}
+	}
+})
+
+export default store

uni.scss

@@ -0,0 +1,3 @@
+@import '@/uni_modules/uni-scss/variables.scss';
+/* uni.scss */
+@import '@/uni_modules/uview-ui/theme.scss';

uni_modules/uni-badge/changelog.md

@@ -0,0 +1,29 @@
+## 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-badge](https://uniapp.dcloud.io/component/uniui/uni-badge)
+## 1.1.7（2021-11-08）
+- 优化 升级ui
+- 修改 size 属性默认值调整为 small
+- 修改 type 属性，默认值调整为 error，info 替换 default
+## 1.1.6（2021-09-22）
+- 修复 在字节小程序上样式不生效的 bug
+## 1.1.5（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.4（2021-07-29）
+- 修复 去掉 nvue 不支持css 的 align-self 属性，nvue 下不暂支持 absolute 属性
+## 1.1.3（2021-06-24）
+- 优化 示例项目
+## 1.1.1（2021-05-12）
+- 新增 组件示例地址
+## 1.1.0（2021-05-12）
+- 新增 uni-badge 的 absolute 属性，支持定位
+- 新增 uni-badge 的 offset 属性，支持定位偏移
+- 新增 uni-badge 的 is-dot 属性，支持仅显示有一个小点
+- 新增 uni-badge 的 max-num 属性，支持自定义封顶的数字值，超过 99 显示99+
+- 优化 uni-badge 属性 custom-style， 支持以对象形式自定义样式
+## 1.0.7（2021-05-07）
+- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug
+- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug
+- 新增 uni-badge 属性 custom-style， 支持自定义样式
+## 1.0.6（2021-02-04）
+- 调整为uni_modules目录规范

uni_modules/uni-badge/components/uni-badge/uni-badge.vue

@@ -0,0 +1,268 @@
+<template>
+	<view class="uni-badge--x">
+		<slot />
+		<text v-if="text" :class="classNames" :style="[badgeWidth, positionStyle, customStyle, dotStyle]"
+			class="uni-badge" @click="onClick()">{{displayValue}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Badge 数字角标
+	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
+	 * @property {String} text 角标内容
+	 * @property {String} size = [normal|small] 角标内容
+	 * @property {String} type = [info|primary|success|warning|error] 颜色类型
+	 * 	@value info 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * @property {String} inverted = [true|false] 是否无需背景颜色
+	 * @property {Number} maxNum 展示封顶的数字值，超过 99 显示 99+
+	 * @property {String} absolute = [rightTop|rightBottom|leftBottom|leftTop] 开启绝对定位, 角标将定位到其包裹的标签的四角上		
+	 * 	@value rightTop 右上
+	 * 	@value rightBottom 右下
+	 * 	@value leftTop 左上
+	 * 	@value leftBottom 左下
+	 * @property {Array[number]} offset	距定位角中心点的偏移量，只有存在 absolute 属性时有效，例如：[-10, -10] 表示向外偏移 10px，[10, 10] 表示向 absolute 指定的内偏移 10px
+	 * @property {String} isDot = [true|false] 是否显示为一个小点
+	 * @event {Function} click 点击 Badge 触发事件
+	 * @example <uni-badge text="1"></uni-badge>
+	 */
+
+	export default {
+		name: 'UniBadge',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: 'error'
+			},
+			inverted: {
+				type: Boolean,
+				default: false
+			},
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			maxNum: {
+				type: Number,
+				default: 99
+			},
+			absolute: {
+				type: String,
+				default: ''
+			},
+			offset: {
+				type: Array,
+				default () {
+					return [0, 0]
+				}
+			},
+			text: {
+				type: [String, Number],
+				default: ''
+			},
+			size: {
+				type: String,
+				default: 'small'
+			},
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			width() {
+				return String(this.text).length * 8 + 12
+			},
+			classNames() {
+				const {
+					inverted,
+					type,
+					size,
+					absolute
+				} = this
+				return [
+					inverted ? 'uni-badge--' + type + '-inverted' : '',
+					'uni-badge--' + type,
+					'uni-badge--' + size,
+					absolute ? 'uni-badge--absolute' : ''
+				].join(' ')
+			},
+			positionStyle() {
+				if (!this.absolute) return {}
+				let w = this.width / 2,
+					h = 10
+				if (this.isDot) {
+					w = 5
+					h = 5
+				}
+				const x = `${- w  + this.offset[0]}px`
+				const y = `${- h + this.offset[1]}px`
+
+				const whiteList = {
+					rightTop: {
+						right: x,
+						top: y
+					},
+					rightBottom: {
+						right: x,
+						bottom: y
+					},
+					leftBottom: {
+						left: x,
+						bottom: y
+					},
+					leftTop: {
+						left: x,
+						top: y
+					}
+				}
+				const match = whiteList[this.absolute]
+				return match ? match : whiteList['rightTop']
+			},
+			badgeWidth() {
+				return {
+					width: `${this.width}px`
+				}
+			},
+			dotStyle() {
+				if (!this.isDot) return {}
+				return {
+					width: '10px',
+					height: '10px',
+					borderRadius: '10px'
+				}
+			},
+			displayValue() {
+				const {
+					isDot,
+					text,
+					maxNum
+				} = this
+				return isDot ? '' : (Number(text) > maxNum ? `${maxNum}+` : text)
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click');
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	$uni-primary: #2979ff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	$uni-info: #909399 !default;
+
+
+	$bage-size: 12px;
+	$bage-small: scale(0.8);
+
+	.uni-badge--x {
+		/* #ifdef APP-NVUE */
+		// align-self: flex-start;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		position: relative;
+	}
+
+	.uni-badge--absolute {
+		position: absolute;
+	}
+
+	.uni-badge--small {
+		transform: $bage-small;
+		transform-origin: center center;
+	}
+
+	.uni-badge {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		overflow: hidden;
+		box-sizing: border-box;
+		/* #endif */
+		justify-content: center;
+		flex-direction: row;
+		height: 20px;
+		line-height: 18px;
+		color: #fff;
+		border-radius: 100px;
+		background-color: $uni-info;
+		background-color: transparent;
+		border: 1px solid #fff;
+		text-align: center;
+		font-family: 'Helvetica Neue', Helvetica, sans-serif;
+		font-size: $bage-size;
+		/* #ifdef H5 */
+		z-index: 999;
+		cursor: pointer;
+		/* #endif */
+
+		&--info {
+			color: #fff;
+			background-color: $uni-info;
+		}
+
+		&--primary {
+			background-color: $uni-primary;
+		}
+
+		&--success {
+			background-color: $uni-success;
+		}
+
+		&--warning {
+			background-color: $uni-warning;
+		}
+
+		&--error {
+			background-color: $uni-error;
+		}
+
+		&--inverted {
+			padding: 0 5px 0 0;
+			color: $uni-info;
+		}
+
+		&--info-inverted {
+			color: $uni-info;
+			background-color: transparent;
+		}
+
+		&--primary-inverted {
+			color: $uni-primary;
+			background-color: transparent;
+		}
+
+		&--success-inverted {
+			color: $uni-success;
+			background-color: transparent;
+		}
+
+		&--warning-inverted {
+			color: $uni-warning;
+			background-color: transparent;
+		}
+
+		&--error-inverted {
+			color: $uni-error;
+			background-color: transparent;
+		}
+
+	}
+</style>

uni_modules/uni-badge/package.json

@@ -0,0 +1,88 @@
+{
+  "id": "uni-badge",
+  "displayName": "uni-badge 数字角标",
+  "version": "1.2.0",
+  "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。",
+  "keywords": [
+    "",
+    "badge",
+    "uni-ui",
+    "uniui",
+    "数字角标",
+    "徽章"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-badge/readme.md

@@ -0,0 +1,10 @@
+## Badge 数字角标
+> **组件名：uni-badge**
+> 代码块： `uBadge`
+
+数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景，
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-badge)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+

uni_modules/uni-breadcrumb/changelog.md

@@ -0,0 +1,4 @@
+## 0.1.1（2022-06-02）
+- 新增 支持 uni.scss 修改颜色
+## 0.1.0（2022-04-21）
+- 初始化

uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue

@@ -0,0 +1,104 @@
+<template>
+	<view class="uni-breadcrumb-item">
+		<view :class="{
+			'uni-breadcrumb-item--slot': true,
+			'uni-breadcrumb-item--slot-link': to && currentPage !== to.path
+			}" @click="navTo">
+			<slot />
+		</view>
+		<i v-if="separatorClass" class="uni-breadcrumb-item--separator" :class="separatorClass" />
+		<text v-else class="uni-breadcrumb-item--separator">{{ separator }}</text>
+	</view>
+</template>
+<script>
+	/**
+	 * BreadcrumbItem 面包屑导航子组件
+	 * @property {String/Object} to 路由跳转页面路径/对象
+	 * @property {Boolean} replace 在使用 to 进行路由跳转时，启用 replace 将不会向 history 添加新记录(仅 h5 支持）
+	 */
+	export default {
+		data() {
+			return {
+				currentPage: ''
+			}
+		},
+		props: {
+			to: {
+				type: [String, Object],
+				default: ''
+			}
+		},
+		inject: ['uniBreadcrumb'],
+		computed: {
+			separator() {
+				return this.uniBreadcrumb.separator
+			},
+			separatorClass() {
+				return this.uniBreadcrumb.separatorClass
+			}
+		},
+		watch: {
+			$route: {
+				immediate: true,
+				handler(val) {
+					this.currentPage = val.path
+				}
+			}
+		},
+		methods: {
+			navTo() {
+				const {
+					to,
+					$router
+				} = this
+				if (this.currentPage === to.path) return
+				if (to && $router) {
+					this.replace ?
+						$router.replace(to) :
+						$router.push(to)
+
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	$uni-primary: #2979ff !default;
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #3a3a3a !default;
+	.uni-breadcrumb-item {
+		display: flex;
+		align-items: center;
+		white-space: nowrap;
+		font-size: 14px;
+
+		&--slot {
+			color: $uni-base-color;
+			padding: 0 10px;
+
+			&-link {
+				color: $uni-main-color;
+				font-weight: bold;
+				/* #ifndef APP-NVUE */
+				cursor: pointer;
+				/* #endif */
+
+				&:hover {
+					color: $uni-primary;
+				}
+			}
+		}
+
+		&--separator {
+			font-size: 12px;
+			color: $uni-base-color;
+		}
+
+		&:last-child &--separator {
+			display: none;
+		}
+		&:first-child &--slot {
+			padding-left: 0;
+		}
+	}
+</style>

uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue

@@ -0,0 +1,38 @@
+<template>
+	<view class="uni-breadcrumb">
+		<slot />
+	</view>
+</template>
+<script>
+	/**
+	 * Breadcrumb 面包屑导航父组件
+	 * @description 显示当前页面的路径，快速返回之前的任意页面
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} separator 分隔符，默认为斜杠'/'
+	 * @property {String} separatorClass 图标分隔符 class
+	 */
+	export default {
+		props: {
+			separator: {
+				type: String,
+				default: '/'
+			},
+			separatorClass: {
+				type: String,
+				default: ''
+			}
+		},
+
+		provide() {
+			return {
+				uniBreadcrumb: this
+			}
+		}
+
+	}
+</script>
+<style lang="scss">
+	.uni-breadcrumb {
+		display: flex;
+	}
+</style>

uni_modules/uni-breadcrumb/package.json

@@ -0,0 +1,85 @@
+{
+  "id": "uni-breadcrumb",
+  "displayName": "uni-breadcrumb 面包屑",
+  "version": "0.1.1",
+  "description": "Breadcrumb  面包屑",
+  "keywords": [
+    "uni-breadcrumb",
+    "breadcrumb",
+    "uni-ui",
+    "面包屑导航",
+    "面包屑"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-breadcrumb/readme.md

@@ -0,0 +1,66 @@
+
+## breadcrumb 面包屑导航
+> **组件名：uni-breadcrumb**
+> 代码块： `ubreadcrumb`
+
+显示当前页面的路径，快速返回之前的任意页面。
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<uni-breadcrumb separator="/">
+	<uni-breadcrumb-item v-for="route in routes" :to="route.to">{{route.name}}</uni-breadcrumb-item>
+</uni-breadcrumb>
+```
+
+```js
+export default {
+		name: "uni-stat-breadcrumb",
+		data() {
+			return {
+				routes: [{
+					to: '/A',
+					name: 'A页面'
+				}, {
+					to: '/B',
+					name: 'B页面'
+				}, {
+					to: '/C',
+					name: 'C页面'
+				}]
+			};
+		}
+	}
+```
+
+
+## API
+
+### Breadcrumb Props
+
+|属性名			|类型	|默认值	|说明				|
+|:-:			|:-:	|:-:	|:-:				|
+|separator		|String	|斜杠'/'|分隔符				|
+|separatorClass	|String	|		|图标分隔符 class	|
+
+### Breadcrumb Item Props
+
+|属性名	|类型			|默认值	|说明																			|
+|:-:	|:-:			|:-:	|:-:																			|
+|to		|String/Object	|		|路由跳转页面路径/对象															|
+|replace|Boolean		|		|在使用 to 进行路由跳转时，启用 replace 将不会向 history 添加新记录(仅 h5 支持）|
+
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/breadcrumb/breadcrumb](https://hellouniapp.dcloud.net.cn/pages/extUI/breadcrumb/breadcrumb)

uni_modules/uni-calendar/changelog.md

@@ -0,0 +1,16 @@
+## 1.4.5（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.4.4（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.4.3（2021-09-22）
+- 修复 startDate、 endDate 属性失效的 bug
+## 1.4.2（2021-08-24）
+- 新增 支持国际化
+## 1.4.1（2021-08-05）
+- 修复 弹出层被 tabbar 遮盖 bug
+## 1.4.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.3.16（2021-05-12）
+- 新增 组件示例地址
+## 1.3.15（2021-02-04）
+- 调整为uni_modules目录规范 

uni_modules/uni-calendar/components/uni-calendar/calendar.js

@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar

uni_modules/uni-calendar/components/uni-calendar/i18n/en.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "ok",
+	"uni-calender.cancel": "cancel",
+	"uni-calender.today": "today",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}

uni_modules/uni-calendar/components/uni-calendar/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}

uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "確定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}

uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue

@@ -0,0 +1,188 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+		'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+	 @click="choiceDate(weeks)">
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text" :class="{
+				'uni-calendar-item--isDay-text': weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.date}}</text>
+			<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				}">{{todayText}}</text>
+			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+			<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--extra':weeks.extraInfo.info,
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.extraInfo.info}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		emits:['change'],
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			todayText() {
+				return t("uni-calender.today")
+			},
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-font-size-base:14px;
+	$uni-text-color:#333;
+	$uni-font-size-sm:12px;
+	$uni-color-error: #e43d33;
+	$uni-opacity-disabled: 0.3;
+	$uni-text-color-disable:#c0c0c0;
+	$uni-color-primary: #2979ff;
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		color: $uni-text-color-disable;
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-color-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-color-primary;
+		opacity: 0.8;
+		color: #fff;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+</style>

uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue

@@ -0,0 +1,562 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{cancelText}}</text>
+				</view>
+				<view class="uni-calendar__header-btn-box" @click="confirm">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{okText}}</text>
+				</view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +' / '+( nowDate.month||'')}}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<text class="uni-calendar__backtoday" @click="backtoday">{{todayText}}</text>
+
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './uni-calendar-item.vue'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem
+		},
+		emits:['close','confirm','change','monthSwitch'],
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false
+			}
+		},
+		computed:{
+			/**
+			 * for i18n
+			 */
+
+			okText() {
+				return t("uni-calender.ok")
+			},
+			cancelText() {
+				return t("uni-calender.cancel")
+			},
+			todayText() {
+				return t("uni-calender.today")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		watch: {
+			date(newVal) {
+				// this.cale.setDate(newVal)
+				this.init(newVal)
+			},
+			startDate(val){
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val){
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			}
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			// this.cale.setDate(this.date)
+			this.init(this.date)
+			// this.setDay
+		},
+		methods: {
+			// 取消穿透
+			clean() {},
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				console.log(this.cale.getDate(value));
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				console.log(this.cale.getDate(new Date()).fullDate);
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
+	$uni-border-color: #EDEDED;
+	$uni-text-color: #333;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-font-size-base:14px;
+	$uni-text-color-placeholder: #808080;
+	$uni-color-subtitle: #555555;
+	$uni-text-color-grey:#999;
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: $uni-bg-color-mask;
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		bottom: 0;
+		/* #endif */
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		bottom: calc(var(--window-bottom));
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+		// padding: 0 15px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: $uni-text-color;
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 10px;
+		height: 10px;
+		border-left-color: $uni-text-color-placeholder;
+		border-left-style: solid;
+		border-left-width: 2px;
+		border-top-color: $uni-color-subtitle;
+		border-top-style: solid;
+		border-top-width: 2px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 14px;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: $uni-text-color-grey;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+</style>

uni_modules/uni-calendar/components/uni-calendar/util.js

@@ -0,0 +1,350 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !(disableBefore && disableAfter),
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			year,
+			month
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar

uni_modules/uni-calendar/package.json

@@ -0,0 +1,88 @@
+{
+  "id": "uni-calendar",
+  "displayName": "uni-calendar 日历",
+  "version": "1.4.5",
+  "description": "日历组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "日历",
+    "",
+    "打卡",
+    "日历选择"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-calendar/readme.md

@@ -0,0 +1,103 @@
+
+
+## Calendar 日历
+> **组件名：uni-calendar**
+> 代码块： `uCalendar`
+
+
+日历组件
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 本组件农历转换使用的js是 [@1900-2100区间内的公历、农历互转](https://github.com/jjonline/calendar.js)  
+> - 仅支持自定义组件模式
+> - `date`属性传入的应该是一个 String ，如： 2019-06-27 ，而不是 new Date()
+> - 通过 `insert` 属性来确定当前的事件是 @change 还是 @confirm 。理应合并为一个事件，但是为了区分模式，现使用两个事件，这里需要注意
+> - 弹窗模式下无法阻止后面的元素滚动，如有需要阻止，请在弹窗弹出后，手动设置滚动元素为不可滚动
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<view>
+	<uni-calendar 
+	:insert="true"
+	:lunar="true" 
+	:start-date="'2019-3-2'"
+	:end-date="'2019-5-20'"
+	@change="change"
+	 />
+</view>
+```
+
+### 通过方法打开日历
+
+需要设置 `insert` 为 `false`
+
+```html
+<view>
+	<uni-calendar 
+	ref="calendar"
+	:insert="false"
+	@confirm="confirm"
+	 />
+	 <button @click="open">打开日历</button>
+</view>
+```
+
+```javascript
+
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		open(){
+			this.$refs.calendar.open();
+		},
+		confirm(e) {
+			console.log(e);
+		}
+	}
+};
+
+```
+
+
+## API
+
+### Calendar Props
+
+|  属性名	|    类型	| 默认值| 说明																													|
+| 		| 																													|
+| date		| String	|-		| 自定义当前时间，默认为今天																							|
+| lunar		| Boolean	| false	| 显示农历																												|
+| startDate	| String	|-		| 日期选择范围-开始日期																									|
+| endDate	| String	|-		| 日期选择范围-结束日期																									|
+| range		| Boolean	| false	| 范围选择																												|
+| insert	| Boolean	| false	| 插入模式,可选值，ture：插入模式；false：弹窗模式；默认为插入模式														|
+|clearDate	|Boolean	|true	|弹窗模式是否清空上次选择内容	|
+| selected	| Array		|-		| 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]	|
+|showMonth	| Boolean	| true	| 是否显示月份为背景																									|
+
+### Calendar Events
+
+|  事件名		| 说明								|返回值|
+| 								|		| 									|
+| open	| 弹出日历组件，`insert :false` 时生效|- 	|
+
+
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar](https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar)

uni_modules/uni-card/changelog.md

@@ -0,0 +1,26 @@
+## 1.3.1（2021-12-20）
+- 修复 在vue页面下略缩图显示不正常的bug
+## 1.3.0（2021-11-19）
+- 重构插槽的用法 ，header 替换为 title 
+- 新增 actions 插槽
+- 新增 cover 封面图属性和插槽
+- 新增 padding 内容默认内边距离
+- 新增 margin 卡片默认外边距离
+- 新增 spacing 卡片默认内边距
+- 新增 shadow 卡片阴影属性
+- 取消 mode 属性，可使用组合插槽代替
+- 取消 note 属性 ，使用actions插槽代替
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-card](https://uniapp.dcloud.io/component/uniui/uni-card)
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-07-01）
+- 优化 图文卡片无图片加载时，提供占位图标
+- 新增 header 插槽，自定义卡片头部（ 图文卡片 mode="style" 时，不支持）
+- 修复 thumbnail 不存在仍然占位的 bug
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-04）
+- 调整为uni_modules目录规范

uni_modules/uni-card/components/uni-card/uni-card.vue

@@ -0,0 +1,270 @@
+<template>
+	<view class="uni-card" :class="{ 'uni-card--full': isFull, 'uni-card--shadow': isShadow,'uni-card--border':border}"
+		:style="{'margin':isFull?0:margin,'padding':spacing,'box-shadow':isShadow?shadow:''}">
+		<!-- 封面 -->
+		<slot name="cover">
+			<view v-if="cover" class="uni-card__cover">
+				<image class="uni-card__cover-image" mode="widthFix" @click="onClick('cover')" :src="cover"></image>
+			</view>
+		</slot>
+		<slot name="title">
+			<view v-if="title || extra" class="uni-card__header">
+				<!-- 卡片标题 -->
+				<view class="uni-card__header-box" @click="onClick('title')">
+					<view v-if="thumbnail" class="uni-card__header-avatar">
+						<image class="uni-card__header-avatar-image" :src="thumbnail" mode="aspectFit" />
+					</view>
+					<view class="uni-card__header-content">
+						<text class="uni-card__header-content-title uni-ellipsis">{{ title }}</text>
+						<text v-if="title&&subTitle"
+							class="uni-card__header-content-subtitle uni-ellipsis">{{ subTitle }}</text>
+					</view>
+				</view>
+				<view class="uni-card__header-extra" @click="onClick('extra')">
+					<text class="uni-card__header-extra-text">{{ extra }}</text>
+				</view>
+			</view>
+		</slot>
+		<!-- 卡片内容 -->
+		<view class="uni-card__content" :style="{padding:padding}" @click="onClick('content')">
+			<slot></slot>
+		</view>
+		<view class="uni-card__actions" @click="onClick('actions')">
+			<slot name="actions"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Card 卡片
+	 * @description 卡片视图组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=22
+	 * @property {String} title 标题文字
+	 * @property {String} subTitle 副标题
+	 * @property {Number} padding 内容内边距
+	 * @property {Number} margin 卡片外边距
+	 * @property {Number} spacing 卡片内边距
+	 * @property {String} extra 标题额外信息
+	 * @property {String} cover 封面图（本地路径需要引入）
+	 * @property {String} thumbnail 标题左侧缩略图
+	 * @property {Boolean} is-full = [true | false] 卡片内容是否通栏，为 true 时将去除padding值
+	 * @property {Boolean} is-shadow = [true | false] 卡片内容是否开启阴影
+	 * @property {String} shadow 卡片阴影
+	 * @property {Boolean} border 卡片边框
+	 * @event {Function} click 点击 Card 触发事件
+	 */
+	export default {
+		name: 'UniCard',
+		emits: ['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+			padding: {
+				type: String,
+				default: '10px'
+			},
+			margin: {
+				type: String,
+				default: '15px'
+			},
+			spacing: {
+				type: String,
+				default: '0 10px'
+			},
+			extra: {
+				type: String,
+				default: ''
+			},
+			cover: {
+				type: String,
+				default: ''
+			},
+			thumbnail: {
+				type: String,
+				default: ''
+			},
+			isFull: {
+				// 内容区域是否通栏
+				type: Boolean,
+				default: false
+			},
+			isShadow: {
+				// 是否开启阴影
+				type: Boolean,
+				default: true
+			},
+			shadow: {
+				type: String,
+				default: '0px 0px 3px 1px rgba(0, 0, 0, 0.08)'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			}
+		},
+		methods: {
+			onClick(type) {
+				this.$emit('click', type)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-border-3: #EBEEF5 !default;
+	$uni-shadow-base:0 0px 6px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+	$uni-main-color: #3a3a3a !default;
+	$uni-base-color: #6a6a6a !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-spacing-sm: 8px !default;
+	$uni-border-color:$uni-border-3;
+	$uni-shadow: $uni-shadow-base;
+	$uni-card-title: 15px;
+	$uni-cart-title-color:$uni-main-color;
+	$uni-card-subtitle: 12px;
+	$uni-cart-subtitle-color:$uni-secondary-color;
+	$uni-card-spacing: 10px;
+	$uni-card-content-color: $uni-base-color;
+
+	.uni-card {
+		margin: $uni-card-spacing;
+		padding: 0 $uni-spacing-sm;
+		border-radius: 4px;
+		overflow: hidden;
+		font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+		background-color: #fff;
+		flex: 1;
+
+		.uni-card__cover {
+			position: relative;
+			margin-top: $uni-card-spacing;
+			flex-direction: row;
+			overflow: hidden;
+			border-radius: 4px;
+			.uni-card__cover-image {
+				flex: 1;
+				// width: 100%;
+				/* #ifndef APP-PLUS */
+				vertical-align: middle;
+				/* #endif */
+			}
+		}
+
+		.uni-card__header {
+			display: flex;
+			border-bottom: 1px $uni-border-color solid;
+			flex-direction: row;
+			align-items: center;
+			padding: $uni-card-spacing;
+			overflow: hidden;
+
+			.uni-card__header-box {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex: 1;
+				flex-direction: row;
+				align-items: center;
+				overflow: hidden;
+			}
+
+			.uni-card__header-avatar {
+				width: 40px;
+				height: 40px;
+				overflow: hidden;
+				border-radius: 5px;
+				margin-right: $uni-card-spacing;
+				.uni-card__header-avatar-image {
+					flex: 1;
+					width: 40px;
+					height: 40px;
+				}
+			}
+
+			.uni-card__header-content {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex-direction: column;
+				justify-content: center;
+				flex: 1;
+				// height: 40px;
+				overflow: hidden;
+
+				.uni-card__header-content-title {
+					font-size: $uni-card-title;
+					color: $uni-cart-title-color;
+					// line-height: 22px;
+				}
+
+				.uni-card__header-content-subtitle {
+					font-size: $uni-card-subtitle;
+					margin-top: 5px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
+
+			.uni-card__header-extra {
+				line-height: 12px;
+
+				.uni-card__header-extra-text {
+					font-size: 12px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
+		}
+
+		.uni-card__content {
+			padding: $uni-card-spacing;
+			font-size: 14px;
+			color: $uni-card-content-color;
+			line-height: 22px;
+		}
+
+		.uni-card__actions {
+			font-size: 12px;
+		}
+	}
+
+	.uni-card--border {
+		border: 1px solid $uni-border-color;
+	}
+
+	.uni-card--shadow {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		box-shadow: $uni-shadow;
+		/* #endif */
+	}
+
+	.uni-card--full {
+		margin: 0;
+		border-left-width: 0;
+		border-left-width: 0;
+		border-radius: 0;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-card--full:after {
+		border-radius: 0;
+	}
+
+	/* #endif */
+	.uni-ellipsis {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+	}
+</style>

uni_modules/uni-card/package.json

@@ -0,0 +1,90 @@
+{
+  "id": "uni-card",
+  "displayName": "uni-card 卡片",
+  "version": "1.3.1",
+  "description": "Card 组件，提供常见的卡片样式。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "card",
+    "",
+    "卡片"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-icons",
+			"uni-scss"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-card/readme.md

@@ -0,0 +1,12 @@
+
+
+## Card 卡片
+> **组件名：uni-card**
+> 代码块： `uCard`
+
+卡片视图组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-card)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+

uni_modules/uni-collapse/changelog.md

@@ -0,0 +1,36 @@
+## 1.4.3（2022-01-25）
+- 修复 初始化的时候 ，open 属性失效的bug
+## 1.4.2（2022-01-21）
+- 修复 微信小程序resize后组件收起的bug
+## 1.4.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.4.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-collapse](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+## 1.3.3（2021-08-17）
+- 优化 show-arrow 属性默认为true
+## 1.3.2（2021-08-17）
+- 新增 show-arrow 属性，控制是否显示右侧箭头
+## 1.3.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.3.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.2（2021-07-21）
+- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+## 1.2.1（2021-07-21）
+- 优化 组件示例
+## 1.2.0（2021-07-21）
+- 新增 组件折叠动画
+- 新增 value\v-model 属性 ，动态修改面板折叠状态
+- 新增 title 插槽 ，可定义面板标题
+- 新增 border 属性 ，显示隐藏面板内容分隔线
+- 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- 修复 resize 方法失效的Bug
+- 修复 change 事件返回参数不正确的Bug
+- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.1.5（2021-02-05）
+- 调整为uni_modules目录规范

uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

@@ -0,0 +1,402 @@
+<template>
+	<view class="uni-collapse-item">
+		<!-- onClick(!isOpen) -->
+		<view @click="onClick(!isOpen)" class="uni-collapse-item__title"
+			:class="{'is-open':isOpen &&titleBorder === 'auto' ,'uni-collapse-item-border':titleBorder !== 'none'}">
+			<view class="uni-collapse-item__title-wrap">
+				<slot name="title">
+					<view class="uni-collapse-item__title-box" :class="{'is-disabled':disabled}">
+						<image v-if="thumb" :src="thumb" class="uni-collapse-item__title-img" />
+						<text class="uni-collapse-item__title-text">{{ title }}</text>
+					</view>
+				</slot>
+			</view>
+			<view v-if="showArrow"
+				:class="{ 'uni-collapse-item__title-arrow-active': isOpen, 'uni-collapse-item--animation': showAnimation === true }"
+				class="uni-collapse-item__title-arrow">
+				<uni-icons :color="disabled?'#ddd':'#bbb'" size="14" type="bottom" />
+			</view>
+		</view>
+		<view class="uni-collapse-item__wrap" :class="{'is--transition':showAnimation}"
+			:style="{height: (isOpen?height:0) +'px'}">
+			<view :id="elId" ref="collapse--hook" class="uni-collapse-item__wrap-content"
+				:class="{open:isheight,'uni-collapse-item--border':border&&isOpen}">
+				<slot></slot>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom')
+	// #endif
+	/**
+	 * CollapseItem 折叠面板子组件
+	 * @description 折叠面板子组件
+	 * @property {String} title 标题文字
+	 * @property {String} thumb 标题左侧缩略图
+	 * @property {String} name 唯一标志符
+	 * @property {Boolean} open = [true|false] 是否展开组件
+	 * @property {Boolean} titleBorder = [true|false] 是否显示标题分隔线
+	 * @property {Boolean} border = [true|false] 是否显示分隔线
+	 * @property {Boolean} disabled = [true|false] 是否展开面板
+	 * @property {Boolean} showAnimation = [true|false] 开启动画
+	 * @property {Boolean} showArrow = [true|false] 是否显示右侧箭头
+	 */
+	export default {
+		name: 'uniCollapseItem',
+		props: {
+			// 列表标题
+			title: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// #ifdef APP-PLUS
+			// 是否显示动画,app 端默认不开启动画，卡顿严重
+			showAnimation: {
+				type: Boolean,
+				default: false
+			},
+			// #endif
+			// #ifndef APP-PLUS
+			// 是否显示动画
+			showAnimation: {
+				type: Boolean,
+				default: true
+			},
+			// #endif
+			// 是否展开
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 缩略图
+			thumb: {
+				type: String,
+				default: ''
+			},
+			// 标题分隔线显示类型
+			titleBorder: {
+				type: String,
+				default: 'auto'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			showArrow: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				isOpen: false,
+				isheight: null,
+				height: 0,
+				elId,
+				nameSync: 0
+			}
+		},
+		watch: {
+			open(val) {
+				this.isOpen = val
+				this.onClick(val, 'init')
+			}
+		},
+		updated(e) {
+			this.$nextTick(() => {
+				this.init(true)
+			})
+		},
+		created() {
+			this.collapse = this.getCollapse()
+			this.oldHeight = 0
+			this.onClick(this.open, 'init')
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+		mounted() {
+			if (!this.collapse) return
+			if (this.name !== '') {
+				this.nameSync = this.name
+			} else {
+				this.nameSync = this.collapse.childrens.length + ''
+			}
+			if (this.collapse.names.indexOf(this.nameSync) === -1) {
+				this.collapse.names.push(this.nameSync)
+			} else {
+				console.warn(`name 值 ${this.nameSync} 重复`);
+			}
+			if (this.collapse.childrens.indexOf(this) === -1) {
+				this.collapse.childrens.push(this)
+			}
+			this.init()
+		},
+		methods: {
+			init(type) {
+				// #ifndef APP-NVUE
+				this.getCollapseHeight(type)
+				// #endif
+				// #ifdef APP-NVUE
+				this.getNvueHwight(type)
+				// #endif
+			},
+			uninstall() {
+				if (this.collapse) {
+					this.collapse.childrens.forEach((item, index) => {
+						if (item === this) {
+							this.collapse.childrens.splice(index, 1)
+						}
+					})
+					this.collapse.names.forEach((item, index) => {
+						if (item === this.nameSync) {
+							this.collapse.names.splice(index, 1)
+						}
+					})
+				}
+			},
+			onClick(isOpen, type) {
+				if (this.disabled) return
+				this.isOpen = isOpen
+				if (this.isOpen && this.collapse) {
+					this.collapse.setAccordion(this)
+				}
+				if (type !== 'init') {
+					this.collapse.onChange(isOpen, this)
+				}
+			},
+			getCollapseHeight(type, index = 0) {
+				const views = uni.createSelectorQuery().in(this)
+				views
+					.select(`#${this.elId}`)
+					.fields({
+						size: true
+					}, data => {
+						// TODO 百度中可能获取不到节点信息 ，需要循环获取
+						if (index >= 10) return
+						if (!data) {
+							index++
+							this.getCollapseHeight(false, index)
+							return
+						}
+						// #ifdef APP-NVUE
+						this.height = data.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = data.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.isOpen, 'init')
+					})
+					.exec()
+			},
+			getNvueHwight(type) {
+				const result = dom.getComponentRect(this.$refs['collapse--hook'], option => {
+					if (option && option.result && option.size) {
+						// #ifdef APP-NVUE
+						this.height = option.size.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = option.size.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.open, 'init')
+					}
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getCollapse(name = 'uniCollapse') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-collapse-item {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+
+		/* #endif */
+		&__title {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			width: 100%;
+			box-sizing: border-box;
+			/* #endif */
+			flex-direction: row;
+			align-items: center;
+			transition: border-bottom-color .3s;
+
+			// transition-property: border-bottom-color;
+			// transition-duration: 5s;
+			&-wrap {
+				width: 100%;
+				flex: 1;
+
+			}
+
+			&-box {
+				padding: 0 15px;
+				/* #ifndef APP-NVUE */
+				display: flex;
+				width: 100%;
+				box-sizing: border-box;
+				/* #endif */
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+				height: 48px;
+				line-height: 48px;
+				background-color: #fff;
+				color: #303133;
+				font-size: 13px;
+				font-weight: 500;
+				/* #ifdef H5 */
+				cursor: pointer;
+				outline: none;
+
+				/* #endif */
+				&.is-disabled {
+					.uni-collapse-item__title-text {
+						color: #999;
+					}
+				}
+
+			}
+
+			&.uni-collapse-item-border {
+				border-bottom: 1px solid #ebeef5;
+			}
+
+			&.is-open {
+				border-bottom-color: transparent;
+			}
+
+			&-img {
+				height: 22px;
+				width: 22px;
+				margin-right: 10px;
+			}
+
+			&-text {
+				flex: 1;
+				font-size: 14px;
+				/* #ifndef APP-NVUE */
+				white-space: nowrap;
+				color: inherit;
+				/* #endif */
+				/* #ifdef APP-NVUE */
+				lines: 1;
+				/* #endif */
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			&-arrow {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				box-sizing: border-box;
+				/* #endif */
+				align-items: center;
+				justify-content: center;
+				width: 20px;
+				height: 20px;
+				margin-right: 10px;
+				transform: rotate(0deg);
+
+				&-active {
+					transform: rotate(-180deg);
+				}
+			}
+
+
+		}
+
+		&__wrap {
+			/* #ifndef APP-NVUE */
+			will-change: height;
+			box-sizing: border-box;
+			/* #endif */
+			background-color: #fff;
+			overflow: hidden;
+			position: relative;
+			height: 0;
+
+			&.is--transition {
+				// transition: all 0.3s;
+				transition-property: height, border-bottom-width;
+				transition-duration: 0.3s;
+				/* #ifndef APP-NVUE */
+				will-change: height;
+				/* #endif */
+			}
+
+
+
+			&-content {
+				position: absolute;
+				font-size: 13px;
+				color: #303133;
+				// transition: height 0.3s;
+				border-bottom-color: transparent;
+				border-bottom-style: solid;
+				border-bottom-width: 0;
+
+				&.uni-collapse-item--border {
+					border-bottom-width: 1px;
+					border-bottom-color: red;
+					border-bottom-color: #ebeef5;
+				}
+
+				&.open {
+					position: relative;
+				}
+			}
+		}
+
+		&--animation {
+			transition-property: transform;
+			transition-duration: 0.3s;
+			transition-timing-function: ease;
+		}
+
+	}
+</style>

uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue

@@ -0,0 +1,147 @@
+<template>
+	<view class="uni-collapse">
+		<slot />
+	</view>
+</template>
+<script>
+	/**
+	 * Collapse 折叠面板
+	 * @description 展示可以折叠 / 展开的内容区域
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=23
+	 * @property {String|Array} value 当前激活面板改变时触发(如果是手风琴模式，参数类型为string，否则为array)
+	 * @property {Boolean} accordion = [true|false] 是否开启手风琴效果是否开启手风琴效果
+	 * @event {Function} change 切换面板时触发，如果是手风琴模式，返回类型为string，否则为array
+	 */
+	export default {
+		name: 'uniCollapse',
+		emits:['change','activeItem','input','update:modelValue'],
+		props: {
+			value: {
+				type: [String, Array],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Array],
+				default: ''
+			},
+			accordion: {
+				// 是否开启手风琴效果
+				type: [Boolean, String],
+				default: false
+			},
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			// TODO 兼容 vue2 和 vue3
+			dataValue() {
+				let value = (typeof this.value === 'string' && this.value === '') ||
+					(Array.isArray(this.value) && this.value.length === 0)
+				let modelValue = (typeof this.modelValue === 'string' && this.modelValue === '') ||
+					(Array.isArray(this.modelValue) && this.modelValue.length === 0)
+				if (value) {
+					return this.modelValue
+				}
+				if (modelValue) {
+					return this.value
+				}
+
+				return this.value
+			}
+		},
+		watch: {
+			dataValue(val) {
+				this.setOpen(val)
+			}
+		},
+		created() {
+			this.childrens = []
+			this.names = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.setOpen(this.dataValue)
+			})
+		},
+		methods: {
+			setOpen(val) {
+				let str = typeof val === 'string'
+				let arr = Array.isArray(val)
+				this.childrens.forEach((vm, index) => {
+					if (str) {
+						if (val === vm.nameSync) {
+							if (!this.accordion) {
+								console.warn('accordion 属性为 false ,v-model 类型应该为 array')
+								return
+							}
+							vm.isOpen = true
+						}
+					}
+					if (arr) {
+						val.forEach(v => {
+							if (v === vm.nameSync) {
+								if (this.accordion) {
+									console.warn('accordion 属性为 true ,v-model 类型应该为 string')
+									return
+								}
+								vm.isOpen = true
+							}
+						})
+					}
+				})
+				this.emit(val)
+			},
+			setAccordion(self) {
+				if (!this.accordion) return
+				this.childrens.forEach((vm, index) => {
+					if (self !== vm) {
+						vm.isOpen = false
+					}
+				})
+			},
+			resize() {
+				this.childrens.forEach((vm, index) => {
+					// #ifndef APP-NVUE
+					vm.getCollapseHeight()
+					// #endif
+					// #ifdef APP-NVUE
+					vm.getNvueHwight()
+					// #endif
+				})
+			},
+			onChange(isOpen, self) {
+				let activeItem = []
+
+				if (this.accordion) {
+					activeItem = isOpen ? self.nameSync : ''
+				} else {
+					this.childrens.forEach((vm, index) => {
+						if (vm.isOpen) {
+							activeItem.push(vm.nameSync)
+						}
+					})
+				}
+				this.$emit('change', activeItem)
+				this.emit(activeItem)
+			},
+			emit(val){
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-collapse {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		flex-direction: column;
+		background-color: #fff;
+	}
+</style>

uni_modules/uni-collapse/package.json

@@ -0,0 +1,89 @@
+{
+  "id": "uni-collapse",
+  "displayName": "uni-collapse 折叠面板",
+  "version": "1.4.3",
+  "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
+  "keywords": [
+    "uni-ui",
+    "折叠",
+    "折叠面板",
+    "手风琴"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-collapse/readme.md

@@ -0,0 +1,12 @@
+
+
+## Collapse 折叠面板
+> **组件名：uni-collapse**
+> 代码块： `uCollapse`
+> 关联组件：`uni-collapse-item`、`uni-icons`。
+
+
+折叠面板用来折叠/显示过长的内容或者是列表。通常是在多内容分类项使用，折叠不重要的内容，显示重要内容。点击可以展开折叠部分。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-combox/changelog.md

@@ -0,0 +1,15 @@
+## 1.0.1（2021-11-23）
+- 优化 label、label-width 属性
+## 1.0.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-combox](https://uniapp.dcloud.io/component/uniui/uni-combox)
+## 0.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.6（2021-05-12）
+- 新增 组件示例地址
+## 0.0.5（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 0.0.4（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 0.0.3（2021-02-04）
+- 调整为uni_modules目录规范

uni_modules/uni-combox/components/uni-combox/uni-combox.vue

@@ -0,0 +1,275 @@
+<template>
+	<view class="uni-combox" :class="border ? '' : 'uni-combox__no-border'">
+		<view v-if="label" class="uni-combox__label" :style="labelStyle">
+			<text>{{label}}</text>
+		</view>
+		<view class="uni-combox__input-box">
+			<input class="uni-combox__input" type="text" :placeholder="placeholder" 
+			placeholder-class="uni-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus" 
+@blur="onBlur" />
+			<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="toggleSelector">
+			</uni-icons>
+		</view>
+		<view class="uni-combox__selector" v-if="showSelector">
+			<view class="uni-popper__arrow"></view>
+			<scroll-view scroll-y="true" class="uni-combox__selector-scroll">
+				<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
+					<text>{{emptyTips}}</text>
+				</view>
+				<view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index" 
+				@click="onSelectorClick(index)">
+					<text>{{item}}</text>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Combox 组合输入框
+	 * @description 组合输入框一般用于既可以输入也可以选择的场景
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1261
+	 * @property {String} label 左侧文字
+	 * @property {String} labelWidth 左侧内容宽度
+	 * @property {String} placeholder 输入框占位符
+	 * @property {Array} candidates 候选项列表
+	 * @property {String} emptyTips 筛选结果为空时显示的文字
+	 * @property {String} value 组合框的值
+	 */
+	export default {
+		name: 'uniCombox',
+		emits: ['input', 'update:modelValue'],
+		props: {
+			border: {
+				type: Boolean,
+				default: true
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			labelWidth: {
+				type: String,
+				default: 'auto'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			candidates: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			emptyTips: {
+				type: String,
+				default: '无匹配项'
+			},
+			// #ifndef VUE3
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+		},
+		data() {
+			return {
+				showSelector: false,
+				inputVal: ''
+			}
+		},
+		computed: {
+			labelStyle() {
+				if (this.labelWidth === 'auto') {
+					return ""
+				}
+				return `width: ${this.labelWidth}`
+			},
+			filterCandidates() {
+				return this.candidates.filter((item) => {
+					return item.toString().indexOf(this.inputVal) > -1
+				})
+			},
+			filterCandidatesLength() {
+				return this.filterCandidates.length
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			},
+			// #endif
+		},
+		methods: {
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+			},
+			onFocus() {
+				this.showSelector = true
+			},
+			onBlur() {
+				setTimeout(() => {
+					this.showSelector = false
+				}, 153)
+			},
+			onSelectorClick(index) {
+				this.inputVal = this.filterCandidates[index]
+				this.showSelector = false
+				this.$emit('input', this.inputVal)
+				this.$emit('update:modelValue', this.inputVal)
+			},
+			onInput() {
+				setTimeout(() => {
+					this.$emit('input', this.inputVal)
+					this.$emit('update:modelValue', this.inputVal)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-combox {
+		font-size: 14px;
+		border: 1px solid #DCDFE6;
+		border-radius: 4px;
+		padding: 6px 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// height: 40px;
+		flex-direction: row;
+		align-items: center;
+		// border-bottom: solid 1px #DDDDDD;
+	}
+
+	.uni-combox__label {
+		font-size: 16px;
+		line-height: 22px;
+		padding-right: 10px;
+		color: #999999;
+	}
+
+	.uni-combox__input-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-combox__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-combox__input-plac {
+		font-size: 14px;
+		color: #999;
+	}
+
+	.uni-combox__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 2;
+		padding: 4px 0;
+	}
+
+	.uni-combox__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-combox__selector-empty,
+	.uni-combox__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 36px;
+		font-size: 14px;
+		text-align: center;
+		// border-bottom: solid 1px #DDDDDD;
+		padding: 0px 10px;
+	}
+
+	.uni-combox__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-combox__selector-empty:last-child,
+	.uni-combox__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	// picker 弹出层通用的指示小三角
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-combox__no-border {
+		border: none;
+	}
+</style>

uni_modules/uni-combox/package.json

@@ -0,0 +1,90 @@
+{
+  "id": "uni-combox",
+  "displayName": "uni-combox 组合框",
+  "version": "1.0.1",
+  "description": "可以选择也可以输入的表单项 ",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "combox",
+    "组合框",
+    "select"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-combox/readme.md

@@ -0,0 +1,11 @@
+
+
+## Combox 组合框
+> **组件名：uni-combox**
+> 代码块： `uCombox`
+
+
+组合框组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-combox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-countdown/changelog.md

@@ -0,0 +1,24 @@
+## 1.2.2（2022-01-19）
+- 修复 在微信小程序中样式不生效的bug
+## 1.2.1（2022-01-18）
+- 新增 update 方法 ，在动态更新时间后，刷新组件
+## 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-countdown](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+## 1.1.3（2021-10-18）
+- 重构
+- 新增 font-size 支持自定义字体大小
+## 1.1.2（2021-08-24）
+- 新增 支持国际化
+## 1.1.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-06-18）
+- 修复 uni-countdown 重复赋值跳两秒的 bug
+## 1.0.4（2021-05-12）
+- 新增 组件示例地址
+## 1.0.3（2021-05-08）
+- 修复 uni-countdown 不能控制倒计时的 bug
+## 1.0.2（2021-02-04）
+- 调整为uni_modules目录规范

uni_modules/uni-countdown/components/uni-countdown/i18n/en.json

@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "day",
+	"uni-countdown.h": "h",
+	"uni-countdown.m": "m",
+	"uni-countdown.s": "s"
+}

uni_modules/uni-countdown/components/uni-countdown/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json

@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "时",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}

uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json

@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "時",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}

uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue

@@ -0,0 +1,271 @@
+<template>
+	<view class="uni-countdown">
+		<text v-if="showDay" :style="[timeStyle]" class="uni-countdown__number">{{ d }}</text>
+		<text v-if="showDay" :style="[splitorStyle]" class="uni-countdown__splitor">{{dayText}}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ s }}</text>
+		<text v-if="!showColon" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
+	</view>
+</template>
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Countdown 倒计时
+	 * @description 倒计时组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=25
+	 * @property {String} backgroundColor 背景色
+	 * @property {String} color 文字颜色
+	 * @property {Number} day 天数
+	 * @property {Number} hour 小时
+	 * @property {Number} minute 分钟
+	 * @property {Number} second 秒
+	 * @property {Number} timestamp 时间戳
+	 * @property {Boolean} showDay = [true|false] 是否显示天数
+	 * @property {Boolean} show-colon = [true|false] 是否以冒号为分隔符
+	 * @property {String} splitorColor 分割符号颜色
+	 * @event {Function} timeup 倒计时时间到触发事件
+	 * @example <uni-countdown :day="1" :hour="1" :minute="12" :second="40"></uni-countdown>
+	 */
+	export default {
+		name: 'UniCountdown',
+		emits: ['timeup'],
+		props: {
+			showDay: {
+				type: Boolean,
+				default: true
+			},
+			showColon: {
+				type: Boolean,
+				default: true
+			},
+			start: {
+				type: Boolean,
+				default: true
+			},
+			backgroundColor: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			fontSize: {
+				type: Number,
+				default: 14
+			},
+			splitorColor: {
+				type: String,
+				default: '#333'
+			},
+			day: {
+				type: Number,
+				default: 0
+			},
+			hour: {
+				type: Number,
+				default: 0
+			},
+			minute: {
+				type: Number,
+				default: 0
+			},
+			second: {
+				type: Number,
+				default: 0
+			},
+			timestamp: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				timer: null,
+				syncFlag: false,
+				d: '00',
+				h: '00',
+				i: '00',
+				s: '00',
+				leftTime: 0,
+				seconds: 0
+			}
+		},
+		computed: {
+			dayText() {
+				return t("uni-countdown.day")
+			},
+			hourText(val) {
+				return t("uni-countdown.h")
+			},
+			minuteText(val) {
+				return t("uni-countdown.m")
+			},
+			secondText(val) {
+				return t("uni-countdown.s")
+			},
+			timeStyle() {
+				const {
+					color,
+					backgroundColor,
+					fontSize
+				} = this
+				return {
+					color,
+					backgroundColor,
+					fontSize: `${fontSize}px`,
+					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
+ 					lineHeight: `${fontSize * 20 / 14}px`,
+					borderRadius: `${fontSize * 3 / 14}px`,
+				}
+			},
+			splitorStyle() {
+				const { splitorColor, fontSize, backgroundColor } = this
+				return {
+					color: splitorColor,
+					fontSize: `${fontSize * 12 / 14}px`,
+					margin: backgroundColor ? `${fontSize * 4 / 14}px` : ''
+				}
+			}
+		},
+		watch: {
+			day(val) {
+				this.changeFlag()
+			},
+			hour(val) {
+				this.changeFlag()
+			},
+			minute(val) {
+				this.changeFlag()
+			},
+			second(val) {
+				this.changeFlag()
+			},
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.startData();
+					} else {
+						if (!oldVal) return
+						clearInterval(this.timer)
+					}
+				}
+
+			}
+		},
+		created: function(e) {
+			this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+			this.countDown()
+		},
+		// #ifndef VUE3
+		destroyed() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		// #ifdef VUE3
+		unmounted() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		methods: {
+			toSeconds(timestamp, day, hours, minutes, seconds) {
+				if (timestamp) {
+					return timestamp - parseInt(new Date().getTime() / 1000, 10)
+				}
+				return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds
+			},
+			timeUp() {
+				clearInterval(this.timer)
+				this.$emit('timeup')
+			},
+			countDown() {
+				let seconds = this.seconds
+				let [day, hour, minute, second] = [0, 0, 0, 0]
+				if (seconds > 0) {
+					day = Math.floor(seconds / (60 * 60 * 24))
+					hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+					minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+					second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+				} else {
+					this.timeUp()
+				}
+				if (day < 10) {
+					day = '0' + day
+				}
+				if (hour < 10) {
+					hour = '0' + hour
+				}
+				if (minute < 10) {
+					minute = '0' + minute
+				}
+				if (second < 10) {
+					second = '0' + second
+				}
+				this.d = day
+				this.h = hour
+				this.i = minute
+				this.s = second
+			},
+			startData() {
+				this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+				if (this.seconds <= 0) {
+					this.seconds = this.toSeconds(0, 0, 0, 0, 0)
+					this.countDown()
+					return
+				}
+				clearInterval(this.timer)
+				this.countDown()
+				this.timer = setInterval(() => {
+					this.seconds--
+					if (this.seconds < 0) {
+						this.timeUp()
+						return
+					}
+					this.countDown()
+				}, 1000)
+			},
+			update(){
+				this.startData();
+			},
+			changeFlag() {
+				if (!this.syncFlag) {
+					this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+					this.startData();
+					this.syncFlag = true;
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	$font-size: 14px;
+
+	.uni-countdown {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+
+		&__splitor {
+			margin: 0 2px;
+			font-size: $font-size;
+			color: #333;
+		}
+
+		&__number {
+			border-radius: 3px;
+			text-align: center;
+			font-size: $font-size;
+		}
+	}
+</style>

uni_modules/uni-countdown/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-countdown",
+  "displayName": "uni-countdown 倒计时",
+  "version": "1.2.2",
+  "description": "CountDown 倒计时组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "countdown",
+    "倒计时"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-countdown/readme.md

@@ -0,0 +1,10 @@
+
+
+## CountDown 倒计时
+> **组件名：uni-countdown**
+> 代码块： `uCountDown`
+
+倒计时组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-data-checkbox/changelog.md

@@ -0,0 +1,41 @@
+## 1.0.1（2022-02-07）
+- 修复 multiple 为 true 时，v-model 的值为 null 报错的 bug
+## 1.0.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-data-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+## 0.2.5（2021-08-23）
+- 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题
+## 0.2.4（2021-08-17）
+- 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题
+## 0.2.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.2.2（2021-07-30）
+- 优化 在uni-forms组件，与label不对齐的问题
+## 0.2.1（2021-07-27）
+- 修复 单选默认值为0不能选中的Bug
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.11（2021-07-06）
+- 优化 删除无用日志
+## 0.1.10（2021-07-05）
+- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题
+## 0.1.9（2021-07-05）
+- 修复 nvue 黑框样式问题
+## 0.1.8（2021-06-28）
+- 修复 selectedTextColor 属性不生效的Bug
+## 0.1.7（2021-06-02）
+- 新增 map 属性，可以方便映射text/value属性
+## 0.1.6（2021-05-26）
+- 修复 不关联服务空间的情况下组件报错的Bug
+## 0.1.5（2021-05-12）
+- 新增 组件示例地址
+## 0.1.4（2021-04-09）
+- 修复 nvue 下无法选中的问题
+## 0.1.3（2021-03-22）
+- 新增 disabled属性
+## 0.1.2（2021-02-24）
+- 优化 默认颜色显示
+## 0.1.1（2021-02-24）
+- 新增 支持nvue
+## 0.1.0（2021-02-18）
+- “暂无数据”显示居中

uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue

@@ -0,0 +1,817 @@
+<template>
+	<view class="uni-data-checklist" :style="{'margin-top':isTop+'px'}">
+		<template v-if="!isLocal">
+			<view class="uni-data-loading">
+				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18" :content-text="contentText"></uni-load-more>
+				<text v-else>{{mixinDatacomErrorMessage}}</text>
+			</view>
+		</template>
+		<template v-else>
+			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}" @change="chagne">
+				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+				 :style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''" :checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="checkbox__inner"  :style="item.styleIcon">
+						<view class="checkbox__inner-icon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" class="checkobx__list" :style="item.styleBackgroud"></view>
+					</view>
+				</label>
+			</checkbox-group>
+			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="chagne">
+				<!-- -->
+				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+				 :style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''" :checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner"
+					 :style="item.styleBackgroud">
+						<view class="radio__inner-icon" :style="item.styleIcon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" :style="item.styleRightIcon" class="checkobx__list"></view>
+					</view>
+				</label>
+			</radio-group>
+		</template>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染 checkbox 和 radio
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} mode = [default| list | button | tag] 显示模式
+	 * @value default  	默认横排模式
+	 * @value list		列表模式
+	 * @value button	按钮模式
+	 * @value tag 		标签模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {Array|String|Number} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Number|String} min 最小选择个数 ，multiple为true时生效
+	 * @property {Number|String} max 最大选择个数 ，multiple为true时生效
+	 * @property {Boolean} wrap 是否换行显示
+	 * @property {String} icon = [left|right]  list 列表模式下icon显示位置
+	 * @property {Boolean} selectedColor 选中颜色
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {Boolean} selectedTextColor 选中文本颜色，如不填写则自动显示
+	 * @property {Object} map 字段映射， 默认 map={text:'text',value:'value'}
+	 * @value left 左侧显示
+	 * @value right 右侧显示
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'uniDataChecklist',
+		mixins: [uniCloud.mixinDatacom || {}],
+		emits:['input','update:modelValue','change'],
+		props: {
+			mode: {
+				type: String,
+				default: 'default'
+			},
+
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			value: {
+				type: [Array, String, Number],
+				default () {
+					return ''
+				}
+			},
+			// TODO vue3
+			modelValue: {
+				type: [Array, String, Number],
+				default() {
+					return '';
+				}
+			},
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			min: {
+				type: [Number, String],
+				default: ''
+			},
+			max: {
+				type: [Number, String],
+				default: ''
+			},
+			wrap: {
+				type: Boolean,
+				default: false
+			},
+			icon: {
+				type: String,
+				default: 'left'
+			},
+			selectedColor: {
+				type: String,
+				default: ''
+			},
+			selectedTextColor: {
+				type: String,
+				default: ''
+			},
+			emptyText:{
+				type: String,
+				default: '暂无数据'
+			},
+			disabled:{
+				type: Boolean,
+				default: false
+			},
+			map:{
+				type: Object,
+				default(){
+					return {
+						text:'text',
+						value:'value'
+					}
+				}
+			}
+		},
+		watch: {
+			localdata: {
+				handler(newVal) {
+					this.range = newVal
+					this.dataList = this.getDataList(this.getSelectedValue(newVal))
+				},
+				deep: true
+			},
+			mixinDatacomResData(newVal) {
+				this.range = newVal
+				this.dataList = this.getDataList(this.getSelectedValue(newVal))
+			},
+			value(newVal) {
+				this.dataList = this.getDataList(newVal)
+				// fix by mehaotian is_reset 在 uni-forms 中定义
+				if(!this.is_reset){
+					this.is_reset = false
+					this.formItem && this.formItem.setValue(newVal)
+				}
+			},
+			modelValue(newVal) {
+				this.dataList = this.getDataList(newVal);
+				if(!this.is_reset){
+					this.is_reset = false
+					this.formItem && this.formItem.setValue(newVal)
+				}
+			}
+		},
+		data() {
+			return {
+				dataList: [],
+				range: [],
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				isLocal:true,
+				styles: {
+					selectedColor: '#2979ff',
+					selectedTextColor: '#666',
+				},
+				isTop:0
+			};
+		},
+		computed:{
+			dataValue(){
+				if(this.value === '')return this.modelValue
+				if(this.modelValue === '') return this.value
+				return this.value
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			// this.formItem && this.formItem.setValue(this.value)
+
+			if (this.formItem) {
+				this.isTop = 6
+				if (this.formItem.name) {
+					// 如果存在name添加默认值,否则formData 中不存在这个字段不校验
+					if(!this.is_reset){
+						this.is_reset = false
+						this.formItem.setValue(this.dataValue)
+					}
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+
+			if (this.localdata && this.localdata.length !== 0) {
+				this.isLocal = true
+				this.range = this.localdata
+				this.dataList = this.getDataList(this.getSelectedValue(this.range))
+			} else {
+				if (this.collection) {
+					this.isLocal = false
+					this.loadData()
+				}
+			}
+		},
+		methods: {
+			loadData() {
+				this.mixinDatacomGet().then(res=>{
+					this.mixinDatacomResData = res.result.data
+					if(this.mixinDatacomResData.length === 0){
+						this.isLocal = false
+						this.mixinDatacomErrorMessage = this.emptyText
+					}else{
+						this.isLocal = true
+					}
+				}).catch(err=>{
+					this.mixinDatacomErrorMessage = err.message
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				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;
+			},
+			chagne(e) {
+				const values = e.detail.value
+
+				let detail = {
+					value: [],
+					data: []
+				}
+
+				if (this.multiple) {
+					this.range.forEach(item => {
+
+						if (values.includes(item[this.map.value] + '')) {
+							detail.value.push(item[this.map.value])
+							detail.data.push(item)
+						}
+					})
+				} else {
+					const range = this.range.find(item => (item[this.map.value] + '') === values)
+					if (range) {
+						detail = {
+							value: range[this.map.value],
+							data: range
+						}
+					}
+				}
+				this.formItem && this.formItem.setValue(detail.value)
+				// TODO 兼容 vue2
+				this.$emit('input', detail.value);
+				// // TOTO 兼容 vue3
+				this.$emit('update:modelValue', detail.value);
+				this.$emit('change', {
+					detail
+				})
+				if (this.multiple) {
+					// 如果 v-model 没有绑定 ，则走内部逻辑
+					// if (this.value.length === 0) {
+					this.dataList = this.getDataList(detail.value, true)
+					// }
+				} else {
+					this.dataList = this.getDataList(detail.value)
+				}
+			},
+
+			/**
+			 * 获取渲染的新数组
+			 * @param {Object} value 选中内容
+			 */
+			getDataList(value) {
+				// 解除引用关系，破坏原引用关系，避免污染源数据
+				let dataList = JSON.parse(JSON.stringify(this.range))
+				let list = []
+				if (this.multiple) {
+					if (!Array.isArray(value)) {
+						value = []
+					}
+				}
+				dataList.forEach((item, index) => {
+					item.disabled = item.disable || item.disabled || false
+					if (this.multiple) {
+						if (value.length > 0) {
+							let have = value.find(val => val === item[this.map.value])
+							item.selected = have !== undefined
+						} else {
+							item.selected = false
+						}
+					} else {
+						item.selected = value === item[this.map.value]
+					}
+
+					list.push(item)
+				})
+				return this.setRange(list)
+			},
+			/**
+			 * 处理最大最小值
+			 * @param {Object} list
+			 */
+			setRange(list) {
+				let selectList = list.filter(item => item.selected)
+				let min = Number(this.min) || 0
+				let max = Number(this.max) || ''
+				list.forEach((item, index) => {
+					if (this.multiple) {
+						if (selectList.length <= min) {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have !== undefined) {
+								item.disabled = true
+							}
+						}
+
+						if (selectList.length >= max && max !== '') {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have === undefined) {
+								item.disabled = true
+							}
+						}
+					}
+					this.setStyles(item, index)
+					list[index] = item
+				})
+				return list
+			},
+			/**
+			 * 设置 class
+			 * @param {Object} item
+			 * @param {Object} index
+			 */
+			setStyles(item, index) {
+				//  设置自定义样式
+				item.styleBackgroud = this.setStyleBackgroud(item)
+				item.styleIcon = this.setStyleIcon(item)
+				item.styleIconText = this.setStyleIconText(item)
+				item.styleRightIcon = this.setStyleRightIcon(item)
+			},
+
+			/**
+			 * 获取选中值
+			 * @param {Object} range
+			 */
+			getSelectedValue(range) {
+				if (!this.multiple) return this.dataValue
+				let selectedArr = []
+				range.forEach((item) => {
+					if (item.selected) {
+						selectedArr.push(item[this.map.value])
+					}
+				})
+				return this.dataValue && this.dataValue.length > 0 ? this.dataValue : selectedArr
+			},
+
+			/**
+			 * 设置背景样式
+			 */
+			setStyleBackgroud(item) {
+				let styles = {}
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				if (this.mode !== 'list') {
+					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+				}
+				if (this.mode === 'tag') {
+					styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
+				}
+				let classles = ''
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIcon(item) {
+				let styles = {}
+				let classles = ''
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				styles['background-color'] = item.selected?selectedColor:'#fff'
+				styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+
+				if(!item.selected && item.disabled){
+					styles['background-color'] = '#F2F6FC'
+					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+				}
+
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIconText(item) {
+				let styles = {}
+				let classles = ''
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				if (this.mode === 'tag') {
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
+				} else {
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
+				}
+				if(!item.selected && item.disabled){
+					styles.color = '#999'
+				}
+
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleRightIcon(item) {
+				let styles = {}
+				let classles = ''
+				if (this.mode === 'list') {
+					styles['border-color'] = item.selected?this.styles.selectedColor:'#DCDFE6'
+				}
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+
+				return classles
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$checked-color: #2979ff;
+	$border-color: #DCDFE6;
+	$disable:0.4;
+
+	@mixin flex {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.uni-data-loading {
+		@include flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 36px;
+		padding-left: 10px;
+		color: #999;
+	}
+
+	.uni-data-checklist {
+		position: relative;
+		z-index: 0;
+		flex: 1;
+		// 多选样式
+		.checklist-group {
+			@include flex;
+			flex-direction: row;
+			flex-wrap: wrap;
+
+			&.is-list {
+				flex-direction: column;
+			}
+
+			.checklist-box {
+				@include flex;
+				flex-direction: row;
+				align-items: center;
+				position: relative;
+				margin: 5px 0;
+				margin-right: 25px;
+
+				.hidden {
+					position: absolute;
+					opacity: 0;
+				}
+
+				// 文字样式
+				.checklist-content {
+					@include flex;
+					flex: 1;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+					.checklist-text {
+						font-size: 14px;
+						color: #666;
+						margin-left: 5px;
+						line-height: 14px;
+					}
+
+					.checkobx__list {
+						border-right-width: 1px;
+						border-right-color: #007aff;
+						border-right-style: solid;
+						border-bottom-width:1px;
+						border-bottom-color: #007aff;
+						border-bottom-style: solid;
+						height: 12px;
+						width: 6px;
+						left: -5px;
+						transform-origin: center;
+						transform: rotate(45deg);
+						opacity: 0;
+					}
+				}
+
+				// 多选样式
+				.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: 4px;
+					background-color: #fff;
+					z-index: 1;
+					.checkbox__inner-icon {
+						position: absolute;
+						/* #ifdef APP-NVUE */
+						top: 2px;
+						/* #endif */
+						/* #ifndef APP-NVUE */
+						top: 1px;
+						/* #endif */
+						left: 5px;
+						height: 8px;
+						width: 4px;
+						border-right-width: 1px;
+						border-right-color: #fff;
+						border-right-style: solid;
+						border-bottom-width:1px ;
+						border-bottom-color: #fff;
+						border-bottom-style: solid;
+						opacity: 0;
+						transform-origin: center;
+						transform: rotate(40deg);
+					}
+				}
+
+				// 单选样式
+				.radio__inner {
+					@include flex;
+					/* #ifndef APP-NVUE */
+					flex-shrink: 0;
+					box-sizing: border-box;
+					/* #endif */
+					justify-content: center;
+					align-items: center;
+					position: relative;
+					width: 16px;
+					height: 16px;
+					border: 1px solid $border-color;
+					border-radius: 16px;
+					background-color: #fff;
+					z-index: 1;
+
+					.radio__inner-icon {
+						width: 8px;
+						height: 8px;
+						border-radius: 10px;
+						opacity: 0;
+					}
+				}
+
+				// 默认样式
+				&.is--default {
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					// 选中
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+						.radio__inner {
+							border-color: $checked-color;
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $checked-color;
+							}
+						}
+						.checklist-text {
+							color: $checked-color;
+						}
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+							.radio__inner {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+
+				// 按钮样式
+				&.is--button {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					transition: border-color 0.2s;
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						border: 1px #eee solid;
+						opacity: $disable;
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						border-color: $checked-color;
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+
+						.radio__inner {
+							border-color: $checked-color;
+
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $checked-color;
+							}
+						}
+
+						.checklist-text {
+							color: $checked-color;
+						}
+
+						// 选中禁用
+						&.is-disable {
+							opacity: $disable;
+						}
+					}
+				}
+
+				// 标签样式
+				&.is--tag {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					background-color: #f5f5f5;
+
+					.checklist-text {
+						margin: 0;
+						color: #666;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						opacity: $disable;
+					}
+
+					&.is-checked {
+						background-color: $checked-color;
+						border-color: $checked-color;
+
+						.checklist-text {
+							color: #fff;
+						}
+					}
+				}
+				// 列表样式
+				&.is--list {
+					/* #ifndef APP-NVUE */
+					display: flex;
+					/* #endif */
+					padding: 10px 15px;
+					padding-left: 0;
+					margin: 0;
+
+					&.is-list-border {
+						border-top: 1px #eee solid;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+						.radio__inner {
+							.radio__inner-icon {
+								opacity: 1;
+							}
+						}
+						.checklist-text {
+							color: $checked-color;
+						}
+
+						.checklist-content {
+							.checkobx__list {
+								opacity: 1;
+								border-color: $checked-color;
+							}
+						}
+
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

uni_modules/uni-data-checkbox/package.json

@@ -0,0 +1,87 @@
+{
+  "id": "uni-data-checkbox",
+  "displayName": "uni-data-checkbox 数据选择器",
+  "version": "1.0.1",
+  "description": "通过数据驱动的单选框和复选框",
+  "keywords": [
+    "uni-ui",
+    "checkbox",
+    "单选",
+    "多选",
+    "单选多选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more","uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-data-checkbox/readme.md

@@ -0,0 +1,18 @@
+
+
+## DataCheckbox 数据驱动的单选复选框
+> **组件名：uni-data-checkbox**
+> 代码块： `uDataCheckbox`
+
+
+本组件是基于uni-app基础组件checkbox的封装。本组件要解决问题包括：
+
+1. 数据绑定型组件：给本组件绑定一个data，会自动渲染一组候选内容。再以往，开发者需要编写不少代码实现类似功能
+2. 自动的表单校验：组件绑定了data，且符合[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)组件的表单校验规范，搭配使用会自动实现表单校验
+3. 本组件合并了单选多选
+4. 本组件有若干风格选择，如普通的单选多选框、并列button风格、tag风格。开发者可以快速选择需要的风格。但作为一个封装组件，样式代码虽然不用自己写了，却会牺牲一定的样式自定义性
+
+在uniCloud开发中，`DB Schema`中配置了enum枚举等类型后，在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中，会自动生成``uni-data-checkbox``组件并绑定好data
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-data-picker/changelog.md

@@ -0,0 +1,58 @@
+## 1.0.4（2022-04-19）
+- 修复 字节小程序 本地数据无法选择下一级的Bug
+## 1.0.3（2022-02-25）
+- 修复 nvue 不支持的 v-show 的 bug
+## 1.0.2（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.0.1（2021-11-23）
+- 修复 由上个版本引发的map、v-model等属性不生效的bug
+## 1.0.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-data-picker](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+## 0.4.9（2021-10-28）
+- 修复 VUE2 v-model 概率无效的 bug
+## 0.4.8（2021-10-27）
+- 修复 v-model 概率无效的 bug
+## 0.4.7（2021-10-25）
+- 新增 属性 spaceInfo 服务空间配置 HBuilderX 3.2.11+
+- 修复 树型 uniCloud 数据类型为 int 时报错的 bug
+## 0.4.6（2021-10-19）
+- 修复 非 VUE3 v-model 为 0 时无法选中的 bug
+## 0.4.5（2021-09-26）
+- 新增 清除已选项的功能（通过 clearIcon 属性配置是否显示按钮），同时提供 clear 方法以供调用，二者等效
+- 修复 readonly 为 true 时报错的 bug
+## 0.4.4（2021-09-26）
+- 修复 上一版本造成的 map 属性失效的 bug
+- 新增 ellipsis 属性，支持配置 tab 选项长度过长时是否自动省略
+## 0.4.3（2021-09-24）
+- 修复 某些情况下级联未触发的 bug
+## 0.4.2（2021-09-23）
+- 新增 提供 show 和 hide 方法，开发者可以通过 ref 调用
+- 新增 选项内容过长自动添加省略号
+## 0.4.1（2021-09-15）
+- 新增 map 属性 字段映射，将 text/value 映射到数据中的其他字段
+## 0.4.0（2021-07-13）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.3.5（2021-06-04）
+- 修复 无法加载云端数据的问题
+## 0.3.4（2021-05-28）
+- 修复 v-model 无效问题
+- 修复 loaddata 为空数据组时加载时间过长问题
+- 修复 上个版本引出的本地数据无法选择带有 children 的 2 级节点
+## 0.3.3（2021-05-12）
+- 新增 组件示例地址
+## 0.3.2（2021-04-22）
+- 修复 非树形数据有 where 属性查询报错的问题
+## 0.3.1（2021-04-15）
+- 修复 本地数据概率无法回显时问题
+## 0.3.0（2021-04-07）
+- 新增 支持云端非树形表结构数据
+- 修复 根节点 parent_field 字段等于 null 时选择界面错乱问题
+## 0.2.0（2021-03-15）
+- 修复 nodeclick、popupopened、popupclosed 事件无法触发的问题
+## 0.1.9（2021-03-09）
+- 修复 微信小程序某些情况下无法选择的问题
+## 0.1.8（2021-02-05）
+- 优化 部分样式在 nvue 上的兼容表现
+## 0.1.7（2021-02-05）
+- 调整为 uni_modules 目录规范