whx 7 hónapja
szülő
commit
b5234b2588
100 módosított fájl, 3401 hozzáadás és 977 törlés
  1. 16 4
      virgo.wzfrontend/yui_wx/components/device/aircondition.vue
  2. 258 3
      virgo.wzfrontend/yui_wx/components/device/control.vue
  3. 7 20
      virgo.wzfrontend/yui_wx/pages/reservation/reservation.vue
  4. 9 2
      virgo.wzfrontend/yui_wx/static/font/iconfont.css
  5. BIN
      virgo.wzfrontend/yui_wx/static/font/iconfont.ttf
  6. 4 3
      virgo.wzfrontend/yui_wx/static/scss/common.scss
  7. 33 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-button/changelog.md
  8. 46 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/nvue.scss
  9. 163 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/props.js
  10. 528 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/uv-button.vue
  11. 93 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/vue.scss
  12. 89 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-button/package.json
  13. 19 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-button/readme.md
  14. 16 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/changelog.md
  15. 546 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/calendar.js
  16. 104 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/header.vue
  17. 616 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/month.vue
  18. 145 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/props.js
  19. 390 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue
  20. 89 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/package.json
  21. 21 0
      virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/readme.md
  22. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  23. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  24. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  25. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/device/aircondition.js.map
  26. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/device/control.js.map
  27. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/deviceDetail/deviceDetail.js.map
  28. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservation/reservation.js.map
  29. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map
  30. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map
  31. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map
  32. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map
  33. 10 3
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/main.wxss
  34. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/runtime.js
  35. 5 5
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/vendor.js
  36. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/navbar.json
  37. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/projectDropDown.js
  38. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/upload.js
  39. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/aircondition.js
  40. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/aircondition.wxml
  41. 2 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/aircondition.wxss
  42. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.js
  43. 3 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.json
  44. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.wxml
  45. 105 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.wxss
  46. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/environment.js
  47. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/environment.json
  48. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/meter.js
  49. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/uEchart.js
  50. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/water.js
  51. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/sin-signature/sin-signature.json
  52. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-head/uni-mall-head.js
  53. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-head/uni-mall-head.json
  54. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-list/uni-mall-list.js
  55. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/deviceDetail/deviceDetail.js
  56. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/reservation/reservation.js
  57. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/reservation/reservation.json
  58. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/reservation/reservation.wxml
  59. 9 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/font/iconfont.css
  60. BIN
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/font/iconfont.ttf
  61. 4 3
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/scss/common.scss
  62. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.json
  63. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/lime-slider/components/l-slider/l-slider.js
  64. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.js
  65. 0 7
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.json
  66. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.wxml
  67. 0 10
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.wxss
  68. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.js
  69. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.wxml
  70. 0 22
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.wxss
  71. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.js
  72. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.wxml
  73. 0 132
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.wxss
  74. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.js
  75. 0 4
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.json
  76. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.wxml
  77. 0 138
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.wxss
  78. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.js
  79. 0 4
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.json
  80. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.wxml
  81. 0 142
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.wxss
  82. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.js
  83. 0 4
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.json
  84. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.wxml
  85. 0 191
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.wxss
  86. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.js
  87. 0 4
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.json
  88. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.wxml
  89. 0 199
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.wxss
  90. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.js
  91. 0 10
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.json
  92. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.wxml
  93. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.json
  94. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
  95. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
  96. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.js
  97. 11 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js
  98. 7 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.json
  99. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.wxml
  100. 0 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.wxss

+ 16 - 4
virgo.wzfrontend/yui_wx/components/device/aircondition.vue

@@ -15,15 +15,15 @@
 				</uni-icons>
 			</view>
 			<view class="aircondition-show">
-				<view class="aircondition-reduce aircondition-icon">
+				<view class="aircondition-reduce aircondition-icon" @click="reduce">
 					<uni-icons type="icon-jian" custom-prefix="iconfont" color="#8c8c8c"></uni-icons>
 				</view>
 				<view class="aircondition-label">
-					<view class="value">{{temp}}</view>
+					<view class="value">{{showValue(temp)}}</view>
 					<view class="unit">°C</view>
 				</view>
 				<view class="aircondition-add aircondition-icon">
-					<uni-icons type="plusempty" color="#8c8c8c"></uni-icons>
+					<uni-icons type="plusempty" color="#8c8c8c" @click="add"></uni-icons>
 				</view>
 			</view>
 			<l-slider v-model="temp" :min="16" :max="30" :step="0.5"></l-slider>
