diff --git a/miniprogram/app.js b/miniprogram/app.js index f9ed01e..527672c 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -5,10 +5,14 @@ App({ userInfo: null, userId: null, connectedDevice: null, - currentTreatment: null + currentTreatment: null, + statusBarHeight: 44 }, onLaunch: function () { + var sysInfo = wx.getSystemInfoSync() + this.globalData.statusBarHeight = sysInfo.statusBarHeight || 44 + if (!wx.cloud) { console.error('请使用 2.2.3 或以上的基础库以使用云能力') return diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index f9c216b..8f35780 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -6,7 +6,7 @@ page { } .page-header { - padding: 80rpx 40rpx 32rpx; + padding: 0 40rpx 32rpx; text-align: center; color: #ffffff; } diff --git a/miniprogram/pages/auto-scan/auto-scan.js b/miniprogram/pages/auto-scan/auto-scan.js index b5309ed..870c166 100644 --- a/miniprogram/pages/auto-scan/auto-scan.js +++ b/miniprogram/pages/auto-scan/auto-scan.js @@ -2,6 +2,7 @@ var ble = require('../../services/ble') Page({ data: { + statusBarHeight: 44, scanning: true, scanProgress: 0, regionData: [], @@ -9,6 +10,8 @@ Page({ }, onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) this.startScan() }, diff --git a/miniprogram/pages/auto-scan/auto-scan.wxml b/miniprogram/pages/auto-scan/auto-scan.wxml index a4750ef..54d6fe5 100644 --- a/miniprogram/pages/auto-scan/auto-scan.wxml +++ b/miniprogram/pages/auto-scan/auto-scan.wxml @@ -1,5 +1,5 @@ - + 自动扫描 正在识别面部... diff --git a/miniprogram/pages/bind-success/bind-success.js b/miniprogram/pages/bind-success/bind-success.js index 868c160..2a504af 100644 --- a/miniprogram/pages/bind-success/bind-success.js +++ b/miniprogram/pages/bind-success/bind-success.js @@ -1,10 +1,13 @@ Page({ data: { + statusBarHeight: 44, deviceId: '', trialDays: 7 }, onLoad: function (options) { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) this.setData({ deviceId: options.device_id || '' }) }, diff --git a/miniprogram/pages/bind-success/bind-success.wxml b/miniprogram/pages/bind-success/bind-success.wxml index 71c9a3e..0a90e47 100644 --- a/miniprogram/pages/bind-success/bind-success.wxml +++ b/miniprogram/pages/bind-success/bind-success.wxml @@ -1,5 +1,5 @@ - + 绑定成功 设备已成功绑定 diff --git a/miniprogram/pages/ble-connect/ble-connect.js b/miniprogram/pages/ble-connect/ble-connect.js index 45ae6ff..5e4235d 100644 --- a/miniprogram/pages/ble-connect/ble-connect.js +++ b/miniprogram/pages/ble-connect/ble-connect.js @@ -3,6 +3,7 @@ var app = getApp() Page({ data: { + statusBarHeight: 44, deviceId: '', bindToken: '', state: 'scanning', @@ -10,6 +11,7 @@ Page({ }, onLoad: function (options) { + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) this.setData({ deviceId: options.device_id || '', bindToken: options.bind_token || '' diff --git a/miniprogram/pages/ble-connect/ble-connect.wxml b/miniprogram/pages/ble-connect/ble-connect.wxml index 43a444f..ea17f13 100644 --- a/miniprogram/pages/ble-connect/ble-connect.wxml +++ b/miniprogram/pages/ble-connect/ble-connect.wxml @@ -1,5 +1,5 @@ - + 蓝牙连接 {{state === 'scanning' ? '正在搜索设备...' : state === 'connecting' ? '正在连接设备...' : state === 'binding' ? '正在绑定...' : '连接失败'}} diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 7612c2a..e837b2b 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/login.js @@ -2,9 +2,15 @@ var app = getApp() Page({ data: { + statusBarHeight: 44, loading: false }, + onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) + }, + onLogin: function () { var self = this self.setData({ loading: true }) diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml index f2956b7..e4a6025 100644 --- a/miniprogram/pages/login/login.wxml +++ b/miniprogram/pages/login/login.wxml @@ -1,5 +1,5 @@ - + 光子美容仪 微信授权登录 diff --git a/miniprogram/pages/scan/scan.js b/miniprogram/pages/scan/scan.js index f817b83..795ae71 100644 --- a/miniprogram/pages/scan/scan.js +++ b/miniprogram/pages/scan/scan.js @@ -2,11 +2,17 @@ var http = require('../../utils/request') Page({ data: { + statusBarHeight: 44, scanning: false, deviceId: '', error: '' }, + onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) + }, + onScan: function () { var self = this self.setData({ scanning: true, error: '' }) diff --git a/miniprogram/pages/scan/scan.wxml b/miniprogram/pages/scan/scan.wxml index 393b908..42a571e 100644 --- a/miniprogram/pages/scan/scan.wxml +++ b/miniprogram/pages/scan/scan.wxml @@ -1,5 +1,5 @@ - + 扫码绑定 扫描设备底部二维码 diff --git a/miniprogram/pages/subscribe-plans/subscribe-plans.js b/miniprogram/pages/subscribe-plans/subscribe-plans.js index 2aca9af..b2343d7 100644 --- a/miniprogram/pages/subscribe-plans/subscribe-plans.js +++ b/miniprogram/pages/subscribe-plans/subscribe-plans.js @@ -2,6 +2,7 @@ var http = require('../../utils/request') Page({ data: { + statusBarHeight: 44, plans: [ { plan: 'monthly', price: '¥99', desc: '约3.3元/天' }, { plan: 'yearly', price: '¥899', desc: '省¥289' } @@ -10,6 +11,11 @@ Page({ purchasing: false }, + onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) + }, + onSelect: function (e) { this.setData({ selected: e.currentTarget.dataset.plan }) }, diff --git a/miniprogram/pages/subscribe-plans/subscribe-plans.wxml b/miniprogram/pages/subscribe-plans/subscribe-plans.wxml index 0530ff2..83afdc4 100644 --- a/miniprogram/pages/subscribe-plans/subscribe-plans.wxml +++ b/miniprogram/pages/subscribe-plans/subscribe-plans.wxml @@ -1,5 +1,5 @@ - + 订阅服务 解锁智能模式 diff --git a/miniprogram/pages/subscribe-prompt/subscribe-prompt.js b/miniprogram/pages/subscribe-prompt/subscribe-prompt.js index 1b3dcc9..d74caf7 100644 --- a/miniprogram/pages/subscribe-prompt/subscribe-prompt.js +++ b/miniprogram/pages/subscribe-prompt/subscribe-prompt.js @@ -1,5 +1,12 @@ Page({ - data: {}, + data: { + statusBarHeight: 44 + }, + + onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) + }, onViewPlans: function () { wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' }) diff --git a/miniprogram/pages/subscribe-prompt/subscribe-prompt.wxml b/miniprogram/pages/subscribe-prompt/subscribe-prompt.wxml index 3954055..3aadfa9 100644 --- a/miniprogram/pages/subscribe-prompt/subscribe-prompt.wxml +++ b/miniprogram/pages/subscribe-prompt/subscribe-prompt.wxml @@ -1,5 +1,5 @@ - + 护理设置 试用期已结束 diff --git a/miniprogram/pages/subscribe-success/subscribe-success.js b/miniprogram/pages/subscribe-success/subscribe-success.js index 613607e..b8c2054 100644 --- a/miniprogram/pages/subscribe-success/subscribe-success.js +++ b/miniprogram/pages/subscribe-success/subscribe-success.js @@ -1,10 +1,13 @@ Page({ data: { + statusBarHeight: 44, planName: '年卡会员', expiryDate: '' }, onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) var now = new Date() now.setFullYear(now.getFullYear() + 1) var y = now.getFullYear() diff --git a/miniprogram/pages/subscribe-success/subscribe-success.wxml b/miniprogram/pages/subscribe-success/subscribe-success.wxml index ef81c37..bd71771 100644 --- a/miniprogram/pages/subscribe-success/subscribe-success.wxml +++ b/miniprogram/pages/subscribe-success/subscribe-success.wxml @@ -1,5 +1,5 @@ - + 订阅成功 欢迎使用智能模式 diff --git a/miniprogram/pages/treating/treating.js b/miniprogram/pages/treating/treating.js index e59e2f9..e912e2e 100644 --- a/miniprogram/pages/treating/treating.js +++ b/miniprogram/pages/treating/treating.js @@ -2,6 +2,7 @@ var ble = require('../../services/ble') Page({ data: { + statusBarHeight: 44, regions: 0, wavelength: 2, duration: 600000, @@ -16,6 +17,8 @@ Page({ }, onLoad: function (options) { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) this.setData({ regions: parseInt(options.regions) || 0x7F, wavelength: parseInt(options.wavelength) || 2, diff --git a/miniprogram/pages/treating/treating.wxml b/miniprogram/pages/treating/treating.wxml index 7c8e76d..608d918 100644 --- a/miniprogram/pages/treating/treating.wxml +++ b/miniprogram/pages/treating/treating.wxml @@ -1,5 +1,5 @@ - + 护理中 正在护理... diff --git a/miniprogram/pages/treatment-done/treatment-done.js b/miniprogram/pages/treatment-done/treatment-done.js index 4165b72..b3b3007 100644 --- a/miniprogram/pages/treatment-done/treatment-done.js +++ b/miniprogram/pages/treatment-done/treatment-done.js @@ -4,6 +4,7 @@ var app = getApp() Page({ data: { + statusBarHeight: 44, sessionId: '', regions: 0, duration: 0, @@ -15,6 +16,7 @@ Page({ }, onLoad: function (options) { + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) var durationMs = parseInt(options.duration) || 0 var mins = Math.floor(durationMs / 60000) var secs = Math.floor((durationMs % 60000) / 1000) diff --git a/miniprogram/pages/treatment-done/treatment-done.wxml b/miniprogram/pages/treatment-done/treatment-done.wxml index 4b26495..dbb4c46 100644 --- a/miniprogram/pages/treatment-done/treatment-done.wxml +++ b/miniprogram/pages/treatment-done/treatment-done.wxml @@ -1,5 +1,5 @@ - + 护理完成 本次护理已结束 diff --git a/miniprogram/pages/treatment-setup/treatment-setup.js b/miniprogram/pages/treatment-setup/treatment-setup.js index 03eeb66..e4d647f 100644 --- a/miniprogram/pages/treatment-setup/treatment-setup.js +++ b/miniprogram/pages/treatment-setup/treatment-setup.js @@ -2,6 +2,7 @@ var ble = require('../../services/ble') Page({ data: { + statusBarHeight: 44, regions: [ { name: '左脸颊', mask: 0x01, checked: true }, { name: '右脸颊', mask: 0x02, checked: true }, @@ -17,6 +18,8 @@ Page({ }, onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) this.checkSubscription() }, diff --git a/miniprogram/pages/treatment-setup/treatment-setup.wxml b/miniprogram/pages/treatment-setup/treatment-setup.wxml index 51c1bf5..7e7be20 100644 --- a/miniprogram/pages/treatment-setup/treatment-setup.wxml +++ b/miniprogram/pages/treatment-setup/treatment-setup.wxml @@ -1,5 +1,5 @@ - + 护理设置 选择模式和区域 diff --git a/miniprogram/pages/wear-check/wear-check.js b/miniprogram/pages/wear-check/wear-check.js index f4f18b7..d037471 100644 --- a/miniprogram/pages/wear-check/wear-check.js +++ b/miniprogram/pages/wear-check/wear-check.js @@ -2,11 +2,17 @@ var ble = require('../../services/ble') Page({ data: { + statusBarHeight: 44, checking: false, result: null, error: '' }, + onLoad: function () { + var app = getApp() + this.setData({ statusBarHeight: app.globalData.statusBarHeight }) + }, + onShow: function () { this.checkWearing() }, diff --git a/miniprogram/pages/wear-check/wear-check.wxml b/miniprogram/pages/wear-check/wear-check.wxml index 574a24f..08274ea 100644 --- a/miniprogram/pages/wear-check/wear-check.wxml +++ b/miniprogram/pages/wear-check/wear-check.wxml @@ -1,5 +1,5 @@ - + 确认佩戴 请确保面罩贴合面部