init

.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+package-lock.json
+unpackage/

.hbuilderx/launch.json

@@ -0,0 +1,16 @@
+{
+    "version" : "1.0",
+    "configurations" : [
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        },
+	{
+		"app-plus" : 
+		{
+			"launchtype" : "local"
+		},
+		"type" : "uniCloud"
+	}
+    ]
+}

App.vue

@@ -0,0 +1,25 @@
+
+<script>
+import { getHotelList } from '@/utils/api.js'
+	export default {
+		async mounted(){
+			let data = await getHotelList()
+            this.$store.commit('setHotelIdList', data.result.records)
+			console.log(this.$store.state.hotelIdList);
+			this.$store.commit('setHotelId', data.result.records[0].id)
+		},
+		onLaunch: function() {
+			console.log('App Launch')
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
+<style>
+	/*每个页面公共css */
+</style>

components/businessAnalysis/businessAnalysis.vue

@@ -0,0 +1,442 @@
+<template>
+<view>
+    <Header :borbtm="false" @change="headerChange">
+        <template #search>
+            <u-subsection :list="list" mode="subsection" :current="current" @change="topChange"></u-subsection>
+        </template>
+        <template #section>
+
+        </template>
+    </Header>
+    <div style="display:flex;padding:10px;">
+        <uni-data-select :clear="false" v-model="timeCheck" :localdata="rangeTime" @change="changeTime"></uni-data-select>
+        <uni-data-select :clear="false" v-model="dayCheck" :localdata="rangeDay" @change="changeDay"></uni-data-select>
+        <div @click="show = true" class="calendar">{{`${startTime} ~ ${endTime}`}}</div>
+    </div>
+    <u-calendar closeOnClickOverlay :show="show" mode="range" @close="close" @confirm="confirm"></u-calendar>
+
+    <div class="content-detail">
+        <div class="content-detail-top">
+            <div>
+                <div>
+                    总营业额/元
+                </div>
+                <div>
+                    {{todayTotalIncome}}元
+                </div>
+            </div>
+            <div v-if="currentWay == 1">
+                <div>
+                    实收
+                </div>
+                <div>
+                    {{todayIncome.reduce((pre, cur) => pre+cur.amount,0 ) || 0}}元
+                </div>
+            </div>
+            <div v-if="currentWay == 1">
+                <div>
+                    欠款（预付）/元
+                </div>
+                <div>
+                    {{roomData.todayArrearsRoomData}}
+                </div>
+            </div>
+        </div>
+        <div class="content-detail-bottom">
+            <!-- <div>
+                <div>间夜数</div>
+                <div>1234</div>
+            </div> -->
+            <div>
+                <div>入住率</div>
+                <div>{{((roomData.checkInRoomData/roomData.allRoomData) || 0).toFixed(2)}}%</div>
+            </div>
+            <div>
+                <div>平均房价/元</div>
+                <div>{{roomData.housingPrices}}</div>
+            </div>
+            <div>
+                <div>RevPAR</div>
+                <div v-if="roomData.checkInRoomData/roomData.allRoomData!=0 && roomData.allRoomData!=0" style="font-size: 18px;">{{((roomData.housingPrices*roomData.allRoomData)/(roomData.checkInRoomData/roomData.allRoomData).toFixed(2)).toFixed(2)}}</div>
+                <div v-else style="font-size: 18px;">{{0}}</div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 支付方式 -->
+    <u-subsection v-if="currentWay==1" style="margin-top:20px;width:35vw;" :list="payMethodsList" mode="subsection" :current="currentPayMethods" @change="PayChange"></u-subsection>
+
+    <u-subsection style="margin-top:20px;" :list="listWay" mode="subsection" :current="currentWay" @change="WayChange"></u-subsection>
+
+    <!-- table表格 -->
+    <!-- 按时间 -->
+    <Time :tableData="tableData" v-if="currentWay==0" />
+    <!-- 按收款方式 -->
+    <PayMethodsVue :tableData="tableData" v-if="currentWay==1" />
+    <!-- 按房型 -->
+    <RoomTypeVue :tableData="tableData" v-if="currentWay==2" />
+    <!-- 按费项 -->
+    <FeeItemsVue :tableData="tableData" v-if="currentWay==3" />
+    <!-- 按来源 -->
+    <SourceVue :tableData="tableData" v-if="currentWay==4" />
+    <!-- 按客型 -->
+    <CustomerTypeVue :tableData="tableData" v-if="currentWay==5" />
+    <!-- 按入住类型 -->
+    <OccupancyTypeVue :tableData="tableData" v-if="currentWay==6" />
+
+</view>
+</template>
+
+<script>
+import Header from '../header.vue'
+import PayMethodsVue from '../tableCharts/payMethods.vue'
+import RoomTypeVue from '../tableCharts/roomType.vue'
+import Time from '../tableCharts/time.vue'
+import FeeItemsVue from '../tableCharts/feeItems.vue'
+import SourceVue from '../tableCharts/source.vue'
+import CustomerTypeVue from '../tableCharts/customerType.vue'
+import OccupancyTypeVue from '../tableCharts/occupancyType.vue'
+
+import {
+    getDataList,
+    getShouKuanList,
+    getFangXingList,
+    getFeiXiangList,
+    getLaiYuanList,
+    getKeXingList,
+    getRuZhuList
+} from '../../utils/businessAnalysisApi'
+import {
+    getHotelList,
+    getRevPAR,
+    getTodayIncome,
+    getTodayTotalIncome,
+    getStaySource,
+    getRoomStatus,
+    getIncomeAndExpenditure
+} from '../../utils/api.js';
+
+export default {
+    components: {
+        Header,
+        Time,
+        PayMethodsVue,
+        RoomTypeVue,
+        FeeItemsVue,
+        SourceVue,
+        CustomerTypeVue,
+        OccupancyTypeVue
+    },
+    data() {
+        return {
+            list: ['收入统计', '支出统计'],
+            listWay: ['按时间', '按收款方式', '按房型', '按费项', '按来源', '按客型', '按入住类型'],
+            payMethodsList: ['查看营业额', '查看实收'],
+            current: 0,
+            currentWay: 0,
+            currentPayMethods: 0,
+            rangeTime: [{
+                    value: 1,
+                    text: "按日"
+                },
+                {
+                    value: 2,
+                    text: "按月"
+                },
+                {
+                    value: 3,
+                    text: "按季度"
+                },
+                {
+                    value: 4,
+                    text: "按年"
+                },
+            ],
+            rangeDay: [{
+                    value: 0,
+                    text: "按营业日"
+                },
+                {
+                    value: 1,
+                    text: "按自然日"
+                }
+            ],
+            timeCheck: 1,
+            dayCheck: 0,
+            startTime: (new Date().toLocaleDateString()).replace(/\//g, '-'),
+            endTime: (new Date(new Date().getTime() + 24 * 60 * 60 * 1000).toLocaleDateString()).replace(/\//g, '-'),
+            show: false,
+            tableData: [], //表格数据
+            todayTotalIncome: 0, //今日总收款
+            roomData: {
+                //房间总数
+                allRoomData: 0,
+                //入住总数
+                checkInRoomData: 0,
+                //平均房价
+                housingPrices: 0,
+                // 今日预离
+                todayLeaveRoomData: 0,
+                //今日预抵
+                todayArriveRoomData: 0,
+                //今日欠费
+                todayArrearsRoomData: 0,
+                //脏房
+                dirtyRoomData: 0,
+            },
+            todayIncome:[],
+        }
+    },
+    onLoad(options) {
+        console.log(options.current);
+        if (options.current) {
+            this.currentWay = options.current
+        }
+    },
+    mounted() {
+        this.getData()
+    },
+    methods: {
+        topChange(e) {
+            this.current = e
+        },
+        changeTime(e) {
+            console.log(e);
+            this.timeCheck = e
+            this.getData()
+        },
+        changeDay(e) {
+            this.dayCheck = e
+        },
+
+        /**
+         * 日期选择确认
+         */
+        confirm(e) {
+            this.show = false
+            this.timeList = e
+            this.startTime = e[0].replace(/\//g, '-')
+            this.endTime = e[e.length - 1].replace(/\//g, '-')
+        },
+
+        /**
+         * 日期选择取消
+         */
+        close() {
+            this.show = false
+        },
+
+        WayChange(e) {
+            this.currentWay = e
+            this.tableData = []
+            this.getData()
+        },
+        PayChange(e) {
+            this.currentPayMethods = e
+        },
+        getData(all = false) {
+            // console.log(this.startTime);
+            this.startTime = this.startTime.replace(/\//g, '-')
+            this.endTime = this.endTime.replace(/\//g, '-')
+
+            getTodayTotalIncome({
+                startTime: this.startTime,
+                endTime: this.endTime
+            }).then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.records.length > 0) {
+                    let brr = []
+                    let data = res.result.records
+                    data.forEach(item => {
+                        let arr = []
+                        arr = Object.keys(item).filter(items => items != 'department' && items != 'hotel_name')
+                        brr = Object.keys(item).filter(items => items == '现金' || items == '微信' || items == '支付宝')
+                        console.log(arr);
+                        arr.forEach(ele => {
+                            this.todayTotalIncome += item[ele] * 1
+                        })
+                    })
+                    let obj = {}
+                    let copy = []
+                    brr.forEach((item, i) => {
+                        console.log(obj);
+                        copy.push({
+                            name: item,
+                            amount: data.reduce((pre, cur) => {
+                                return pre + cur[item]
+                            }, 0)
+                        })
+                    })
+                    // this.paymentMethod = copy
+                    // console.log('2222222222', copy);
+                    // console.log(this.todayTotalIncome);
+                } else {
+                    this.todayTotalIncome = 0
+                }
+            })
+            // 房间数据统计
+            getRevPAR({
+                startTime: this.startTime,
+                endTime: this.endTime
+            }).then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    this.roomData.allRoomData = res.result[0]
+                    this.roomData.checkInRoomData = res.result[1]
+                    this.roomData.housingPrices = res.result[2]
+                    this.roomData.todayLeaveRoomData = res.result[3]
+                    this.roomData.todayArriveRoomData = res.result[4]
+                    this.roomData.todayArrearsRoomData = res.result[5]
+                    this.roomData.dirtyRoomData = res.result[6]
+                }
+            })
+
+            //今日收入统计
+            getTodayIncome({
+                startTime: this.startTime,
+                endTime: this.endTime
+            }).then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    console.log(res.result);
+                    this.todayIncome = res.result
+                } else {
+                    this.todayIncome = [{
+                            name: '押金',
+                            amount: 0
+                        },
+                        {
+                            name: '房费',
+                            amount: 0
+                        },
+                        {
+                            name: '商品',
+                            amount: 0
+                        }
+                    ]
+                }
+            })
+
+            if (this.currentWay == 0 || all) {
+                getDataList(this.startTime, this.endTime, this.timeCheck).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result) {
+                        this.tableData = res.result
+                    } else {
+                        this.tableData = []
+                    }
+                })
+            }
+            if (this.currentWay == 1 || all) {
+                getShouKuanList(this.startTime, this.endTime).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result) {
+                        this.tableData = res.result
+                    }
+                })
+            }
+            if (this.currentWay == 2 || all) {
+                getFangXingList(this.startTime, this.endTime).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result) {
+                        this.tableData = res.result
+                    }
+                })
+            }
+            if (this.currentWay == 3 || all) {
+                getFeiXiangList(this.startTime, this.endTime).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result) {
+                        this.tableData = res.result
+                    }
+                })
+            }
+            if (this.currentWay == 4 || all) {
+                getLaiYuanList(this.startTime, this.endTime).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result) {
+                        this.tableData = res.result
+                    }
+                })
+            }
+            if (this.currentWay == 5 || all) {
+                getKeXingList(this.startTime, this.endTime).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result) {
+                        this.tableData = res.result
+                    }
+                })
+            }
+            if (this.currentWay == 6 || all) {
+                getRuZhuList(this.startTime, this.endTime).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result) {
+                        this.tableData = res.result
+                    }
+                })
+            }
+
+        },
+        headerChange() {
+            this.getData()
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.pages {
+    width: 100vw;
+    height: 100vh;
+    background-color: #f5f5f5;
+}
+
+.calendar {
+    border: 1px solid;
+    padding: 5px 10px;
+    border-radius: 5px;
+    color: #409EFF;
+    font-size: 12px;
+    // min-width: 30%;
+    margin-left: 10px;
+    display: flex;
+    align-items: center;
+}
+
+.content-detail {
+    background: #409EFF;
+    padding: 10px;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 0 10px #000;
+    color: #fff;
+    height: 130px;
+    justify-content: space-between;
+
+    .content-detail-top {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10px;
+
+        div {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            flex: 1;
+        }
+    }
+
+    .content-detail-bottom {
+        display: flex;
+        justify-content: space-between;
+
+        div {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            flex: 1;
+            font-size: 16px;
+        }
+    }
+}
+</style>

components/echarts/line.vue

@@ -0,0 +1,116 @@
+<template>
+<view class="charts-box">
+    <qiun-data-charts :type="type" :opts="opts" :legend="false" :errorShow="true" errorMessage="暂无数据" :chartData="chartData" v-if="chartData.categories.length > 0 && chartData.series.length > 0" />
+    <u-empty v-else mode="data" />
+</view>
+</template>
+
+<script>
+export default {
+    // :chartData="chartData"
+    //     :errorShow="chartData.categories.length === 0 || chartData.series.length === 0"
+    props: {
+        //图表数据
+        chartData: {
+            type: Object,
+            default: () => {
+                return {
+                    categories: ["1月", "2月", "3月", "4月", "5月", "6月"],
+                    series: [{
+                            name: "无",
+                            data: []
+                        },
+                        {
+                            name: "无",
+                            data: []
+                        },
+                        {
+                            name: "无",
+                            data: []
+                        }
+                    ]
+                };
+            }
+        },
+        //图表类型
+        type: {
+            type: String,
+            default: "line"
+        }
+    },
+    watch: {
+        chartData(newVal, oldVal) {
+            console.log('newVal', newVal);
+        }
+    },
+    data() {
+        return {
+            // chartData: {},
+            //您可以通过修改 config-ucharts.js 文件中下标为 ['line'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
+            opts: {
+                color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
+                padding: [15, 10, 0, 15],
+                enableScroll: false,
+                legend: {
+                    show: false
+                },
+                dataLabel: false,
+                dataPointShape: false,
+                xAxis: {
+                    disableGrid: true
+                },
+                yAxis: {
+                    gridType: "dash",
+                    dashLength: 2
+                },
+                extra: {
+                    line: {
+                        type: "straight",
+                        width: 2,
+                        activeType: "hollow"
+                    }
+                }
+            }
+        };
+    },
+    mounted() {
+        this.getServerData();
+    },
+    methods: {
+        getServerData() {
+            //模拟从服务器获取数据时的延时
+            setTimeout(() => {
+                //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+                let res = {
+                    categories: ["1月", "2月", "3月", "4月", "5月", "6月"],
+                    series: [{
+                            name: "成交量A",
+                            data: [35, 8, 25, 37, 4, 20]
+                        },
+                        {
+                            name: "成交量B",
+                            data: [70, 40, 65, 100, 44, 68]
+                        },
+                        {
+                            name: "成交量C",
+                            data: [100, 80, 95, 150, 112, 132]
+                        }
+                    ]
+                };
+                // this.chartData = JSON.parse(JSON.stringify(res));
+            }, 0);
+        },
+    }
+};
+</script>
+
+<style scoped>
+/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+.charts-box {
+    width: 100%;
+    height: 300px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+</style>

components/echarts/pie.vue

@@ -0,0 +1,87 @@
+<template>
+<div class="charts-box" ref="eChart" id="main"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+export default {
+    props: {
+        //图表数据
+        chartData: {
+            type: Array,
+            default: () => {},
+        },
+    },
+    data() {
+        return {};
+    },
+    watch:{
+        chartData(newVal, oldVal){
+          console.log(newVal, oldVal);
+          this.init()
+        }
+    },
+    mounted() {
+      console.log(this.chartData);
+      this.init()
+    },
+    methods: {
+        init() {
+            var chartDom = this.$refs.eChart
+            var myChart = echarts.init(chartDom);
+            var option;
+
+            option = {
+                tooltip: {
+                    trigger: 'axis',
+                    triggerOn: 'click',
+                    axisPointer: {
+                        // Use axis to trigger tooltip
+                        type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+                    },
+                },
+                legend: {
+                    bottom: '0%',
+                    left: 'center'
+                },
+                series: [{
+                    name: '',
+                    type: 'pie',
+                    radius: ['40%', '70%'],
+                    avoidLabelOverlap: false,
+                    itemStyle: {
+                        borderRadius: 10,
+                        borderColor: '#fff',
+                        borderWidth: 2
+                    },
+                    label: {
+                        show: false,
+                        position: 'center'
+                    },
+                    emphasis: {
+                        label: {
+                            show: true,
+                            fontSize: 40,
+                            fontWeight: 'bold'
+                        }
+                    },
+                    labelLine: {
+                        show: false
+                    },
+                    data: this.chartData
+                }]
+            };
+
+            option && myChart.setOption(option);
+        }
+    },
+};
+</script>
+
+<style scoped>
+/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+.charts-box {
+    width: 100%;
+    height: 400px;
+}
+</style>

components/header.vue

@@ -0,0 +1,108 @@
+<template>
+<div style="background-color:#fff;overflow: hidden;" :style="{'border-bottom': borbtm?'1px solid':'none'}">
+    <u-navbar title="" @rightClick="rightClick" :autoBack="!isSwitch" placeholder @leftClick="leftClick" :leftIcon="isSwitch? '' : 'arrow-left' ">
+        <div slot="center" style="width:auto">
+            <uni-data-select :clear="false" style="flex:1" v-model="hotelIds" :localdata="range" @change="change"></uni-data-select>
+        </div>
+    </u-navbar>
+    <!-- <u--input placeholder="房间号/姓名/手机号/身份证号" border="surround" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" fontSize="12px" :customStyle="{border:'1px solid #e2e2e2',padding:'0 10px',margin:'0 10px',borderRadius:'20px'}">
+    </u--input> -->
+    <slot name="search"></slot>
+    <div style="margin:10px 0 6px 0;">
+        <!-- <u-subsection :list="list" mode="subsection" :current="current" @change="sectionChange"></u-subsection> -->
+        <slot name="section"></slot>
+    </div>
+</div>
+</template>
+
+<script>
+import {
+    mapState
+} from 'vuex'
+import {
+    getHotelList
+} from '../utils/api'
+export default {
+    props: {
+        borbtm: {
+            type: Boolean,
+            default: true
+        },
+        isSwitch: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            hotelIds: 0,
+            value: 0,
+            range: [{
+                    value: 0,
+                    text: "全部"
+                },
+                {
+                    value: 1,
+                    text: "沙县大酒店"
+                },
+                {
+                    value: 2,
+                    text: "游泳"
+                },
+            ],
+        }
+    },
+    computed: {
+        // ...mapState(['hotelIdList','hotelId'])
+        ...mapState({
+            hotelIdList: state => state.hotelIdList,
+            hotelId: state => state.hotelId
+        })
+    },
+    watch: {
+        hotelIdList(newVal) {
+            console.log('header', newVal);
+            this.range = newVal.map(item => {
+                return {
+                    value: item.id,
+                    text: item.name
+                }
+            })
+            this.hotelIds = newVal[0].id
+        }
+    },
+    async mounted() {
+        let data = await getHotelList()
+        if (data.code == 200) {
+            this.$nextTick(() => {
+                this.$store.commit('setHotelIdList', data.result.records)
+                this.hotelIds = data.result.records[0].id
+                this.$store.commit('setHotelId', data.result.records[0].id)
+                this.$emit('change', data.result.records[0].id)
+            })
+        }
+    },
+    methods: {
+        change(e) {
+            console.log(e)
+            this.$store.commit('setHotelId', e)
+            console.log(this.hotelId);
+            this.$emit('change', e)
+        },
+        leftClick() {
+            if (this.isSwitch) {
+                return
+            }
+            console.log('leftClick');
+        },
+        rightClick(){}
+    }
+}
+</script>
+
+<style lang="scss">
+/deep/.uni-select {
+    border: none !important;
+    text-align: center;
+}
+</style>