@@ -125,6 +125,17 @@
 		},
 		mounted() {},
 		methods: {
+			reduce() {
+				if (this.temp <= 16) return;
+				this.temp -= 0.5
+			},
+			add() {
+				if (this.temp >= 30) return;
+				this.temp += 0.5
+			},
+			showValue(num) {
+				return num.toFixed(1);
+			},
 			openPopup(type) {
 				this.type = type;
 				this.$refs.popup.open('bottom');
@@ -246,7 +257,8 @@
 
 			.popup-close {
 				border-top: 20rpx solid $uni-background-color;
-				padding: 24rpx 0;
+				height: 88rpx;
+				line-height: 88rpx;
 				text-align: center;
 				color: $uni-secondary-color;
 			}

+ 258 - 3
virgo.wzfrontend/yui_wx/components/device/control.vue

@@ -8,23 +8,278 @@
 			<view class="control-off-btn">开门</view>
 		</view>
 		<view class="common-charts">
-			<view class="common-chart-title">实时考勤</view>
+			<view class="common-chart-title">劳务考勤</view>
+			<view class="control-week">
+				<view class="control-week-item">
+					<view class="control-week-icon">
+						<uni-icons type="icon-jinchang" custom-prefix="iconfont" color="#fff" size="20"></uni-icons>
+					</view>
+					<view class="control-week-content">
+						<view class="label">周进场</view>
+						<view class="number">1280</view>
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="control-week-item orange">
+					<view class="control-week-icon">
+						<uni-icons type="icon-chuqu" custom-prefix="iconfont" color="#fff" size="20"></uni-icons>
+					</view>
+					<view class="control-week-content">
+						<view class="label">周出场</view>
+						<view class="number">1280</view>
+					</view>
+				</view>
+			</view>
 			<view class="common-chart-box">
-
+				<u-echart ref="echart"></u-echart>
+			</view>
+		</view>
+		<view class="control-list">
+			<view class="control-title">
+				<text class="label">进出记录</text>
+				<view class="date" @click="open">
+					<text class="date-value">{{filterDate[0]||'开始日期'}}</text>
+					<text class="line">至</text>
+					<text class="date-value">{{filterDate[1]||'结束日期'}}</text>
+				</view>
+			</view>
+			<view class="fans-list">
+				<view class="fans-item" v-for="(item,index) in list" :key="item.id">
+					<image class="fans-avatar" :src="item.avatar" mode="aspectFill">
+					</image>
+					<view class="fans-content">
+						<view class="fans-name">{{item.name}}</view>
+						<view class="fans-organization">{{item.date}}</view>
+					</view>
+					<view class="control-state">
+						<text class="in control-status" v-if="item.type === 1">进场</text>
+						<text class="out control-status" v-else>出场</text>
+					</view>
+				</view>
 			</view>
 		</view>
+		<uv-calendar ref="calendar" mode="range" @confirm="confirm"></uv-calendar>
 	</view>
 </template>
 
 <script>
+	import uEchart from './uEchart.vue'
 	export default {
-		props: ['title']
+		props: ['title'],
+		data() {
+			return {
+				filterDate: [],
+				list: [{
+					avatar: 'https://wx4.sinaimg.cn/mw690/006cSBLKly1gqqd7n1y77j30j60j676h.jpg',
+					name: '林夕三',
+					date: '2024-01-01 21:00:05',
+					type: 2
+				}, {
+					avatar: 'https://wx4.sinaimg.cn/mw690/006cSBLKly1gqqd7n1y77j30j60j676h.jpg',
+					name: '林夕三',
+					date: '2024-01-01 18:06:05',
+					type: 1
+				}, {
+					avatar: 'https://wx4.sinaimg.cn/mw690/006cSBLKly1gqqd7n1y77j30j60j676h.jpg',
+					name: '林夕三',
+					date: '2024-01-01 21:00:05',
+					type: 2
+				}, {
+					avatar: 'https://wx4.sinaimg.cn/mw690/006cSBLKly1gqqd7n1y77j30j60j676h.jpg',
+					name: '林夕三',
+					date: '2024-01-01 18:06:05',
+					type: 1
+				}]
+			}
+		},
+		components: {
+			uEchart
+		},
+		mounted() {
+			setTimeout(() => {
+				this.$refs.echart.initCharts({
+					type: 'column',
+					categories: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'],
+					series: [{
+						name: '进场人数',
+						data: [86, 122, 93, 98, 91, 88, 95, 102, 110, 80]
+					}],
+					animation: true,
+					background: "#FFFFFF",
+					color: ["#1890FF"],
+					padding: [15, 0, 0, 0],
+					enableScroll: false,
+					legend: {
+						show: false
+					},
+					xAxis: {
+						disableGrid: true
+					},
+					yAxis: {
+						gridType: "dash",
+						data: [{
+							min: 0
+						}]
+					},
+					extra: {
+						column: {
+							type: "group",
+							width: 10,
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							linearType: "custom",
+							seriesGap: 5,
+							linearOpacity: 0.5,
+							barBorderCircle: true,
+							customColor: [
+								"#1890FF",
+								"#EB88E2"
+							]
+						}
+					}
+				})
+			}, 500)
+		},
+		methods: {
+			open() {
+				this.$refs.calendar.open();
+			},
+			confirm(e) {
+				this.filterDate = e;
+			}
+		}
 	}
 </script>
 
 <style lang="scss">
 	.control-index {
 		padding: 30rpx;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+
+		.control-week {
+			display: flex;
+			margin-bottom: 40rpx;
+
+			.line {
+				width: 20rpx;
+			}
+
+			.control-week-item {
+				background: #d4edff;
+				display: flex;
+				align-items: center;
+				padding: 20rpx;
+				flex: 1;
+				width: 0;
+				overflow: hidden;
+				border-radius: 8rpx;
+
+				&.orange {
+					background: #fdd8b7;
+
+					.control-week-icon {
+						background: #ffa300;
+					}
+
+					.control-week-content {
+						color: #ffa300;
+					}
+				}
+			}
+
+			.control-week-icon {
+				width: 72rpx;
+				height: 72rpx;
+				border-radius: 8rpx;
+				background: #4cb0fc;
+				text-align: center;
+				line-height: 72rpx;
+			}
+
+			.control-week-content {
+				margin-left: 20rpx;
+				color: #4cb0fc;
+			}
+
+			.label {
+				font-size: 24rpx;
+			}
+
+			.number {
+				font-size: 32rpx;
+			}
+		}
+
+		.control-list {
+			background: #fff;
+			padding: 30rpx 30rpx 10rpx 30rpx;
+			border-radius: 16rpx;
+			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+			margin-top: 30rpx;
+		}
+
+		.control-state {
+			position: absolute;
+			top: 20rpx;
+			right: 20rpx;
+
+			.control-status {
+				padding: 6rpx 20rpx;
+				color: #fff;
+				border-radius: 8rpx;
+				font-size: 24rpx;
+				font-weight: 300;
+			}
+
+			.in {
+				background: $uni-primary;
+			}
+
+			.out {
+				background: $uni-warning;
+			}
+		}
+
+		.fans-list {
+			padding: 0;
+		}
+
+		.control-title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 30rpx;
+
+			.label {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+
+			.date {
+				font-size: 24rpx;
+				font-weight: 300;
+				color: $uni-secondary-color;
+				border: 1px solid $uni-border-1;
+				padding: 6rpx 10rpx;
+				border-radius: 8rpx;
+				width: 340rpx;
+				display: flex;
+				align-items: center;
+			}
+
+			.line {
+				margin: 0 10rpx;
+			}
+
+			.date-value {
+				flex: 1;
+				width: 0;
+				overflow: hidden;
+				text-align: center;
+			}
+		}
 
 		.control-off {
 			background: #fff;

+ 7 - 20
virgo.wzfrontend/yui_wx/pages/reservation/reservation.vue

@@ -8,15 +8,14 @@
 				<uni-easyinput type="tel" v-model="formData.phone" placeholder="请输入姓名" disabled />
 			</uni-forms-item>
 			<uni-forms-item label="预约时间" name="date">
-				<view class="select-box" @click="openDate">
+				<view class="select-box" @click="open">
 					<text class="select-text" v-if="formData.date">{{formData.date}}</text>
 					<text class="select-label" v-else>请选择日期</text>
 					<uni-icons class="form-icon" type="down" size="12" color="#8c8c8c"></uni-icons>
 				</view>
 			</uni-forms-item>
 		</uni-forms>
-		<lotusCalendar :calendarData="calendarData" @returnDate="calendarChange" @closeCalendar="closeCalendar">
-		</lotusCalendar>
+		<uv-calendar ref="calendar" @confirm="confirm"></uv-calendar>
 		<view class="hui-button-box">
 			<view class="hui-button" @click="submit">提交预约</view>
 		</view>
@@ -28,6 +27,7 @@
 	import {
 		insertReservation
 	} from '@/request/api/house.js'
+
 	export default {
 		data() {
 			return {
@@ -36,10 +36,6 @@
 					phone: '',
 					date: ''
 				},
-				calendarData: {
-					isShow: false,
-					choseTime: ''
-				},
 				houseId: 15
 			}
 		},
@@ -49,24 +45,15 @@
 		},
 		onShow() {
 			this.formData.date = this.$dayjs().format('YYYY-MM-DD');
-			this.calendarData['choseTime'] = this.$dayjs().format('YYYY-MM-DD');
 			this.formData['name'] = this.$store.getters.user.userName;
 			this.formData['phone'] = this.$store.getters.user.phone;
 		},
 		methods: {
-			openDate() {
-				this.calendarData.isShow = true;
-			},
-			// 日期选择
-			calendarChange(res) {
-				if (res.time) {
-					this.formData.date = res.time;
-				}
-				this.calendarData.isShow = res.isShow;
+			open() {
+				this.$refs.calendar.open();
 			},
-			// 关闭日期控件
-			closeCalendar(res) {
-				this.calendarData.isShow = res.isShow;
+			confirm(e) {
+				this.formData.date = e[0];
 			},
 			submit() {
 				insertReservation({

+ 9 - 2
virgo.wzfrontend/yui_wx/static/font/iconfont.css

@@ -12,6 +12,14 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.icon-chuqu:before {
+  content: "\e641";
+}
+
+.icon-jinchang:before {
+  content: "\e69c";
+}
+
 .icon-yiping:before {
   content: "\e680";
 }
@@ -254,5 +262,4 @@
 
 .icon-gongyuan:before {
   content: "\e617";
-}
-
+}

BIN
virgo.wzfrontend/yui_wx/static/font/iconfont.ttf


+ 4 - 3
virgo.wzfrontend/yui_wx/static/scss/common.scss

@@ -116,13 +116,14 @@ button[type=primary]{
 		display: flex;
 		align-items: center;
 		padding: 0 30rpx;
-		margin-bottom: 20rpx;
+		margin-bottom: 20rpx;
+		position: relative;
 	}
 
 	.fans-avatar {
 		width: 100rpx;
 		height: 100rpx;
-		border-radius: 100rpx;
+		border-radius: 16rpx;
 	}
 
 	.fans-content {
@@ -138,7 +139,7 @@ button[type=primary]{
 	.fans-organization {
 		color: $uni-secondary-color;
 		font-weight: 300;
-		margin-top: 4rpx;
+		margin-top: 10rpx;
 		font-size: 24rpx;
 	}
 

+ 33 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-button/changelog.md

@@ -0,0 +1,33 @@
+## 1.0.15(2023-12-20)
+1. 优化
+## 1.0.14(2023-12-06)
+1. 优化
+## 1.0.13(2023-12-06)
+1. 阻止事件冒泡处理
+## 1.0.12(2023-10-19)
+1. 增加后置插槽
+## 1.0.11(2023-09-21)
+1. 修复通过customStyle修改按钮宽度,组件中最外层节点不改变的问题
+## 1.0.10(2023-09-15)
+1. 按钮支持open-type="agreePrivacyAuthorization"
+## 1.0.9(2023-09-11)
+1. 增加参数iconSize,用于控制图标的大小
+## 1.0.8(2023-09-10)
+1. 修复多个按钮在一行宽度不正常的BUG
+## 1.0.7(2023-09-07)
+1. 修复warning颜色对应错误的BUG
+## 1.0.6(2023-07-25)
+1. 增加customTextStyle属性,方便自定义文字样式
+## 1.0.5(2023-07-20)
+1. 解决微信小程序动态设置hover-class点击态不消失的BUG
+## 1.0.4(2023-06-29)
+1. 修改上次更新出现nvue报错异常
+## 1.0.3(2023-06-28)
+ 修复:设置open-type="chooseAvatar"等值不生效的BUG
+## 1.0.2(2023-06-01)
+1. 修复按钮点击触发两次的BUG
+## 1.0.1(2023-05-16)
+1. 优化组件依赖,修改后无需全局引入,组件导入即可使用
+2. 优化部分功能
+## 1.0.0(2023-05-10)
+uv-button 按钮

+ 46 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/nvue.scss

@@ -0,0 +1,46 @@
+$uv-button-active-opacity:0.75 !default;
+$uv-button-loading-text-margin-left:4px !default;
+$uv-button-text-color: #FFFFFF !default;
+$uv-button-text-plain-error-color:$uv-error !default;
+$uv-button-text-plain-warning-color:$uv-warning !default;
+$uv-button-text-plain-success-color:$uv-success !default;
+$uv-button-text-plain-info-color:$uv-info !default;
+$uv-button-text-plain-primary-color:$uv-primary !default;
+.uv-button {
+	&--active {
+		opacity: $uv-button-active-opacity;
+	}
+	
+	&--active--plain {
+		background-color: rgb(217, 217, 217);
+	}
+	
+	&__loading-text {
+		margin-left:$uv-button-loading-text-margin-left;
+	}
+	
+	&__text,
+	&__loading-text {
+		color:$uv-button-text-color;
+	}
+	
+	&__text--plain--error {
+		color:$uv-button-text-plain-error-color;
+	}
+	
+	&__text--plain--warning {
+		color:$uv-button-text-plain-warning-color;
+	}
+	
+	&__text--plain--success{
+		color:$uv-button-text-plain-success-color;
+	}
+	
+	&__text--plain--info {
+		color:$uv-button-text-plain-info-color;
+	}
+	
+	&__text--plain--primary {
+		color:$uv-button-text-plain-primary-color;
+	}
+}

+ 163 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/props.js

@@ -0,0 +1,163 @@
+export default {
+	props: {
+		// 是否细边框
+		hairline: {
+			type: Boolean,
+			default: true
+		},
+		// 按钮的预置样式,info,primary,error,warning,success
+		type: {
+			type: String,
+			default: 'info'
+		},
+		// 按钮尺寸,large,normal,small,mini
+		size: {
+			type: String,
+			default: 'normal'
+		},
+		// 按钮形状,circle(两边为半圆),square(带圆角)
+		shape: {
+			type: String,
+			default: 'square'
+		},
+		// 按钮是否镂空
+		plain: {
+			type: Boolean,
+			default: false
+		},
+		// 是否禁止状态
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 是否加载中
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		// 加载中提示文字
+		loadingText: {
+			type: [String, Number],
+			default: ''
+		},
+		// 加载状态图标类型
+		loadingMode: {
+			type: String,
+			default: 'spinner'
+		},
+		// 加载图标大小
+		loadingSize: {
+			type: [String, Number],
+			default: 14
+		},
+		// 开放能力,具体请看uniapp稳定关于button组件部分说明
+		// https://uniapp.dcloud.io/component/button
+		openType: {
+			type: String,
+			default: ''
+		},
+		// 用于 <form> 组件,点击分别会触发 <form> 组件的 submit/reset 事件
+		// 取值为submit(提交表单),reset(重置表单)
+		formType: {
+			type: String,
+			default: ''
+		},
+		// 打开 APP 时,向 APP 传递的参数,open-type=launchApp时有效
+		// 只微信小程序、QQ小程序有效
+		appParameter: {
+			type: String,
+			default: ''
+		},
+		// 指定是否阻止本节点的祖先节点出现点击态,微信小程序有效
+		hoverStopPropagation: {
+			type: Boolean,
+			default: true
+		},
+		// 指定返回用户信息的语言,zh_CN 简体中文,zh_TW 繁体中文,en 英文。只微信小程序有效
+		lang: {
+			type: String,
+			default: 'en'
+		},
+		// 会话来源,open-type="contact"时有效。只微信小程序有效
+		sessionFrom: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片标题,open-type="contact"时有效
+		// 默认当前标题,只微信小程序有效
+		sendMessageTitle: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片点击跳转小程序路径,open-type="contact"时有效
+		// 默认当前分享路径,只微信小程序有效
+		sendMessagePath: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片图片,open-type="contact"时有效
+		// 默认当前页面截图,只微信小程序有效
+		sendMessageImg: {
+			type: String,
+			default: ''
+		},
+		// 是否显示会话内消息卡片,设置此参数为 true,用户进入客服会话会在右下角显示"可能要发送的小程序"提示,
+		// 用户点击后可以快速发送小程序消息,open-type="contact"时有效
+		showMessageCard: {
+			type: Boolean,
+			default: true
+		},
+		// 额外传参参数,用于小程序的data-xxx属性,通过target.dataset.name获取
+		dataName: {
+			type: String,
+			default: ''
+		},
+		// 节流,一定时间内只能触发一次
+		throttleTime: {
+			type: [String, Number],
+			default: 0
+		},
+		// 按住后多久出现点击态,单位毫秒
+		hoverStartTime: {
+			type: [String, Number],
+			default: 0
+		},
+		// 手指松开后点击态保留时间,单位毫秒
+		hoverStayTime: {
+			type: [String, Number],
+			default: 200
+		},
+		// 按钮文字,之所以通过props传入,是因为slot传入的话
+		// nvue中无法控制文字的样式
+		text: {
+			type: [String, Number],
+			default: ''
+		},
+		// 按钮图标
+		icon: {
+			type: String,
+			default: ''
+		},
+		// 按钮图标大小
+		iconSize: {
+			type: [String, Number],
+			default: ''
+		},
+		// 按钮图标颜色
+		iconColor: {
+			type: String,
+			default: '#000000'
+		},
+		// 按钮颜色,支持传入linear-gradient渐变色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 自定义按钮文本样式
+		customTextStyle: {
+			type: [Object,String],
+			default: ''
+		},
+		...uni.$uv?.props?.button
+	}
+}

+ 528 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/uv-button.vue

@@ -0,0 +1,528 @@
+<template>
+	<view 
+		class="uv-button-wrapper"
+		:style="[btnWrapperStyle]"
+	>
+    <!-- #ifndef APP-NVUE -->
+		<!-- #ifdef MP -->
+		<!-- 为了解决微信小程序动态设置hover-class点击态不消失的BUG -->
+		<view class="uv-button-wrapper--dis" v-if="disabled || loading"></view>
+		<button
+		  :hover-start-time="Number(hoverStartTime)"
+		  :hover-stay-time="Number(hoverStayTime)"
+		  :form-type="formType"
+		  :open-type="openType"
+		  :app-parameter="appParameter"
+		  :hover-stop-propagation="hoverStopPropagation"
+		  :send-message-title="sendMessageTitle"
+		  :send-message-path="sendMessagePath"
+		  :lang="lang"
+		  :data-name="dataName"
+		  :session-from="sessionFrom"
+		  :send-message-img="sendMessageImg"
+		  :show-message-card="showMessageCard"
+		  @getphonenumber="onGetPhoneNumber"
+		  @getuserinfo="onGetUserInfo"
+		  @error="onError"
+		  @opensetting="onOpenSetting"
+		  @launchapp="onLaunchApp"
+			@contact="onContact"
+			@chooseavatar="onChooseavatar"
+			@agreeprivacyauthorization="onAgreeprivacyauthorization"
+			@addgroupapp="onAddgroupapp"
+			@chooseaddress="onChooseaddress"
+			@subscribe="onSubscribe"
+			@login="onLogin"
+			@im="onIm"
+		  hover-class="uv-button--active"
+		  class="uv-button uv-reset-button"
+		  :style="[baseColor, $uv.addStyle(customStyle)]"
+		  @tap="clickHandler"
+		  :class="bemClass"
+		>
+		<!-- #endif -->
+    <!-- #ifndef MP -->
+    <button
+      :hover-start-time="Number(hoverStartTime)"
+      :hover-stay-time="Number(hoverStayTime)"
+      :form-type="formType"
+      :open-type="openType"
+      :app-parameter="appParameter"
+      :hover-stop-propagation="hoverStopPropagation"
+      :send-message-title="sendMessageTitle"
+      :send-message-path="sendMessagePath"
+      :lang="lang"
+      :data-name="dataName"
+      :session-from="sessionFrom"
+      :send-message-img="sendMessageImg"
+      :show-message-card="showMessageCard"
+      :hover-class="!disabled && !loading ? 'uv-button--active' : ''"
+      class="uv-button uv-reset-button"
+      :style="[baseColor, $uv.addStyle(customStyle)]"
+      @tap="clickHandler"
+      :class="bemClass"
+    >
+    <!-- #endif -->
+      <template v-if="loading">
+        <uv-loading-icon
+          :mode="loadingMode"
+          :size="loadingSize * 1.15"
+          :color="loadingColor"
+        ></uv-loading-icon>
+          <text
+            class="uv-button__loading-text"
+            :style="[
+							{ fontSize: textSize + 'px' },
+							$uv.addStyle(customTextStyle)
+						]"
+          >{{ loadingText || text }}</text>
+      </template>
+      <template v-else>
+        <uv-icon
+          v-if="icon"
+          :name="icon"
+          :color="iconColorCom"
+          :size="getIconSize"
+          :customStyle="{ marginRight: '2px' }"
+        ></uv-icon>
+        <slot>
+          <text
+            class="uv-button__text"
+            :style="[
+							{ fontSize: textSize + 'px' },
+							$uv.addStyle(customTextStyle)
+						]"
+            >{{ text }}</text>
+        </slot>
+				<slot name="suffix"></slot>
+      </template>
+    </button>
+    <!-- #endif -->
+    <!-- #ifdef APP-NVUE -->
+    <view
+      :hover-start-time="Number(hoverStartTime)"
+      :hover-stay-time="Number(hoverStayTime)"
+      class="uv-button"
+      :hover-class="
+        !disabled && !loading && !color && (plain || type === 'info')
+          ? 'uv-button--active--plain'
+          : !disabled && !loading && !plain
+          ? 'uv-button--active'
+          : ''
+      "
+      @tap="clickHandler"
+      :class="bemClass"
+      :style="[baseColor, $uv.addStyle(customStyle)]"
+    >
+      <template v-if="loading">
+        <uv-loading-icon
+          :mode="loadingMode"
+          :size="loadingSize * 1.15"
+          :color="loadingColor"
+        ></uv-loading-icon>
+        <text
+          class="uv-button__loading-text"
+          :style="[nvueTextStyle,$uv.addStyle(customTextStyle)]"
+          :class="[plain && `uv-button__text--plain--${type}`]"
+          >{{ loadingText || text }}</text>
+      </template>
+      <template v-else>
+        <uv-icon
+          v-if="icon"
+          :name="icon"
+          :color="iconColorCom"
+          :size="getIconSize"
+        ></uv-icon>
+        <text
+          class="uv-button__text"
+          :style="[
+            {
+              marginLeft: icon ? '2px' : 0,
+            },
+            nvueTextStyle,
+						$uv.addStyle(customTextStyle)
+          ]"
+          :class="[plain && `uv-button__text--plain--${type}`]"
+          >{{ text }}</text>
+				<slot name="suffix"></slot>
+      </template>
+    </view>
+    <!-- #endif -->
+	</view>
+</template>
+
+<script>
+import throttle from '@/uni_modules/uv-ui-tools/libs/function/throttle.js';
+import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+import button from '@/uni_modules/uv-ui-tools/libs/mixin/button.js'
+import openType from '@/uni_modules/uv-ui-tools/libs/mixin/openType.js'
+import props from "./props.js";
+/**
+ * button 按钮
+ * @description Button 按钮
+ * @tutorial https://www.uvui.cn/components/button.html
+ * @property {Boolean}			hairline				是否显示按钮的细边框 (默认 true )
+ * @property {String}			type					按钮的预置样式,info,primary,error,warning,success (默认 'info' )
+ * @property {String}			size					按钮尺寸,large,normal,mini (默认 normal)
+ * @property {String}			shape					按钮形状,circle(两边为半圆),square(带圆角) (默认 'square' )
+ * @property {Boolean}			plain					按钮是否镂空,背景色透明 (默认 false)
+ * @property {Boolean}			disabled				是否禁用 (默认 false)
+ * @property {Boolean}			loading					按钮名称前是否带 loading 图标(App-nvue 平台,在 ios 上为雪花,Android上为圆圈) (默认 false)
+ * @property {String | Number}	loadingText				加载中提示文字
+ * @property {String}			loadingMode				加载状态图标类型 (默认 'spinner' )
+ * @property {String | Number}	loadingSize				加载图标大小 (默认 15 )
+ * @property {String}			openType				开放能力,具体请看uniapp稳定关于button组件部分说明
+ * @property {String}			formType				用于 <form> 组件,点击分别会触发 <form> 组件的 submit/reset 事件
+ * @property {String}			appParameter			打开 APP 时,向 APP 传递的参数,open-type=launchApp时有效 (注:只微信小程序、QQ小程序有效)
+ * @property {Boolean}			hoverStopPropagation	指定是否阻止本节点的祖先节点出现点击态,微信小程序有效(默认 true )
+ * @property {String}			lang					指定返回用户信息的语言,zh_CN 简体中文,zh_TW 繁体中文,en 英文(默认 en )
+ * @property {String}			sessionFrom				会话来源,openType="contact"时有效
+ * @property {String}			sendMessageTitle		会话内消息卡片标题,openType="contact"时有效
+ * @property {String}			sendMessagePath			会话内消息卡片点击跳转小程序路径,openType="contact"时有效
+ * @property {String}			sendMessageImg			会话内消息卡片图片,openType="contact"时有效
+ * @property {Boolean}			showMessageCard			是否显示会话内消息卡片,设置此参数为 true,用户进入客服会话会在右下角显示"可能要发送的小程序"提示,用户点击后可以快速发送小程序消息,openType="contact"时有效(默认false)
+ * @property {String}			dataName				额外传参参数,用于小程序的data-xxx属性,通过target.dataset.name获取
+ * @property {String | Number}	throttleTime			节流,一定时间内只能触发一次 (默认 0 )
+ * @property {String | Number}	hoverStartTime			按住后多久出现点击态,单位毫秒 (默认 0 )
+ * @property {String | Number}	hoverStayTime			手指松开后点击态保留时间,单位毫秒 (默认 200 )
+ * @property {String | Number}	text					按钮文字,之所以通过props传入,是因为slot传入的话(注:nvue中无法控制文字的样式)
+ * @property {String}			icon					按钮图标
+ * @property {String}			iconColor				按钮图标颜色
+ * @property {String}			color					按钮颜色,支持传入linear-gradient渐变色
+ * @property {Object}			customStyle				定义需要用到的外部样式
+ * @event {Function}	click			非禁止并且非加载中,才能点击
+ * @event {Function}	getphonenumber	open-type="getPhoneNumber"时有效
+ * @event {Function}	getuserinfo		用户点击该按钮时,会返回获取到的用户信息,从返回参数的detail中获取到的值同uni.getUserInfo
+ * @event {Function}	error			当使用开放能力时,发生错误的回调
+ * @event {Function}	opensetting		在打开授权设置页并关闭后回调
+ * @event {Function}	launchapp		打开 APP 成功的回调
+ * @example <uv-button>月落</uv-button>
+ */
+export default {
+		name: "uv-button",
+		// #ifdef MP
+		mixins: [mpMixin, mixin, button, openType, props],
+		// #endif
+		// #ifndef MP
+		mixins: [mpMixin, mixin, props],
+		// #endif
+		emits: ['click'],
+		data() {
+			return {};
+		},
+		computed: {
+			// 生成bem风格的类名
+			bemClass() {
+				// this.bem为一个computed变量,在mixin中
+				if (!this.color) {
+					return this.bem("button",
+						["type", "shape", "size"],
+						["disabled", "plain", "hairline"]);
+				} else {
+					// 由于nvue的原因,在有color参数时,不需要传入type,否则会生成type相关的类型,影响最终的样式
+					return this.bem("button",
+						["shape", "size"],
+						["disabled", "plain", "hairline"]);
+				}
+			},
+			loadingColor() {
+				if (this.plain) {
+					// 如果有设置color值,则用color值,否则使用type主题颜色
+					return this.color ? this.color : '#3c9cff';
+				}
+				if (this.type === "info") {
+					return "#c9c9c9";
+				}
+				return "rgb(200, 200, 200)";
+			},
+			iconColorCom() {
+				// 如果是镂空状态,设置了color就用color值,否则使用主题颜色,
+				// uv-icon的color能接受一个主题颜色的值
+				if (this.iconColor) return this.iconColor;
+				if (this.plain) {
+					return this.color ? this.color : this.type;
+				} else {
+					return this.type === "info" ? "#000000" : "#ffffff";
+				}
+			},
+			baseColor() {
+				let style = {};
+				if (this.color) {
+					// 针对自定义了color颜色的情况,镂空状态下,就是用自定义的颜色
+					style.color = this.plain ? this.color : "white";
+					if (!this.plain) {
+						// 非镂空,背景色使用自定义的颜色
+						style["background-color"] = this.color;
+					}
+					if (this.color.indexOf("gradient") !== -1) {
+						// 如果自定义的颜色为渐变色,不显示边框,以及通过backgroundImage设置渐变色
+						// weex文档说明可以写borderWidth的形式,为什么这里需要分开写?
+						// 因为weex是阿里巴巴为了部门业绩考核而做的你懂的东西,所以需要这么写才有效
+						style.borderTopWidth = 0;
+						style.borderRightWidth = 0;
+						style.borderBottomWidth = 0;
+						style.borderLeftWidth = 0;
+						if (!this.plain) {
+							style.backgroundImage = this.color;
+						}
+					} else {
+						// 非渐变色,则设置边框相关的属性
+						style.borderColor = this.color;
+						style.borderWidth = "1px";
+						style.borderStyle = "solid";
+					}
+				}
+				return style;
+			},
+			// nvue版本按钮的字体不会继承父组件的颜色,需要对每一个text组件进行单独的设置
+			nvueTextStyle() {
+				let style = {};
+				// 针对自定义了color颜色的情况,镂空状态下,就是用自定义的颜色
+				if (this.type === "info") {
+					style.color = "#323233";
+				}
+				if (this.color) {
+					style.color = this.plain ? this.color : "white";
+				}
+				style.fontSize = this.textSize + "px";
+				return style;
+			},
+			// 字体大小
+			textSize() {
+				let fontSize = 14,
+					{ size } = this;
+				if (size === "large") fontSize = 16;
+				if (size === "normal") fontSize = 14;
+				if (size === "small") fontSize = 12;
+				if (size === "mini") fontSize = 10;
+				return fontSize;
+			},
+			// 设置图标大小
+			getIconSize() {
+				const size = this.iconSize ? this.iconSize : this.textSize * 1.35;
+				return this.$uv.addUnit(size);
+			},
+			// 设置外层盒子的宽度,其他样式不需要
+			btnWrapperStyle() {
+				const style = {};
+				const customStyle = this.$uv.addStyle(this.customStyle);
+				if(customStyle.width) style.width = customStyle.width;
+				return style;
+			}
+		},
+		methods: {
+			clickHandler() {
+				// 非禁止并且非加载中,才能点击
+				if (!this.disabled && !this.loading) {
+					// 进行节流控制,每this.throttle毫秒内,只在开始处执行
+					throttle(() => {
+						this.$emit("click");
+					}, this.throttleTime);
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+$show-reset-button: 1;
+@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
+@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+
+/* #ifndef APP-NVUE */
+@import "./vue.scss";
+/* #endif */
+
+/* #ifdef APP-NVUE */
+@import "./nvue.scss";
+/* #endif */
+
+$uv-button-uv-button-height: 40px !default;
+$uv-button-text-font-size: 15px !default;
+$uv-button-loading-text-font-size: 15px !default;
+$uv-button-loading-text-margin-left: 4px !default;
+$uv-button-large-width: 100% !default;
+$uv-button-large-height: 50px !default;
+$uv-button-normal-padding: 0 12px !default;
+$uv-button-large-padding: 0 15px !default;
+$uv-button-normal-font-size: 14px !default;
+$uv-button-small-min-width: 60px !default;
+$uv-button-small-height: 30px !default;
+$uv-button-small-padding: 0px 8px !default;
+$uv-button-mini-padding: 0px 8px !default;
+$uv-button-small-font-size: 12px !default;
+$uv-button-mini-height: 22px !default;
+$uv-button-mini-font-size: 10px !default;
+$uv-button-mini-min-width: 50px !default;
+$uv-button-disabled-opacity: 0.5 !default;
+$uv-button-info-color: #323233 !default;
+$uv-button-info-background-color: #fff !default;
+$uv-button-info-border-color: #ebedf0 !default;
+$uv-button-info-border-width: 1px !default;
+$uv-button-info-border-style: solid !default;
+$uv-button-success-color: #fff !default;
+$uv-button-success-background-color: $uv-success !default;
+$uv-button-success-border-color: $uv-button-success-background-color !default;
+$uv-button-success-border-width: 1px !default;
+$uv-button-success-border-style: solid !default;
+$uv-button-primary-color: #fff !default;
+$uv-button-primary-background-color: $uv-primary !default;
+$uv-button-primary-border-color: $uv-button-primary-background-color !default;
+$uv-button-primary-border-width: 1px !default;
+$uv-button-primary-border-style: solid !default;
+$uv-button-error-color: #fff !default;
+$uv-button-error-background-color: $uv-error !default;
+$uv-button-error-border-color: $uv-button-error-background-color !default;
+$uv-button-error-border-width: 1px !default;
+$uv-button-error-border-style: solid !default;
+$uv-button-warning-color: #fff !default;
+$uv-button-warning-background-color: $uv-warning !default;
+$uv-button-warning-border-color: $uv-button-warning-background-color !default;
+$uv-button-warning-border-width: 1px !default;
+$uv-button-warning-border-style: solid !default;
+$uv-button-block-width: 100% !default;
+$uv-button-circle-border-top-right-radius: 100px !default;
+$uv-button-circle-border-top-left-radius: 100px !default;
+$uv-button-circle-border-bottom-left-radius: 100px !default;
+$uv-button-circle-border-bottom-right-radius: 100px !default;
+$uv-button-square-border-top-right-radius: 3px !default;
+$uv-button-square-border-top-left-radius: 3px !default;
+$uv-button-square-border-bottom-left-radius: 3px !default;
+$uv-button-square-border-bottom-right-radius: 3px !default;
+$uv-button-icon-min-width: 1em !default;
+$uv-button-plain-background-color: #fff !default;
+$uv-button-hairline-border-width: 0.5px !default;
+
+.uv-button {
+    height: $uv-button-uv-button-height;
+    position: relative;
+    align-items: center;
+    justify-content: center;
+    @include flex;
+    /* #ifndef APP-NVUE */
+    box-sizing: border-box;
+    /* #endif */
+    flex-direction: row;
+
+    &__text {
+        font-size: $uv-button-text-font-size;
+    }
+
+    &__loading-text {
+        font-size: $uv-button-loading-text-font-size;
+        margin-left: $uv-button-loading-text-margin-left;
+    }
+
+    &--large {
+        /* #ifndef APP-NVUE */
+        width: $uv-button-large-width;
+        /* #endif */
+        height: $uv-button-large-height;
+        padding: $uv-button-large-padding;
+    }
+
+    &--normal {
+        padding: $uv-button-normal-padding;
+        font-size: $uv-button-normal-font-size;
+    }
+
+    &--small {
+        /* #ifndef APP-NVUE */
+        min-width: $uv-button-small-min-width;
+        /* #endif */
+        height: $uv-button-small-height;
+        padding: $uv-button-small-padding;
+        font-size: $uv-button-small-font-size;
+    }
+
+    &--mini {
+        height: $uv-button-mini-height;
+        font-size: $uv-button-mini-font-size;
+        /* #ifndef APP-NVUE */
+        min-width: $uv-button-mini-min-width;
+        /* #endif */
+        padding: $uv-button-mini-padding;
+    }
+
+    &--disabled {
+        opacity: $uv-button-disabled-opacity;
+    }
+
+    &--info {
+        color: $uv-button-info-color;
+        background-color: $uv-button-info-background-color;
+        border-color: $uv-button-info-border-color;
+        border-width: $uv-button-info-border-width;
+        border-style: $uv-button-info-border-style;
+    }
+
+    &--success {
+        color: $uv-button-success-color;
+        background-color: $uv-button-success-background-color;
+        border-color: $uv-button-success-border-color;
+        border-width: $uv-button-success-border-width;
+        border-style: $uv-button-success-border-style;
+    }
+
+    &--primary {
+        color: $uv-button-primary-color;
+        background-color: $uv-button-primary-background-color;
+        border-color: $uv-button-primary-border-color;
+        border-width: $uv-button-primary-border-width;
+        border-style: $uv-button-primary-border-style;
+    }
+
+    &--error {
+        color: $uv-button-error-color;
+        background-color: $uv-button-error-background-color;
+        border-color: $uv-button-error-border-color;
+        border-width: $uv-button-error-border-width;
+        border-style: $uv-button-error-border-style;
+    }
+
+    &--warning {
+        color: $uv-button-warning-color;
+        background-color: $uv-button-warning-background-color;
+        border-color: $uv-button-warning-border-color;
+        border-width: $uv-button-warning-border-width;
+        border-style: $uv-button-warning-border-style;
+    }
+
+    &--block {
+        @include flex;
+        width: $uv-button-block-width;
+    }
+
+    &--circle {
+        border-top-right-radius: $uv-button-circle-border-top-right-radius;
+        border-top-left-radius: $uv-button-circle-border-top-left-radius;
+        border-bottom-left-radius: $uv-button-circle-border-bottom-left-radius;
+        border-bottom-right-radius: $uv-button-circle-border-bottom-right-radius;
+    }
+
+    &--square {
+        border-bottom-left-radius: $uv-button-square-border-top-right-radius;
+        border-bottom-right-radius: $uv-button-square-border-top-left-radius;
+        border-top-left-radius: $uv-button-square-border-bottom-left-radius;
+        border-top-right-radius: $uv-button-square-border-bottom-right-radius;
+    }
+
+    &__icon {
+        /* #ifndef APP-NVUE */
+        min-width: $uv-button-icon-min-width;
+        line-height: inherit !important;
+        vertical-align: top;
+        /* #endif */
+    }
+
+    &--plain {
+        background-color: $uv-button-plain-background-color;
+    }
+
+    &--hairline {
+        border-width: $uv-button-hairline-border-width !important;
+    }
+}
+</style>

+ 93 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-button/components/uv-button/vue.scss

@@ -0,0 +1,93 @@
+@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+// nvue下hover-class无效
+$uv-button-before-top:50% !default;
+$uv-button-before-left:50% !default;
+$uv-button-before-width:100% !default;
+$uv-button-before-height:100% !default;
+$uv-button-before-transform:translate(-50%, -50%) !default;
+$uv-button-before-opacity:0 !default;
+$uv-button-before-background-color:#000 !default;
+$uv-button-before-border-color:#000 !default;
+$uv-button-active-before-opacity:.15 !default;
+$uv-button-icon-margin-left:4px !default;
+$uv-button-plain-uv-button-info-color:$uv-info;
+$uv-button-plain-uv-button-success-color:$uv-success;
+$uv-button-plain-uv-button-error-color:$uv-error;
+$uv-button-plain-uv-button-warning-color:$uv-warning;
+
+.uv-button-wrapper {
+	position: relative;
+	&--dis {
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 9;
+	}
+}
+
+.uv-button {
+	width: 100%;
+	
+	&__text {
+		white-space: nowrap;
+		line-height: 1;
+	}
+	
+	&:before {
+		position: absolute;
+		top:$uv-button-before-top;
+		left:$uv-button-before-left;
+		width:$uv-button-before-width;
+		height:$uv-button-before-height;
+		border: inherit;
+		border-radius: inherit;
+		transform:$uv-button-before-transform;
+		opacity:$uv-button-before-opacity;
+		content: " ";
+		background-color:$uv-button-before-background-color;
+		border-color:$uv-button-before-border-color;
+	}
+	
+	&--active {
+		&:before {
+			opacity: .15
+		}
+	}
+	
+	&__icon+&__text:not(:empty),
+	&__loading-text {
+		margin-left:$uv-button-icon-margin-left;
+	}
+	
+	&--plain {
+		&.uv-button--primary {
+			color: $uv-primary;
+		}
+	}
+	
+	&--plain {
+		&.uv-button--info {
+			color:$uv-button-plain-uv-button-info-color;
+		}
+	}
+	
+	&--plain {
+		&.uv-button--success {
+			color:$uv-button-plain-uv-button-success-color;
+		}
+	}
+	
+	&--plain {
+		&.uv-button--error {
+			color:$uv-button-plain-uv-button-error-color;
+		}
+	}
+	
+	&--plain {
+		&.uv-button--warning {
+			color:$uv-button-plain-uv-button-warning-color;
+		}
+	}
+}

+ 89 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-button/package.json

@@ -0,0 +1,89 @@
+{
+	"id": "uv-button",
+	"displayName": "uv-button 按钮 全面兼容vue3+2、app、h5、小程序等多端",
+	"version": "1.0.15",
+	"description": "按钮组件内部实现以uni-app的button组件为基础,进行二次封装,灵活配置,功能齐全,兼容全端。",
+	"keywords": [
+        "uv-button",
+        "uvui",
+        "uv-ui",
+        "button",
+        "按钮"
+    ],
+	"repository": "",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+	"dcloudext": {
+		"type": "component-vue",
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "插件不采集任何数据",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uv-ui-tools",
+			"uv-loading-icon",
+			"uv-icon"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}

+ 19 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-button/readme.md

@@ -0,0 +1,19 @@
+## Button 按钮
+
+> **组件名:uv-button**
+
+该组件内部实现以`uni-app`的`button`组件为基础,进行二次封装,灵活配置,功能齐全,兼容全端。灵活配置,内置状态设置,开箱即用。
+
+# <a href="https://www.uvui.cn/components/button.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>(请不要 下载插件ZIP)</small>
+
+### [更多插件,请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈,或者您对uv-ui有一些好的建议,欢迎加入uv-ui官方交流群:<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>

+ 16 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/changelog.md

@@ -0,0 +1,16 @@
+## 1.0.6(2023-11-03)
+1. **该版本不再维护**,推荐使用新版本[https://ext.dcloud.net.cn/plugin?name=uv-calendars](https://ext.dcloud.net.cn/plugin?name=uv-calendars)
+## 1.0.5(2023-07-02)
+uv-calendar  由于弹出层uv-popup的修改,打开和关闭方法更改,详情参考文档:https://www.uvui.cn/components/calendar.html
+## 1.0.4(2023-06-15)
+1. formatter格式化中增加topInfo参数
+## 1.0.3(2023-06-08)
+1. 增加点击日期change回调
+2. 优化
+## 1.0.2(2023-06-05)
+1. 修改多个时间选择的时候存在反选的BUG
+## 1.0.1(2023-05-16)
+1. 优化组件依赖,修改后无需全局引入,组件导入即可使用
+2. 优化部分功能
+## 1.0.0(2023-05-10)
+uv-calendar 日历

+ 546 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-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

+ 104 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/header.vue

@@ -0,0 +1,104 @@
+<template>
+	<view class="uv-calendar-header uv-border-bottom">
+		<text
+			class="uv-calendar-header__title"
+			v-if="showTitle"
+		>{{ title }}</text>
+		<text
+			class="uv-calendar-header__subtitle"
+			v-if="showSubtitle"
+		>{{ subtitle }}</text>
+		<view class="uv-calendar-header__weekdays">
+			<text class="uv-calendar-header__weekdays__weekday">一</text>
+			<text class="uv-calendar-header__weekdays__weekday">二</text>
+			<text class="uv-calendar-header__weekdays__weekday">三</text>
+			<text class="uv-calendar-header__weekdays__weekday">四</text>
+			<text class="uv-calendar-header__weekdays__weekday">五</text>
+			<text class="uv-calendar-header__weekdays__weekday">六</text>
+			<text class="uv-calendar-header__weekdays__weekday">日</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	export default {
+		name: 'uv-calendar-header',
+		mixins: [mpMixin, mixin],
+		props: {
+			// 标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 副标题
+			subtitle: {
+				type: [String,null],
+				default: ''
+			},
+			// 是否显示标题
+			showTitle: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示副标题
+			showSubtitle: {
+				type: Boolean,
+				default: true
+			},
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			name() {
+
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	$show-border: 1;
+	$show-border-bottom: 1;
+	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+	.uv-calendar-header {
+		padding-bottom: 4px;
+
+		&__title {
+			font-size: 16px;
+			color: $uv-main-color;
+			text-align: center;
+			height: 42px;
+			line-height: 42px;
+			font-weight: bold;
+		}
+
+		&__subtitle {
+			font-size: 14px;
+			color: $uv-main-color;
+			height: 40px;
+			text-align: center;
+			line-height: 40px;
+			font-weight: bold;
+		}
+
+		&__weekdays {
+			@include flex;
+			justify-content: space-between;
+
+			&__weekday {
+				font-size: 13px;
+				color: $uv-main-color;
+				line-height: 30px;
+				flex: 1;
+				text-align: center;
+			}
+		}
+	}
+</style>

+ 616 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/month.vue

@@ -0,0 +1,616 @@
+<template>
+	<view class="uv-calendar-month-wrapper" ref="uv-calendar-month-wrapper">
+		<view v-for="(item, index) in months" :key="index" :class="[`uv-calendar-month-${index}`]"
+			:ref="`uv-calendar-month-${index}`" :id="`month-${index}`">
+			<text v-if="index !== 0" class="uv-calendar-month__title">{{ item.year }}年{{ item.month }}月</text>
+			<view class="uv-calendar-month__days">
+				<view v-if="showMark" class="uv-calendar-month__days__month-mark-wrapper">
+					<text class="uv-calendar-month__days__month-mark-wrapper__text">{{ item.month }}</text>
+				</view>
+				<view class="uv-calendar-month__days__day" v-for="(item1, index1) in item.date" :key="index1"
+					:style="[dayStyle(index, index1, item1)]" @tap="clickHandler(index, index1, item1)"
+					:class="[item1.selected && 'uv-calendar-month__days__day__select--selected']">
+					<view class="uv-calendar-month__days__day__select" :style="[daySelectStyle(index, index1, item1)]">
+						<text v-if="getTopInfo(index, index1, item1)"
+						class="uv-calendar-month__days__day__select__top-info"
+						:class="[item1.disabled && 'uv-calendar-month__days__day__select__top-info--disabled']"
+						:style="[textStyle(item1)]"
+						>{{ getTopInfo(index, index1, item1) }}</text>
+						<text class="uv-calendar-month__days__day__select__info"
+							:class="[item1.disabled && 'uv-calendar-month__days__day__select__info--disabled']"
+							:style="[textStyle(item1)]">{{ item1.day }}</text>
+						<text v-if="getBottomInfo(index, index1, item1)"
+							class="uv-calendar-month__days__day__select__buttom-info"
+							:class="[item1.disabled && 'uv-calendar-month__days__day__select__buttom-info--disabled']"
+							:style="[textStyle(item1)]">{{ getBottomInfo(index, index1, item1) }}</text>
+						<text v-if="item1.dot" class="uv-calendar-month__days__day__select__dot"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	// 由于nvue不支持百分比单位,需要查询宽度来计算每个日期的宽度
+	const dom = uni.requireNativePlugin('dom')
+	// #endif
+	import { colorGradient } from '@/uni_modules/uv-ui-tools/libs/function/colorGradient.js';
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
+	export default {
+		name: 'uv-calendar-month',
+		emits:['monthSelected','updateMonthTop','change'],
+		mixins: [mpMixin, mixin],
+		props: {
+			// 是否显示月份背景色
+			showMark: {
+				type: Boolean,
+				default: true
+			},
+			// 主题色,对底部按钮和选中日期有效
+			color: {
+				type: String,
+				default: '#3c9cff'
+			},
+			// 月份数据
+			months: {
+				type: Array,
+				default: () => []
+			},
+			// 日期选择类型
+			mode: {
+				type: String,
+				default: 'single'
+			},
+			// 日期行高
+			rowHeight: {
+				type: [String, Number],
+				default: 58
+			},
+			// mode=multiple时,最多可选多少个日期
+			maxCount: {
+				type: [String, Number],
+				default: Infinity
+			},
+			// mode=range时,第一个日期底部的提示文字
+			startText: {
+				type: String,
+				default: '开始'
+			},
+			// mode=range时,最后一个日期底部的提示文字
+			endText: {
+				type: String,
+				default: '结束'
+			},
+			// 默认选中的日期,mode为multiple或range是必须为数组格式
+			defaultDate: {
+				type: [Array, String, Date],
+				default: null
+			},
+			// 最小的可选日期
+			minDate: {
+				type: [String, Number],
+				default: 0
+			},
+			// 最大可选日期
+			maxDate: {
+				type: [String, Number],
+				default: 0
+			},
+			// 如果没有设置maxDate,则往后推多少个月
+			maxMonth: {
+				type: [String, Number],
+				default: 2
+			},
+			// 是否为只读状态,只读状态下禁止选择日期
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			// 日期区间最多可选天数,默认无限制,mode = range时有效
+			maxRange: {
+				type: [Number, String],
+				default: Infinity
+			},
+			// 范围选择超过最多可选天数时的提示文案,mode = range时有效
+			rangePrompt: {
+				type: String,
+				default: ''
+			},
+			// 范围选择超过最多可选天数时,是否展示提示文案,mode = range时有效
+			showRangePrompt: {
+				type: Boolean,
+				default: true
+			},
+			// 是否允许日期范围的起止时间为同一天,mode = range时有效
+			allowSameDay: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// 每个日期的宽度
+				width: 0,
+				// 当前选中的日期item
+				item: {},
+				selected: []
+			}
+		},
+		watch: {
+			selectedChange: {
+				immediate: true,
+				handler(n) {
+					this.setDefaultDate()
+				}
+			}
+		},
+		computed: {
+			// 多个条件的变化,会引起选中日期的变化,这里统一管理监听
+			selectedChange() {
+				return [this.minDate, this.maxDate, this.defaultDate]
+			},
+			dayStyle(index1, index2, item) {
+				return (index1, index2, item) => {
+					const style = {}
+					let week = item.week
+					// 不进行四舍五入的形式保留2位小数
+					const dayWidth = Number(parseFloat(this.width / 7).toFixed(3).slice(0, -1))
+					// 得出每个日期的宽度
+					// #ifdef APP-NVUE
+					style.width = this.$uv.addUnit(dayWidth)
+					// #endif
+					style.height = this.$uv.addUnit(this.rowHeight)
+					if (index2 === 0) {
+						// 获取当前为星期几,如果为0,则为星期天,减一为每月第一天时,需要向左偏移的item个数
+						week = (week === 0 ? 7 : week) - 1
+						style.marginLeft = this.$uv.addUnit(week * dayWidth)
+					}
+					if (this.mode === 'range') {
+						// 之所以需要这么写,是因为DCloud公司的iOS客户端的开发者能力有限导致的bug
+						style.paddingLeft = 0
+						style.paddingRight = 0
+						style.paddingBottom = 0
+						style.paddingTop = 0
+					}
+					return style
+				}
+			},
+			daySelectStyle() {
+				return (index1, index2, item) => {
+					let date = dayjs(item.date).format("YYYY-MM-DD"),
+						style = {}
+					// 判断date是否在selected数组中,因为月份可能会需要补0,所以使用dateSame判断,而不用数组的includes判断
+					if (this.selected.some(item => this.dateSame(item, date))) {
+						style.backgroundColor = this.color
+					}
+					if (this.mode === 'single') {
+						if (date === this.selected[0]) {
+							// 因为需要对nvue的兼容,只能这么写,无法缩写,也无法通过类名控制等等
+							style.borderTopLeftRadius = '3px'
+							style.borderBottomLeftRadius = '3px'
+							style.borderTopRightRadius = '3px'
+							style.borderBottomRightRadius = '3px'
+						}
+					} else if (this.mode === 'range') {
+						if (this.selected.length >= 2) {
+							const len = this.selected.length - 1
+							// 第一个日期设置左上角和左下角的圆角
+							if (this.dateSame(date, this.selected[0])) {
+								style.borderTopLeftRadius = '3px'
+								style.borderBottomLeftRadius = '3px'
+							}
+							// 最后一个日期设置右上角和右下角的圆角
+							if (this.dateSame(date, this.selected[len])) {
+								style.borderTopRightRadius = '3px'
+								style.borderBottomRightRadius = '3px'
+							}
+							// 处于第一和最后一个之间的日期,背景色设置为浅色,通过将对应颜色进行等分,再取其尾部的颜色值
+							if (dayjs(date).isAfter(dayjs(this.selected[0])) && dayjs(date).isBefore(dayjs(this
+									.selected[len]))) {
+								style.backgroundColor = colorGradient(this.color, '#ffffff', 100)[90]
+								// 增加一个透明度,让范围区间的背景色也能看到底部的mark水印字符
+								style.opacity = 0.7
+							}
+						} else if (this.selected.length === 1) {
+							// 之所以需要这么写,是因为DCloud公司的iOS客户端的开发者能力有限导致的bug
+							// 进行还原操作,否则在nvue的iOS,uni-app有bug,会导致诡异的表现
+							style.borderTopLeftRadius = '3px'
+							style.borderBottomLeftRadius = '3px'
+						}
+					} else {
+						if (this.selected.some(item => this.dateSame(item, date))) {
+							style.borderTopLeftRadius = '3px'
+							style.borderBottomLeftRadius = '3px'
+							style.borderTopRightRadius = '3px'
+							style.borderBottomRightRadius = '3px'
+						}
+					}
+					return style
+				}
+			},
+			// 某个日期是否被选中
+			textStyle() {
+				return (item) => {
+					const date = dayjs(item.date).format("YYYY-MM-DD"),
+						style = {}
+					// 选中的日期,提示文字设置白色
+					if (this.selected.some(item => this.dateSame(item, date))) {
+						style.color = '#ffffff'
+					}
+					if (this.mode === 'range') {
+						const len = this.selected.length - 1
+						// 如果是范围选择模式,第一个和最后一个之间的日期,文字颜色设置为高亮的主题色
+						if (dayjs(date).isAfter(dayjs(this.selected[0])) && dayjs(date).isBefore(dayjs(this
+								.selected[len]))) {
+							style.color = this.color
+						}
+					}
+					return style
+				}
+			},
+			// 获取顶部的提示文字
+			getTopInfo() {
+				return (index1, index2, item) => {
+					return item.topInfo;
+				}
+			},
+			// 获取底部的提示文字
+			getBottomInfo() {
+				return (index1, index2, item) => {
+					const date = dayjs(item.date).format("YYYY-MM-DD")
+					const bottomInfo = item.bottomInfo
+					// 当为日期范围模式时,且选择的日期个数大于0时
+					if (this.mode === 'range' && this.selected.length > 0) {
+						if (this.selected.length === 1) {
+							// 选择了一个日期时,如果当前日期为数组中的第一个日期,则显示底部文字为“开始”
+							if (this.dateSame(date, this.selected[0])) return this.startText
+							else return bottomInfo
+						} else {
+							const len = this.selected.length - 1
+							// 如果数组中的日期大于2个时,第一个和最后一个显示为开始和结束日期
+							if (this.dateSame(date, this.selected[0]) && this.dateSame(date, this.selected[1]) &&
+								len === 1) {
+								// 如果长度为2,且第一个等于第二个日期,则提示语放在同一个item中
+								return `${this.startText}/${this.endText}`
+							} else if (this.dateSame(date, this.selected[0])) {
+								return this.startText
+							} else if (this.dateSame(date, this.selected[len])) {
+								return this.endText
+							} else {
+								return bottomInfo
+							}
+						}
+					} else {
+						return bottomInfo
+					}
+				}
+			}
+		},
+		mounted() {
+			this.init()
+		},
+		methods: {
+			init() {
+				// 初始化默认选中
+				this.$emit('monthSelected', this.selected)
+				this.$nextTick(() => {
+					// 这里需要另一个延时,因为获取宽度后,会进行月份数据渲染,只有渲染完成之后,才有真正的高度
+					// 因为nvue下,$nextTick并不是100%可靠的
+					this.$uv.sleep(10).then(() => {
+						this.getWrapperWidth()
+						this.getMonthRect()
+					})
+				})
+			},
+			// 判断两个日期是否相等
+			dateSame(date1, date2) {
+				return dayjs(date1).isSame(dayjs(date2))
+			},
+			// 获取月份数据区域的宽度,因为nvue不支持百分比,所以无法通过css设置每个日期item的宽度
+			getWrapperWidth() {
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uv-calendar-month-wrapper'], res => {
+					this.width = res.size.width
+				})
+				// #endif
+				// #ifndef APP-NVUE
+				this.$uvGetRect('.uv-calendar-month-wrapper').then(size => {
+					this.width = size.width
+				})
+				// #endif
+			},
+			getMonthRect() {
+				// 获取每个月份数据的尺寸,用于父组件在scroll-view滚动事件中,监听当前滚动到了第几个月份
+				const promiseAllArr = this.months.map((item, index) => this.getMonthRectByPromise(
+					`uv-calendar-month-${index}`))
+				// 一次性返回
+				Promise.all(promiseAllArr).then(
+					sizes => {
+						let height = 1
+						const topArr = []
+						for (let i = 0; i < this.months.length; i++) {
+							// 添加到months数组中,供scroll-view滚动事件中,判断当前滚动到哪个月份
+							topArr[i] = height
+							height += sizes[i].height
+						}
+						// 由于微信下,无法通过this.months[i].top的形式(引用类型)去修改父组件的month的top值,所以使用事件形式对外发出
+						this.$emit('updateMonthTop', topArr)
+					})
+			},
+			// 获取每个月份区域的尺寸
+			getMonthRectByPromise(el) {
+				// #ifndef APP-NVUE
+				// $uvGetRect为uvui自带的节点查询简化方法,详见文档介绍:https://www.uvui.cn/js/getRect.html
+				// 组件内部一般用this.$uvGetRect,对外的为getRect,二者功能一致,名称不同
+				return new Promise(resolve => {
+					this.$uvGetRect(`.${el}`).then(size => {
+						resolve(size)
+					})
+				})
+				// #endif
+
+				// #ifdef APP-NVUE
+				// nvue下,使用dom模块查询元素高度
+				// 返回一个promise,让调用此方法的主体能使用then回调
+				return new Promise(resolve => {
+					dom.getComponentRect(this.$refs[el][0], res => {
+						resolve(res.size)
+					})
+				})
+				// #endif
+			},
+			// 点击某一个日期
+			clickHandler(index1, index2, item) {
+				if (this.readonly) {
+					return;
+				}
+				this.item = item
+				const date = dayjs(item.date).format("YYYY-MM-DD")
+				if (item.disabled) return
+				// 对上一次选择的日期数组进行深度克隆
+				let selected = this.$uv.deepClone(this.selected)
+				if (this.mode === 'single') {
+					// 单选情况下,让数组中的元素为当前点击的日期
+					selected = [date]
+				} else if (this.mode === 'multiple') {
+					if (selected.some(item => this.dateSame(item, date))) {
+						// 如果点击的日期已在数组中,则进行移除操作,也就是达到反选的效果
+						const itemIndex = selected.findIndex(item => dayjs(item).format("YYYY-MM-DD") === dayjs(date).format("YYYY-MM-DD"))
+						selected.splice(itemIndex, 1)
+					} else {
+						// 如果点击的日期不在数组中,且已有的长度小于总可选长度时,则添加到数组中去
+						if (selected.length < this.maxCount) selected.push(date)
+					}
+				} else {
+					// 选择区间形式
+					if (selected.length === 0 || selected.length >= 2) {
+						// 如果原来就为0或者大于2的长度,则当前点击的日期,就是开始日期
+						selected = [date]
+					} else if (selected.length === 1) {
+						// 如果已经选择了开始日期
+						const existsDate = selected[0]
+						// 如果当前选择的日期小于上一次选择的日期,则当前的日期定为开始日期
+						if (dayjs(date).isBefore(existsDate)) {
+							selected = [date]
+						} else if (dayjs(date).isAfter(existsDate)) {
+							// 当前日期减去最大可选的日期天数,如果大于起始时间,则进行提示
+							if(dayjs(dayjs(date).subtract(this.maxRange, 'day')).isAfter(dayjs(selected[0])) && this.showRangePrompt) {
+								if(this.rangePrompt) {
+									this.$uv.toast(this.rangePrompt)
+								} else {
+									this.$uv.toast(`选择天数不能超过 ${this.maxRange} 天`)
+								}
+								return
+							}
+							// 如果当前日期大于已有日期,将当前的添加到数组尾部
+							selected.push(date)
+							const startDate = selected[0]
+							const endDate = selected[1]
+							const arr = []
+							let i = 0
+							do {
+								// 将开始和结束日期之间的日期添加到数组中
+								arr.push(dayjs(startDate).add(i, 'day').format("YYYY-MM-DD"))
+								i++
+								// 累加的日期小于结束日期时,继续下一次的循环
+							} while (dayjs(startDate).add(i, 'day').isBefore(dayjs(endDate)))
+							// 为了一次性修改数组,避免computed中多次触发,这里才用arr变量一次性赋值的方式,同时将最后一个日期添加近来
+							arr.push(endDate)
+							selected = arr
+						} else {
+							// 选择区间时,只有一个日期的情况下,且不允许选择起止为同一天的话,不允许选择自己
+							if (selected[0] === date && !this.allowSameDay) return
+							selected.push(date)
+						}
+					}
+				}
+				this.setSelected(selected)
+				this.$emit('change',{
+					day: date,
+					selected: selected
+				});
+			},
+			// 设置默认日期
+			setDefaultDate() {
+				if (!this.defaultDate) {
+					// 如果没有设置默认日期,则将当天日期设置为默认选中的日期
+					const selected = [dayjs().format("YYYY-MM-DD")]
+					return this.setSelected(selected, false)
+				}
+				let defaultDate = []
+				const minDate = this.minDate || dayjs().format("YYYY-MM-DD")
+				const maxDate = this.maxDate || dayjs(minDate).add(this.maxMonth - 1, 'month').format("YYYY-MM-DD")
+				if (this.mode === 'single') {
+					// 单选模式,可以是字符串或数组,Date对象等
+					if (!this.$uv.test.array(this.defaultDate)) {
+						defaultDate = [dayjs(this.defaultDate).format("YYYY-MM-DD")]
+					} else {
+						defaultDate = [this.defaultDate[0]]
+					}
+				} else {
+					// 如果为非数组,则不执行
+					if (!this.$uv.test.array(this.defaultDate)) return
+					defaultDate = this.defaultDate
+				}
+				// 过滤用户传递的默认数组,取出只在可允许最大值与最小值之间的元素
+				defaultDate = defaultDate.filter(item => {
+					return dayjs(item).isAfter(dayjs(minDate).subtract(1, 'day')) && dayjs(item).isBefore(dayjs(
+						maxDate).add(1, 'day'))
+				})
+				this.setSelected(defaultDate, false)
+			},
+			setSelected(selected, event = true) {
+				this.selected = selected
+				event && this.$emit('monthSelected', this.selected)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+	.uv-calendar-month-wrapper {
+		margin-top: 4px;
+	}
+
+	.uv-calendar-month {
+
+		&__title {
+			font-size: 14px;
+			line-height: 42px;
+			height: 42px;
+			color: $uv-main-color;
+			text-align: center;
+			font-weight: bold;
+		}
+
+		&__days {
+			position: relative;
+			@include flex;
+			flex-wrap: wrap;
+
+			&__month-mark-wrapper {
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				left: 0;
+				right: 0;
+				@include flex;
+				justify-content: center;
+				align-items: center;
+
+				&__text {
+					font-size: 155px;
+					color: rgba(231, 232, 234, 0.83);
+				}
+			}
+
+			&__day {
+				@include flex;
+				padding: 2px;
+				/* #ifndef APP-NVUE */
+				// vue下使用css进行宽度计算,因为某些安卓机会无法进行js获取父元素宽度进行计算得出,会有偏移
+				width: calc(100% / 7);
+				box-sizing: border-box;
+				/* #endif */
+
+				&__select {
+					flex: 1;
+					@include flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+
+					&__dot {
+						width: 7px;
+						height: 7px;
+						border-radius: 100px;
+						background-color: $uv-error;
+						position: absolute;
+						top: 12px;
+						right: 7px;
+					}
+					
+					&__top-info {
+						color: $uv-content-color;
+						text-align: center;
+						position: absolute;
+						top: 2px;
+						font-size: 10px;
+						text-align: center;
+						left: 0;
+						right: 0;
+						&--selected {
+							color: #ffffff;
+						}
+						
+						&--disabled {
+							color: #cacbcd;
+						}
+					}
+					
+					&__buttom-info {
+						color: $uv-content-color;
+						text-align: center;
+						position: absolute;
+						bottom: 5px;
+						font-size: 10px;
+						text-align: center;
+						left: 0;
+						right: 0;
+
+						&--selected {
+							color: #ffffff;
+						}
+
+						&--disabled {
+							color: #cacbcd;
+						}
+					}
+
+					&__info {
+						text-align: center;
+						font-size: 16px;
+
+						&--selected {
+							color: #ffffff;
+						}
+
+						&--disabled {
+							color: #cacbcd;
+						}
+					}
+
+					&--selected {
+						background-color: $uv-primary;
+						@include flex;
+						justify-content: center;
+						align-items: center;
+						flex: 1;
+						border-radius: 3px;
+					}
+
+					&--range-selected {
+						opacity: 0.3;
+						border-radius: 0;
+					}
+
+					&--range-start-selected {
+						border-top-right-radius: 0;
+						border-bottom-right-radius: 0;
+					}
+
+					&--range-end-selected {
+						border-top-left-radius: 0;
+						border-bottom-left-radius: 0;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 145 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/props.js

@@ -0,0 +1,145 @@
+export default {
+	props: {
+		// 日历顶部标题
+		title: {
+			type: String,
+			default: '日期选择'
+		},
+		// 是否显示标题
+		showTitle: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示副标题
+		showSubtitle: {
+			type: Boolean,
+			default: true
+		},
+		// 日期类型选择,single-选择单个日期,multiple-可以选择多个日期,range-选择日期范围
+		mode: {
+			type: String,
+			default: 'single'
+		},
+		// mode=range时,第一个日期底部的提示文字
+		startText: {
+			type: String,
+			default: '开始'
+		},
+		// mode=range时,最后一个日期底部的提示文字
+		endText: {
+			type: String,
+			default: '结束'
+		},
+		// 自定义列表
+		customList: {
+			type: Array,
+			default: () => []
+		},
+		// 主题色,对底部按钮和选中日期有效
+		color: {
+			type: String,
+			default: '#3c9cff'
+		},
+		// 最小的可选日期
+		minDate: {
+			type: [String, Number],
+			default: 0
+		},
+		// 最大可选日期
+		maxDate: {
+			type: [String, Number],
+			default: 0
+		},
+		// 默认选中的日期,mode为multiple或range是必须为数组格式
+		defaultDate: {
+			type: [Array, String, Date, null],
+			default: null
+		},
+		// mode=multiple时,最多可选多少个日期
+		maxCount: {
+			type: [String, Number],
+			default: Number.MAX_SAFE_INTEGER
+		},
+		// 日期行高
+		rowHeight: {
+			type: [String, Number],
+			default: 56
+		},
+		// 日期格式化函数
+		formatter: {
+			type: [Function, null],
+			default: null
+		},
+		// 是否显示农历
+		showLunar: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示月份背景色
+		showMark: {
+			type: Boolean,
+			default: true
+		},
+		// 确定按钮的文字
+		confirmText: {
+			type: String,
+			default: '确定'
+		},
+		// 确认按钮处于禁用状态时的文字
+		confirmDisabledText: {
+			type: String,
+			default: '确定'
+		},
+		// 是否允许点击遮罩关闭日历
+		closeOnClickOverlay: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许点击确认按钮关闭日历
+		closeOnClickConfirm: {
+			type: Boolean,
+			default: true
+		},
+		// 是否为只读状态,只读状态下禁止选择日期
+		readonly: {
+			type: Boolean,
+			default: false
+		},
+		// 	是否展示确认按钮
+		showConfirm: {
+			type: Boolean,
+			default: true
+		},
+		// 日期区间最多可选天数,默认无限制,mode = range时有效 Infinity
+		maxRange: {
+			type: [Number, String],
+			default: Number.MAX_SAFE_INTEGER
+		},
+		// 范围选择超过最多可选天数时的提示文案,mode = range时有效
+		rangePrompt: {
+			type: String,
+			default: ''
+		},
+		// 范围选择超过最多可选天数时,是否展示提示文案,mode = range时有效
+		showRangePrompt: {
+			type: Boolean,
+			default: true
+		},
+		// 是否允许日期范围的起止时间为同一天,mode = range时有效
+		allowSameDay: {
+			type: Boolean,
+			default: false
+		},
+		// 圆角值
+		round: {
+			type: [Boolean, String, Number],
+			default: 0
+		},
+		// 最多展示月份数量
+		monthNum: {
+			type: [Number, String],
+			default: 3
+		},
+		...uni.$uv?.props?.calendar
+	}
+}

+ 390 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue

@@ -0,0 +1,390 @@
+<template>
+	<uv-popup
+		ref="calendarPopup"
+		mode="bottom"
+		closeable
+		:round="round"
+		:closeOnClickOverlay="closeOnClickOverlay"
+		@change="popupChange"
+	>
+		<view class="uv-calendar">
+			<uvHeader
+				:title="title"
+				:subtitle="subtitle"
+				:showSubtitle="showSubtitle"
+				:showTitle="showTitle"
+			></uvHeader>
+			<scroll-view
+				:style="{ height: $uv.addUnit(listHeight) }"
+				scroll-y
+				@scroll="onScroll"
+				:scroll-top="scrollTop"
+				:scrollIntoView="scrollIntoView"
+			>
+				<uvMonth
+					:color="color"
+					:rowHeight="rowHeight"
+					:showMark="showMark"
+					:months="months"
+					:mode="mode"
+					:maxCount="maxCount"
+					:startText="startText"
+					:endText="endText"
+					:defaultDate="defaultDate"
+					:minDate="innerMinDate"
+					:maxDate="innerMaxDate"
+					:maxMonth="monthNum"
+					:readonly="readonly"
+					:maxRange="maxRange"
+					:rangePrompt="rangePrompt"
+					:showRangePrompt="showRangePrompt"
+					:allowSameDay="allowSameDay"
+					ref="month"
+					@monthSelected="monthSelected"
+					@updateMonthTop="updateMonthTop"
+					@change="changeDay"
+				></uvMonth>
+			</scroll-view>
+			<slot name="footer" v-if="showConfirm">
+				<view class="uv-calendar__confirm">
+					<uv-button
+						shape="circle"
+						:text="buttonDisabled ? confirmDisabledText : confirmText"
+						:color="color"
+						@click="confirm"
+						:disabled="buttonDisabled"
+					></uv-button>
+				</view>
+			</slot>
+		</view>
+	</uv-popup>
+</template>
+
+<script>
+import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+import uvHeader from './header.vue'
+import uvMonth from './month.vue'
+import props from './props.js'
+import dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
+import Calendar from './calendar.js'
+/**
+ * Calendar 日历
+ * @description  此组件用于单个选择日期,范围选择日期等,日历被包裹在底部弹起的容器中.
+ * @tutorial https://www.uvui.cn/components/calendar.html
+ *
+ * @property {String}				title				标题内容 (默认 日期选择 )
+ * @property {Boolean}				showTitle			是否显示标题  (默认 true )
+ * @property {Boolean}				showSubtitle		是否显示副标题	(默认 true )
+ * @property {String}				mode				日期类型选择  single-选择单个日期,multiple-可以选择多个日期,range-选择日期范围 ( 默认 'single' )
+ * @property {String}				startText			mode=range时,第一个日期底部的提示文字  (默认 '开始' )
+ * @property {String}				endText				mode=range时,最后一个日期底部的提示文字 (默认 '结束' )
+ * @property {Array}				customList			自定义列表
+ * @property {String}				color				主题色,对底部按钮和选中日期有效  (默认 ‘#3c9cff' )
+ * @property {String | Number}		minDate				最小的可选日期	 (默认 0 )
+ * @property {String | Number}		maxDate				最大可选日期  (默认 0 )
+ * @property {Array | String| Date}	defaultDate			默认选中的日期,mode为multiple或range是必须为数组格式
+ * @property {String | Number}		maxCount			mode=multiple时,最多可选多少个日期  (默认 	Number.MAX_SAFE_INTEGER  )
+ * @property {String | Number}		rowHeight			日期行高 (默认 56 )
+ * @property {Function}				formatter			日期格式化函数
+ * @property {Boolean}				showLunar			是否显示农历  (默认 false )
+ * @property {Boolean}				showMark			是否显示月份背景色 (默认 true )
+ * @property {String}				confirmText			确定按钮的文字 (默认 '确定' )
+ * @property {String}				confirmDisabledText	确认按钮处于禁用状态时的文字 (默认 '确定' )
+ * @property {Boolean}				show				是否显示日历弹窗 (默认 false )
+ * @property {Boolean}				closeOnClickOverlay	是否允许点击遮罩关闭日历 (默认 false )
+ * @property {Boolean}				closeOnClickConfirm	是否允许点击确认按钮关闭日历,设置为false不影响confirm事件返回 (默认 true )
+ * @property {Boolean}				readonly	        是否为只读状态,只读状态下禁止选择日期 (默认 false )
+ * @property {String | Number}		maxRange	        日期区间最多可选天数,默认无限制,mode = range时有效
+ * @property {String}				rangePrompt	        范围选择超过最多可选天数时的提示文案,mode = range时有效
+ * @property {Boolean}				showRangePrompt	    范围选择超过最多可选天数时,是否展示提示文案,mode = range时有效 (默认 true )
+ * @property {Boolean}				allowSameDay	    是否允许日期范围的起止时间为同一天,mode = range时有效 (默认 false )
+ * @property {Number|String}	    round				圆角值,默认无圆角  (默认 0 )
+ * @property {Number|String}	    monthNum			最多展示的月份数量  (默认 3 )
+ *
+ * @event {Function()} confirm 		点击确定按钮时触发		选择日期相关的返回参数
+ * @event {Function()} close 		日历关闭时触发			可定义页面关闭时的回调事件
+ * @example <uv-calendar ref="calendar" :defaultDate="defaultDateMultiple" mode="multiple" @confirm="confirm">
+	</uv-calendar>
+ * */
+export default {
+	name: 'uv-calendar',
+	emits:['confirm','close','change'],
+	mixins: [mpMixin, mixin, props],
+	components: {
+		uvHeader,
+		uvMonth
+	},
+	data() {
+		return {
+			// 需要显示的月份的数组
+			months: [],
+			// 在月份滚动区域中,当前视图中月份的index索引
+			monthIndex: 0,
+			// 月份滚动区域的高度
+			listHeight: 0,
+			// month组件中选择的日期数组
+			selected: [],
+			scrollIntoView: '',
+			scrollTop:0,
+			// 过滤处理方法
+			innerFormatter: (value) => value
+		}
+	},
+	watch: {
+		selectedChange: {
+			immediate: true,
+			handler(n) {
+				this.setMonth()
+			}
+		}
+	},
+	computed: {
+		// 由于maxDate和minDate可以为字符串(2021-10-10),或者数值(时间戳),但是dayjs如果接受字符串形式的时间戳会有问题,这里进行处理
+		innerMaxDate() {
+			return this.$uv.test.number(this.maxDate)
+				? Number(this.maxDate)
+				: this.maxDate
+		},
+		innerMinDate() {
+			return this.$uv.test.number(this.minDate)
+				? Number(this.minDate)
+				: this.minDate
+		},
+		// 多个条件的变化,会引起选中日期的变化,这里统一管理监听
+		selectedChange() {
+			return [this.innerMinDate, this.innerMaxDate, this.defaultDate]
+		},
+		subtitle() {
+			// 初始化时,this.months为空数组,所以需要特别判断处理
+			if (this.months.length) {
+				return `${this.months[this.monthIndex].year}年${
+					this.months[this.monthIndex].month
+				}月`
+			} else {
+				return ''
+			}
+		},
+		buttonDisabled() {
+			// 如果为range类型,且选择的日期个数不足1个时,让底部的按钮出于disabled状态
+			if (this.mode === 'range') {
+				if (this.selected.length <= 1) {
+					return true
+				} else {
+					return false
+				}
+			} else {
+				return false
+			}
+		}
+	},
+	mounted() {
+		this.start = Date.now()
+		this.init()
+	},
+	methods: {
+		// 在微信小程序中,不支持将函数当做props参数,故只能通过ref形式调用
+		setFormatter(e) {
+			this.innerFormatter = e
+		},
+		// 点击日期框触发
+		changeDay(e) {
+			this.$emit('change',e);
+		},
+		// month组件内部选择日期后,通过事件通知给父组件
+		monthSelected(e) {
+			this.selected = e
+			if (!this.showConfirm) {
+				// 在不需要确认按钮的情况下,如果为单选,或者范围多选且已选长度大于2,则直接进行返还
+				if (
+					this.mode === 'multiple' ||
+					this.mode === 'single' ||
+					(this.mode === 'range' && this.selected.length >= 2)
+				) {
+					this.$emit('confirm', this.selected)
+				}
+			}
+		},
+		init() {
+			// 校验maxDate,不能小于minDate
+			if (
+				this.innerMaxDate &&
+				this.innerMinDate &&
+				new Date(this.innerMaxDate).getTime() < new Date(this.innerMinDate).getTime()
+			) {
+				return this.$uv.error('maxDate不能小于minDate')
+			}
+			// 滚动区域的高度
+			this.listHeight = this.rowHeight * 5 + 30
+			this.setMonth()
+		},
+		open() {
+			this.setMonth()
+			this.$refs.calendarPopup.open();
+		},
+		popupChange(e) {
+			if(!e.show) {
+				this.$emit('close');
+			}
+		},
+		// 点击确定按钮
+		confirm() {
+			if (!this.buttonDisabled) {
+				this.$emit('confirm', this.selected)
+			}
+			if (this.closeOnClickConfirm) {
+				this.$refs.calendarPopup.close();
+			}
+		},
+		// 获得两个日期之间的月份数
+		getMonths(minDate, maxDate) {
+			const minYear = dayjs(minDate).year()
+			const minMonth = dayjs(minDate).month() + 1
+			const maxYear = dayjs(maxDate).year()
+			const maxMonth = dayjs(maxDate).month() + 1
+			return (maxYear - minYear) * 12 + (maxMonth - minMonth) + 1
+		},
+		// 设置月份数据
+		setMonth() {
+			// 最小日期的毫秒数
+			const minDate = this.innerMinDate || dayjs().valueOf()
+			// 如果没有指定最大日期,则往后推3个月
+			const maxDate =
+				this.innerMaxDate ||
+				dayjs(minDate)
+					.add(this.monthNum - 1, 'month')
+					.valueOf()
+			// 最大最小月份之间的共有多少个月份,
+			const months = this.$uv.range(
+				1,
+				this.monthNum,
+				this.getMonths(minDate, maxDate)
+			)
+			// 先清空数组
+			this.months = []
+			for (let i = 0; i < months; i++) {
+				this.months.push({
+					date: new Array(
+						dayjs(minDate).add(i, 'month').daysInMonth()
+					)
+						.fill(1)
+						.map((item, index) => {
+							// 日期,取值1-31
+							let day = index + 1
+							// 星期,0-6,0为周日
+							const week = dayjs(minDate)
+								.add(i, 'month')
+								.date(day)
+								.day()
+							const date = dayjs(minDate)
+								.add(i, 'month')
+								.date(day)
+								.format('YYYY-MM-DD')
+							let topInfo = ''
+							let bottomInfo = ''
+							if (this.showLunar) {
+								// 将日期转为农历格式
+								const lunar = Calendar.solar2lunar(
+									dayjs(date).year(),
+									dayjs(date).month() + 1,
+									dayjs(date).date()
+								)
+								bottomInfo = lunar.IDayCn
+							}
+							let config = {
+								day,
+								week,
+								// 小于最小允许的日期,或者大于最大的日期,则设置为disabled状态
+								disabled:
+									dayjs(date).isBefore(
+										dayjs(minDate).format('YYYY-MM-DD')
+									) ||
+									dayjs(date).isAfter(
+										dayjs(maxDate).format('YYYY-MM-DD')
+									),
+								// 返回一个日期对象,供外部的formatter获取当前日期的年月日等信息,进行加工处理
+								date: new Date(date),
+								topInfo,
+								bottomInfo,
+								dot: false,
+								month:
+									dayjs(minDate).add(i, 'month').month() + 1
+							}
+							const formatter =
+								this.formatter || this.innerFormatter
+							return formatter(config)
+						}),
+					// 当前所属的月份
+					month: dayjs(minDate).add(i, 'month').month() + 1,
+					// 当前年份
+					year: dayjs(minDate).add(i, 'month').year()
+				})
+			}
+
+		},
+		// 滚动到默认设置的月份
+		scrollIntoDefaultMonth(selected) {
+			// 查询默认日期在可选列表的下标
+			const _index = this.months.findIndex(({
+				  year,
+				  month
+			  }) => {
+				month = this.$uv.padZero(month)
+				return `${year}-${month}` === selected
+			})
+			if (_index !== -1) {
+				// #ifndef MP-WEIXIN
+				this.$nextTick(() => {
+					this.scrollIntoView = `month-${_index}`
+				})
+				// #endif
+				// #ifdef MP-WEIXIN
+				this.scrollTop = this.months[_index].top || 0;
+				// #endif
+			}
+		},
+		// scroll-view滚动监听
+		onScroll(event) {
+			// 不允许小于0的滚动值,如果scroll-view到顶了,继续下拉,会出现负数值
+			const scrollTop = Math.max(0, event.detail.scrollTop)
+			// 将当前滚动条数值,除以滚动区域的高度,可以得出当前滚动到了哪一个月份的索引
+			for (let i = 0; i < this.months.length; i++) {
+				if (scrollTop >= (this.months[i].top || this.listHeight)) {
+					this.monthIndex = i
+				}
+			}
+		},
+		// 更新月份的top值
+		updateMonthTop(topArr = []) {
+			// 设置对应月份的top值,用于onScroll方法更新月份
+			topArr.map((item, index) => {
+				this.months[index].top = item
+			})
+
+			// 获取默认日期的下标
+			if (!this.defaultDate) {
+				// 如果没有设置默认日期,则将当天日期设置为默认选中的日期
+				const selected = dayjs().format("YYYY-MM")
+				this.scrollIntoDefaultMonth(selected)
+				return
+			}
+			let selected = dayjs().format("YYYY-MM");
+			// 单选模式,可以是字符串或数组,Date对象等
+			if (!this.$uv.test.array(this.defaultDate)) {
+				selected = dayjs(this.defaultDate).format("YYYY-MM")
+			} else {
+				selected = dayjs(this.defaultDate[0]).format("YYYY-MM");
+			}
+			this.scrollIntoDefaultMonth(selected)
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.uv-calendar {
+	&__confirm {
+		padding: 7px 18px;
+	}
+}
+</style>

+ 89 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/package.json

@@ -0,0 +1,89 @@
+{
+	"id": "uv-calendar",
+	"displayName": "uv-calendar 日历 全面兼容vue3+2、app、h5、小程序等多端",
+	"version": "1.0.6",
+	"description": "日历组件用于单个选择日期,范围选择日期等,日历被包裹在底部弹起的容器中,灵活配置,功能齐全,兼容全端。强烈推荐使用最新版日历组件,在下方跳入。",
+	"keywords": [
+        "uv-calendar",
+        "uvui",
+        "uv-ui",
+        "calendar",
+        "日历"
+    ],
+	"repository": "",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+	"dcloudext": {
+		"type": "component-vue",
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "插件不采集任何数据",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uv-ui-tools",
+			"uv-button",
+			"uv-popup"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}

+ 21 - 0
virgo.wzfrontend/yui_wx/uni_modules/uv-calendar/readme.md

@@ -0,0 +1,21 @@
+## Calendar 日历 
+
+> **组件名:uv-calendar**
+
+此组件用于单个选择日期,范围选择日期等,日历被包裹在底部弹起的容器中。灵活配置,功能齐全,兼容全端。
+
+## 温馨提示:该组件不再更新,强烈推荐使用最新版日历组件:[https://www.uvui.cn/components/calendars.html](https://www.uvui.cn/components/calendars.html)。基于 `uv-ui` 插件市场首款多功能日历组件,不仅可以查看、选择日期,还可以选择任意范围内的日期、打点操作、自定义主题颜色、自定义文案、农历显示等。追求的就是完美。
+
+# <a href="https://www.uvui.cn/components/calendar.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>(请不要 下载插件ZIP)</small>
+
+### [更多插件,请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈,或者您对uv-ui有一些好的建议,欢迎加入uv-ui官方交流群:<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/device/aircondition.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/device/control.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/deviceDetail/deviceDetail.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservation/reservation.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 10 - 3
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/main.wxss


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/runtime.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 5 - 5
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/vendor.js


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/navbar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/projectDropDown.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/upload.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/aircondition.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/aircondition.wxml


+ 2 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/aircondition.wxss

@@ -97,7 +97,8 @@
 }
 .aircondition-box .popup-content .popup-close {
   border-top: 20rpx solid #f2f2f2;
-  padding: 24rpx 0;
+  height: 88rpx;
+  line-height: 88rpx;
   text-align: center;
   color: #8c8c8c;
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.js


+ 3 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.json

@@ -1,6 +1,8 @@
 {
   "usingComponents": {
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uv-calendar": "/uni_modules/uv-calendar/components/uv-calendar/uv-calendar",
+    "u-echart": "/components/device/uEchart"
   },
   "component": true
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.wxml


+ 105 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/control.wxss

@@ -8,6 +8,111 @@
 /* 水平间距 */
 .control-index {
   padding: 30rpx;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+}
+.control-index .control-week {
+  display: flex;
+  margin-bottom: 40rpx;
+}
+.control-index .control-week .line {
+  width: 20rpx;
+}
+.control-index .control-week .control-week-item {
+  background: #d4edff;
+  display: flex;
+  align-items: center;
+  padding: 20rpx;
+  flex: 1;
+  width: 0;
+  overflow: hidden;
+  border-radius: 8rpx;
+}
+.control-index .control-week .control-week-item.orange {
+  background: #fdd8b7;
+}
+.control-index .control-week .control-week-item.orange .control-week-icon {
+  background: #ffa300;
+}
+.control-index .control-week .control-week-item.orange .control-week-content {
+  color: #ffa300;
+}
+.control-index .control-week .control-week-icon {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 8rpx;
+  background: #4cb0fc;
+  text-align: center;
+  line-height: 72rpx;
+}
+.control-index .control-week .control-week-content {
+  margin-left: 20rpx;
+  color: #4cb0fc;
+}
+.control-index .control-week .label {
+  font-size: 24rpx;
+}
+.control-index .control-week .number {
+  font-size: 32rpx;
+}
+.control-index .control-list {
+  background: #fff;
+  padding: 30rpx 30rpx 10rpx 30rpx;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+  margin-top: 30rpx;
+}
+.control-index .control-state {
+  position: absolute;
+  top: 20rpx;
+  right: 20rpx;
+}
+.control-index .control-state .control-status {
+  padding: 6rpx 20rpx;
+  color: #fff;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+  font-weight: 300;
+}
+.control-index .control-state .in {
+  background: #08979c;
+}
+.control-index .control-state .out {
+  background: #fa8c16;
+}
+.control-index .fans-list {
+  padding: 0;
+}
+.control-index .control-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+.control-index .control-title .label {
+  font-size: 32rpx;
+  font-weight: 500;
+}
+.control-index .control-title .date {
+  font-size: 24rpx;
+  font-weight: 300;
+  color: #8c8c8c;
+  border: 1px solid #d9d9d9;
+  padding: 6rpx 10rpx;
+  border-radius: 8rpx;
+  width: 340rpx;
+  display: flex;
+  align-items: center;
+}
+.control-index .control-title .line {
+  margin: 0 10rpx;
+}
+.control-index .control-title .date-value {
+  flex: 1;
+  width: 0;
+  overflow: hidden;
+  text-align: center;
 }
 .control-index .control-off {
   background: #fff;

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/environment.js


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/environment.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-echart": "/components/device/uEchart"
-  },
-  "component": true
+  }
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/meter.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/uEchart.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/water.js


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/sin-signature/sin-signature.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-head/uni-mall-head.js


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-head/uni-mall-head.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  },
-  "component": true
+  }
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-list/uni-mall-list.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/deviceDetail/deviceDetail.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/reservation/reservation.js


+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/reservation/reservation.json

@@ -5,6 +5,7 @@
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uv-calendar": "/uni_modules/uv-calendar/components/uv-calendar/uv-calendar",
     "lotus-calendar": "/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar"
   }
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/reservation/reservation.wxml


+ 9 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/font/iconfont.css

@@ -12,6 +12,14 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.icon-chuqu:before {
+  content: "\e641";
+}
+
+.icon-jinchang:before {
+  content: "\e69c";
+}
+
 .icon-yiping:before {
   content: "\e680";
 }
@@ -254,5 +262,4 @@
 
 .icon-gongyuan:before {
   content: "\e617";
-}
-
+}

BIN
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/font/iconfont.ttf


+ 4 - 3
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/scss/common.scss

@@ -116,13 +116,14 @@ button[type=primary]{
 		display: flex;
 		align-items: center;
 		padding: 0 30rpx;
-		margin-bottom: 20rpx;
+		margin-bottom: 20rpx;
+		position: relative;
 	}
 
 	.fans-avatar {
 		width: 100rpx;
 		height: 100rpx;
-		border-radius: 100rpx;
+		border-radius: 16rpx;
 	}
 
 	.fans-content {
@@ -138,7 +139,7 @@ button[type=primary]{
 	.fans-organization {
 		color: $uni-secondary-color;
 		font-weight: 300;
-		margin-top: 4rpx;
+		margin-top: 10rpx;
 		font-size: 24rpx;
 	}
 

+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/lime-slider/components/l-slider/l-slider.js


+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 7
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "qiun-loading": "/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading",
-    "qiun-error": "/uni_modules/qiun-data-charts/components/qiun-error/qiun-error"
-  }
-}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.wxml


+ 0 - 10
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.wxss

@@ -1,10 +0,0 @@
-
-.chartsview.data-v-fe947b98 {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex: 1;
-  justify-content: center;
-  align-items: center;
-}
-

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.wxml

@@ -1 +0,0 @@
-<view class="chartsview"><view class="charts-error"></view><view class="charts-font">{{errorMessage==null?'请点击重试':errorMessage}}</view></view>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 22
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.wxss


+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.wxml

@@ -1 +0,0 @@
-<view class="container loading1 data-v-e4e769ee"><view class="shape shape1 data-v-e4e769ee"></view><view class="shape shape2 data-v-e4e769ee"></view><view class="shape shape3 data-v-e4e769ee"></view><view class="shape shape4 data-v-e4e769ee"></view></view>

+ 0 - 132
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.wxss

@@ -1,132 +0,0 @@
-
-.container.data-v-e4e769ee {
-  width: 30px;
-  height: 30px;
-  position: relative;
-}
-.container.loading1.data-v-e4e769ee {
-  -webkit-transform: rotate(45deg);
-          transform: rotate(45deg);
-}
-.container .shape.data-v-e4e769ee {
-  position: absolute;
-  width: 10px;
-  height: 10px;
-  border-radius: 1px;
-}
-.container .shape.shape1.data-v-e4e769ee {
-  left: 0;
-  background-color: #1890FF;
-}
-.container .shape.shape2.data-v-e4e769ee {
-  right: 0;
-  background-color: #91CB74;
-}
-.container .shape.shape3.data-v-e4e769ee {
-  bottom: 0;
-  background-color: #FAC858;
-}
-.container .shape.shape4.data-v-e4e769ee {
-  bottom: 0;
-  right: 0;
-  background-color: #EE6666;
-}
-.loading1 .shape1.data-v-e4e769ee {
-  -webkit-animation: animation1shape1-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-          animation: animation1shape1-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation1shape1-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(16px, 16px);
-            transform: translate(16px, 16px);
-}
-}
-@keyframes animation1shape1-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(16px, 16px);
-            transform: translate(16px, 16px);
-}
-}
-.loading1 .shape2.data-v-e4e769ee {
-  -webkit-animation: animation1shape2-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-          animation: animation1shape2-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation1shape2-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-16px, 16px);
-            transform: translate(-16px, 16px);
-}
-}
-@keyframes animation1shape2-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-16px, 16px);
-            transform: translate(-16px, 16px);
-}
-}
-.loading1 .shape3.data-v-e4e769ee {
-  -webkit-animation: animation1shape3-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-          animation: animation1shape3-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation1shape3-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(16px, -16px);
-            transform: translate(16px, -16px);
-}
-}
-@keyframes animation1shape3-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(16px, -16px);
-            transform: translate(16px, -16px);
-}
-}
-.loading1 .shape4.data-v-e4e769ee {
-  -webkit-animation: animation1shape4-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-          animation: animation1shape4-data-v-e4e769ee 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation1shape4-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-16px, -16px);
-            transform: translate(-16px, -16px);
-}
-}
-@keyframes animation1shape4-data-v-e4e769ee {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-16px, -16px);
-            transform: translate(-16px, -16px);
-}
-}
-
-
-

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 4
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.wxml

@@ -1 +0,0 @@
-<view class="container loading2 data-v-e4cb3aec"><view class="shape shape1 data-v-e4cb3aec"></view><view class="shape shape2 data-v-e4cb3aec"></view><view class="shape shape3 data-v-e4cb3aec"></view><view class="shape shape4 data-v-e4cb3aec"></view></view>

+ 0 - 138
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.wxss

@@ -1,138 +0,0 @@
-
-.container.data-v-e4cb3aec {
-  width: 30px;
-  height: 30px;
-  position: relative;
-}
-.container.loading2.data-v-e4cb3aec {
-  -webkit-transform: rotate(10deg);
-          transform: rotate(10deg);
-}
-.container.loading2 .shape.data-v-e4cb3aec {
-  border-radius: 5px;
-}
-.container.loading2.data-v-e4cb3aec{
-  -webkit-animation: rotation 1s infinite;
-          animation: rotation 1s infinite;
-}
-.container .shape.data-v-e4cb3aec {
-  position: absolute;
-  width: 10px;
-  height: 10px;
-  border-radius: 1px;
-}
-.container .shape.shape1.data-v-e4cb3aec {
-  left: 0;
-  background-color: #1890FF;
-}
-.container .shape.shape2.data-v-e4cb3aec {
-  right: 0;
-  background-color: #91CB74;
-}
-.container .shape.shape3.data-v-e4cb3aec {
-  bottom: 0;
-  background-color: #FAC858;
-}
-.container .shape.shape4.data-v-e4cb3aec {
-  bottom: 0;
-  right: 0;
-  background-color: #EE6666;
-}
-.loading2 .shape1.data-v-e4cb3aec {
-  -webkit-animation: animation2shape1-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-          animation: animation2shape1-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation2shape1-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(20px, 20px);
-            transform: translate(20px, 20px);
-}
-}
-@keyframes animation2shape1-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(20px, 20px);
-            transform: translate(20px, 20px);
-}
-}
-.loading2 .shape2.data-v-e4cb3aec {
-  -webkit-animation: animation2shape2-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-          animation: animation2shape2-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation2shape2-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-20px, 20px);
-            transform: translate(-20px, 20px);
-}
-}
-@keyframes animation2shape2-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-20px, 20px);
-            transform: translate(-20px, 20px);
-}
-}
-.loading2 .shape3.data-v-e4cb3aec {
-  -webkit-animation: animation2shape3-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-          animation: animation2shape3-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation2shape3-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(20px, -20px);
-            transform: translate(20px, -20px);
-}
-}
-@keyframes animation2shape3-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(20px, -20px);
-            transform: translate(20px, -20px);
-}
-}
-.loading2 .shape4.data-v-e4cb3aec {
-  -webkit-animation: animation2shape4-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-          animation: animation2shape4-data-v-e4cb3aec 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation2shape4-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-20px, -20px);
-            transform: translate(-20px, -20px);
-}
-}
-@keyframes animation2shape4-data-v-e4cb3aec {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-20px, -20px);
-            transform: translate(-20px, -20px);
-}
-}
-
-

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 4
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.wxml

