feat(ui): redesign all miniprogram pages
- 全局样式改为粉色(#E6508C)/金色(#DCB982)/绿色(#52c41a)配色
- 所有非tab页使用自定义导航栏,带彩色头部+标题+副标题
- login页: 粉色头部+🌸图标+微信授权登录
- scan页: 粉色头部+虚线扫码框+手动输入按钮
- ble-connect页: 蓝牙提示+搜索中/已发现设备卡片
- bind-success页: 绿色头部+成功图标+7天试用提示卡
- wear-check页: 设备信息行+佩戴指引卡片
- index首页: 粉色设备卡片+开始护理/设备管理按钮
- treatment-setup页: 模式选择+面部地图选区域
- auto-scan页: 面部轮廓+扫描线动画+检测标签
- treating页: 蓝色头部+大倒计时+渐变进度条+放松提示
- treatment-done页: 绿色头部+统计卡片+已记录提示
- subscribe-prompt页: 普通/智能模式对比+试用提示+金色订阅按钮
- subscribe-plans页: 金色头部+服务卡片+月卡/年卡选择
- subscribe-success页: 绿色头部+订阅详情卡+金色按钮
- profile页: 渐变头部+用户行+订阅卡+菜单列表
- history页: 粉色统计行+模式标签记录列表
这个提交包含在:
@@ -7,34 +7,30 @@ Page({
|
||||
{ name: '右脸颊', mask: 0x02, checked: true },
|
||||
{ name: '额头', mask: 0x04, checked: true },
|
||||
{ name: '下巴', mask: 0x08, checked: true },
|
||||
{ name: '鼻部', mask: 0x10, checked: true },
|
||||
{ name: '左眼周', mask: 0x20, checked: false },
|
||||
{ name: '右眼周', mask: 0x40, checked: false }
|
||||
],
|
||||
wavelengthOptions: [
|
||||
{ name: '红光 630nm', value: 2, desc: '抗衰修复' },
|
||||
{ name: '红外 850nm', value: 1, desc: '深层修复' },
|
||||
{ name: '紫光 405nm', value: 3, desc: '祛痘消炎' },
|
||||
{ name: '黄光 590nm', value: 4, desc: '提亮肤色' }
|
||||
],
|
||||
selectedWavelength: 2,
|
||||
brightness: 200,
|
||||
durationOptions: [
|
||||
{ label: '5分钟', value: 300000 },
|
||||
{ label: '10分钟', value: 600000 },
|
||||
{ label: '15分钟', value: 900000 },
|
||||
{ label: '20分钟', value: 1200000 }
|
||||
],
|
||||
selectedDuration: 600000,
|
||||
modeOptions: [
|
||||
{ name: '普通模式', value: 0 },
|
||||
{ name: '智能模式', value: 1 }
|
||||
{ name: '鼻唇', mask: 0x10, checked: true }
|
||||
],
|
||||
selectedMode: 0,
|
||||
subExpired: false,
|
||||
subDays: 6,
|
||||
submitting: false,
|
||||
error: ''
|
||||
},
|
||||
|
||||
onLoad: function () {
|
||||
this.checkSubscription()
|
||||
},
|
||||
|
||||
checkSubscription: function () {
|
||||
var http = require('../../utils/request')
|
||||
var self = this
|
||||
http.get('/api/v1/subscription/status').then(function (sub) {
|
||||
self.setData({
|
||||
subExpired: sub.status !== 'active',
|
||||
subDays: sub.remaining_days || 0
|
||||
})
|
||||
}).catch(function () {})
|
||||
},
|
||||
|
||||
onToggleRegion: function (e) {
|
||||
var idx = e.currentTarget.dataset.idx
|
||||
var regions = this.data.regions
|
||||
@@ -42,27 +38,13 @@ Page({
|
||||
this.setData({ regions: regions })
|
||||
},
|
||||
|
||||
onSelectAll: function () {
|
||||
var regions = this.data.regions.map(function (r) {
|
||||
return Object.assign({}, r, { checked: true })
|
||||
})
|
||||
this.setData({ regions: regions })
|
||||
},
|
||||
|
||||
onSelectWavelength: function (e) {
|
||||
this.setData({ selectedWavelength: e.currentTarget.dataset.value })
|
||||
},
|
||||
|
||||
onBrightnessChange: function (e) {
|
||||
this.setData({ brightness: parseInt(e.detail.value) })
|
||||
},
|
||||
|
||||
onSelectDuration: function (e) {
|
||||
this.setData({ selectedDuration: e.currentTarget.dataset.value })
|
||||
},
|
||||
|
||||
onSelectMode: function (e) {
|
||||
this.setData({ selectedMode: e.currentTarget.dataset.value })
|
||||
var mode = parseInt(e.currentTarget.dataset.value)
|
||||
if (mode === 1 && this.data.subExpired) {
|
||||
wx.navigateTo({ url: '/pages/subscribe-prompt/subscribe-prompt' })
|
||||
return
|
||||
}
|
||||
this.setData({ selectedMode: mode })
|
||||
},
|
||||
|
||||
onStart: function () {
|
||||
@@ -81,9 +63,9 @@ Page({
|
||||
|
||||
ble.setParams({
|
||||
region_mask: mask,
|
||||
wavelength: self.data.selectedWavelength,
|
||||
brightness: self.data.brightness,
|
||||
duration_ms: self.data.selectedDuration,
|
||||
wavelength: 2,
|
||||
brightness: 200,
|
||||
duration_ms: 600000,
|
||||
mode: self.data.selectedMode
|
||||
}).then(function () {
|
||||
return ble.startTreatment(mask)
|
||||
@@ -91,8 +73,8 @@ Page({
|
||||
self.setData({ submitting: false })
|
||||
wx.redirectTo({
|
||||
url: '/pages/treating/treating?regions=' + mask +
|
||||
'&wavelength=' + self.data.selectedWavelength +
|
||||
'&duration=' + self.data.selectedDuration +
|
||||
'&wavelength=2' +
|
||||
'&duration=600000' +
|
||||
'&mode=' + self.data.selectedMode
|
||||
})
|
||||
}).catch(function (err) {
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTitleText": "护理设置"
|
||||
}
|
||||
|
||||
@@ -1,62 +1,40 @@
|
||||
<view class="container">
|
||||
<view class="card">
|
||||
<view class="section-title">护理区域</view>
|
||||
<view class="region-grid">
|
||||
<view wx:for="{{regions}}" wx:key="mask" class="region-item {{item.checked ? 'region-active' : ''}}"
|
||||
bindtap="onToggleRegion" data-idx="{{index}}">
|
||||
<text>{{item.name}}</text>
|
||||
<view class="page">
|
||||
<view class="page-header page-header-pink">
|
||||
<view class="page-header-title">护理设置</view>
|
||||
<view class="page-header-subtitle">选择模式和区域</view>
|
||||
</view>
|
||||
|
||||
<view class="page-content">
|
||||
<view class="page-title">选择护理模式</view>
|
||||
|
||||
<view class="mode-selector">
|
||||
<view class="mode-option {{selectedMode === 0 ? 'active' : ''}}" bindtap="onSelectMode" data-value="0">
|
||||
<text class="mode-icon">🔄</text>
|
||||
<view class="mode-label">普通模式</view>
|
||||
<view class="mode-sub">6色循环</view>
|
||||
</view>
|
||||
<view class="mode-option {{selectedMode === 1 ? 'active' : ''}} {{subExpired ? 'locked' : ''}}" bindtap="onSelectMode" data-value="1">
|
||||
<text class="mode-icon">✨</text>
|
||||
<view class="mode-label">智能模式</view>
|
||||
<view class="mode-sub" wx:if="{{!subExpired}}">剩余{{subDays}}天</view>
|
||||
<view class="mode-sub" wx:else>订阅解锁</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn-select-all mt-10" bindtap="onSelectAll">全选</view>
|
||||
</view>
|
||||
|
||||
<view class="card">
|
||||
<view class="section-title">波长选择</view>
|
||||
<view class="wavelength-list">
|
||||
<view wx:for="{{wavelengthOptions}}" wx:key="value"
|
||||
class="wavelength-item {{selectedWavelength === item.value ? 'wavelength-active' : ''}}"
|
||||
bindtap="onSelectWavelength" data-value="{{item.value}}">
|
||||
<text class="wavelength-name">{{item.name}}</text>
|
||||
<text class="wavelength-desc">{{item.desc}}</text>
|
||||
</view>
|
||||
<view class="page-title" style="font-size:28rpx;">选择护理区域</view>
|
||||
|
||||
<view class="face-map">
|
||||
<view class="face-region forehead {{regions[2].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="2">额头</view>
|
||||
<view class="face-region left-cheek {{regions[0].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="0">左脸</view>
|
||||
<view class="face-region right-cheek {{regions[1].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="1">右脸</view>
|
||||
<view class="face-region nose {{regions[4].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="4">鼻唇</view>
|
||||
<view class="face-region chin {{regions[3].checked ? 'active' : ''}}" bindtap="onToggleRegion" data-idx="3">下巴</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card">
|
||||
<view class="section-title">亮度: {{brightness}}</view>
|
||||
<slider min="0" max="255" value="{{brightness}}" bindchange="onBrightnessChange"
|
||||
activeColor="#333333" block-size="20" />
|
||||
</view>
|
||||
<button class="btn-primary" bindtap="onStart" disabled="{{submitting}}" loading="{{submitting}}">
|
||||
开始护理
|
||||
</button>
|
||||
|
||||
<view class="card">
|
||||
<view class="section-title">护理时长</view>
|
||||
<view class="duration-list">
|
||||
<view wx:for="{{durationOptions}}" wx:key="value"
|
||||
class="duration-item {{selectedDuration === item.value ? 'duration-active' : ''}}"
|
||||
bindtap="onSelectDuration" data-value="{{item.value}}">
|
||||
{{item.label}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card">
|
||||
<view class="section-title">护理模式</view>
|
||||
<view class="mode-list">
|
||||
<view wx:for="{{modeOptions}}" wx:key="value"
|
||||
class="mode-item {{selectedMode === item.value ? 'mode-active' : ''}}"
|
||||
bindtap="onSelectMode" data-value="{{item.value}}">
|
||||
{{item.name}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view wx:if="{{error}}" class="card">
|
||||
<text class="text-error">{{error}}</text>
|
||||
</view>
|
||||
|
||||
<view class="btn-area-fixed">
|
||||
<view class="btn-primary" bindtap="onStart" disabled="{{submitting}}">
|
||||
{{submitting ? '启动中...' : '开始护理'}}
|
||||
</view>
|
||||
<view class="error-text" wx:if="{{error}}">{{error}}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -1,98 +1,120 @@
|
||||
.region-grid {
|
||||
.mode-selector {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 16rpx;
|
||||
gap: 20rpx;
|
||||
margin-bottom: 32rpx;
|
||||
}
|
||||
|
||||
.region-item {
|
||||
padding: 12rpx 24rpx;
|
||||
border-radius: 8rpx;
|
||||
background-color: #f0f0f0;
|
||||
font-size: 26rpx;
|
||||
color: #666666;
|
||||
.mode-option {
|
||||
flex: 1;
|
||||
padding: 28rpx 20rpx;
|
||||
border: 4rpx solid #e5e5e5;
|
||||
border-radius: 24rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.region-active {
|
||||
background-color: #333333;
|
||||
color: #ffffff;
|
||||
.mode-option.active {
|
||||
border-color: #E6508C;
|
||||
background: #fdf2f8;
|
||||
}
|
||||
|
||||
.btn-select-all {
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
text-align: right;
|
||||
.mode-option.locked {
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.wavelength-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12rpx;
|
||||
.mode-icon {
|
||||
font-size: 48rpx;
|
||||
display: block;
|
||||
margin-bottom: 8rpx;
|
||||
}
|
||||
|
||||
.wavelength-item {
|
||||
padding: 20rpx;
|
||||
border: 2rpx solid #eeeeee;
|
||||
border-radius: 8rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.wavelength-active {
|
||||
border-color: #333333;
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
.wavelength-name {
|
||||
.mode-label {
|
||||
font-size: 28rpx;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.wavelength-desc {
|
||||
font-size: 24rpx;
|
||||
.mode-option.locked .mode-label {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.duration-list {
|
||||
.mode-sub {
|
||||
font-size: 22rpx;
|
||||
color: #999999;
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
|
||||
.mode-option.active .mode-sub {
|
||||
color: #E6508C;
|
||||
}
|
||||
|
||||
.face-map {
|
||||
width: 240rpx;
|
||||
height: 280rpx;
|
||||
margin: 0 auto 24rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.face-region {
|
||||
position: absolute;
|
||||
border: 4rpx solid #e5e5e5;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
gap: 16rpx;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 22rpx;
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.duration-item {
|
||||
flex: 1;
|
||||
padding: 16rpx;
|
||||
.face-region.active {
|
||||
border-color: #E6508C;
|
||||
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%;
|
||||
}
|
||||
|
||||
.error-text {
|
||||
text-align: center;
|
||||
border: 2rpx solid #eeeeee;
|
||||
border-radius: 8rpx;
|
||||
color: #ff4d4f;
|
||||
font-size: 26rpx;
|
||||
margin-top: 16rpx;
|
||||
}
|
||||
|
||||
.duration-active {
|
||||
border-color: #333333;
|
||||
background-color: #333333;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.mode-list {
|
||||
display: flex;
|
||||
gap: 16rpx;
|
||||
}
|
||||
|
||||
.mode-item {
|
||||
flex: 1;
|
||||
padding: 16rpx;
|
||||
text-align: center;
|
||||
border: 2rpx solid #eeeeee;
|
||||
border-radius: 8rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.mode-active {
|
||||
border-color: #333333;
|
||||
background-color: #333333;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.btn-area-fixed {
|
||||
padding: 20rpx 0 40rpx;
|
||||
.btn-primary::after {
|
||||
border: none;
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户