components/incomeDetail/historicalIncome.vue

@@ -0,0 +1,270 @@
+<template>
+<div>
+    <div style="display:flex;justify-content:flex-end;">
+        <div @click="show = true" class="calendar">{{`${startTime} ~ ${endTime}`}}</div>
+    </div>
+    <u-calendar closeOnClickOverlay :minDate="minData" :show="show" mode="range" @close="close" @confirm="confirm"></u-calendar>
+    <div class="content-detail">
+        <div class="content-detail-top">
+            <div>
+                <div>
+                    总营业额/元
+                </div>
+                <div>
+                    65535元
+                </div>
+            </div>
+            <div>
+                <div>
+                    实收
+                </div>
+                <div>
+                    60000元
+                </div>
+            </div>
+            <div>
+                <div>
+                    欠款（预付）/元
+                </div>
+                <div>
+                    500
+                </div>
+            </div>
+        </div>
+        <div class="content-detail-bottom">
+            <div>
+                <div>间夜数</div>
+                <div>1234</div>
+            </div>
+            <div>
+                <div>入住率</div>
+                <div>58%</div>
+            </div>
+            <div>
+                <div>平均房价/元</div>
+                <div>325</div>
+            </div>
+            <div>
+                <div>RevPAR</div>
+                <div>216</div>
+            </div>
+        </div>
+    </div>
+    <u-subsection style="margin-top:20px;" :list="listWay" mode="subsection" :current="currentWay" @change="WayChange"></u-subsection>
+    <u-collapse @change="change" @close="closeColl" @open="open" v-if="currentWay==0 && dataListTime.length>0">
+        <u-collapse-item title="" name="Docs guide" v-for="(item, index) in dataListTime" :key="index">
+            <b slot="title" class="u-page__item__title__slot-title">{{index+1}} {{item.roomName}} 收款合计{{item.detailList.reduce((pre, cur)=> pre+cur.money,0 )}}元</b>
+            <div class="collapse-content" v-for="(sItem, index) in item.detailList" :key="index">
+                <div>
+                    {{sItem.create_time}}
+                </div>
+                <div>
+                    {{sItem.money}}元/ {{sItem.subject_type_name}} / {{sItem.pay_name}}
+                </div>
+                <div>
+                    收款人：
+                </div>
+            </div>
+        </u-collapse-item>
+    </u-collapse>
+    <!-- <u-empty v-else mode="data" /> -->
+    <u-collapse v-if="currentWay==1 && dataListIncome.length>0">
+        <u-collapse-item title="" name="Docs guide" v-for="(item, index) in dataListIncome" :key="index">
+            <b slot="title" class="u-page__item__title__slot-title">{{index+1}} {{item.create_time}} 收款合计{{dataListIncome.reduce((pre, cur)=> pre+cur.money,0 )}}元</b>
+            <div class="collapse-content" :key="index">
+                <!-- <div>
+                    {{item.create_time}}
+                </div>
+                <div>
+                    {{item.money}}元/ {{item.room_name}} / {{item.subject_type_name}}
+                </div>
+                <div>
+                    收款人：
+                </div> -->
+            </div>
+        </u-collapse-item>
+    </u-collapse>
+    <!-- <u-empty v-else mode="data" /> -->
+    <!-- <uni-table style="margin-top:20px;" ref="table" :loading="false" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange" v-if="currentWay==1">
+        <uni-tr>
+            <uni-th width="60" align="center">序号</uni-th>
+            <uni-th width="60" align="center">时间</uni-th>
+            <uni-th width="60" align="center">金额</uni-th>
+            <uni-th width="60" align="center">房号</uni-th>
+            <uni-th width="60" align="center">费项</uni-th>
+            <uni-th width="60" align="center">收款方式</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableListIncome" :key="index">
+            <uni-td align="center">{{ index+1 }}</uni-td>
+            <uni-td>
+                <view class="name">{{ item.create_time }}</view>
+            </uni-td>
+            <uni-td align="center">{{ item.money }}</uni-td>
+            <uni-td align="center">{{ item.room_name }}</uni-td>
+            <uni-td align="center">{{ item.subject_type_name }}</uni-td>
+            <uni-td align="center">{{ item.pay_name }}</uni-td>
+        </uni-tr>
+    </uni-table> -->
+</div>
+</template>
+
+<script>
+import {
+    getRoomIncomeList,
+    getTimeIncomeList,
+    getPayMethodIncomeList,
+    getMatterExpenditureList,
+    getTimeExpenditureList,
+    getPayMethodExpenditureList,
+} from '../../utils/incomeDetail'
+import { mapState } from 'vuex'
+
+
+export default {
+    data() {
+        return {
+            listWay: ['按房间', '按时间', '按收款方式'],
+            currentWay: 0,
+            dataListTime: [],
+            dataListIncome: [],
+            tableListIncome: [],
+            show: false,
+            startTime: (new Date().toLocaleDateString()).replace(/\//g, '-'),
+            endTime: (new Date(new Date().getTime() + 24 * 60 * 60 * 1000).toLocaleDateString()).replace(/\//g, '-'),
+            minData: (new Date(new Date().getTime() - 24 * 60 * 60 * 1000 * 30).toLocaleDateString()).replace(/\//g, '-'),
+        }
+    },
+    computed:{
+        ...mapState(['hotelId'])
+    },
+    watch:{
+        hotelId(newVal, oldVal){
+            if (newVal!=oldVal) {
+                this.getData()
+            }
+        }
+    },
+    mounted() {
+        this.getData()
+    },
+    methods: {
+        getData() {
+            if (this.currentWay == 0) {
+                getRoomIncomeList({
+                    startTime: this.startTime,
+                    endTime: this.endTime,
+                }).then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.dataListTime = res.result
+                    }
+                })
+            }
+            if (this.currentWay == 1) {
+                getTimeIncomeList({
+                    startTime: this.startTime,
+                    endTime: this.endTime,
+                }).then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.dataListIncome = res.result
+                    }
+                })
+                
+            }
+
+        },
+        WayChange(e) {
+            this.currentWay = e
+            this.getData()
+        },
+        /**
+         * 日期选择确认
+         */
+        confirm(e) {
+            this.show = false
+            this.timeList = e
+            this.startTime = e[0].replace(/\//g, '-')
+            this.endTime = e[e.length - 1].replace(/\//g, '-')
+            this.getData()
+        },
+
+        /**
+         * 日期选择取消
+         */
+        close() {
+            this.show = false
+        },
+        change(){
+
+        },
+        closeColl(){
+
+        },
+        open(){
+            
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.calendar {
+    border: 1px solid;
+    padding: 5px 10px;
+    border-radius: 5px;
+    color: #409EFF;
+    font-size: 12px;
+    // min-width: 30%;
+    margin-left: 10px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+}
+
+.content-detail {
+    background: #409EFF;
+    padding: 10px;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 0 10px #000;
+    color: #fff;
+    height: 130px;
+    justify-content: space-between;
+
+    .content-detail-top {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10px;
+
+        div {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            flex: 1;
+        }
+    }
+
+    .content-detail-bottom {
+        display: flex;
+        justify-content: space-between;
+
+        div {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            flex: 1;
+            font-size: 16px;
+        }
+    }
+}
+
+.collapse-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 12px;
+}
+</style>

components/incomeDetail/incomeDetail.vue

@@ -0,0 +1,547 @@
+<template>
+<view>
+    <Header :borbtm="false" @change="headerChange">
+        <template #search>
+            <u-subsection :list="list" mode="subsection" :current="current" @change="topChange"></u-subsection>
+        </template>
+        <template #section>
+
+        </template>
+    </Header>
+    <div v-if="current==0">
+        <div class="content-detail">
+            <div class="content-detail-top">
+                <div>
+                    <div>
+                        总营业额/元
+                    </div>
+                    <div>
+                        {{todayTotalIncome}}元
+                    </div>
+                </div>
+                <div>
+                    <div>
+                        实收
+                    </div>
+                    <div>
+                        {{todayIncome.reduce((pre, cur) => pre+cur.amount,0 ) || 0}}元
+                    </div>
+                </div>
+                <div>
+                    <div>
+                        欠款（预付）/元
+                    </div>
+                    <div>
+                        {{roomData.todayArrearsRoomData}}
+                    </div>
+                </div>
+            </div>
+            <div class="content-detail-bottom">
+                <!-- <div>
+                    <div>间夜数</div>
+                    <div>1234</div>
+                </div> -->
+                <div>
+                    <div>入住率</div>
+                    <div>{{((roomData.checkInRoomData/roomData.allRoomData) || 0).toFixed(2)}}%</div>
+                </div>
+                <div>
+                    <div>平均房价/元</div>
+                    <div>{{roomData.housingPrices}}</div>
+                </div>
+                <div>
+                    <div>RevPAR</div>
+                    <div v-if="roomData.checkInRoomData/roomData.allRoomData!=0 && roomData.allRoomData!=0" style="font-size: 18px;">{{((roomData.housingPrices*roomData.allRoomData)/(roomData.checkInRoomData/roomData.allRoomData).toFixed(2)).toFixed(2)}}</div>
+                    <div v-else style="font-size: 18px;">{{0}}</div>
+                </div>
+            </div>
+        </div>
+        <u-subsection style="margin-top:20px;" :list="listWay" mode="subsection" :current="currentWay" @change="WayChange"></u-subsection>
+        <u-collapse @change="change" @close="close" @open="open" v-if="currentWay==0 && dataListTime.length>0">
+            <u-collapse-item title="" name="Docs guide" v-for="(item, index) in dataListTime" :key="index">
+                <b slot="title" class="u-page__item__title__slot-title">{{index+1}} {{item.roomName}} 收款合计{{item.detailList.reduce((pre, cur)=> pre+cur.money,0 )}}元</b>
+                <div class="collapse-content" v-for="(sItem, index) in item.detailList" :key="index">
+                    <div>
+                        {{sItem.create_time}}
+                    </div>
+                    <div>
+                        {{sItem.money}}元/ {{sItem.subject_type_name}} / {{sItem.pay_name}}
+                    </div>
+                    <div>
+                        收款人：
+                    </div>
+                </div>
+            </u-collapse-item>
+        </u-collapse>
+        <!-- <u-empty v-else mode="data" /> -->
+        <u-collapse @change="change" @close="close" @open="open" v-if="currentWay==2 && dataListIncome.length>0">
+            <u-collapse-item title="" name="Docs guide" v-for="(item, index) in dataListIncome" :key="index">
+                <b slot="title" class="u-page__item__title__slot-title">{{index+1}} {{item.payTypeName}} 收款合计{{item.detailList.reduce((pre, cur)=> pre+cur.money,0 )}}元</b>
+                <div class="collapse-content" v-for="(sItem, index) in item.detailList" :key="index">
+                    <div>
+                        {{sItem.create_time}}
+                    </div>
+                    <div>
+                        {{sItem.money}}元/ {{sItem.room_name}} / {{sItem.subject_type_name}}
+                    </div>
+                    <div>
+                        收款人：
+                    </div>
+                </div>
+            </u-collapse-item>
+        </u-collapse>
+        <!-- <u-empty v-else mode="data" /> -->
+        <uni-table style="margin-top:20px;" ref="table" :loading="false" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange" v-if="currentWay==1">
+            <uni-tr>
+                <uni-th width="60" align="center">序号</uni-th>
+                <uni-th width="60" align="center">时间</uni-th>
+                <uni-th width="60" align="center">金额</uni-th>
+                <uni-th width="60" align="center">房号</uni-th>
+                <uni-th width="60" align="center">费项</uni-th>
+                <uni-th width="60" align="center">收款方式</uni-th>
+            </uni-tr>
+            <uni-tr v-for="(item, index) in tableListIncome" :key="index">
+                <uni-td align="center">{{ index+1 }}</uni-td>
+                <uni-td>
+                    <view class="name">{{ item.create_time }}</view>
+                </uni-td>
+                <uni-td align="center">{{ item.money }}</uni-td>
+                <uni-td align="center">{{ item.room_name }}</uni-td>
+                <uni-td align="center">{{ item.subject_type_name }}</uni-td>
+                <uni-td align="center">{{ item.pay_name }}</uni-td>
+            </uni-tr>
+        </uni-table>
+    </div>
+
+    <!-- 当日支出 -->
+    <div v-if="current==1">
+        <div class="content-detail">
+            <div class="content-detail-top">
+                <div>
+                    <div>
+                        今日支出/元
+                    </div>
+                    <div>
+                        65535元
+                    </div>
+                </div>
+            </div>
+            <div class="content-detail-bottom">
+                <div>
+                    <div>退还押金/元</div>
+                    <div>1234</div>
+                </div>
+                <div>
+                    <div>办公支出</div>
+                    <div>58</div>
+                </div>
+                <div>
+                    <div>租金支出/元</div>
+                    <div>325</div>
+                </div>
+                <div>
+                    <div>水电支出/元</div>
+                    <div>216</div>
+                </div>
+            </div>
+        </div>
+        <u-subsection style="margin-top:20px;" :list="listPay" mode="subsection" :current="currentPay" @change="PayChange"></u-subsection>
+        <u-collapse @change="change" @close="close" @open="open" v-if="currentPay==0">
+            <u-collapse-item title="" name="Docs guide" v-for="(item, index) in dataListPayProject" :key="index">
+                <b slot="title" class="u-page__item__title__slot-title">01 退还押金 支出合计400 元</b>
+                <div class="collapse-content" v-for="(sItem, index) in item.detailList || []" :key="index">
+                    <div>
+                        2023/04/13 12:15
+                    </div>
+                    <div>
+                        100.00元/ 房费 / 微信
+                    </div>
+                    <div>
+                        操作员：沙暴蟑螂
+                    </div>
+                </div>
+            </u-collapse-item>
+        </u-collapse>
+
+        <u-collapse @change="change" @close="close" @open="open" v-if="currentPay==2">
+            <u-collapse-item title="" name="Docs guide" v-for="(item, index) in dataListPay" :key="index">
+                <b slot="title" class="u-page__item__title__slot-title">{{index+1}} {{item.payTypeName}} 支出合计{{item.detailList.reduce((pre, cur)=> pre+cur.money,0 ) || 0}} 元</b>
+                <div class="collapse-content" v-for="(sItem, index) in item.detailList" :key="index">
+                    <div>
+                        {{sItem.create_time}}
+                    </div>
+                    <div>
+                        {{sItem.money}}元/ {{sItem.room_name}} / {{sItem.subject_type_name}}
+                    </div>
+                    <div>
+                        收款人：
+                    </div>
+                </div>
+            </u-collapse-item>
+        </u-collapse>
+
+        <uni-table style="margin-top:20px;" ref="table" :loading="false" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange" v-if="currentPay==1">
+            <uni-tr>
+                <uni-th width="60" align="center">序号</uni-th>
+                <uni-th width="60" align="center">时间</uni-th>
+                <uni-th width="60" align="center">金额</uni-th>
+                <!-- <uni-th width="60" align="center">房号</uni-th> -->
+                <uni-th width="60" align="center">事项</uni-th>
+                <uni-th width="60" align="center">支出方式</uni-th>
+            </uni-tr>
+            <uni-tr v-for="(item, index) in tableListPay" :key="index">
+                <uni-td align="center">{{ index+1 }}</uni-td>
+                <uni-td>
+                    <view class="name">{{ item.create_time }}</view>
+                </uni-td>
+                <uni-td align="center">{{ item.money }}</uni-td>
+                <uni-td align="center">{{ item.subject_type_name }}</uni-td>
+                <uni-td align="center">{{ item.pay_name }}</uni-td>
+            </uni-tr>
+        </uni-table>
+    </div>
+
+    <HistoricalIncome v-if="current==2" />
+
+</view>
+</template>
+
+<script>
+import Header from '../header.vue'
+import PayMethodsVue from '../tableCharts/payMethods.vue'
+import RoomTypeVue from '../tableCharts/roomType.vue'
+import Time from '../tableCharts/time.vue'
+import FeeItemsVue from '../tableCharts/feeItems.vue'
+import SourceVue from '../tableCharts/source.vue'
+import CustomerTypeVue from '../tableCharts/customerType.vue'
+import OccupancyTypeVue from '../tableCharts/occupancyType.vue'
+import HistoricalIncome from './historicalIncome.vue'
+
+import {
+    getRoomIncomeList,
+    getTimeIncomeList,
+    getPayMethodIncomeList,
+    getMatterExpenditureList,
+    getTimeExpenditureList,
+    getPayMethodExpenditureList,
+} from '../../utils/incomeDetail'
+
+import {
+    getHotelList,
+    getRevPAR,
+    getTodayIncome,
+    getTodayTotalIncome,
+    getStaySource,
+    getRoomStatus,
+    getIncomeAndExpenditure
+} from '../../utils/api.js';
+
+export default {
+    components: {
+        Header,
+        Time,
+        PayMethodsVue,
+        RoomTypeVue,
+        FeeItemsVue,
+        SourceVue,
+        CustomerTypeVue,
+        OccupancyTypeVue,
+        HistoricalIncome
+    },
+    data() {
+        return {
+            list: ['当日收入', '当日支出', '历史收入', '历史支出'],
+            listWay: ['按房间', '按时间', '按收款方式'],
+            listPay: ['按支出事项', '按支出时间', '按付款方式'],
+            payMethodsList: ['查看营业额', '查看实收'],
+            current: 0,
+            currentWay: 0,
+            currentPayMethods: 0,
+            currentPay: 0,
+            rangeTime: [{
+                    value: 0,
+                    text: "按日"
+                },
+                {
+                    value: 1,
+                    text: "按月"
+                },
+                {
+                    value: 2,
+                    text: "按季度"
+                },
+                {
+                    value: 3,
+                    text: "按年"
+                },
+            ],
+            rangeDay: [{
+                    value: 0,
+                    text: "按营业日"
+                },
+                {
+                    value: 1,
+                    text: "按自然日"
+                }
+            ],
+            timeCheck: 0,
+            dayCheck: 0,
+            startTime: (new Date().toLocaleDateString()).replace(/\//g, '-'),
+            endTime: (new Date(new Date().getTime() + 24 * 60 * 60 * 1000).toLocaleDateString()).replace(/\//g, '-'),
+            show: false,
+            dataListTime:[],
+            dataListIncome:[],
+            dataListPay:[],
+            dataListPayProject: [],
+            tableListIncome: [],
+            tableListPay: [],
+
+
+            todayTotalIncome: 0, //今日总收款
+            roomData: {
+                //房间总数
+                allRoomData: 0,
+                //入住总数
+                checkInRoomData: 0,
+                //平均房价
+                housingPrices: 0,
+                // 今日预离
+                todayLeaveRoomData: 0,
+                //今日预抵
+                todayArriveRoomData: 0,
+                //今日欠费
+                todayArrearsRoomData: 0,
+                //脏房
+                dirtyRoomData: 0,
+            },
+            todayIncome:[],
+        }
+    },
+    mounted() {
+        this.getData()
+    },
+    methods: {
+        topChange(e) {
+            this.current = e
+            this.getData()
+        },
+        changeTime(e) {
+            this.timeCheck = e
+        },
+        changeDay(e) {
+            this.dayCheck = e
+        },
+        WayChange(e) {
+            this.currentWay = e
+            this.getData()
+        },
+        PayChange(e) {
+            this.currentPay = e
+            this.getData()
+        },
+        // 手风琴部分
+        change(e) {
+            console.log(e);
+        },
+        close(e) {
+            console.log(e);
+        },
+        open(e) {
+            console.log(e);
+        },
+        headerChange(e){
+            console.log(e);
+            this.getData()
+        },
+
+        getData() {
+            getTodayTotalIncome({
+                startTime: this.startTime,
+                endTime: this.endTime
+            }).then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.records.length > 0) {
+                    let brr = []
+                    let data = res.result.records
+                    data.forEach(item => {
+                        let arr = []
+                        arr = Object.keys(item).filter(items => items != 'department' && items != 'hotel_name')
+                        brr = Object.keys(item).filter(items => items == '现金' || items == '微信' || items == '支付宝')
+                        console.log(arr);
+                        arr.forEach(ele => {
+                            this.todayTotalIncome += item[ele] * 1
+                        })
+                    })
+                    let obj = {}
+                    let copy = []
+                    brr.forEach((item, i) => {
+                        console.log(obj);
+                        copy.push({
+                            name: item,
+                            amount: data.reduce((pre, cur) => {
+                                return pre + cur[item]
+                            }, 0)
+                        })
+                    })
+                    // this.paymentMethod = copy
+                    // console.log('2222222222', copy);
+                    // console.log(this.todayTotalIncome);
+                } else {
+                    this.todayTotalIncome = 0
+                }
+            })
+            // 房间数据统计
+            getRevPAR({
+                startTime: this.startTime,
+                endTime: this.endTime
+            }).then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    this.roomData.allRoomData = res.result[0]
+                    this.roomData.checkInRoomData = res.result[1]
+                    this.roomData.housingPrices = res.result[2]
+                    this.roomData.todayLeaveRoomData = res.result[3]
+                    this.roomData.todayArriveRoomData = res.result[4]
+                    this.roomData.todayArrearsRoomData = res.result[5]
+                    this.roomData.dirtyRoomData = res.result[6]
+                }
+            })
+
+            //今日收入统计
+            getTodayIncome({
+                startTime: this.startTime,
+                endTime: this.endTime
+            }).then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    console.log(res.result);
+                    this.todayIncome = res.result
+                } else {
+                    this.todayIncome = [{
+                            name: '押金',
+                            amount: 0
+                        },
+                        {
+                            name: '房费',
+                            amount: 0
+                        },
+                        {
+                            name: '商品',
+                            amount: 0
+                        }
+                    ]
+                }
+            })
+            if (this.current == 0 && this.currentWay == 0) {
+                getRoomIncomeList({startTime:this.startTime, endTime:this.endTime}).then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.dataListTime = res.result
+                    }
+                })
+            }
+            if (this.current == 0 && this.currentWay == 1) {
+                getTimeIncomeList({startTime:this.startTime, endTime:this.endTime}).then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.tableListIncome = res.result
+                    }
+                })
+            }
+            if (this.current == 0 && this.currentWay == 2) {
+                getPayMethodIncomeList({startTime:this.startTime, endTime:this.endTime}).then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.dataListIncome = res.result
+                    }
+                })
+            }
+            if (this.current == 1 && this.currentPay == 0) {
+                getMatterExpenditureList().then(res => {
+                    console.log(res);
+                })
+            }
+            if (this.current == 1 && this.currentPay == 1) {
+                getTimeExpenditureList().then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.tableListPay = res.result
+                    }
+                })
+            }
+            if (this.current == 1 && this.currentPay == 2) {
+                getPayMethodExpenditureList().then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.dataListPay = res.result
+                    }
+                })
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.pages {
+    width: 100vw;
+    height: 100vh;
+    background-color: #f5f5f5;
+}
+
+.calendar {
+    border: 1px solid;
+    padding: 5px 10px;
+    border-radius: 5px;
+    color: #409EFF;
+    font-size: 12px;
+    // min-width: 30%;
+    margin-left: 10px;
+    display: flex;
+    align-items: center;
+}
+
+.content-detail {
+    background: #409EFF;
+    padding: 10px;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 0 10px #000;
+    color: #fff;
+    height: 130px;
+    justify-content: space-between;
+
+    .content-detail-top {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10px;
+
+        div {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            flex: 1;
+        }
+    }
+
+    .content-detail-bottom {
+        display: flex;
+        justify-content: space-between;
+
+        div {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            flex: 1;
+            font-size: 16px;
+        }
+    }
+}
+
+.collapse-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 12px;
+}
+</style>

