no message

package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "Homestay_manage_app",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}

package.json

@@ -1 +0,0 @@
-{}

pages.json

@@ -1,19 +1,20 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/index/index",
+			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "靖安人家乡村民宿",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/home/home",
+			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "靖安乡村民宿",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "靖安人家乡村民宿",
+				"enablePullDownRefresh": false
 			}
-		}, {
+		},
+		{
 			"path": "pages/my/my",
 			"style": {
 				"navigationBarTitleText": "我的",
@@ -47,7 +48,7 @@
 		}, {
 			"path": "pages/detail/detail",
 			"style": {
-				"navigationBarTitleText": "乡村民宿详情",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 		}, {
@@ -129,8 +130,9 @@
 		}, {
 			"path": "pages/web/web",
 			"style": {
-				"navigationBarTitleText": "数据中台",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -182,6 +184,24 @@
 				"navigationBarTitleText": "我的卡券",
 				"enablePullDownRefresh": false
 			}
+		}, {
+			"path": "pages/couponCenter/couponCenter",
+			"style": {
+				"navigationBarTitleText": "领券中心",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/myComplaint/myComplaint",
+			"style": {
+				"navigationBarTitleText": "投诉进度",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/complaintProgress/complaintProgress",
+			"style": {
+				"navigationBarTitleText": "进度详情",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"tabBar": {
@@ -195,18 +215,18 @@
 				"selectedIconPath": "static/images/index-active.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/setMeal/setMeal",
-				"iconPath": "static/images/setMeal.png",
-				"selectedIconPath": "static/images/setMeal-active.png",
-				"text": "套餐"
-			},
-			{
-				"pagePath": "pages/search/search",
-				"iconPath": "static/images/search.png",
-				"selectedIconPath": "static/images/search-active.png",
-				"text": "服务"
-			},
+			// {
+			// 	"pagePath": "pages/setMeal/setMeal",
+			// 	"iconPath": "static/images/setMeal.png",
+			// 	"selectedIconPath": "static/images/setMeal-active.png",
+			// 	"text": "套餐"
+			// },
+			// {
+			// 	"pagePath": "pages/search/search",
+			// 	"iconPath": "static/images/search.png",
+			// 	"selectedIconPath": "static/images/search-active.png",
+			// 	"text": "服务"
+			// },
 			{
 				"pagePath": "pages/my/my",
 				"iconPath": "static/images/my.png",

pages/affirmOrder/affirmOrder.vue

@@ -60,13 +60,13 @@
 						<input type="number" maxlength="11" placeholder="请输入联系电话" v-model="clientPhone" />
 					</view>
 				</view>
-				<view class="msg_box" @click="handleSelectTime">
+				<!-- <view class="msg_box" @click="handleSelectTime">
 					<view class="box_key">预计到店</view>
 					<view class="box_value" :class="{ color: !arriveTime }">{{ arriveTime ? arriveTime : '请选择预计到店时间' }}</view>
 					<view class="box_icon">
 						<img class="img3" src="../../static/index/right2.png" />
 					</view>
-				</view>
+				</view> -->
 
 				<uv-datetime-picker
 					ref="datetimePicker"
@@ -278,7 +278,7 @@ export default {
 
 		.header_title {
 			position: absolute;
-			top: 65rpx;
+			top: 76rpx;
 			left: 182rpx;
 			width: 50%;
 			color: #fff;
@@ -585,4 +585,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

pages/complaintProgress/complaintProgress.vue

@@ -0,0 +1,285 @@
+<template>
+	<view class="container">
+		<!-- 头部订单信息区域 -->
+		<view class="header">
+			<view class="header_title">
+				<view class="title_left">标题标题标题</view>
+				<view class="title_right">处理中</view>
+			</view>
+			<view class="header_info">
+				<view class="info_box">
+					<view class="box_key">订单号</view>
+					<view class="box_value">2626262626260660606</view>
+				</view>
+				<view class="info_box">
+					<view class="box_key">投诉单号</view>
+					<view class="box_value">6165165116506503063</view>
+				</view>
+				<view class="info_box">
+					<view class="box_key">反馈时间</view>
+					<view class="box_value">2023-05-25 15:15:15</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 进度详情区域 -->
+		<view class="progress">
+			<view class="progress_title">进度详情</view>
+			<!-- 进度条区域 -->
+			<view class="progress_body">
+				<!-- 每一个进度区域 -->
+				<view class="body_item" v-for="item in list" :key="item.id">
+					<view class="item_left">
+						<view class="left_top">{{ item.day }}</view>
+						<view class="left_bottom">{{ item.time }}</view>
+						<view class="left_dot"></view>
+					</view>
+					<view class="item_right">
+						<view class="right_top">{{ item.title }}</view>
+						<view class="right_bottom" v-for="(ele, index) in item.tags" :key="index">
+							{{ ele }}
+						</view>
+						<!-- 图片区域 -->
+						<view class="right_bottom" v-if="item.imgs">
+							<view class="bottom_key">图片：</view>
+							<view class="bottom_value">
+								<img mode="aspectFill" v-for="(img, index2) in item.imgs" :key="index2" :src="img" @click="() => handleClickImg(item, index2)" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部按钮区域 -->
+		<view class="foot">
+			<view class="btn_phone">服务热线</view>
+			<view class="btn_finish">处理完成</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			// 进度条列表数据
+			list: [
+				{
+					id: 1,
+					day: '08-04',
+					time: '12:13',
+					title: '处理完成',
+					tags: ['您的问题已处理']
+				},
+				{
+					id: 1,
+					day: '08-04',
+					time: '12:13',
+					title: '服务热线',
+					tags: ['问题跟进中，呼叫结果：已接通']
+				},
+				{
+					id: 1,
+					day: '08-04',
+					time: '12:13',
+					title: '问题提交成功',
+					tags: ['标题：xxxxxxxxxxxxxxxx', '问题描述：xxxxxxxxxxxxxxxx'],
+					imgs: [
+						'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+						'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+						'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+						'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+						'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+						'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375'
+					]
+				}
+			]
+		}
+	},
+	methods: {
+		// 点击进度条图片回调
+		handleClickImg(item, index) {
+			uni.previewImage({
+				urls: item.imgs,
+				current: index
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.container {
+	height: 100vh;
+	overflow-y: auto;
+	background-color: #f7f7f7;
+
+	.header {
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		height: 290rpx;
+		background-color: #fff;
+
+		.header_title {
+			display: flex;
+			align-items: center;
+			height: 89rpx;
+			font-size: 28rpx;
+			border-bottom: 1rpx solid #e5e5e5;
+
+			.title_left {
+				flex: 4;
+				font-weight: bold;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+			.title_right {
+				flex: 1;
+				text-align: end;
+				color: #a6a6a6;
+			}
+		}
+
+		.header_info {
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
+			height: 200rpx;
+			font-size: 28rpx;
+
+			.info_box {
+				display: flex;
+				align-items: center;
+
+				.box_key {
+					width: 130rpx;
+					color: #808080;
+				}
+				.box_value {
+					color: #383838;
+				}
+			}
+		}
+	}
+
+	.progress {
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		margin-top: 20rpx;
+		background-color: #fff;
+
+		.progress_title {
+			display: flex;
+			align-items: center;
+			height: 89rpx;
+			font-size: 28rpx;
+			font-weight: bold;
+			border-bottom: 1rpx solid #e5e5e5;
+		}
+
+		.progress_body {
+			padding-top: 22rpx;
+			padding-bottom: 47rpx;
+
+			.body_item {
+				display: flex;
+
+				.item_left {
+					position: relative;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					padding-right: 20rpx;
+					width: 100rpx;
+					border-right: 1rpx dotted #a6a6a6;
+
+					.left_top {
+						font-size: 28rpx;
+					}
+					.left_bottom {
+						font-size: 20rpx;
+					}
+
+					.left_dot {
+						position: absolute;
+						top: 18rpx;
+						right: -8rpx;
+						width: 16rpx;
+						height: 16rpx;
+						border-radius: 50%;
+						background-color: #096562;
+					}
+				}
+
+				.item_right {
+					flex: 1;
+					margin-top: -10rpx;
+					margin-left: 30rpx;
+					padding-bottom: 20rpx;
+					overflow: hidden;
+
+					.right_top {
+						margin-bottom: 8rpx;
+						font-weight: bold;
+						font-size: 28rpx;
+					}
+					.right_bottom {
+						display: flex;
+						margin-bottom: 12rpx;
+						font-size: 24rpx;
+						color: #808080;
+
+						.bottom_key {
+							width: 75rpx;
+						}
+
+						.bottom_value {
+							flex: 1;
+							display: grid;
+							grid-template-columns: repeat(auto-fill, 103rpx);
+							gap: 12rpx;
+
+							img {
+								width: 103rpx;
+								height: 122rpx;
+								border-radius: 5rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.foot {
+		display: flex;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 66rpx 30rpx;
+		font-size: 28rpx;
+
+		.btn_phone {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 330rpx;
+			height: 84rpx;
+			color: #096562;
+			border-radius: 22rpx;
+			border: 1rpx solid #096562;
+		}
+		.btn_finish {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 330rpx;
+			height: 84rpx;
+			color: #fff;
+			border-radius: 22rpx;
+			background-color: #096562;
+		}
+	}
+}
+</style>

pages/couponCenter/couponCenter.vue

@@ -0,0 +1,277 @@
+<template>
+	<view class="container">
+		<!-- 优惠券列表区域 -->
+		<view class="body">
+			<!-- 每一张优惠券区域 -->
+			<view class="body_item" v-for="item in list" :key="item.id">
+				<img src="../../static/my/couponTitle.png" />
+				<view class="item_type" v-if="item.type === 1">折扣卷</view>
+				<view class="item_type" v-if="item.type === 2">代金卷</view>
+				<view class="item_box">
+					<view class="box_left">
+						<view class="left_title">{{ item.name }}</view>
+						<view class="left_time">{{ item.time }} 可领取</view>
+						<view class="left_tags">
+							<view class="tag" v-for="(ele, index) in item.tags" :key="index" @click="handleClickTag(ele)">
+								{{ ele }}
+								<img v-if="ele === '指定民宿'" src="../../static/index/right2.png" />
+							</view>
+						</view>
+					</view>
+					<view class="box_right">
+						<view class="right_info">
+							<view class="info_top">{{ item.info }}</view>
+							<view class="info_bottom">满200可用</view>
+							<view class="info_btn" v-if="item.isFull">立即领取</view>
+							<view class="info_btn2" v-else>已领取</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 指定民宿弹窗区域 -->
+		<uni-popup ref="popup" type="center" :is-mask-click="false">
+			<view class="popup_body">
+				<view class="popup_header">
+					<img src="../../static/my/popup_title.png" />
+					<view class="header_title">指定民宿</view>
+					<img src="../../static/my/popup_title.png" />
+				</view>
+				<view class="popup_center">民宿名称，民宿名称，民宿名称</view>
+				<view class="popup_btn" @click="handleClose">我知道了</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			// 优惠券列表数据
+			list: [
+				{
+					id: 1,
+					name: '7.5折折扣卷',
+					type: 1,
+					info: '7.5折',
+					isFull: false,
+					time: '2023.09.01  12:00 - 2023.10.01  12:00',
+					tags: ['可通用', '全民宿']
+				},
+				{
+					id: 2,
+					name: '20元代金券',
+					type: 2,
+					info: '¥20',
+					isFull: true,
+					time: '2023.09.01  12:00 - 2023.10.01  12:00',
+					tags: ['可通用', '指定民宿']
+				},
+				{
+					id: 3,
+					name: '7.5折折扣卷',
+					type: 1,
+					info: '7.5折',
+					isFull: false,
+					time: '2023.09.01  12:00 - 2023.10.01  12:00',
+					tags: ['可通用', '全民宿']
+				}
+			]
+		}
+	},
+	methods: {
+		// 点击指定民宿tag回调
+		handleClickTag(ele) {
+			if (ele === '指定民宿') {
+				this.$refs.popup.open()
+			}
+		},
+		// 点击弹窗我知道了按钮回调
+		handleClose() {
+			this.$refs.popup.close()
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	box-sizing: border-box;
+	padding: 20rpx 30rpx;
+	height: 100vh;
+	overflow-y: auto;
+	background-color: #f2f3f5;
+
+	.body {
+		.body_item {
+			position: relative;
+			margin-bottom: 20rpx;
+			padding-bottom: 22rpx;
+			width: 690rpx;
+			border-radius: 15rpx;
+			background-color: #fff;
+
+			img {
+				width: 100rpx;
+				height: 36rpx;
+			}
+
+			.item_type {
+				position: absolute;
+				top: 0;
+				left: 14rpx;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #fff;
+			}
+
+			.item_box {
+				padding: 0 25rpx;
+				display: flex;
+
+				.box_left {
+					flex: 6;
+					overflow: hidden;
+
+					.left_title {
+						margin: 12rpx 0;
+						font-size: 36rpx;
+						font-weight: bold;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.left_time {
+						display: flex;
+						flex-wrap: wrap;
+						color: #808080;
+						font-size: 20rpx;
+					}
+
+					.left_tags {
+						display: flex;
+						align-items: center;
+						margin-top: 20rpx;
+						color: #808080;
+						font-size: 20rpx;
+
+						.tag {
+							display: flex;
+							align-items: center;
+							margin-right: 44rpx;
+
+							img {
+								margin-top: 4rpx;
+								margin-left: 4rpx;
+								width: 28rpx;
+								height: 28rpx;
+							}
+						}
+					}
+				}
+
+				.box_right {
+					flex: 2;
+					display: flex;
+
+					.right_info {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						align-items: flex-end;
+						width: 100rpx;
+						color: #ff5733;
+
+						.info_top {
+							margin-top: 10rpx;
+							font-size: 36rpx;
+						}
+
+						.info_bottom {
+							margin-top: 10rpx;
+							font-size: 20rpx;
+						}
+
+						.info_btn {
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							margin-top: 25rpx;
+							width: 122rpx;
+							height: 48rpx;
+							color: #fff;
+							font-size: 24rpx;
+							border-radius: 6rpx;
+							background-color: #096562;
+						}
+
+						.info_btn2 {
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							margin-top: 25rpx;
+							width: 122rpx;
+							height: 48rpx;
+							color: #fff;
+							font-size: 24rpx;
+							border-radius: 6rpx;
+							background-color: #cccccc;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.popup_body {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 481rpx;
+		height: 404rpx;
+		border-radius: 22.5rpx;
+		background-color: #fff;
+
+		.popup_header {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 123rpx;
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #0f194d;
+
+			img {
+				width: 16rpx;
+				height: 16rpx;
+			}
+
+			.header_title {
+				margin: 0 10rpx;
+			}
+		}
+
+		.popup_center {
+			height: 135rpx;
+			color: rgba(15, 25, 77, 0.6);
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+
+		.popup_btn {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 396rpx;
+			height: 76rpx;
+			color: #fff;
+			font-size: 26rpx;
+			border-radius: 43rpx;
+			background: linear-gradient(90deg, #0bc196 0%, #096562 100%);
+		}
+	}
+}
+</style>

pages/detail/detail.vue

@@ -2,10 +2,18 @@
 	<view class="container" :style="'overflow:' + (showPage ? 'hidden' : 'visible')" v-if="info">
 		<!-- 顶部民宿图片区域 -->
 		<view class="banner">
-			<img class="img" mode="aspectFill" :src="info.hotelFileInfoList[0].url" />
+			<swiper autoplay circular class="swiper">
+				<swiper-item class="swiper_item" v-for="item in info.hotelFileInfoList" :key="item.id">
+					<img mode="aspectFill" class="img" :src="item.url" />
+				</swiper-item>
+			</swiper>
 			<view class="slogan">
 				<img src="../../static/index/slogan.png" />
 			</view>
+			<view class="full" v-if="info.linkProUrl" @click="handleGoPull(info.linkProUrl)">
+				<img src="../../static/index/full.png" />
+				720°全景
+			</view>
 		</view>
 
 		<!-- 民宿详细信息区域 -->
@@ -71,6 +79,7 @@
 				color="#096562"
 				confirmColor="#096562"
 				:startDate="earlyTime"
+				:endDate="lateTime"
 				@confirm="handleConfirm"
 			/>
 
@@ -194,7 +203,9 @@ export default {
 			// 离店时间 YYYY-MM-DD
 			endTime: '',
 			// 日历可以选择的最早日期
-			earlyTime: ''
+			earlyTime: '',
+			// 日历可以选择的最晚日期
+			lateTime: ''
 		}
 	},
 	onLoad(options) {
@@ -222,6 +233,9 @@ export default {
 			if (res.code === 200) {
 				this.info = res.data.data
 				this.list = res.data.data.houseList
+				uni.setNavigationBarTitle({
+					title: res.data.data.hotel_name
+				})
 			}
 		},
 		// 选择日期确定回调
@@ -365,12 +379,25 @@ export default {
 		},
 		// 获取今明两天的日期 YYYY-MM-DD
 		getTimes() {
+			// 今天
 			let today = new Date()
+			// 明天
 			let tomorrow = new Date(today.getTime() + 24 * 60 * 60 * 1000)
+			let late = new Date(today.getTime() + 24 * 60 * 60 * 1000 * 14)
+
 			this.startTime = `${today.getFullYear()}-${(today.getMonth() + 1).toString().padStart(2, 0)}-${today.getDate().toString().padStart(2, 0)}`
 			this.endTime = `${tomorrow.getFullYear()}-${(tomorrow.getMonth() + 1).toString().padStart(2, 0)}-${tomorrow.getDate().toString().padStart(2, 0)}`
 			this.dayList = [this.startTime, this.endTime]
+
 			this.earlyTime = this.startTime
+			this.lateTime = `${late.getFullYear()}-${(late.getMonth() + 1).toString().padStart(2, 0)}-${late.getDate().toString().padStart(2, 0)}`
+		},
+		handleGoPull(linkProUrl) {
+			let temURL = linkProUrl.slice(22)
+			let url = 'https://f10mfe54bri.720yun.com' + temURL
+			uni.navigateTo({
+				url: `/pages/web/web?url=${url}`
+			})
 		}
 	}
 }
@@ -391,6 +418,20 @@ export default {
 		width: 750rpx;
 		height: 422rpx;
 
+		.swiper {
+			height: 422rpx;
+
+			.swiper_item {
+				width: 100%;
+				height: 100%;
+
+				.img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
 		.img {
 			width: 100%;
 			height: 100%;
@@ -412,6 +453,26 @@ export default {
 				height: 44rpx;
 			}
 		}
+
+		.full {
+			position: absolute;
+			top: 13rpx;
+			right: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-around;
+			width: 173rpx;
+			height: 60rpx;
+			color: #fff;
+			font-size: 24rpx;
+			border-radius: 11rpx;
+			background-color: rgba(0, 0, 0, 0.5);
+
+			img {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
 	}
 
 	.detail {
@@ -863,4 +924,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

pages/detailInfo/detailInfo.vue

@@ -150,7 +150,7 @@ export default {
 
 		.header_title {
 			position: absolute;
-			top: 65rpx;
+			top: 76rpx;
 			left: 308rpx;
 			color: #fff;
 			font-size: 28rpx;

pages/home/home.vue

@@ -1,59 +1,132 @@
 <template>
 	<view class="container">
 		<!-- 搜索框区域 -->
-		<uv-row custom-style="margin: 10px 0px" gutter="10">
-			<picker @change="bindPickerChange" range-key="name" :value="placeIndex" :range="placeList">
-				<view class="address">
-					<view class="address_text">{{ placeList[placeIndex].name }}</view>
-					<img src="../../static/index/bottom.png" />
+		<view class="content">
+			<uv-row custom-style="margin: 10px 0px" gutter="10">
+				<picker @change="bindPickerChange" range-key="name" :value="placeIndex" :range="placeList">
+					<view class="address">
+						<view class="address_text">{{ placeList[placeIndex].name }}</view>
+						<img src="../../static/index/bottom.png" />
+					</view>
+				</picker>
+
+				<view class="search">
+					<view class="add">
+						<image class="img" src="../../static/index/search.png" mode="aspectFit"></image>
+					</view>
+					<input class="inp" type="text" v-model="keywords" placeholder="请输入关键字搜索" />
+					<view class="btnSearch" @click="searchHandler">搜索</view>
+				</view>
+			</uv-row>
+		</view>
+
+		<scroll-view scroll-y class="main" @scroll="handleScroll" @scrolltolower="handleRefresh">
+			<!-- 添加一层view解决 css属性 sticky 不生效问题 -->
+			<view>
+				<!-- 图标区域 -->
+				<view class="icons">
+					<view class="icon_item" @click="handleTest">
+						<view class="item_top color">
+							<img src="../../static/index/icon.png" />
+						</view>
+						<view class="item_bottom">推文</view>
+					</view>
+
+					<view class="icon_item" @click="handleTest">
+						<view class="item_top color2">
+							<img class="img2" src="../../static/index/icon2.png" />
+						</view>
+						<view class="item_bottom">周边</view>
+					</view>
+
+					<view class="icon_item" @click="handleGoSetMeal">
+						<view class="item_top color3">
+							<img class="img3" src="../../static/index/icon3.png" />
+						</view>
+						<view class="item_bottom">套餐</view>
+					</view>
+
+					<view class="icon_item" @click="handleTest">
+						<view class="item_top color4">
+							<img src="../../static/index/icon4.png" />
+						</view>
+						<view class="item_bottom">招商</view>
+					</view>
+					<view class="icon_item" @click="handleTest">
+						<view class="item_top color5">
+							<img src="../../static/index/icon5.png" />
+						</view>
+						<view class="item_bottom">其他</view>
+					</view>
 				</view>
-			</picker>
 
-			<view class="search">
-				<view class="add">
-					<image class="img" src="../../static/index/search.png" mode="aspectFit"></image>
+				<!-- 分段器区域 -->
+				<view class="control" :class="{ sticky: isSticky }">
+					<uni-segmented-control :current="current" :values="items" style-type="text" active-color="#096562" @clickItem="onClickItem" />
 				</view>
-				<input class="inp" type="text" v-model="keywords" placeholder="请输入关键字搜索" />
-				<view class="btnSearch" @click="searchHandler">搜索</view>
-			</view>
-		</uv-row>
-
-		<!-- 名宿列表区域 -->
-		<view class="body" v-if="hotelList.length">
-			<!-- 每一个名宿区域 -->
-			<view class="item" v-for="item in hotelList" :key="item.id" @click="goPageDetail(item)">
-				<image class="item-img" :src="item.coverImg" mode="scaleToFill"></image>
-				<view class="descrition">
-					<text class="title">{{ item.hotel_name }}</text>
-					<text class="type">{{ item.hTypeName }}</text>
-					<text class="distance" v-if="showdDistance">距您直线{{ item.distance }}公里</text>
-					<view class="detail">
-						<img class="img" src="../../static/index/hotel.png" />
-						<view class="price">
-							<text class="txt1">¥{{ item.min_price }}</text>
-							<text class="txt2">起</text>
+
+				<!-- 民宿列表 -->
+				<view class="box" v-if="hotelList.length">
+					<!-- 列表区域 -->
+					<view class="box_body">
+						<!-- 每一个民宿区域 -->
+						<view class="box_item" v-for="item in hotelList" :key="item.id" @click="goPageDetail(item)">
+							<img mode="aspectFill" :src="item.coverImg" />
+							<view class="item_name">{{ item.hotel_name }}</view>
+							<view class="item_rate">
+								<view class="rate_left">{{ item.scoreHotel || '5.0' }}</view>
+								<!-- <view class="rate_right">超棒</view> -->
+							</view>
+							<view class="item_distance">距您直线{{ item.distance }}公里</view>
+							<view class="item_info">
+								<view class="info_count">剩{{ item.roomNumber }}间</view>
+								<view class="info_price">
+									¥{{ item.min_price }}
+									<text>起</text>
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
+
+				<!-- 没有数据时展示的页面 -->
+				<view class="noData" v-else>
+					<img src="../../static/images/noData.png" />
+					暂无数据
+				</view>
 			</view>
-		</view>
+		</scroll-view>
 
-		<!-- 没有数据时展示的页面 -->
-		<view class="noData" v-else>
-			<img src="../../static/images/noData.png" />
-			暂无数据
-		</view>
+		<!-- 选择乡镇弹窗区域 -->
+		<uni-popup ref="popup" :is-mask-click="false" type="center">
+			<view class="popup_body">
+				<view class="body_header">
+					<img src="../../static/my/popup_title.png" />
+					<view class="header_title">请选择乡镇</view>
+					<img src="../../static/my/popup_title.png" />
 
-		<!-- 领取优惠券弹窗区域 -->
-		<uv-popup ref="popup" mode="center" :closeOnClickOverlay="false" bgColor="none">
-			<view class="popupClass">
-				<img src="../../static/index/popup_bg.png" />
-				<!-- 立即前往区域 -->
-				<view class="btn_go" @click="handleGo"></view>
-				<!-- 关闭按钮区域 -->
-				<view class="btn_close" @click="handleClose"></view>
+					<view class="header_jump" @click="handleChooseTown()">跳过</view>
+				</view>
+				<view class="body_content">
+					<view class="content_box" v-for="(item, index) in popList" :key="index" @click="handleChooseTown(item.name)">
+						<img v-if="index === 0" src="https://chtech.ncjti.edu.cn/hotelReservation/image/1.png" mode="aspectFill" />
+						<img v-if="index === 1" src="https://chtech.ncjti.edu.cn/hotelReservation/image/2.png" mode="aspectFill" />
+						<img v-if="index === 2" src="https://chtech.ncjti.edu.cn/hotelReservation/image/3.png" mode="aspectFill" />
+						<img v-if="index === 3" src="https://chtech.ncjti.edu.cn/hotelReservation/image/4.png" mode="aspectFill" />
+						<img v-if="index === 4" src="https://chtech.ncjti.edu.cn/hotelReservation/image/5.png" mode="aspectFill" />
+						<img v-if="index === 5" src="https://chtech.ncjti.edu.cn/hotelReservation/image/6.png" mode="aspectFill" />
+						<img v-if="index === 6" src="https://chtech.ncjti.edu.cn/hotelReservation/image/7.png" mode="aspectFill" />
+						<img v-if="index === 7" src="https://chtech.ncjti.edu.cn/hotelReservation/image/8.png" mode="aspectFill" />
+						<img v-if="index === 8" src="https://chtech.ncjti.edu.cn/hotelReservation/image/9.png" mode="aspectFill" />
+						<img v-if="index === 9" src="https://chtech.ncjti.edu.cn/hotelReservation/image/10.png" mode="aspectFill" />
+						<img v-if="index === 10" src="https://chtech.ncjti.edu.cn/hotelReservation/image/11.png" mode="aspectFill" />
+						<img v-if="index === 11" src="https://chtech.ncjti.edu.cn/hotelReservation/image/12.png" mode="aspectFill" />
+						<view class="box_town">{{ item.name }}</view>
+						<view class="box_count">剩{{ item.residueNumber }}间</view>
+					</view>
+				</view>
 			</view>
-		</uv-popup>
+		</uni-popup>
 	</view>
 </template>
 
@@ -61,12 +134,10 @@
 export default {
 	data() {
 		return {
-			// 是否显示距离差
-			showdDistance: false,
-			// 搜索框绑定数据
-			keywords: '',
-			// 民宿列表数组
-			hotelList: [],
+			// 分段器数组
+			items: ['白金级', '金宿级', '银宿级'],
+			// 当前索引
+			current: 0,
 			// 地区数组
 			placeList: [
 				{
@@ -75,24 +146,35 @@ export default {
 			],
 			// 当前选择地区索引
 			placeIndex: 0,
+			// 搜索框绑定数据
+			keywords: '',
+			// 是否显示距离差
+			showdDistance: false,
+			// 用户定位经度
+			myLng: 0,
+			// 用户定位纬度
+			myLat: 0,
 			// 当前页
 			page: 1,
 			// 每页多少条
 			rows: 6,
 			// 总条数
 			total: null,
-			// 用户定位经度
-			myLng: 0,
-			// 用户定位纬度
-			myLat: 0
+			// 民宿列表数组
+			hotelList: [],
+			// 当前乡镇
+			town: '',
+			// 分段器是否吸顶
+			isSticky: false,
+			// 选择乡镇弹窗数据
+			popList: []
 		}
 	},
 	onLoad() {
-		this.getLocation()
-		this.getTownList()
-		// this.$refs.popup.open()
+		this.openPop()
+		this.getResidueCount()
 	},
-	// 页面下拉回调
+	// 页面下拉刷新回调
 	onPullDownRefresh() {
 		setTimeout(() => {
 			this.hotelList = []
@@ -101,19 +183,70 @@ export default {
 			uni.stopPullDownRefresh()
 		}, 2000)
 	},
-	// 页面下拉到底部回调
-	onReachBottom() {
-		if (this.hotelList.length < this.total) {
-			this.page++
-			this.getHotelList()
-		} else {
-			uni.showToast({
-				title: '没有更多数据了',
-				icon: 'none'
-			})
-		}
-	},
 	methods: {
+		// 弹窗点击选择乡镇地址回调
+		handleChooseTown(name) {
+			if (!name) {
+				this.town = '靖安县'
+			} else {
+				this.town = name
+			}
+			uni.setNavigationBarTitle({
+				title: this.town
+			})
+			this.$refs.popup.close()
+			uni.showTabBar()
+			this.getTownList()
+			this.getLocation()
+		},
+		// 打开选择乡镇弹窗回调
+		openPop() {
+			this.$refs.popup.open()
+			uni.hideTabBar()
+		},
+		handleGoSetMeal() {
+			uni.navigateTo({
+				url: '/pages/setMeal/setMeal'
+			})
+		},
+		// 页面上拉到底部回调
+		handleRefresh() {
+			if (this.hotelList.length < this.total) {
+				this.page++
+				this.getHotelList()
+			} else {
+				uni.showToast({
+					title: '没有更多数据了',
+					icon: 'none'
+				})
+			}
+		},
+		// 滚动条滚动回调
+		handleScroll(e) {
+			if (e.detail.scrollTop > 90) {
+				this.isSticky = true
+			} else {
+				this.isSticky = false
+			}
+		},
+		// 获取乡镇剩余房间数
+		async getResidueCount() {
+			const res = await this.$myRequest({
+				url: '/mhotel/ahpgetResidueCount.action'
+			})
+			// console.log(res)
+			if (res.code === 200) {
+				let residueNumber = 0
+				res.data.forEach((ele) => {
+					residueNumber += ele.residueNumber
+				})
+				res.data.unshift({
+					name: '靖安县',
+					residueNumber
+				})
+				this.popList = res.data
+			}
+		},
 		// 获取乡镇集合
 		async getTownList() {
 			const res = await this.$myRequest({
@@ -126,6 +259,13 @@ export default {
 			// console.log(res)
 			if (res.code === 200) {
 				this.placeList = [...this.placeList, ...res.data]
+				let temindex
+				this.placeList.forEach((ele, index) => {
+					if (ele.name === this.town) {
+						temindex = index
+					}
+				})
+				this.placeIndex = temindex
 			}
 		},
 		// 获取用户当前位置
@@ -188,6 +328,14 @@ export default {
 		},
 		// 获取民宿列表
 		async getHotelList() {
+			let type
+			if (this.current === 0) {
+				type = 3
+			} else if (this.current === 1) {
+				type = 2
+			} else if (this.current === 2) {
+				type = 1
+			}
 			const res = await this.$myRequest({
 				url: '/mhotel/ahphomePage.action',
 				data: {
@@ -195,7 +343,8 @@ export default {
 					page: this.page,
 					rows: this.rows,
 					hotel_township: this.placeList[this.placeIndex].id || '',
-					userId: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo').id : ''
+					userId: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo').id : '',
+					type
 				}
 			})
 			// console.log(res)
@@ -213,6 +362,43 @@ export default {
 				}
 			}
 		},
+		// 点击每一个民宿卡片回调
+		goPageDetail(item) {
+			uni.navigateTo({
+				url: `/pages/detail/detail?id=${item.id}&distance=${item.distance}`
+			})
+		},
+		// 选择地区时的回调
+		bindPickerChange(e) {
+			this.placeIndex = e.detail.value
+			uni.setNavigationBarTitle({
+				title: this.placeList[this.placeIndex].name
+			})
+			this.hotelList = []
+			this.page = 1
+			this.getHotelList()
+		},
+		// 搜索按钮点击回调
+		searchHandler() {
+			this.hotelList = []
+			this.page = 1
+			this.getHotelList()
+		},
+		onClickItem(e) {
+			if (this.current !== e.currentIndex) {
+				this.current = e.currentIndex
+				this.hotelList = []
+				this.page = 1
+				this.getHotelList()
+			}
+		},
+		handleTest() {
+			uni.showToast({
+				title: '功能开发中',
+				icon: 'none',
+				mask: true
+			})
+		},
 		// 计算两个点之间的距离
 		calculateDistance(lat, lng) {
 			let centerLat = lat
@@ -227,34 +413,6 @@ export default {
 			let res = (distance / 1000).toFixed(2) * 1
 
 			return res
-		},
-
-		// 搜索按钮点击回调
-		searchHandler() {
-			this.hotelList = []
-			this.page = 1
-			this.getHotelList()
-		},
-		// 点击每一个名宿卡片回调
-		goPageDetail(item) {
-			uni.navigateTo({
-				url: `/pages/detail/detail?id=${item.id}&distance=${item.distance}`
-			})
-		},
-		// 选择地区时的回调
-		bindPickerChange(e) {
-			this.placeIndex = e.detail.value
-			this.hotelList = []
-			this.page = 1
-			this.getHotelList()
-		},
-		// 立即前往按钮回调
-		handleGo() {
-			console.log(111)
-		},
-		// 优惠券弹窗关闭按钮回调
-		handleClose() {
-			this.$refs.popup.close()
 		}
 	}
 }
@@ -265,204 +423,336 @@ export default {
 	display: flex;
 	flex-direction: column;
 	width: 750rpx;
-	min-height: 100vh;
+	height: 100vh;
 	padding: 0 30rpx;
 	box-sizing: border-box;
+	overflow: hidden;
 	background-color: #f7f7f7;
 
-	.address {
-		display: flex;
-		width: 152rpx;
-		font-size: 28rpx;
-
-		.address_text {
-			width: 104rpx;
-			text-align: center;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		}
+	.content {
+		position: sticky;
+		background-color: #f7f7f7;
 
-		img {
-			width: 48rpx;
-			height: 48rpx;
-		}
-	}
+		.address {
+			display: flex;
+			width: 152rpx;
+			font-size: 28rpx;
 
-	.search {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		width: 538rpx;
-		height: 80rpx;
-		opacity: 1;
-		border-radius: 70px;
-		background-color: #fff;
+			.address_text {
+				width: 104rpx;
+				text-align: center;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			}
+
+			img {
+				width: 48rpx;
+				height: 48rpx;
+			}
+		}
 
-		.add {
+		.search {
 			display: flex;
-			justify-content: center;
+			justify-content: space-between;
 			align-items: center;
-			margin-left: 10rpx;
-			width: 60rpx;
-			font-size: 50rpx;
-			height: 60rpx;
-			line-height: 60rpx;
-			color: rgba(30, 125, 251, 1);
-
-			.img {
-				width: 30rpx;
-				height: 30rpx;
+			width: 538rpx;
+			height: 80rpx;
+			opacity: 1;
+			border-radius: 70px;
+			background-color: #fff;
+
+			.add {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-left: 10rpx;
+				width: 60rpx;
+				font-size: 50rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				color: rgba(30, 125, 251, 1);
+
+				.img {
+					width: 30rpx;
+					height: 30rpx;
+				}
 			}
-		}
 
-		.inp {
-			height: 60rpx;
-			line-height: 60rpx;
-			flex-grow: 1;
-			font-size: 28rpx;
-		}
+			.inp {
+				height: 60rpx;
+				line-height: 60rpx;
+				flex-grow: 1;
+				font-size: 28rpx;
+			}
 
-		.btnSearch {
-			width: 100rpx;
-			text-align: center;
-			margin-right: 10rpx;
-			height: 60rpx;
-			line-height: 60rpx;
-			opacity: 1;
-			font-size: 28rpx;
-			font-weight: 400;
-			height: 2rem;
-			color: #096562;
+			.btnSearch {
+				width: 100rpx;
+				text-align: center;
+				margin-right: 10rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				opacity: 1;
+				font-size: 28rpx;
+				font-weight: 400;
+				height: 2rem;
+				color: #096562;
+			}
 		}
 	}
 
-	.body {
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-
-		.item {
-			width: 335rpx;
-			box-sizing: border-box;
-			margin-bottom: 20rpx;
+	.main {
+		margin-top: 10rpx;
+		height: calc(100vh - 120rpx);
 
-			.item-img {
-				width: 100%;
-				height: 223rpx;
-				border-radius: 18rpx 18rpx 0 0;
-				box-sizing: border-box;
-			}
+		.icons {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+			height: 158rpx;
+			border-radius: 12rpx;
+			background-color: #fff;
 
-			.descrition {
+			.icon_item {
 				display: flex;
 				flex-direction: column;
-				width: 100%;
-				border-radius: 0 0 18rpx 18rpx;
-				box-sizing: border-box;
-				background: rgba(255, 255, 255, 1);
-				margin-top: -10rpx;
+				align-items: center;
+				width: 20%;
 
-				.title {
-					font-size: 28rpx;
-					font-weight: 600;
-					padding: 20rpx 20rpx 10rpx;
-					color: rgba(0, 0, 0, 1);
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
+				.item_top {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 60rpx;
+					height: 60rpx;
+					border-radius: 50%;
+
+					img {
+						width: 28rpx;
+						height: 27rpx;
+					}
+
+					.img2 {
+						width: 40rpx;
+						height: 25.5rpx;
+					}
+					.img3 {
+						width: 31rpx;
+						height: 21rpx;
+					}
 				}
 
-				.type {
-					padding: 5rpx 20rpx;
-					height: 40rpx;
-					font-size: 24rpx;
-					color: #a6a6a6;
+				.color {
+					background-color: #d8e8e8;
 				}
 
-				.distance {
-					padding: 10rpx 20rpx;
-					font-size: 24rpx;
-					color: #a6a6a6;
+				.color2 {
+					background-color: #c2f2d5;
+				}
+				.color3 {
+					background-color: #f7d4ba;
+				}
+				.color4 {
+					background-color: #fae1e2;
+				}
+				.color5 {
+					background-color: #d0e0f2;
 				}
 
-				.detail {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-between;
-					align-items: center;
-					padding: 0 20rpx 20rpx 20rpx;
-					color: rgba(0, 0, 0, 1);
+				.item_bottom {
+					margin-top: 6rpx;
+					font-size: 28rpx;
+				}
+			}
+		}
 
-					.img {
-						width: 40rpx;
-						height: 40rpx;
+		.control {
+			margin: 20rpx 0;
+			height: 90rpx;
+			border-radius: 8rpx;
+			background-color: #fff;
+		}
+
+		.sticky {
+			position: sticky;
+			top: 0;
+			border-radius: 0;
+		}
+
+		.box {
+			.box_body {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				.box_item {
+					margin-bottom: 20rpx;
+					width: 335rpx;
+					height: 446rpx;
+					border-radius: 10rpx;
+					background-color: #fff;
+
+					img {
+						width: 335rpx;
+						height: 223rpx;
+						border-radius: 10rpx 10rpx 0 0;
 					}
 
-					.price {
-						.txt1 {
-							font-size: 36rpx;
-							font-weight: 600;
-							color: rgba(255, 87, 51, 1);
+					.item_name {
+						margin-left: 22rpx;
+						margin-top: 10rpx;
+						line-height: 55rpx;
+						font-size: 28rpx;
+						font-weight: bold;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.item_rate {
+						display: flex;
+						align-items: center;
+						margin-left: 22rpx;
+						font-size: 24rpx;
+
+						.rate_left {
+							padding: 0 12rpx;
+							color: #fff;
+							// border-radius: 32rpx 0 0 32rpx;
+							border-radius: 32rpx;
+							background-color: #096562;
 						}
 
-						.txt2 {
-							font-size: 24rpx;
-							font-weight: 400;
-							color: #a6a6a6;
+						.rate_right {
+							padding: 0 16rpx 0 7rpx;
+							color: #096562;
+							border-radius: 0 32rpx 32rpx 0;
+							background-color: #dff2f2;
 						}
 					}
 
-					.score {
+					.item_distance {
+						margin-top: 10rpx;
+						margin-left: 22rpx;
+						color: #a6a6a6;
 						font-size: 24rpx;
-						font-weight: 400;
-						padding-top: 10rpx;
-						color: rgba(166, 166, 166, 1);
+					}
+
+					.item_info {
+						box-sizing: border-box;
+						padding: 0 30rpx 0 25rpx;
+						margin-top: 16rpx;
+						display: flex;
+						justify-content: space-between;
+						color: #ff5733;
+
+						.info_count {
+							font-size: 24rpx;
+						}
+
+						.info_price {
+							margin-top: -5rpx;
+							font-size: 36rpx;
+							font-weight: bold;
+
+							text {
+								color: #a6a6a6;
+								font-size: 24rpx;
+								font-weight: 400;
+							}
+						}
 					}
 				}
 			}
 		}
-	}
 
-	.noData {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
+		.noData {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
 
-		img {
-			margin-top: 150rpx;
-			width: 600rpx;
-			height: 600rpx;
+			img {
+				margin-top: 150rpx;
+				width: 400rpx;
+				height: 400rpx;
+			}
 		}
 	}
 
-	.popupClass {
-		position: relative;
-		width: 481rpx;
-		height: 764rpx;
+	.popup_body {
+		width: 618rpx;
+		height: 687rpx;
+		border-radius: 21rpx;
+		background-color: #fff;
 
-		img {
-			width: 100%;
-			height: 665rpx;
-		}
+		.body_header {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: relative;
+			height: 113rpx;
+			border-bottom: 1rpx solid #e6e6e6;
 
-		.btn_go {
-			position: absolute;
-			top: 415rpx;
-			left: 40rpx;
-			width: 396rpx;
-			height: 76rpx;
-			border-radius: 43rpx;
+			img {
+				width: 16rpx;
+				height: 16rpx;
+			}
+
+			.header_title {
+				margin: 0 10rpx;
+				font-size: 34rpx;
+				font-weight: bold;
+				color: #0f194d;
+			}
+
+			.header_jump {
+				position: absolute;
+				top: 38rpx;
+				right: 30rpx;
+				font-size: 28rpx;
+				color: #a6a6a6;
+			}
 		}
+		.body_content {
+			display: grid;
+			grid-template-columns: repeat(auto-fill, 160rpx);
+			gap: 28rpx;
+			box-sizing: border-box;
+			padding: 26rpx 40rpx 50rpx;
+
+			.content_box {
+				position: relative;
+				width: 160rpx;
+				height: 105rpx;
+				color: #fff;
+				border-radius: 10rpx;
+
+				img {
+					width: 160rpx;
+					height: 105rpx;
+					border-radius: 10rpx;
+				}
+
+				.box_town {
+					position: absolute;
+					top: 17rpx;
+					left: 0;
+					right: 0;
+					text-align: center;
+					font-size: 28rpx;
+					font-weight: bold;
+				}
 
-		.btn_close {
-			position: absolute;
-			top: 586rpx;
-			left: 212rpx;
-			width: 58rpx;
-			height: 58rpx;
-			border-radius: 50%;
+				.box_count {
+					position: absolute;
+					top: 57rpx;
+					left: 0;
+					right: 0;
+					text-align: center;
+					font-size: 18rpx;
+				}
+			}
 		}
 	}
 }

pages/home2/home2.vue

@@ -0,0 +1,469 @@
+<template>
+	<view class="container">
+		<!-- 搜索框区域 -->
+		<uv-row custom-style="margin: 10px 0px" gutter="10">
+			<picker @change="bindPickerChange" range-key="name" :value="placeIndex" :range="placeList">
+				<view class="address">
+					<view class="address_text">{{ placeList[placeIndex].name }}</view>
+					<img src="../../static/index/bottom.png" />
+				</view>
+			</picker>
+
+			<view class="search">
+				<view class="add">
+					<image class="img" src="../../static/index/search.png" mode="aspectFit"></image>
+				</view>
+				<input class="inp" type="text" v-model="keywords" placeholder="请输入关键字搜索" />
+				<view class="btnSearch" @click="searchHandler">搜索</view>
+			</view>
+		</uv-row>
+
+		<!-- 名宿列表区域 -->
+		<view class="body" v-if="hotelList.length">
+			<!-- 每一个名宿区域 -->
+			<view class="item" v-for="item in hotelList" :key="item.id" @click="goPageDetail(item)">
+				<image class="item-img" :src="item.coverImg" mode="scaleToFill"></image>
+				<view class="descrition">
+					<text class="title">{{ item.hotel_name }}</text>
+					<text class="type">{{ item.hTypeName }}</text>
+					<text class="distance" v-if="showdDistance">距您直线{{ item.distance }}公里</text>
+					<view class="detail">
+						<img class="img" src="../../static/index/hotel.png" />
+						<view class="price">
+							<text class="txt1">¥{{ item.min_price }}</text>
+							<text class="txt2">起</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 没有数据时展示的页面 -->
+		<view class="noData" v-else>
+			<img src="../../static/images/noData.png" />
+			暂无数据
+		</view>
+
+		<!-- 领取优惠券弹窗区域 -->
+		<uv-popup ref="popup" mode="center" :closeOnClickOverlay="false" bgColor="none">
+			<view class="popupClass">
+				<img src="../../static/index/popup_bg.png" />
+				<!-- 立即前往区域 -->
+				<view class="btn_go" @click="handleGo"></view>
+				<!-- 关闭按钮区域 -->
+				<view class="btn_close" @click="handleClose"></view>
+			</view>
+		</uv-popup>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			// 是否显示距离差
+			showdDistance: false,
+			// 搜索框绑定数据
+			keywords: '',
+			// 民宿列表数组
+			hotelList: [],
+			// 地区数组
+			placeList: [
+				{
+					name: '靖安县'
+				}
+			],
+			// 当前选择地区索引
+			placeIndex: 0,
+			// 当前页
+			page: 1,
+			// 每页多少条
+			rows: 6,
+			// 总条数
+			total: null,
+			// 用户定位经度
+			myLng: 0,
+			// 用户定位纬度
+			myLat: 0
+		}
+	},
+	onLoad() {
+		this.getLocation()
+		this.getTownList()
+		// this.$refs.popup.open()
+	},
+	// 页面下拉回调
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.hotelList = []
+			this.page = 1
+			this.getLocation()
+			uni.stopPullDownRefresh()
+		}, 2000)
+	},
+	// 页面下拉到底部回调
+	onReachBottom() {
+		if (this.hotelList.length < this.total) {
+			this.page++
+			this.getHotelList()
+		} else {
+			uni.showToast({
+				title: '没有更多数据了',
+				icon: 'none'
+			})
+		}
+	},
+	methods: {
+		// 获取乡镇集合
+		async getTownList() {
+			const res = await this.$myRequest({
+				url: '/mhotel/hotelqueryList.action',
+				method: 'get',
+				data: {
+					code: 10
+				}
+			})
+			// console.log(res)
+			if (res.code === 200) {
+				this.placeList = [...this.placeList, ...res.data]
+			}
+		},
+		// 获取用户当前位置
+		getLocation() {
+			uni.getSetting({
+				success: (res) => {
+					if (!res.authSetting['scope.userLocation']) {
+						uni.authorize({
+							scope: 'scope.userLocation',
+							success: (res) => {
+								// 授权成功
+								uni.getLocation({
+									type: 'gcj02',
+									success: (res) => {
+										this.myLat = res.latitude
+										this.myLng = res.longitude
+										this.showdDistance = true
+										this.getHotelList()
+									}
+								})
+							},
+							fail: () => {
+								uni.showModal({
+									content: '获取定位权限失败将会影响使用部分功能，是否去设置打开？',
+									confirmText: '确认',
+									cancelText: '取消',
+									success: (res) => {
+										if (res.confirm) {
+											uni.openSetting({
+												success: (res) => {
+													console.log(res)
+													this.getLocation()
+												}
+											})
+										} else {
+											this.showdDistance = false
+											this.getHotelList()
+											uni.showToast({
+												title: '获取定位权限失败',
+												icon: 'none'
+											})
+										}
+									}
+								})
+							}
+						})
+					} else {
+						uni.getLocation({
+							type: 'gcj02',
+							success: (res) => {
+								this.myLat = res.latitude
+								this.myLng = res.longitude
+								this.showdDistance = true
+								this.getHotelList()
+							}
+						})
+					}
+				}
+			})
+		},
+		// 获取民宿列表
+		async getHotelList() {
+			const res = await this.$myRequest({
+				url: '/mhotel/ahphomePage.action',
+				data: {
+					queryValue: this.keywords,
+					page: this.page,
+					rows: this.rows,
+					hotel_township: this.placeList[this.placeIndex].id || '',
+					userId: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo').id : ''
+				}
+			})
+			// console.log(res)
+			if (res.code === 200) {
+				this.hotelList = [...this.hotelList, ...res.data.pageList]
+				this.total = res.data.total
+
+				// 如果定位成功则获取和民宿之间的距离
+				if (this.showdDistance && this.hotelList.length) {
+					this.hotelList.forEach((ele) => {
+						let lat = ele.hpositionWens.split(',')[0]
+						let lng = ele.hpositionWens.split(',')[1]
+						ele.distance = this.calculateDistance(lat, lng)
+					})
+				}
+			}
+		},
+		// 计算两个点之间的距离
+		calculateDistance(lat, lng) {
+			let centerLat = lat
+			let centerLng = lng
+
+			let red1 = (this.myLat * Math.PI) / 180.0
+			let red2 = (centerLat * Math.PI) / 180.0
+			let a = red1 - red2
+			let b = (this.myLng * Math.PI) / 180.0 - (centerLng * Math.PI) / 180.0
+			let R = 6378137
+			let distance = R * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(red1) * Math.cos(red2) * Math.pow(Math.sin(b / 2), 2)))
+			let res = (distance / 1000).toFixed(2) * 1
+
+			return res
+		},
+
+		// 搜索按钮点击回调
+		searchHandler() {
+			this.hotelList = []
+			this.page = 1
+			this.getHotelList()
+		},
+		// 点击每一个民宿卡片回调
+		goPageDetail(item) {
+			uni.navigateTo({
+				url: `/pages/detail/detail?id=${item.id}&distance=${item.distance}`
+			})
+		},
+		// 选择地区时的回调
+		bindPickerChange(e) {
+			this.placeIndex = e.detail.value
+			this.hotelList = []
+			this.page = 1
+			this.getHotelList()
+		},
+		// 立即前往按钮回调
+		handleGo() {
+			console.log(111)
+		},
+		// 优惠券弹窗关闭按钮回调
+		handleClose() {
+			this.$refs.popup.close()
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	display: flex;
+	flex-direction: column;
+	width: 750rpx;
+	min-height: 100vh;
+	padding: 0 30rpx;
+	box-sizing: border-box;
+	background-color: #f7f7f7;
+
+	.address {
+		display: flex;
+		width: 152rpx;
+		font-size: 28rpx;
+
+		.address_text {
+			width: 104rpx;
+			text-align: center;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+
+		img {
+			width: 48rpx;
+			height: 48rpx;
+		}
+	}
+
+	.search {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 538rpx;
+		height: 80rpx;
+		opacity: 1;
+		border-radius: 70px;
+		background-color: #fff;
+
+		.add {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-left: 10rpx;
+			width: 60rpx;
+			font-size: 50rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			color: rgba(30, 125, 251, 1);
+
+			.img {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+
+		.inp {
+			height: 60rpx;
+			line-height: 60rpx;
+			flex-grow: 1;
+			font-size: 28rpx;
+		}
+
+		.btnSearch {
+			width: 100rpx;
+			text-align: center;
+			margin-right: 10rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			opacity: 1;
+			font-size: 28rpx;
+			font-weight: 400;
+			height: 2rem;
+			color: #096562;
+		}
+	}
+
+	.body {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+
+		.item {
+			width: 335rpx;
+			box-sizing: border-box;
+			margin-bottom: 20rpx;
+
+			.item-img {
+				width: 100%;
+				height: 223rpx;
+				border-radius: 18rpx 18rpx 0 0;
+				box-sizing: border-box;
+			}
+
+			.descrition {
+				display: flex;
+				flex-direction: column;
+				width: 100%;
+				border-radius: 0 0 18rpx 18rpx;
+				box-sizing: border-box;
+				background: rgba(255, 255, 255, 1);
+				margin-top: -10rpx;
+
+				.title {
+					font-size: 28rpx;
+					font-weight: 600;
+					padding: 20rpx 20rpx 10rpx;
+					color: rgba(0, 0, 0, 1);
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+
+				.type {
+					padding: 5rpx 20rpx;
+					height: 40rpx;
+					font-size: 24rpx;
+					color: #a6a6a6;
+				}
+
+				.distance {
+					padding: 10rpx 20rpx;
+					font-size: 24rpx;
+					color: #a6a6a6;
+				}
+
+				.detail {
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					align-items: center;
+					padding: 0 20rpx 20rpx 20rpx;
+					color: rgba(0, 0, 0, 1);
+
+					.img {
+						width: 40rpx;
+						height: 40rpx;
+					}
+
+					.price {
+						.txt1 {
+							font-size: 36rpx;
+							font-weight: 600;
+							color: rgba(255, 87, 51, 1);
+						}
+
+						.txt2 {
+							font-size: 24rpx;
+							font-weight: 400;
+							color: #a6a6a6;
+						}
+					}
+
+					.score {
+						font-size: 24rpx;
+						font-weight: 400;
+						padding-top: 10rpx;
+						color: rgba(166, 166, 166, 1);
+					}
+				}
+			}
+		}
+	}
+
+	.noData {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		img {
+			margin-top: 150rpx;
+			width: 600rpx;
+			height: 600rpx;
+		}
+	}
+
+	.popupClass {
+		position: relative;
+		width: 481rpx;
+		height: 764rpx;
+
+		img {
+			width: 100%;
+			height: 665rpx;
+		}
+
+		.btn_go {
+			position: absolute;
+			top: 415rpx;
+			left: 40rpx;
+			width: 396rpx;
+			height: 76rpx;
+			border-radius: 43rpx;
+		}
+
+		.btn_close {
+			position: absolute;
+			top: 586rpx;
+			left: 212rpx;
+			width: 58rpx;
+			height: 58rpx;
+			border-radius: 50%;
+		}
+	}
+}
+</style>

pages/index/index.vue

@@ -1,24 +1,180 @@
 <template>
-	<view class="container"></view>
+	<view class="container">
+		<!-- 地图区域 -->
+		<view class="map">
+			<qiun-data-charts type="map" :opts="opts" :chartData="chartData" @getIndex="getMapIndex" />
+		</view>
+		<!-- 乡镇列表区域 -->
+		<view class="body" v-if="list.length">
+			<!-- 每一个乡镇区域 -->
+			<view class="body_item" v-for="(item, index) in list" :key="index">
+				<view class="item_town">{{ item.name }}</view>
+				<view class="item_platina">白金级（{{ item.cSum }}）</view>
+				<view class="item_gold">金宿级（{{ item.bSum }}）</view>
+				<view class="item_silver">银宿级（{{ item.aSum }}）</view>
+				<view class="item_btn" @click="() => handleGoHome(item)">订</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+// 靖安县地图数据
+import { mapData } from '@/util/mapData.js'
+
 export default {
 	data() {
-		return {}
+		return {
+			// 城镇列表数据
+			list: [],
+			// 图表数据
+			chartData: {
+				series: {}
+			},
+			// 图表配置
+			opts: {
+				color: ['#096562', '#096562', '#096562', '#096562', '#096562', '#096562', '#096562', '#096562', '#096562', '#096562', '#096562'],
+				padding: [0, 0, 0, 0],
+				fontColor: '#fff',
+				fontSize: 10,
+				dataPointShape: false,
+				extra: {
+					map: {
+						border: true,
+						borderWidth: 1,
+						borderColor: 'rgba(255,255,255,0.2)',
+						fillOpacity: 0.6,
+						activeBorderColor: 'rgba(255,255,255,0.2)',
+						activeFillColor: '#0BBA92',
+						activeFillOpacity: 1,
+						fillOpacity: 1
+					}
+				}
+			}
+		}
+	},
+	onReady() {
+		this.getServerData()
 	},
 	onLoad() {
-		uni.switchTab({
-			url: '/pages/home/home'
-		})
+		this.getTownList()
 	},
-	methods: {}
+	methods: {
+		getMapIndex(e) {
+			let town
+			if (e.currentIndex === 0) {
+				town = '双溪镇'
+			} else if (e.currentIndex === 1) {
+				town = '仁首镇'
+			} else if (e.currentIndex === 2) {
+				town = '罗湾乡'
+			} else if (e.currentIndex === 3) {
+				town = '水口乡'
+			} else if (e.currentIndex === 4) {
+				town = '香田乡'
+			} else if (e.currentIndex === 5) {
+				town = '躁都镇'
+			} else if (e.currentIndex === 6) {
+				town = '三爪仑乡'
+			} else if (e.currentIndex === 7) {
+				town = '中源乡'
+			} else if (e.currentIndex === 8) {
+				town = '高湖镇'
+			} else if (e.currentIndex === 9) {
+				town = '雷公尖乡'
+			} else if (e.currentIndex === 10) {
+				town = '宝峰镇'
+			}
+			uni.setStorageSync('town', town)
+			uni.switchTab({
+				url: `/pages/home/home`
+			})
+		},
+		// 获取城镇列表数据
+		async getTownList() {
+			const res = await this.$myRequest({
+				url: '/mhotel/ahpgetTownshipCount.action',
+				method: 'post'
+			})
+			// console.log(res)
+			if (res.code === 200) {
+				this.list = res.data
+			}
+		},
+		handleGoHome(item) {
+			uni.setStorageSync('town', item.name)
+			uni.switchTab({
+				url: `/pages/home/home`
+			})
+		},
+		// 获取地图数据
+		getServerData() {
+			this.chartData.series = mapData.features
+		}
+	}
 }
 </script>
 
 <style lang="scss" scoped>
 .container {
+	box-sizing: border-box;
+	padding: 0 30rpx 10rpx;
 	height: 100vh;
-	background-color: #fff;
+	background-color: #f7f7f7;
+
+	.map {
+		width: 100%;
+		height: 463rpx;
+	}
+
+	.body {
+		height: calc(100vh - 463rpx);
+		overflow-y: auto;
+
+		.body_item {
+			display: flex;
+			align-items: center;
+			margin-bottom: 20rpx;
+			height: 92rpx;
+			border-radius: 12rpx;
+			background-color: #e6e6e6;
+
+			.item_town {
+				margin-left: 30rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+
+			.item_silver {
+				margin-left: 24rpx;
+				font-size: 20rpx;
+				color: #660909;
+			}
+			.item_gold {
+				margin-left: 18rpx;
+				font-size: 20rpx;
+				color: #096562;
+			}
+			.item_platina {
+				margin-left: 24rpx;
+				font-size: 20rpx;
+				color: #ff5733;
+			}
+
+			.item_btn {
+				margin-left: auto;
+				margin-right: 10rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100rpx;
+				height: 66rpx;
+				color: #fff;
+				font-size: 36rpx;
+				border-radius: 11rpx;
+				background-color: #096562;
+			}
+		}
+	}
 }
 </style>

pages/my/my.vue

@@ -57,7 +57,7 @@
 			</view>
 
 			<!-- 投诉进度区域 -->
-			<view class="body_item">
+			<view class="body_item" @click="handleGoPage('/pages/myComplaint/myComplaint')">
 				<img class="img" src="../../static/my/complaint.png" />
 				投诉进度
 				<img class="img_icon" src="../../static/my/right3.png" />

pages/myComplaint/myComplaint.vue

@@ -0,0 +1,212 @@
+<template>
+	<view class="container">
+		<!-- 投诉列表区域 -->
+		<view class="body">
+			<!-- 每一个投诉订单区域 -->
+			<view class="box" v-for="item in list" :key="item.id" @click="handleGoPage(item)">
+				<!-- 标题区域 -->
+				<view class="box_header">
+					<view class="header_left">{{ item.title }}</view>
+					<view class="header_right">{{ item.type }}</view>
+				</view>
+				<!-- 信息区域 -->
+				<view class="box_info">
+					<img mode="aspectFill" :src="item.imgUrl" />
+					<view class="info_center">
+						<view class="center_name">{{ item.name }}</view>
+						<view class="center_time">{{ item.time }}</view>
+						<view class="center_tags">{{ item.count }}间 {{ item.roomType }}</view>
+						<view class="center_price">¥{{ item.price }}</view>
+					</view>
+					<view class="info_right">{{ item.status }}</view>
+				</view>
+
+				<!-- 反馈时间区域 -->
+				<view class="box_time">
+					<view class="time_left">反馈时间</view>
+					<view class="time_right">{{ item.time2 }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			// 投诉列表区域
+			list: [
+				{
+					id: 1,
+					title: '标题',
+					type: '处理中',
+					imgUrl: 'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+					name: '开心民宿',
+					time: '2023-07-26  -  2023-07-27',
+					status: '支付超时',
+					price: 666,
+					time2: '2023-08-15  15:15:15',
+					count: 1,
+					roomType: '双人标间'
+				},
+				{
+					id: 2,
+					title: '我要投诉',
+					type: '已处理',
+					imgUrl: 'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+					name: '快乐民宿',
+					time: '2023-07-26  -  2023-07-27',
+					status: '支付超时',
+					price: 888,
+					time2: '2023-08-15  15:15:15',
+					count: 1,
+					roomType: '单人标间'
+				},
+				{
+					id: 3,
+					title: '投诉',
+					type: '处理中',
+					imgUrl: 'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+					name: '健康民宿',
+					time: '2023-07-26  -  2023-07-27',
+					status: '支付超时',
+					price: 1288,
+					time2: '2023-08-15  15:15:15',
+					count: 1,
+					roomType: '双人标间'
+				},
+				{
+					id: 4,
+					title: '投诉投诉投诉投诉',
+					type: '投诉',
+					imgUrl: 'https://img1.baidu.com/it/u=4085584268,3308739054&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=375',
+					name: '木叶村',
+					time: '2023-07-26  -  2023-07-27',
+					status: '支付超时',
+					price: 8888,
+					time2: '2023-08-15  15:15:15',
+					count: 1,
+					roomType: '火影标间'
+				}
+			]
+		}
+	},
+	methods: {
+		// 点击每一个投诉订单的回调
+		handleGoPage(item) {
+			uni.navigateTo({
+				url: `/pages/complaintProgress/complaintProgress`
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.container {
+	box-sizing: border-box;
+	padding: 20rpx;
+	height: 100vh;
+	overflow-y: auto;
+	background-color: #f7f7f7;
+
+	.body {
+		.box {
+			box-sizing: border-box;
+			padding: 0 20rpx 0 30rpx;
+			margin-bottom: 20rpx;
+			width: 710rpx;
+			height: 390rpx;
+			border-radius: 15rpx;
+			background-color: #fff;
+
+			.box_header {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 98rpx;
+				border-bottom: 1rpx solid #e6e6e6;
+
+				.header_left {
+					flex: 4;
+					font-size: 32rpx;
+					font-weight: bold;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+				.header_right {
+					flex: 1;
+					font-size: 28rpx;
+					color: #808080;
+					text-align: end;
+				}
+			}
+
+			.box_info {
+				display: flex;
+				margin: 34rpx 0 27rpx 0;
+				height: 143rpx;
+
+				img {
+					width: 143rpx;
+					height: 143rpx;
+					border-radius: 9rpx;
+				}
+
+				.info_center {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					margin-top: -5rpx;
+					margin-left: 17rpx;
+					height: 150rpx;
+					color: #808080;
+					font-size: 24rpx;
+					overflow: hidden;
+
+					.center_name {
+						font-size: 28rpx;
+						font-weight: bold;
+						color: #000;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+					.center_time {
+					}
+					.center_tags {
+					}
+					.center_price {
+					}
+				}
+
+				.info_right {
+					width: 185rpx;
+					text-align: end;
+					font-size: 24rpx;
+					color: #808080;
+				}
+			}
+
+			.box_time {
+				display: flex;
+				align-items: center;
+				height: 58rpx;
+				font-size: 24rpx;
+				border-radius: 9rpx;
+				background-color: #f2f2f2;
+
+				.time_left {
+					margin: 0 20rpx;
+				}
+				.time_right {
+					color: #808080;
+				}
+			}
+		}
+	}
+}
+</style>

pages/myCoupon/myCoupon.vue

@@ -15,7 +15,7 @@
 				<view class="msg_top">关注领券中心</view>
 				<view>系统会不定时发放代金券</view>
 			</view>
-			<view class="banner_btn">去逛逛</view>
+			<view class="banner_btn" @click="handleGoPage('/pages/couponCenter/couponCenter')">去逛逛</view>
 		</view>
 
 		<!-- 代金券列表区域 -->
@@ -126,6 +126,12 @@ export default {
 		// 列表下拉到底部回调
 		handlePull() {
 			console.log(111)
+		},
+		// 跳转页面回调
+		handleGoPage(url) {
+			uni.navigateTo({
+				url
+			})
 		}
 	}
 }

pages/orderDetail/orderDetail.vue

@@ -151,11 +151,14 @@ export default {
 			// 详细信息
 			info: null,
 			// 订单ID
-			id: ''
+			id: '',
+			// 距离差
+			distance: ''
 		}
 	},
 	onLoad(options) {
 		this.id = options.id
+		this.distance = options.distance
 		this.getData()
 	},
 	methods: {
@@ -268,39 +271,42 @@ export default {
 		},
 		// 点击再次预定按钮回调
 		handleAgain() {
-			uni.showModal({
-				title: '提示',
-				content: '确定再次预定吗？',
-				success: async (res) => {
-					if (res.confirm) {
-						const result = await this.$myRequest({
-							url: '/mhotel/abkcreateOrder.action',
-							data: {
-								houseId: this.info.houseId,
-								startTime: this.info.orderStartTime.slice(0, 10),
-								endTime: this.info.orderEndTime.slice(0, 10),
-								houseOrderNumber: this.info.houseOrderNumber,
-								userName: this.info.userName,
-								userPhone: this.info.userPhone,
-								userId: uni.getStorageSync('userInfo').id
-							}
-						})
-						if (result.code === 200) {
-							uni.navigateTo({
-								url: `/pages/pay/pay?id=${result.data}`
-							})
-							// uni.showToast({
-							// 	title: '预定成功',
-							// 	icon: 'success',
-							// 	mask: true
-							// })
-							// setTimeout(() => {
-							// 	uni.navigateBack(1)
-							// }, 1500)
-						}
-					}
-				}
+			uni.navigateTo({
+				url: `/pages/detail/detail?id=${this.info.hotelId}&distance=${this.distance}`
 			})
+			// if (this.info.hstatus === 1 && this.info.hotelStatus === 1) {
+			// 	uni.showModal({
+			// 		title: '提示',
+			// 		content: '确定再次预定吗？',
+			// 		success: async (res) => {
+			// 			if (res.confirm) {
+			// 				const result = await this.$myRequest({
+			// 					url: '/mhotel/abkcreateOrder.action',
+			// 					data: {
+			// 						houseId: this.info.houseId,
+			// 						startTime: this.info.orderStartTime.slice(0, 10),
+			// 						endTime: this.info.orderEndTime.slice(0, 10),
+			// 						houseOrderNumber: this.info.houseOrderNumber,
+			// 						userName: this.info.userName,
+			// 						userPhone: this.info.userPhone,
+			// 						userId: uni.getStorageSync('userInfo').id
+			// 					}
+			// 				})
+			// 				if (result.code === 200) {
+			// 					uni.navigateTo({
+			// 						url: `/pages/pay/pay?id=${result.data}`
+			// 					})
+			// 				}
+			// 			}
+			// 		}
+			// 	})
+			// } else {
+			// 	uni.showToast({
+			// 		title: '该民宿暂时无法预定',
+			// 		icon: 'none',
+			// 		mask: true
+			// 	})
+			// }
 		},
 		// 点击删除订单按钮回调
 		handleDelete() {
@@ -363,7 +369,7 @@ export default {
 
 		.header_title {
 			position: absolute;
-			top: 65rpx;
+			top: 76rpx;
 			left: 308rpx;
 			color: #fff;
 			font-size: 28rpx;

pages/orderManage/orderManage.vue

@@ -68,20 +68,29 @@ export default {
 			// 每页多少条数据
 			rows: 6,
 			// 一共多少条数据
-			total: ''
+			total: '',
+			// 是否显示距离差
+			showdDistance: false,
+			// 用户定位经度
+			myLng: 0,
+			// 用户定位纬度
+			myLat: 0
 		}
 	},
-	onShow() {
-		this.page = 1
-		this.orderList = []
-		this.getOrderList()
+	onLoad() {
+		this.getLocation()
 	},
+	// onShow() {
+	// 	this.page = 1
+	// 	this.orderList = []
+	// 	this.getLocation()
+	// },
 	// 下拉刷新
 	onPullDownRefresh() {
 		setTimeout(() => {
 			this.orderList = []
 			this.page = 1
-			this.getOrderList()
+			this.getLocation()
 			uni.stopPullDownRefresh()
 		}, 2000)
 	},
@@ -99,6 +108,64 @@ export default {
 		}
 	},
 	methods: {
+		// 获取用户当前位置
+		getLocation() {
+			uni.getSetting({
+				success: (res) => {
+					if (!res.authSetting['scope.userLocation']) {
+						uni.authorize({
+							scope: 'scope.userLocation',
+							success: (res) => {
+								// 授权成功
+								uni.getLocation({
+									type: 'gcj02',
+									success: (res) => {
+										this.myLat = res.latitude
+										this.myLng = res.longitude
+										this.showdDistance = true
+										this.getOrderList()
+									}
+								})
+							},
+							fail: () => {
+								uni.showModal({
+									content: '获取定位权限失败将会影响使用部分功能，是否去设置打开？',
+									confirmText: '确认',
+									cancelText: '取消',
+									success: (res) => {
+										if (res.confirm) {
+											uni.openSetting({
+												success: (res) => {
+													console.log(res)
+													this.getLocation()
+												}
+											})
+										} else {
+											this.showdDistance = false
+											this.getOrderList()
+											uni.showToast({
+												title: '获取定位权限失败',
+												icon: 'none'
+											})
+										}
+									}
+								})
+							}
+						})
+					} else {
+						uni.getLocation({
+							type: 'gcj02',
+							success: (res) => {
+								this.myLat = res.latitude
+								this.myLng = res.longitude
+								this.showdDistance = true
+								this.getOrderList()
+							}
+						})
+					}
+				}
+			})
+		},
 		// 获取订单列表数据
 		async getOrderList() {
 			const res = await this.$myRequest({
@@ -122,6 +189,15 @@ export default {
 						ele.countDownTime = new Date(createTime).getTime() + temLockTime * 60 * 1000 - new Date().getTime()
 					}
 				})
+
+				// 如果定位成功则获取和民宿之间的距离
+				if (this.showdDistance && this.orderList.length) {
+					this.orderList.forEach((ele) => {
+						let lat = ele.hotelHpositionWens.split(',')[0]
+						let lng = ele.hotelHpositionWens.split(',')[1]
+						ele.distance = this.calculateDistance(lat, lng)
+					})
+				}
 			}
 		},
 		// 倒计时结束回调
@@ -191,47 +267,49 @@ export default {
 		},
 		// 点击再次预定按钮回调
 		goPageDetail(item) {
-			uni.showModal({
-				title: '提示',
-				content: '确定再次预定吗？',
-				success: async (res) => {
-					if (res.confirm) {
-						const result = await this.$myRequest({
-							url: '/mhotel/abkcreateOrder.action',
-							data: {
-								houseId: item.houseId,
-								startTime: item.orderStartTime.slice(0, 10),
-								endTime: item.orderEndTime.slice(0, 10),
-								houseOrderNumber: item.houseOrderNumber,
-								userName: item.userName,
-								userPhone: item.userPhone,
-								userId: uni.getStorageSync('userInfo').id
-							}
-						})
-						if (result.code === 200) {
-							uni.navigateTo({
-								url: `/pages/pay/pay?id=${result.data}`
-							})
-							// uni.showToast({
-							// 	title: '预定成功',
-							// 	icon: 'success',
-							// 	mask: true
-							// })
-							// setTimeout(() => {
-							// 	this.page = 1
-							// 	this.orderList = []
-							// 	this.getOrderList()
-							// }, 1500)
-						}
-					}
-				}
+			uni.navigateTo({
+				url: `/pages/detail/detail?id=${item.hotelId}&distance=${item.distance}`
 			})
+
+			// if (item.hstatus === 1 && item.hotelStatus === 1) {
+			// 	uni.showModal({
+			// 		title: '提示',
+			// 		content: '确定再次预定吗？',
+			// 		success: async (res) => {
+			// 			if (res.confirm) {
+			// 				const result = await this.$myRequest({
+			// 					url: '/mhotel/abkcreateOrder.action',
+			// 					data: {
+			// 						houseId: item.houseId,
+			// 						startTime: item.orderStartTime.slice(0, 10),
+			// 						endTime: item.orderEndTime.slice(0, 10),
+			// 						houseOrderNumber: item.houseOrderNumber,
+			// 						userName: item.userName,
+			// 						userPhone: item.userPhone,
+			// 						userId: uni.getStorageSync('userInfo').id
+			// 					}
+			// 				})
+			// 				if (result.code === 200) {
+			// 					uni.navigateTo({
+			// 						url: `/pages/pay/pay?id=${result.data}`
+			// 					})
+			// 				}
+			// 			}
+			// 		}
+			// 	})
+			// } else {
+			// 	uni.showToast({
+			// 		title: '该民宿暂时无法预定',
+			// 		icon: 'none',
+			// 		mask: true
+			// 	})
+			// }
 		},
 		// 点击每一个订单回调
 		goPageOrderDetail(item) {
 			// console.log(item)
 			uni.navigateTo({
-				url: `/pages/orderDetail/orderDetail?id=${item.id}`
+				url: `/pages/orderDetail/orderDetail?id=${item.id}&distance=${item.distance}`
 			})
 		},
 		// 右侧选项内容删除按钮回调
@@ -279,6 +357,21 @@ export default {
 					mask: true
 				})
 			}
+		},
+		// 计算两个点之间的距离
+		calculateDistance(lat, lng) {
+			let centerLat = lat
+			let centerLng = lng
+
+			let red1 = (this.myLat * Math.PI) / 180.0
+			let red2 = (centerLat * Math.PI) / 180.0
+			let a = red1 - red2
+			let b = (this.myLng * Math.PI) / 180.0 - (centerLng * Math.PI) / 180.0
+			let R = 6378137
+			let distance = R * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(red1) * Math.cos(red2) * Math.pow(Math.sin(b / 2), 2)))
+			let res = (distance / 1000).toFixed(2) * 1
+
+			return res
 		}
 	}
 }

pages/shopInfo/shopInfo.vue

@@ -59,8 +59,9 @@ export default {
 			})
 		},
 		handleGoMsg() {
+			let url = 'https://chtech.ncjti.edu.cn/hotelReservation/pc4/'
 			uni.navigateTo({
-				url: '/pages/web/web'
+				url: `/pages/web/web?url=${url}`
 			})
 		}
 	}

pages/web/web.vue

@@ -8,8 +8,11 @@
 export default {
 	data() {
 		return {
-			webUrl: 'https://chtech.ncjti.edu.cn/hotelReservation/pc4/'
+			webUrl: ''
 		}
+	},
+	onLoad(options) {
+		this.webUrl = options.url
 	}
 }
 </script>

uni_modules/qiun-data-charts/changelog.md

@@ -0,0 +1,320 @@
+## 2.5.0-20230101（2023-01-01）
+- 秋云图表组件 修改条件编译顺序，确保uniapp的cli方式的项目依赖不完整时可以正常显示
+- 秋云图表组件 恢复props属性directory的使用，以修复vue3项目中，开启echarts后，echarts目录识别错误的bug
+- uCharts.js 修复区域图、混合图只有一个数据时图表显示不正确的bug
+- uCharts.js 修复折线图、区域图中时间轴类别图表tooltip指示点显示不正确的bug
+- uCharts.js 修复x轴使用labelCount时，并且boundaryGap = 'justify' 并且关闭Y轴显示的时候，最后一个坐标值不显示的bug
+- uCharts.js 修复折线图只有一组数据时 ios16 渲染颜色不正确的bug
+- uCharts.js 修复玫瑰图半径显示不正确的bug
+- uCharts.js 柱状图、山峰图增加正负图功能，y轴网格如果需要显示0轴则由 min max 及 splitNumber 确定，后续版本优化自动显示0轴
+- uCharts.js 柱状图column增加 opts.extra.column.labelPosition，数据标签位置，有效值为 outside外部, insideTop内顶部, center内中间, bottom内底部
+- uCharts.js 雷达图radar增加 opts.extra.radar.labelShow，否显示各项标识文案是，默认true
+- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.boxPadding，提示窗边框填充距离，默认3px
+- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.fontSize，提示窗字体大小配置，默认13px
+- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.lineHeight，提示窗文字行高，默认20px
+- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.legendShow，是否显示左侧图例，默认true
+- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.legendShape，图例形状，图例标识样式，有效值为 auto自动跟随图例, diamond◆, circle●, triangle▲, square■, rect▬, line-
+- uCharts.js 标记线markLine增加 opts.extra.markLine.labelFontSize，字体大小配置，默认13px
+- uCharts.js 标记线markLine增加 opts.extra.markLine.labelPadding，标签边框内填充距离，默认6px
+- uCharts.js 折线图line增加 opts.extra.line.linearType，渐变色类型，可选值 none关闭渐变色，custom 自定义渐变色。使用自定义渐变色时请赋值serie.linearColor作为颜色值
+- uCharts.js 折线图line增加 serie.linearColor，渐变色数组，格式为2维数组[起始位置，颜色值]，例如[[0,'#0EE2F8'],[0.3,'#2BDCA8'],[0.6,'#1890FF'],[1,'#9A60B4']]
+- uCharts.js 折线图line增加 opts.extra.line.onShadow，是否开启折线阴影，开启后请赋值serie.setShadow阴影设置
+- uCharts.js 折线图line增加 serie.setShadow，阴影配置，格式为4位数组：[offsetX,offsetY,blur,color]
+- uCharts.js 折线图line增加 opts.extra.line.animation，动画效果方向，可选值为vertical 垂直动画效果，horizontal 水平动画效果
+- uCharts.js X轴xAxis增加 opts.xAxis.lineHeight，X轴字体行高，默认20px
+- uCharts.js X轴xAxis增加 opts.xAxis.marginTop，X轴文字距离轴线的距离，默认0px
+- uCharts.js X轴xAxis增加 opts.xAxis.title，当前X轴标题
+- uCharts.js X轴xAxis增加 opts.xAxis.titleFontSize，标题字体大小，默认13px
+- uCharts.js X轴xAxis增加 opts.xAxis.titleOffsetY，标题纵向偏移距离，负数为向上偏移，正数向下偏移
+- uCharts.js X轴xAxis增加 opts.xAxis.titleOffsetX，标题横向偏移距离，负数为向左偏移，正数向右偏移
+- uCharts.js X轴xAxis增加 opts.xAxis.titleFontColor，标题字体颜色，默认#666666
+
+## 报错TypeError: Cannot read properties of undefined (reading 'length')
+- 如果是uni-modules版本组件，请先登录HBuilderX账号；
+- 在HBuilderX中的manifest.json，点击重新获取uniapp的appid，或者删除appid重新粘贴，重新运行；
+- 如果是cli项目请使用码云上的非uniCloud版本组件；
+- 或者添加uniCloud的依赖；
+- 或者使用原生uCharts；
+## 2.4.5-20221130（2022-11-30）
+- uCharts.js 优化tooltip当文字很多变为左侧显示时，如果画布仍显显示不下，提示框错位置变为以左侧0位置起画
+- uCharts.js 折线图修复特殊情况下只有单点数据，并改变线宽后点变为圆形的bug
+- uCharts.js 修复Y轴disabled启用后无效并报错的bug
+- uCharts.js 修复仪表盘起始结束角度特殊情况下显示不正确的bug
+- uCharts.js 雷达图新增参数 opts.extra.radar.radius , 自定义雷达图半径
+- uCharts.js 折线图、区域图增加tooltip指示点，opts.extra.line.activeType/opts.extra.area.activeType，可选值"none"不启用激活指示点,"hollow"空心点模式,"solid"实心点模式
+## 2.4.4-20221102（2022-11-02）
+- 秋云图表组件 修复使用echarts时reload、reshow无法调用重新渲染的bug，[详见码云PR](https://gitee.com/uCharts/uCharts/pulls/40)
+- 秋云图表组件 修复使用echarts时，初始化时宽高不正确的bug，[详见码云PR](https://gitee.com/uCharts/uCharts/pulls/42)
+- 秋云图表组件 修复uniapp的h5使用history模式时，无法加载echarts的bug
+- 秋云图表组件 小程序端@complete、@scrollLeft、@scrollRight、@getTouchStart、@getTouchMove、@getTouchEnd事件增加opts参数传出，方便一些特殊需求的交互获取数据。
+
+- uCharts.js 修复calTooltipYAxisData方法内formatter格式化方法未与y轴方法同步的问题，[详见码云PR](https://gitee.com/uCharts/uCharts/pulls/43)
+- uCharts.js 地图新增参数opts.series[i].fillOpacity，以透明度方式来设置颜色过度效果，[详见码云PR](https://gitee.com/uCharts/uCharts/pulls/38)
+- uCharts.js 地图新增参数opts.extra.map.active，是否启用点击激活变色
+- uCharts.js 地图新增参数opts.extra.map.activeTextColor，是否启用点击激活变色
+- uCharts.js 地图新增渲染完成事件renderComplete
+- uCharts.js 漏斗图修复当部分数据相同时tooltip提示窗点击错误的bug
+- uCharts.js 漏斗图新增参数series.data[i].centerText 居中标签文案
+- uCharts.js 漏斗图新增参数series.data[i].centerTextSize 居中标签文案字体大小，默认opts.fontSize
+- uCharts.js 漏斗图新增参数series.data[i].centerTextColor 居中标签文案字体颜色，默认#FFFFFF
+- uCharts.js 漏斗图新增参数opts.extra.funnel.minSize 最小值的最小宽度，默认0
+- uCharts.js 进度条新增参数opts.extra.arcbar.direction，动画方向，可选值为cw顺时针、ccw逆时针
+- uCharts.js 混合图新增参数opts.extra.mix.line.width，折线的宽度，默认2
+- uCharts.js 修复tooltip开启horizentalLine水平横线标注时，图表显示错位的bug
+- uCharts.js 优化tooltip当文字很多变为左侧显示时，如果画布仍显显示不下，提示框错位置变为以左侧0位置起画
+- uCharts.js 修复开启滚动条后X轴文字超出绘图区域后的隐藏逻辑
+- uCharts.js 柱状图、条状图修复堆叠模式不能通过{value,color}赋值单个柱子颜色的问题
+- uCharts.js 气泡图修复不识别series.textSize和series.textColor的bug
+
+## 报错TypeError: Cannot read properties of undefined (reading 'length')
+1. 如果是uni-modules版本组件，请先登录HBuilderX账号；
+2. 在HBuilderX中的manifest.json，点击重新获取uniapp的appid，或者删除appid重新粘贴，重新运行；
+3. 如果是cli项目请使用码云上的非uniCloud版本组件；
+4. 或者添加uniCloud的依赖；
+5. 或者使用原生uCharts；
+## 2.4.3-20220505（2022-05-05）
+- 秋云图表组件 修复开启canvas2d后将series赋值为空数组显示加载图标时，再次赋值后画布闪动的bug
+- 秋云图表组件 修复升级hbx最新版后ECharts的highlight方法报错的bug
+- uCharts.js 雷达图新增参数opts.extra.radar.gridEval，数据点位网格抽希，默认1
+- uCharts.js 雷达图新增参数opts.extra.radar.axisLabel，	是否显示刻度点值，默认false
+- uCharts.js 雷达图新增参数opts.extra.radar.axisLabelTofix，刻度点值小数位数，默认0
+- uCharts.js 雷达图新增参数opts.extra.radar.labelPointShow，是否显示末端刻度圆点，默认false
+- uCharts.js 雷达图新增参数opts.extra.radar.labelPointRadius，刻度圆点的半径，默认3
+- uCharts.js 雷达图新增参数opts.extra.radar.labelPointColor，刻度圆点的颜色，默认#cccccc
+- uCharts.js 雷达图新增参数opts.extra.radar.linearType，渐变色类型，可选值"none"关闭渐变,"custom"开启渐变
+- uCharts.js 雷达图新增参数opts.extra.radar.customColor，自定义渐变颜色，数组类型对应series的数组长度以匹配不同series颜色的不同配色方案，例如["#FA7D8D", "#EB88E2"]
+- uCharts.js 雷达图优化支持series.textColor、series.textSize属性
+- uCharts.js 柱状图中温度计式图标，优化支持全圆角类型，修复边框有缝隙的bug，详见官网【演示】中的温度计图表
+- uCharts.js 柱状图新增参数opts.extra.column.activeWidth，当前点击柱状图的背景宽度，默认一个单元格单位
+- uCharts.js 混合图增加opts.extra.mix.area.gradient 区域图是否开启渐变色
+- uCharts.js 混合图增加opts.extra.mix.area.opacity 区域图透明度，默认0.2
+- uCharts.js 饼图、圆环图、玫瑰图、漏斗图，增加opts.series[0].data[i].labelText，自定义标签文字，避免formatter格式化的繁琐，详见官网【演示】中的饼图
+- uCharts.js 饼图、圆环图、玫瑰图、漏斗图，增加opts.series[0].data[i].labelShow，自定义是否显示某一个指示标签，避免因饼图类别太多导致标签重复或者居多导致图形变形的问题，详见官网【演示】中的饼图
+- uCharts.js 增加opts.series[i].legendText/opts.series[0].data[i].legendText（与series.name同级）自定义图例显示文字的方法
+- uCharts.js 优化X轴、Y轴formatter格式化方法增加形参，统一为fromatter:function(value,index,opts){}
+- uCharts.js 修复横屏模式下无法使用双指缩放方法的bug
+- uCharts.js 修复当只有一条数据或者多条数据值相等的时候Y轴自动计算的最大值错误的bug
+- 【官网模板】增加外部自定义图例与图表交互的例子，[点击跳转](https://www.ucharts.cn/v2/#/layout/info?id=2)
+
+## 注意：非unimodules 版本如因更新 hbx 至 3.4.7 导致报错如下，请到码云更新非 unimodules 版本组件，[点击跳转](https://gitee.com/uCharts/uCharts/tree/master/uni-app/uCharts-%E7%BB%84%E4%BB%B6)
+> Error in callback for immediate watcher "uchartsOpts": "SyntaxError: Unexpected token u in JSON at position 0"
+## 2.4.2-20220421（2022-04-21）
+- 秋云图表组件 修复HBX升级3.4.6.20220420版本后echarts报错的问题
+## 2.4.2-20220420（2022-04-20）
+## 重要！此版本uCharts新增了很多功能，修复了诸多已知问题
+- 秋云图表组件 新增onzoom开启双指缩放功能（仅uCharts），前提需要直角坐标系类图表类型，并且ontouch为true、opts.enableScroll为true，详见实例项目K线图
+- 秋云图表组件 新增optsWatch是否监听opts变化，关闭optsWatch后，动态修改opts不会触发图表重绘
+- 秋云图表组件 修复开启canvas2d功能后，动态更新数据后画布闪动的bug
+- 秋云图表组件 去除directory属性，改为自动获取echarts.min.js路径（升级不受影响）
+- 秋云图表组件 增加getImage()方法及@getImage事件，通过ref调用getImage()方法获，触发@getImage事件获取当前画布的base64图片文件流。
+- 秋云图表组件 支付宝、字节跳动、飞书、快手小程序支持开启canvas2d同层渲染设置。
+- 秋云图表组件 新增加【非uniCloud】版本组件，避免有些不需要uniCloud的使用组件发布至小程序需要提交隐私声明问题，请到码云[【非uniCloud版本】](https://gitee.com/uCharts/uCharts/tree/master/uni-app/uCharts-%E7%BB%84%E4%BB%B6)，或npm[【非uniCloud版本】](https://www.npmjs.com/package/@qiun/uni-ucharts)下载使用。
+- uCharts.js 新增dobuleZoom双指缩放功能
+- uCharts.js 新增山峰图type="mount"，数据格式为饼图类格式，不需要传入categories，具体详见新版官网在线演示
+- uCharts.js 修复折线图当数据中存在null时tooltip报错的bug
+- uCharts.js 修复饼图类当画布比较小时自动计算的半径是负数报错的bug
+- uCharts.js 统一各图表类型的series.formatter格式化方法的形参为(val, index, series, opts)，方便格式化时有更多参数可用
+- uCharts.js 标记线功能增加labelText自定义显示文字，增加labelAlign标签显示位置（左侧或右侧），增加标签显示位置微调labelOffsetX、labelOffsetY
+- uCharts.js 修复条状图当数值很小时开启圆角后样式错误的bug
+- uCharts.js 修复X轴开启disabled后，X轴仍占用空间的bug
+- uCharts.js 修复X轴开启滚动条并且开启rotateLabel后，X轴文字与滚动条重叠的bug
+- uCharts.js 增加X轴rotateAngle文字旋转自定义角度，取值范围(-90至90)
+- uCharts.js 修复地图文字标签层级显示不正确的bug
+- uCharts.js 修复饼图、圆环图、玫瑰图当数据全部为0的时候不显示数据标签的bug
+- uCharts.js 修复当opts.padding上边距为0时，Y轴顶部刻度标签位置不正确的bug
+
+## 另外我们还开发了各大原生小程序组件，已发布至码云和npm
+[https://gitee.com/uCharts/uCharts](https://gitee.com/uCharts/uCharts)
+[https://www.npmjs.com/~qiun](https://www.npmjs.com/~qiun)
+
+## 对于原生uCharts文档我们已上线新版官方网站，详情点击下面链接进入官网
+[https://www.uCharts.cn/v2/](https://www.ucharts.cn/v2/)
+## 2.3.7-20220122（2022-01-22）
+## 重要！使用vue3编译，请使用cli模式并升级至最新依赖，HbuilderX编译需要使用3.3.8以上版本
+- uCharts.js 修复uni-app平台组件模式使用vue3编译到小程序报错的bug。
+## 2.3.7-20220118（2022-01-18）
+## 注意，使用vue3的前提是需要3.3.8.20220114-alpha版本的HBuilder！
+## 2.3.67-20220118（2022-01-18）
+- 秋云图表组件 组件初步支持vue3，全端编译会有些问题，具体详见下面修改：
+1. 小程序端运行时，在uni_modules文件夹的qiun-data-charts.js中搜索 new uni_modules_qiunDataCharts_js_sdk_uCharts_uCharts.uCharts，将.uCharts去掉。
+2. 小程序端发行时，在uni_modules文件夹的qiun-data-charts.js中搜索 new e.uCharts，将.uCharts去掉，变为 new e。
+3. 如果觉得上述步骤比较麻烦，如果您的项目只编译到小程序端，可以修改u-charts.js最后一行导出方式，将 export default uCharts;变更为 export default { uCharts: uCharts }; 这样变更后，H5和App端的renderjs会有问题，请开发者自行选择。（此问题非组件问题，请等待DC官方修复Vue3的小程序端）
+## 2.3.6-20220111（2022-01-11）
+- 秋云图表组件 修改组件 props 属性中的 background 默认值为 rgba(0,0,0,0)
+## 2.3.6-20211201（2021-12-01）
+- uCharts.js 修复bar条状图开启圆角模式时，值很小时圆角渲染错误的bug
+## 2.3.5-20211014（2021-10-15）
+- uCharts.js 增加vue3的编译支持（仅原生uCharts，qiun-data-charts组件后续会支持，请关注更新）
+## 2.3.4-20211012（2021-10-12）
+- 秋云图表组件 修复 mac os x 系统 mouseover 事件丢失的 bug
+## 2.3.3-20210706（2021-07-06）
+- uCharts.js 增加雷达图开启数据点值（opts.dataLabel）的显示
+## 2.3.2-20210627（2021-06-27）
+- 秋云图表组件 修复tooltipCustom个别情况下传值不正确报错TypeError: Cannot read property 'name' of undefined的bug
+## 2.3.1-20210616（2021-06-16）
+- uCharts.js 修复圆角柱状图使用4角圆角时，当数值过大时不正确的bug
+## 2.3.0-20210612（2021-06-12）
+- uCharts.js 【重要】uCharts增加nvue兼容，可在nvue项目中使用gcanvas组件渲染uCharts，[详见码云uCharts-demo-nvue](https://gitee.com/uCharts/uCharts)
+- 秋云图表组件 增加tapLegend属性，是否开启图例点击交互事件
+- 秋云图表组件 getIndex事件中增加返回uCharts实例中的opts参数，以便在页面中调用参数
+- 示例项目 pages/other/other.vue增加app端自定义tooltip的方法，详见showOptsTooltip方法
+## 2.2.1-20210603（2021-06-03）
+- uCharts.js 修复饼图、圆环图、玫瑰图，当起始角度不为0时，tooltip位置不准确的bug
+- uCharts.js 增加温度计式柱状图开启顶部半圆形的配置
+## 2.2.0-20210529（2021-05-29）
+- uCharts.js 增加条状图type="bar"
+- 示例项目 pages/ucharts/ucharts.vue增加条状图的demo
+## 2.1.7-20210524（2021-05-24）
+- uCharts.js 修复大数据量模式下曲线图不平滑的bug
+## 2.1.6-20210523（2021-05-23）
+- 秋云图表组件 修复小程序端开启滚动条更新数据后滚动条位置不符合预期的bug
+## 2.1.5-2021051702（2021-05-17）
+- uCharts.js 修复自定义Y轴min和max值为0时不能正确显示的bug
+## 2.1.5-20210517（2021-05-17）
+- uCharts.js 修复Y轴自定义min和max时，未按指定的最大值最小值显示坐标轴刻度的bug
+## 2.1.4-20210516（2021-05-16）
+- 秋云图表组件 优化onWindowResize防抖方法
+- 秋云图表组件 修复APP端uCharts更新数据时，清空series显示loading图标后再显示图表，图表抖动的bug
+- uCharts.js 修复开启canvas2d后，x轴、y轴、series自定义字体大小未按比例缩放的bug
+- 示例项目 修复format-e.vue拼写错误导致app端使用uCharts渲染图表
+## 2.1.3-20210513（2021-05-13）
+- 秋云图表组件 修改uCharts变更chartData数据为updateData方法，支持带滚动条的数据动态打点
+- 秋云图表组件 增加onWindowResize防抖方法 fix by ど誓言，如尘般染指流年づ 
+- 秋云图表组件 H5或者APP变更chartData数据显示loading图表时，原数据闪现的bug
+- 秋云图表组件 props增加errorReload禁用错误点击重新加载的方法
+- uCharts.js 增加tooltip显示category（x轴对应点位）标题的功能，opts.extra.tooltip.showCategory，默认为false
+- uCharts.js 修复mix混合图只有柱状图时，tooltip的分割线显示位置不正确的bug
+- uCharts.js 修复开启滚动条，图表在拖动中动态打点，滚动条位置不正确的bug
+- uCharts.js 修复饼图类数据格式为echarts数据格式，series为空数组报错的bug
+- 示例项目 修改uCharts.js更新到v2.1.2版本后，@getIndex方法获取索引值变更为e.currentIndex.index
+- 示例项目 pages/updata/updata.vue增加滚动条拖动更新（数据动态打点）的demo
+- 示例项目 pages/other/other.vue增加errorReload禁用错误点击重新加载的demo
+## 2.1.2-20210509（2021-05-09）
+秋云图表组件 修复APP端初始化时就传入chartData或lacaldata不显示图表的bug
+## 2.1.1-20210509（2021-05-09）
+- 秋云图表组件 变更ECharts的eopts配置在renderjs内执行，支持在config-echarts.js配置文件内写function配置。
+- 秋云图表组件 修复APP端报错Prop being mutated: "onmouse"错误的bug。
+- 秋云图表组件 修复APP端报错Error: Not Found：Page[6][-1,27] at view.umd.min.js:1的bug。
+## 2.1.0-20210507（2021-05-07）
+- 秋云图表组件 修复初始化时就有数据或者数据更新的时候loading加载动画闪动的bug
+- uCharts.js 修复x轴format方法categories为字符串类型时返回NaN的bug
+- uCharts.js 修复series.textColor、legend.fontColor未执行全局默认颜色的bug
+## 2.1.0-20210506（2021-05-06）
+- 秋云图表组件 修复极个别情况下报错item.properties undefined的bug
+- 秋云图表组件 修复极个别情况下关闭加载动画reshow不起作用，无法显示图表的bug
+- 示例项目 pages/ucharts/ucharts.vue 增加时间轴折线图（type="tline"）、时间轴区域图（type="tarea"）、散点图（type="scatter"）、气泡图demo（type="bubble"）、倒三角形漏斗图（opts.extra.funnel.type="triangle"）、金字塔形漏斗图（opts.extra.funnel.type="pyramid"）
+- 示例项目 pages/format-u/format-u.vue 增加X轴format格式化示例
+- uCharts.js 升级至v2.1.0版本
+- uCharts.js 修复 玫瑰图面积模式点击tooltip位置不正确的bug
+- uCharts.js 修复 玫瑰图点击图例，只剩一个类别显示空白的bug
+- uCharts.js 修复 饼图类图点击图例，其他图表tooltip位置某些情况下不准的bug
+- uCharts.js 修复 x轴为矢量轴（时间轴）情况下，点击tooltip位置不正确的bug
+- uCharts.js 修复 词云图获取点击索引偶尔不准的bug
+- uCharts.js 增加 直角坐标系图表X轴format格式化方法（原生uCharts.js用法请使用formatter）
+- uCharts.js 增加 漏斗图扩展配置，倒三角形（opts.extra.funnel.type="triangle"），金字塔形（opts.extra.funnel.type="pyramid"）
+- uCharts.js 增加 散点图（opts.type="scatter"）、气泡图（opts.type="bubble"）
+- 后期计划 完善散点图、气泡图，增加markPoints标记点，增加横向条状图。
+## 2.0.0-20210502（2021-05-02）
+- uCharts.js 修复词云图获取点击索引不正确的bug
+## 2.0.0-20210501（2021-05-01）
+- 秋云图表组件 修复QQ小程序、百度小程序在关闭动画效果情况下，v-for循环使用图表，显示不正确的bug
+## 2.0.0-20210426（2021-04-26）
+- 秋云图表组件 修复QQ小程序不支持canvas2d的bug
+- 秋云图表组件 修复钉钉小程序某些情况点击坐标计算错误的bug
+- uCharts.js 增加 extra.column.categoryGap 参数，柱状图类每个category点位（X轴点）柱子组之间的间距
+- uCharts.js 增加 yAxis.data[i].titleOffsetY 参数，标题纵向偏移距离，负数为向上偏移，正数向下偏移
+- uCharts.js 增加 yAxis.data[i].titleOffsetX 参数，标题横向偏移距离，负数为向左偏移，正数向右偏移
+- uCharts.js 增加 extra.gauge.labelOffset 参数，仪表盘标签文字径向便宜距离，默认13px
+## 2.0.0-20210422-2（2021-04-22）
+秋云图表组件 修复 formatterAssign 未判断 args[key] == null 的情况导致栈溢出的 bug
+## 2.0.0-20210422（2021-04-22）
+- 秋云图表组件 修复H5、APP、支付宝小程序、微信小程序canvas2d模式下横屏模式的bug
+## 2.0.0-20210421（2021-04-21）
+- uCharts.js 修复多行图例的情况下，图例在上方或者下方时，图例float为左侧或者右侧时，第二行及以后的图例对齐方式不正确的bug
+## 2.0.0-20210420（2021-04-20）
+- 秋云图表组件 修复微信小程序开启canvas2d模式后，windows版微信小程序不支持canvas2d模式的bug
+- 秋云图表组件 修改非uni_modules版本为v2.0版本qiun-data-charts组件
+## 2.0.0-20210419（2021-04-19）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册<qiun-data-charts>组件，请重启HBuilderX，如仍不好用，请重启电脑；
+## 如果是cli项目，请尝试清理node_modules，重新install，还不行就删除项目，再重新install。
+## 此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## 其他图表不显示问题详见[常见问题选项卡](https://demo.ucharts.cn)
+## <font color=#FF0000> 新手请先完整阅读帮助文档及常见问题3遍，右侧蓝色按钮示例项目请看2遍！ </font> 
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在项目中的应用参见 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- uCharts.js 修复混合图中柱状图单独设置颜色不生效的bug
+- uCharts.js 修复多Y轴单独设置fontSize时，开启canvas2d后，未对应放大字体的bug
+## 2.0.0-20210418（2021-04-18）
+- 秋云图表组件 增加directory配置，修复H5端history模式下如果发布到二级目录无法正确加载echarts.min.js的bug
+## 2.0.0-20210416（2021-04-16）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册&lt;qiun-data-charts&gt;组件，请重启HBuilderX，如仍不好用，请重启电脑；
+## 如果是cli项目，请尝试清理node_modules，重新install，还不行就删除项目，再重新install。
+## 此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## 其他图表不显示问题详见[常见问题选项卡](https://demo.ucharts.cn)
+## <font color=#FF0000> 新手请先完整阅读帮助文档及常见问题3遍，右侧蓝色按钮示例项目请看2遍！ </font> 
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在项目中的应用参见 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- 秋云图表组件 修复APP端某些情况下报错`Not Found Page`的bug，fix by 高级bug开发技术员
+- 示例项目 修复APP端v-for循环某些情况下报错`Not Found Page`的bug，fix by 高级bug开发技术员
+- uCharts.js 修复非直角坐标系tooltip提示窗右侧超出未变换方向显示的bug
+## 2.0.0-20210415（2021-04-15）
+- 秋云图表组件 修复H5端发布到二级目录下echarts无法加载的bug
+- 秋云图表组件 修复某些情况下echarts.off('finished')移除监听事件报错的bug
+## 2.0.0-20210414（2021-04-14）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册&lt;qiun-data-charts&gt;组件，请重启HBuilderX，如仍不好用，请重启电脑；
+## 如果是cli项目，请尝试清理node_modules，重新install，还不行就删除项目，再重新install。
+## 此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## 其他图表不显示问题详见[常见问题选项卡](https://demo.ucharts.cn)
+## <font color=#FF0000> 新手请先完整阅读帮助文档及常见问题3遍，右侧蓝色按钮示例项目请看2遍！ </font> 
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在项目中的应用参见 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- 秋云图表组件 修复H5端在cli项目下ECharts引用地址错误的bug
+- 示例项目 增加ECharts的formatter用法的示例(详见示例项目format-e.vue)
+- uCharts.js 增加圆环图中心背景色的配置extra.ring.centerColor
+- uCharts.js 修复微信小程序安卓端柱状图开启透明色后显示不正确的bug
+## 2.0.0-20210413（2021-04-13）
+- 秋云图表组件 修复百度小程序多个图表真机未能正确获取根元素dom尺寸的bug
+- 秋云图表组件 修复百度小程序横屏模式方向不正确的bug
+- 秋云图表组件 修改ontouch时，@getTouchStart@getTouchMove@getTouchEnd的触发条件
+- uCharts.js 修复饼图类数据格式series属性不生效的bug
+- uCharts.js 增加时序区域图 详见示例项目中ucharts.vue
+## 2.0.0-20210412-2（2021-04-12）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册&lt;qiun-data-charts&gt;组件，请重启HBuilderX。如仍不好用，请重启电脑，此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在uniCloudAdmin中的应用 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- 秋云图表组件 修复uCharts在APP端横屏模式下不能正确渲染的bug
+- 示例项目 增加ECharts柱状图渐变色、圆角柱状图、横向柱状图（条状图）的示例
+## 2.0.0-20210412（2021-04-12）
+- 秋云图表组件 修复created中判断echarts导致APP端无法识别，改回mounted中判断echarts初始化
+- uCharts.js 修复2d模式下series.textOffset未乘像素比的bug
+## 2.0.0-20210411（2021-04-11）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册<qiun-data-charts>组件，请重启HBuilderX，并清空小程序开发者工具缓存。
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在uniCloudAdmin中的应用 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- uCharts.js 折线图区域图增加connectNulls断点续连的功能，详见示例项目中ucharts.vue
+- 秋云图表组件 变更初始化方法为created，变更type2d默认值为true，优化2d模式下组件初始化后dom获取不到的bug
+- 秋云图表组件 修复左右布局时，右侧图表点击坐标错误的bug，修复tooltip柱状图自定义颜色显示object的bug
+## 2.0.0-20210410（2021-04-10）
+- 修复左右布局时，右侧图表点击坐标错误的bug，修复柱状图自定义颜色tooltip显示object的bug
+- 增加标记线及柱状图自定义颜色的demo
+## 2.0.0-20210409（2021-04-08）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧【使用HBuilderX导入插件】即可体验，DEMO演示及在线生成工具（v2.0文档）[https://demo.ucharts.cn](https://demo.ucharts.cn)
+## 图表组件在uniCloudAdmin中的应用 [UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- uCharts.js 修复钉钉小程序百度小程序measureText不准确的bug，修复2d模式下饼图类activeRadius为按比例放大的bug
+- 修复组件在支付宝小程序端点击位置不准确的bug
+## 2.0.0-20210408（2021-04-07）
+- 修复组件在支付宝小程序端不能显示的bug（目前支付宝小程不能点击交互，后续修复）
+- uCharts.js 修复高分屏下柱状图类，圆弧进度条 自定义宽度不能按比例放大的bug
+## 2.0.0-20210407（2021-04-06）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧【使用HBuilderX导入插件】即可体验，DEMO演示及在线生成工具（v2.0文档）[https://demo.ucharts.cn](https://demo.ucharts.cn)
+## 增加 通过tofix和unit快速格式化y轴的demo add by `howcode`
+## 增加 图表组件在uniCloudAdmin中的应用 [UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+## 2.0.0-20210406（2021-04-05）
+# 秋云图表组件+uCharts v2.0版本同步上线，使用方法详见https://demo.ucharts.cn帮助页
+## 2.0.0（2021-04-05）
+# 秋云图表组件+uCharts v2.0版本同步上线，使用方法详见https://demo.ucharts.cn帮助页

uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue

@@ -0,0 +1,162 @@
+<template>
+	 <view class="container loading1">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading1',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+.container.loading1 {
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+.loading1 .shape1 {
+  -webkit-animation: animation1shape1 0.5s ease 0s infinite alternate;
+          animation: animation1shape1 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, 16px);
+            transform: translate(16px, 16px);
+  }
+}
+
+@keyframes animation1shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, 16px);
+            transform: translate(16px, 16px);
+  }
+}
+.loading1 .shape2 {
+  -webkit-animation: animation1shape2 0.5s ease 0s infinite alternate;
+          animation: animation1shape2 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, 16px);
+            transform: translate(-16px, 16px);
+  }
+}
+
+@keyframes animation1shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, 16px);
+            transform: translate(-16px, 16px);
+  }
+}
+.loading1 .shape3 {
+  -webkit-animation: animation1shape3 0.5s ease 0s infinite alternate;
+          animation: animation1shape3 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, -16px);
+            transform: translate(16px, -16px);
+  }
+}
+
+@keyframes animation1shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, -16px);
+            transform: translate(16px, -16px);
+  }
+}
+.loading1 .shape4 {
+  -webkit-animation: animation1shape4 0.5s ease 0s infinite alternate;
+          animation: animation1shape4 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, -16px);
+            transform: translate(-16px, -16px);
+  }
+}
+
+@keyframes animation1shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, -16px);
+            transform: translate(-16px, -16px);
+  }
+}
+
+
+</style>

uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue

@@ -0,0 +1,170 @@
+<template>
+	 <view class="container loading2">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading2',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+.container.loading2 {
+  -webkit-transform: rotate(10deg);
+          transform: rotate(10deg);
+}
+.container.loading2 .shape {
+  border-radius: 5px;
+}
+.container.loading2{
+  -webkit-animation: rotation 1s infinite;
+          animation: rotation 1s infinite;
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+
+.loading2 .shape1 {
+  -webkit-animation: animation2shape1 0.5s ease 0s infinite alternate;
+          animation: animation2shape1 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, 20px);
+            transform: translate(20px, 20px);
+  }
+}
+
+@keyframes animation2shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, 20px);
+            transform: translate(20px, 20px);
+  }
+}
+.loading2 .shape2 {
+  -webkit-animation: animation2shape2 0.5s ease 0s infinite alternate;
+          animation: animation2shape2 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, 20px);
+            transform: translate(-20px, 20px);
+  }
+}
+
+@keyframes animation2shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, 20px);
+            transform: translate(-20px, 20px);
+  }
+}
+.loading2 .shape3 {
+  -webkit-animation: animation2shape3 0.5s ease 0s infinite alternate;
+          animation: animation2shape3 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, -20px);
+            transform: translate(20px, -20px);
+  }
+}
+
+@keyframes animation2shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, -20px);
+            transform: translate(20px, -20px);
+  }
+}
+.loading2 .shape4 {
+  -webkit-animation: animation2shape4 0.5s ease 0s infinite alternate;
+          animation: animation2shape4 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, -20px);
+            transform: translate(-20px, -20px);
+  }
+}
+
+@keyframes animation2shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, -20px);
+            transform: translate(-20px, -20px);
+  }
+}
+
+</style>

uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue

@@ -0,0 +1,173 @@
+<template>
+	 <view class="container loading3">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading3',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+ .container.loading3 {
+  -webkit-animation: rotation 1s infinite;
+          animation: rotation 1s infinite;
+}
+.container.loading3 .shape1 {
+  border-top-left-radius: 10px;
+}
+.container.loading3 .shape2 {
+  border-top-right-radius: 10px;
+}
+.container.loading3 .shape3 {
+  border-bottom-left-radius: 10px;
+}
+.container.loading3 .shape4 {
+  border-bottom-right-radius: 10px;
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+.loading3 .shape1 {
+  -webkit-animation: animation3shape1 0.5s ease 0s infinite alternate;
+          animation: animation3shape1 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, 5px);
+            transform: translate(5px, 5px);
+  }
+}
+
+@keyframes animation3shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, 5px);
+            transform: translate(5px, 5px);
+  }
+}
+.loading3 .shape2 {
+  -webkit-animation: animation3shape2 0.5s ease 0s infinite alternate;
+          animation: animation3shape2 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, 5px);
+            transform: translate(-5px, 5px);
+  }
+}
+
+@keyframes animation3shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, 5px);
+            transform: translate(-5px, 5px);
+  }
+}
+.loading3 .shape3 {
+  -webkit-animation: animation3shape3 0.5s ease 0s infinite alternate;
+          animation: animation3shape3 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, -5px);
+            transform: translate(5px, -5px);
+  }
+}
+
+@keyframes animation3shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, -5px);
+            transform: translate(5px, -5px);
+  }
+}
+.loading3 .shape4 {
+  -webkit-animation: animation3shape4 0.5s ease 0s infinite alternate;
+          animation: animation3shape4 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, -5px);
+            transform: translate(-5px, -5px);
+  }
+}
+
+@keyframes animation3shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, -5px);
+            transform: translate(-5px, -5px);
+  }
+}
+</style>

uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue

@@ -0,0 +1,222 @@
+<template>
+	 <view class="container loading5">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading5',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+.container.loading5 .shape {
+  width: 15px;
+  height: 15px;
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+.loading5 .shape1 {
+  animation: animation5shape1 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape1 {
+  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 {
+  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 {
+  animation: animation5shape2 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape2 {
+  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 {
+  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 {
+  animation: animation5shape3 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape3 {
+  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 {
+  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 {
+  animation: animation5shape4 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape4 {
+  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 {
+  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);
+  }
+}
+
+</style>

uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue

@@ -0,0 +1,229 @@
+<template>
+	 <view class="container loading6">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading6',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+.container.loading6 {
+  -webkit-animation: rotation 1s infinite;
+          animation: rotation 1s infinite;
+}
+.container.loading6 .shape {
+  width: 12px;
+  height: 12px;
+  border-radius: 2px;
+}
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+
+.loading6 .shape1 {
+  -webkit-animation: animation6shape1 2s linear 0s infinite normal;
+          animation: animation6shape1 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape1 {
+  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 {
+  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 {
+  -webkit-animation: animation6shape2 2s linear 0s infinite normal;
+          animation: animation6shape2 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape2 {
+  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 {
+  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 {
+  -webkit-animation: animation6shape3 2s linear 0s infinite normal;
+          animation: animation6shape3 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape3 {
+  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 {
+  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 {
+  -webkit-animation: animation6shape4 2s linear 0s infinite normal;
+          animation: animation6shape4 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape4 {
+  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 {
+  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);
+  }
+}
+</style>

uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue

@@ -0,0 +1,36 @@
+<template>
+	<view>
+	 <Loading1 v-if="loadingType==1"/>
+	 <Loading2 v-if="loadingType==2"/>
+	 <Loading3 v-if="loadingType==3"/>
+	 <Loading4 v-if="loadingType==4"/>
+	 <Loading5 v-if="loadingType==5"/>
+	</view>
+</template>
+
+<script>
+	import Loading1 from "./loading1.vue";
+	import Loading2 from "./loading2.vue";
+	import Loading3 from "./loading3.vue";
+	import Loading4 from "./loading4.vue";
+	import Loading5 from "./loading5.vue";
+	export default {
+		components:{Loading1,Loading2,Loading3,Loading4,Loading5},
+		name: 'qiun-loading',
+		props: {
+			loadingType: {
+				type: Number,
+				default: 2
+			},
+		},
+		data() {
+			return {
+				
+			};
+		},
+	}
+</script>
+
+<style>
+
+</style>

uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js

@@ -0,0 +1,422 @@
+/*
+ * uCharts®
+ * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360）、Vue、Taro等支持canvas的框架平台
+ * Copyright (c) 2021 QIUN®秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 复制使用请保留本段注释，感谢支持开源！
+ * 
+ * uCharts®官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ */
+
+// 通用配置项
+
+// 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
+const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
+
+const cfe = {
+  //demotype为自定义图表类型
+	"type": ["pie", "ring", "rose", "funnel", "line", "column", "area", "radar", "gauge","candle","demotype"],
+  //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型例如最后的"demotype"
+	"categories": ["line", "column", "area", "radar", "gauge", "candle","demotype"],
+  //instance为实例变量承载属性，option为eopts承载属性，不要删除
+	"instance": {},
+	"option": {},
+  //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+  "formatter":{
+    "tooltipDemo1":function(res){
+      let result = ''
+      for (let i in res) {
+      	if (i == 0) {
+      		result += res[i].axisValueLabel + '年销售额'
+      	}
+      	let value = '--'
+      	if (res[i].data !== null) {
+      		value = res[i].data
+      	}
+      	// #ifdef H5
+      	result += '\n' + res[i].seriesName + '：' + value + ' 万元'
+      	// #endif
+      	
+      	// #ifdef APP-PLUS
+      	result += '<br/>' + res[i].marker + res[i].seriesName + '：' + value + ' 万元'
+      	// #endif
+      }
+      return result;
+    },
+    legendFormat:function(name){
+      return "自定义图例+"+name;
+    },
+    yAxisFormatDemo:function (value, index) {
+      return value + '元';
+    },
+    seriesFormatDemo:function(res){
+      return res.name + '年' + res.value + '元';
+    }
+  },
+  //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在eopts参数，会将demotype与eopts中option合并后渲染图表。
+  "demotype":{
+    "color": color,
+    //在这里填写echarts的option即可
+    
+  },
+  //下面是自定义配置，请添加项目所需的通用配置
+	"column": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'axis'
+		},
+		"grid": {
+			"top": 30,
+			"bottom": 50,
+			"right": 15,
+			"left": 40
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"toolbox": {
+			"show": false,
+		},
+		"xAxis": {
+			"type": 'category',
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+			"boundaryGap": true,
+			"data": []
+		},
+		"yAxis": {
+			"type": 'value',
+			"axisTick": {
+				"show": false,
+			},
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'bar',
+			"data": [],
+			"barwidth": 20,
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"line": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'axis'
+		},
+		"grid": {
+			"top": 30,
+			"bottom": 50,
+			"right": 15,
+			"left": 40
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"toolbox": {
+			"show": false,
+		},
+		"xAxis": {
+			"type": 'category',
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+			"boundaryGap": true,
+			"data": []
+		},
+		"yAxis": {
+			"type": 'value',
+			"axisTick": {
+				"show": false,
+			},
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'line',
+			"data": [],
+			"barwidth": 20,
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"area": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'axis'
+		},
+		"grid": {
+			"top": 30,
+			"bottom": 50,
+			"right": 15,
+			"left": 40
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"toolbox": {
+			"show": false,
+		},
+		"xAxis": {
+			"type": 'category',
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+			"boundaryGap": true,
+			"data": []
+		},
+		"yAxis": {
+			"type": 'value',
+			"axisTick": {
+				"show": false,
+			},
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'line',
+			"data": [],
+			"areaStyle": {},
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"pie": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item'
+		},
+		"grid": {
+			"top": 40,
+			"bottom": 30,
+			"right": 15,
+			"left": 15
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'pie',
+			"data": [],
+			"radius": '50%',
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"ring": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item'
+		},
+		"grid": {
+			"top": 40,
+			"bottom": 30,
+			"right": 15,
+			"left": 15
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'pie',
+			"data": [],
+			"radius": ['40%', '70%'],
+			"avoidLabelOverlap": false,
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+			"labelLine": {
+				"show": true
+			},
+		},
+	},
+	"rose": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item'
+		},
+		"legend": {
+			"top": 'bottom'
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'pie',
+			"data": [],
+			"radius": "55%",
+			"center": ['50%', '50%'],
+			"roseType": 'area',
+		},
+	},
+	"funnel": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item',
+			"formatter": "{b} : {c}%"
+		},
+		"legend": {
+			"top": 'bottom'
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'funnel',
+			"left": '10%',
+			"top": 60,
+			"bottom": 60,
+			"width": '80%',
+			"min": 0,
+			"max": 100,
+			"minSize": '0%',
+			"maxSize": '100%',
+			"sort": 'descending',
+			"gap": 2,
+			"label": {
+				"show": true,
+				"position": 'inside'
+			},
+			"labelLine": {
+				"length": 10,
+				"lineStyle": {
+					"width": 1,
+					"type": 'solid'
+				}
+			},
+			"itemStyle": {
+				"bordercolor": '#fff',
+				"borderwidth": 1
+			},
+			"emphasis": {
+				"label": {
+					"fontSize": 20
+				}
+			},
+			"data": [],
+		},
+	},
+	"gauge": {
+		"color": color,
+		"tooltip": {
+        "formatter": '{a} <br/>{b} : {c}%'
+    },
+		"seriesTemplate": {
+			"name": '业务指标',
+      "type": 'gauge',
+      "detail": {"formatter": '{value}%'},
+      "data": [{"value": 50, "name": '完成率'}]
+		},
+	},
+	"candle": {
+		"xAxis": {
+			"data": []
+		},
+		"yAxis": {},
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"dataZoom": [{
+				"type": 'inside',
+				"xAxisIndex": [0, 1],
+				"start": 10,
+				"end": 100
+			},
+			{
+				"show": true,
+				"xAxisIndex": [0, 1],
+				"type": 'slider',
+				"bottom": 10,
+				"start": 10,
+				"end": 100
+			}
+		],
+		"seriesTemplate": {
+			"name": '',
+			"type": 'k',
+			"data": [],
+		},
+	}
+}
+
+export default cfe;

uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -0,0 +1,606 @@
+/*
+ * uCharts®
+ * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360）、Vue、Taro等支持canvas的框架平台
+ * Copyright (c) 2021 QIUN®秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 复制使用请保留本段注释，感谢支持开源！
+ * 
+ * uCharts®官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ */
+
+// 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
+const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
+
+//事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
+const formatDateTime = (timeStamp, returnType)=>{
+  var date = new Date();
+  date.setTime(timeStamp * 1000);
+  var y = date.getFullYear();
+  var m = date.getMonth() + 1;
+  m = m < 10 ? ('0' + m) : m;
+  var d = date.getDate();
+  d = d < 10 ? ('0' + d) : d;
+  var h = date.getHours();
+  h = h < 10 ? ('0' + h) : h;
+  var minute = date.getMinutes();
+  var second = date.getSeconds();
+  minute = minute < 10 ? ('0' + minute) : minute;
+  second = second < 10 ? ('0' + second) : second;
+  if(returnType == 'full'){return y + '-' + m + '-' + d + ' '+ h +':' + minute + ':' + second;}
+  if(returnType == 'y-m-d'){return y + '-' + m + '-' + d;}
+  if(returnType == 'h:m'){return  h +':' + minute;}
+  if(returnType == 'h:m:s'){return  h +':' + minute +':' + second;}
+  return [y, m, d, h, minute, second];
+}
+
+const cfu = {
+  //demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
+	"type":["pie","ring","rose","word","funnel","map","arcbar","line","column","mount","bar","area","radar","gauge","candle","mix","tline","tarea","scatter","bubble","demotype"],
+	"range":["饼状图","圆环图","玫瑰图","词云图","漏斗图","地图","圆弧进度条","折线图","柱状图","山峰图","条状图","区域图","雷达图","仪表盘","K线图","混合图","时间轴折线","时间轴区域","散点图","气泡图","自定义类型"],
+  //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
+  //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
+	"categories":["line","column","mount","bar","area","radar","gauge","candle","mix","demotype"],
+  //instance为实例变量承载属性，不要删除
+  "instance":{},
+  //option为opts及eopts承载属性，不要删除
+  "option":{},
+  //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+  "formatter":{
+    "yAxisDemo1":function(val, index, opts){return val+'元'},
+    "yAxisDemo2":function(val, index, opts){return val.toFixed(2)},
+    "xAxisDemo1":function(val, index, opts){return val+'年';},
+    "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')},
+    "seriesDemo1":function(val, index, series, opts){return val+'元'},
+    "tooltipDemo1":function(item, category, index, opts){
+      if(index==0){
+      	return '随便用'+item.data+'年'
+      }else{
+      	return '其他我没改'+item.data+'天'
+      }
+    },
+    "pieDemo":function(val, index, series, opts){
+      if(index !== undefined){
+        return series[index].name+'：'+series[index].data+'元'
+      }
+    },
+  },
+  //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
+  "demotype":{
+    //我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
+    "type": "line",
+    "color": color,
+    "padding": [15,10,0,15],
+    "xAxis": {
+      "disableGrid": true,
+    },
+    "yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+    },
+    "legend": {
+    },
+    "extra": {
+    	"line": {
+    		"type": "curve",
+    		"width": 2
+    	},
+    }
+  },
+  //下面是自定义配置，请添加项目所需的通用配置
+	"pie":{
+		"type": "pie",
+    "color": color,
+		"padding": [5,5,5,5],
+		"extra": {
+			"pie": {
+				"activeOpacity": 0.5,
+				"activeRadius": 10,
+				"offsetAngle": 0,
+				"labelWidth": 15,
+				"border": true,
+				"borderWidth": 3,
+				"borderColor": "#FFFFFF"
+			},
+		}
+	},
+	"ring":{
+		"type": "ring",
+    "color": color,
+		"padding": [5,5,5,5],
+		"rotate": false,
+		"dataLabel": true,
+		"legend": {
+			"show": true,
+			"position": "right",
+      "lineHeight": 25,
+		},
+		"title": {
+			"name": "收益率",
+			"fontSize": 15,
+			"color": "#666666"
+		},
+		"subtitle": {
+			"name": "70%",
+			"fontSize": 25,
+			"color": "#7cb5ec"
+		},
+		"extra": {
+			"ring": {
+				"ringWidth":30,
+				"activeOpacity": 0.5,
+				"activeRadius": 10,
+				"offsetAngle": 0,
+				"labelWidth": 15,
+				"border": true,
+				"borderWidth": 3,
+				"borderColor": "#FFFFFF"
+			},
+		},
+	},
+	"rose":{
+		"type": "rose",
+    "color": color,
+		"padding": [5,5,5,5],
+		"legend": {
+			"show": true,
+			"position": "left",
+      "lineHeight": 25,
+		},
+		"extra": {
+			"rose": {
+				"type": "area",
+				"minRadius": 50,
+				"activeOpacity": 0.5,
+				"activeRadius": 10,
+				"offsetAngle": 0,
+				"labelWidth": 15,
+				"border": false,
+				"borderWidth": 2,
+				"borderColor": "#FFFFFF"
+			},
+		}
+	},
+	"word":{
+		"type": "word",
+    "color": color,
+		"extra": {
+			"word": {
+				"type": "normal",
+				"autoColors": false
+			}
+		}
+	},
+	"funnel":{
+		"type": "funnel",
+    "color": color,
+		"padding": [15,15,0,15],
+		"extra": {
+			"funnel": {
+				"activeOpacity": 0.3,
+				"activeWidth": 10,
+				"border": true,
+				"borderWidth": 2,
+				"borderColor": "#FFFFFF",
+				"fillOpacity": 1,
+				"labelAlign": "right"
+			},
+		}
+	},
+	"map":{
+		"type": "map",
+    "color": color,
+		"padding": [0,0,0,0],
+    "dataLabel": true,
+		"extra": {
+			"map": {
+				"border": true,
+				"borderWidth": 1,
+				"borderColor": "#666666",
+				"fillOpacity": 0.6,
+				"activeBorderColor": "#F04864",
+				"activeFillColor": "#FACC14",
+				"activeFillOpacity": 1
+			},
+		}
+	},
+	"arcbar":{
+		"type": "arcbar",
+    "color": color,
+		"title": {
+			"name": "百分比",
+			"fontSize": 25,
+			"color": "#00FF00"
+		},
+		"subtitle": {
+			"name": "默认标题",
+			"fontSize": 15,
+			"color": "#666666"
+		},
+		"extra": {
+			"arcbar": {
+				"type": "default",
+				"width": 12,
+				"backgroundColor": "#E9E9E9",
+				"startAngle": 0.75,
+				"endAngle": 0.25,
+				"gap": 2
+			}
+		}
+	},
+	"line":{
+		"type": "line",
+    "color": color,
+		"padding": [15,10,0,15],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+		},
+		"legend": {
+		},
+		"extra": {
+			"line": {
+				"type": "straight",
+				"width": 2,
+        "activeType": "hollow"
+			},
+		}
+	},
+  "tline":{
+  	"type": "line",
+    "color": color,
+  	"padding": [15,10,0,15],
+  	"xAxis": {
+      "disableGrid": false,
+      "boundaryGap":"justify",
+  	},
+  	"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+      "data":[
+        {
+          "min":0,
+          "max":80
+        }
+      ]
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"line": {
+  			"type": "curve",
+  			"width": 2,
+        "activeType": "hollow"
+  		},
+  	}
+  },
+  "tarea":{
+  	"type": "area",
+    "color": color,
+  	"padding": [15,10,0,15],
+  	"xAxis": {
+      "disableGrid": true,
+      "boundaryGap":"justify",
+  	},
+  	"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+      "data":[
+        {
+          "min":0,
+          "max":80
+        }
+      ]
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"area": {
+  			"type": "curve",
+  			"opacity": 0.2,
+  			"addLine": true,
+  			"width": 2,
+  			"gradient": true,
+        "activeType": "hollow"
+  		},
+  	}
+  },
+	"column":{
+		"type": "column",
+    "color": color,
+		"padding": [15,15,0,5],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+      "data":[{"min":0}]
+		},
+		"legend": {
+		},
+		"extra": {
+			"column": {
+				"type": "group",
+				"width": 30,
+				"activeBgColor": "#000000",
+				"activeBgOpacity": 0.08
+			},
+		}
+	},
+  "mount":{
+  	"type": "mount",
+    "color": color,
+  	"padding": [15,15,0,5],
+  	"xAxis": {
+      "disableGrid": true,
+  	},
+  	"yAxis": {
+      "data":[{"min":0}]
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"mount": {
+  			"type": "mount",
+  			"widthRatio": 1.5,
+  		},
+  	}
+  },
+  "bar":{
+  	"type": "bar",
+    "color": color,
+  	"padding": [15,30,0,5],
+  	"xAxis": {
+      "boundaryGap":"justify",
+      "disableGrid":false,
+      "min":0,
+      "axisLine":false
+  	},
+  	"yAxis": {
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"bar": {
+  			"type": "group",
+  			"width": 30,
+  			"meterBorde": 1,
+  			"meterFillColor": "#FFFFFF",
+  			"activeBgColor": "#000000",
+  			"activeBgOpacity": 0.08
+  		},
+  	}
+  },
+	"area":{
+		"type": "area",
+		"color": color,
+		"padding": [15,15,0,15],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+		},
+		"legend": {
+		},
+		"extra": {
+			"area": {
+				"type": "straight",
+				"opacity": 0.2,
+				"addLine": true,
+				"width": 2,
+				"gradient": false,
+        "activeType": "hollow"
+			},
+		}
+	},
+	"radar":{
+		"type": "radar",
+		"color": color,
+		"padding": [5,5,5,5],
+    "dataLabel": false,
+		"legend": {
+			"show": true,
+			"position": "right",
+      "lineHeight": 25,
+		},
+		"extra": {
+			"radar": {
+				"gridType": "radar",
+				"gridColor": "#CCCCCC",
+				"gridCount": 3,
+				"opacity": 0.2,
+				"max": 200,
+				"labelShow": true
+			},
+		}
+	},
+	"gauge":{
+		"type": "gauge",
+		"color": color,
+		"title": {
+			"name": "66Km/H",
+			"fontSize": 25,
+			"color": "#2fc25b",
+			"offsetY": 50
+		},
+		"subtitle": {
+			"name": "实时速度",
+			"fontSize": 15,
+			"color": "#1890ff",
+			"offsetY": -50
+		},
+		"extra": {
+			"gauge": {
+				"type": "default",
+				"width": 30,
+				"labelColor": "#666666",
+				"startAngle": 0.75,
+				"endAngle": 0.25,
+				"startNumber": 0,
+				"endNumber": 100,
+				"labelFormat": "",
+				"splitLine": {
+					"fixRadius": 0,
+					"splitNumber": 10,
+					"width": 30,
+					"color": "#FFFFFF",
+					"childNumber": 5,
+					"childWidth": 12
+				},
+				"pointer": {
+					"width": 24,
+					"color": "auto"
+				}
+			}
+		}
+	},
+	"candle":{
+		"type": "candle",
+		"color": color,
+		"padding": [15,15,0,15],
+		"enableScroll": true,
+		"enableMarkLine": true,
+		"dataLabel": false,
+		"xAxis": {
+			"labelCount": 4,
+			"itemCount": 40,
+			"disableGrid": true,
+			"gridColor": "#CCCCCC",
+			"gridType": "solid",
+			"dashLength": 4,
+			"scrollShow": true,
+			"scrollAlign": "left",
+			"scrollColor": "#A6A6A6",
+			"scrollBackgroundColor": "#EFEBEF"
+		},
+		"yAxis": {
+		},
+		"legend": {
+		},
+		"extra": {
+			"candle": {
+				"color": {
+					"upLine": "#f04864",
+					"upFill": "#f04864",
+					"downLine": "#2fc25b",
+					"downFill": "#2fc25b"
+				},
+				"average": {
+					"show": true,
+					"name": ["MA5","MA10","MA30"],
+					"day": [5,10,20],
+					"color": ["#1890ff","#2fc25b","#facc14"]
+				}
+			},
+			"markLine": {
+				"type": "dash",
+				"dashLength": 5,
+				"data": [
+					{
+						"value": 2150,
+						"lineColor": "#f04864",
+						"showLabel": true
+					},
+					{
+						"value": 2350,
+						"lineColor": "#f04864",
+						"showLabel": true
+					}
+				]
+			}
+		}
+	},
+	"mix":{
+		"type": "mix",
+		"color": color,
+		"padding": [15,15,0,15],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+			"disabled": false,
+			"disableGrid": false,
+			"splitNumber": 5,
+			"gridType": "dash",
+			"dashLength": 4,
+			"gridColor": "#CCCCCC",
+			"padding": 10,
+			"showTitle": true,
+			"data": []
+		},
+		"legend": {
+		},
+		"extra": {
+			"mix": {
+				"column": {
+					"width": 20
+				}
+			},
+		}
+	},
+	"scatter":{
+		"type": "scatter",
+		"color":color,
+		"padding":[15,15,0,15],
+    "dataLabel":false,
+    "xAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+      "splitNumber":5,
+      "boundaryGap":"justify",
+      "min":0
+    },
+    "yAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+    },
+    "legend": {
+    },
+    "extra": {
+    	"scatter": {
+    	},
+    }
+	},
+	"bubble":{
+		"type": "bubble",
+		"color":color,
+		"padding":[15,15,0,15],
+    "xAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+      "splitNumber":5,
+      "boundaryGap":"justify",
+      "min":0,
+      "max":250
+    },
+    "yAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+      "data":[{
+        "min":0,
+        "max":150
+      }]
+    },
+    "legend": {
+    },
+    "extra": {
+    	"bubble": {
+        "border":2,
+        "opacity": 0.5,
+    	},
+    }
+	}
+}
+
+export default cfu;

uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md

@@ -0,0 +1,5 @@
+# uCharts JSSDK说明
+1、如不使用uCharts组件，可直接引用u-charts.js，打包编译后会`自动压缩`，压缩后体积约为`120kb`。
+2、如果120kb的体积仍需压缩，请手到uCharts官网通过在线定制选择您需要的图表。
+3、config-ucharts.js为uCharts组件的用户配置文件，升级前请`自行备份config-ucharts.js`文件，以免被强制覆盖。
+4、config-echarts.js为ECharts组件的用户配置文件，升级前请`自行备份config-echarts.js`文件，以免被强制覆盖。

uni_modules/qiun-data-charts/license.md

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

uni_modules/qiun-data-charts/package.json

@@ -0,0 +1,81 @@
+{
+  "id": "qiun-data-charts",
+  "displayName": "秋云 ucharts echarts 高性能跨全端图表组件",
+  "version": "2.5.0-20230101",
+  "description": "uCharts 新增正负柱状图！支持H5及APP用 ucharts echarts 渲染图表，uniapp可视化首选组件",
+  "keywords": [
+    "ucharts",
+    "echarts",
+    "f2",
+    "图表",
+    "可视化"
+],
+  "repository": "https://gitee.com/uCharts/uCharts",
+  "engines": {
+    "HBuilderX": "^3.3.8"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "474119"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/~qiun",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}