Merge remote-tracking branch 'origin/master'

App.vue

@@ -6,8 +6,8 @@
 		onShow: function() {
 			console.log('App Show')
 			this.autoUpdate();
-			if(uni.getStorageSync('userInfo')) uni.reLaunch({ url:'/pages/home/index' })
-			else uni.reLaunch({ url:'/pages/login/index' })
+			// if(uni.getStorageSync('userInfo')) uni.reLaunch({ url:'/pages/home/index' })
+			// else uni.reLaunch({ url:'/pages/login/index' })
 		},
 		onHide: function() {
 			console.log('App Hide')
@@ -61,7 +61,8 @@
 		font-family: PingFangSC-Regular, PingFang SC;
 	}
 
-	html,body {
+	html,
+	body {
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-size: 24rpx;
 		width: 100%;

components/Charts/LineOne.vue

@@ -0,0 +1,84 @@
+<template>
+	<view class="charts-box">
+		<qiun-data-charts type="area" :opts="revenueOpts" :chartData="revenueChartData" />
+	</view>
+</template>
+
+<script>
+	// import template_page_mixin from '@/libs/mixin/template_page_mixin.js'
+	export default {
+		name: 'TemplateContent',
+		// mixins: [template_page_mixin],
+		data() {
+			return {
+
+				// 公司营收
+				revenueChartData: {},
+				revenueOpts: {
+					color: ["#4B98FE"],
+					padding: [15, 15],
+					dataLabel: false,
+					xAxis: {
+						disableGrid: true,
+					},
+					yAxis: {
+						// gridColor: "rgba(230,230,230,0.6)",
+						gridColor: "rgba(200,200,200,0.6)",
+						disabled: false,
+						disableGrid: false,
+						gridType: 'dash',
+						dashLength: '4',
+						data: [{
+							axisLineColor: "#FFFFFF",
+							min: 0,
+						}],
+					},
+					legend: {
+						show: false,
+						position: "top",
+						float: "right",
+					},
+					extra: {
+						area: {
+							type: "curve",
+							opacity: 0.8,
+							addLine: true,
+							width: 1,
+							gradient: true,
+						},
+					},
+				},
+
+			}
+		},
+		onReady() {
+			this.drawRevenueCharts(); //公司营收
+		},
+		methods: {
+			// 公司营收 绘制
+			drawRevenueCharts() {
+				let res = {
+					categories: ["01-01", "", "01-08", "", "01-15", "", "01-22", "", "01-29"],
+					series: [{
+							name: "收入",
+							data: [6800, 8040, 5203, 9850, 7510, 6301, 5968, 9808, 5200],
+							legendShape: "circle",
+							color: "#4088FE",
+							pointShape: "none",
+						},
+
+					],
+				};
+				this.revenueChartData = JSON.parse(JSON.stringify(res));
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.charts-box {
+		width: 630rpx;
+		height: 388rpx;
+	}
+</style>

components/Charts/LineTwo.vue

@@ -0,0 +1,82 @@
+<template>
+	<view class="charts-box">
+		<qiun-data-charts type="area" :opts="revenueOpts" :chartData="revenueChartData" />
+	</view>
+</template>
+
+<script>
+	import template_page_mixin from '@/libs/mixin/template_page_mixin.js'
+	export default {
+		name: 'TemplateContent',
+		mixins: [template_page_mixin],
+		data() {
+			return {
+
+				// 公司营收
+				revenueChartData: {},
+				revenueOpts: {
+					color: ["#4B98FE"],
+					padding: [15, 15],
+					dataLabel: false,
+					xAxis: {
+						disableGrid: true,
+					},
+					yAxis: {
+						gridColor: "rgba(200,200,200,0.6)",
+						disabled: false,
+						disableGrid: false,
+						gridType: 'dash',
+						dashLength: '4',
+						data: [{
+							axisLineColor: "#FFFFFF",
+							min: 0,
+						}],
+					},
+					legend: {
+						show: false,
+						position: "top",
+						float: "right",
+					},
+					extra: {
+						area: {
+							type: "curve",
+							opacity: 0.8,
+							addLine: true,
+							width: 1,
+							gradient: true,
+						},
+					},
+				},
+
+			}
+		},
+		onReady() {
+			this.drawRevenueCharts(); //公司营收
+		},
+		methods: {
+
+			// 公司营收 绘制
+			drawRevenueCharts() {
+				let res = {
+					categories: ["01-01", "", "01-08", "", "01-15", "", "01-22", "", "01-29"],
+					series: [{
+						name: "收入",
+						data: [0.1, 0.3, 0.4, 0.3, 0.6, 0.7, 0.4, 1, 0.5],
+						legendShape: "circle",
+						color: "#600EFF",
+						pointShape: "none",
+					}],
+				};
+				this.revenueChartData = JSON.parse(JSON.stringify(res));
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.charts-box {
+		width: 630rpx;
+		height: 388rpx;
+	}
+</style>

components/Charts/PieCharts.vue

@@ -0,0 +1,95 @@
+<template>
+	<view class="charts-box" style="min-height: 630rpx;">
+		<qiun-data-charts type="ring" :opts="opts" :chartData="chartData" style="width: 630rpx; height: 600rpx;" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				chartData: {},
+				//您可以通过修改 config-ucharts.js 文件中下标为 ['ring'] 的节点来配置全局默认参数，如都是默认参数，
+				// 此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】
+				// 即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
+				opts: {
+					rotate: false,
+					rotateLock: false,
+					color: ['#1372FF', '#F89F2A', '#02C493'],
+					padding: [10, 15, 15, 10],
+					dataLabel: true,
+					enableScroll: false,
+					legend: {
+						show: true,
+						position: "bottom",
+						lineHeight: 25
+					},
+					title: {
+						name: "",
+						fontSize: 15,
+						color: "#666666"
+					},
+					subtitle: {
+						name: "",
+						fontSize: 25,
+						color: "#7cb5ec"
+					},
+					extra: {
+						ring: {
+							ringWidth: 35,
+							activeOpacity: 0.5,
+							activeRadius: 10,
+							offsetAngle: 0,
+							labelWidth: 10,
+							border: false,
+							borderWidth: 3,
+							borderColor: "#FFFFFF"
+						}
+					},
+				}
+			};
+		},
+		onReady() {
+			this.getServerData();
+		},
+		methods: {
+			getServerData() {
+				//模拟从服务器获取数据时的延时
+				setTimeout(() => {
+					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+					let res = {
+						series: [{
+							data: [{
+									"name": "房费",
+									"value": 21964.00,
+									"labelText": "房费 72%"
+								},
+								{
+									"name": "商品",
+									"value": 6514.00,
+									"labelText": "商品 21%"
+								},
+								{
+									"name": "其他",
+									"value": 2514.00,
+									"labelText": "其他 7%",
+								},
+
+							],
+
+						}]
+					};
+					this.chartData = JSON.parse(JSON.stringify(res));
+				}, 500);
+			},
+		}
+	};
+</script>
+
+<style scoped>
+	/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+	.charts-box {
+		width: 630rpx;
+		height: 600rpx;
+	}
+</style>

libs/components/demo-title.vue

@@ -0,0 +1,94 @@
+<template>
+  <view class="demo-title">
+    <view>
+      <view v-if="type === 'first'" class="main_title">
+        <view v-if="leftIcon" class="main_title__icon main_title__icon--left" :class="[`tn-icon-${leftIcon}`]"></view>
+        <view class="main_title__content">{{ title }}</view>
+        <view v-if="rightIcon" class="main_title__icon main_title__icon--right" :class="[`tn-icon-${rightIcon}`]"></view>
+      </view>
+      <view v-if="type === 'second'" class="second_title">
+        <view class="second_title__content">{{ title }}</view>
+      </view>
+    </view>
+    <view class="content" :class="[{
+      'content--padding': contentPadding
+    }]">
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'demo-title',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    props: {
+      // 标题类型
+      type: {
+        type: String,
+        default: 'first'
+      },
+      // 标题
+      title: {
+        type: String,
+        default: ''
+      },
+      // 左图标
+      leftIcon: {
+        type: String,
+        default: 'star'
+      },
+      // 右图标
+      rightIcon: {
+        type: String,
+        default: 'star'
+      },
+      // 内容容器是否有两边边距
+      contentPadding: {
+        type: Boolean,
+        default: true
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .main_title {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 50rpx;
+    font-size: 36rpx;
+    font-weight: bold;
+    
+    &__content {
+      padding: 0 18rpx;
+    }
+    
+    &__icon {
+      font-size: 34rpx;
+    }
+  }
+  
+  .second_title {
+    margin: 24rpx 0;
+    margin-left: 30rpx;
+    
+    &__content {
+      font-size: 32rpx;
+      font-weight: bold;
+    }
+  }
+  
+  .content {
+    margin-top: 30rpx;
+    
+    &--padding {
+      margin-left: 30rpx;
+      margin-right: 30rpx;
+    }
+  }
+</style>

libs/components/dynamic-demo-template.vue

@@ -0,0 +1,689 @@
+<template>
+  <view class="dynamic-demo">
+
+    <!-- 效果预览窗口 -->
+    <view v-if="!noDemo" class="demo-container" :class="{'demo-container--full': full}">
+      <view class="demo">
+        <slot></slot>
+      </view>
+      <!-- 提示信息 -->
+      <view v-if="haveTips">
+        <view class="demo__tips__icon" @click="demoTipsClick">
+          <view class="icon tn-icon-help"></view>
+        </view>
+        <view class="demo__tips__content"
+          :class="[showContentTips ? 'demo__tips__content--show' : 'demo__tips__content--hide']">
+          <view v-for="(item,index) in tipsData" :key="index" class="demo__tips__content--item">{{ item }}</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 模式切换 -->
+    <view v-if="multiMode" class="mode-switch">
+      <view class="mode-switch__container">
+        <view v-for="(item, index) in sectionModeListInfos" :key="index" class="mode-switch__item"
+          :class="[`mode-switch-item-${index}`,{'mode-switch__item--active': modeIndex === index}]"
+          @click="switchMode(index)">{{ item.name }}</view>
+
+        <!-- 滑块样式 -->
+        <view class="mode-switch__slider" :style="[modeSwitchSliderStyle]"></view>
+      </view>
+    </view>
+
+    <!-- 组件对应可选项容器 -->
+    <view class="section-container">
+      <scroll-view
+        class="section__scroll-view"
+        :class="{'section__scroll-view--auto': sectionScrollViewStyle.height === 'auto'}"
+        :style="[sectionScrollViewStyle]"
+        :scroll-y="sectionScrollViewStyle.height !== 'auto'"
+      >
+        <block v-for="(item,index) in btnsList" :key="index">
+          <view class="section__content" :class="{'section__content--visible': item.show}">
+            <view class="section__content__title">
+              <view class="section__content__title__left-line" :class="[`tn-main-gradient-${tuniaoColorList[index]}`]"></view>
+              <view class="section__content__title--text tn-text-ellipsis" :class="[`tn-main-gradient-${tuniaoColorList[index]}`]">{{ item.title }}</view>
+              <view class="section__content__title__right-line" :class="[`tn-main-gradient-${tuniaoColorList[index]}`]"></view>
+            </view>
+            <view class="section__content__btns">
+              <view v-for="(section_btn,section_index) in item.optional" :key="section_index"
+                class="section__content__btns__item" :class="[`tn-main-gradient-${tuniaoColorList[index]}--light`]" @click="sectionBtnClick(index, section_index)">
+                <view class="section__content__btns__item__bg"
+                  :class="[`tn-main-gradient-${tuniaoColorList[index]}`, {'section__content__btns__item__bg--active':sectionIndex[modeIndex][index]['value'] === section_index}]"></view>
+                <view class="section__content__btns__item--text tn-text-ellipsis"
+                  :class="[sectionIndex[modeIndex][index]['value'] === section_index ? 'section__content__btns__item--text--active' : `tn-color-${tuniaoColorList[index]}`]">{{ section_btn }}</view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'dynamic-demo-template',
+    props: {
+      // 可选项列表数据
+      sectionList: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 提示信息
+      tips: {
+        type: [String, Array],
+        default: ''
+      },
+      // 演示框的内容是否为铺满
+      full: {
+        type: Boolean,
+        default: false
+      },
+      // 是否使用了自定义顶部导航栏
+      customBar: {
+        type: Boolean,
+        default: true
+      },
+      // 是否全屏滚动
+      fullWindowsScroll: {
+        type: Boolean,
+        default: false
+      },
+      // 没有演示内容
+      noDemo: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      tipsData() {
+        if (typeof this.tips === 'string') {
+          return [this.tips]
+        }
+        return this.tips
+      },
+      haveTips() {
+        return this.tips && this.tips.length > 0
+      },
+      multiMode() {
+        return this.sectionList.length > 1
+      },
+      sectionModeList() {
+        return this.sectionList.map((item) => {
+          return item.name
+        })
+      }
+    },
+    data() {
+      return {
+        // 图鸟颜色列表
+        tuniaoColorList: this.$t.color.getTuniaoColorList(),
+        // 保存选项列表信息（由于prop中的数据时不能被修改的）
+        _sectionList: [],
+        // 模式列表信息
+        sectionModeListInfos: [],
+        // 所选模式的序号
+        modeIndex: 0,
+        // 模式选择滑块样式
+        modeSwitchSliderStyle: {
+          width: 0,
+          left: 0
+        },
+        // 显示组件相关提示信息
+        showContentTips: false,
+        // 可选项滚动容器样式
+        sectionScrollViewStyle: {
+          height: 0
+        },
+        // 按钮列表信息
+        btnsList: [],
+        // 标记当前所选按钮
+        sectionIndex: [],
+        // 标记选项按钮是否可以滑动（使用scroll-view进行包裹）
+        sectionScrollFlag: true
+      }
+    },
+    watch: {
+      sectionList: {
+        handler(value) {
+          // 如果sectionList发生改变，重新初始化选项列表信息
+          this.initSectionBtns()
+        },
+        deep: true
+      },
+      sectionScrollFlag(value) {
+        if (!value) {
+          this.sectionScrollViewStyle.height = 'auto'
+        }
+      },
+      fullWindowsScroll: {
+        handler(value) {
+          if (value) {
+            this.sectionScrollViewStyle.height = 'auto'
+          }
+        },
+        immediate: true
+      }
+    },
+    created() {
+      // 初始化可选项模式列表
+      this.sectionModeListInfos = this.sectionModeList.map((item) => {
+        return {
+          name: item
+        }
+      })
+      // 初始化选项按钮默认信息
+      this.initSectionBtns()
+    },
+    mounted() {
+      // 等待加载组件完成
+      // setTimeout(() => {
+      //   // 计算出底部scroll-view的高度
+      //   this.initSectionScrollView()
+
+      //   if (this.multiMode) {
+      //     // 获取模式切换标签的信息
+      //     this.getModeTabsInfo()
+      //   }
+      // }, 10)
+      this.$nextTick(() => {
+        // 计算出底部scroll-view的高度
+        this.initSectionScrollView()
+        
+        if (this.multiMode) {
+          // 获取模式切换标签的信息
+          this.getModeTabsInfo()
+        }
+      })
+    },
+    methods: {
+      // 初始化选项滑动窗口的高度
+      initSectionScrollView() {
+        // 全屏滚动时不进行任何的操作
+        if (this.fullWindowsScroll) {
+          return
+        }
+        // 获取屏幕的高度
+        uni.getSystemInfo({
+          success: (systemInfo) => {
+            // 通过当前屏幕的安全高度减去上一个元素的底部和距离上一个元素的外边距，然后减获取到的值减去标题栏的高度即可
+            const navBarHeight = this.customBar ? 0 : this.vuex_custom_bar_height
+            if (this.multiMode) {
+              uni.createSelectorQuery().in(this).select('.mode-switch').boundingClientRect(data => {
+                if (data.bottom >= systemInfo.safeArea.height) {
+                  this.sectionScrollFlag = false
+                } else {
+                  this.sectionScrollFlag = true
+                  const containerBaseHeight = systemInfo.safeArea.height - data.bottom
+                  this.sectionScrollViewStyle.height = (containerBaseHeight - navBarHeight) + systemInfo.statusBarHeight - uni.upx2px(75) + 'px'
+                }
+              }).exec()
+            } else {
+              if (!this.noDemo) {
+                uni.createSelectorQuery().in(this).select('.demo-container').boundingClientRect(data => {
+                  if (data.bottom >= systemInfo.safeArea.height) {
+                    this.sectionScrollFlag = false
+                  } else {
+                    this.sectionScrollFlag = true
+                    const containerBaseHeight = systemInfo.safeArea.height - data.bottom
+                    this.sectionScrollViewStyle.height = (containerBaseHeight - navBarHeight) + systemInfo.statusBarHeight - uni.upx2px(75) + 'px'
+                  }
+                }).exec()
+              } else {
+                this.sectionScrollFlag = false
+              }
+            }
+            
+          }
+        })
+      },
+      // 更新选项滑动容器的高度
+      updateSectionScrollView() {
+        this.$nextTick(() => {
+          this.initSectionScrollView()
+        })
+      },
+      // 获取各个模式tab的节点信息
+      getModeTabsInfo() {
+        let view = uni.createSelectorQuery().in(this)
+        for (let i = 0; i < this.sectionModeListInfos.length; i++) {
+          view.select('.mode-switch-item-' + i).boundingClientRect()
+        }
+        view.exec(res => {
+          // 如果没有获取到，则重新获取
+          if (!res.length) {
+            setTimeout(() => {
+              this.getModeTabsInfo()
+            }, 10)
+            return
+          }
+          // 将每个模式的宽度放入list中
+          res.map((item, index) => {
+            this.sectionModeListInfos[index].width = item.width
+          })
+          // 初始化滑块的宽度
+          this.modeSwitchSliderStyle.width = this.sectionModeListInfos[0].width + 'px'
+
+          // 初始化滑块的位置
+          this.modeSliderPosition()
+        })
+      },
+      // 设置模式滑块的位置
+      modeSliderPosition() {
+        let left = 0
+        // 计算当前所选模式选项到组件左边的距离
+        this.sectionModeListInfos.map((item, index) => {
+          if (index < this.modeIndex) left += item.width
+        })
+
+        this.modeSwitchSliderStyle.left = left + 'px'
+      },
+      // 切换模式
+      switchMode(index) {
+        // 不允许点击当前激活的选项
+        if (index === this.modeIndex) return
+        this.modeIndex = index
+        this.modeSliderPosition()
+        this.updateSectionBtns()
+        this.$emit('modeClick', {
+          index: index
+        })
+      },
+      // 点击内容提示信息
+      demoTipsClick() {
+        this.showContentTips = !this.showContentTips
+      },
+      // 初始化被选中选项按钮
+      initSectionBtns() {
+        this.sectionIndex = []
+        this.sectionIndex = this.sectionList.map((item) => {
+          if (item.hasOwnProperty('section') && item.section.length > 0) {
+            return Array(item.section.length).fill({
+              value: 0,
+              change: false
+            })
+          } else {
+            return []
+          }
+        })
+        
+        this._sectionList = this.$t.deepClone(this.sectionList)
+        // 给本地选项按钮列表给默认show属性
+        this._sectionList.map((item) => {
+          const section = item.section.map((section_item) => {
+            if (!section_item.hasOwnProperty('show')) {
+              section_item.show = true
+            }
+            return section_item
+          })
+          item.section = section
+          return item
+        })
+        
+        // 更新按钮信息
+        this.updateSectionBtns()
+      },
+      // 跟新选项按钮信息
+      updateSectionBtns(sectionIndex = -1, showState = true) {
+        let sectionOptional = this._sectionList[this.modeIndex]['section']
+        this.btnsList = sectionOptional.map((item, index) => {
+          // 判断是否已经修改了对应的值
+          let changeValue = this.sectionIndex[this.modeIndex][index]['change'] || false
+          let currentSectionIndexValue = this.sectionIndex[this.modeIndex][index]['value'] || 0
+          // 取出默认值(如果是已经修改过的选项，则使用之前的选项信息)
+          let indexValue = changeValue ? currentSectionIndexValue : item.hasOwnProperty('current') ? item.current : 0
+          // 取出是否显示当前选项
+          let show = (sectionIndex !== -1 && sectionIndex === index) ? showState : item.hasOwnProperty('show') ? item.show : true
+          // 处理最大最小值
+          if (indexValue < 0) {
+            indexValue = 0
+          }
+          if (indexValue >= item.optional.length) {
+            indexValue = item.optional.length
+          }
+          // this.sectionIndex[this.modeIndex][index]['value'] = indexValue
+          this.$set(this.sectionIndex[this.modeIndex], index, {value: indexValue, change: changeValue})
+          item.show = show
+          return item
+        })
+      },
+      // 更新选项按钮状态信息
+      updateSectionBtnsState(sectionIndex = -1, showState = true) {
+        // 判断sectionIndex是否为数组
+        if (this.$t.array.isArray(sectionIndex)) {
+          if (sectionIndex.length === 0) {
+            return
+          }
+          sectionIndex = sectionIndex.filter((item) => item >= 0 && item < this.sectionList[this.modeIndex]['section'].length)
+          sectionIndex.map((item) => {
+            this.btnsList[item]['show'] = showState
+            this._sectionList[this.modeIndex]['section'][item]['show'] = showState
+          })
+        } else {
+          if (sectionIndex < 0 || sectionIndex >= this.sectionList[this.modeIndex]['section'].length) {
+            return
+          }
+          // 将按键的对应显示状态设置为对应的状态
+          this.btnsList[sectionIndex]['show'] = showState
+          this._sectionList[this.modeIndex]['section'][sectionIndex]['show'] = showState
+        }
+        
+      },
+      // 更新选项按钮选中信息
+      updateSectionBtnsValue(modeIndex = 0, sectionIndex = -1, value = 0) {
+        if (sectionIndex < 0 || sectionIndex >= this.sectionList[modeIndex]['section'].length) {
+          return
+        }
+        // 如果showState为false则移除对应的选项按钮，否则往对应的位置添加上对应的选项按钮
+        this.sectionIndex[modeIndex][sectionIndex] = {
+          value,
+          change: true
+        }
+      },
+      // 选项按钮点击事件
+      sectionBtnClick(index, sectionIndex) {
+        // if (this.sectionIndex[this.modeIndex][index] === sectionIndex) {
+        //   return
+        // }
+        this.$set(this.sectionIndex[this.modeIndex], index, {value: sectionIndex, change: true})
+        this.$emit('click', {
+          methods: this.btnsList[index]['methods'],
+          index: sectionIndex,
+          name: this.btnsList[index]['optional'][sectionIndex]
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .dynamic-demo {
+    padding-top: 78rpx;
+
+    /* 顶部模式切换start */
+    .mode-switch {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 75rpx;
+      padding: 0 30rpx;
+
+      &__container {
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        width: 476rpx;
+        height: 62rpx;
+        background-color: #FFFFFF;
+        box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+        border-radius: 31rpx;
+      }
+
+      &__item {
+        flex: 1;
+        height: 62rpx;
+        width: 100%;
+        line-height: 62rpx;
+        text-align: center;
+        font-size: 28rpx;
+        color: $tn-font-sub-color;
+        z-index: 2;
+        transition: all 0.3s;
+
+        &--active {
+          color: #FFFFFF;
+          font-weight: bold;
+        }
+      }
+
+      &__slider {
+        position: absolute;
+        height: 62rpx;
+        border-radius: 31rpx;
+        // background-image: linear-gradient(-86deg, #FF8359 0%, #FFDF40 100%);
+        background-image: linear-gradient(-86deg, #00C3FF 0%, #58FFF5 100%);
+        box-shadow: 1rpx 10rpx 24rpx 0rpx #00C3FF77;
+        z-index: 1;
+        transition: all 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+      }
+    }
+
+    /* 顶部模式切换end */
+
+    /* 演示内容展示start */
+    .demo-container {
+      min-height: 327rpx;
+      width: calc(100% - 60rpx);
+      background-color: #FFFFFF;
+      box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+      margin: 0 30rpx 5rpx 30rpx;
+      border-radius: 20rpx;
+      position: relative;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &--full {
+        display: inline-block;
+        padding-bottom: 20rpx;
+        min-height: 0rpx;
+        padding: 10rpx 20rpx 30rpx;
+      }
+
+      .demo {
+        padding-top: 70rpx;
+
+        &__tips {
+          &__icon {
+            position: absolute;
+            top: 20rpx;
+            right: 16rpx;
+            width: 39rpx;
+            height: 39rpx;
+            line-height: 39rpx;
+            font-size: 39rpx;
+
+            .icon {
+              background: linear-gradient(-45deg, #FF8359 0%, #FFDF40 100%);
+              -webkit-background-clip: text;
+              color: transparent;
+              text-shadow: 0rpx 10rpx 10rpx rgba(255, 156, 82, 0.2);
+            }
+          }
+
+          &__content {
+            position: absolute;
+            top: 65rpx;
+            right: 16rpx;
+            font-size: 20rpx;
+            margin-left: 20rpx;
+            word-wrap: normal;
+            display: flex;
+            flex-direction: column;
+            background-color: #E6E6E6;
+            padding: 20rpx;
+            border-radius: 10rpx;
+            transition: transform 0.3s cubic-bezier(0.68, -0.55, 0.265, 1);
+            transform-origin: 0 0;
+            z-index: 999999;
+
+            &--hide {
+              transform: scaleY(0);
+            }
+
+            &--show {
+              transform: scaleY(100%);
+
+              &::after {
+                content: "";
+                width: 0px;
+                height: 0px;
+                border-width: 4px;
+                border-style: solid;
+                border-color: transparent transparent rgba(149, 149, 149, 0.1) transparent;
+                position: absolute;
+                top: -8px;
+                right: 6px;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    /* 演示内容展示end */
+
+    /* 可选项start */
+    .section-container {
+      width: 100%;
+      height: auto;
+      margin-top: 70rpx;
+
+      .section {
+        &__content {
+          margin-top: 70rpx;
+          display: none;
+          
+          &--visible {
+            display: block;
+            
+            &:last-child {
+              padding-bottom: calc(70rpx + env(safe-area-inset-bottom));
+            }
+          }
+
+          &:nth-child(1) {
+            margin-top: 0rpx;
+          }
+
+          &__title {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin: 0 30rpx;
+            text-align: center;
+
+            &__left-line,
+            &__right-line {
+
+              width: 100rpx;
+              height: 2rpx;
+              position: relative;
+            }
+
+            &__left-line {
+              &::after {
+                content: '';
+                background: inherit;
+                width: 12rpx;
+                height: 12rpx;
+                position: absolute;
+                top: -12rpx;
+                right: 0rpx;
+                border-radius: 50%;
+                transform: translateY(50%);
+              }
+            }
+
+            &__right-line {
+              &::after {
+                content: '';
+                background: inherit;
+                width: 12rpx;
+                height: 12rpx;
+                position: absolute;
+                top: -12rpx;
+                left: 0rpx;
+                border-radius: 50%;
+                transform: translateY(50%);
+              }
+            }
+
+            &--text {
+              -webkit-background-clip: text;
+              color: transparent;
+              min-width: 124rpx;
+              height: 30rpx;
+              font-size: 32rpx;
+              line-height: 1;
+              margin: 0 35rpx;
+            }
+          }
+
+          &__btns {
+            width: calc(100% - 60rpx);
+            margin: 0 30rpx;
+            margin-top: 29rpx;
+            padding: 50rpx 30rpx 0rpx 0rpx;
+            background-color: #FFFFFF;
+            box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+            border-radius: 20rpx;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            flex-wrap: wrap;
+
+            &__item {
+              max-width: 30%;
+              padding: 17rpx 36rpx;
+              border-radius: 10rpx;
+              margin-bottom: 40rpx;
+              margin-left: 40rpx;
+              position: relative;
+              z-index: 1;
+
+              // &::before {
+              //   content: " ";
+              //   position: absolute;
+              //   top: 10rpx;
+              //   left: 1rpx;
+              //   width: 100%;
+              //   height: 100%;
+              //   background: inherit;
+              //   filter: blur(24rpx);
+              //   opacity: 1;
+              //   z-index: -1;
+              // }
+
+              &__bg {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                border-radius: inherit;
+                z-index: -1;
+                opacity: 0;
+                transform: scale(0);
+                transition: all 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+
+                &--active {
+                  opacity: 1;
+                  transform: scale(1);
+                }
+              }
+
+              &--text {
+                font-size: 24rpx;
+                line-height: 1.2em;
+                transition: all 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+                
+                &--active {
+                  color: #FFFFFF;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    /* 可选项end */
+  }
+</style>

libs/components/multiple-options-demo.vue

@@ -0,0 +1,147 @@
+<template>
+  <view class="multiple-options">
+    <view class="list">
+      <block v-for="(item, index) in listData" :key="index">
+        <view
+          class="list__item"
+          :class="[`tn-main-gradient-${tuniaoColorList[item.bgColorIndex]}--light`]"
+          @tap="navOptionsPage(item.url)"
+        >
+          <view class="list__content">
+            <view class="list__content__title">{{ item.title }}</view>
+            <view class="list__content__desc">{{ item.desc }}</view>
+          </view>
+          <view class="list__icon">
+            <view class="list__icon__main" :class="[`tn-icon-${item.mainIcon}`, `tn-main-gradient-${tuniaoColorList[item.bgColorIndex]}`]"></view>
+            <view class="list__icon__sub" :class="[`tn-icon-${item.subIcon}`, `tn-main-gradient-${tuniaoColorList[item.bgColorIndex]}`]"></view>
+          </view>
+        </view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'multiple-options-demo',
+    props: {
+      // 显示的列表数据
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      }
+    },
+    data() {
+      return {
+        // 图鸟颜色列表
+        tuniaoColorList: [
+          'red',
+          'purplered',
+          'purple',
+          'bluepurple',
+          'aquablue',
+          'blue',
+          'indigo',
+          'cyan',
+          'teal',
+          'green',
+          'orange',
+          'orangered'
+        ],
+        listData: []
+      }
+    },
+    watch: {
+      list(val) {
+        this.initList()
+      }
+    },
+    created() {
+      this.initList()
+    },
+    methods: {
+      // 初始化列表数据
+      initList() {
+        // 给列表添加背景颜色数据
+        this.listData = this.list.map((item, index) => {
+          item.bgColorIndex = this.getBgNum()
+          item.mainIcon = item?.mainIcon || 'computer-fill'
+          item.subIcon = item?.subIcon || 'share'
+          return item
+        })
+      },
+      // 跳转到对应的选项页面
+      navOptionsPage(url) {
+        uni.navigateTo({
+          url: url
+        })
+      },
+      // 获取酷炫背景随机数
+      getBgNum() {
+        return Math.floor((Math.random() * this.tuniaoColorList.length))
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .list {
+    
+    &__item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      width: calc(100% - 60rpx);
+      margin: 108rpx 30rpx 0rpx 30rpx;
+      box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+      border-radius: 20rpx;
+    }
+    
+    &__content {
+      flex: 1;
+      // color: $tn-font-color;
+      margin: 34rpx 0rpx 27rpx 37rpx;
+      
+      &__title {
+        font-size: 36rpx;
+        font-weight: bold;
+        margin-bottom: 12rpx;
+      }
+      &__desc {
+        font-size: 28rpx;
+      }
+    }
+    
+    &__icon {
+      flex: 1;
+      margin-right: 26rpx;
+      position: relative;
+      
+      &__main, &__sub {
+        -webkit-background-clip: text;
+        color: transparent;
+        position: absolute;
+        transition: transform 0.25s ease;
+      }
+      
+      &__main {
+        font-size: 200rpx;
+        width: 190rpx;
+        line-height: 200rpx;
+        top: 0;
+        right: 0rpx;
+        transform: translateY(-60%);
+      }
+      &__sub {
+        font-size: 70rpx;
+        top: 0;
+        right: 175rpx;
+        transform: translateY(-5rpx);
+      }
+    }
+  }
+</style>

libs/components/nav-index-button.vue

@@ -0,0 +1,169 @@
+<template>
+  <view class="nav-index-button" :style="{bottom: `${bottom}rpx`, right: `${right}rpx`}" @tap.stop="navIndex">
+    <view class="nav-index-button__content">
+        <view class="nav-index-button__content--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur tn-cool-bg-color-5">
+          <view class="tn-icon-home-fill"></view>
+        </view>  
+    </view>
+  
+    <view class="nav-index-button__meteor">
+      <view class="nav-index-button__meteor__wrapper">
+        <view v-for="(item,index) in 6" :key="index" class="nav-index-button__meteor__item" :style="{transform: `rotateX(${-60 + (30 * index)}deg) rotateZ(${-60 + (30 * index)}deg)`}">
+          <view class="nav-index-button__meteor__item--pic"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'nav-index-button',
+    props: {
+      // 距离底部的距离
+      bottom: {
+        type: [Number, String],
+        default: 300
+      },
+      // 距离右边的距离
+      right: {
+        type: [Number, String],
+        default: 75
+      },
+      // 首页地址
+      indexPath: {
+        type: String,
+        default: '/pages/index'
+      }
+    },
+    methods: {
+      // 跳转回首页
+      navIndex() {
+        // 通过判断当前页面的页面栈信息，是否有上一页进行返回，如果没有则跳转到首页
+        const pages = getCurrentPages()
+        if (pages && pages.length > 0) {
+          const indexPath = this.indexPath || '/pages/index'
+          const firstPage = pages[0]
+          if (pages.length == 1 && (!firstPage.route || firstPage.route != indexPath.substring(1, indexPath.length))) {
+            uni.reLaunch({
+              url: indexPath
+            })
+          } else {
+            uni.navigateBack({
+              delta: 1
+            })
+          }
+        } else {
+          uni.reLaunch({
+            url: indexPath
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .nav-index-button {
+    position: fixed;
+    animation: suspension 3s ease-in-out infinite;
+    z-index: 999999;
+    
+    &__content {
+      position: absolute;
+      width: 100rpx;
+      height: 100rpx;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      
+      &--icon {
+        width: 100rpx;
+        height: 100rpx;
+        font-size: 60rpx;
+        border-radius: 50%;
+        margin-bottom: 18rpx;
+        position: relative;
+        z-index: 1;
+        transform: scale(0.85);
+        
+        &::after {
+          content: " ";
+          position: absolute;
+          z-index: -1;
+          width: 100%;
+          height: 100%;
+          left: 0;
+          bottom: 0;
+          border-radius: inherit;
+          opacity: 1;
+          transform: scale(1, 1);
+          background-size: 100% 100%;
+          background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/icon_bg6.png);
+        }
+      }
+    }
+    
+    &__meteor {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 100rpx;
+      height: 100rpx;
+      transform-style: preserve-3d;
+      transform: translate(-50%, -50%) rotateY(75deg) rotateZ(10deg);
+      
+      &__wrapper {
+        width: 100rpx;
+        height: 100rpx;
+        transform-style: preserve-3d;
+        animation: spin 20s linear infinite;
+      }
+      
+      &__item {
+        position: absolute;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 1000rpx;
+        left: 0;
+        top: 0;
+        
+        &--pic {
+          display: block;
+          width: 100%;
+          height: 100%;
+          background: url(https://resource.tuniaokj.com/images/cool_bg_image/arc3.png) no-repeat center center;
+          background-size: 100% 100%;
+          animation: arc 4s linear infinite;
+        }
+      }
+    }
+  }
+  
+  
+  @keyframes suspension {
+    0%, 100% {
+      transform: translateY(0);
+    }
+    50% {
+      transform: translateY(-0.8rem);
+    }
+  }
+  
+  @keyframes spin {
+    0% {
+      transform: rotateX(0deg);
+    }
+  
+    100% {
+      transform: rotateX(-360deg);
+    }
+  }
+  
+  @keyframes arc {
+    to {
+      transform: rotate(360deg);
+    }
+  }
+</style>

libs/index.list.js

@@ -0,0 +1,494 @@
+module.exports = {
+	list: [{
+			"letter": "A",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟研发部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "B",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "C",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "D",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "E",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "F",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "G",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "H",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "I",
+			"data": [{
+				"name": "ice",
+				"mobile": "13588889999",
+				"keyword": "佳木斯JIAMUSI13588889999"
+			}]
+		},
+		{
+			"letter": "J",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "K",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "L",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "M",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "N",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "O",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+      ]
+		},
+		{
+			"letter": "P",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "Q",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "R",
+			"data": [{
+					"name": "日喀则",
+					"mobile": "15544448888",
+					"keyword": "日喀则RIKAZE15544448888"
+				},
+				{
+					"name": "日照",
+					"mobile": "15544448888",
+					"keyword": "日照RIZHAO15544448888"
+				}
+			]
+		},
+		{
+			"letter": "S",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "T",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "W",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "X",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "Y",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "Z",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				},
+				{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}
+			]
+		},
+		{
+			"letter": "#",
+			"data": [{
+          "url": "https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1664005699053-assets/web-upload/8645ea3a-e0a9-4422-8364-cc5ede305c9f.jpeg",
+					"name": "付衣衣",
+					"mobile": "13699999999",
+					"branch": "图鸟设计部"
+				}]
+		}
+	]
+}

libs/mixin/dynamic_demo_mixin.js

@@ -0,0 +1,52 @@
+/**
+ * 动态参数演示mixin
+ */
+module.exports = {
+  data() {
+    return {
+      // 效果显示框top的值
+      contentContainerTop: '0px',
+      contentContainerIsTop: false,
+      
+      // 参数显示框top的值
+      sectionContainerTop: '0px'
+    }
+  },
+  onReady() {
+    this.updateSectionContainerTop()
+  },
+  methods: {
+    // 处理演示效果框的位置
+    async _handleContentConatinerPosition() {
+      // 获取效果演示框的节点信息
+      const contentContainer = await this._tGetRect('#content_container')
+      // 获取参数框的节点信息
+      this._tGetRect('#section_container').then((res) => {
+        // 判断参数框是否在移动，如果是则更新效果框的位置
+        // 如果效果框的顶部已经触控到顶部导航栏就停止跟随
+        if (res.top - contentContainer.bottom != 15) {
+          const newTop = res.top - (contentContainer.height + uni.upx2px(20))
+          const minTop = this.vuex_custom_bar_height + 1
+          if (newTop < minTop) {
+            this.contentContainerTop = minTop + 'px'
+            this.contentContainerIsTop = true
+          } else {
+            this.contentContainerTop = newTop + 'px'
+            this.contentContainerIsTop = false
+          }
+        }
+      })
+    },
+    // 更新状态切换栏位置信息
+    updateSectionContainerTop() {
+      this._tGetRect('#content_container').then((res) => {
+        this.contentContainerTop = (this.vuex_custom_bar_height + 148) + 'px'
+        this.sectionContainerTop = (res.height + 20) + 'px'
+      })
+    }
+  },
+  // 监听页面滚动
+  onPageScroll() {
+    this._handleContentConatinerPosition()
+  }
+}

libs/mixin/template_page_mixin.js

@@ -0,0 +1,60 @@
+/**
+ * 演示页面mixin
+ */
+module.exports = {
+  data() {
+    return {
+      
+    }
+  },
+  onLoad() {
+    // 更新顶部导航栏信息
+    this.updateCustomBarInfo()
+  },
+  methods: {
+    // 点击左上角返回按钮时触发事件
+    goBack() {
+      // 通过判断当前页面的页面栈信息，是否有上一页进行返回，如果没有则跳转到首页
+      const pages = getCurrentPages()
+      if (pages && pages.length > 0) {
+        const firstPage = pages[0]
+        if (pages.length == 1 && (!firstPage.route || firstPage.route != 'pages/index')) {
+          uni.reLaunch({
+            url: '/pages/index'
+          })
+        } else {
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+      } else {
+        uni.reLaunch({
+          url: '/pages/index'
+        })
+      }
+    },
+    // 更新顶部导航栏信息
+    async updateCustomBarInfo() {
+      // 获取vuex中的自定义顶栏的高度
+      let customBarHeight = this.vuex_custom_bar_height
+      let statusBarHeight = this.vuex_status_bar_height
+      // 如果获取失败则重新获取
+      if (!customBarHeight) {
+        try {
+          const navBarInfo = await this.$t.updateCustomBar()
+          customBarHeight = navBarInfo.customBarHeight
+          statusBarHeight = navBarInfo.statusBarHeight
+        } catch(e) {
+          setTimeout(() => {
+            this.updateCustomBarInfo()
+          }, 10)
+          return
+        }
+      }
+      
+      // 更新vuex中的导航栏信息
+      this.$t.vuex('vuex_status_bar_height', statusBarHeight)
+      this.$t.vuex('vuex_custom_bar_height', customBarHeight)
+    }
+  }
+}

libs/navigation/navigation.js

@@ -0,0 +1,90 @@
+/**
+ * 页面展示列表数据
+ */
+export default {
+  data: [{
+      title: '首次更新',
+      list: [{
+          icon: 'code',
+          title: '月薪清单 + 五险一金明细',
+          color: 'red',
+          url: '/vipPages/salary',
+          author: '图鸟北北'
+        },{
+          icon: 'code',
+          title: '收益明细 + 收益趋势预测',
+          color: 'green',
+          url: '/vipPages/income',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '粉丝明细 + 访问流量分析',
+          color: 'blue',
+          url: '/vipPages/diagnosis',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '运动效果 + 训练表现监控',
+          color: 'cyan',
+          url: '/vipPages/sport',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '理财持仓 + 市值盈亏份额',
+          color: 'bluepurple',
+          url: '/vipPages/manage',
+          author: '图鸟北北'
+        }
+      ]
+    },
+    {
+      title: '二次更新',
+      list: [{
+          icon: 'code',
+          title: '文件类型 + 存储空间占用',
+          color: 'indigo',
+          url: '/vipPages/file',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '账单明细 + 资产理财统计',
+          color: 'aquablue',
+          url: '/vipPages/bank',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '微信群组 + 成员分析统计',
+          color: 'teal',
+          url: '/vipPages/group',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '用户画像 + 客户画像分析',
+          color: 'orangered',
+          url: '/vipPages/portrait',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '暗黑风格 + 可视化趋势图',
+          color: 'grey',
+          url: '/vipPages/black',
+          author: '图鸟北北'
+        },
+        {
+          icon: 'code',
+          title: '持续更新，感恩会员大佬们的支持',
+          color: 'orange',
+          url: '/vipPages/xxxx',
+          author: '图鸟北北'
+        }
+      ]
+    }
+  ]
+}

libs/navigation/navigation1.js

@@ -0,0 +1,111 @@
+/**
+ * 页面展示列表数据
+ */
+export default {
+  data: [{
+      title: '首次更新',
+      list: [{
+          icon: 'code',
+          title: '销售统计',
+          color: 'purplered',
+          url: '/newsPages/pages1',
+          author: '图鸟真菜'
+        },{
+          icon: 'code',
+          title: '考勤打卡',
+          color: 'bluepurple',
+          url: '/newsPages/pages2',
+          author: '图鸟黑粉'
+        },
+        {
+          icon: 'code',
+          title: '访客统计',
+          color: 'red',
+          url: '/newsPages/pages3',
+          author: '心之所向'
+        },
+        {
+          icon: 'code',
+          title: '学生体检',
+          color: 'aquablue',
+          url: '/newsPages/pages4',
+          author: '请叫我神秘人'
+        },
+        {
+          icon: 'code',
+          title: '温度检测',
+          color: 'orangered',
+          url: '/newsPages/pages5',
+          author: '哎哟你干嘛'
+        }
+      ]
+    },
+    {
+      title: '二次更新',
+      list: [{
+          icon: 'code',
+          title: '收入支出',
+          color: 'blue',
+          url: '/newsPages/pages6',
+          author: '心若向阳'
+        },
+        {
+          icon: 'code',
+          title: '营业目标',
+          color: 'orange',
+          url: '/newsPages/pages7',
+          author: '无名之辈'
+        },
+        {
+          icon: 'code',
+          title: '营业统计',
+          color: 'indigo',
+          url: '/newsPages/pages8',
+          author: '那只猪'
+        },
+        {
+          icon: 'code',
+          title: '库存统计',
+          color: 'orangeyellow',
+          url: '/newsPages/pages9',
+          author: '你的名字'
+        },
+        {
+          icon: 'code',
+          title: '收益来源',
+          color: 'cyan',
+          url: '/newsPages/pages10',
+          author: '哒咩哒咩'
+        },
+        {
+          icon: 'code',
+          title: '区域销售',
+          color: 'lime',
+          url: '/newsPages/pages11',
+          author: '你的名字'
+        },
+        {
+          icon: 'code',
+          title: '月度下载',
+          color: 'teal',
+          url: '/newsPages/pages12',
+          author: '你的名字'
+        },
+        {
+          icon: 'code',
+          title: '公司股价',
+          color: 'yellowgreen',
+          url: '/newsPages/pages13',
+          author: '你的名字'
+        },
+        {
+          icon: 'code',
+          title: '运动数据',
+          color: 'green',
+          url: '/newsPages/pages14',
+          author: '不许爱我'
+        }
+      ]
+    }
+  ]
+}

node_modules/qiun/ucharts/package.json

@@ -0,0 +1,71 @@
+{
+  "_from": "@qiun/ucharts@^2.5.0-20230101",
+  "_id": "@qiun/ucharts@2.5.0-20230101",
+  "_inBundle": false,
+  "_integrity": "sha512-C7ccBgfPuGF6dxTRuMW0NPPMSCf1k/kh3I9zkRVBc5PaivudX/rPL+jd2Wty6gn5ya5L3Ob+YmYe09V5xw66Cw==",
+  "_location": "/@qiun/ucharts",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "@qiun/ucharts@^2.5.0-20230101",
+    "name": "@qiun/ucharts",
+    "escapedName": "@qiun%2fucharts",
+    "scope": "@qiun",
+    "rawSpec": "^2.5.0-20230101",
+    "saveSpec": null,
+    "fetchSpec": "^2.5.0-20230101"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@qiun/ucharts/-/ucharts-2.5.0-20230101.tgz",
+  "_shasum": "9ca5d646328ad4a002c745c28001f8916865c4f8",
+  "_spec": "@qiun/ucharts@^2.5.0-20230101",
+  "_where": "C:\\Users\\任春旭\\Desktop\\传秀\\hotelHomestayWx",
+  "author": {
+    "name": "秋云"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "【原生uCharts】跨平台图表库，全端全平台支持的图表库，开箱即用。支持PC、H5、微信小程序、支付宝小程序、百度小程序、头条小程序、飞书小程序、QQ小程序、360小程序、快手小程序、钉钉小程序、淘宝小程序、京东小程序、Vue、Taro等更多支持canvas的框架，体积小巧、调用简单方便、性能及体验极佳。",
+  "homepage": "https://www.ucharts.cn",
+  "keywords": [
+    "uCharts",
+    "大图",
+    "大屏",
+    "可视化",
+    "图表库",
+    "饼图",
+    "圆环图",
+    "折线图",
+    "柱状图",
+    "山峰图",
+    "区域图",
+    "雷达图",
+    "圆弧进度图",
+    "仪表盘",
+    "K线图",
+    "条状图",
+    "混合图",
+    "玫瑰图",
+    "漏斗图",
+    "词云图",
+    "时序图",
+    "散点图",
+    "气泡图",
+    "地图"
+  ],
+  "license": "Apache",
+  "main": "u-charts.js",
+  "name": "@qiun/ucharts",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "2.5.0-20230101"
+}

package-lock.json

@@ -2,6 +2,11 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
+    "@qiun/ucharts": {
+      "version": "2.5.0-20230101",
+      "resolved": "https://registry.npmjs.org/@qiun/ucharts/-/ucharts-2.5.0-20230101.tgz",
+      "integrity": "sha512-C7ccBgfPuGF6dxTRuMW0NPPMSCf1k/kh3I9zkRVBc5PaivudX/rPL+jd2Wty6gn5ya5L3Ob+YmYe09V5xw66Cw=="
+    },
     "debounce": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.0.0.tgz",

package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@qiun/ucharts": "^2.5.0-20230101",
     "debounce": "^2.0.0",
     "uniapp-qrcode": "^1.0.2",
     "uview-ui": "^2.0.36"

pages.json

@@ -43,6 +43,7 @@
 				"navigationStyle": "custom"
 			}
 		},
+		//房态
 		{
 			"path": "pages/house/index",
 			"style": {
@@ -57,6 +58,35 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/house/breast",
+			"style": {
+				"navigationBarTitleText": "添加早餐",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/house/payAdd",
+			"style": {
+				"navigationBarTitleText": "添加收款",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/house/orderInfo",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"navigationStyle": "custom"
+			}
+		},
+		
+		{
+			"path": "pages/house/stayCheck",
+			"style": {
+				"navigationBarTitleText": "入住登记",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/statistics/index",
 			"style": {

pages/house/breast.vue

@@ -0,0 +1,186 @@
+<template>
+	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="添加商品" :showIcon="true"></c-nav-bar>
+		<view class="content">
+			<view class="item" v-for="(item,index) in list" :key="index">
+				<text>{{item.breakfastName}}</text>
+				<text>{{item.price}}</text>
+				<u-number-box v-model="item.num" min="0">
+					<view slot="minus" class="minus">
+						<u-icon name="minus" size="22"></u-icon>
+					</view>
+					<text slot="input" class="input">{{item.num||0}}</text>
+					<view slot="plus" class="plus">
+						<u-icon name="plus" size="22"></u-icon>
+					</view>
+				</u-number-box>
+			</view>
+			<view class="item" v-for="(item,index) in list2" :key="index">
+				<text>{{item.projectName}}</text>
+				<text>{{item.defaultPrice}}</text>
+				<u-number-box v-model="item.num" min="0">
+					<view slot="minus" class="minus">
+						<u-icon name="minus" size="22"></u-icon>
+					</view>
+					<text slot="input" class="input">{{item.num||0}}</text>
+					<view slot="plus" class="plus">
+						<u-icon name="plus" size="22"></u-icon>
+					</view>
+				</u-number-box>
+			</view>
+		</view>
+		<view class="btn">
+			<text @click="conform()">确定</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import listItem from '../../uni_modules/uview-ui/libs/config/props/listItem';
+	export default {
+		data() {
+			return {
+				list: [],
+				list2: []
+			}
+		},
+		onLoad(opt) {
+			console.log(opt)
+			let list = JSON.parse(opt.list1);
+			let list2 =JSON.parse(opt.list2);
+			this.getBreastData(list);
+			this.getOtherData(list2);
+		},
+		methods: {
+			conform() {
+				this.getOpenerEventChannel().emit('addSuccess', {
+					'data1': this.list,
+					'data2': this.list2
+				});
+				uni.navigateBack();
+			},
+			getBreastData(list) {
+				this.$api.get('/merchant/hotel/order/getBreakfastList', {
+					homestayId: '1711268640588517378'
+				}).then(res => {
+					console.log(res)
+					if (res.data.code == 0) {
+						if (list && list.length != 0) {
+							for (let i = 0; i < res.data.data.length; i++) {
+								let item = list.filter(
+									(item) =>
+									item.breakfastName == res.data.data[i].breakfastName
+								);
+								if (item) {
+									res.data.data[i].num = item[0].num;
+								}
+							}
+						}
+						this.list = res.data.data
+					}
+					console.log(this.list)
+				})
+			},
+			getOtherData(list2) {
+				this.$api.get('/merchant/hotel/order/getOtherList', {
+					homestayId: '1711268640588517378'
+				}).then(res => {
+					if (res.data.code == 0) {
+						if (list2 && list2.length != 0) {
+							for (let i = 0; i < res.data.data.length; i++) {
+								let item = list2.filter(
+									(item) =>
+									item.projectName == res.data.data[i].projectName
+								);
+								if (item) {
+									res.data.data[i].num = item[0].num;
+								}
+							}
+						}
+						this.list2 = res.data.data
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.btn {
+		position: fixed;
+		background-color: #fff;
+		padding: 30rpx 0;
+		z-index: 9;
+		bottom: 0;
+		width: 100%;
+		left: 0;
+		text-align: center;
+
+		text {
+			display: inline-block;
+			width: 90%;
+			height: 96rpx;
+			line-height: 96rpx;
+			background-color: #1372FF;
+			color: #fff;
+			font-size: 34rpx;
+			border-radius: 48rpx;
+
+		}
+	}
+
+	.page {
+		background: #F3F4F4;
+		box-sizing: border-box;
+		overflow-y: auto;
+		overflow-x: auto;
+	}
+
+	.content {
+		padding: 0 30rpx 20rpx;
+		width: 96%;
+		margin: 20rpx auto 0;
+		box-sizing: border-box;
+		background-color: #fff;
+
+		.item {
+			padding: 36rpx 0;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #D1D1D1;
+
+			&:last-child {
+				border: 0;
+			}
+
+			text {
+				font-size: 30rpx;
+				color: #F14D4D;
+
+				&:nth-of-type(1) {
+					font-weight: bold;
+					color: #333;
+				}
+			}
+		}
+
+	}
+	.input {
+		margin: 0 20rpx;
+		font-size: 28rpx;
+	}
+	.minus,
+	.plus {
+		justify-content: center;
+		display: flex;
+		width: 34rpx;
+		height: 34rpx;
+		line-height: 34rpx;
+		padding: 8rpx 6rpx;
+		border: 1px solid #999;
+		border-radius: 6rpx;
+	}
+	
+</style>

pages/house/createOrder.vue

@@ -1,36 +1,141 @@
 <template>
-	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
-		<c-nav-bar title="新增订单" :showIcon="false"></c-nav-bar>
-		<view class="box">
+	<view class="page" :style="{'height':(h)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="新增订单" :showIcon="true"></c-nav-bar>
+		<view class="box box1">
 			<view class="tit">预订信息</view>
-
-			<u-cell-group :border="false"
-				customStyle="background-color: #fff;border-radius: 16rpx;width: 94%;margin:0 auto;">
+			<u-cell-group :border="false" customStyle="margin:0 -30rpx">
 				<u-cell>
-					<text slot="icon" style="font-size: 30rpx">姓名</text>
+					<text slot="icon" class="label">姓名</text>
 					<view slot="title" class="title">
 						<u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx"
 							placeholder="请输入姓名" v-model="dataForm.guestName"></u--input>
 					</view>
 				</u-cell>
 				<u-cell>
-					<text slot="icon" style="font-size: 30rpx">手机号码</text>
+					<text slot="icon" class="label">手机号码</text>
 					<view slot="title" class="title">
 						<u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx"
 							placeholder="请输入手机号码" v-model="dataForm.guestPhone"></u--input>
 					</view>
 				</u-cell>
-				<u-cell isLink="true" @click="showLaiyuan=true">
-					<text slot="icon" style="font-size: 30rpx">订单来源</text>
+				<u-cell :isLink="true" @click="showLaiyuan=true">
+					<text slot="icon" class="label">订单来源</text>
 					<view slot="title" class="title">
 						{{dataForm.guestSourceName}}
 					</view>
 				</u-cell>
 			</u-cell-group>
 		</view>
+		<view class="box box1">
+			<view class="tit">房间信息</view>
+			<u-cell-group :border="false" customStyle="margin:0 -30rpx">
+				<u-cell>
+					<text slot="icon" class="label">入住日期</text>
+					<view slot="title" class="title">
+						{{dataForm.arriveDate}}
+						<!-- <u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx" :disabled="true"
+							placeholder="" v-model="dataForm.arriveDate"></u--input> -->
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" class="label">离店日期</text>
+					<view slot="title" class="title">
+						{{dataForm.leaveDate}}
+						<!-- <u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx" :disabled="true"
+							placeholder="" v-model="dataForm.leaveDate"></u--input> -->
+					</view>
+				</u-cell>
+				<u-cell isLink="true">
+					<text slot="icon" class="label">共几晚</text>
+					<view slot="title" class="title">
+						{{dataForm.num}}
+					</view>
+				</u-cell>
+				<u-cell isLink="true" @click="checkInTypeShow=true">
+					<text slot="icon" class="label">入住类型</text>
+					<view slot="title" class="title">
+						{{dataForm.detailFormList[0].checkInTypeName}}
+					</view>
+				</u-cell>
+				<u-cell isLink="true">
+					<text slot="icon" class="label">房间类型</text>
+					<view slot="title" class="title">
+						{{dataForm.houseBaseId}}
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" class="label">房间号</text>
+					<view slot="title" class="title">
+						{{dataForm.detailFormList[0].roomNumber}}
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" class="label">房价</text>
+					<view slot="title" class="title">
+						{{dataForm.detailFormList[0].roomAmount}}
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" class="label">备注</text>
+					<view slot="title" class="title">
+						<u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx"
+							type="textarea" placeholder="请输入" v-model="dataForm.remarks" height="200"></u--input>
+					</view>
+				</u-cell>
+			</u-cell-group>
+		</view>
+		<view class="box">
+			<view class="tit tit2"><text>消费信息</text> <u-icon @click="addBreast()" name="plus-circle" label="添加消费"
+					labelColor="#1372FF" labelSize="24" color="1372FF" size="30"></u-icon></view>
+			<u-swipe-action>
+				<u-swipe-action-item :show="item.show" :index="index" class=""
+					v-for="(item, index) in dataForm.detailFormList[0].breakfastData" :key="index" @click="click(index)"
+					:options="options">
+					<view class="goodsInfo item">
+						<view class="title-wrap">
+							<text class="title u-line-2">{{item.breakfastName}}/{{item.num}}/{{item.price}}</text>
+						</view>
+					</view>
+				</u-swipe-action-item>
+				<u-swipe-action-item :show="item.show" :index="index" class=""
+					v-for="(item, index) in dataForm.detailFormList[0].otherData" :key="index" @click="click2(index)"
+					:options="options">
+					<view class="goodsInfo item">
+						<view class="title-wrap">
+							<text class="title u-line-2">{{item.projectName}}/{{item.num}}/{{item.defaultPrice}}</text>
+						</view>
+					</view>
+				</u-swipe-action-item>
+			</u-swipe-action>
+		</view>
+		<view class="box">
+			<view class="tit tit2"><text>收款信息</text> <u-icon @click="addpay()" name="plus-circle" label="添加收款"
+					labelColor="#1372FF" labelSize="24" color="1372FF" size="30"></u-icon></view>
+			<u-swipe-action>
+				<u-swipe-action-item :show="item.show" :index="index" class="goodsInfo"
+					v-for="(item, index) in dataForm.flowRecord" :key="index" @click="click3(index)" :options="options">
+					<view class="item">
+						<view class="title-wrap">
+							<text
+								class="title u-line-2">{{item.flowTypeName}}/{{item.payTypeName}}/{{item.amount}}</text>
+						</view>
+					</view>
+				</u-swipe-action-item>
+			</u-swipe-action>
+		</view>
+		<view class="footer">
+			<view class="total"><text>订单金额：</text><text>￥{{totalMOney}}</text></view>
+			<view class="btns">
+				<text @click="confirmOrder(2)">直接入住</text>
+				<text @click="confirmOrder(1)">提交订单</text>
+			</view>
+		</view>
 		<u-picker :itemHeight="88" :immediateChange="true" :show="showLaiyuan" :columns="laiyuan" title="来源选择"
-			keyName="guestSource" :defaultIndex="passengerDefault" @cancel="areaShow=false;"
+			keyName="guestSource" :defaultIndex="passengerDefault" @cancel="showLaiyuan=false;"
 			@confirm="passengerConfirm"></u-picker>
+		<u-picker :itemHeight="88" :immediateChange="true" :show="checkInTypeShow" :columns="checkInType" title="入住类型选择"
+			keyName="label" :defaultIndex="passengerDefault2" @cancel="checkInTypeShow=false;"
+			@confirm="passengerConfirm2"></u-picker>
 	</view>
 </template>
 
@@ -38,44 +143,155 @@
 	export default {
 		data() {
 			return {
+				titleStyle: {
+					fontSize: '34rpx',
+					fontWeight: "bold",
+				},
 				showLaiyuan: false,
+				checkInTypeShow: false,
 				passengerDefault: [0],
+				passengerDefault2: [0],
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#dd524d'
+					}
+				}],
+				totalMOney: 0, //订单总金额
 				dataForm: {
 					arriveDate: "",
 					detailFormList: [{
 						breakfastAmount: 0,
 						checkInPersonList: [],
 						checkInType: 0,
+						checkInTypeName: '',
 						id: 0,
 						otherAmount: 0,
 						roomAmount: 0,
 						roomIds: "",
+						breakfastData: [],
+						otherData: [],
 						roomNumber: "",
-					}, ],
+					}],
+					flowRecord: [],
 					guestName: "",
 					guestPhone: "",
 					guestSourceId: null,
 					guestSourceName: null,
-					homestayId: '1711268640588517378',
+					homestayId: this.$store.state.moduleHouse.homestayId,
 					houseBaseId: 0,
+					houseBaseName: '',
 					leaveDate: "",
 					num: 0,
 					orderStatus: null,
 					remarks: "",
 				},
+				checkInType: [
+					[{
+							label: '正常入住',
+							val: 1
+						}, {
+							label: '自用房',
+							val: 2
+						},
+						{
+							label: '免费入住',
+							val: 3
+						}
+					]
+				],
 				roomId: '',
-				laiyuan: []
+				laiyuan: [[]]
 			}
 		},
 		onLoad(opt) {
-			this.roomId = opt.roomId.split(',');
-			this.getInfo();
 			this.getLaiyuan();
+			this.roomId = opt.roomId.split(',');
+			if (opt.id) { //编辑
+				if (opt.orderStatus) {
+					this.orderStatus = opt.orderStatus;
+				}
+				this.dataForm.id = opt.id;
+				this.getInfo2()
+			} else {
+				//新增获取简单信息
+				this.getInfo();
+			}
 		},
 		methods: {
+			//添加早餐
+			addBreast() {
+				let list = JSON.stringify(this.dataForm.detailFormList[0].breakfastData);
+				let list2 = JSON.stringify(this.dataForm.detailFormList[0].otherData)
+				uni.navigateTo({
+					url: '/pages/house/breast?list1=' + list + '&list2=' + list2,
+					events: {
+						addSuccess: data => {
+							this.dataForm.detailFormList[0].breakfastData = data.data1.filter((item) => item
+								.num && item
+								.num != 0);
+							this.dataForm.detailFormList[0].otherData = data.data2.filter((item) => item.num &&
+								item.num !=
+								0);
+							this.totalMOney = this.dataForm.detailFormList[0].roomAmount;
+							for (let i = 0; i < this.dataForm.detailFormList[0].breakfastData.length; i++) {
+								this.totalMOney += parseFloat(this.dataForm.detailFormList[0].breakfastData[i]
+									.price);
+							}
+							for (let i = 0; i < this.dataForm.detailFormList[0].otherData.length; i++) {
+								this.totalMOney += parseFloat(this.dataForm.detailFormList[0].otherData[i]
+									.defaultPrice);
+							}
+						}
+					}
+				})
+			},
+			//添加收款
+			addpay() {
+				uni.navigateTo({
+					url: '/pages/house/payAdd?money=' + this.dataForm.detailFormList[0].roomAmount + '&list=' +
+						JSON.stringify(this.dataForm.flowRecord),
+					events: {
+						addSuccess: data => {
+							if (data.data.amount != 0) {
+								this.dataForm.flowRecord.push(data.data)
+								// if(data.data.flowType==1){ //收款
+								// 	this.totalMOney+=parseFloat(data.data.amount);
+								// }else{
+								// 	this.totalMOney=parseFloat(data.data.amount);
+								// }
+							}
+						}
+					}
+				})
+			},
+			confirmOrder(orderStatus) {
+				//orderStatus//预约入住 1，直接入住2
+				this.dataForm.orderStatus = orderStatus
+				this.$api.post('/merchant/hotel/order/placeOrder', this.dataForm).then(res => {
+					if (res.data.code == 0) {
+						this.$showToast('下单成功');
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pagesMy/orderList/orderList'
+							})
+						}, 1500)
+					}
+				})
+			},
+			click(index) {
+				console.log(index)
+				this.dataForm.detailFormList[0].breakfastData.splice(index, 1);
+			},
+			click2(index) {
+				this.dataForm.detailFormList[0].otherData.splice(index, 1);
+			},
+			click3(index) {
+				this.dataForm.flowRecord.splice(index, 1);
+			},
 			getLaiyuan() {
 				this.$api.get("/merchant/hotel/room/state/getSourceDownBox", {
-						homestayId: '1711268640588517378',
+						homestayId: this.dataForm.homestayId,
 					})
 					.then((res) => {
 						if (res.data.code == 0) {
@@ -83,16 +299,107 @@
 						}
 					});
 			},
+			getInfo2(){//详情信息
+				
+			},
+			// 房型列表
 			getInfo() {
 				this.$api.post('/merchant/hotel/order/getRoomInfoList', this.roomId).then(res => {
 					console.log(res)
+					if (res.data.code == 0) {
+						this.dataForm.detailFormList[0].roomIds = res.data.data.roomIds;
+						this.dataForm.detailFormList[0].roomNumber = res.data.data.roomNumber;
+						this.dataForm.detailFormList[0].checkInType = res.data.data.checkInType;
+						this.dataForm.detailFormList[0].checkInTypeName = this.checkInType[0].filter((item => item
+							.val == res.data.data.checkInType))[0].label;
+						this.dataForm.detailFormList[0].roomAmount = res.data.data.roomAmount;
+						this.dataForm.arriveDate = res.data.data.arriveDate;
+						this.dataForm.leaveDate = res.data.data.leaveDate;
+						this.dataForm.houseBaseId = res.data.data.houseBaseId;
+						this.dataForm.num = res.data.data.num;
+						this.totalMOney = res.data.data.roomAmount;
+					}
 				})
+			},
+			//  来源
+			passengerConfirm(e) {
+				this.dataForm.guestSourceId = e.value[0].id;
+				this.dataForm.guestSourceName = e.value[0].guestSource;
+				this.showLaiyuan = false;
+			},
+			//入住类型
+			passengerConfirm2() {
+				this.dataForm.detailFormList[0].checkInType = e.value[0].val;
+				this.dataForm.detailFormList[0].checkInTypeName = e.value[0].guestSource;
+				this.checkInTypeShow = false;
 			}
 		}
 	}
 </script>
+<style>
+	.u-swipe-action-item__right__button__wrapper__text {
+		font-size: 28rpx !important;
+	}
+</style>
+<style lang="scss" scoped>
+	.u-swipe-action-item__right__button__wrapper {
+		height: 36px
+	}
+
+	.u-swipe-action-item__right__button__wrapper__text {
+		font-size: 28rpx;
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		background-color: #fff;
+		left: 0;
+		z-index: 9;
+		padding: 30rpx;
+		box-sizing: border-box;
+
+		.total {
+			text {
+				color: #1372FF;
+				font-size: 32rpx;
+
+				&:first-child {
+					color: #333;
+				}
+			}
+		}
+
+		.btns {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 30rpx;
+
+			text {
+				display: inline-block;
+				width: 48%;
+				height: 96rpx;
+				line-height: 96rpx;
+				text-align: center;
+				font-size: 34rpx;
+				border-radius: 48rpx;
+				border: 1rpx solid #D1D1D1;
+				color: #999;
+
+				&:last-child {
+					background-color: #1372FF;
+					color: #fff;
+				}
+			}
+		}
+
+	}
+
+	.u-cell__body {
+		padding: 0 !important;
+	}
 
-<style lang="scss">
 	.page {
 		background: #F3F4F4;
 		padding-bottom: 260rpx;
@@ -100,16 +407,56 @@
 		overflow-y: auto;
 		overflow-x: auto;
 	}
-	.box{
+
+
+
+	.box {
 		background-color: #fff;
-		margin: 0 auto 20rpx;
+		margin: 20rpx auto 0;
 		border-radius: 10rpx;
 		width: 96%;
-		padding: 0 30rpx;
+		padding: 0 30rpx 30rpx;
+		box-sizing: border-box;
+
+		.label {
+			color: #333;
+			font-size: 30rpx;
+		}
+
+		&.box1 {
+			padding: 0 30rpx;
+
+			.title {
+				text-align: right;
+			}
+		}
+
+		.title {
+			color: #999;
+		}
 	}
-	.tit {
+
+	.tit,
+	.tit2 {
 		font-size: 32rpx;
 		font-weight: bold;
+		padding-top: 30rpx;
 		color: #333;
+		margin-bottom: 10rpx;
+	}
+
+	.tit2 {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.goodsInfo.item {
+		padding: 20rpx 0;
+
+		text {
+			font-size: 30rpx;
+		}
+
 	}
 </style>

pages/house/index.vue

@@ -68,7 +68,8 @@
 		<Tabbar :tabbarIndex="1"></Tabbar>
 		<!-- 关房 -->
 		<u-picker :itemHeight="88" :immediateChange="true" :show="areaShow" :columns="areaTxt" title="房态选择"
-			:defaultIndex="passengerDefault" @cancel="areaShow=false;clearData();" @confirm="passengerConfirm"></u-picker>
+			:defaultIndex="passengerDefault" @cancel="areaShow=false;clearData();"
+			@confirm="passengerConfirm"></u-picker>
 	</view>
 </template>
 
@@ -77,6 +78,7 @@
 	export default {
 		data() {
 			return {
+				homestayId:this.$store.state.moduleHouse.homestayId,
 				areaShow: false,
 				passengerDefault: [0],
 				areaTxt: [
@@ -118,7 +120,7 @@
 				checkDataDate: [],
 				checkPrice: [],
 				checkDataRoomId: [],
-				checkStatus:''
+				checkStatus: ''
 			}
 		},
 		onLoad() {
@@ -156,9 +158,14 @@
 							obj = roomId[i];
 						}
 					}
-					if(obj.status==2||obj.status==3){
+					//已预订，已入住
+					if (obj.status == 1 || obj.status == 2) {
+						let orderId= obj.orderId;
+						uni.navigateTo({
+							url:"/pages/house/orderInfo?orderId="+orderId
+						})
 						//到详情
-					}else{
+					} else {
 						//更改状态
 						this.areaShow = true;
 						this.checkDataRoomId = [obj.id];
@@ -183,9 +190,9 @@
 				})
 			},
 			//新增订单
-			createOrder(){
+			createOrder() {
 				uni.navigateTo({
-					url:'/pages/house/createOrder?roomId='+this.checkDataRoomId
+					url: '/pages/house/createOrder?roomId=' + this.checkDataRoomId
 				})
 			},
 			//展开收起
@@ -268,7 +275,7 @@
 				}
 			},
 			getLeftData() {
-				this.$api.get('/merchant/hotel/room/state/getHouseCategoryData/1711268640588517378').then(res => {
+				this.$api.get(`/merchant/hotel/room/state/getHouseCategoryData/${this.homestayId}`).then(res => {
 					console.log(res)
 					if (res.data.code == 0) {
 						// for (let i; i < res.data.data.length; i++) {
@@ -292,14 +299,13 @@
 			},
 			getData() {
 				this.$api.get('/merchant/hotel/room/state/getDateRoomList', {
-					homestayId: '1711268640588517378',
+					homestayId: this.homestayId,
 					nowDate: '',
 					status: ''
 				}).then(res => {
 					if (res.data.code == 0) {
 						this.xdata = res.data.data;
 					}
-					console.log(res)
 				})
 			}
 		}
@@ -319,6 +325,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		box-sizing: border-box;
 
 		text {
 			display: inline-block;
@@ -436,6 +443,9 @@
 				}
 
 				.td {
+					display: flex;
+					align-items: center;
+					justify-content: center;
 					position: relative;
 					width: 130rpx;
 					min-width: 130rpx;
@@ -445,7 +455,8 @@
 					color: #1F2425;
 					font-size: 20rpx;
 
-					.tdP,.cellBox {
+					.tdP,
+					.cellBox {
 						display: flex;
 						height: 100%;
 						flex-direction: column;

pages/house/orderInfo.vue

@@ -0,0 +1,320 @@
+<template>
+	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="订单详情" :showIcon="false" :titleStyle="titleStyle"></c-nav-bar>
+		<view class="body">
+			<!-- 个人信息 -->
+			<view class="uname">
+				<text style="margin-right: 20rpx;">{{orderInfo.guestName}}</text>
+				<text>{{orderInfo.guestPhone}}</text>
+			</view>
+			<!-- 房间信息  -->
+			<view class="room">
+				<!-- 房间/预定信息 -->
+				<view class="reservations">
+					<text
+						style="font-size: 30rpx; color: #333333; font-weight: 700;">{{orderInfo.houseBaseName}}-{{orderInfo.roomNumber}}</text>
+					<text style="font-size: 24rpx; color: #39CE77;" v-if="isOrderPanding">{{getStatusText()}}</text>
+				</view>
+				<!-- 时间/价格 -->
+				<view class="time-price">
+					<text style="font-size: 30rpx; color: #777;">{{orderInfo.arriveDate}}入住 {{orderInfo.num}}晚</text>
+					<text style="font-size: 30rpx; color: #245BED;">￥{{orderInfo.orderAmount}}</text>
+				</view>
+				<!-- 入住人数 -->
+				<view class="house-person">
+					<text style="font-size: 30rpx; color: #777;">入住人</text>
+					<view class="right">
+						<text style="font-size: 30rpx; color: #777; ">{{orderInfo.checkInNums}}人 </text>
+						<u-icon name="arrow-right" @click.native="goStayCheck"></u-icon>
+						<!-- <u-icon name="arrow-right" ></u-icon>  -->
+					</view>
+				</view>
+			</view>
+			<!-- 订单信息 -->
+
+			<u-cell-group :border="false"
+				customStyle="background-color: #fff;border-radius: 16rpx;width: 690rpx;margin:0 auto;">
+				<u-cell>
+					<text slot="icon" style="font-size: 30rpx; margin-right: 50rpx;">订单号</text>
+					<view slot="title" class="title">
+						<text>{{orderInfo.orderCode}}</text>
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" style="font-size: 30rpx; margin-right: 20rpx;">创建时间</text>
+					<view slot="title" class="title">
+						<text>{{orderInfo.orderTime}}</text>
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" style="font-size: 30rpx; margin-right: 20rpx;">办理员工</text>
+					<view slot="title" class="title">
+						<text>何伟婷</text>
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" style="font-size: 30rpx; margin-right: 20rpx;">取消原因</text>
+					<view slot="title" class="title">
+						<text>-</text>
+					</view>
+				</u-cell>
+				<u-cell>
+					<text slot="icon" style="font-size: 30rpx; margin-right: 80rpx;">备注</text>
+					<view slot="title" class="title">
+						<text>-</text>
+					</view>
+				</u-cell>
+
+
+			</u-cell-group>
+			<!-- 按钮 -->
+			<view class="button">
+				<!-- 待确认 -->
+				<template v-if="orderInfo.orderStatus==-1">
+					<button class="edit" @click="cancle()">取消订单</button>
+					<button class="goRoom" @click="show2=true">确认订单</button>
+				</template>
+				<!-- 已预订 -->
+				<template v-if="orderInfo.orderStatus==1">
+					<button class="edit" @click="edit()">编辑订单</button>
+					<button class="goRoom" @click="checkIn()">办理入住</button>
+				</template>
+				<!-- 已入住 -->
+				<template v-if="orderInfo.orderStatus==2">
+					<button class="edit" @click="edit()">编辑订单</button>
+					<button class="goRoom" @click="checkIn()">办理退房</button>
+				</template>
+			</view>
+		</view>
+		<!-- 取消订单 -->
+		<u-modal v-model="show" @confirm="confirmCheck">
+			<view class="slot-content">
+				<u-cell-group :border="false" customStyle="margin:0 -30rpx">
+					<u-cell>
+						<text slot="icon" class="label">原因：</text>
+						<view slot="title" class="title">
+							<u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx"
+								placeholder="请输入原因" v-model="check.refundReason"></u--input>
+						</view>
+					</u-cell>
+				</u-cell-group>
+			</view>
+		</u-modal>
+		<!-- 确认订单 -->
+		<u-modal v-model="show2" content="确定该操作?" @confirm="confirmOrder">
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				show2: false,
+				check: {
+					initiator: 1,
+					refundReason: "",
+					status: -1,
+					orderCode: "",
+				},
+				orderId: '',
+				orderInfo: {}
+			}
+		},
+		onLoad(opt) {
+			if (opt.orderId) {
+				this.orderId = opt.orderId;
+				this.getOrderInfo()
+			}
+		},
+		methods: {
+			// 获取数据
+			getOrderInfo() {
+				this.$api.get(`/merchant/hotel/order/getMerchantOrderInfo/${this.orderId}`, {
+					orderId: this.orderId
+				}).then((res) => {
+					if (res.data.code == 0) {
+						this.orderInfo = res.data.data
+					}
+				})
+			},
+			// 客房状态
+			getStatusText() {
+				if (this.orderInfo.orderStatus === -1) {
+					return '待确定'
+				} else if (this.orderInfo.orderStatus === 1) {
+					return '已预订'
+				} else if (this.orderInfo.orderStatus === 2) {
+					return '已入住'
+				} else if (this.orderInfo.orderStatus === 3) {
+					return '已退房'
+				} else if (this.orderInfo.orderStatus === 4) {
+					return '已取消'
+				} else {
+					return '状态异常'
+				}
+			},
+			goStayCheck(id) {
+				uni.navigateTo({
+					url: `/pages/house/stayCheck?id=${this.orderId}`
+				})
+			},
+			// 确认订单
+			confirmOrder() {
+				this.$api
+					.get(`/merchant/hotel/order/confirm/${this.orderInfo.id}`)
+					.then((res) => {
+						if (res.data.code !== 0) {
+							return this.$showToast(res.data.msg);
+						}
+						this.show2 = false;
+						this.$showToast('操作成功');
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pagesMy/orderList/orderList'
+							})
+						}, 1500)
+					});
+			},
+			//取消订单
+			cancle() {
+				this.show = true;
+				this.check.orderCode = this.orderInfo.orderCode;
+			},
+			//取消订单
+			confirmCheck() {
+				this.$api.post("/merchant/hotel/order/cancelOrder", this.check)
+					.then((res) => {
+						if (res.data.code !== 0) {
+							return this.$showToast(res.data.msg);
+						}
+						this.show = false;
+						this.$showToast('操作成功');
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pagesMy/orderList/orderList'
+							})
+						}, 1500)
+					});
+			},
+			//办理入住
+			checkIn(orderStatus) {
+				uni.redirectTo({
+					url: "/pages/house/createOrder?id=" + this.orderInfo.id + '&orderStatus=' + orderStatus
+				})
+			},
+			// 编辑
+			edit() {
+				uni.redirectTo({
+					url: "/pages/house/createOrder?id=" + this.orderInfo.id
+				})
+			}
+		},
+		computed: {
+			isOrderPanding() {
+				return this.orderInfo.orderStatus === 1
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page {
+		background: #F3F4F4;
+		padding-bottom: 260rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+		overflow-x: auto;
+	}
+
+	.body {
+		padding-top: 20rpx;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+	}
+
+	.uname {
+		width: 665rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		background-color: #fff;
+		padding-left: 30rpx;
+		font-size: 30rpx;
+		border-radius: 10rpx;
+
+	}
+
+	.room {
+		margin-top: 20rpx;
+		width: 92%;
+		height: 246rpx;
+		background-color: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 10rpx;
+		padding: 30rpx;
+	}
+
+	.orderTip {
+		padding: 30rpx;
+		padding-top: 0;
+		width: 690rpx;
+		height: 514rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+
+	}
+
+	.button {
+		position: fixed;
+		bottom: 120rpx;
+		height: 96rpx;
+		width: 690rpx;
+		// background-color: teal;
+		margin-top: 20rpx;
+		display: flex;
+		justify-content: space-between;
+		border-radius: 10rpx;
+		z-index: 9;
+	}
+
+	.goRoom {
+		// border-radius: ;
+		width: 330rpx;
+		height: 96rpx;
+		border-radius: 48rpx;
+		font-size: 34rpx;
+		background-color: #1372FF;
+		color: #fff;
+	}
+
+	.edit {
+		width: 330rpx;
+		height: 96rpx;
+		border-radius: 48rpx;
+		font-size: 34rpx;
+		background-color: #E2EDFC;
+		color: #1372FF;
+	}
+
+	.reservations {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.time-price {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 30rpx;
+	}
+
+	.house-person {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 30rpx;
+	}
+
+	.right {
+		display: flex;
+	}
+</style>

pages/house/payAdd.vue

@@ -0,0 +1,199 @@
+<template>
+	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="添加收款" :showIcon="true"></c-nav-bar>
+		<view class="content">
+			<view class="box">
+				<view class="item">
+					<text>订单金额</text>
+					<text style="color: #245BED;">{{money}}</text>
+				</view>
+				<view class="item">
+					<text>已付金额</text>
+					<text style="color: #FF9B17;">{{haspay}}</text>
+				</view>
+				<view class="item">
+					<text>还需付款</text>
+					<text style="color: #F14D4D;">{{money-haspay}}</text>
+				</view>
+			</view>
+			<view style="background-color:#fff;padding:0 30rpx 20rpx;">
+				<u-cell-group :border="false" customStyle="margin:0 -30rpx">
+					<u-cell class="pd15">
+						<text slot="icon" class="label">类型</text>
+						<view slot="title" class="title">
+							<u-radio-group v-model="dataForm.flowTypeName" iconPlacement="left" style="white">
+								<u-radio :customStyle="{padding: '8rpx 0',margin:'0 0 0 30px'}"
+									v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name" shape="circle"
+									size="30" labelSize="30" icon-size="22">
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</u-cell>
+					<u-cell class="pd15" :isLink="true" @click="showPay=true">
+						<text slot="icon" class="label">支付方式</text>
+						<view slot="title" class="title">
+							{{dataForm.payTypeName}}
+						</view>
+					</u-cell>
+					<u-cell class="pd15">
+						<text slot="icon" class="label">金额</text>
+						<view slot="title" class="title">
+							<u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx"
+								type="number" placeholder="请输入金额" v-model="dataForm.amount"></u--input>
+						</view>
+					</u-cell>
+					<u-cell class="pd15" :border="false">
+						<text slot="icon" class="label">备注</text>
+						<view slot="title" class="title">
+							<u--input border="none" class="input" inputAlign="right" placeholderStyle="font-size:26rpx"
+								placeholder="请输入" v-model="dataForm.remark"></u--input>
+						</view>
+					</u-cell>
+				</u-cell-group>
+			</view>
+		</view>
+		<view class="btn">
+			<text @click="conform()">确定</text>
+		</view>
+		<u-picker :itemHeight="88" :immediateChange="true" :show="showPay" :columns="payStyle" title="支付方式选择"
+			keyName="label" :defaultIndex="passengerDefault" @cancel="showPay=false;"
+			@confirm="passengerConfirm"></u-picker>
+	</view>
+</template>
+
+<script>
+import list from '../../uni_modules/uview-ui/libs/config/props/list';
+	export default {
+		data() {
+			return {
+				money: '',
+				showPay: false,
+				passengerDefault: [0],
+				checkboxList:[{
+					name:'收款'
+				},{
+					name:'退款'
+				}],
+				dataForm: {
+					flowType: '',
+					flowTypeName:'',
+					amount: '',
+					remark: '',
+					payType: '',
+					payTypeName: ''
+				},
+				haspay:0,
+				payStyle: [
+					[{
+							label: '微信',
+							val: 1
+						}, {
+							label: '支付宝',
+							val: 2
+						},
+						{
+							label: '云闪付',
+							val: 3
+						}
+					]
+				],
+			}
+		},
+		onLoad(opt) {
+			//this.haspay=0;
+			this.money = opt.money;
+			this.list = JSON.parse(opt.list);
+			for(let i=0;i<this.list.length;i++){
+				if(this.list[i].flowType==1){ //收款
+					this.haspay+=parseFloat(this.list[i].amount);
+				}else{
+					this.haspay-=parseFloat(this.list[i].amount);
+				}
+			}
+		},
+		methods: {
+			//  支付方式
+			passengerConfirm(e) {
+				this.dataForm.payType = e.value[0].val;
+				this.dataForm.payTypeName = e.value[0].label;
+				this.showPay = false;
+			},
+			conform() {
+				if(this.dataForm.flowTypeName=='收款'){
+					this.dataForm.flowType=1;
+				}else{
+					this.dataForm.flowType=2;
+				}
+				this.getOpenerEventChannel().emit('addSuccess', {
+					'data': this.dataForm,
+				});
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.pd15{padding: 10rpx 0!important;}
+	.btn {
+		position: fixed;
+		background-color: #fff;
+		padding: 30rpx 0;
+		z-index: 9;
+		bottom: 0;
+		width: 100%;
+		left: 0;
+		text-align: center;
+
+		text {
+			display: inline-block;
+			width: 90%;
+			height: 96rpx;
+			line-height: 96rpx;
+			background-color: #1372FF;
+			color: #fff;
+			font-size: 34rpx;
+			border-radius: 48rpx;
+
+		}
+	}
+
+	.page {
+		background: #F3F4F4;
+		box-sizing: border-box;
+		overflow-y: auto;
+		overflow-x: auto;
+	}
+
+	.content {
+		
+		width: 94%;
+		margin: 20rpx auto 0;
+		box-sizing: border-box;
+		
+		.title{
+			text-align: right;
+		}
+		.box {
+			padding: 28rpx 30rpx 0;
+			border-radius: 10rpx;
+			margin: 30rpx 0;
+			background-color: #fff;
+
+			.item {
+				padding-bottom: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				&:last-child {
+					border: 0;
+				}
+
+				text {
+					font-size: 30rpx;
+				}
+			}
+		}
+	}
+</style>

pages/house/stayCheck.vue

@@ -0,0 +1,200 @@
+<template>
+	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="新增订单" :showIcon="true"></c-nav-bar>
+		<view class="box">
+		
+			 <u-form :model="form" ref="form">
+				 <u-form-item label="姓名" prop="guestName" label-width="172rpx" border-bottom>
+					 <u-input border="false" v-model="form.guestName" placeholder="请输入姓名"/>
+				 </u-form-item>
+				 <u-form-item label="手机号码" prop="guestPhone" label-width="172rpx" border-bottom>
+				 	<u-input border="false" v-model="form.guestPhone" placeholder="请输入手机号"/>
+				 </u-form-item>
+				 <u-form-item label="证件类型" label-width="172rpx" border-bottom>
+					    <view class="personInfo" @click.native="show=true">
+								<text style="font-size: 30rpx;">{{form.idName}}</text>
+								<!-- 证件下拉框 -->
+								<u-picker :itemHeight="88" :immediateChange="true" :show="show" :columns="list" keyName="label"
+									:defaultIndex="passengerDefault" @cancel="show=false;"
+									@confirm="passengerConfirm"></u-picker>
+								<!-- <u-select v-model="show"  mode="single-column" :list="list" @confirm="confirm"></u-select> -->
+								<u-icon name="arrow-right" ></u-icon>
+							</view>
+				 </u-form-item> 
+				 <u-form-item label="证件号" prop="idCard" label-width="172rpx" border-bottom>
+				 	<u-input border="false" v-model="form.idCard" placeholder="请输入证件号"/>
+				 </u-form-item>
+				 <u-form-item class="delete" >
+						<view class="delete" @click="del">
+							<u-icon name="trash"></u-icon>
+							<text style="font-size: 30rpx;">删除</text>
+						</view>
+				 </u-form-item>
+			 </u-form>
+		</view>
+		<!-- 添加入住人 -->
+		<view class="addPerson">
+			 <u-icon name="plus" color="#2979ff"></u-icon>添加入住人
+		</view>
+		<!-- 按钮 -->
+		<!-- 按钮 -->
+		
+			<view class="yes" @click.native="submit">
+				确定
+			</view>
+			
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return {
+				passengerDefault:[0],
+				form:{
+					guestPhone:'',
+					idCard:'',
+					idName:'',
+					guestName:'',					
+				},
+				orderInfo:[],
+				orderId:null,
+				show: false,
+								list: [[
+									{
+										value: '1',
+										label: '身份证'
+									},
+									{
+										value: '2',
+										label: '居住证'
+									}]
+								],
+			}
+			
+		},
+		onLoad({id}){
+			console.log(id)
+			this.orderId=id
+			console.log(this.orderId)	
+			this.getOrderInfo()
+		},
+		methods:{
+			passengerConfirm(e){
+				this.form.idName=e.value[0].label
+			},
+			// 证件下拉菜单
+			showCardChoose(){
+				console.log(11)
+				this.show=true
+			},
+					
+			// 订单数据回显
+			getOrderInfo(){
+				this.$api.get(`/merchant/hotel/order/getMerchantOrderInfo/${this.orderId}`,{
+					orderId:this.orderId
+				}).then((res)=>{
+					console.log(res)
+					if(res.data.code==0){
+						this.orderInfo = res.data.data
+						// console.log(this.orderInfo)
+						this.form.guestName=res.data.data.guestName
+						this.form.guestPhone=res.data.data.guestPhone
+					}
+				})
+			},
+			
+			
+			del(){
+				this.form.guestName=''
+				this.form.idCard=''
+				this.form.guestPhone=''
+			},			
+			submit(){
+				uni.navigateTo({
+					url:'/pages/house/orderInfo'
+				})
+			},			
+			
+		}
+		// onReady(){
+		// 	this.$refs.form.setRules(this.rules)
+		// }
+		
+	}
+</script>
+
+<style lang="scss">
+	.page {
+		background: #F3F4F4;
+		padding-bottom: 260rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+		overflow-x: auto;
+		
+	}
+	.box{
+		background-color: #fff;
+		margin: 0 auto 20rpx;
+		border-radius: 10rpx;
+		width: 92%;
+		padding: 0 30rpx;
+		margin-top: 20rpx;
+	}
+	.tit {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #333;
+	}
+	.del{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		height: 102rpx;
+		background-color: #fff;
+		font-size: 30rpx
+	}
+	.addPerson{
+		// margin: 0 auto ;
+		width: 92%;
+		height: 100rpx;
+		margin-left: 30rpx;
+		// margin-top: 20rpx; 
+		background-color: #fff;
+		border-radius: 10rpx; 
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 30rpx;
+		color: #1372FF;
+		
+	}
+	.yes{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 690rpx;
+		height: 96rpx;
+		background-color: #1372FF;
+		border-radius: 48rpx;
+		position: fixed;
+		bottom: 10%;
+		margin-left: 30rpx;
+		color: #fff;
+		font-size: 34rpx;
+		// line-height: 96rpx;
+		// margin-top: 200rpx;
+	}
+	.delete{
+		display: flex;
+		 justify-content: center; 
+		 align-items: center;
+	}
+	.personInfo{
+		padding-left: 15rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>

pages/login/select.vue

@@ -29,18 +29,20 @@
 			},
 			getList(){
 				this.list = [
-					{ name:'一家民宿', type:'酒店民宿' },
+					{ name:'一家民宿', type:'酒店民宿'},
 					{ name:'石柱村渔家乐', type:'渔家乐' },
 					{ name:'周游嵊泗', type:'旅行社' }
 				]
 			},
 			toHome(item){
+				console.log(item)
+				this.$store.state.moduleHouse.homestayId=item.merchantId||'1711268640588517378';
 				uni.setStorageSync('userInfo',this.userInfo);
 				uni.reLaunch({
 					url:'/pages/home/index'
 				})
 			}
-		}
+		}			
 	}
 </script>
 

pages/statistics/index.vue

@@ -1,29 +1,309 @@
 <template>
-	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+	<view class="page" :style="{'padding-top':mt+'px'}">
 		<c-nav-bar title="统计" :showIcon="false"></c-nav-bar>
-		
+		<view class="hander">
+			<!-- 2024年1月 -->
+			<view
+				class="tn-flex tn-flex-col-center justify-content-item tn-margin-right tn-padding-xs tn-text-sm tn-bg-gray--light tn-radius tn-color-gray--dark"
+				style="border-radius: 12rpx;">
+				<picker @change="bindDateChange" mode="date" :value="date" :start="startDate" :end="endDate"
+					fields="month">
+					<text class="tn-padding-left-xs tn-padding-right-xs">{{date}}</text>
+				</picker>
+			</view>
+		</view>
+		<view class="hander-price">
+			<view class="one">
+				<view class="left">
+					总营业额
+				</view>
+				<view class="right">
+					共124笔
+				</view>
+			</view>
+			<view class="two">
+				<text>￥</text>
+				<text>15424.00</text>
+			</view>
+		</view>
+
+		<view class="echarts-one">
+			<view class="title">
+				营业概况
+			</view>
+			<view class="hander-content">
+				<view class="list">
+					<view class="title">
+						房费
+					</view>
+					<view class="price">
+						{{}}￥21964.00
+					</view>
+				</view>
+				<view class="list">
+					<view class="title">
+						商品
+					</view>
+					<view class="price">
+						{{}}￥6514.00
+					</view>
+				</view>
+				<view class="list">
+					<view class="title">
+						其他
+					</view>
+					<view class="price">
+						{{}}￥2514.00
+					</view>
+				</view>
+
+			</view>
+			<view class="Pie_charts">
+				<PieCharts></PieCharts>
+
+			</view>
+		</view>
+		<view class="echarts-two">
+
+			<view class="title">
+				交易趋势
+			</view>
+			<view class="title1">
+				单位：元
+			</view>
+			<view class="line_charts_one">
+				<LineOne />
+
+			</view>
+		</view>
+		<view class="echarts-three">
+			<view>
+				<view class="title">
+					入住率
+				</view>
+				<view class="title1">
+
+					入住率(%)
+				</view>
+			</view>
+			<view class="line_charts_two">
+				<LineTwo />
+			</view>
+		</view>
 		<Tabbar :tabbarIndex="2"></Tabbar>
 	</view>
 </template>
 
 <script>
+	// import uCharts from '@/utils/u-charts.js';
+	import PieCharts from "@/components/Charts/PieCharts.vue"
+	import LineOne from "@/components/Charts/LineOne.vue"
+	import LineTwo from "@/components/Charts/LineTwo.vue"
 	export default {
+		components: {
+			PieCharts,
+			LineOne,
+			LineTwo
+		},
 		data() {
 			return {
-				
+				h: uni.getSystemInfoSync().windowHeight,
+				mt: uni.getSystemInfoSync().statusBarHeight + 54,
+				date: '2023-07',
 			}
 		},
+		onReady() {},
 		methods: {
-			
+
+			bindDateChange(e) {
+				this.date = e.detail.value
+			},
+			// 时间
+			startDate() {
+				return this.getDate('start');
+			},
+			endDate() {
+				return this.getDate('end');
+			},
 		}
-	}
+	};
 </script>
 
 <style scoped lang="less">
-	.page{
+	// .charts {
+	// 	width: 700rpx;
+	// 	height: 630rpx;
+	// }
+	.charts-box {
+		width: 100%;
+		height: 630rpx;
+	}
+
+	.page {
 		background: #F3F4F4;
 		padding-bottom: 40rpx;
 		box-sizing: border-box;
-		overflow-y: auto;
+		// overflow-y: auto;
+		padding: 20rpx 30rpx;
+		// height: 100%;
+	}
+
+	.hander {
+		height: 48rpx;
+		width: 216rpx;
+		border-radius: 8rpx;
+		background-color: #fff;
+		text-align: center;
+		line-height: 48rpx;
+	}
+
+	.hander-price {
+		margin-top: 20rpx;
+		width: 100%;
+		height: 192rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		background-color: #fff;
+
+		.one {
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				font-size: 32rpx;
+				color: #333333;
+				font-weight: Heavy;
+				font-family: PingFang SC-Heavy;
+			}
+
+			.right {
+				font-size: 24rpx;
+				color: #333333;
+				font-weight: Regular;
+				font-family: PingFang SC-Regular;
+			}
+		}
+
+		.two {
+			margin-top: 20rpx;
+			font-size: 48rpx;
+			color: #1372FF;
+			font-weight: Heavy;
+			font-family: PingFang SC-Heavy;
+		}
+	}
+
+	.echarts-one {
+		box-sizing: border-box;
+		width: 100%;
+		height: 829rpx;
+		background-color: #fff;
+		margin: 20rpx 0;
+		border-radius: 10rpx;
+		padding: 30rpx;
+
+		.title {
+			font-size: 32rpx;
+			color: #333333;
+			font-weight: Heavy;
+			font-family: PingFang SC-Heavy;
+		}
+
+		.hander-content {
+			margin-top: 40rpx;
+			display: flex;
+			justify-content: space-between;
+			height: 110rpx;
+
+			.title {
+				font-size: 28rpx;
+				color: #777777;
+				font-weight: Regular;
+				font-family: PingFang SC-Regular;
+			}
+
+			.price {
+				margin-top: 10rpx;
+				font-size: 28rpx;
+				color: #333;
+				font-weight: Bold;
+				font-family: PingFang SC-Bold;
+			}
+
+		}
+
+		.Pie_charts {
+			height: 630rpx;
+			width: 630rpx;
+			// background-color: aqua;
+		}
+
+	}
+
+	.echarts-two {
+		box-sizing: border-box;
+		width: 100%;
+		height: 543rpx;
+		background-color: #fff;
+		margin: 20rpx 0;
+		border-radius: 10rpx;
+		padding: 30rpx;
+
+		.title {
+			font-size: 32rpx;
+			color: #333333;
+			font-weight: Heavy;
+			font-family: PingFang SC-Heavy;
+		}
+
+		.title1 {
+			margin-left: 20rpx;
+			margin-top: 20rpx;
+			font-size: 20rpx;
+			color: #333333;
+			font-weight: Regular;
+			font-family: PingFang SC-Regular;
+		}
+
+		.line_charts_one {
+			width: 630rpx;
+			height: 388rpx;
+			// background-color: aqua;
+		}
+
+	}
+
+	.echarts-three {
+		box-sizing: border-box;
+		width: 100%;
+		height: 540rpx;
+		background-color: #fff;
+		margin: 20rpx 0;
+		border-radius: 10rpx;
+		padding: 30rpx;
+
+		.title {
+			font-size: 32rpx;
+			color: #333333;
+			font-weight: Heavy;
+			font-family: PingFang SC-Heavy;
+		}
+
+		.title1 {
+			margin-left: 20rpx;
+			margin-top: 20rpx;
+			font-size: 20rpx;
+			color: #333333;
+			font-weight: Regular;
+			font-family: PingFang SC-Regular;
+		}
+
+		.line_charts_two {
+			width: 630rpx;
+			height: 388rpx;
+			// background-color: aqua;
+		}
+
 	}
 </style>

store/house/index.js

@@ -1,5 +1,5 @@
 const state = {
-	
+	 homestayId:'1711268640588517378',
 }
 
 const getters = {

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,80 @@
+{
+  "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": {
+  },
+"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"
+        }
+      }
+    }
+  }
+}

uni_modules/tuniaoui-wx-user-info/changelog.md

@@ -0,0 +1,4 @@
+## 1.0.1（2022-11-22）
+更新使用文档
+## 1.0.0（2022-11-22）
+适配微信新版获取用户头像、昵称信息

uni_modules/tuniaoui-wx-user-info/components/tuniaoui-wx-user-info/tuniaoui-wx-user-info.vue

@@ -0,0 +1,329 @@
+<template>
+  <view
+    v-if="openModal"
+    class="wx-authorization-modal"
+  >
+    <view
+      class="wam__mask"
+      @touchmove.prevent=""
+      @tap.stop="closeModal"
+    ></view>
+    
+    <!-- 内容区域 -->
+    <view class="wam__wrapper">
+      <!-- 关闭按钮 -->
+      <view class="wam__close-btn" @tap.stop="closeModal">
+        <text class="tn-icon-close"></text>
+      </view>
+      <!-- 标题 -->
+      <view class="wam__title">获取您的昵称、头像</view>
+      <!-- tips -->
+      <view class="wam__sub-title">
+        获取用户头像、昵称，主要用于向用户提供具有辨识度的用户中心界面
+      </view>
+      
+      <!-- 头像选择 -->
+      <view class="wam__avatar">
+        <view class="button-shadow">
+          <button
+            class="button"
+            open-type="chooseAvatar"
+            @chooseavatar="chooseAvatarEvent"
+          >
+            <view v-if="userInfo.avatar" class="avatar__image">
+              <image class="image" :src="userInfo.avatar" mode="aspectFill"></image>
+            </view>
+            <view v-else class="avatar__empty">
+              <image class="image" src="https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1668928062708-assets/web-upload/764843cf-055a-4cb6-b5d3-dca528b33fd4.jpeg" mode="aspectFill"></image>
+            </view>
+            <view class="avatar--icon">
+              <view class="tn-icon-camera-fill"></view>
+            </view>
+          </button>
+        </view>
+      </view>
+      
+      <!-- 昵称输入 -->
+      <view class="wam__nickname">
+        <view class="nickname__data">
+          <input class="input" type="nickname" v-model="userInfo.nickname" placeholder="请输入昵称" placeholder-style="color: #AAAAAA;">
+        </view>
+      </view>
+      
+      
+      <!-- 保存按钮 -->
+      <view
+        class="wam__submit-btn"
+        :class="[{
+          'disabled': !userInfo.avatar || !userInfo.nickname
+        }]"
+        hover-class="tn-btn-hover-class"
+        :hover-stay-time="150"
+        @tap.stop="submitUserInfo"
+      >
+        保 存
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  
+  export default {
+    options: {
+      // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+      virtualHost: true
+    },
+    props: {
+      value: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        openModal: false,
+        userInfo: {
+          avatar: '',
+          nickname: ''
+        }
+      }
+    },
+    watch: {
+      value: {
+        handler(val) {
+          this.openModal = val
+        },
+        immediate: true
+      }
+    },
+    methods: {
+      
+      
+      // 头像选择
+      chooseAvatarEvent(e) {
+        this.userInfo.avatar = e.detail.avatarUrl
+      },
+      
+      // 更新用户信息
+      submitUserInfo() {
+        // 判断是否已经选择了用户头像和输入了用户昵称
+        if (!this.userInfo.avatar || !this.userInfo.nickname) {
+          return uni.showToast({
+            icon: 'none',
+            title: '请选择头像和输入用户信息'
+          })
+        }
+        
+        // 更新完成事件
+        this.$emit('updated', this.userInfo)
+        
+      },
+      
+      // 关闭弹框
+      closeModal() {
+        this.$emit('input', false)
+      },
+      
+      
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  @import '../../static/iconfont.css';
+  
+  .wx-authorization-modal {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 99998;
+    
+    view {
+      box-sizing: border-box;
+    }
+    
+    .image {
+      width: 100%;
+      height: 100%;
+      border-radius: inherit;
+    }
+    
+    .wam {
+      /* mask */
+      &__mask {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0, 0, 0, 0.5);
+        opacity: 0;
+        animation: showMask 0.25s ease 0.1s forwards;
+      }
+      
+      /* close-btn */
+      &__close-btn {
+        position: absolute;
+        top: 30rpx;
+        right: 30rpx;
+        z-index: 99999;
+      }
+      
+      /* wrapper */
+      &__wrapper {
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        background-color: #FFFFFF;
+        border-radius: 20rpx 20rpx 0rpx 0rpx;
+        padding: 40rpx;
+        padding-top: 60rpx;
+        padding-bottom: 40rpx;
+        padding-bottom: calc(constant(safe-area-inset-bottom) + 40rpx);
+        padding-bottom: calc(env(safe-area-inset-bottom) + 40rpx);
+        transform-origin: center bottom;
+        transform: scaleY(0);
+        animation: showWrapper 0.25s ease 0.1s forwards;
+        z-index: 99999;
+      }
+      
+      /* title */
+      &__title {
+        font-size: 34rpx;
+      }
+      /* sub-title */
+      &__sub-title {
+        font-size: 26rpx;
+        color: #AAAAAA;
+        margin-top: 16rpx;
+        padding-bottom: 30rpx;
+      }
+      
+      /* 头像选择 */
+      &__avatar {
+        width: 100%;
+        margin-top: 30rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+        .button-shadow {
+          border: 8rpx solid rgba(255,255,255,0.05);
+          box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.15);
+          border-radius: 50%;
+        }
+        
+        .button {
+          position: relative;
+          width: 160rpx;
+          height: 160rpx;
+          border-radius: 50%;
+          overflow: visible;
+          background-image: repeating-linear-gradient(45deg, #E4E9EC, #F8F7F8);
+          color: #FFFFFF;
+          background-color: transparent;
+          padding: 0;
+          margin: 0;
+          font-size: inherit;
+          line-height: inherit;
+          border: none;
+          &::after {
+            border: none;
+          }
+        }
+        
+        .avatar {
+          &__empty, &__image {
+            width: 100%;
+            height: 100%;
+            border-radius: inherit;
+          }
+          
+          &--icon {
+            position: absolute;
+            right: -10rpx;
+            bottom: -6rpx;
+            width: 60rpx;
+            height: 60rpx;
+            // transform: translate(50%, 50%);
+            background-color: #1D2541;
+            color: #FFFFFF;
+            border-radius: 50%;
+            border: 6rpx solid #FFFFFF;
+            line-height: 1;
+            font-size: 36rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+      
+      /* 昵称 */
+      &__nickname {
+        margin-top: 40rpx;
+        
+        .nickname {
+          
+          &__data {
+            margin-top: 16rpx;
+            width: 100%;
+            padding: 26rpx 20rpx;
+            border-radius: 10rpx;
+            background-color: #F8F7F8;
+            
+            .input {
+              color: #080808;
+            }
+          }
+        }
+      }
+      
+      /* 保存按钮 */
+      &__submit-btn {
+        width: 100%;
+        background-color: #05C160;
+        color: #FFFFFF;
+        margin-top: 60rpx;
+        border-radius: 10rpx;
+        padding: 25rpx;
+        font-size: 32rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+        &.disabled {
+          background-color: #E6E6E6;
+        }
+      }
+      
+      
+    }
+  }
+  
+  .tn-btn-hover-class {
+    box-shadow: inset 10rpx 2rpx 40rpx 0rpx rgba(0, 0, 0, 0.05);
+  }
+  
+  @keyframes showMask {
+    0% {
+      opacity: 0;
+    }
+    100% {
+      opacity: 1;
+    }
+  }
+  @keyframes showWrapper {
+    0% {
+      transform: scaleY(0);
+    }
+    100% {
+      transform: scaleY(1);
+    }
+  }
+</style>

uni_modules/tuniaoui-wx-user-info/package.json

@@ -0,0 +1,83 @@
+{
+  "id": "tuniaoui-wx-user-info",
+  "displayName": "微信用户信息设置弹框",
+  "version": "1.0.1",
+  "description": "设置微信用户头像、昵称信息",
+  "keywords": [
+    "微信小程序",
+    "微信小程序用户信息",
+    "图鸟UI"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "n",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "n",
+          "Android Browser": "n",
+          "微信浏览器(Android)": "n",
+          "QQ浏览器(Android)": "n"
+        },
+        "H5-pc": {
+          "Chrome": "n",
+          "IE": "n",
+          "Edge": "n",
+          "Firefox": "n",
+          "Safari": "n"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "n",
+          "百度": "n",
+          "字节跳动": "n",
+          "QQ": "n",
+          "钉钉": "n",
+          "快手": "n",
+          "飞书": "n",
+          "京东": "n"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        }
+      }
+    }
+  }
+}

uni_modules/tuniaoui-wx-user-info/readme.md

@@ -0,0 +1,84 @@
+
+# 使用说明
+
+使用方法：
+
+```
+<template>
+	<view class="login-page">
+    <!-- 授权登录按钮 -->
+    <view class="submit-btn"  @tap.stop="openAuthorizationModal">
+      授权登录
+    </view>
+    
+    
+    <wx-user-info-modal
+      v-model="showAuthorizationModal"
+      @updated="updatedUserInfoEvent"
+    ></wx-user-info-modal>
+	</view>
+</template>
+
+<script>
+  import WxUserInfoModal from '@/uni_modules/tuniaoui-wx-user-info/components/tuniaoui-wx-user-info/tuniaoui-wx-user-info.vue'
+  
+	export default {
+    components: { WxUserInfoModal },
+		data() {
+			return {
+				showAuthorizationModal: false
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+      // 打开获取用户信息弹框
+      openAuthorizationModal() {
+        this.showAuthorizationModal = true
+      },
+      
+      // 获取到的用户信息
+      updatedUserInfoEvent(info) {
+        console.log('获取到的用户信息', info)
+      },
+      
+      
+		}
+	}
+</script>
+
+<style>
+	.login-page {
+    width: 100vw;
+    height: 100vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  /* 授权按钮 */
+  .submit-btn {
+    width: 100%;
+    background-color: #05C160;
+    color: #FFFFFF;
+    margin-top: 60rpx;
+    border-radius: 10rpx;
+    padding: 25rpx;
+    font-size: 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 30rpx;
+  }
+</style>
+
+```
+
+参数说明：
+
+| 参数       | 说明                                                 |
+| :-------- | ---------------------------------------------------- |
+| v-model   | 弹出、关闭设置用户信息弹框                               |
+