@@ -1 +0,0 @@
-<view class="container loading3 data-v-e4af0bea"><view class="shape shape1 data-v-e4af0bea"></view><view class="shape shape2 data-v-e4af0bea"></view><view class="shape shape3 data-v-e4af0bea"></view><view class="shape shape4 data-v-e4af0bea"></view></view>

+ 0 - 142
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.wxss

@@ -1,142 +0,0 @@
-
-.container.data-v-e4af0bea {
-  width: 30px;
-  height: 30px;
-  position: relative;
-}
-.container.loading3.data-v-e4af0bea {
-  -webkit-animation: rotation 1s infinite;
-          animation: rotation 1s infinite;
-}
-.container.loading3 .shape1.data-v-e4af0bea {
-  border-top-left-radius: 10px;
-}
-.container.loading3 .shape2.data-v-e4af0bea {
-  border-top-right-radius: 10px;
-}
-.container.loading3 .shape3.data-v-e4af0bea {
-  border-bottom-left-radius: 10px;
-}
-.container.loading3 .shape4.data-v-e4af0bea {
-  border-bottom-right-radius: 10px;
-}
-.container .shape.data-v-e4af0bea {
-  position: absolute;
-  width: 10px;
-  height: 10px;
-  border-radius: 1px;
-}
-.container .shape.shape1.data-v-e4af0bea {
-  left: 0;
-  background-color: #1890FF;
-}
-.container .shape.shape2.data-v-e4af0bea {
-  right: 0;
-  background-color: #91CB74;
-}
-.container .shape.shape3.data-v-e4af0bea {
-  bottom: 0;
-  background-color: #FAC858;
-}
-.container .shape.shape4.data-v-e4af0bea {
-  bottom: 0;
-  right: 0;
-  background-color: #EE6666;
-}
-.loading3 .shape1.data-v-e4af0bea {
-  -webkit-animation: animation3shape1-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-          animation: animation3shape1-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation3shape1-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(5px, 5px);
-            transform: translate(5px, 5px);
-}
-}
-@keyframes animation3shape1-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(5px, 5px);
-            transform: translate(5px, 5px);
-}
-}
-.loading3 .shape2.data-v-e4af0bea {
-  -webkit-animation: animation3shape2-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-          animation: animation3shape2-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation3shape2-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-5px, 5px);
-            transform: translate(-5px, 5px);
-}
-}
-@keyframes animation3shape2-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-5px, 5px);
-            transform: translate(-5px, 5px);
-}
-}
-.loading3 .shape3.data-v-e4af0bea {
-  -webkit-animation: animation3shape3-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-          animation: animation3shape3-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation3shape3-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(5px, -5px);
-            transform: translate(5px, -5px);
-}
-}
-@keyframes animation3shape3-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(5px, -5px);
-            transform: translate(5px, -5px);
-}
-}
-.loading3 .shape4.data-v-e4af0bea {
-  -webkit-animation: animation3shape4-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-          animation: animation3shape4-data-v-e4af0bea 0.5s ease 0s infinite alternate;
-}
-@-webkit-keyframes animation3shape4-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-5px, -5px);
-            transform: translate(-5px, -5px);
-}
-}
-@keyframes animation3shape4-data-v-e4af0bea {
-from {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-to {
-    -webkit-transform: translate(-5px, -5px);
-            transform: translate(-5px, -5px);
-}
-}
-

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 4
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.wxml

@@ -1 +0,0 @@
-<view class="container loading5 data-v-e492dce8"><view class="shape shape1 data-v-e492dce8"></view><view class="shape shape2 data-v-e492dce8"></view><view class="shape shape3 data-v-e492dce8"></view><view class="shape shape4 data-v-e492dce8"></view></view>

+ 0 - 191
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.wxss

@@ -1,191 +0,0 @@
-
-.container.data-v-e492dce8 {
-  width: 30px;
-  height: 30px;
-  position: relative;
-}
-.container.loading5 .shape.data-v-e492dce8 {
-  width: 15px;
-  height: 15px;
-}
-.container .shape.data-v-e492dce8 {
-  position: absolute;
-  width: 10px;
-  height: 10px;
-  border-radius: 1px;
-}
-.container .shape.shape1.data-v-e492dce8 {
-  left: 0;
-  background-color: #1890FF;
-}
-.container .shape.shape2.data-v-e492dce8 {
-  right: 0;
-  background-color: #91CB74;
-}
-.container .shape.shape3.data-v-e492dce8 {
-  bottom: 0;
-  background-color: #FAC858;
-}
-.container .shape.shape4.data-v-e492dce8 {
-  bottom: 0;
-  right: 0;
-  background-color: #EE6666;
-}
-.loading5 .shape1.data-v-e492dce8 {
-  animation: animation5shape1-data-v-e492dce8 2s ease 0s infinite reverse;
-}
-@-webkit-keyframes animation5shape1-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, 15px);
-            transform: translate(0, 15px);
-}
-50% {
-    -webkit-transform: translate(15px, 15px);
-            transform: translate(15px, 15px);
-}
-75% {
-    -webkit-transform: translate(15px, 0);
-            transform: translate(15px, 0);
-}
-}
-@keyframes animation5shape1-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, 15px);
-            transform: translate(0, 15px);
-}
-50% {
-    -webkit-transform: translate(15px, 15px);
-            transform: translate(15px, 15px);
-}
-75% {
-    -webkit-transform: translate(15px, 0);
-            transform: translate(15px, 0);
-}
-}
-.loading5 .shape2.data-v-e492dce8 {
-  animation: animation5shape2-data-v-e492dce8 2s ease 0s infinite reverse;
-}
-@-webkit-keyframes animation5shape2-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(-15px, 0);
-            transform: translate(-15px, 0);
-}
-50% {
-    -webkit-transform: translate(-15px, 15px);
-            transform: translate(-15px, 15px);
-}
-75% {
-    -webkit-transform: translate(0, 15px);
-            transform: translate(0, 15px);
-}
-}
-@keyframes animation5shape2-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(-15px, 0);
-            transform: translate(-15px, 0);
-}
-50% {
-    -webkit-transform: translate(-15px, 15px);
-            transform: translate(-15px, 15px);
-}
-75% {
-    -webkit-transform: translate(0, 15px);
-            transform: translate(0, 15px);
-}
-}
-.loading5 .shape3.data-v-e492dce8 {
-  animation: animation5shape3-data-v-e492dce8 2s ease 0s infinite reverse;
-}
-@-webkit-keyframes animation5shape3-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(15px, 0);
-            transform: translate(15px, 0);
-}
-50% {
-    -webkit-transform: translate(15px, -15px);
-            transform: translate(15px, -15px);
-}
-75% {
-    -webkit-transform: translate(0, -15px);
-            transform: translate(0, -15px);
-}
-}
-@keyframes animation5shape3-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(15px, 0);
-            transform: translate(15px, 0);
-}
-50% {
-    -webkit-transform: translate(15px, -15px);
-            transform: translate(15px, -15px);
-}
-75% {
-    -webkit-transform: translate(0, -15px);
-            transform: translate(0, -15px);
-}
-}
-.loading5 .shape4.data-v-e492dce8 {
-  animation: animation5shape4-data-v-e492dce8 2s ease 0s infinite reverse;
-}
-@-webkit-keyframes animation5shape4-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, -15px);
-            transform: translate(0, -15px);
-}
-50% {
-    -webkit-transform: translate(-15px, -15px);
-            transform: translate(-15px, -15px);
-}
-75% {
-    -webkit-transform: translate(-15px, 0);
-            transform: translate(-15px, 0);
-}
-}
-@keyframes animation5shape4-data-v-e492dce8 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, -15px);
-            transform: translate(0, -15px);
-}
-50% {
-    -webkit-transform: translate(-15px, -15px);
-            transform: translate(-15px, -15px);
-}
-75% {
-    -webkit-transform: translate(-15px, 0);
-            transform: translate(-15px, 0);
-}
-}
-
-

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 4
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.wxml

