zhy.he/jw-beauty
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

fix: remove all medical device terms from user-facing text

浏览代码 
Replace '光子美容仪' with '智美'/'智能面膜'/'我的设备' throughout.
Replace '护理' with '使用' in all UI text.
Replace '皮肤' with '检测'/'智能' where applicable.
Replace 🌸 with 💎 for brand identity.
Internal code (variable names, API paths, file names) unchanged.
这个提交包含在：
Guoguo
2026-05-29 01:34:54 -07:00
父节点 22110e866a
当前提交 aff8c2d9b5
共修改 30 个文件，包含 69 行新增和 69 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件
miniprogram/pages/auto-scan/auto-scan.wxml
+2 -2
查看文件
@@ -15,7 +15,7 @@
</view>
<view class="scan-hint">请将面罩对准面部</view>
<view class="scan-hint" style="font-size:24rpx;color:#999;margin-top:8rpx;">连接设备后可获取皮肤数据</view>
<view class="scan-hint" style="font-size:24rpx;color:#999;margin-top:8rpx;">连接设备后可获取检测数据</view>
<view class="scan-progress" wx:if="{{scanning}}">
正在扫描... <text class="highlight">{{regionData.length || 3}}</text> 个区域
@@ -25,6 +25,6 @@
<text class="detected-tag" wx:for="{{regionData}}" wx:key="region">{{item.region}}</text>
</view>
<button class="btn-primary mt-30" wx:if="{{!scanning}}" bindtap="onNext">设置护理参数</button>
<button class="btn-primary mt-30" wx:if="{{!scanning}}" bindtap="onNext">设置参数</button>
</view>
</view>
miniprogram/pages/ble-connect/ble-connect.wxml
+1 -1
查看文件
@@ -18,7 +18,7 @@
<view class="found-card" wx:if="{{state === 'binding'}}">
<view class="found-icon">💆</view>
<view class="found-name">光子美容仪-{{deviceId}}</view>
<view class="found-name">智能面膜-{{deviceId}}</view>
<text class="status-badge status-badge-green">正在配对...</text>
</view>
miniprogram/pages/history/history.json
+1 -1
查看文件
@@ -1,5 +1,5 @@
{
"navigationBarTitleText": "护理记录",
"navigationBarTitleText": "使用记录",
"navigationBarBackgroundColor": "#E6508C",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": true
miniprogram/pages/history/history.wxml
+1 -1
查看文件
@@ -25,7 +25,7 @@
<view class="empty-state" wx:if="{{!loading && records.length === 0}}">
<text class="empty-icon">📃</text>
<view class="empty-text">暂无护理记录</view>
<view class="empty-text">暂无使用记录</view>
</view>
<view class="loading-more" wx:if="{{loadingMore}}">加载更多...</view>
miniprogram/pages/index/index.wxml
+2 -2
查看文件
@@ -15,7 +15,7 @@
<view class="page-content" wx:if="{{!loading && hasDevice}}">
<view class="device-card">
<view class="device-card-icon">💆</view>
<view class="device-card-name">{{deviceName || '光子美容仪'}}</view>
<view class="device-card-name">{{deviceName || '我的设备'}}</view>
<view class="device-card-status">
<text class="status-badge status-badge-green" wx:if="{{connected}}">已连接</text>
<text class="status-badge" style="background:#ccc;" wx:else>未连接</text>
@@ -34,7 +34,7 @@
</view>
<view class="action-buttons">
<button class="btn-primary" bindtap="onStartTreatment">开始护理</button>
<button class="btn-primary" bindtap="onStartTreatment">开始使用</button>
<button class="btn-secondary" bindtap="onManageDevice">设备管理</button>
</view>
</view>
miniprogram/pages/login/login.wxml
+3 -3
查看文件
@@ -1,14 +1,14 @@
<view class="page">
<view class="page-header page-header-pink" style="padding-top: {{statusBarHeight + 24}}px;">
<view class="page-header-title">光子美容仪</view>
<view class="page-header-title">智美</view>
<view class="page-header-subtitle">微信登录</view>
</view>
<view class="page-content">
<view class="welcome-text">欢迎使用光子美容仪</view>
<view class="welcome-text">欢迎使用智美</view>
<view class="flower-area">
<text class="flower">🌸</text>
<text class="flower">💎</text>
<view class="desc">登录后即可使用全部功能</view>
</view>
miniprogram/pages/profile/profile.wxml
+1 -1
查看文件
@@ -40,7 +40,7 @@
</view>
<view class="menu-item" bindtap="onViewHistory">
<view class="menu-icon">📋</view>
<view class="menu-text">护理记录</view>
<view class="menu-text">使用记录</view>
<text class="menu-arrow">›</text>
</view>
<view class="menu-item" bindtap="onViewSubscription">
miniprogram/pages/register/register.wxml
+1 -1
查看文件
@@ -1,6 +1,6 @@
<view class="page">
<view class="page-header page-header-pink" style="padding-top: {{statusBarHeight + 24}}px;">
<view class="page-header-title">光子美容仪</view>
<view class="page-header-title">智美</view>
<view class="page-header-subtitle">完善个人资料</view>
</view>
miniprogram/pages/subscribe-plans/subscribe-plans.wxml
+1 -1
查看文件
@@ -29,7 +29,7 @@
<view class="service-icon">✨</view>
<view class="service-info">
<view class="service-name">智能模式</view>
<view class="service-desc">根据皮肤状态自动调节</view>
<view class="service-desc">智能自动调节</view>
</view>
</view>
miniprogram/pages/subscribe-prompt/subscribe-prompt.wxml
+2 -2
查看文件
@@ -1,12 +1,12 @@
<view class="page">
<view class="page-header page-header-pink" style="padding-top: {{statusBarHeight + 24}}px;">
<view class="nav-back" bindtap="onBack">‹ 返回</view>
<view class="page-header-title">护理设置</view>
<view class="page-header-title">使用设置</view>
<view class="page-header-subtitle">试用期已结束</view>
</view>
<view class="page-content">
<view class="page-title">选择护理模式</view>
<view class="page-title">选择模式</view>
<view class="mode-selector">
<view class="mode-option active">
miniprogram/pages/treating/treating.js
+7 -7
查看文件
@@ -16,17 +16,17 @@ Page({
paused: false,
completed: false,
startedAt: 0,
regionText: '全脸护理',
regionText: '全脸使用',
},
_getRegionText: function (regionMask) {
var REGION_MAP = {1:'左脸', 2:'右脸', 4:'额头', 8:'下巴', 16:'鼻', 32:'左眼', 64:'右眼'}
if (regionMask === 0x7F) return '全脸护理'
if (regionMask === 0x7F) return '全脸使用'
var names = []
for (var bit in REGION_MAP) {
if (regionMask & parseInt(bit)) names.push(REGION_MAP[bit])
}
return names.length > 0 ? names.join('+') + '护理' : '全脸护理'
return names.length > 0 ? names.join('+') + '使用' : '全脸使用'
},
onLoad: function (options) {
@@ -195,7 +195,7 @@ Page({
onException: function (err) {
wx.showModal({
title: '设备异常',
content: err.error_msg || '护理过程中出现异常',
content: err.error_msg || '使用过程中出现异常',
showCancel: false,
complete: function () {
wx.navigateBack()
@@ -229,7 +229,7 @@ Page({
}
wx.showModal({
title: '连接丢失',
content: '设备蓝牙连接已断开，无法恢复。本次护理数据将保存。',
content: '设备蓝牙连接已断开，无法恢复。本次使用数据将保存。',
showCancel: false,
complete: function () {
self.finishAsComplete()
@@ -244,8 +244,8 @@ Page({
onStop: function () {
var self = this
wx.showModal({
title: '结束护理',
content: '确定要提前结束本次护理吗？',
title: '结束使用',
content: '确定要提前结束本次使用吗？',
success: function (res) {
if (res.confirm) {
ble.stopTreatment().catch(function () {}).then(function () {
miniprogram/pages/treating/treating.json
+1 -1
查看文件
@@ -1,4 +1,4 @@
{
"navigationStyle": "custom",
"navigationBarTitleText": "护理中"
"navigationBarTitleText": "使用中"
}
miniprogram/pages/treating/treating.wxml
+4 -4
查看文件
@@ -1,8 +1,8 @@
<view class="page">
<view class="page-header page-header-blue" style="padding-top: {{statusBarHeight + 24}}px;">
<view class="nav-back nav-back-light" bindtap="onBack">‹ 返回</view>
<view class="page-header-title">护理中</view>
<view class="page-header-subtitle">正在护理...</view>
<view class="page-header-title">使用中</view>
<view class="page-header-subtitle">正在使用...</view>
</view>
<view class="page-content">
@@ -23,10 +23,10 @@
<text class="relax-icon">💆</text>
<view class="relax-text">
<text>请放松心情</text>
<text>享受护理时光</text>
<text>享受美好时光</text>
</view>
</view>
<button class="btn-primary btn-primary-red" bindtap="onStop">停止护理</button>
<button class="btn-primary btn-primary-red" bindtap="onStop">停止使用</button>
</view>
</view>
miniprogram/pages/treatment-done/treatment-done.json
+1 -1
查看文件
@@ -1,4 +1,4 @@
{
"navigationStyle": "custom",
"navigationBarTitleText": "护理完成"
"navigationBarTitleText": "使用完成"
}
miniprogram/pages/treatment-done/treatment-done.wxml
+6 -6
查看文件
@@ -1,28 +1,28 @@
<view class="page">
<view class="page-header page-header-green" style="padding-top: {{statusBarHeight + 24}}px;">
<view class="nav-back" bindtap="onBack">‹ 返回</view>
<view class="page-header-title">护理完成</view>
<view class="page-header-subtitle">本次护理已结束</view>
<view class="page-header-title">使用完成</view>
<view class="page-header-subtitle">本次使用已结束</view>
</view>
<view class="page-content">
<view class="result-icon">✓</view>
<view class="result-title">护理完成！</view>
<view class="result-title">使用完成！</view>
<view class="result-data">
<view class="result-item">
<view class="result-value">{{durationText}}</view>
<view class="result-label">护理时长</view>
<view class="result-label">使用时长</view>
</view>
<view class="result-item">
<view class="result-value">{{regionNames.length}}</view>
<view class="result-label">护理区域</view>
<view class="result-label">使用区域</view>
</view>
</view>
<view class="result-tip">
<text class="result-tip-icon">✨</text>
<text class="result-tip-text">本次护理已记录</text>
<text class="result-tip-text">本次使用已记录</text>
</view>
<button class="btn-primary" bindtap="onBackHome">返回首页</button>
miniprogram/pages/treatment-setup/treatment-setup.json
+1 -1
查看文件
@@ -1,4 +1,4 @@
{
"navigationStyle": "custom",
"navigationBarTitleText": "护理设置"
"navigationBarTitleText": "使用设置"
}
miniprogram/pages/treatment-setup/treatment-setup.wxml
+5 -5
查看文件
@@ -1,12 +1,12 @@
<view class="page">
<view class="page-header page-header-pink" style="padding-top: {{statusBarHeight + 24}}px;">
<view class="nav-back" bindtap="onBack">‹ 返回</view>
<view class="page-header-title">护理设置</view>
<view class="page-header-title">使用设置</view>
<view class="page-header-subtitle">选择模式和区域</view>
</view>
<view class="page-content">
<view class="page-title">选择护理模式</view>
<view class="page-title">选择模式</view>
<view class="mode-selector">
<view class="mode-option {{selectedMode === 0 ? 'active' : ''}}" bindtap="onSelectMode" data-value="0">
@@ -22,8 +22,8 @@
</view>
</view>
<view class="page-title" style="font-size:28rpx;">选择护理区域</view>
<view class="mode-tip" wx:if="{{selectedMode === 0}}">普通模式固定 10 分钟，护理区域默认全脸，不可调整</view>
<view class="page-title" style="font-size:28rpx;">选择区域</view>
<view class="mode-tip" wx:if="{{selectedMode === 0}}">普通模式固定 10 分钟，使用区域默认全脸，不可调整</view>
<view class="face-map">
<view class="face-region forehead {{regions[2].checked ? 'active' : ''}} {{selectedMode === 0 ? 'disabled' : ''}}" bindtap="onToggleRegion" data-idx="2">额头</view>
@@ -34,7 +34,7 @@
</view>
<button class="btn-primary" bindtap="onStart" disabled="{{submitting}}" loading="{{submitting}}">
开始护理
开始使用
</button>
<view class="error-text" wx:if="{{error}}">{{error}}</view>
miniprogram/pages/wear-check/wear-check.wxml
+2 -2
查看文件
@@ -10,7 +10,7 @@
<view class="device-row-icon">💆</view>
<view class="device-row-info">
<view class="device-row-name">
光子美容仪
智能面膜
<text class="status-badge status-badge-green" wx:if="{{connected}}">已连接</text>
<text class="status-badge" style="background:#ccc;" wx:else>未连接</text>
</view>
@@ -40,6 +40,6 @@
<text class="check-fail">{{error}}</text>
</view>
<button wx:if="{{result === 'ok'}}" class="btn-primary mt-30" bindtap="onNext">设置护理参数</button>
<button wx:if="{{result === 'ok'}}" class="btn-primary mt-30" bindtap="onNext">设置参数</button>
</view>
</view>