From a1eba624e8a0a499e3e5f0b8392b1cc70588cdda Mon Sep 17 00:00:00 2001
From: tianqian <277562116@qq.com>
Date: Tue, 30 May 2023 14:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
miniprogram/app.js | 97 +++++++++---------
miniprogram/app.json | 56 ++++++++--
miniprogram/custom-tab-bar/index.js | 45 ++++++++
miniprogram/custom-tab-bar/index.json | 3 +
miniprogram/custom-tab-bar/index.wxml | 8 ++
miniprogram/custom-tab-bar/index.wxss | 38 +++++++
miniprogram/pages/home/home.js | 2 +
miniprogram/pages/home/home.wxml | 12 +--
miniprogram/pages/message/message.js | 10 +-
.../checkIn/images}/01.png | Bin
.../checkIn/images}/02.png | Bin
.../checkIn/images}/03.png | Bin
miniprogram/subpages/checkIn/images/back.png | Bin 0 -> 1935 bytes
miniprogram/subpages/checkIn/images/back2.png | Bin 0 -> 2111 bytes
.../checkIn/images}/right.png | Bin
.../checkIn/pages/checkIn/checkIn.js} | 0
.../checkIn/pages/checkIn/checkIn.json} | 0
.../checkIn/pages/checkIn/checkIn.wxml} | 14 +--
.../checkIn/pages/checkIn/checkIn.wxss} | 0
.../knight => subpages/knight/images}/01.png | Bin
.../knight => subpages/knight/images}/01r.png | Bin
.../knight => subpages/knight/images}/02.png | Bin
.../knight => subpages/knight/images}/02r.png | Bin
.../knight => subpages/knight/images}/03.png | Bin
.../knight => subpages/knight/images}/03r.png | Bin
.../knight => subpages/knight/images}/04.png | Bin
.../knight => subpages/knight/images}/04r.png | Bin
.../knight => subpages/knight/images}/05.png | Bin
.../knight => subpages/knight/images}/05r.png | Bin
.../knight => subpages/knight/images}/06.png | Bin
.../knight => subpages/knight/images}/06r.png | Bin
miniprogram/subpages/knight/images/back.png | Bin 0 -> 1935 bytes
miniprogram/subpages/knight/images/back2.png | Bin 0 -> 2111 bytes
.../knight => subpages/knight/images}/bg.png | Bin
.../knight}/pages/knight/knight.js | 0
.../knight}/pages/knight/knight.json | 0
.../knight}/pages/knight/knight.wxml | 28 ++---
.../knight}/pages/knight/knight.wxss | 0
miniprogram/subpages/pioneer/images/back.png | Bin 0 -> 1935 bytes
miniprogram/subpages/pioneer/images/back2.png | Bin 0 -> 2111 bytes
.../pioneer/images}/by.png | Bin
.../pioneer/images}/erweima.png | Bin
.../pioneer/pages/pioneer/pioneer.js} | 0
.../pioneer/pages/pioneer/pioneer.json} | 0
.../pioneer/pages/pioneer/pioneer.wxml} | 6 +-
.../pioneer/pages/pioneer/pioneer.wxss} | 0
.../redGrider/images}/01.png | Bin
.../redGrider/images}/01r.png | Bin
.../redGrider/images}/02.png | Bin
.../redGrider/images}/02r.png | Bin
.../redGrider/images}/03.png | Bin
.../redGrider/images}/03r.png | Bin
.../redGrider/images}/04.png | Bin
.../redGrider/images}/04r.png | Bin
.../subpages/redGrider/images/back.png | Bin 0 -> 1935 bytes
.../subpages/redGrider/images/back2.png | Bin 0 -> 2111 bytes
.../redGrider/images}/bg.png | Bin
.../redGrider}/pages/redGrider/redGrider.js | 0
.../redGrider}/pages/redGrider/redGrider.json | 0
.../redGrider}/pages/redGrider/redGrider.wxml | 20 ++--
.../redGrider}/pages/redGrider/redGrider.wxss | 0
.../redSail/images}/01.png | Bin
.../redSail/images}/02.png | Bin
.../redSail/images}/03.png | Bin
.../redSail/images}/04.png | Bin
.../redSail/images}/05.png | Bin
miniprogram/subpages/redSail/images/back.png | Bin 0 -> 1935 bytes
miniprogram/subpages/redSail/images/back2.png | Bin 0 -> 2111 bytes
.../redSail/images}/bg.png | Bin
.../redSail/images}/right.png | Bin
.../redSail}/pages/redSail/redSail.js | 0
.../redSail}/pages/redSail/redSail.json | 0
.../redSail}/pages/redSail/redSail.wxml | 24 ++---
.../redSail}/pages/redSail/redSail.wxss | 0
.../volunteer/images}/01.png | Bin
.../volunteer/images}/02.png | Bin
.../volunteer/images}/03.png | Bin
.../subpages/volunteer/images/back.png | Bin 0 -> 1935 bytes
.../subpages/volunteer/images/back2.png | Bin 0 -> 2111 bytes
.../volunteer/images}/right.png | Bin
.../volunteer}/pages/volunteer/volunteer.js | 0
.../volunteer}/pages/volunteer/volunteer.json | 0
.../volunteer}/pages/volunteer/volunteer.wxml | 14 +--
.../volunteer}/pages/volunteer/volunteer.wxss | 0
84 files changed, 262 insertions(+), 115 deletions(-)
create mode 100644 miniprogram/custom-tab-bar/index.js
create mode 100644 miniprogram/custom-tab-bar/index.json
create mode 100644 miniprogram/custom-tab-bar/index.wxml
create mode 100644 miniprogram/custom-tab-bar/index.wxss
rename miniprogram/{images/checkin => subpages/checkIn/images}/01.png (100%)
rename miniprogram/{images/checkin => subpages/checkIn/images}/02.png (100%)
rename miniprogram/{images/checkin => subpages/checkIn/images}/03.png (100%)
create mode 100644 miniprogram/subpages/checkIn/images/back.png
create mode 100644 miniprogram/subpages/checkIn/images/back2.png
rename miniprogram/{images/checkin => subpages/checkIn/images}/right.png (100%)
rename miniprogram/{pages/CheckIn/CheckIn.js => subpages/checkIn/pages/checkIn/checkIn.js} (100%)
rename miniprogram/{pages/CheckIn/CheckIn.json => subpages/checkIn/pages/checkIn/checkIn.json} (100%)
rename miniprogram/{pages/CheckIn/CheckIn.wxml => subpages/checkIn/pages/checkIn/checkIn.wxml} (69%)
rename miniprogram/{pages/CheckIn/CheckIn.wxss => subpages/checkIn/pages/checkIn/checkIn.wxss} (100%)
rename miniprogram/{images/knight => subpages/knight/images}/01.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/01r.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/02.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/02r.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/03.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/03r.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/04.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/04r.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/05.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/05r.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/06.png (100%)
rename miniprogram/{images/knight => subpages/knight/images}/06r.png (100%)
create mode 100644 miniprogram/subpages/knight/images/back.png
create mode 100644 miniprogram/subpages/knight/images/back2.png
rename miniprogram/{images/knight => subpages/knight/images}/bg.png (100%)
rename miniprogram/{ => subpages/knight}/pages/knight/knight.js (100%)
rename miniprogram/{ => subpages/knight}/pages/knight/knight.json (100%)
rename miniprogram/{ => subpages/knight}/pages/knight/knight.wxml (67%)
rename miniprogram/{ => subpages/knight}/pages/knight/knight.wxss (100%)
create mode 100644 miniprogram/subpages/pioneer/images/back.png
create mode 100644 miniprogram/subpages/pioneer/images/back2.png
rename miniprogram/{images/poineer => subpages/pioneer/images}/by.png (100%)
rename miniprogram/{images/poineer => subpages/pioneer/images}/erweima.png (100%)
rename miniprogram/{pages/Pioneer/Pioneer.js => subpages/pioneer/pages/pioneer/pioneer.js} (100%)
rename miniprogram/{pages/Pioneer/Pioneer.json => subpages/pioneer/pages/pioneer/pioneer.json} (100%)
rename miniprogram/{pages/Pioneer/Pioneer.wxml => subpages/pioneer/pages/pioneer/pioneer.wxml} (69%)
rename miniprogram/{pages/Pioneer/Pioneer.wxss => subpages/pioneer/pages/pioneer/pioneer.wxss} (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/01.png (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/01r.png (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/02.png (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/02r.png (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/03.png (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/03r.png (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/04.png (100%)
rename miniprogram/{images/redGrider => subpages/redGrider/images}/04r.png (100%)
create mode 100644 miniprogram/subpages/redGrider/images/back.png
create mode 100644 miniprogram/subpages/redGrider/images/back2.png
rename miniprogram/{images/redGrider => subpages/redGrider/images}/bg.png (100%)
rename miniprogram/{ => subpages/redGrider}/pages/redGrider/redGrider.js (100%)
rename miniprogram/{ => subpages/redGrider}/pages/redGrider/redGrider.json (100%)
rename miniprogram/{ => subpages/redGrider}/pages/redGrider/redGrider.wxml (65%)
rename miniprogram/{ => subpages/redGrider}/pages/redGrider/redGrider.wxss (100%)
rename miniprogram/{images/redSail => subpages/redSail/images}/01.png (100%)
rename miniprogram/{images/redSail => subpages/redSail/images}/02.png (100%)
rename miniprogram/{images/redSail => subpages/redSail/images}/03.png (100%)
rename miniprogram/{images/redSail => subpages/redSail/images}/04.png (100%)
rename miniprogram/{images/redSail => subpages/redSail/images}/05.png (100%)
create mode 100644 miniprogram/subpages/redSail/images/back.png
create mode 100644 miniprogram/subpages/redSail/images/back2.png
rename miniprogram/{images/redSail => subpages/redSail/images}/bg.png (100%)
rename miniprogram/{images/redSail => subpages/redSail/images}/right.png (100%)
rename miniprogram/{ => subpages/redSail}/pages/redSail/redSail.js (100%)
rename miniprogram/{ => subpages/redSail}/pages/redSail/redSail.json (100%)
rename miniprogram/{ => subpages/redSail}/pages/redSail/redSail.wxml (65%)
rename miniprogram/{ => subpages/redSail}/pages/redSail/redSail.wxss (100%)
rename miniprogram/{images/volunteer => subpages/volunteer/images}/01.png (100%)
rename miniprogram/{images/volunteer => subpages/volunteer/images}/02.png (100%)
rename miniprogram/{images/volunteer => subpages/volunteer/images}/03.png (100%)
create mode 100644 miniprogram/subpages/volunteer/images/back.png
create mode 100644 miniprogram/subpages/volunteer/images/back2.png
rename miniprogram/{images/volunteer => subpages/volunteer/images}/right.png (100%)
rename miniprogram/{ => subpages/volunteer}/pages/volunteer/volunteer.js (100%)
rename miniprogram/{ => subpages/volunteer}/pages/volunteer/volunteer.json (100%)
rename miniprogram/{ => subpages/volunteer}/pages/volunteer/volunteer.wxml (68%)
rename miniprogram/{ => subpages/volunteer}/pages/volunteer/volunteer.wxss (100%)
diff --git a/miniprogram/app.js b/miniprogram/app.js
index 4068315..8a58389 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -1,53 +1,54 @@
App({
- onLaunch: function (options) {
- // 判断是否由分享进入小程序
- if (options.scene == 1007 || options.scene == 1008) {
- this.globalData.share = true
- } else {
- this.globalData.share = false
- };
- //获取设备顶部窗口的高度(不同设备窗口高度不一样,根据这个来设置自定义导航栏的高度)
- //这个最初我是在组件中获取,但是出现了一个问题,当第一次进入小程序时导航栏会把
- //页面内容盖住一部分,当打开调试重新进入时就没有问题,这个问题弄得我是莫名其妙
- //虽然最后解决了,但是花费了不少时间
- const menuButtonInfo = wx.getMenuButtonBoundingClientRect()
- wx.getSystemInfo({
- success: (res) => {
- this.globalData.height = res.statusBarHeight
- this.globalData.deviceInfo.statusHeight = res.statusBarHeight
- this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2
- }
- })
- },
- onShow () {
-
- },
- globalData: {
- flag: false,
- exitApp: false,
- userInfo: null,
- accountState: 0, // 未注册
- share: false, // 分享默认为false
- height: 0,
- infoCompleted: 0, // 0-未完善 1,2,3...-已完善
- tempGridId: '',
- userInfo : { // 当前登陆的用户信息
- userId: '',
- username: '',
- userMobile: '',
- partyFlag: ''
+ onLaunch: function (options) {
+ // 判断是否由分享进入小程序
+ if (options.scene == 1007 || options.scene == 1008) {
+ this.globalData.share = true
+ } else {
+ this.globalData.share = false
+ };
+ //获取设备顶部窗口的高度(不同设备窗口高度不一样,根据这个来设置自定义导航栏的高度)
+ //这个最初我是在组件中获取,但是出现了一个问题,当第一次进入小程序时导航栏会把
+ //页面内容盖住一部分,当打开调试重新进入时就没有问题,这个问题弄得我是莫名其妙
+ //虽然最后解决了,但是花费了不少时间
+ const menuButtonInfo = wx.getMenuButtonBoundingClientRect()
+ wx.getSystemInfo({
+ success: (res) => {
+ this.globalData.height = res.statusBarHeight
+ this.globalData.deviceInfo.statusHeight = res.statusBarHeight
+ this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2
+ }
+ })
},
- groupInfo: { // 友邻社群-当前展示的社群信息
- groupAvatar: '',
- groupLeader: '',
- groupName:'',
- groupId: '',
- lordFlag: ''
+ onShow() {
+
},
- previewImage: false, // 预览图片后会触发onShow,加个状态区分一下
- deviceInfo: {
- statusHeight: 20,
- navigationHeight: 40
+ globalData: {
+ selected: 0,
+ flag: false,
+ exitApp: false,
+ userInfo: null,
+ accountState: 0, // 未注册
+ share: false, // 分享默认为false
+ height: 0,
+ infoCompleted: 0, // 0-未完善 1,2,3...-已完善
+ tempGridId: '',
+ userInfo: { // 当前登陆的用户信息
+ userId: '',
+ username: '',
+ userMobile: '',
+ partyFlag: ''
+ },
+ groupInfo: { // 友邻社群-当前展示的社群信息
+ groupAvatar: '',
+ groupLeader: '',
+ groupName: '',
+ groupId: '',
+ lordFlag: ''
+ },
+ previewImage: false, // 预览图片后会触发onShow,加个状态区分一下
+ deviceInfo: {
+ statusHeight: 20,
+ navigationHeight: 40
+ }
}
- }
})
\ No newline at end of file
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 0aaa1e9..da3a888 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,12 +1,7 @@
{
"pages": [
"pages/home/home",
- "pages/redSail/redSail",
- "pages/knight/knight",
- "pages/redGrider/redGrider",
- "pages/pioneer/pioneer",
- "pages/checkIn/checkIn",
- "pages/volunteer/volunteer",
+
"pages/message/message",
"pages/my/my",
"pages/index/index",
@@ -27,6 +22,52 @@
"pages/navigatetoApp/navigatetoApp"
],
"subPackages": [
+ {
+ "root": "subpages/redSail",
+ "name": "redSail",
+ "pages": [
+ "pages/redSail/redSail"
+ ]
+ },
+ {
+ "root": "subpages/knight",
+ "name": "knight",
+ "pages": [
+ "pages/knight/knight"
+ ]
+ },
+ {
+ "root": "subpages/redGrider",
+ "name": "redGrider",
+ "pages": [
+ "pages/redGrider/redGrider"
+ ]
+ },
+ {
+ "root": "subpages/pioneer",
+ "name": "pioneer",
+ "pages": [
+ "pages/pioneer/pioneer"
+ ]
+ },
+ {
+ "root": "subpages/checkIn",
+ "name": "checkIn",
+ "pages": [
+ "pages/checkIn/checkIn"
+ ]
+ },
+ {
+ "root": "subpages/volunteer",
+ "name": "volunteer",
+ "pages": [
+ "pages/volunteer/volunteer"
+ ]
+ },
+
+
+
+
{
"root": "subpages/home",
"name": "home",
@@ -214,10 +255,11 @@
"selectedColor": "#FF0000",
"backgroundColor": "#FFFFFF",
"borderStyle": "white",
+ "custom": true,
"list": [
{
"pagePath": "pages/home/home",
- "text": "",
+ "text": "首页",
"iconPath": "images/main/icon01.png",
"selectedIconPath": "images/main/icon01-a.png"
},
diff --git a/miniprogram/custom-tab-bar/index.js b/miniprogram/custom-tab-bar/index.js
new file mode 100644
index 0000000..60787ef
--- /dev/null
+++ b/miniprogram/custom-tab-bar/index.js
@@ -0,0 +1,45 @@
+const app = getApp()
+Component({
+ data: {
+ selected: 0,
+ color: "#7A7E83",
+ selectedColor: "#3cc51f",
+ "list": [
+ {
+ "pagePath": "/pages/home/home",
+ "text": "",
+ "iconPath": "/images/main/icon01.png",
+ "selectedIconPath": "/images/main/icon01-a.png"
+ },
+ {
+ "pagePath": "/pages/message/message",
+ "text": "消息",
+ "iconPath": "/images/main/icon02.png",
+ "selectedIconPath": "/images/main/icon02-a.png"
+ },
+
+ {
+ "pagePath": "/pages/my/my",
+ "text": "我的",
+ "iconPath": "/images/main/icon03.png",
+ "selectedIconPath": "/images/main/icon03-a.png"
+ }
+ ]
+ },
+ attached() {
+ },
+ ready: function() {
+ this.setData({
+ selected: app.globalData.selected
+ })
+ },
+ methods: {
+ switchTab(e) {
+ // console.log(e);
+ const data = e.currentTarget.dataset;
+ const url = data.path;
+ app.globalData.selected = data.index;
+ wx.switchTab({url})
+ }
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/custom-tab-bar/index.json b/miniprogram/custom-tab-bar/index.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/miniprogram/custom-tab-bar/index.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+}
\ No newline at end of file
diff --git a/miniprogram/custom-tab-bar/index.wxml b/miniprogram/custom-tab-bar/index.wxml
new file mode 100644
index 0000000..3ce2f86
--- /dev/null
+++ b/miniprogram/custom-tab-bar/index.wxml
@@ -0,0 +1,8 @@
+
+
+
+
+
+ {{item.text}}
+
+
diff --git a/miniprogram/custom-tab-bar/index.wxss b/miniprogram/custom-tab-bar/index.wxss
new file mode 100644
index 0000000..dc8a9ee
--- /dev/null
+++ b/miniprogram/custom-tab-bar/index.wxss
@@ -0,0 +1,38 @@
+.tab-bar {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 48px;
+ background: white;
+ display: flex;
+ padding-bottom: env(safe-area-inset-bottom);
+}
+
+.tab-bar-border {
+ background-color: rgba(0, 0, 0, 0.33);
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 1px;
+ transform: scaleY(0.5);
+}
+
+.tab-bar-item {
+ flex: 1;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+}
+
+.tab-bar-item image {
+ width: 27px;
+ height: 27px;
+}
+
+.tab-bar-item view {
+ font-size: 10px;
+}
diff --git a/miniprogram/pages/home/home.js b/miniprogram/pages/home/home.js
index dae0bc7..7050845 100644
--- a/miniprogram/pages/home/home.js
+++ b/miniprogram/pages/home/home.js
@@ -1,3 +1,4 @@
+
const app = getApp()
const api = require("../../utils/api")
const homeApi = require("../../utils/home")
@@ -42,6 +43,7 @@ Page({
isSignUp: 0,
communityId: "" // 社区id
},
+
async onLoad(options) {
wx.showLoading({
title: "加载中,请稍后",
diff --git a/miniprogram/pages/home/home.wxml b/miniprogram/pages/home/home.wxml
index 4906a59..ca7e39c 100644
--- a/miniprogram/pages/home/home.wxml
+++ b/miniprogram/pages/home/home.wxml
@@ -6,26 +6,26 @@
-
+
红帆支队
-
+
骑士驿站
-
+
红色网格员
-
+
西海岸先锋
-
+
在职党员
@@ -35,7 +35,7 @@
-
+
红色尖兵
diff --git a/miniprogram/pages/message/message.js b/miniprogram/pages/message/message.js
index f916eb2..857b3a4 100644
--- a/miniprogram/pages/message/message.js
+++ b/miniprogram/pages/message/message.js
@@ -7,7 +7,15 @@ Page({
data: {
},
-
+ getInstance() {
+ if (typeof this.getTabBar === 'function' ) {
+ this.getTabBar((tabBar) => {
+ tabBar.setData({
+ selected: 1
+ })
+ })
+ }
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/miniprogram/images/checkin/01.png b/miniprogram/subpages/checkIn/images/01.png
similarity index 100%
rename from miniprogram/images/checkin/01.png
rename to miniprogram/subpages/checkIn/images/01.png
diff --git a/miniprogram/images/checkin/02.png b/miniprogram/subpages/checkIn/images/02.png
similarity index 100%
rename from miniprogram/images/checkin/02.png
rename to miniprogram/subpages/checkIn/images/02.png
diff --git a/miniprogram/images/checkin/03.png b/miniprogram/subpages/checkIn/images/03.png
similarity index 100%
rename from miniprogram/images/checkin/03.png
rename to miniprogram/subpages/checkIn/images/03.png
diff --git a/miniprogram/subpages/checkIn/images/back.png b/miniprogram/subpages/checkIn/images/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..74a96541ee911d72174366132e6e8e19133c0fa3
GIT binary patch
literal 1935
zcmbVNZA{c=94|U2V3;90&D1fPx;YhleYv~dUB`iNhh8HG2q^f0gi!L~fP1-(v
zp5OEP|Nbw}zdNfc*5_m|%|;L;hx7ZY;oD-~nUBL~$IiSQ_{viKTXY0j@T7TXAn)&e
z3PI*wlWOaY`an4=C^0K9DnVdP#8ikzkiz1G$_q`vK!YGG$sTO{#1|MUi5{%Z5g-Gq
z7epj~n+9syDr$wcCc!OY#YJdgf`tSzVDM-n7L|22;lYx;EF7ED1coLdMw16CF%6>i
zfhyFiXaIFs8C;<3F4XC^QjDFnF>6qoq}&AQA}AY9QY^`^4kwzrFlbE^Lu|EgUCI{x
z@?a6eP+5YA$K%$x&8lc&f^xed2Tjm44iUKCDjR$Pm-Xe-3_hR>nxq<%BBLfFA5@wR
z4+fP^xe!y+w6dNG6AT!U;8lXMlBP>ZpeUqqYO@wi8W#luL_rM5h7Pe*8mmSWL(wD3
z1E|x>_Zfhp4Fu9QX4DdkrA_EYSqpR{6_6RxdTpx;h-#oK&6)tpTA+&47^<_~JI{H&
zRhkl#qHsa4USEoGWnPAIGYn2!sifRMfaPS};AH`DJ`V?T`ID-JEfk5F7
zx1GXW4DH0lpgkzMfy3=&())di&}^2#^nTIYFWBr(Cqv?H;Bw+j$j;zFh6K0}4A~qu
zyG;P_M4738_A50B9zj0($UNr3OfvZ;9cHyPb#!XLw$vypp~-TAvdm-P!2~n^04kW8
zmS&2;LwPW@KOO;)^ndDN3Z^R|BhG7}Bn+c9YuynK60h?uvq*oam_GRwUspANeQO)^E
zYF!;4|8TO&ve7bc;@Z;84M+XC{<^nK5f_Q|<(dVORg$U9fvzvu0S
z%+XHE=$y%OZ6#+)3znVOe|B(QcXK>EH2V&=it!Y75Ihk
zdXFFc;Cj3>A2>g%oNxK*?1sHU{+>HuHXTr3%gFtdyU-PV@7K?`qUR+-&_%F&~T1NnJtt}Z%tdF`U?k%8A=9=^KjTXkpN@ZE*{_Q$?CRQ21H+x@xa*Qre_
zZywSnkb=OeKR<7N;p?rPzdu{UJ@Ze)UVCHL>iXgpll#O2FW#A3zzuBfID4zY{AF@w
L6~4aG##jFZN*t2M
literal 0
HcmV?d00001
diff --git a/miniprogram/subpages/checkIn/images/back2.png b/miniprogram/subpages/checkIn/images/back2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0604ff6e8132e3141aaa00f38580e76082d53e4c
GIT binary patch
literal 2111
zcmb_dZEO=|9KQuN*v1sHshfjv9(+LMdM|CSy<=tB+POBPvsT_+^4BQ-9Y;wKl
zp6B=c{=fg*^YllW8_P!++`w2X}SFrAcx3q-gXVr1v}Q;$*BW>(XA6G$
zu()OE96_W~DM!lb(2Nd(Vp+&R6EuxO1a9`K7N5pdbJH9{0GOho=$4|XsLjX=TDRrH
zpwg@hNj*=inz=B+fDvh4CnyJLyOaS+Vjib=8;Oi@NhCl5B!Oy~5KHB;dR((KGp;Q{
zonOAs01Rz7oVT%{mSi$-!n7KCpc}b>EQmH^y*eOTfvI&HB53G=GB?@Y=$zjGyrmg2
zO-sxrDl#V-rJ>j8mYs?!X({vRc^g20w}20$NgC$Mjniz5VmON8T;69%FGrGDXjqdJ
zx%b~t4+qgSdmj{*jKo{~l3+>XWX(wO&|xLXcK||HJ1{gKM$WG#Gy@uj>YVfELw5oDR-oifPp4`^byT>^9aCAgm#oi2}uA#oOXJvbw~7+hdTfQteob-J7)
zfE{J00@{DxP+$x4iDmQHjhSHzDkjWoZ?1Ksper{@C}^f!pe(x$e3)qGA3z1!X=Q;3
zJe&vF{i!&Br2kPDS(vHGR*E-3T?dTTl66NcCf?+GmXJ=%6yp&9P6Ls`-K>kky$tQa
zCBY>~EO4_P1}1ND=`<`=*Ib=0M|zH1jPq&-fM+U!E#H}ktHi~ed7$b3KW7O0D9u(F
z@nG>~*5)0%Fp-%lc$VA4{3QZE^4AbhVVn$j$$Z`4!XZe3I~1skdG{Z^GS;-BtMbC^
z)#RDVJ!`AB?ASN?(bnqg1H1Os-Pt%47;2{<{p`ol7uO9BloWk+q!$&&KbexJJd@vj
zF>(9aO!dgkFMGEixjX&w_rC;pPx6oaKJs!=+qzQkh3LuJ&F9J+T8cZ{8msq@G!>72
zBNnZS&s4rp(b{x=^&$PuRo6e5zVjC{wfWcd`NBigpFeMVHF)gWT5aYSS{rHE*#GT`
zGfhJ}-Blut7bgnG9Pb9#ube)=?QL>6Ae=Nlt$1wqjZ1pZJEOl1t`|xsPBfO^J_Ya_
zjaB}#s~_&EytHP`<@%xHRrJ*5dr{-P*9s1wb^UQ`Ao|nM$i^yGAHKdhzte
z$79`t^`&?3Z4Dlz4s;KmjgGg^zH%DbaPApZf8yroOXE*{eq+l(^R2xH(|=e0u%ak^
TrEqx6zT!g-&4J_f?XUj>JR!U2
literal 0
HcmV?d00001
diff --git a/miniprogram/images/checkin/right.png b/miniprogram/subpages/checkIn/images/right.png
similarity index 100%
rename from miniprogram/images/checkin/right.png
rename to miniprogram/subpages/checkIn/images/right.png
diff --git a/miniprogram/pages/CheckIn/CheckIn.js b/miniprogram/subpages/checkIn/pages/checkIn/checkIn.js
similarity index 100%
rename from miniprogram/pages/CheckIn/CheckIn.js
rename to miniprogram/subpages/checkIn/pages/checkIn/checkIn.js
diff --git a/miniprogram/pages/CheckIn/CheckIn.json b/miniprogram/subpages/checkIn/pages/checkIn/checkIn.json
similarity index 100%
rename from miniprogram/pages/CheckIn/CheckIn.json
rename to miniprogram/subpages/checkIn/pages/checkIn/checkIn.json
diff --git a/miniprogram/pages/CheckIn/CheckIn.wxml b/miniprogram/subpages/checkIn/pages/checkIn/checkIn.wxml
similarity index 69%
rename from miniprogram/pages/CheckIn/CheckIn.wxml
rename to miniprogram/subpages/checkIn/pages/checkIn/checkIn.wxml
index a633e56..a1657dd 100644
--- a/miniprogram/pages/CheckIn/CheckIn.wxml
+++ b/miniprogram/subpages/checkIn/pages/checkIn/checkIn.wxml
@@ -1,5 +1,5 @@