components/longTermHousingStatus/longTermHousingStatus.vue

@@ -0,0 +1,219 @@
+<template>
+<view>
+    <Header @change="headerChange">
+        <template #search>
+            <div class="header-top">
+                <b style="color:rgb(60, 156, 255)">远期房态</b>
+                <div style="font-size: 12px;" class="header-top">
+                    <u-switch size="12" v-model="isContainLeave" @change="change"></u-switch>包含当日预离房
+                </div>
+            </div>
+        </template>
+        <template #section>
+            <div style="display:flex;align-items:center;font-size: 12px;padding:0 10px;">
+                <span style="color:#00000060;">请选择日期</span>
+                <div @click="show = true" class="calendar">{{`${startTime} ~ ${endTime}`}}</div>
+            </div>
+        </template>
+    </Header>
+    <u-calendar closeOnClickOverlay :show="show" mode="range" @close="close" @confirm="confirm"></u-calendar>
+    <div style="background:#fff">
+        <div class="table">
+            <table>
+                <tr>
+                    <td>房型</td>
+                    <td style="font-size: 14px;" v-for="item in timeList" :key="item.id">{{item}}</td>
+                </tr>
+                <tr v-for="(item, index) in dataList" :key="index">
+                    <td>{{item.layout_name}}</td>
+                    <td v-for="sItem in timeList" :key="sItem.id">
+                        <span style="color:rgb(255, 141, 26)">{{item[sItem].leaveCount || 0}}/</span>
+                        <span style="color:rgb(42, 130, 228)">{{item[sItem].livingCount || 0}}/</span>
+                        <span style="color:rgb(67, 207, 124)">{{item.count - item[sItem].livingCount || 0}}</span>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div class="explain">
+            <div>
+                说明:
+            </div>
+            <div>1、15/25/38，15表示当日预离间数，25表示占用房间数，38表示可用房间数</div>
+            <div>2、占用放 = 在住房+预定房+自用房+维修房+预离房(可选)+锁房</div>
+            <div>3、可用房 = 总房·占用房</div>
+        </div>
+    </div>
+</view>
+</template>
+
+<script>
+import Header from '@/components/header.vue'
+import {
+    getFutureRoomStatus
+} from '../../utils/api'
+export default {
+    components: {
+        Header
+    },
+    data() {
+        return {
+            isContainLeave: true,
+            startTime: (new Date().toLocaleDateString()).replace(/\//g, '-'),
+            endTime: (new Date(new Date().getTime() + 24 * 60 * 60 * 1000).toLocaleDateString()).replace(/\//g, '-'),
+            show: false,
+            timeList: [],
+            dataList: [],
+        }
+    },
+    mounted() {
+        this.createTime()
+        this.getData()
+    },
+    methods: {
+        change(e) {
+            console.log(e)
+            this.isContainLeave = e
+            this.getData()
+        },
+        close() {
+            this.show = false
+        },
+        confirm(e) {
+            console.log(e);
+            this.show = false
+            this.timeList = e
+            this.startTime = e[0]
+            this.endTime = e[e.length - 1]
+            this.getData()
+        },
+        createTime() {
+            // Create a new Date object
+            const today = new Date();
+            // Get yesterday's date by subtracting one day from today's date
+            const yesterday = new Date(today);
+            yesterday.setDate(yesterday.getDate() - 1);
+            // Get tomorrow's date by adding one day to today's date
+            const tomorrow = new Date(today);
+            tomorrow.setDate(tomorrow.getDate() + 1);
+            // Store the dates in an array with yyyy-mm-dd format
+            const dates = [
+                // yesterday.toISOString().slice(0, 10),
+                today.toISOString().slice(0, 10),
+                tomorrow.toISOString().slice(0, 10)
+            ];
+            this.timeList = dates
+            // return dates
+        },
+        getData() {
+            getFutureRoomStatus({
+                start: this.startTime,
+                end: this.endTime,
+                isContainLeave: this.isContainLeave
+            }).then(res => {
+                console.log(res)
+                let brr = []
+                res.result.layoutRooms.forEach(ele => {
+                    brr.push({
+                        layout_name: ele.layoutName,
+                        count: ele.roomCount,
+                        data: res.result.dateList.filter(item => item.layoutId == ele.layoutId)
+                    })
+                })
+                brr.forEach(ele => {
+                    ele.data.forEach(item => {
+                        ele[item.date] = item
+                    })
+                })
+                console.log(brr);
+                let arr = []
+                brr[0].data.forEach(ele => {
+                    arr.push({
+                        title: ele.date,
+                        align: "center",
+                        dataIndex: ele.date,
+                        width: '120px',
+                        scopedSlots: {
+                            customRender: 'long'
+                        },
+                    })
+                })
+                this.dataList = brr
+                // this.columns = this.columns.concat(arr)
+                console.log('1111111111111111', arr);
+            })
+        },
+        headerChange() {
+            this.getData()
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+page {
+    background-color: #f5f5f5;
+}
+
+.header-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px;
+}
+
+.calendar {
+    border: 1px solid;
+    padding: 5px 10px;
+    border-radius: 5px;
+    color: #409EFF;
+    font-size: 12px;
+    min-width: 30%;
+    margin-left: 10px;
+}
+
+.table {
+    width: 98%;
+    font-size: 16px;
+    padding: 2px;
+    box-shadow: 0 4px 4px rgba(0, 0, 0, 0.4);
+    overflow-x: auto;
+    overflow-y: hidden;
+
+    table {
+        width: 100%;
+        height: 100%;
+        table-layout: fixed;
+    }
+
+    table,
+    td {
+        // width: 100%;
+        border: 1px solid #ccc;
+        border-collapse: collapse;
+    }
+
+    table>tr>td {
+        text-align: center;
+        height: 40px;
+    }
+
+    table>tr>td:first-child {
+        background: #409EFF;
+        color: #fff;
+        width: 115px;
+        position: sticky;
+        left: 0;
+        padding: 0;
+    }
+
+    table>tr>td:not(:first-child) {
+        width: 100px
+    }
+}
+
+.explain {
+    padding: 20px;
+    font-size: 14px;
+    color: #999;
+}
+</style>

components/predetermineList/allPredetermine.vue

@@ -0,0 +1,440 @@
+<template>
+<div>
+    <template>
+        <div class="card-day">
+            <div>
+                <div style="font-size: 12px;color:#409EFF; display:flex;justify-content:space-between;align-items:center;">
+                    <div style="font-size: 16px;font-weight: bold;margin-right:10px">预定概览</div>
+                    <!-- 共 <span>10</span> 间 -->
+                    <div @click="show = true" class="calendar">{{`${startTime} ~ ${endTime}`}}</div>
+                </div>
+                <div class="card-day-top">
+                    <div style="font-size: 12px;color:#409EFF;">
+                        <!-- <span style="font-size: 16px;font-weight: bold;margin-right:10px">今日预抵概览</span> -->
+                        共 <span>{{dataList.length}}</span> 间
+                    </div>
+                    <div style="color:#409EFF;font-size:14px;width:40%;">
+                        <u-subsection :list="list1" mode="subsection" :current="current1" @change="sectionChangeDay"></u-subsection>
+                    </div>
+                </div>
+            </div>
+            <div class="card-day-btm" v-show="current1==0">
+                <div v-for="(item, index) in cesRoomLayoutList" :key="index">
+                    <div>
+                        {{item.name}} {{ filterRoomType(item.id)}}间
+                    </div>
+                    <!-- <div>
+                        高级商务标间 {{ 10 }}间
+                    </div> -->
+                </div>
+                <!-- <div>
+                    <div>
+                        麻将房 {{25}}间
+                    </div>
+                    <div>
+                        零压高级大床房 {{25}} 间
+                    </div>
+                </div>
+                <div>
+                    <div>
+                        商务单人房 {{25}}间
+                    </div>
+                    <div>
+                        特惠大床房 {{25}} 间
+                    </div>
+                </div> -->
+            </div>
+            <div class="card-day-btm" v-show="current1==1">
+                <div v-for="(item, index) in customerSourceList" :key="index">
+                    <div>
+                        {{item.itemText}} {{ filterCustomerSource(item.id)}}间
+                    </div>
+                </div>
+                <!-- <div>
+                    <div>
+                        携程 {{25}}间
+                    </div>
+                    <div>
+                        去哪儿 {{25}} 间
+                    </div>
+                </div>
+                <div>
+                    <div>
+                        艺龙 {{25}}间
+                    </div>
+                    <div>
+                        微信 {{25}} 间
+                    </div>
+                </div> -->
+            </div>
+        </div>
+
+        <div class="day-detail">
+            <div class="day-detail-title">
+                <div style="color: #409EFF;">
+                    预定详情
+                </div>
+                <uni-data-select :placeholder="current1==0? '请选择房型' : '请选择订单来源'" :clear="false" style="width:40%;flex:none;" :localdata="current1==0? range : range2" @change="change"></uni-data-select>
+            </div>
+            <div>
+                <!-- <div style="color:rgb(255, 141, 26);text-align:right;border-bottom:1px solid #00000030;line-height:30px">A栋6层：12间</div> -->
+                <div v-for="(sItem, index) in dataList" :key="sItem.id" :class="index==curIdx?'list-active':''" :style="{height:'90px',borderBottom:index!=5?'1px solid #00000030':'',padding:'10px 0 0 0'}" @click="changeList(index)">
+                    <div>
+                        <span v-if="sItem.bookingData &&sItem.bookingData.bookingOrder && sItem.bookingData.bookingCustomer" style="font-size: 16px; font-weight: bold;">{{index+1}} {{sItem.bookingData.bookingCustomer.name + ' / '+  (sItem.livingData.livingCustomers? sItem.livingData.livingCustomers.gender == 1 ? "男 / ": "女 / " : "") + sItem.bookingData.bookingCustomer.phone }}</span>
+                        <b v-else>{{index+1}}</b>
+                    </div>
+                    <div class="day-detail-list">
+                        <div>房型：{{sItem.layout.name}}/1间</div>
+                        <!-- <div>一天</div> -->
+                        <div>预住时长：{{sItem.bookingData.bookingOrder.dayCount}}天</div>
+                    </div>
+                    <div class="day-detail-list">
+                        <div>预抵：{{sItem.bookingData.bookingOrder.arrivalTime}}</div>
+                        <div>保留：</div>
+                        <div>已付：0元</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </template>
+    <u-calendar closeOnClickOverlay :show="show" mode="range" @close="close" @confirm="confirm"></u-calendar>
+
+</div>
+</template>
+
+<script>
+import {
+    getHotelRoomList,
+    getRoomStatus,
+    getCustomerSource,
+    getRoomType
+} from '../../utils/customerOrder'
+import {
+    mapState
+} from 'vuex'
+export default {
+    props: {
+        keyWord: {
+            type: String,
+            default: ''
+        }
+    },
+    watch: {
+        keyWord: {
+            handler(val) {
+                this.filter()
+            }
+        },
+    },
+    data() {
+        return {
+            list1: ['按房间类型', '按订单来源'],
+            current1: 0,
+            filterId: null,
+            value: 0,
+            range: [],
+            range2: [],
+            show: false,
+            startTime: (new Date().toLocaleDateString()).replace(/\//g, '-'),
+            endTime: (new Date(new Date().getTime() + 24 * 60 * 60 * 1000).toLocaleDateString()).replace(/\//g, '-'),
+            curIdx: -1,
+            dataList: [],
+            dataListCopy: [],
+            /**
+             * 用户来源列表
+             */
+            customerSourceList: [],
+            /**
+             * 方块背景颜色列表
+             */
+            roomStatusColorList: [],
+            /**
+             * 房型列表
+             */
+            cesRoomLayoutList: [],
+        }
+    },
+    computed: {
+        ...mapState(['hotelId'])
+    },
+    mounted() {
+        this.getData()
+    },
+    filters: {
+
+    },
+    methods: {
+        sectionChangeDay(e) {
+            console.log(e)
+            this.current1 = e
+        },
+        change(e) {
+            console.log(e)
+            this.filterId = e
+            this.filter()
+        },
+        confirm(e) {
+            console.log(e)
+            this.startTime = e[0]
+            this.endTime = e[e.length - 1]
+            this.show = false
+        },
+        close() {
+            this.show = false
+        },
+        changeList(index) {
+            this.curIdx = index
+            this.$emit('changeList', index)
+        },
+        headerChange(e) {
+            this.getData(e)
+        },
+        getData(id = this.hotelId) {
+            getHotelRoomList({
+                hotelId: id
+            }).then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.length > 0) {
+                    this.dataListCopy = res.result
+                    // this.dataList = res.result
+                    this.filter()
+                } else {
+                    this.dataListCopy = []
+                    this.dataList = []
+                }
+            })
+            getRoomStatus().then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.length > 0) {
+                    let arr = []
+                    res.result.forEach(ele => {
+                        arr.push(ele.text)
+                    })
+                    this.roomStatusColorList = res.result
+                    this.list3 = arr
+                    this.list3.unshift('全部')
+                } else {
+                    this.roomStatusColorList = []
+                    this.list3 = []
+                }
+            })
+            getCustomerSource().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.customerSourceList = res.result.records
+                    console.log(this.current2);
+                    this.range2 = res.result.records.map(item => {
+                        return {
+                            value: item.id,
+                            text: item.itemText
+                        }
+                    })
+                    this.range2.unshift({
+                        value: null,
+                        text: '全部'
+                    })
+                } else {
+                    this.customerSourceList = []
+                    this.range2 = []
+                }
+            })
+            getRoomType().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.cesRoomLayoutList = res.result.records
+                    this.current2 = res.result.records[0].id
+                    this.range = res.result.records.map(item => {
+                        return {
+                            value: item.id,
+                            text: item.name
+                        }
+                    })
+                    this.range.unshift({
+                        value: null,
+                        text: '全部'
+                    })
+                } else {
+                    this.cesRoomLayoutList = []
+                    this.range = []
+                }
+            })
+        },
+        /**
+         * @description: 筛选
+         * @param
+         * @return
+         */
+        filter() {
+            console.log('this.current1', this.current1);
+            console.log('this.current3', this.current3);
+            let arr = JSON.parse(JSON.stringify(this.dataListCopy))
+            console.log(arr);
+            arr.forEach(item => {
+                item.rooms = item.rooms.filter(ele => {
+                    return ele.bookingData && ele.bookingData.bookingOrder
+                })
+            })
+            if (this.current1 == 0 && this.filterId) {
+                arr.forEach(item => {
+                    console.log(item);
+                    item.rooms = item.rooms.filter(ele => {
+                        return ele.layout.id == this.filterId
+                    })
+                })
+            }
+            if (this.current1 == 1 && this.filterId) {
+                arr.forEach(item => {
+                    console.log(item);
+                    item.rooms = item.rooms.filter(ele => {
+                        return ele.livingData && ele.livingData.livingOrder ? ele.livingData.livingOrder.customerSource == this.filterId : ele.bookingData && ele.bookingData.bookingOrder ? ele.bookingData.bookingOrder.customerSource == this.filterId : false
+                    })
+                })
+            }
+            if (this.keyWord) {
+                arr.forEach(item => {
+                    item.rooms = item.rooms.filter(ele => {
+                        return ele.roomInfo.name == this.keyWord ||
+                            (ele.livingData && ele.livingData.livingCustomers ?
+                                ele.livingData.livingCustomers.customerName == this.keyWord :
+                                ele.bookingData && ele.bookingData.bookingCustomer ?
+                                ele.bookingData.bookingCustomer.name == this.keyWord :
+                                false) ||
+                            (ele.livingData && ele.livingData.livingCustomers ?
+                                ele.livingData.livingCustomers.phone == this.keyWord :
+                                ele.bookingData && ele.bookingData.bookingCustomer ?
+                                ele.bookingData.bookingCustomer.phone == this.keyWord :
+                                false)
+                    })
+                })
+            }
+            let brr = []
+            arr.forEach(item => {
+                if (item.rooms.length > 0) {
+                    brr.push(...item.rooms)
+                }
+            })
+            console.log('arrarrarrarr', arr);
+            this.dataList = JSON.parse(JSON.stringify(brr))
+            // this.dataListCopy = JSON.parse(JSON.stringify(brr))
+            console.log(brr);
+            // return arr
+        },
+        /**
+         * 根据id计算每种房型的数量
+         */
+        filterRoomType(id) {
+            let arr = JSON.parse(JSON.stringify(this.dataList))
+            arr = arr.filter(item => {
+                return item.layout.id == id
+            })
+            return arr.length
+        },
+        /**
+         * 根据id计算每种来源的数量
+         */
+        filterCustomerSource(id) {
+            let arr = JSON.parse(JSON.stringify(this.dataList))
+            arr = arr.filter(item => {
+                return item.livingData && item.livingData.livingOrder ? item.livingData.livingOrder.customerSource == id : item.bookingData && item.bookingData.bookingOrder ? item.bookingData.bookingOrder.customerSource == id : false
+            })
+            return arr.length
+        },
+        getCustomerSourceList(customerSource, first) {
+            console.log(customerSource);
+            var find = this.customerSourceList.find((t) => t.id == customerSource);
+            console.log(find);
+            console.log(this.customerSourceList);
+            if (find) {
+                // return first ? find.label.substr(0, 1) : find.label;
+                return find.itemText.substr(0, 1);
+            }
+            return "";
+        },
+        /**
+         * 计算方块的背景颜色
+         */
+        getRoomStatusColor(roomStatus) {
+            var find = this.roomStatusColorList.find((t) => t.value == roomStatus);
+            return find ? find.extend : "";
+        },
+        /**
+         * 计算房态出现的数量
+         */
+        roomStateFilter(roomStatus) {
+            let count = 0
+            let arr = JSON.parse(JSON.stringify(this.dataListCopy))
+            arr.forEach(ele => {
+                ele.rooms.forEach(item => {
+                    if (item.roomInfo.roomStatus == roomStatus) {
+                        count++
+                    }
+                })
+            })
+            return count
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.list-active {
+    background: rgb(228, 240, 253);
+}
+
+.card-day {
+    padding: 10px;
+    background: #fff;
+    margin-top: 8px;
+    border-bottom: #00000030 1px solid;
+}
+
+.card-day-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: #00000030 1px solid;
+    height: 35px;
+}
+
+.card-day-btm {
+    margin-top: 10px;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    justify-content: space-between;
+    gap: 10px;
+
+    // div为偶数时右对齐
+    div:nth-child(even) {
+        text-align: right;
+    }
+}
+
+.day-detail {
+    background: #fff;
+    padding: 10px;
+    margin-top: 8px;
+
+    .day-detail-title {
+        font-weight: bold;
+        font-size: 16px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+}
+
+.day-detail-list {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 10px 15px;
+    // height: 30px;
+    font-size: 12px;
+}
+
+.calendar {
+    border: 1px solid;
+    padding: 5px 10px;
+    border-radius: 5px;
+}
+</style>

components/predetermineList/arrivalsDay.vue

@@ -0,0 +1,385 @@
+<template>
+<div>
+    <template>
+        <div class="card-day">
+            <div >
+                <div style="font-size: 12px;color:#409EFF; display:flex;justify-content:space-between;align-items:center;">
+                    <div>
+                        <span style="font-size: 16px;font-weight: bold;margin-right:10px">今日预抵概览</span>共 <span>{{dataList.length}}</span> 间
+                    </div>                    
+                    <!-- <div @click="show = true" class="calendar">{{`${startTime} ~ ${endTime}`}}</div> -->
+                    <div style="color:#409EFF;font-size:14px;width:40%;">
+                        <u-subsection :list="list" mode="subsection" :current="current" @change="sectionChangeDay"></u-subsection>
+                    </div>
+                </div>
+            </div>
+            <div class="card-day-btm" v-show="current==0">
+                <div v-for="(item, index) in cesRoomLayoutList" :key="index">
+                    <div>
+                        {{item.name}} {{ filterRoomType(item.id)}}间
+                    </div>
+                </div>
+            </div>
+            <div class="card-day-btm" v-show="current==1">
+                <div v-for="(item, index) in customerSourceList" :key="index">
+                    <div>
+                        {{item.itemText}} {{ filterCustomerSource(item.id)}}间
+                    </div>
+                </div>
+                <!-- <div>
+                    <div>
+                        携程 {{25}}间
+                    </div>
+                    <div>
+                        去哪儿 {{25}} 间
+                    </div>
+                </div>
+                <div>
+                    <div>
+                        艺龙 {{25}}间
+                    </div>
+                    <div>
+                        微信 {{25}} 间
+                    </div>
+                </div> -->
+            </div>
+        </div>
+
+        <div class="day-detail">
+            <div class="day-detail-title">
+                <div style="color: #409EFF;">
+                    今日{{'预抵'}}详情
+                </div>
+                <uni-data-select :placeholder="current==0? '请选择房型' : '请选择订单来源'" :clear="false" style="width:40%;flex:none;" :localdata="current==0? range : range2" @change="change"></uni-data-select>
+            </div>
+            <div>
+                <!-- <div style="color:rgb(255, 141, 26);text-align:right;border-bottom:1px solid #00000030;line-height:30px">A栋6层：12间</div> -->
+                <div v-for="(sItem, index) in dataList" :key="sItem.id" :class="index==curIdx?'list-active':''" :style="{height:'90px',borderBottom:index!=5?'1px solid #00000030':'',padding:'10px 0 0 0'}" @click="changeList(index)">
+                    <div>
+                        <span v-if="sItem.bookingData &&sItem.bookingData.bookingOrder && sItem.bookingData.bookingCustomer" style="font-size: 16px; font-weight: bold;">{{index+1}} {{sItem.bookingData.bookingCustomer.name + ' / '+  (sItem.livingData.livingCustomers? sItem.livingData.livingCustomers.gender == 1 ? "男 / ": "女 / " : "") + sItem.bookingData.bookingCustomer.phone }}</span>
+                        <b v-else>{{index+1}}</b>
+                    </div>
+                    <div class="day-detail-list">
+                        <div>房型：{{sItem.layout.name}}/1间</div>
+                        <!-- <div>一天</div> -->
+                        <div>预住时长：{{sItem.bookingData.bookingOrder.dayCount}}天</div>
+                    </div>
+                    <div class="day-detail-list">
+                        <div>预抵：{{sItem.bookingData.bookingOrder.arrivalTime}}</div>
+                        <div>保留：03/24/16:00</div>
+                        <div>已付：300元</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </template>
+    <u-calendar closeOnClickOverlay :show="show" mode="range" @close="close" @confirm="confirm"></u-calendar>
+
+</div>
+</template>
+
+<script>
+import {
+    getHotelRoomList,
+    getRoomStatus,
+    getCustomerSource,
+    getRoomType
+} from '../../utils/customerOrder'
+import {
+    mapState
+} from 'vuex'
+export default {
+    data() {
+        return {
+            list: ['按房间类型', '按订单来源'],
+            current: 0,
+            value: 0,
+            range: [],
+            range2:[],
+            show:false,
+            startTime:'开始时间',
+            endTime:'结束时间',
+            curIdx:-1,
+            dataList: [],
+            dataListCopy: [],
+            /**
+             * 用户来源列表
+             */
+            customerSourceList: [],
+            /**
+             * 方块背景颜色列表
+             */
+            roomStatusColorList: [],
+            /**
+             * 房型列表
+             */
+            cesRoomLayoutList: [],
+        }
+    },
+    computed: {
+        ...mapState(['hotelId'])
+    },
+    mounted() {
+        this.getData()
+    },
+    filters: {
+
+    },
+    methods:{
+        sectionChangeDay(e) {
+            console.log(e)
+            this.current = e
+        },
+        change(e) {
+            console.log(e)
+            this.filterId = e
+            this.filter()
+        },
+        confirm(e) {
+            console.log(e)
+            this.startTime = e[0]
+            this.endTime = e[e.length - 1]
+            this.show = false
+        },
+        close() {
+            this.show = false
+        },
+        changeList(index) {
+            this.curIdx = index
+            this.$emit('changeList', index)
+        },
+        headerChange(e) {
+            this.getData(e)
+        },
+        getData(id = this.hotelId) {
+            getHotelRoomList({
+                hotelId: id
+            }).then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.length > 0) {
+                    this.dataListCopy = res.result
+                    // this.dataList = res.result
+                    this.filter()
+                } else {
+                    this.dataListCopy = []
+                    this.dataList = []
+                }
+            })
+            getRoomStatus().then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.length > 0) {
+                    let arr = []
+                    res.result.forEach(ele => {
+                        arr.push(ele.text)
+                    })
+                    this.roomStatusColorList = res.result
+                    this.list3 = arr
+                    this.list3.unshift('全部')
+                } else {
+                    this.roomStatusColorList = []
+                    this.list3 = []
+                }
+            })
+            getCustomerSource().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.customerSourceList = res.result.records
+                    console.log(this.current2);
+                    this.range2 = res.result.records.map(item => {
+                        return {
+                            value: item.id,
+                            text: item.itemText
+                        }
+                    })
+                    this.range2.unshift({
+                        value: null,
+                        text: '全部'
+                    })
+                } else {
+                    this.customerSourceList = []
+                    this.range2 = []
+                }
+            })
+            getRoomType().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.cesRoomLayoutList = res.result.records
+                    this.current2 = res.result.records[0].id
+                    this.range = res.result.records.map(item => {
+                        return {
+                            value: item.id,
+                            text: item.name
+                        }
+                    })
+                    this.range.unshift({
+                        value: null,
+                        text: '全部'
+                    })
+                } else {
+                    this.cesRoomLayoutList = []
+                    this.range = []
+                }
+            })
+        },
+        /**
+         * @description: 筛选
+         * @param
+         * @return
+         */
+        filter() {
+            console.log('this.current', this.current);
+            console.log('this.current3', this.current3);
+            let arr = JSON.parse(JSON.stringify(this.dataListCopy))
+            console.log(arr);
+            arr.forEach(item => {
+                item.rooms = item.rooms.filter(ele => {
+                    return ele.bookingData && ele.bookingData.bookingOrder && new Date().toLocaleDateString() == new Date(ele.bookingData.bookingOrder.arrivalTime).toLocaleDateString()
+                })
+            })
+            if (this.current == 0 && this.filterId) {
+                arr.forEach(item => {
+                    console.log(item);
+                    item.rooms = item.rooms.filter(ele => {
+                        return ele.layout.id == this.filterId
+                    })
+                })
+            }
+            if (this.current == 1 && this.filterId) {
+                arr.forEach(item => {
+                    console.log(item);
+                    item.rooms = item.rooms.filter(ele => {
+                        return ele.livingData && ele.livingData.livingOrder ? ele.livingData.livingOrder.customerSource == this.filterId : ele.bookingData && ele.bookingData.bookingOrder ? ele.bookingData.bookingOrder.customerSource == this.filterId : false
+                    })
+                })                
+            }
+            let brr = []
+            arr.forEach(item => {
+                if (item.rooms.length > 0) {
+                    brr.push(...item.rooms)
+                }
+            })
+            console.log('arrarrarrarr', arr);
+            this.dataList = JSON.parse(JSON.stringify(brr))
+            // this.dataListCopy = JSON.parse(JSON.stringify(brr))
+            console.log(brr);
+            // return arr
+        },
+        /**
+         * 根据id计算每种房型的数量
+         */
+        filterRoomType(id) {
+            let arr = JSON.parse(JSON.stringify(this.dataList))
+            arr = arr.filter(item => {
+                return item.layout.id == id
+            })
+            return arr.length
+        },
+        /**
+         * 根据id计算每种来源的数量
+         */
+        filterCustomerSource(id) {
+            let arr = JSON.parse(JSON.stringify(this.dataList))
+            arr = arr.filter(item => {
+                return item.livingData && item.livingData.livingOrder ? item.livingData.livingOrder.customerSource == id : item.bookingData && item.bookingData.bookingOrder ? item.bookingData.bookingOrder.customerSource == id : false
+            })
+            return arr.length
+        },
+        getCustomerSourceList(customerSource, first) {
+            console.log(customerSource);
+            var find = this.customerSourceList.find((t) => t.id == customerSource);
+            console.log(find);
+            console.log(this.customerSourceList);
+            if (find) {
+                // return first ? find.label.substr(0, 1) : find.label;
+                return find.itemText.substr(0, 1);
+            }
+            return "";
+        },
+        /**
+         * 计算方块的背景颜色
+         */
+        getRoomStatusColor(roomStatus) {
+            var find = this.roomStatusColorList.find((t) => t.value == roomStatus);
+            return find ? find.extend : "";
+        },
+        /**
+         * 计算房态出现的数量
+         */
+        roomStateFilter(roomStatus) {
+            let count = 0
+            let arr = JSON.parse(JSON.stringify(this.dataListCopy))
+            arr.forEach(ele => {
+                ele.rooms.forEach(item => {
+                    if (item.roomInfo.roomStatus == roomStatus) {
+                        count++
+                    }
+                })
+            })
+            return count
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.list-active{
+    background: rgb(228, 240, 253);
+}
+
+.card-day {
+    padding: 10px;
+    background: #fff;
+    margin-top: 8px;
+    border-bottom: #00000030 1px solid;
+}
+
+.card-day-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: #00000030 1px solid;
+    height: 35px;
+}
+
+.card-day-btm {
+    margin-top: 10px;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    justify-content: space-between;
+    gap: 10px;
+
+    // div为偶数时右对齐
+    div:nth-child(even) {
+        text-align: right;
+    }
+}
+
+.day-detail {
+    background: #fff;
+    padding: 10px;
+    margin-top: 8px;
+
+    .day-detail-title {
+        font-weight: bold;
+        font-size: 16px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+}
+
+.day-detail-list {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 10px 15px;
+    // height: 30px;
+    font-size: 12px;
+}
+.calendar{
+    border: 1px solid;
+    padding: 5px 10px;
+    border-radius: 5px;
+}
+</style>

components/roomService/roomService.vue

@@ -0,0 +1,191 @@
+<template>
+<view class="pages">
+    <Header @change="headerChange">
+        <template #search>
+            <u-subsection :list="list" mode="subsection" :current="current" @change="topChange"></u-subsection>
+        </template>
+    </Header>
+    <div class="content">
+        <div>
+            <u-collapse>
+                <u-collapse-item>
+                    <div class="title" slot="title">
+                        <div>
+                            待服务
+                        </div>
+                    </div>
+                    <div class="content-detail" v-for="(item, index) in dataList.filter(item=> item.status==1)" :class="{'active':item.id==activeId}" :key="index" @click="changeActive(item)">
+                        <div>
+                            <b>{{index+1}}</b>
+                            <b style="margin-left:10px;margin-right:10px;">{{item.roomNo}}</b>
+                            <b>呼叫时间：{{item.createDate}}</b>
+                        </div>
+                        <!-- <div style="margin-left:30px;display:flex;justify-content:space-between;font-size: 12px;">
+                            <div>房型：{{'高级商务大床房'}}/1间</div>
+                            <div>预离时间：{{item.validDate}}</div>
+                        </div> -->
+                        <div style="margin-left:30px;display:flex;justify-content:space-between;font-size: 12px;">
+                            服务事项：{{item.contentBody}}
+                        </div>
+                    </div>
+                </u-collapse-item>
+                <u-collapse-item>
+                    <div class="title" slot="title">
+                        <div>
+                            已服务
+                        </div>
+                    </div>
+                    <div class="content-detail" v-for="(item, index) in dataList.filter(item=> item.relay==2)" :class="{'active':item.id==activeId}" :key="index" @click="changeActive(item)">
+                        <div>
+                            <b>{{index+1}}</b>
+                            <b style="margin-left:10px;margin-right:10px;">{{item.roomNo}}</b>
+                            <b>呼叫时间：{{item.createDate}}</b>
+                        </div>
+                        <!-- <div style="margin-left:30px;display:flex;justify-content:space-between;font-size: 12px;">
+                            <div>房型：{{'高级商务大床房'}}/1间</div>
+                            <div>预离时间：{{item.validDate}}</div>
+                        </div> -->
+                        <div style="margin-left:30px;display:flex;justify-content:space-between;font-size: 12px;">
+                            服务事项：{{item.contentBody}}
+                        </div>
+                    </div>
+                </u-collapse-item>
+            </u-collapse>
+        </div>
+    </div>
+
+    <div class="btn">
+        <u-subsection :list="btnList" mode="subsection" :current="btnCurrent" @change="btnChange"></u-subsection>
+    </div>
+    <u-toast ref="uToast"></u-toast>
+</view>
+</template>
+
+<script>
+import Header from '../header.vue'
+import {
+    getRoomServiceList,
+    cancelRoomService
+} from '../../utils/roomService'
+import { mapState } from 'vuex'
+export default {
+    components: {
+        Header
+    },
+    data() {
+        return {
+            list: ['客房服务', '查房'],
+            btnList: ['取消服务', '添加账单', '完成服务'],
+            btnCurrent: 0,
+            current: 0,
+            dataList: [],
+            activeId: '',
+            activeItem: null,
+        }
+    },
+	computed:{
+		...mapState(['hotelId'])
+	},
+    mounted() {
+        // this.getData()
+    },
+    methods: {
+        headerChange(e) {
+            console.log(e)
+            this.getData(e)
+        },
+        topChange(e) {
+            console.log(e)
+            this.current = e
+        },
+        getData(hotelId) {
+            if (this.current == 0) {
+                getRoomServiceList({
+                    hotelId: hotelId
+                }).then(res => {
+                    console.log(res);
+                    if (res.code == 200 && res.result.records.length > 0) {
+                        this.dataList = res.result.records
+                    }else{
+						this.dataList = []
+					}
+                })
+            }
+        },
+        changeActive(data) {
+            console.log(data.id);
+            this.activeId = data.id
+            this.activeItem = JSON.parse(JSON.stringify(data))
+        },
+        btnChange(e) {
+            console.log(e)
+            this.btnCurrent = e
+            if (e == 0 && this.activeItem) {
+                this.activeItem.status = 3
+                cancelRoomService(this.activeItem).then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.$refs.uToast.show({
+                            message: '取消成功',
+                            type: 'success',
+                            duration: 2000
+                        })
+						this.getData(this.hotelId)
+                    }
+                })
+            }
+			if (e == 2 && this.activeItem) {
+                this.activeItem.status = 2
+                cancelRoomService(this.activeItem).then(res => {
+                    console.log(res);
+                    if (res.code == 200) {
+                        this.$refs.uToast.show({
+                            message: '设置成功',
+                            type: 'success',
+                            duration: 2000
+                        })
+						this.getData(this.hotelId)
+                    }
+                })
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.pages {
+    height: 100vh;
+    width: 100vw;
+    background-color: #f5f5f5;
+}
+
+.content {
+    margin-top: 10px;
+    padding: 10px 5px;
+    background-color: #fff;
+
+    .title {
+        display: flex;
+        justify-content: space-between;
+        color: #409EFF;
+        font-size: 18px;
+    }
+}
+
+.content-detail {
+    >div {
+        // display: flex;
+        // align-items: center;
+        margin-top: 10px;
+    }
+}
+
+.active {
+    background: rgb(228, 240, 253);
+
+    >b {
+        font-size: 16px !important;
+    }
+}
+</style>

components/tableCharts/customerType.vue

@@ -0,0 +1,122 @@
+<template>
+<div>
+    <uni-table style="margin-top:40px;" ref="table" :loading="loading" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange">
+        <uni-tr>
+            <uni-th width="60" align="center">客户类型</uni-th>
+            <uni-th width="60" align="center">间夜数/间</uni-th>
+            <uni-th width="60" align="center">数量占比</uni-th>
+            <uni-th width="60" align="center">房费收入/元</uni-th>
+            <uni-th width="60" align="center">非房费收入/元</uni-th>
+            <uni-th width="60" align="center">收入小计</uni-th>
+            <uni-th width="60" align="center">收入占比</uni-th>
+            <uni-th width="60" align="center">平均客单价/元</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableData" :key="index">
+            <uni-td align="center">
+                <view class="name">{{ item.name }}</view>
+            </uni-td>
+            <uni-td align="center">{{ item.rz_count }}</uni-td>
+            <uni-td align="center">{{ item.address }}</uni-td>
+            <uni-td align="center">{{ item.room_money }}</uni-td>
+            <uni-td align="center">{{ item.other_money }}</uni-td>
+            <uni-td align="center">{{ item.sum_money }}</uni-td>
+            <uni-td align="center">{{ item.date }}</uni-td>
+            <uni-td align="center">{{ item.room_average_price }}</uni-td>
+        </uni-tr>
+    </uni-table>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'column'"></ucharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieDatas" ></pieCharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieData" ></pieCharts>
+    </div>
+</div>
+</template>
+
+<script>
+import ucharts from '../echarts/line.vue'
+import pieCharts from '../echarts/pie.vue'
+export default {
+    components: {
+        ucharts,
+        pieCharts
+    },
+    props:{
+        tableData:{
+            type:Array,
+            default(){
+                return []
+            }
+        }
+    },
+    computed: {
+        chartsData() {
+            let categories = [];
+            let series = [];
+            let obj = {
+                name: '收入',
+                data: []
+            }
+            console.log(this.tableData);
+            if (!this.tableData || this.tableData.length === 0) {
+                return {
+                    categories,
+                    series
+                }
+            } else {
+                this.tableData.forEach(ele => {
+                    categories.push(ele.name)
+                    obj.data.push(ele.sum_money)
+                })
+                series = [obj]
+                return {
+                    categories,
+                    series
+                }
+            }
+        },
+        chartsPieData() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.sum_money
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+        chartsPieDatas() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.rz_count
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+    },
+    data() {
+        return {
+            loading:false,
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+/deep/.uni-table {
+    min-width: 100vw !important;
+}
+
+/deep/.uni-table-th {
+    font-size: 12px !important;
+}
+</style>

components/tableCharts/feeItems.vue

@@ -0,0 +1,116 @@
+<template>
+<div>
+    <uni-table style="margin-top:40px;" ref="table" :loading="loading" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange">
+        <uni-tr>
+            <uni-th width="60" align="center">费项</uni-th>
+            <uni-th width="60" align="center">微信</uni-th>
+            <uni-th width="60" align="center">支付宝</uni-th>
+            <uni-th width="60" align="center">现金</uni-th>
+            <uni-th width="60" align="center">银联卡</uni-th>
+            <uni-th width="60" align="center">其他</uni-th>
+            <uni-th width="60" align="center">收入小计</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableData" :key="index">
+            <!-- <uni-td>{{ item.date }}</uni-td> -->
+            <uni-td align="center">
+                <view class="name">{{ item.name }}</view>
+            </uni-td>
+            <uni-td align="center">{{ item['微信'] }}</uni-td>
+            <uni-td align="center">{{ item['支付宝'] }}</uni-td>
+            <uni-td align="center">{{ item['现金'] }}</uni-td>
+            <uni-td align="center">{{ item['银联卡'] }}</uni-td>
+            <uni-td align="center">{{ item['其他'] }}</uni-td>
+            <uni-td align="center">{{ filter(item) }}</uni-td>
+        </uni-tr>
+    </uni-table>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'column'"></ucharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieData"></pieCharts>
+    </div>
+</div>
+</template>
+
+<script>
+import ucharts from '../echarts/line.vue'
+import pieCharts from '../echarts/pie.vue'
+export default {
+    components: {
+        ucharts,
+        pieCharts
+    },
+    props:{
+        tableData:{
+            type:Array,
+            default(){
+                return []
+            }
+        }
+    },
+    data() {
+        return {
+            loading:false,
+        }
+    },
+    computed: {
+        chartsData() {
+            let categories = [];
+            let series = [];
+            let obj = {
+                name: '小计',
+                data: []
+            }
+            console.log(this.tableData);
+            if (!this.tableData || this.tableData.length === 0) {
+                return {
+                    categories,
+                    series
+                }
+            } else {
+                this.tableData.forEach(ele => {
+                    categories.push(ele.name)
+                    obj.data.push(this.filter(ele))
+                })
+                series = [obj]
+                return {
+                    categories,
+                    series
+                }
+            }
+        },
+        chartsPieData() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: this.filter(ele)
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+    },
+    methods:{
+        filter(object){
+            let arr = Object.keys(object).filter(item=>item!='name')
+            let count = 0
+            arr.forEach(item=>{
+                count += object[item]
+            })
+            return count
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+/deep/.uni-table {
+    min-width: 100vw !important;
+}
+
+/deep/.uni-table-th {
+    font-size: 12px !important;
+}
+</style>

components/tableCharts/occupancyType.vue

@@ -0,0 +1,120 @@
+<template>
+<div>
+    <uni-table style="margin-top:40px;" ref="table" :loading="loading" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange">
+        <uni-tr>
+            <uni-th width="60" align="center">入住类型</uni-th>
+            <uni-th width="60" align="center">入住间数</uni-th>
+            <uni-th width="60" align="center">房费</uni-th>
+            <uni-th width="60" align="center">平均房价</uni-th>
+            <uni-th width="60" align="center">非房费</uni-th>
+            <uni-th width="60" align="center">收入小计</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableData" :key="index">
+            <uni-td align="center">
+                <view class="name">{{ item.name }}</view>
+            </uni-td>
+            <uni-td align="center">{{ item.rz_count }}</uni-td>
+            <!-- <uni-td align="center">{{ item.address }}</uni-td> -->
+            <uni-td align="center">{{ item.room_money }}</uni-td>
+            <uni-td align="center">{{ item.room_average_price }}</uni-td>
+            <uni-td align="center">{{ item.other_money }}</uni-td>
+            <uni-td align="center">{{ item.sum_money }}</uni-td>
+            <!-- <uni-td align="center">{{ item.date }}</uni-td> -->
+        </uni-tr>
+    </uni-table>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'column'"></ucharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieDatas"></pieCharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieData"></pieCharts>
+    </div>
+</div>
+</template>
+
+<script>
+import ucharts from '../echarts/line.vue'
+import pieCharts from '../echarts/pie.vue'
+export default {
+    components: {
+        ucharts,
+        pieCharts
+    },
+    props:{
+        tableData:{
+            type:Array,
+            default(){
+                return []
+            }
+        }
+    },
+    computed: {
+        chartsData() {
+            let categories = [];
+            let series = [];
+            let obj = {
+                name: '收入',
+                data: []
+            }
+            console.log(this.tableData);
+            if (!this.tableData || this.tableData.length === 0) {
+                return {
+                    categories,
+                    series
+                }
+            } else {
+                this.tableData.forEach(ele => {
+                    categories.push(ele.name)
+                    obj.data.push(ele.sum_money)
+                })
+                series = [obj]
+                return {
+                    categories,
+                    series
+                }
+            }
+        },
+        chartsPieData() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.sum_money
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+        chartsPieDatas() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.rz_count
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+    },
+    data() {
+        return {
+            loading:false,
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+/deep/.uni-table {
+    min-width: 100vw !important;
+}
+
+/deep/.uni-table-th {
+    font-size: 12px !important;
+}
+</style>

components/tableCharts/payMethods.vue

@@ -0,0 +1,85 @@
+<template>
+<div>
+    <uni-table style="margin-top:40px;" ref="table" :loading="loading" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange">
+        <uni-tr>
+            <uni-th width="60" align="center">收款方式</uni-th>
+            <uni-th width="60" align="center">房费</uni-th>
+            <uni-th width="60" align="center">非房费</uni-th>
+            <uni-th width="60" align="center">小计</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableData" :key="index">
+            <uni-td align="center">{{ item.name }}</uni-td>
+            <uni-td align="center">
+                {{ item.room_money }}
+            </uni-td>
+            <uni-td align="center">{{ item.other_money }}</uni-td>
+            <uni-td align="center">
+                {{ item.room_money*1+item.other_money }}
+            </uni-td>
+        </uni-tr>
+    </uni-table>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'column'"></ucharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieData"></pieCharts>
+    </div>
+</div>
+</template>
+
+<script>
+import ucharts from '../echarts/line.vue'
+import pieCharts from '../echarts/pie.vue'
+export default {
+    components: {
+        ucharts,
+        pieCharts
+    },
+    props:{
+        tableData:{
+            type:Array,
+            default(){
+                return []
+            }
+        }
+    },
+    computed:{
+        chartsData(){
+            let categories = [];
+            let series = [];
+            let obj = {name:'房费',data:[]};
+            let obj1 = {name:'非房费', data:[]}
+            let obj2 = {name:'小计', data:[]}
+            if (this.tableData.length == 0) {
+                return { categories, series }
+            }
+            this.tableData.forEach(ele=>{
+                categories.push(ele.name)
+                obj.data.push(ele.room_money)
+                obj1.data.push(ele.other_money)
+                obj2.data.push(ele.room_money*1+ele.other_money*1)
+            })
+            series = [obj, obj1, obj2]
+            return { categories, series }
+        },
+        chartsPieData(){
+            console.log('111111111',this.tableData);
+            let series= []
+            this.tableData.forEach(ele=>{
+                series.push({name:ele.name,value:((ele.room_money*1+ele.other_money*1)/this.tableData.reduce((pre, cur)=> pre+(cur.room_money*1+cur.other_money*1), 0 )).toFixed(0)})
+            })
+            console.log('222222222222',series);
+            return series
+        }
+    },
+    data() {
+        return {
+            loading:false,
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+
+</style>

components/tableCharts/roomType.vue

@@ -0,0 +1,123 @@
+<template>
+<div>
+    <uni-table style="margin-top:40px;" ref="table" :loading="loading" border stripe type="selection" emptyText="暂无更多数据" @selection-change="selectionChange">
+        <uni-tr>
+            <uni-th width="60" align="center">房间类型</uni-th>
+            <uni-th width="60" align="center">入住间数</uni-th>
+            <uni-th width="60" align="center">入住率</uni-th>
+            <uni-th width="60" align="center">房费收入</uni-th>
+            <uni-th width="60" align="center">非房费收入</uni-th>
+            <uni-th width="60" align="center">收入小计</uni-th>
+            <uni-th width="60" align="center">平均房价</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableData" :key="index">
+            <uni-td align="center">{{ item.name }}</uni-td>
+            <uni-td align="center">
+                <view class="name">{{ item.rz_count }}</view>
+            </uni-td>
+            <uni-td align="center">{{ ((item.rz_count/item.room_count) || 0).toFixed(2)}}</uni-td>
+            <uni-td align="center">{{ item.room_money }}</uni-td>
+            <uni-td align="center">{{ item.other_money }}</uni-td>
+            <uni-td align="center">{{ item.sum_money }}</uni-td>
+            <uni-td align="center">{{ item.room_average_price }}</uni-td>
+        </uni-tr>
+    </uni-table>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'column'"></ucharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieData" ></pieCharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieData2" ></pieCharts>
+    </div>
+</div>
+</template>
+
+<script>
+import ucharts from '../echarts/line.vue'
+import pieCharts from '../echarts/pie.vue'
+export default {
+    components: {
+        ucharts,
+        pieCharts
+    },
+    props: {
+        tableData: {
+            type: Array,
+            default () {
+                return []
+            }
+        }
+    },
+    computed: {
+        chartsData() {
+            let categories = [];
+            let series = [];
+            let obj = {
+                name: '房费收入',
+                data: []
+            };
+            let obj1 = {
+                name: '间数',
+                data: []
+            }
+            if (this.tableData.length == 0) {
+                return {
+                    categories,
+                    series
+                }
+            }
+            this.tableData.forEach(ele => {
+                categories.push(ele.name)
+                obj.data.push(ele.room_money)
+                obj1.data.push(ele.rz_count)
+            })
+            series = [obj, obj1]
+            return {
+                categories,
+                series
+            }
+        },
+        chartsPieData() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.room_money
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+        chartsPieData2(){
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.other_money
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        }
+    },
+    data() {
+        return {
+            loading: false,
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+/deep/.uni-table {
+    min-width: 100vw !important;
+}
+
+/deep/.uni-table-th {
+    font-size: 12px !important;
+}
+</style>

components/tableCharts/source.vue

@@ -0,0 +1,122 @@
+<template>
+<div>
+    <uni-table style="margin-top:40px;" ref="table" :loading="loading" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange">
+        <uni-tr>
+            <uni-th width="60" align="center">订单来源</uni-th>
+            <uni-th width="60" align="center">间夜数/间</uni-th>
+            <uni-th width="60" align="center">数量占比</uni-th>
+            <uni-th width="60" align="center">房费收入/元</uni-th>
+            <uni-th width="60" align="center">非房费收入/元</uni-th>
+            <uni-th width="60" align="center">收入小计</uni-th>
+            <uni-th width="60" align="center">收入占比</uni-th>
+            <uni-th width="60" align="center">平均客单价/元</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableData" :key="index">
+            <uni-td align="center">
+                <view class="name">{{ item.name }}</view>
+            </uni-td>
+            <uni-td align="center">{{ item.rz_count }}</uni-td>
+            <uni-td align="center">{{ item.address }}</uni-td>
+            <uni-td align="center">{{ item.room_money }}</uni-td>
+            <uni-td align="center">{{ item.other_money }}</uni-td>
+            <uni-td align="center">{{ item.sum_money }}</uni-td>
+            <uni-td align="center">{{ item.date }}</uni-td>
+            <uni-td align="center">{{ item.room_average_price }}</uni-td>
+        </uni-tr>
+    </uni-table>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'column'"></ucharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieDatas"></pieCharts>
+    </div>
+    <div style="margin-top:20px;">
+        <pieCharts :chartData="chartsPieData"></pieCharts>
+    </div>
+</div>
+</template>
+
+<script>
+import ucharts from '../echarts/line.vue'
+import pieCharts from '../echarts/pie.vue'
+export default {
+    components: {
+        ucharts,
+        pieCharts
+    },
+    props:{
+        tableData:{
+            type:Array,
+            default(){
+                return []
+            }
+        }
+    },
+    computed: {
+        chartsData() {
+            let categories = [];
+            let series = [];
+            let obj = {
+                name: '收入',
+                data: []
+            }
+            console.log(this.tableData);
+            if (!this.tableData || this.tableData.length === 0) {
+                return {
+                    categories,
+                    series
+                }
+            } else {
+                this.tableData.forEach(ele => {
+                    categories.push(ele.name)
+                    obj.data.push(ele.sum_money)
+                })
+                series = [obj]
+                return {
+                    categories,
+                    series
+                }
+            }
+        },
+        chartsPieData() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.sum_money
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+        chartsPieDatas() {
+            console.log('111111111', this.tableData);
+            let series = []
+            this.tableData.forEach(ele => {
+                series.push({
+                    name: ele.name,
+                    value: ele.rz_count
+                })
+            })
+            console.log('222222222222', series);
+            return series
+        },
+    },
+    data() {
+        return {
+            loading:false,
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+/deep/.uni-table {
+    min-width: 100vw !important;
+}
+
+/deep/.uni-table-th {
+    font-size: 12px !important;
+}
+</style>

components/tableCharts/time.vue

@@ -0,0 +1,95 @@
+<template>
+<div>
+    <uni-table style="margin-top:40px;" ref="table" :loading="loading" border stripe type="" emptyText="暂无更多数据" @selection-change="selectionChange">
+        <uni-tr>
+            <uni-th width="60" align="center">收款日期</uni-th>
+            <uni-th width="60" align="center">房费</uni-th>
+            <uni-th width="60" align="center">非房费</uni-th>
+            <uni-th width="60" align="center">小计</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(item, index) in tableData" :key="index">
+            <uni-td align="center">{{ item.time }}</uni-td>
+            <uni-td align="center">
+                {{ item.room_money }}
+            </uni-td>
+            <uni-td align="center">{{ item.other_money }}</uni-td>
+            <uni-td align="center">
+                {{ item.room_money*1+item.other_money }}
+            </uni-td>
+        </uni-tr>
+    </uni-table>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'column'"></ucharts>
+    </div>
+    <div style="margin-top:20px;">
+        <ucharts :chartData="chartsData" :type="'line'"></ucharts>
+    </div>
+</div>
+</template>
+
+<script>
+import ucharts from '../echarts/line.vue'
+export default {
+    components: {
+        ucharts
+    },
+    props: {
+        tableData: {
+            type: Array,
+            default () {
+                return []
+            }
+        }
+    },
+    computed: {
+        chartsData() {
+            let categories = [];
+            let series = [];
+            let obj = {
+                name: '房费',
+                data: []
+            };
+            let obj1 = {
+                name: '非房费',
+                data: []
+            }
+            let obj2 = {
+                name: '小计',
+                data: []
+            }
+            console.log(this.tableData);
+            if (!this.tableData || this.tableData.length === 0) {
+                return {
+                    categories,
+                    series
+                }
+            } else {
+                this.tableData.forEach(ele => {
+                    categories.push(ele.time)
+                    obj.data.push(ele.room_money)
+                    obj1.data.push(ele.other_money)
+                    obj2.data.push(ele.room_money * 1 + ele.other_money * 1)
+                })
+                series = [obj, obj1, obj2]
+                return {
+                    categories,
+                    series
+                }
+            }
+
+        }
+    },
+    mounted() {
+        console.log(this.tableData);
+
+    },
+    data() {
+        return {
+            loading: false,
+        }
+    }
+}
+</script>
+
+<style>
+</style>

index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>

main.js

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

manifest.json

@@ -0,0 +1,100 @@
+{
+    "name" : "酒店App老板",
+    "appid" : "__UNI__60D7431",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "h5" : {
+        "devServer" : {
+            "https" : false,
+            "port" : 8080,
+            "proxy" : {
+                "/api" : {
+                    // "target" : "http://192.168.2.88:3000", // 
+                    // "target" : "http://192.168.2.9:8080", // 
+                    "target" : "http://118.195.195.200:8080", //线上
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/api" : "/"
+                    }
+                }
+            }
+        },
+        "router" : {
+            "mode" : "history"
+        },
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    },
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
+}

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "echarts": "^5.4.2"
+  }
+}

pages.json

@@ -0,0 +1,149 @@
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+		    "path" : "pages/login/login",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "登录",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "uni-app"
+			}
+		}
+	    ,{
+            "path" : "pages/roomOrders/roomOrders",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/predetermine/predetermine",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/roomStateDiagram/roomStateDiagram",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "components/longTermHousingStatus/longTermHousingStatus",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/roomDetail/roomDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/mine/mine",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "components/businessAnalysis/businessAnalysis",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "经营分析",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "components/incomeDetail/incomeDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+				
+            }
+            
+        }
+        ,{
+            "path" : "components/roomService/roomService",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom"
+            }
+            
+        }
+    ],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"backgroundColor": "#fff",
+		"borderStyle": "#00000011",
+		"selectedColor": "#846FFE",
+		"fontSize": "12px",
+		"list": [{
+				// "iconPath": "static/icon/cookbook_1.svg",
+				// "selectedIconPath": "static/icon/cookbook.svg",
+				"pagePath": "pages/index/index",
+				"text": "首页"
+			},
+			{
+				// "iconPath": "static/icon/health.svg",
+				// "selectedIconPath": "static/icon/health_1.svg",
+				"pagePath": "pages/roomStateDiagram/roomStateDiagram",
+				"text": "房态图"
+			},
+			{
+				// "iconPath": "static/icon/dietician.svg",
+				// "selectedIconPath": "static/icon/dietician_1.svg",
+				"pagePath": "pages/roomDetail/roomDetail",
+				"text": "客房详情"
+			},
+			{
+				// "iconPath": "static/icon/my.svg",
+				// "selectedIconPath": "static/icon/my_1.svg",
+				"pagePath": "pages/mine/mine",
+				"text": "我的"
+			}
+		]
+	},
+	"uniIdRouter": {},
+	"easycom": {
+			"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
+		}
+}

pages/index/index.vue

@@ -0,0 +1,824 @@
+<template>
+<view style="height:calc(100vh - var(--window-bottom))">
+    <div style="background:#fff">
+        <div class="home-box">
+            <div class="select-top">
+                <uni-data-select style="width:auto;border: none;flex: none;" :clear="false" v-model="hotelIds" :localdata="range" @change="change"></uni-data-select>
+            </div>
+            <div class="grid-data">
+                <div>
+                    <div>今日总收款/元</div>
+                    <div style="font-size: 18px;">{{todayTotalIncome}}</div>
+                </div>
+                <div>
+                    <div>在住/空置</div>
+                    <div style="font-size: 18px;">{{roomData.checkInRoomData}}/{{roomData.allRoomData - roomData.checkInRoomData}}</div>
+                </div>
+                <div>
+                    <div>入住率</div>
+                    <div style="font-size: 18px;">{{((roomData.checkInRoomData/roomData.allRoomData) || 0).toFixed(2)}}%</div>
+                </div>
+                <div>
+                    <div>今日总收入/元</div>
+                    <div style="font-size: 18px;">{{todayIncome.reduce((pre, cur) => pre+cur.amount,0 ) || 0}}</div>
+                </div>
+                <div>
+                    <div>平均房价/元</div>
+                    <div style="font-size: 18px;">{{roomData.housingPrices}}</div>
+                </div>
+                <div>
+                    <div>RevPAR</div>
+                    <div v-if="roomData.checkInRoomData/roomData.allRoomData!=0 && roomData.allRoomData!=0" style="font-size: 18px;">{{((roomData.housingPrices*roomData.allRoomData)/(roomData.checkInRoomData/roomData.allRoomData).toFixed(2)).toFixed(2)}}</div>
+                    <div v-else style="font-size: 18px;">{{0}}</div>
+                </div>
+            </div>
+            <div class="card">
+                <div style="display:flex;justify-content:flex-end;align-items:center;">
+                    <u-icon name="arrow-right"></u-icon>
+                </div>
+                <div class="card-data">
+                    <div @click="roomOrders(1)">
+                        <div style="font-size: 20px; font-weight: 600;">{{roomData.todayLeaveRoomData}}</div>
+                        <div style="font-size: 12px;">今日预离</div>
+                    </div>
+                    <div @click="handleToPredetemine(1)">
+                        <div style="font-size: 20px; font-weight: 600;">{{roomData.todayArriveRoomData}}</div>
+                        <div style="font-size: 12px;">今日预抵</div>
+                    </div>
+                    <div>
+                        <div style="font-size: 20px; font-weight: 600;">{{roomData.todayArrearsRoomData}}</div>
+                        <div style="font-size: 12px;color:red">欠费</div>
+                    </div>
+                    <div>
+                        <div style="font-size: 20px; font-weight: 600;">{{roomData.dirtyRoomData}}</div>
+                        <div style="font-size: 12px;">脏房</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="grid-tabbar">
+            <div v-for="(item, index) in tabbarList" @click="handleToPage(item)" :key="index" style="display:flex;flex-direction:column;align-items:center">
+                <image :src="item.icon" style="width:30px;height:30px;" />
+                <div>{{item.name}}</div>
+            </div>
+        </div>
+        <div class="notice">
+            公告<span style="border-right:3px solid rgb(255, 141, 26);margin:0 5px"></span>公告内容公告内容公告内容公告内容
+        </div>
+    </div>
+
+    <div class="content-card">
+        <div class="content-card-top">
+            <div>
+                <span>今日收入</span>/元
+            </div>
+            <div @click="handleToIncome">
+                <u-icon name="arrow-right"></u-icon>
+            </div>
+        </div>
+        <div class="content-card-btm">
+            <div v-for="(item, index) in todayIncome" :key="index">
+                <div>{{item.amount}}</div>
+                <div>{{item.name}}</div>
+            </div>
+        </div>
+    </div>
+
+    <div class="content-card">
+        <div class="content-card-top">
+            <div>
+                <span>收款方式</span>/元
+            </div>
+            <div @click="handleToBusinessAnalysis">
+                <u-icon name="arrow-right"></u-icon>
+            </div>
+        </div>
+        <div class="content-card-btm">
+            <div v-for="(item, index) in paymentMethod" :key="index">
+                <div>{{item.amount}}</div>
+                <div>{{item.name}}</div>
+            </div>
+            <!-- <div>
+                <div>35280.00</div>
+                <div>微信</div>
+            </div>
+            <div>
+                <div>7890.00</div>
+                <div>支付宝</div>
+            </div> -->
+        </div>
+    </div>
+
+    <div class="content-card">
+        <div class="content-card-top">
+            <div>
+                <span>在住来源</span>/间
+            </div>
+            <div @click="toBusiness">
+                <u-icon name="arrow-right"></u-icon>
+            </div>
+        </div>
+        <div class="content-card-btm">
+            <div v-for="(item, index) in staySource" :key="index">
+                <div>{{item.count}}</div>
+                <div>{{item.name}}</div>
+            </div>
+            <!-- <div>
+                <div>123</div>
+                <div>美团</div>
+            </div>
+            <div>
+                <div>123</div>
+                <div>携程</div>
+            </div>
+            <div>
+                <div>123</div>
+                <div>飞猪</div>
+            </div> -->
+        </div>
+    </div>
+
+    <div class="content-card">
+        <div class="content-card-top">
+            <div>
+                <span>房态</span>/间
+            </div>
+            <div @click="toRoomType">
+                <u-icon name="arrow-right"></u-icon>
+            </div>
+        </div>
+        <div class="content-card-btm">
+            <div v-for="(item, index) in roomStatus" :key="index">
+                <div>{{item.count}}</div>
+                <div>{{item.name}}</div>
+            </div>
+            <!-- <div>
+                <div>123</div>
+                <div>住脏</div>
+            </div>
+            <div>
+                <div>123</div>
+                <div>空净</div>
+            </div>
+            <div>
+                <div>123</div>
+                <div>空脏</div>
+            </div>
+            <div>
+                <div>123</div>
+                <div>维修</div>
+            </div> -->
+        </div>
+    </div>
+
+    <div class="content-card" v-if="true">
+        <div class="content-card-top">
+            <div>
+                <span>收支情况</span>/元
+                <uni-data-select style="width:80px;border: none;flex: none;" :clear="false" v-model="incomeValue" :localdata="incomeRange" @change="incomeChange"></uni-data-select>
+            </div>
+            <div @click="toIncomeDetail">
+                <u-icon name="arrow-right"></u-icon>
+            </div>
+        </div>
+        <div class="content-card-btm">
+            <div>
+                <div>{{incomeAndExpenditure.reduce((pre, cur)=> pre+cur.money,0)}}</div>
+                <div>收入</div>
+            </div>
+            <div>
+                <div>{{incomeAndExpenditure.reduce((pre, cur)=> pre+cur.zc_money,0)}}</div>
+                <div>支出</div>
+            </div>
+            <div>
+                <div>{{incomeAndExpenditure.reduce((pre, cur)=> pre+cur.jy_money,0)}}</div>
+                <div>结余</div>
+            </div>
+        </div>
+    </div>
+    <div class="content-card" v-if="false">
+        <div class="content-card-top">
+            <div>
+                <span>收支一览</span>/元
+                <uni-data-select style="width:80px;border: none;flex: none;" :clear="false" v-model="incomeValue" :localdata="incomeRange" @change="generalChange"></uni-data-select>
+            </div>
+            <div>></div>
+        </div>
+        <div class="">
+            <LineCharts />
+        </div>
+    </div>
+    <div style="height:100px;">
+
+    </div>
+    <div style="width:100vw;height:var(--window-bottom);"></div>
+</view>
+</template>
+
+<script>
+import LineCharts from '../../components/echarts/line.vue';
+import {
+    getHotelList,
+    getRevPAR,
+    getTodayIncome,
+    getTodayTotalIncome,
+    getStaySource,
+    getRoomStatus,
+    getIncomeAndExpenditure
+} from '../../utils/api.js';
+import {
+    mapState
+} from 'vuex';
+export default {
+    components: {
+        LineCharts
+    },
+    data() {
+        return {
+            // value: 0,
+            range: [{
+                    value: 0,
+                    text: "全部"
+                },
+                {
+                    value: 1,
+                    text: "沙县大酒店"
+                },
+                {
+                    value: 2,
+                    text: "游泳"
+                },
+            ],
+            incomeRange: [{
+                    value: 1,
+                    text: "近七日"
+                },
+                {
+                    value: 2,
+                    text: "本月"
+                },
+                {
+                    value: 3,
+                    text: "近半年"
+                },
+                {
+                    value: 4,
+                    text: "本年度"
+                },
+            ],
+            incomeValue: 1,
+            tabbarList: [{
+                    name: '退房',
+                    icon: '../../static/alisvg/tuifang1.svg',
+                },
+                {
+                    name: '审核',
+                    icon: '../../static/alisvg/shenhe.svg',
+                },
+                {
+                    name: '客房服务',
+                    icon: '../../static/alisvg/wodekefu.svg',
+                },
+                {
+                    name: '预定',
+                    icon: '../../static/alisvg/yuding.svg',
+                },
+                {
+                    name: '记账本',
+                    icon: '../../static/alisvg/jizhangben.svg',
+                },
+                {
+                    name: '财务报表',
+                    icon: '../../static/alisvg/jurassic_report-caiwu.svg',
+                },
+                {
+                    name: '经营分析',
+                    icon: '../../static/alisvg/jingyingfenxi.svg',
+                },
+                {
+                    name: '客单',
+                    icon: '../../static/alisvg/24gf-building2.svg',
+                },
+                {
+                    name: 'POS消费',
+                    icon: '../../static/alisvg/24gl-cart4.svg',
+                },
+                {
+                    name: '更多',
+                    icon: '../../static/alisvg/gengduo.svg',
+                },
+                {
+                    name: '交接班',
+                    icon: '../../static/alisvg/qiehuan2.svg',
+                },
+                {
+                    name: '商品订单',
+                    icon: '../../static/alisvg/24gf-cart4.svg',
+                },
+                {
+                    name: '远期房态',
+                    icon: '../../static/alisvg/ico_jiudianguanli_yuanqifangtai.svg',
+                },
+                {
+                    name: '异动表',
+                    icon: '../../static/alisvg/24gf-bag.svg',
+                },
+                {
+                    name: '收支明细',
+                    icon: '../../static/alisvg/jurassic_report-caiwu.svg',
+                }
+            ],
+            RevPAR: 0,
+            hotelIds: 0,
+            // housingPrices: 0, //平均房价
+            todayIncome: [{
+                    name: '押金',
+                    amount: 0
+                },
+                {
+                    name: '房费',
+                    amount: 0
+                },
+                {
+                    name: '商品',
+                    amount: 0
+                }
+            ], //今日收入统计
+            todayTotalIncome: 0, //今日总收款
+            roomData: {
+                //房间总数
+                allRoomData: 0,
+                //入住总数
+                checkInRoomData: 0,
+                //平均房价
+                housingPrices: 0,
+                // 今日预离
+                todayLeaveRoomData: 0,
+                //今日预抵
+                todayArriveRoomData: 0,
+                //今日欠费
+                todayArrearsRoomData: 0,
+                //脏房
+                dirtyRoomData: 0,
+
+            },
+            //收款方式
+            paymentMethod: [{
+                    name: '现金',
+                    amount: 0
+                },
+                {
+                    name: '微信',
+                    amount: 0
+                },
+                {
+                    name: '支付宝',
+                    amount: 0
+                }
+            ],
+            //在住来源
+            staySource: [{
+                    name: '散客',
+                    count: 0
+                },
+                {
+                    name: '美团',
+                    count: 0
+                }
+            ],
+            //房态统计
+            roomStatus: [{
+                    name: '住净',
+                    count: 0
+                },
+                {
+                    name: '住脏',
+                    count: 0
+                },
+                {
+                    name: '空净',
+                    count: 0
+                },
+                {
+                    name: '空脏',
+                    count: 0
+                },
+                {
+                    name: '维修',
+                    count: 0
+                },
+            ],
+            //收支情况
+            incomeAndExpenditure: [],
+        };
+    },
+    computed: {
+        ...mapState({
+            hotelIdList: state => state.hotelIdList,
+            hotelId: state => state.hotelId
+        }),
+        IncomeAndExpenditure(){
+
+        }
+    },
+    watch: {
+        hotelIdList(newVal) {
+            console.log(newVal);
+            this.range = newVal.map(item => ({
+                value: item.id,
+                text: item.name
+            }))
+        }
+    },
+    async mounted() {
+        // this.onload()
+        await this.getHotel();
+        this.onload()
+
+    },
+    methods: {
+        //获取酒店数据
+        async getHotel() {
+            let data = await getHotelList()
+            if (data.code == 200) {
+                this.$nextTick(() => {
+                    this.$store.commit('setHotelIdList', data.result.records)
+                    this.hotelIds = data.result.records[0].id
+                    this.$store.commit('setHotelId', data.result.records[0].id)
+                })
+            }
+            return data
+        },
+        onload() {
+            let str = new Date().toLocaleDateString()
+            //后一天
+            let end = new Date(new Date().getTime() + 24 * 60 * 60 * 1000).toLocaleDateString()
+            str = str.replace(/\//g, '-')
+            end = end.replace(/\//g, '-')
+
+            // 房间数据统计
+            getRevPAR().then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    this.roomData.allRoomData = res.result[0]
+                    this.roomData.checkInRoomData = res.result[1]
+                    this.roomData.housingPrices = res.result[2]
+                    this.roomData.todayLeaveRoomData = res.result[3]
+                    this.roomData.todayArriveRoomData = res.result[4]
+                    this.roomData.todayArrearsRoomData = res.result[5]
+                    this.roomData.dirtyRoomData = res.result[6]
+                }
+            })
+
+            //今日收入统计
+            getTodayIncome().then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    console.log(res.result);
+                    this.todayIncome = res.result
+                } else {
+                    this.todayIncome = [{
+                            name: '押金',
+                            amount: 0
+                        },
+                        {
+                            name: '房费',
+                            amount: 0
+                        },
+                        {
+                            name: '商品',
+                            amount: 0
+                        }
+                    ]
+                }
+            })
+
+            //今日总收款
+            getTodayTotalIncome({
+                startTime: str,
+                endTime: end
+            }).then(res => {
+                if (res.code == 200 && res.result.records.length > 0) {
+                    let brr = []
+                    let data = res.result.records
+                    data.forEach(item => {
+                        let arr = []
+                        arr = Object.keys(item).filter(items => items != 'department' && items != 'hotel_name')
+                        brr = Object.keys(item).filter(items => items == '现金' || items == '微信' || items == '支付宝')
+                        console.log(arr);
+                        arr.forEach(ele => {
+                            this.todayTotalIncome += item[ele] * 1
+                        })
+                    })
+                    let obj = {}
+                    let copy = []
+                    brr.forEach((item, i) => {
+                        console.log(obj);
+                        copy.push({
+                            name: item,
+                            amount: data.reduce((pre, cur) => {
+                                return pre + cur[item]
+                            }, 0)
+                        })
+                    })
+                    this.paymentMethod = copy
+                    // console.log('2222222222', copy);
+                    // console.log(this.todayTotalIncome);
+                } else {
+                    this.todayTotalIncome = 0
+                }
+            })
+
+            //在住来源
+            getStaySource().then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    this.staySource = res.result
+                    // console.log('%cindex.vue line:463 this.staySource', 'color: white; background-color: #007acc;', this.staySource);
+                }
+            })
+
+            getRoomStatus().then(res => {
+                if (res.code == 200 && res.result.length > 0) {
+                    this.roomStatus = res.result
+                } else {
+                    this.roomStatus = [{
+                            name: '住净',
+                            count: 0
+                        },
+                        {
+                            name: '住脏',
+                            count: 0
+                        },
+                        {
+                            name: '空净',
+                            count: 0
+                        },
+                        {
+                            name: '空脏',
+                            count: 0
+                        },
+                        {
+                            name: '维修',
+                            count: 0
+                        },
+                    ]
+                }
+            })
+            this.getIncomeAndExpenditure(this.incomeValue)
+
+        },
+        /**
+         * 获取收支情况
+         */
+        getIncomeAndExpenditure(section){
+            getIncomeAndExpenditure({section:section}).then(res=>{
+                console.log(res);
+                if (res.code == 200) {
+                    this.incomeAndExpenditure = res.result
+                }
+            })
+        },
+        
+        change(e) {
+            console.log("e:", e);
+            this.hotelIds = e
+            this.$store.commit('setHotelId', e)
+            this.onload()
+        },
+        roomOrders(idx) {
+            uni.navigateTo({
+                url: `/pages/roomOrders/roomOrders?current=${idx}`
+            })
+        },
+        handleToPredetemine(idx) {
+            uni.navigateTo({
+                url: `/pages/predetermine/predetermine?current=${idx}`
+            })
+        },
+        handleToPage(e) {
+            console.log(e);
+            if (e.name == '远期房态') {
+                uni.navigateTo({
+                    url: '/components/longTermHousingStatus/longTermHousingStatus'
+                })
+            }
+            if (e.name == '客单') {
+                this.roomOrders(0)
+            }
+            if (e.name == '预定') {
+                this.handleToPredetemine(0)
+            }
+            if (e.name == '经营分析') {
+                uni.navigateTo({
+                    url: '/components/businessAnalysis/businessAnalysis'
+                })
+            }
+            if (e.name == '收支明细') {
+                uni.navigateTo({
+                    url: '/components/incomeDetail/incomeDetail'
+                })
+            }
+            if (e.name == '客房服务') {
+                uni.navigateTo({
+                    url: '/components/roomService/roomService'
+                })
+            }
+        },
+        handleToIncome(){
+            uni.navigateTo({
+                url: '/components/incomeDetail/incomeDetail'
+            })
+        },
+        handleToBusinessAnalysis(){
+            uni.navigateTo({
+                url: `/components/businessAnalysis/businessAnalysis?current=${1}`
+            })
+        },
+        toBusiness(){
+            uni.navigateTo({
+                url: `/components/businessAnalysis/businessAnalysis?current=${4}`
+            })
+        },
+        toRoomType(){
+            uni.switchTab({
+            	url:'/pages/roomStateDiagram/roomStateDiagram'
+            })
+        },
+        toIncomeDetail(){
+            uni.navigateTo({
+                url: '/components/incomeDetail/incomeDetail'
+            })
+        },
+        incomeChange(e) {
+            console.log("e:", e);
+            console.log(this.incomeValue);
+            // this.
+            this.getIncomeAndExpenditure(e)
+        },
+        generalChange(e) {
+            console.log("e:", e);
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+    width: 100%;
+    height: 100%;
+    background-color: #f5f5f5;
+    z-index: -20 !important;
+}
+
+.home-box {
+    // height: 200px;
+    // width: 200px;
+    background-color: rgb(0, 186, 173);
+    border-radius: 0 0 20% 20%;
+}
+
+.select-top {
+    // width: 100px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    /deep/.uni-select {
+        border: none !important;
+        text-align: center;
+    }
+
+    /deep/.uni-select__input-text {
+        color: #fff;
+    }
+}
+
+.card {
+    width: 80%;
+    height: 100px;
+    background-color: #fff;
+    border: 1px solid rgb(0, 186, 173);
+    margin: auto;
+    border-radius: 5px;
+    //阴影
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+    margin-top: 10px;
+    // padding: 10px;
+    display: flex;
+    flex-direction: column;
+}
+
+.card-data {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    flex: 1;
+
+    >div {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: space-between;
+        width: 25%;
+        height: 45px;
+    }
+}
+
+.grid-data {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-template-rows: repeat(2, 1fr);
+    grid-gap: 30px 10px;
+    color: #fff;
+}
+
+.grid-data>div {
+    /* background-color: #fff; */
+    /* border: 1px solid #eee; */
+    display: flex;
+    justify-content: space-between;
+    flex-direction: column;
+    align-items: center;
+    height: 50px;
+    font-size: 12px;
+}
+
+.grid-tabbar {
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+    grid-template-rows: repeat(3, 1fr);
+    gap: 10px;
+    margin-top: 20px;
+    background: #fff;
+}
+
+// .bgco {
+//     position: fixed;
+//     background-color: rgb(0, 186, 173);
+//     height: 250px;
+//     width: 100%;
+//     z-index: -1;
+//     top: 0;
+//     border-bottom-left-radius: 20%;
+//     border-bottom-right-radius: 20%;
+// }
+
+.notice {
+    border-top: 1px solid #00000040;
+    margin-top: 10px;
+    padding: 10px;
+    border-bottom: 1px solid #000;
+    background: #fff;
+}
+
+.content-card {
+    margin-top: 5px;
+    background: #fff;
+    border-bottom: 1px solid #000;
+
+    .content-card-top {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 10px;
+
+        // border-bottom: 1px solid #00000040;
+        div:nth-child(1) {
+            display: flex;
+            align-items: center;
+            // justify-content: center;
+            width: 200px;
+
+            span {
+                font-size: 18px;
+                font-weight: bold;
+            }
+        }
+
+        >div {
+            >span {
+                font-size: 18px;
+                font-weight: bold;
+            }
+        }
+    }
+
+    .content-card-btm {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        padding: 10px;
+        height: 45px;
+
+        >div {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: space-between;
+            height: 100%;
+
+            div:nth-child(2) {
+                font-size: 12px;
+            }
+        }
+    }
+}
+</style>

pages/login/login.vue

@@ -0,0 +1,86 @@
+<template>
+<div>
+    <form>
+        <label for="username">Username:</label>
+        <input type="text" id="username" v-model="username">
+        <label for="password">Password:</label>
+        <input type="password" id="password" v-model="password">
+        <button type="submit" @click.prevent="login">Login</button>
+    </form>
+</div>
+</template>
+
+<script>
+import {
+    login
+} from '@/utils/api.js'
+export default {
+    data() {
+        return {
+            username: '',
+            password: ''
+        }
+    },
+    methods: {
+        login() {
+            // perform login logic here
+			// uni.switchTab({
+			//     url: '/pages/index/index'
+			// })
+			// return
+            login({
+                username: this.username,
+                password: this.password
+            }).then(res => {
+                console.log(res)
+                if (res.code === 200) {
+                    this.$store.commit('setToken', res.result.token)
+                    uni.setStorageSync("token", res.result.token)
+                    uni.showToast({
+                        icon: 'none',   
+                        duration: 3000,
+                        title: `成功`
+                    });
+                    uni.switchTab({
+                        url: '/pages/index/index'
+                    })
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style>
+/* add any necessary styles here */
+form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top: 50px;
+}
+
+label {
+    margin-bottom: 10px;
+}
+
+input {
+    padding: 5px;
+    margin-bottom: 20px;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+}
+
+button {
+    padding: 10px 20px;
+    background-color: #4CAF50;
+    color: white;
+    border: none;
+    border-radius: 5px;
+    cursor: pointer;
+}
+
+button:hover {
+    background-color: #3e8e41;
+}
+</style>

pages/mine/mine.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    我的
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      
+    }
+  },
+  methods: {
+    
+  }
+}
+</script>
+
+<style>
+</style>

pages/predetermine/predetermine.vue

@@ -0,0 +1,97 @@
+<template>
+<view>
+	<Header @change="headerChange">
+		<template #search>
+            <u--input v-model="keyWord" placeholder="姓名/手机号" border="surround" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" fontSize="12px" :customStyle="{border:'1px solid #e2e2e2',padding:'0 10px',margin:'0 10px',borderRadius:'20px'}">
+            </u--input>
+        </template>
+        <template #section>
+            <u-subsection :list="list" mode="subsection" :current="current" @change="sectionChange"></u-subsection>
+        </template>
+	</Header>
+	<Allpredetermine :keyWord="keyWord" v-if="current==0" ref="allpredetermine" />
+	<ArrivalsDay :keyWord="keyWord" v-if="current==1" @changeList="selectArrivalsChange" />
+	<u-subsection v-if="arrivalsCur" style="margin-top:10px" :list="checkRoom" mode="subsection" :current="currentRoom" @change="roomChange"></u-subsection>
+	<div class="btn-add" v-else>
+		<div class="btn-add-left">返回</div>
+		<div class="btn-add-right">添加预定</div>
+	</div>
+</view>
+</template>
+
+<script>
+import Allpredetermine from '@/components/predetermineList/allPredetermine.vue'
+import Header from '@/components/header.vue'
+import ArrivalsDay from '../../components/predetermineList/arrivalsDay.vue'
+export default {
+	components: {
+		Header,
+		Allpredetermine,
+		ArrivalsDay
+	},
+    data() {
+        return {		
+			list: ['全部预定', '今日预抵', '预定未到', '远期房态', '今日已入住'],
+			checkRoom:['查看详情', '拨打电话','开单入住', '预排房间'],
+            current: 0,
+			currentRoom: 0,
+			arrivalsCur: false,
+			keyWord: ''
+        };
+    },
+	onLoad(options){
+		if (options.current) {
+			this.current = options.current
+		}
+	},
+	methods:{
+		sectionChange(i){
+			console.log(i)
+			this.current = i
+		},
+		roomChange(i){
+			console.log(i)
+			this.currentRoom = i
+		},
+		selectArrivalsChange(e){
+			console.log(e);
+			this.arrivalsCur = e
+		},
+		headerChange(e){
+			console.log(e)
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+page{
+	background-color: #f5f5f5;
+}
+.btn-add{
+	width: 100%;
+	height: 40px;
+	display: flex;
+	align-items: center;
+	border: 1px solid rgb(60, 156, 255);
+	border-radius: 5px;
+	overflow: hidden;
+	margin-top: 15px;
+}
+.btn-add-left{
+	width: 50%;
+	height: 100%;
+	background-color: #fff;
+	color: rgb(60, 156, 255);
+	text-align: center;
+	line-height: 40px;
+}
+.btn-add-right{
+	width: 50%;
+	height: 100%;
+	background-color: rgb(60, 156, 255);
+	color: #fff;
+	text-align: center;
+	line-height: 40px;
+}
+</style>

pages/roomDetail/roomDetail.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/roomOrders/roomOrders.vue

@@ -0,0 +1,395 @@
+<template>
+<view>
+    <Header @change="switchChange">
+        <template #search>
+            <u--input v-model="keyWord" @change="searchWord" placeholder="房间号/姓名/手机号" border="surround" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" fontSize="12px" :customStyle="{border:'1px solid #e2e2e2',padding:'0 10px',margin:'0 10px',borderRadius:'20px'}">
+            </u--input>
+        </template>
+        <template #section>
+            <u-subsection :list="list" mode="subsection" :current="current" @change="sectionChange"></u-subsection>
+        </template>
+    </Header>
+    <template>
+        <div class="card-day">
+            <div class="card-day-top">
+                <div style="font-size: 16px;color:#409EFF;font-weight: bold;">今日{{list[current]}}概览</div>
+                <div style="color:#409EFF;font-size:14px">
+                    <!-- 合计 <span>{{roomTypeCount.reduce((pre, cur)=> pre+cur.count,0 )}}</span> 间 -->
+                </div>
+            </div>
+            <div class="card-day-btm">
+                <div v-for="(item, index) in cesRoomLayoutList" :key="index">
+                    <div>
+                        {{item.name}} {{filterRoomType(item.id)}}间
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="day-detail">
+            <div class="day-detail-title">
+                今日{{list[current]}}概览
+            </div>
+            <div v-for="item in roomList" :key="item.id">
+                <template v-if="item.rooms.length>0">
+                    <div style="color:rgb(255, 141, 26);text-align:right;border-bottom:1px solid #00000030;line-height:30px">{{item.name}}：{{item.rooms.length}}间</div>
+                    <div v-for="(sItem, index) in item.rooms" :key="sItem.id" :style="{height:'60px',borderBottom:index!=item.rooms.length-1?'1px solid #00000030':'',}">
+                        <div style="margin-top:10px">
+                            <span style="font-size: 16px; font-weight: bold;margin-right:10px;">{{sItem.roomInfo.name}}</span> <span style="font-size: 16px; font-weight: bold;">{{sItem.layout.name }}</span> <span style="margin-left:10px;">{{''}}</span>
+                        </div>
+                        <div class="day-detail-list" v-if="sItem.livingData.livingOrder">
+                            <div style="width:35%;">{{sItem.livingData.livingCustomers.customerName}}/ {{sItem.livingData.livingCustomers.phone}}</div>
+                            <div>{{sItem.livingData.livingOrder.dayCount}}天/{{sItem.livingData.livingOrder.arrivalTime.substr(5,5)}}</div>
+                            <div>￥{{sItem.layout.marketPrice}}/付0/余0</div>
+                        </div>
+                    </div>
+                </template>
+
+            </div>
+        </div>
+    </template>
+    <div class="btm-subsection">
+        <u-subsection :list="list1" mode="subsection" :current="current1" @change="bottomChange"></u-subsection>
+    </div>
+    <div style="width:100vw;height: 30px;"></div>
+</view>
+</template>
+
+<script>
+import Header from '@/components/header.vue'
+import {
+    getHotelRoomList,
+    getCustomerSource,
+    getRoomType
+} from '../../utils/customerOrder'
+export default {
+    components: {
+        Header
+    },
+
+    data() {
+        return {
+            value: 0,
+            range: [{
+                    value: 0,
+                    text: "全部"
+                },
+                {
+                    value: 1,
+                    text: "沙县大酒店"
+                },
+                {
+                    value: 2,
+                    text: "游泳"
+                },
+            ],
+            roomStatus: 3,
+            list: ['全部', '预离', '续住', '欠费', '钟点', '散客', '团队', '联房'],
+            list1: ['查看详情', '缴费', '退房结账'],
+            current: 0,
+            current1: 0,
+            //酒店房子列表
+            roomList: [],
+            roomListCopy: [],
+            //房型数量
+            roomTypeCount: [],
+            /**
+             * 用户来源列表
+             */
+            customerSourceList: [],
+            /**
+             * 方块背景颜色列表
+             */
+            roomStatusColorList: [],
+            /**
+             * 房型列表
+             */
+            cesRoomLayoutList: [],
+            keyWord: '',
+        };
+    },
+    onLoad(options) {
+        console.log(options);
+        if (options.current) {
+            // this.sectionChange(options.current)
+            this.current = options.current
+            this.getData()
+        }
+        this.getData()
+    },
+    filters: {},
+    methods: {
+        getData() {
+            getHotelRoomList().then(res => {
+                console.log(res)
+                if (res.code == 200) {
+                    this.roomListCopy = res.result
+                    this.filter()
+                }
+            })
+            getCustomerSource().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.customerSourceList = res.result.records
+                } else {
+                    this.customerSourceList = []
+                }
+            })
+            getRoomType().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.cesRoomLayoutList = res.result.records
+                    this.current2 = res.result.records[0].id
+                } else {
+                    this.cesRoomLayoutList = []
+                }
+            })
+        },
+
+        searchWord(){
+            this.filter()
+        },
+
+        /**筛选符合条件的房子列表
+         * @param {Array} type 房子状态数组
+         */
+        filter(type = [3, 4]) {
+            console.log(type);
+            let arr = []
+            // arr = this.roomListCopy.filter(item => {
+            //     return item.rooms.filter(ele => {
+            //         return type.includes(ele.roomInfo.roomStatus)
+            //     })
+            // })
+            this.roomListCopy.forEach(item => {
+                item.rooms = item.rooms.filter(ele => {
+                    return type.includes(ele.roomInfo.roomStatus)
+                })
+            })
+            arr = JSON.parse(JSON.stringify(this.roomListCopy))
+            console.log(typeof this.keyWord);
+            if (this.keyWord) {
+                arr.forEach(item => {
+                    item.rooms = item.rooms.filter(ele => {
+                        return ele.roomInfo.name == this.keyWord ||
+                            (ele.livingData && ele.livingData.livingCustomers ?
+                                ele.livingData.livingCustomers.customerName == this.keyWord :
+                                ele.bookingData && ele.bookingData.bookingCustomer ?
+                                ele.bookingData.bookingCustomer.name == this.keyWord :
+                                false) ||
+                            (ele.livingData && ele.livingData.livingCustomers ?
+                                ele.livingData.livingCustomers.phone == this.keyWord :
+                                ele.bookingData && ele.bookingData.bookingCustomer ?
+                                ele.bookingData.bookingCustomer.phone == this.keyWord :
+                                false)
+                    })
+                })
+            }
+            console.log('arrarrarrarr', arr);
+            this.roomList = JSON.parse(JSON.stringify(arr))
+            console.log(this.roomList);
+            if (this.roomList.length == 0) {
+                return
+            }
+            let nameList = []
+            this.roomList.forEach(ele => {
+                ele.rooms.forEach(item => {
+                    nameList.push(item.layout.name)
+                })
+            })
+            this.roomTypeCount = this.count(nameList)
+            console.log(this.roomTypeCount);
+            if (this.current == 1) {
+                nameList = []
+                this.roomList = this.filterLeave(this.roomList)
+            }
+            return arr
+        },
+        /**
+         * 根据id计算每种房型的数量
+         */
+        filterRoomType(id) {
+            let arr = JSON.parse(JSON.stringify(this.roomList))
+            arr.forEach(item => {
+                // console.log(item);
+                item.rooms = item.rooms.filter(ele => {
+                    return ele.layout.id == id
+                })
+            })
+            let count = 0
+            arr.forEach(ele => {
+                count += ele.rooms.length
+            })
+            return count
+        },
+        /**统计数组中每个字符串出现的次数
+         * @param {Array} arr 要统计的数组
+         * @returns {Array}
+         */
+        count(arr) {
+            let obj = {}
+            let array = []
+            arr.forEach(ele => {
+                if (obj[ele]) {
+                    obj[ele]++
+                } else {
+                    obj[ele] = 1
+                }
+            })
+            Object.keys(obj).forEach(ele => {
+                array.push({
+                    name: ele,
+                    count: obj[ele]
+                })
+            })
+            return array
+        },
+
+        /**
+         * 筛选预离状态的房间
+         * @param {Array} arr 房间列表
+         * @returns {Array}
+         */
+        filterLeave(arr) {
+            if (!arr) {
+                return
+            }
+            let array = JSON.parse(JSON.stringify(arr))
+            array.forEach(ele => {
+                ele.rooms = ele.rooms.filter(item => {
+                    //比较时间
+                    return item.livingData.livingOrder.dueOutTime == item.livingData.livingOrder.arrivalTime
+                })
+            })
+            return array
+        },
+
+        rightClick() {
+            console.log('rightClick')
+        },
+        leftClick() {
+            console.log('leftClick')
+        },
+        change(e) {
+            console.log(e)
+        },
+        // 切换分段器
+        sectionChange(index) {
+            console.log(index)
+            this.current = index
+            if (index == 0) {
+                this.filter()
+            }
+            if (index == 1) {
+                let arr = this.filter()
+                this.roomList = this.filterLeave(arr || [])
+                console.log('1111111111111111111', this.roomList);
+                if (this.roomList.some(ele => ele.rooms.length == 0) || this.roomList.length == 0) {
+                    // debugger
+                    this.roomTypeCount = [{
+                            name: '高级商务标间',
+                            count: 0
+                        },
+                        {
+                            name: '麻将房',
+                            count: 0
+                        },
+                        {
+                            name: '零压高级大床房',
+                            count: 0
+                        },
+                        {
+                            name: '商务单人房',
+                            count: 0
+                        },
+                        {
+                            name: '特惠大床房',
+                            count: 0
+                        },
+                    ]
+                    return
+                }
+                let nameList = []
+                this.roomList.forEach(ele => {
+                    ele.rooms.forEach(item => {
+                        nameList.push(item.layout.name)
+                    })
+                })
+                this.roomTypeCount = this.count(this.roomList)
+            }
+        },
+        bottomChange(index) {
+            console.log(index)
+            this.current1 = index
+        },
+        switchChange() {
+            this.$nextTick(() => {
+                this.getData()
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.uni-select {
+    border: none !important;
+    text-align: center;
+}
+
+page {
+    background-color: #f5f5f5;
+}
+
+.card-day {
+    padding: 10px;
+    background: #fff;
+    margin-top: 8px;
+    border-bottom: #00000030 1px solid;
+}
+
+.card-day-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: #00000030 1px solid;
+    height: 30px;
+}
+
+.card-day-btm {
+    margin-top: 10px;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    justify-content: space-between;
+    gap: 10px;
+
+    // div为偶数时右对齐
+    div:nth-child(even) {
+        text-align: right;
+    }
+}
+
+.day-detail {
+    background: #fff;
+    padding: 10px;
+    margin-top: 8px;
+
+    .day-detail-title {
+        font-weight: bold;
+        font-size: 16px;
+        color: #409EFF;
+    }
+}
+
+.day-detail-list {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 30px;
+    font-size: 14px;
+}
+
+.btm-subsection {
+    margin-top: 10px;
+}
+</style>

pages/roomStateDiagram/roomStateDiagram.vue

@@ -0,0 +1,322 @@
+<template>
+<view>
+    <Header @change="headerChange" :isSwitch="true">
+        <template #search>
+            <!-- <u--input placeholder="房间号/姓名/手机号/身份证号" border="surround" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" fontSize="12px" :customStyle="{border:'1px solid #e2e2e2',padding:'0 10px',margin:'0 10px',borderRadius:'20px'}" @change="searchChange"></u--input> -->
+        </template>
+        <template #section>
+            <u-subsection :list="list" mode="subsection" :current="current" @change="sectionChange"></u-subsection>
+        </template>
+    </Header>
+    <div style="background:#fff">
+        <div class="room-state-explain">
+            <div style="margin-right:8px">房态说明</div>
+            <div v-for="(item, index) in roomStatusColorList" :key="index" style="margin-right:8px">
+                <div :style="{width:'15px',height:'10px',background:item.extend}"></div>{{item.text}}:{{roomStateFilter(item.value)}}
+            </div>
+        </div>
+        <div style="width:50%;margin-bottom:10px">
+            <u-subsection :bold="false" :list="list1" mode="subsection" :current="current1" @change="selectChange"></u-subsection>
+        </div>
+        <div v-if="current1==1">
+            <!-- <u-subsection :list="list2" mode="subsection" :current="current2" @change="selectChangeRoomState" fontSize="10"></u-subsection> -->
+            <div class="tabs-list">
+                <div v-for="(item, index) in cesRoomLayoutList" :key="item.id" class="tabs-list-content" :class="{'tabs-list-border':index!=list2.length-1}" @click="selectChangeRoomModel(item,index)" :style="{background:item.id==current2?'rgb(60, 156, 255)':'',color:item.id==current2?'#fff':''}">{{item.name}}</div>
+            </div>
+        </div>
+        <div v-if="current1==2">
+            <u-subsection :bold="false" :list="list3" mode="subsection" :current="current3" @change="selectChangeRoomState" fontSize="10"></u-subsection>
+        </div>
+        <div style="margin-top:10px">
+            <div class="room-state-detail" v-for="item in dataList" :key="item.id">
+                <div class="room-state-detail-title">{{item.name.includes('栋')? item.name : item.buildingName + item.name}}：{{item.rooms.length}}间</div>
+                <div class="room-state-detail-grid">
+                    <div class="room-state-detail-card" v-for="sItem in item.rooms" :key="sItem.id" :style="{background: roomStatusColorList && roomStatusColorList.length > 0 ? getRoomStatusColor(sItem.roomInfo.roomStatus) : '',}">
+                        <div style="display:flex;justify-content: space-between;">
+                            <div><b>{{sItem.roomInfo.name}}</b></div>
+                            <div v-if="sItem.livingData.livingOrder" style="background:rgb(255, 141, 26);color:#fff;padding:1px 2px;border-radius:5px;">{{getCustomerSourceList(sItem.livingData.livingOrder.customerSource)}}</div>
+                        </div>
+                        <div v-if="sItem.livingData.livingOrder">
+                            <div style="width:100%;overflow: hidden;"><b>{{sItem.livingData.livingCustomers.customerName}}</b><span v-if="sItem.livingData.livingOrder.vipCustomerId" style="color:red; font-size: 12px;transform: scale(0.6);display:inline-block;">VIP</span></div>
+                            <div>{{sItem.livingData.livingOrder.dayCount}}天/{{ sItem.livingData.livingOrder.arrivalTime }}</div>
+                            <div style="width:100%;overflow: hidden;">￥{{sItem.livingData.price && sItem.livingData.price.length > 0  ? sItem.livingData.price[0].price : 0 }}/剩0</div>
+                        </div>
+                        <b v-else>
+                            {{sItem.layout.name}}
+                        </b>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</view>
+</template>
+
+<script>
+import Header from '@/components/header.vue'
+import {
+    getHotelRoomList,
+    getRoomStatus,
+    getCustomerSource,
+    getRoomType
+} from '../../utils/customerOrder'
+export default {
+    components: {
+        Header
+    },
+    data() {
+        return {
+            list: ['全部', '在住', '预离', '欠费', '钟点', '团队', '散客', '联房', '脏房'],
+            list1: ['按楼层', '按房型', '按房态'],
+            list2: [],
+            list3: [],
+            current: 0,
+            current1: 0,
+            current2: 0,
+            current3: 0,
+            dataList: [],
+            dataListCopy: [],
+            /**
+             * 用户来源列表
+             */
+            customerSourceList: [],
+            /**
+             * 方块背景颜色列表
+             */
+            roomStatusColorList: [],
+            /**
+             * 房型列表
+             */
+            cesRoomLayoutList: [],
+        }
+    },
+    mounted() {
+        this.getData()
+    },
+    methods: {
+        sectionChange(i) {
+            console.log(i)
+            this.current = i
+        },
+        searchChange(e) {
+            console.log(e)
+        },
+        selectChange(e) {
+            console.log(e)
+            this.current1 = e
+            this.filter()
+        },
+        selectChangeRoomModel(data, idx) {
+            console.log(data)
+            this.current2 = data.id
+            this.filter()
+        },
+        selectChangeRoomState(e) {
+            console.log(e)
+            this.current3 = e
+            this.filter()
+        },
+        randomColor() {
+            const color = Math.floor(Math.random() * 0xffffff).toString(16).padEnd(6, '0');
+            return `#${color}`;
+        },
+        headerChange(e) {
+            this.getData(e)
+        },
+        getData(id) {
+            getHotelRoomList({hotelId:id}).then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.length > 0) {
+                    this.dataListCopy = res.result
+                    this.dataList = res.result
+                }else{
+                    this.dataListCopy = []
+                    this.dataList = []
+                }
+            })
+            getRoomStatus().then(res => {
+                console.log(res);
+                if (res.code == 200 && res.result.length > 0) {
+                    let arr = []
+                    res.result.forEach(ele => {
+                        arr.push(ele.text)
+                    })
+                    this.roomStatusColorList = res.result
+                    this.list3 = arr
+                    this.list3.unshift('全部')
+                }else{
+                    this.roomStatusColorList = []
+                    this.list3 = []
+                }
+            })
+            getCustomerSource().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.customerSourceList = res.result.records
+                    console.log(this.current2);
+                }else{
+                    this.customerSourceList = []
+                }
+            })
+            getRoomType().then(res => {
+                console.log(res);
+                if (res.code === 200 && res.result.records.length > 0) {
+                    this.cesRoomLayoutList = res.result.records
+                    this.current2 = res.result.records[0].id
+                }else{
+                    this.cesRoomLayoutList = []
+                }
+            })
+        },
+        /**
+         * @description: 筛选
+         * @param
+         * @return
+         */
+        filter() {
+            console.log('this.current1', this.current1);
+            console.log('this.current3', this.current3);
+            let arr = JSON.parse(JSON.stringify(this.dataListCopy))
+            console.log('...............');
+            arr.forEach(item => {
+                this.current3 == 0 ? item.rooms = item.rooms :
+                item.rooms = item.rooms.filter(ele => {
+                    return ele.roomInfo.roomStatus == this.current3
+                })
+            })
+            if (this.current2 && this.current1 == 1) {
+                arr.forEach(item => {
+                    item.rooms = item.rooms.filter(ele => {
+                        return ele.layout.id == this.current2
+                    })
+                })
+            }
+            console.log('arrarrarrarr', arr);
+            this.dataList = JSON.parse(JSON.stringify(arr))
+            // console.log(this.roomList);
+            // if (this.roomList.length == 0) {
+            //     return
+            // }
+            // let nameList = []
+            // this.roomList.forEach(ele => {
+            //     ele.rooms.forEach(item => {
+            //         nameList.push(item.layout.name)
+            //     })
+            // })
+            // this.roomTypeCount = this.count(nameList)
+            // console.log(this.roomTypeCount);
+            return arr
+        },
+        getCustomerSourceList(customerSource, first) {
+            console.log(customerSource);
+            var find = this.customerSourceList.find((t) => t.id == customerSource);
+            console.log(find);
+            console.log(this.customerSourceList);
+            if (find) {
+                // return first ? find.label.substr(0, 1) : find.label;
+                return find.itemText.substr(0, 1);
+            }
+            return "";
+        },
+        /**
+         * 计算方块的背景颜色
+         */
+        getRoomStatusColor(roomStatus) {
+            var find = this.roomStatusColorList.find((t) => t.value == roomStatus);
+            return find ? find.extend : "";
+        },
+        /**
+         * 计算房态出现的数量
+         */
+        roomStateFilter(roomStatus) {
+            let count = 0
+            let arr = JSON.parse(JSON.stringify(this.dataListCopy))
+            arr.forEach(ele => {
+                ele.rooms.forEach(item => {
+                    if (item.roomInfo.roomStatus == roomStatus) {
+                        count++
+                    }
+                })
+            })
+            return count
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+page {
+    background-color: #f5f5f5;
+}
+
+.room-state-explain {
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 10px;
+    font-size: 12px;
+    height: 30px;
+    margin-top: 10px;
+    flex-wrap: wrap;
+
+    div {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        // width: 20%;
+        // height: 30px;
+        // border-radius: 5px;
+        // background-color: #fff;
+    }
+}
+
+.room-state-detail-title {
+    font-size: 14px;
+    color: #00000080;
+    padding: 0 8px;
+    text-align: right;
+    border-bottom: 1px solid #00000030;
+}
+
+.room-state-detail-grid {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    grid-gap: 10px;
+    padding: 10px;
+}
+
+.room-state-detail-card {
+    width: 30vw;
+    height: 30vw;
+    font-size: 12px;
+    border-radius: 8px;
+    // background: red;
+    color: #fff;
+    padding: 5px 5px;
+    box-sizing: border-box;
+    //阴影
+    box-shadow: 0 4px 5px rgba(0, 0, 0, 0.6);
+}
+
+.tabs-list {
+    display: flex;
+    flex-wrap: nowrap;
+    font-size: 12px;
+    border-radius: 3px;
+    // overflow: hidden;
+    border: 1px solid rgb(60, 156, 255);
+
+    .tabs-list-content {
+        text-align: center;
+        padding: 5px 7px;
+        flex: 1;
+        // text-overflow: ellipsis;
+        white-space: nowrap;
+        // overflow: hidden;
+    }
+
+    .tabs-list-border {
+        border-right: 1px solid rgb(60, 156, 255);
+    }
+}
+</style>

store/index.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+    state: {
+        token: '',
+        hotelIdList:[],
+        hotelId: ''
+    },
+    mutations: {
+        setToken(state, token) {
+            state.token = token
+        },
+        setHotelIdList(state, hotelIdList) {
+            state.hotelIdList = hotelIdList
+        },
+        setHotelId(state, hotelId) {
+            state.hotelId = hotelId
+        }
+    },
+    actions: {
+        
+    },
+    getters: {
+        
+    }
+})
+export default store

uni.scss

@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+@import "@/uni_modules/uview-ui/theme.scss";
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16;
+
+/* 图片尺寸 */
+$uni-img-size-sm:20px;
+$uni-img-size-base:26px;
+$uni-img-size-lg:40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:20px;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:26px;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:15px;

uni_modules/qiun-data-charts/changelog.md

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

uni_modules/qiun-data-charts/license.md

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

uni_modules/qiun-data-charts/package.json

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

uni_modules/uni-data-select/changelog.md

@@ -0,0 +1,33 @@
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化

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

@@ -0,0 +1,502 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons v-if="current && clear && !disabled" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
+					<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom(){
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			debounce(fn, time = 100){
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query(){
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange(){
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+          if (defValue || defValue === 0) {
+					  this.emit(defValue)
+          }
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData(){
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey(){
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		cursor: pointer;
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>

uni_modules/uni-data-select/package.json

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

uni_modules/uni-data-select/readme.md

@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-datetime-picker/changelog.md

@@ -0,0 +1,133 @@
+## 2.2.22（2023-03-30）
+- 修复 日历 picker 修改年月后，自动选中当月1日 [详情](https://ask.dcloud.net.cn/question/165937)
+- 修复 小程序端 低版本 ios NaN [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.21（2023-02-20）
+- 修复 firefox 浏览器显示区域点击无法拉起日历弹框的Bug [详情](https://ask.dcloud.net.cn/question/163362)
+## 2.2.20（2023-02-17）
+- 优化 值为空依然选中当天问题
+- 优化 提供 default-value 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行问题
+## 2.2.19（2023-02-09）
+- 修复 2.2.18 引起范围选择配置 end 选择无效的Bug [详情](https://github.com/dcloudio/uni-ui/issues/686)
+## 2.2.18（2023-02-08）
+- 修复 移动端范围选择change事件触发异常的Bug [详情](https://github.com/dcloudio/uni-ui/issues/684)
+- 优化 PC端输入日期格式错误时返回当前日期时间
+- 优化 PC端输入日期时间超出 start、end 限制的Bug
+- 优化 移动端日期时间范围用法时间展示不完整问题
+## 2.2.17（2023-02-04）
+- 修复 小程序端绑定 Date 类型报错的Bug [详情](https://github.com/dcloudio/uni-ui/issues/679)
+- 修复 vue3 time-picker 无法显示绑定时分秒的Bug
+## 2.2.16（2023-02-02）
+- 修复 字节小程序报错的Bug
+## 2.2.15（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 2.2.14（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/162033)
+## 2.2.13（2023-01-10）
+- 修复 多次加载组件造成内存占用的Bug
+## 2.2.12（2022-12-01）
+- 修复 vue3 下 i18n 国际化初始值不正确的Bug
+## 2.2.11（2022-09-19）
+- 修复 支付宝小程序样式错乱的Bug [详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复 反向选择日期范围，日期显示异常的Bug [详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的Bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的Bug [详情](https://ask.dcloud.net.cn/question/140824)
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化的Bug
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的Bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的Bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的Bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的Bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源 [详情](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移 [https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的Bug
+- 修复 单选赋默认值时，赋值日期未高亮的Bug
+- 修复 赋默认值时，移动端未正确显示时间的Bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的Bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的Bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的Bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的Bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的Bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的Bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的Bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的Bug
+- 修复 start 和 end 不能动态赋值的Bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的Bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的Bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的Bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的Bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的Bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的Bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的Bug
+- 修复 chang事件触发2次的Bug
+- 修复 分、秒 end 范围错误的Bug
+- 优化 更好的 nvue 适配

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

@@ -0,0 +1,177 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: darken($color: $uni-primary, $amount: 40%);
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--today {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>

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

@@ -0,0 +1,928 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="maskClick"></view>
+
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('pre')">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
+				</picker>
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('next')">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+
+				<view v-if="!insert" class="dialog-close" @click="close">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
+							:selected="selected" :checkHover="range" @change="choiceDate"
+							@handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="!insert && !range && hasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="timepickerStartTime" :end="timepickerEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && hasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="timepickerStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="timepickerEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<view class="uni-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { Calendar, getDate, getTime } from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const { t } = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+      startPlaceholder: {
+        type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			hasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			},
+      defaultValue: {
+        type: [String, Object, Array],
+        default: ''
+      }
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: {},
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setStartDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+              // 字节小程序 watch 早于 created
+              if(!this.cale){
+                return
+              }
+
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left' && before) {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else if(after) {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				return activeDate === this.startDate ? this.selectableTimes.start : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				return activeDate === this.endDate ? this.selectableTimes.end : ''
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.init(this.date)
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+			// 蒙版点击事件
+			maskClick() {
+        this.close()
+				this.$emit('maskClose')
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate(new Date())
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+        // 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setDate(date || new Date())
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+        this.calendar = {...this.nowDate}
+        if(!date){
+          // 优化date为空默认不选中今天
+          this.calendar.fullDate = ''
+          if(this.defaultValue && !this.range){
+            // 暂时只支持移动端非范围选择
+            const defaultDate = new Date(this.defaultValue)
+            const fullDate = getDate(defaultDate)
+            const year = defaultDate.getFullYear()
+            const month = defaultDate.getMonth()+1
+            const date = defaultDate.getDate()
+            const day = defaultDate.getDay()
+            this.calendar = {
+              fullDate,
+              year,
+              month,
+              date,
+              day
+            },
+            this.tempSingleDate = fullDate
+            this.time = getTime(defaultDate, this.hideSecond)
+          }
+        }
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+        if(!this.range){
+					if(!this.calendar.fullDate){
+					  this.calendar = this.cale.getInfo(new Date())
+					  this.tempSingleDate = this.calendar.fullDate
+					}
+					if(this.hasTime && !this.time) {
+					  this.time = getTime(new Date(), this.hideSecond)
+					}
+				}
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
+				this.change()
+			},
+      changeMonth(type) {
+        let newDate
+        if(type === 'pre') {
+          newDate = this.cale.getPreMonthObj(this.nowDate.fullDate).fullDate
+        } else if(type === 'next') {
+          newDate = this.cale.getNextMonthObj(this.nowDate.fullDate).fullDate
+        }
+
+        this.setDate(newDate)
+				this.monthSwitch()
+      },
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: $uni-primary;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+    display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+    color: #999;
+		line-height: 50px;
+    /* #ifdef MP-TOUTIAO */
+    font-size: 16px;
+    /* #endif */
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: $uni-primary;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 2px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json

@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select date and time",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN",
+	"uni-calender.confirm": "confirm"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js

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

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json

@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六",
+	"uni-calender.confirm": "确认"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json

@@ -0,0 +1,22 @@
+{
+  "uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.year": "年",
+  "uni-datetime-picker.month": "月",
+  "uni-calender.SUN": "日",
+  "uni-calender.MON": "一",
+  "uni-calender.TUE": "二",
+  "uni-calender.WED": "三",
+  "uni-calender.THU": "四",
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue

@@ -0,0 +1,934 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+  import { fixIosDateFormat } from './util'
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+          if (newVal) {
+            this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+            this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+        handler(newVal) {
+          if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'start')
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'end')
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value)) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point)) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = fixIosDateFormat(this.time)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: $uni-primary;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+		line-height: 50px
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js

@@ -0,0 +1,403 @@
+class Calendar {
+	constructor({
+		selected,
+		startDate,
+		endDate,
+		range,
+	} = {}) {
+		// 当前日期
+		this.date = this.getDateObj(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 起始时间
+		this.startDate = startDate
+		// 终止时间
+		this.endDate = endDate
+    // 是否范围选择
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		const selectDate = this.getDateObj(date)
+		this.getWeeks(selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	setStartDate(startDate) {
+		this.startDate = startDate
+	}
+
+	setEndDate(endDate) {
+		this.endDate = endDate
+	}
+
+  getPreMonthObj(date){
+    date = fixIosDateFormat(date)
+    date = new Date(date)
+
+    const oldMonth = date.getMonth()
+    date.setMonth(oldMonth - 1)
+    const newMonth = date.getMonth()
+    if(oldMonth !== 0 && newMonth - oldMonth === 0){
+      date.setMonth(newMonth - 1)
+    }
+    return this.getDateObj(date)
+  }
+  getNextMonthObj(date){
+    date = fixIosDateFormat(date)
+    date = new Date(date)
+
+    const oldMonth = date.getMonth()
+    date.setMonth(oldMonth + 1)
+    const newMonth = date.getMonth()
+    if(newMonth - oldMonth > 1){
+      date.setMonth(newMonth - 1)
+    }
+    return this.getDateObj(date)
+  }
+
+	/**
+	 * 获取指定格式Date对象
+	 */
+	getDateObj(date) {
+    date = fixIosDateFormat(date)
+    date = new Date(date)
+
+		return {
+			fullDate: getDate(date),
+      year: date.getFullYear(),
+      month: addZero(date.getMonth() + 1),
+      date: addZero(date.getDate()),
+      day: date.getDay()
+		}
+	}
+
+	/**
+	 * 获取上一个月日期集合
+	 */
+	getPreMonthDays(amount, dateObj) {
+		const result = []
+		for (let i = amount - 1; i >= 0; i--) {
+      const month = dateObj.month - 1
+			result.push({
+				date: new Date(dateObj.year, month, -i).getDate(),
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取本月日期集合
+	 */
+	getCurrentMonthDays(amount, dateObj) {
+		const result = []
+		const fullDate = this.date.fullDate
+		for (let i = 1; i <= amount; i++) {
+			const currentDate = `${dateObj.year}-${dateObj.month}-${addZero(i)}`
+			const isToday = fullDate === currentDate
+			// 获取打点信息
+			const info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(currentDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				disableBefore = dateCompare(this.startDate, currentDate)
+			}
+
+			if (this.endDate) {
+				disableAfter = dateCompare(currentDate, this.endDate)
+			}
+
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+        multiplesStatus = multiples.findIndex((item) => {
+          return this.dateEqual(item, currentDate)
+        })
+			}
+      const checked = multiplesStatus !== -1
+
+			result.push({
+				fullDate: currentDate,
+				year: dateObj.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: dateObj.month,
+				disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(currentDate,this.endDate)),
+				isToday,
+				userChecked: false,
+        extraInfo: info
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取下一个月日期集合
+	 */
+	_getNextMonthDays(amount, dateObj) {
+		const result = []
+    const month = dateObj.month + 1
+		for (let i = 1; i <= amount; i++) {
+			result.push({
+				date: i,
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+
+		return this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		before = new Date(fixIosDateFormat(before))
+		after = new Date(fixIosDateFormat(after))
+		return before.valueOf() === after.valueOf()
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDate, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDate)
+	}
+
+	isLogicAfter(currentDate, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDate)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDateObj(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+    if (!this.range) return
+
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+    if (!this.range || this.lastHover) return
+
+		const { before } = this.multipleStatus
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this.getWeeks(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this.getWeeks(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	getWeeks(dateData) {
+		const {
+			year,
+			month,
+		} = this.getDateObj(dateData)
+
+		const preMonthDayAmount = new Date(year, month - 1, 1).getDay()
+    const preMonthDays = this.getPreMonthDays(preMonthDayAmount, this.getDateObj(dateData))
+
+		const currentMonthDayAmount = new Date(year, month, 0).getDate()
+    const currentMonthDays = this.getCurrentMonthDays(currentMonthDayAmount, this.getDateObj(dateData))
+
+    const nextMonthDayAmount = 42 - preMonthDayAmount - currentMonthDayAmount
+    const nextMonthDays = this._getNextMonthDays(nextMonthDayAmount, this.getDateObj(dateData))
+
+		const calendarDays = [...preMonthDays, ...currentMonthDays, ...nextMonthDays]
+
+		const weeks = new Array(6)
+		for (let i = 0; i < calendarDays.length; i++) {
+      const index = Math.floor(i / 7)
+      if(!weeks[index]){
+        weeks[index] = new Array(7)
+      }
+			weeks[index][i % 7] = calendarDays[i]
+		}
+
+		this.calendar = calendarDays
+		this.weeks = weeks
+	}
+}
+
+function getDateTime(date, hideSecond){
+  return `${getDate(date)} ${getTime(date, hideSecond)}`
+}
+
+function getDate(date) {
+  date = fixIosDateFormat(date)
+  date = new Date(date)
+  const year = date.getFullYear()
+  const month = date.getMonth()+1
+  const day = date.getDate()
+  return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function getTime(date, hideSecond){
+  date = fixIosDateFormat(date)
+  date = new Date(date)
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+  return hideSecond ? `${addZero(hour)}:${addZero(minute)}` : `${addZero(hour)}:${addZero(minute)}:${addZero(second)}`
+}
+
+function addZero(num) {
+  if(num < 10){
+    num = `0${num}`
+  }
+  return num
+}
+
+function getDefaultSecond(hideSecond) {
+  return hideSecond ? '00:00' : '00:00:00'
+}
+
+function dateCompare(startDate, endDate) {
+  startDate = new Date(fixIosDateFormat(startDate))
+  endDate = new Date(fixIosDateFormat(endDate))
+  return startDate <= endDate
+}
+
+function checkDate(date){
+  const dateReg = /((19|20)\d{2})(-|\/)\d{1,2}(-|\/)\d{1,2}/g
+  return date.match(dateReg)
+}
+
+const dateTimeReg = /^\d{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])( [0-5][0-9]:[0-5][0-9]:[0-5][0-9])?$/
+function fixIosDateFormat(value) {
+  if (typeof value === 'string' && dateTimeReg.test(value)) {
+    value = value.replace(/-/g, '/')
+  }
+  return value
+}
+
+export {Calendar, getDateTime, getDate, getTime, addZero, getDefaultSecond, dateCompare, checkDate, fixIosDateFormat}

uni_modules/uni-datetime-picker/package.json

@@ -0,0 +1,87 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.22",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-datetime-picker/readme.md

@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-icons/changelog.md

@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					return unescape(`%u${code.unicode}`)
+				}
+				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>

uni_modules/uni-icons/components/uni-icons/uniicons.css

@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}

uni_modules/uni-icons/package.json

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

uni_modules/uni-icons/readme.md

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

uni_modules/uni-load-more/changelog.md

@@ -0,0 +1,19 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范

uni_modules/uni-load-more/components/uni-load-more/i18n/en.json

@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}

uni_modules/uni-load-more/components/uni-load-more/i18n/index.js

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

uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json

@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}

uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json

@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}

uni_modules/uni-load-more/package.json

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