feat(ui): use face-map layout for report zones and manual region picker; restrict manual care to smart mode
- scan-report: replace zone card grid with the same oval face-map layout as treatment-setup, zones tinted by recommended light with mode label; restore the per-light legend under the map - manual-treatment: region picker now uses the same face-map layout - manual care mode selection is smart-mode only: entry link hidden for non-subscribers and the page itself checks subscription (free mode passes since the backend reports it as active)
这个提交包含在:
@@ -19,7 +19,8 @@ module.exports = {
|
||||
starting: '启动中...',
|
||||
noRegionSelected: '请至少选择一个区域',
|
||||
startFailed: '启动失败',
|
||||
entryLink: '手动选择波长护理 ›'
|
||||
entryLink: '手动选择波长护理 ›',
|
||||
smartOnly: '手动选择护理模式为智能模式专属,开通订阅后即可使用'
|
||||
},
|
||||
en: {
|
||||
navTitle: 'Manual Care',
|
||||
@@ -39,6 +40,7 @@ module.exports = {
|
||||
starting: 'Starting...',
|
||||
noRegionSelected: 'Please select at least one region',
|
||||
startFailed: 'Failed to start',
|
||||
entryLink: 'Manual wavelength care ›'
|
||||
entryLink: 'Manual wavelength care ›',
|
||||
smartOnly: 'Choosing a care mode manually is a Smart Mode feature. Subscribe to unlock it.'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,6 +48,23 @@ Page({
|
||||
onShow: function () {
|
||||
i18n.bind(this)
|
||||
this.refreshDurationOptions()
|
||||
this._checkAccess()
|
||||
},
|
||||
|
||||
// 手动选择护理模式为智能模式专属(果果 2026-07-28 定案)。普通模式用户不可用——
|
||||
// 入口链接已按订阅隐藏,此处兜底拦截直达(smart_mode_free 开启时后端返回 active,同样放行)。
|
||||
_checkAccess: function () {
|
||||
var http = require('../../utils/request')
|
||||
http.get('/api/v1/subscription').then(function (sub) {
|
||||
if (sub && sub.status === 'active') return
|
||||
wx.showModal({
|
||||
content: i18n.t('manual.smartOnly'),
|
||||
showCancel: false,
|
||||
complete: function () {
|
||||
wx.navigateBack({ fail: function () { wx.reLaunch({ url: '/pages/index/index' }) } })
|
||||
}
|
||||
})
|
||||
}).catch(function () {}) // 网络失败不拦(避免误伤),实际下发仍有 BLE/后端校验
|
||||
},
|
||||
|
||||
// Duration labels carry a dynamic number, which WXML cannot substitute, so
|
||||
|
||||
@@ -24,15 +24,13 @@
|
||||
</view>
|
||||
|
||||
<view class="page-title section-title">{{i18n.manual.regionTitle}}</view>
|
||||
<view class="region-grid">
|
||||
<view
|
||||
wx:for="{{regions}}"
|
||||
wx:key="key"
|
||||
class="region-chip {{item.checked ? 'active' : ''}}"
|
||||
bindtap="onToggleRegion"
|
||||
data-idx="{{index}}">
|
||||
{{i18n.common.regions[item.key]}}
|
||||
</view>
|
||||
<!-- 脸型图布局(与「使用设置」一致);位置↔idx:0=左 1=中上 2=中 3=中下 4=右 -->
|
||||
<view class="face-map">
|
||||
<view class="face-region forehead {{regions[1].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="1">{{i18n.common.regions.top}}</view>
|
||||
<view class="face-region left-cheek {{regions[0].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="0">{{i18n.common.regions.left}}</view>
|
||||
<view class="face-region right-cheek {{regions[4].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="4">{{i18n.common.regions.right}}</view>
|
||||
<view class="face-region nose {{regions[2].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="2">{{i18n.common.regions.middle}}</view>
|
||||
<view class="face-region chin {{regions[3].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="3">{{i18n.common.regions.bottom}}</view>
|
||||
</view>
|
||||
|
||||
<view class="page-title section-title">{{i18n.manual.durationTitle}}</view>
|
||||
|
||||
@@ -56,30 +56,33 @@
|
||||
}
|
||||
|
||||
/* region checkbox grid */
|
||||
.region-grid {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 20rpx;
|
||||
justify-content: center;
|
||||
/* face-map 脸型图(与 treatment-setup 同款) */
|
||||
.face-map {
|
||||
width: 240rpx;
|
||||
height: 280rpx;
|
||||
margin: 0 auto 24rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.region-chip {
|
||||
/* 与「使用设置」mode-option 同款卡片:等宽(3+2 排布)不拉伸、圆角 24rpx */
|
||||
padding: 24rpx 0;
|
||||
text-align: center;
|
||||
.face-region {
|
||||
position: absolute;
|
||||
border: 4rpx solid #e5e5e5;
|
||||
border-radius: 24rpx;
|
||||
font-size: 26rpx;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 22rpx;
|
||||
color: #999999;
|
||||
flex: 0 0 calc((100% - 40rpx) / 3);
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.region-chip.active {
|
||||
.face-region.active {
|
||||
border-color: #E6508C;
|
||||
background: rgba(230, 80, 140, 0.12);
|
||||
background: rgba(230, 80, 140, 0.2);
|
||||
color: #E6508C;
|
||||
}
|
||||
.face-region.forehead { top: 5%; left: 25%; width: 50%; height: 15%; border-radius: 40rpx 40rpx 50% 50%; }
|
||||
.face-region.left-cheek { top: 25%; left: 5%; width: 30%; height: 25%; }
|
||||
.face-region.right-cheek { top: 25%; right: 5%; width: 30%; height: 25%; }
|
||||
.face-region.nose { top: 45%; left: 35%; width: 30%; height: 18%; border-radius: 40%; }
|
||||
.face-region.chin { top: 68%; left: 25%; width: 50%; height: 20%; border-radius: 0 0 50% 50%; }
|
||||
|
||||
/* duration segmented control */
|
||||
.segmented {
|
||||
|
||||
@@ -30,17 +30,38 @@
|
||||
<view class="empty-hint" wx:else>{{i18n.report.noProblem}}</view>
|
||||
</view>
|
||||
|
||||
<!-- Face zones — 卡片栅格,与「使用设置」模式选择同款布局(果果 2026-07-28 要求,弃面罩大矩形) -->
|
||||
<!-- Face zones — 脸型图布局(与「使用设置」区域选择一致,果果 2026-07-28 定稿) -->
|
||||
<view class="card">
|
||||
<view class="card-title">{{i18n.report.faceTitle}}</view>
|
||||
<view class="zone-grid">
|
||||
<view class="zone-card {{item.colorClass}}" wx:for="{{faceZones}}" wx:key="key"
|
||||
bindtap="onTapZone" data-wave="{{item.waveKey}}">
|
||||
<view class="zone-card-name">{{item.name}}</view>
|
||||
<view class="zone-card-mode" wx:if="{{item.hasProblem}}">{{item.modeLabel}}</view>
|
||||
<view class="zone-card-level" wx:if="{{item.hasProblem}}">{{item.levelLabel}}</view>
|
||||
<view class="zone-card-mode" wx:if="{{!item.hasProblem}}">{{i18n.report.noProblem}}</view>
|
||||
<!-- 脸型图(与「使用设置」同款布局);位置↔faceZones 下标:1=中上 0=左 4=右 2=中 3=中下 -->
|
||||
<view class="face-map">
|
||||
<view class="face-region forehead {{faceZones[1].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[1].waveKey}}">
|
||||
<view class="fz-name">{{faceZones[1].name}}</view>
|
||||
<view class="fz-mode" wx:if="{{faceZones[1].hasProblem}}">{{faceZones[1].modeLabel}}</view>
|
||||
</view>
|
||||
<view class="face-region left-cheek {{faceZones[0].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[0].waveKey}}">
|
||||
<view class="fz-name">{{faceZones[0].name}}</view>
|
||||
<view class="fz-mode" wx:if="{{faceZones[0].hasProblem}}">{{faceZones[0].modeLabel}}</view>
|
||||
</view>
|
||||
<view class="face-region right-cheek {{faceZones[4].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[4].waveKey}}">
|
||||
<view class="fz-name">{{faceZones[4].name}}</view>
|
||||
<view class="fz-mode" wx:if="{{faceZones[4].hasProblem}}">{{faceZones[4].modeLabel}}</view>
|
||||
</view>
|
||||
<view class="face-region nose {{faceZones[2].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[2].waveKey}}">
|
||||
<view class="fz-name">{{faceZones[2].name}}</view>
|
||||
<view class="fz-mode" wx:if="{{faceZones[2].hasProblem}}">{{faceZones[2].modeLabel}}</view>
|
||||
</view>
|
||||
<view class="face-region chin {{faceZones[3].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[3].waveKey}}">
|
||||
<view class="fz-name">{{faceZones[3].name}}</view>
|
||||
<view class="fz-mode" wx:if="{{faceZones[3].hasProblem}}">{{faceZones[3].modeLabel}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 底部图例:各光简要功效(果果指定保留) -->
|
||||
<view class="face-legend">
|
||||
<view class="legend-item"><view class="legend-dot dot-red"></view><text class="legend-label">{{i18n.report.modeNames.red}}</text></view>
|
||||
<view class="legend-item"><view class="legend-dot dot-ir"></view><text class="legend-label">{{i18n.report.modeNames.ir}}</text></view>
|
||||
<view class="legend-item"><view class="legend-dot dot-uv"></view><text class="legend-label">{{i18n.report.modeNames.uv}}</text></view>
|
||||
<view class="legend-item"><view class="legend-dot dot-yellow"></view><text class="legend-label">{{i18n.report.modeNames.yellow}}</text></view>
|
||||
</view>
|
||||
<view class="face-tap-hint">{{i18n.report.faceTapHint}}</view>
|
||||
<view class="face-all-normal-hint" wx:if="{{!hasProblem}}">{{i18n.report.allNormalHint}}</view>
|
||||
|
||||
@@ -60,34 +60,50 @@
|
||||
|
||||
.empty-hint { color: #999; font-size: 26rpx; }
|
||||
|
||||
/* 分区卡片栅格 — 与「使用设置」mode-selector 同款:等宽圆角卡片,3+2 排布 */
|
||||
.zone-grid {
|
||||
/* 脸型图 — 与「使用设置」同款布局,放大以容纳模式名 */
|
||||
.face-map {
|
||||
width: 320rpx;
|
||||
height: 400rpx;
|
||||
margin: 0 auto 16rpx;
|
||||
position: relative;
|
||||
}
|
||||
.face-region {
|
||||
position: absolute;
|
||||
border: 3rpx solid #e5e5e5;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 20rpx;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: #FAFAFA;
|
||||
color: #999;
|
||||
}
|
||||
.zone-card {
|
||||
flex: 0 0 calc((100% - 40rpx) / 3);
|
||||
box-sizing: border-box;
|
||||
padding: 24rpx 12rpx;
|
||||
border: 4rpx solid #e5e5e5;
|
||||
border-radius: 24rpx;
|
||||
text-align: center;
|
||||
color: #666;
|
||||
}
|
||||
.zone-card:active { transform: scale(0.97); }
|
||||
.zone-card-name { font-size: 28rpx; font-weight: 600; color: inherit; }
|
||||
.zone-card-mode { font-size: 22rpx; margin-top: 6rpx; }
|
||||
.zone-card-level { font-size: 20rpx; margin-top: 2rpx; opacity: 0.85; }
|
||||
.face-region:active { transform: scale(0.96); }
|
||||
.fz-name { font-size: 22rpx; font-weight: 600; }
|
||||
.fz-mode { font-size: 18rpx; margin-top: 2rpx; }
|
||||
.face-region.forehead { top: 5%; left: 25%; width: 50%; height: 15%; border-radius: 40rpx 40rpx 50% 50%; }
|
||||
.face-region.left-cheek { top: 25%; left: 5%; width: 30%; height: 25%; }
|
||||
.face-region.right-cheek { top: 25%; right: 5%; width: 30%; height: 25%; }
|
||||
.face-region.nose { top: 45%; left: 35%; width: 30%; height: 18%; border-radius: 40%; }
|
||||
.face-region.chin { top: 68%; left: 25%; width: 50%; height: 20%; border-radius: 0 0 50% 50%; }
|
||||
|
||||
/* 波长配色(置于 .zone-card 之后以覆盖默认边框/文字色) */
|
||||
.zone-red { background: rgba(232, 93, 93, 0.10); border-color: rgba(232, 93, 93, 0.55); color: #B23C3C; }
|
||||
.zone-ir { background: rgba(192, 107, 74, 0.10); border-color: rgba(192, 107, 74, 0.55); color: #8C4A2E; }
|
||||
.zone-uv { background: rgba(142, 107, 216, 0.10); border-color: rgba(142, 107, 216, 0.55); color: #5F3FAE; }
|
||||
.zone-yellow { background: rgba(232, 185, 61, 0.12); border-color: rgba(232, 185, 61, 0.6); color: #8A6A10; }
|
||||
/* 波长配色(置于 .face-region 之后以覆盖默认色) */
|
||||
.zone-red { background: rgba(232, 93, 93, 0.14); border-color: rgba(232, 93, 93, 0.55); color: #B23C3C; }
|
||||
.zone-ir { background: rgba(192, 107, 74, 0.14); border-color: rgba(192, 107, 74, 0.55); color: #8C4A2E; }
|
||||
.zone-uv { background: rgba(142, 107, 216, 0.14); border-color: rgba(142, 107, 216, 0.55); color: #5F3FAE; }
|
||||
.zone-yellow { background: rgba(232, 185, 61, 0.16); border-color: rgba(232, 185, 61, 0.6); color: #8A6A10; }
|
||||
.zone-none { background: #FAFAFA; border-color: #e5e5e5; color: #999; }
|
||||
|
||||
/* 底部图例:各光简要功效 */
|
||||
.face-legend { display: flex; flex-wrap: wrap; justify-content: center; margin-top: 8rpx; }
|
||||
.legend-item { display: flex; align-items: center; margin: 0 16rpx 10rpx 0; }
|
||||
.legend-dot { width: 16rpx; height: 16rpx; border-radius: 50%; margin-right: 8rpx; }
|
||||
.dot-red { background: #E85D5D; }
|
||||
.dot-ir { background: #C06B4A; }
|
||||
.dot-uv { background: #8E6BD8; }
|
||||
.dot-yellow { background: #E8B93D; }
|
||||
.legend-label { font-size: 22rpx; color: #888; }
|
||||
|
||||
.face-tap-hint { font-size: 22rpx; color: #bbb; margin-top: 14rpx; text-align: center; }
|
||||
.face-all-normal-hint { font-size: 24rpx; color: #6BBF59; text-align: center; margin-top: 12rpx; }
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
{{i18n.setup.startBtn}}
|
||||
</button>
|
||||
|
||||
<view class="manual-entry" bindtap="onManual" style="text-align:center;color:#E8503A;font-size:26rpx;margin-top:28rpx;">{{i18n.manual.entryLink}}</view>
|
||||
<view class="manual-entry" wx:if="{{!subExpired}}" bindtap="onManual" style="text-align:center;color:#E8503A;font-size:26rpx;margin-top:28rpx;">{{i18n.manual.entryLink}}</view>
|
||||
|
||||
<view class="error-text" wx:if="{{error}}">{{error}}</view>
|
||||
</view>
|
||||
|
||||
在新工单中引用
屏蔽一个用户