diff --git a/miniprogram/lefu/service.ts b/miniprogram/lefu/service.ts index 3a86348..09c1de2 100644 --- a/miniprogram/lefu/service.ts +++ b/miniprogram/lefu/service.ts @@ -20,10 +20,10 @@ const plugin = requirePlugin('ppScale-plugin') as LeFuPlugin const LEFU_CONFIG: LeFuConfig = { key: 'lefudc91611833e18d94', secret: 'eQ50JYimMp0X7uhNLj6D3lTEk4TUUvEG7dvaqKM9t1U=', - // domain1: 'http://10.10.10.10:8889', - // domain2: 'http://10.10.10.10:8889/weight', - domain1: 'http://device.shuziweidao.com:80/gateway', - domain2: 'http://device.shuziweidao.com:80/weight', + domain1: 'http://10.10.10.10:8889', + domain2: 'http://10.10.10.10:8889/weight', + // domain1: 'http://device.shuziweidao.com:80/gateway', + // domain2: 'http://device.shuziweidao.com:80/weight', } /** 支持的设备型号配置列表（5款） */ @@ -427,7 +427,7 @@ class LeFuService { let syncTimer: number | null = null const resetTimer = () => { if (syncTimer !== null) clearTimeout(syncTimer) - syncTimer = setTimeout(() => reject(new Error(`第 ${index + 1} 个用户下发超时`)), 15000) + syncTimer = setTimeout(() => reject(new Error(`请求超时`)), 15000) } const syncNext = () => { if (index >= members.length) { diff --git a/miniprogram/pages/connectedWifi/connectedWifi.less b/miniprogram/pages/connectedWifi/connectedWifi.less index 429f8f4..8b4adfa 100644 --- a/miniprogram/pages/connectedWifi/connectedWifi.less +++ b/miniprogram/pages/connectedWifi/connectedWifi.less @@ -141,7 +141,6 @@ overflow: hidden; margin-right: 24rpx; border-radius: 24rpx; - background-color: red; flex-shrink: 0; } diff --git a/miniprogram/pages/equipmentMember/equipmentMember.less b/miniprogram/pages/equipmentMember/equipmentMember.less index 40fcc73..960955f 100644 --- a/miniprogram/pages/equipmentMember/equipmentMember.less +++ b/miniprogram/pages/equipmentMember/equipmentMember.less @@ -120,10 +120,6 @@ overflow: hidden; margin-bottom: 20rpx; - &:first-of-type { - - } - /* 容量小标题 */ .member-card-header { width: 100%; @@ -342,10 +338,11 @@ /* 删除确认弹窗 — 仿原生 wx.showModal 风格 */ .delete-modal-mask { position: fixed; - top: 0; + top: -10vh; left: 0; right: 0; bottom: 0; + margin: auto; z-index: 999; display: flex; align-items: center; @@ -354,23 +351,24 @@ } .delete-modal { - width: 540rpx; - border-radius: 16rpx; + width: 650rpx; + padding-top: 50rpx; + border-radius: 24rpx; background-color: #FFFFFF; - overflow: hidden; } .delete-modal-title { width: 100%; - padding-top: 40rpx; - text-align: center; - font-size: 34rpx; - font-weight: 500; + height: 40rpx; + line-height: 40rpx; color: #000000; + text-align: center; + font-size: 36rpx; + font-weight: bolder; } .delete-modal-content { - padding: 32rpx 32rpx 40rpx; + padding: 40rpx 0 60rpx; font-size: 28rpx; color: #353535; line-height: 44rpx; @@ -378,32 +376,30 @@ } .delete-modal-warning { - color: #FF4D4F; - font-weight: bold; + color: #F24439; } .delete-modal-footer { width: 100%; - height: 88rpx; + height: 110rpx; display: flex; - border-top: 1rpx solid rgba(0, 0, 0, 0.1); + border-top: 2rpx solid #EAECF1; } .delete-modal-btn { flex: 1; - height: 88rpx; - line-height: 88rpx; + height: 110rpx; + line-height: 110rpx; text-align: center; - font-size: 32rpx; + font-size: 36rpx; } .delete-modal-btn-cancel { - color: #000000; - border-right: 1rpx solid rgba(0, 0, 0, 0.1); + color: #77849E; + border-right: 2rpx solid #EAECF1; } .delete-modal-btn-confirm { - color: #000000; - font-weight: bold; + color: #1385FA; } } diff --git a/miniprogram/pages/equipmentMember/equipmentMember.ts b/miniprogram/pages/equipmentMember/equipmentMember.ts index fbce78f..380bc32 100644 --- a/miniprogram/pages/equipmentMember/equipmentMember.ts +++ b/miniprogram/pages/equipmentMember/equipmentMember.ts @@ -289,15 +289,17 @@ Page({ showDeleteModal: false, deleteTarget: null, }) - - wx.showLoading({ title: '正在同步设备数据...', mask: true }) + + wx.showLoading({ title: '加载中...', mask: true }) + console.log('正在同步设备数据...') let devicePromise: Promise if (merged.length) { devicePromise = lefuService.syncMembersToDevice( merged.map(toDeviceMember), (current, total) => { - wx.showLoading({ title: `正在同步设备数据 ${current}/${total}...`, mask: true }) + wx.showLoading({ title: `加载中...`, mask: true }) + console.log(`正在同步设备数据 ${current}/${total}...`) }, ) } else { diff --git a/miniprogram/pages/equipmentMember/equipmentMember.wxml b/miniprogram/pages/equipmentMember/equipmentMember.wxml index ce7217b..af3da23 100644 --- a/miniprogram/pages/equipmentMember/equipmentMember.wxml +++ b/miniprogram/pages/equipmentMember/equipmentMember.wxml @@ -133,15 +133,15 @@ 确认删除 - '{{ deleteTarget.realname }}'用户为他人添加，请确认是否删除 + "{{ deleteTarget.realname }}"用户为他人添加，请确认是否删除 - 确定要删除用户「{{ deleteTarget.realname }}」吗？删除后将同步更新设备数据。 + 确定删除"{{ deleteTarget.realname }}"吗？删除后将不再显示 取消 - 确定删除 + 删除 diff --git a/miniprogram/pages/supplementPersonal/supplementPersonal.ts b/miniprogram/pages/supplementPersonal/supplementPersonal.ts index 2856b13..8eecec8 100644 --- a/miniprogram/pages/supplementPersonal/supplementPersonal.ts +++ b/miniprogram/pages/supplementPersonal/supplementPersonal.ts @@ -317,7 +317,7 @@ Page({ isSelf: true, } - wx.showLoading({ title: '正在下发主用户...', mask: true }) + wx.showLoading({ title: '加载中...', mask: true }) lefuService.syncMembersToDevice([mainUser]) .then(() => { wx.hideLoading() diff --git a/miniprogram/utils/request/index.ts b/miniprogram/utils/request/index.ts index 7921630..e8f0106 100644 --- a/miniprogram/utils/request/index.ts +++ b/miniprogram/utils/request/index.ts @@ -2,8 +2,8 @@ import type { ApiResponse, HttpMethod, RequestOptions } from './types' export type { ApiResponse, RequestOptions } -// const BASE_URL = 'http://10.10.10.10:8889/' // 测试环境 -const BASE_URL = 'https://device.shuziweidao.com/gateway/' // 正式环境 +const BASE_URL = 'http://10.10.10.10:8889/' // 测试环境 +// const BASE_URL = 'https://device.shuziweidao.com/gateway/' // 正式环境 let _loadingCount = 0