@@ -1 +0,0 @@
-<view class="container loading6 data-v-e476ade6"><view class="shape shape1 data-v-e476ade6"></view><view class="shape shape2 data-v-e476ade6"></view><view class="shape shape3 data-v-e476ade6"></view><view class="shape shape4 data-v-e476ade6"></view></view>

+ 0 - 199
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.wxss

@@ -1,199 +0,0 @@
-
-.container.data-v-e476ade6 {
-  width: 30px;
-  height: 30px;
-  position: relative;
-}
-.container.loading6.data-v-e476ade6 {
-  -webkit-animation: rotation 1s infinite;
-          animation: rotation 1s infinite;
-}
-.container.loading6 .shape.data-v-e476ade6 {
-  width: 12px;
-  height: 12px;
-  border-radius: 2px;
-}
-.container .shape.data-v-e476ade6 {
-  position: absolute;
-  width: 10px;
-  height: 10px;
-  border-radius: 1px;
-}
-.container .shape.shape1.data-v-e476ade6 {
-  left: 0;
-  background-color: #1890FF;
-}
-.container .shape.shape2.data-v-e476ade6 {
-  right: 0;
-  background-color: #91CB74;
-}
-.container .shape.shape3.data-v-e476ade6 {
-  bottom: 0;
-  background-color: #FAC858;
-}
-.container .shape.shape4.data-v-e476ade6 {
-  bottom: 0;
-  right: 0;
-  background-color: #EE6666;
-}
-.loading6 .shape1.data-v-e476ade6 {
-  -webkit-animation: animation6shape1-data-v-e476ade6 2s linear 0s infinite normal;
-          animation: animation6shape1-data-v-e476ade6 2s linear 0s infinite normal;
-}
-@-webkit-keyframes animation6shape1-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, 18px);
-            transform: translate(0, 18px);
-}
-50% {
-    -webkit-transform: translate(18px, 18px);
-            transform: translate(18px, 18px);
-}
-75% {
-    -webkit-transform: translate(18px, 0);
-            transform: translate(18px, 0);
-}
-}
-@keyframes animation6shape1-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, 18px);
-            transform: translate(0, 18px);
-}
-50% {
-    -webkit-transform: translate(18px, 18px);
-            transform: translate(18px, 18px);
-}
-75% {
-    -webkit-transform: translate(18px, 0);
-            transform: translate(18px, 0);
-}
-}
-.loading6 .shape2.data-v-e476ade6 {
-  -webkit-animation: animation6shape2-data-v-e476ade6 2s linear 0s infinite normal;
-          animation: animation6shape2-data-v-e476ade6 2s linear 0s infinite normal;
-}
-@-webkit-keyframes animation6shape2-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(-18px, 0);
-            transform: translate(-18px, 0);
-}
-50% {
-    -webkit-transform: translate(-18px, 18px);
-            transform: translate(-18px, 18px);
-}
-75% {
-    -webkit-transform: translate(0, 18px);
-            transform: translate(0, 18px);
-}
-}
-@keyframes animation6shape2-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(-18px, 0);
-            transform: translate(-18px, 0);
-}
-50% {
-    -webkit-transform: translate(-18px, 18px);
-            transform: translate(-18px, 18px);
-}
-75% {
-    -webkit-transform: translate(0, 18px);
-            transform: translate(0, 18px);
-}
-}
-.loading6 .shape3.data-v-e476ade6 {
-  -webkit-animation: animation6shape3-data-v-e476ade6 2s linear 0s infinite normal;
-          animation: animation6shape3-data-v-e476ade6 2s linear 0s infinite normal;
-}
-@-webkit-keyframes animation6shape3-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(18px, 0);
-            transform: translate(18px, 0);
-}
-50% {
-    -webkit-transform: translate(18px, -18px);
-            transform: translate(18px, -18px);
-}
-75% {
-    -webkit-transform: translate(0, -18px);
-            transform: translate(0, -18px);
-}
-}
-@keyframes animation6shape3-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(18px, 0);
-            transform: translate(18px, 0);
-}
-50% {
-    -webkit-transform: translate(18px, -18px);
-            transform: translate(18px, -18px);
-}
-75% {
-    -webkit-transform: translate(0, -18px);
-            transform: translate(0, -18px);
-}
-}
-.loading6 .shape4.data-v-e476ade6 {
-  -webkit-animation: animation6shape4-data-v-e476ade6 2s linear 0s infinite normal;
-          animation: animation6shape4-data-v-e476ade6 2s linear 0s infinite normal;
-}
-@-webkit-keyframes animation6shape4-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, -18px);
-            transform: translate(0, -18px);
-}
-50% {
-    -webkit-transform: translate(-18px, -18px);
-            transform: translate(-18px, -18px);
-}
-75% {
-    -webkit-transform: translate(-18px, 0);
-            transform: translate(-18px, 0);
-}
-}
-@keyframes animation6shape4-data-v-e476ade6 {
-0% {
-    -webkit-transform: translate(0, 0);
-            transform: translate(0, 0);
-}
-25% {
-    -webkit-transform: translate(0, -18px);
-            transform: translate(0, -18px);
-}
-50% {
-    -webkit-transform: translate(-18px, -18px);
-            transform: translate(-18px, -18px);
-}
-75% {
-    -webkit-transform: translate(-18px, 0);
-            transform: translate(-18px, 0);
-}
-}
-

+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 10
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.json

@@ -1,10 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "loading1": "/uni_modules/qiun-data-charts/components/qiun-loading/loading1",
-    "loading2": "/uni_modules/qiun-data-charts/components/qiun-loading/loading2",
-    "loading3": "/uni_modules/qiun-data-charts/components/qiun-loading/loading3",
-    "loading4": "/uni_modules/qiun-data-charts/components/qiun-loading/loading4",
-    "loading5": "/uni_modules/qiun-data-charts/components/qiun-loading/loading5"
-  }
-}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.wxml


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 11 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js


+ 7 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "uv-loading-icon": "/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  },
+  "component": true
+}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.wxml


+ 0 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.wxss


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott