[AI Generated]: refactor(member,my): 成员页重构为 flex+scroll-view 布局并设为首页;我的页改为 onShow 刷新
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
14ec4fe177
commit
2ecb86871b
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"pages": [
|
"pages": [
|
||||||
|
"pages/equipmentMember/equipmentMember",
|
||||||
"pages/login/login",
|
"pages/login/login",
|
||||||
"pages/home/home",
|
"pages/home/home",
|
||||||
"pages/connectedDevice/connectedDevice",
|
"pages/connectedDevice/connectedDevice",
|
||||||
"pages/connectedWifi/connectedWifi",
|
"pages/connectedWifi/connectedWifi",
|
||||||
"pages/supplementPersonal/supplementPersonal",
|
"pages/supplementPersonal/supplementPersonal",
|
||||||
"pages/equipmentMember/equipmentMember",
|
|
||||||
"pages/addMember/addMember",
|
"pages/addMember/addMember",
|
||||||
"pages/equipment/equipment",
|
"pages/equipment/equipment",
|
||||||
"pages/measurementReport/measurementReport",
|
"pages/measurementReport/measurementReport",
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ image {
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
overflow: hidden;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
color: #808080;
|
color: #808080;
|
||||||
height: 80rpx;
|
height: 80rpx;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
line-height: 28rpx;
|
|
||||||
padding: 0 30rpx;
|
padding: 0 30rpx;
|
||||||
line-height: 80rpx;
|
line-height: 80rpx;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
.equipmentMember {
|
.equipmentMember {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
/* 顶部浅红提示条(未连接态) */
|
/* 顶部浅红提示条(未连接态) */
|
||||||
.tips {
|
.tips {
|
||||||
@@ -10,6 +12,7 @@
|
|||||||
padding-left: 30rpx;
|
padding-left: 30rpx;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
margin-bottom: 24rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background-color: rgba(255, 77, 79, 0.12);
|
background-color: rgba(255, 77, 79, 0.12);
|
||||||
|
|
||||||
@@ -37,9 +40,11 @@
|
|||||||
|
|
||||||
.seaction {
|
.seaction {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
flex: 1;
|
||||||
padding: 24rpx 30rpx 0 ;
|
overflow: hidden;
|
||||||
box-sizing: border-box;
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
margin-bottom: 24rpx;
|
||||||
|
|
||||||
/* 设备卡(大卡:左插画 + 右信息) */
|
/* 设备卡(大卡:左插画 + 右信息) */
|
||||||
.device-card {
|
.device-card {
|
||||||
@@ -103,9 +108,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.scrollViewContent {
|
||||||
|
box-sizing: border-box;
|
||||||
|
|
||||||
/* 成员卡(容量小标题 + 列表整体白卡) */
|
/* 成员卡(容量小标题 + 列表整体白卡) */
|
||||||
.member-card {
|
.member-card {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
flex: 1;
|
||||||
|
box-sizing: border-box;
|
||||||
|
overflow: hidden;
|
||||||
margin-bottom: 40rpx;
|
margin-bottom: 40rpx;
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
background-color: #FFFFFF;
|
background-color: #FFFFFF;
|
||||||
@@ -137,17 +148,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 列表 */
|
|
||||||
.member-card-list {
|
|
||||||
width: 100%;
|
|
||||||
padding: 0 30rpx;
|
|
||||||
box-sizing: border-box;
|
|
||||||
|
|
||||||
.member-item {
|
.member-item {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 20rpx 0;
|
padding: 20rpx 30rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border-bottom: 1rpx solid #F0F0F2;
|
border-bottom: 1rpx solid #F0F0F2;
|
||||||
|
|
||||||
@@ -259,6 +264,14 @@
|
|||||||
color: #77849E;
|
color: #77849E;
|
||||||
background-color: rgba(0, 0, 0, 0);
|
background-color: rgba(0, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
width: 100%;
|
||||||
|
height: 120rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
|
||||||
/* 底部添加成员按钮 */
|
/* 底部添加成员按钮 */
|
||||||
.add-member {
|
.add-member {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
<view class="seaction">
|
<view class="seaction">
|
||||||
<!-- 设备卡 -->
|
<!-- 设备卡 -->
|
||||||
|
<view class="page-container">
|
||||||
<view class="device-card">
|
<view class="device-card">
|
||||||
<image class="device-illustration" src="/images/device/{{ deviceCard.name }}.png" mode="aspectFit"></image>
|
<image class="device-illustration" src="/images/device/{{ deviceCard.name }}.png" mode="aspectFit"></image>
|
||||||
<view class="device-info">
|
<view class="device-info">
|
||||||
@@ -20,7 +21,10 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<scroll-view class="scrollView" scroll-y>
|
||||||
|
<view class="scrollViewContent page-container">
|
||||||
<!-- 成员卡(容量 + 列表) -->
|
<!-- 成员卡(容量 + 列表) -->
|
||||||
<view class="member-card">
|
<view class="member-card">
|
||||||
<!-- 设备容量(仅已连接态) -->
|
<!-- 设备容量(仅已连接态) -->
|
||||||
@@ -34,7 +38,6 @@
|
|||||||
</block>
|
</block>
|
||||||
|
|
||||||
<!-- 成员列表 -->
|
<!-- 成员列表 -->
|
||||||
<scroll-view scroll-y class="member-card-list">
|
|
||||||
<block wx:for="{{ memberList }}" wx:key="id">
|
<block wx:for="{{ memberList }}" wx:key="id">
|
||||||
<view class="member-item">
|
<view class="member-item">
|
||||||
<!-- 头像:取名字第一个字 -->
|
<!-- 头像:取名字第一个字 -->
|
||||||
@@ -72,10 +75,13 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 底部添加成员按钮 -->
|
<!-- 底部添加成员按钮 -->
|
||||||
|
<view class="btn">
|
||||||
<view class="add-member {{ connected ? '' : 'add-member-disabled' }}" bind:tap="onTapAddMember">
|
<view class="add-member {{ connected ? '' : 'add-member-disabled' }}" bind:tap="onTapAddMember">
|
||||||
<view class="add-member-icon">+</view>
|
<view class="add-member-icon">+</view>
|
||||||
<view class="add-member-text">添加成员<text>(最多10位)</text></view>
|
<view class="add-member-text">添加成员<text>(最多10位)</text></view>
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ Page({
|
|||||||
userInfo: null as PageUserInfo | null,
|
userInfo: null as PageUserInfo | null,
|
||||||
},
|
},
|
||||||
|
|
||||||
onLoad() {
|
onShow() {
|
||||||
const raw = wx.getStorageSync('userInfo') as StorageUserInfo | null
|
const raw = wx.getStorageSync('userInfo') as StorageUserInfo | null
|
||||||
if (!raw?.userId) return
|
if (!raw?.userId) return
|
||||||
const userInfo: PageUserInfo = {
|
const userInfo: PageUserInfo = {
|
||||||
|
|||||||
Reference in New Issue
Block a user