diff --git a/monitorMobile/components/cell.vue b/monitorMobile/components/cell.vue new file mode 100644 index 0000000..96b18e4 --- /dev/null +++ b/monitorMobile/components/cell.vue @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/monitorMobile/components/selectRadio.vue b/monitorMobile/components/selectRadio.vue new file mode 100644 index 0000000..27b5ba4 --- /dev/null +++ b/monitorMobile/components/selectRadio.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/monitorMobile/components/selectSearch.vue b/monitorMobile/components/selectSearch.vue new file mode 100644 index 0000000..de2c78b --- /dev/null +++ b/monitorMobile/components/selectSearch.vue @@ -0,0 +1,123 @@ + + + + + \ No newline at end of file diff --git a/monitorMobile/pages.json b/monitorMobile/pages.json index 886cdf6..c453af5 100644 --- a/monitorMobile/pages.json +++ b/monitorMobile/pages.json @@ -47,9 +47,27 @@ { "path": "pages/attendanceCall/index", "style": { - "navigationBarTitleText": "考勤点名" + "navigationBarTitleText": "考勤点名", + "enablePullDownRefresh": true } }, + // 归寝 + { + "path" : "pages/attendanceCall/returnBed/detail", + "style" : + { + "navigationBarTitleText": "查看详情", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/attendanceCall/returnBed/comfirm", + "style" : + { + "navigationBarTitleText": "归寝确认", + "enablePullDownRefresh": false + } + }, // { // "path": "pages/attendanceCall/rollCall/index", // "style": { @@ -82,7 +100,7 @@ "navigationBarTitleText": "我的" } } - ], + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "校园监控预警平台", diff --git a/monitorMobile/pages/attendanceCall/index.vue b/monitorMobile/pages/attendanceCall/index.vue index b34f987..7db2a7c 100644 --- a/monitorMobile/pages/attendanceCall/index.vue +++ b/monitorMobile/pages/attendanceCall/index.vue @@ -4,7 +4,7 @@ color: '#000000', }" itemStyle="height:84rpx;width:33.33%;box-sizing:border-box;background:#fff;border-top:1rpx solid rgba(0,0,0,0.03)"> - + @@ -39,6 +39,11 @@ tabsClick(item) { this.componentName = item.value } + }, + + onPullDownRefresh(){ + this.$refs['pageComponent'].pullDownRefresh() + uni.stopPullDownRefresh() } } diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/detail.vue b/monitorMobile/pages/attendanceCall/passengerFlow/detail.vue new file mode 100644 index 0000000..1462420 --- /dev/null +++ b/monitorMobile/pages/attendanceCall/passengerFlow/detail.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/index.vue b/monitorMobile/pages/attendanceCall/passengerFlow/index.vue index bd97c98..5ed8c1e 100644 --- a/monitorMobile/pages/attendanceCall/passengerFlow/index.vue +++ b/monitorMobile/pages/attendanceCall/passengerFlow/index.vue @@ -1,6 +1,36 @@ @@ -8,15 +38,106 @@ export default { data() { return { - + list: [{}, {}, {}, {}, {}, {}, {}, {}, {}, ], + isLoading: false, + status: 'loadmore', //loading正在加载 loadmore加载更多 nomore没有更多了 + search: { + loudong: 1, + qinshi: '' + }, + page: { + size: 8, + page: 8, + } } }, methods: { - + scrolltolower() { + this.loadmore() + }, + loadmore() { + if (this.status != 'loadmore') return + this.status = 'loading' + setTimeout(() => { + for (let i = 0; i < 1; i++) { + this.list.push({}, {}, {}, {}) + } + // 获取到的总条数>=接口总条数 || 接口总条数为0 + if (this.list.length >= 14) { + this.status = 'nomore' + } else { + this.status = 'loadmore' + } + }, 2000) + }, + refresh() { + this.status = 'loadmore' + this.list = [] + this.page.page = 1 + this.loadmore() + }, + pullDownRefresh() { + this.refresh() + } + }, + onLoad() { + this.loadmore() }, } - + uni-text { + font-size: 30rpx; + } + } + } + } + \ No newline at end of file diff --git a/monitorMobile/pages/attendanceCall/returnBed/comfirm.vue b/monitorMobile/pages/attendanceCall/returnBed/comfirm.vue new file mode 100644 index 0000000..23ff433 --- /dev/null +++ b/monitorMobile/pages/attendanceCall/returnBed/comfirm.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/monitorMobile/pages/attendanceCall/returnBed/detail.vue b/monitorMobile/pages/attendanceCall/returnBed/detail.vue new file mode 100644 index 0000000..1462420 --- /dev/null +++ b/monitorMobile/pages/attendanceCall/returnBed/detail.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/monitorMobile/pages/attendanceCall/returnBed/index.vue b/monitorMobile/pages/attendanceCall/returnBed/index.vue index 82dc683..926adf9 100644 --- a/monitorMobile/pages/attendanceCall/returnBed/index.vue +++ b/monitorMobile/pages/attendanceCall/returnBed/index.vue @@ -1,7 +1,13 @@