diff --git a/miniprogram/components/userManagementAddUser/userManagementAddUser.json b/miniprogram/components/userManagementAddUser/userManagementAddUser.json
new file mode 100644
index 0000000..59a1db6
--- /dev/null
+++ b/miniprogram/components/userManagementAddUser/userManagementAddUser.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
diff --git a/miniprogram/components/userManagementAddUser/userManagementAddUser.less b/miniprogram/components/userManagementAddUser/userManagementAddUser.less
new file mode 100644
index 0000000..ddbb241
--- /dev/null
+++ b/miniprogram/components/userManagementAddUser/userManagementAddUser.less
@@ -0,0 +1,58 @@
+.userManagementAddUser-mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(37, 37, 53, 0.5);
+ z-index: 100;
+}
+
+.userManagementAddUser-panel {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 660rpx;
+ box-sizing: border-box;
+ padding: 48rpx 40rpx 56rpx;
+ background-color: #FFFFFF;
+ border-radius: 24rpx;
+ z-index: 101;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .userManagementAddUser-title {
+ color: #252535;
+ height: 36rpx;
+ font-size: 36rpx;
+ font-weight: bolder;
+ line-height: 36rpx;
+ margin-bottom: 48rpx;
+ }
+
+ .userManagementAddUser-btn {
+ width: 100%;
+ height: 96rpx;
+ font-size: 36rpx;
+ font-weight: bold;
+ text-align: center;
+ border-radius: 48rpx;
+ box-sizing: border-box;
+
+ &--primary {
+ color: #FFFFFF;
+ line-height: 96rpx;
+ background-color: #1385FA;
+ margin-bottom: 40rpx;
+ }
+
+ &--outline {
+ color: #1385FA;
+ line-height: 92rpx;
+ border: 2rpx solid #1385FA;
+ background-color: #FFFFFF;
+ }
+ }
+}
diff --git a/miniprogram/components/userManagementAddUser/userManagementAddUser.ts b/miniprogram/components/userManagementAddUser/userManagementAddUser.ts
new file mode 100644
index 0000000..e3b5a12
--- /dev/null
+++ b/miniprogram/components/userManagementAddUser/userManagementAddUser.ts
@@ -0,0 +1,26 @@
+Component({
+ properties: {
+ /** 是否显示弹框 */
+ show: {
+ type: Boolean,
+ value: false
+ }
+ },
+
+ methods: {
+ /** 点击遮罩关闭 */
+ onClose() {
+ this.triggerEvent('close')
+ },
+
+ /** 一键添加本人 */
+ onAddSelf() {
+ this.triggerEvent('addself')
+ },
+
+ /** 添加其他用户 */
+ onAddOther() {
+ this.triggerEvent('addother')
+ }
+ }
+})
diff --git a/miniprogram/components/userManagementAddUser/userManagementAddUser.wxml b/miniprogram/components/userManagementAddUser/userManagementAddUser.wxml
new file mode 100644
index 0000000..fb69db1
--- /dev/null
+++ b/miniprogram/components/userManagementAddUser/userManagementAddUser.wxml
@@ -0,0 +1,8 @@
+
+
+
+ 添加用户
+ 一键添加本人
+ 添加其他用户
+
+
diff --git a/miniprogram/images/userManagement/add.png b/miniprogram/images/userManagement/add.png
new file mode 100644
index 0000000..d42a5ad
Binary files /dev/null and b/miniprogram/images/userManagement/add.png differ
diff --git a/miniprogram/pages/userManagement/userManagement.json b/miniprogram/pages/userManagement/userManagement.json
index 41f72a5..81d10ca 100644
--- a/miniprogram/pages/userManagement/userManagement.json
+++ b/miniprogram/pages/userManagement/userManagement.json
@@ -1,6 +1,7 @@
{
"usingComponents": {
- "user-management-sync": "/components/userManagementSync/userManagementSync"
+ "user-management-sync": "/components/userManagementSync/userManagementSync",
+ "user-management-add-user": "/components/userManagementAddUser/userManagementAddUser"
},
"navigationBarTitleText": "用户管理",
"navigationBarTextStyle": "black",
diff --git a/miniprogram/pages/userManagement/userManagement.less b/miniprogram/pages/userManagement/userManagement.less
index 0d3e88a..032339c 100644
--- a/miniprogram/pages/userManagement/userManagement.less
+++ b/miniprogram/pages/userManagement/userManagement.less
@@ -120,14 +120,29 @@
line-height: 32rpx;
}
- .sync-btn {
- color: #FFFFFF;
+ .section-addUser {
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
height: 48rpx;
- font-size: 24rpx;
- line-height: 48rpx;
padding: 0 20rpx;
- border-radius: 8rpx;
- background-color: #1385FA;
+ border-radius: 32rpx;
+ background-color: #D9E9FA;
+
+ > view:nth-of-type(1) {
+ width: 32rpx;
+ height: 32rpx;
+ display: flex;
+ align-items: center;
+ margin-right: 6rpx;
+ }
+
+ > view:nth-of-type(2) {
+ color: #1385FA;
+ height: 24rpx;
+ font-size: 24rpx;
+ line-height: 24rpx;
+ }
}
}
@@ -342,36 +357,36 @@
height: 120rpx;
padding: 0 30rpx;
display: flex;
- gap: 15rpx;
- flex-wrap: nowrap;
align-items: center;
box-sizing: border-box;
background-color: #FFFFFF;
box-shadow: 0 2rpx 8rpx 0 rgba(19, 133, 250, 0.06);
- .btn-cancel {
- color: #1385FA;
+ .sync-btn {
flex: 1;
height: 88rpx;
- font-size: 32rpx;
- text-align: center;
- line-height: 84rpx;
- border-radius: 44rpx;
- box-sizing: border-box;
- border: 2rpx solid #1385FA;
- background-color: #FFFFFF;
- }
-
- .btn-primary {
- color: #FFFFFF;
- flex: 1;
- height: 88rpx;
- font-size: 32rpx;
- font-weight: bold;
- text-align: center;
- line-height: 88rpx;
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ justify-content: center;
border-radius: 44rpx;
background-color: #1385FA;
+
+ > view:nth-of-type(1) {
+ width: 32rpx;
+ height: 32rpx;
+ display: flex;
+ align-items: center;
+ margin-right: 6rpx;
+ }
+
+ > view:nth-of-type(2) {
+ color: #FFFFFF;
+ height: 32rpx;
+ font-size: 32rpx;
+ line-height: 32rpx;
+ font-weight: bold;
+ }
}
}
}
diff --git a/miniprogram/pages/userManagement/userManagement.ts b/miniprogram/pages/userManagement/userManagement.ts
index 2486b70..9d3c7fb 100644
--- a/miniprogram/pages/userManagement/userManagement.ts
+++ b/miniprogram/pages/userManagement/userManagement.ts
@@ -96,6 +96,7 @@ Page({
syncShow: false,
syncPercent: 0,
syncStatus: '',
+ addUserShow: false,
isOps: false
},
@@ -403,14 +404,34 @@ Page({
})
},
- /** 添加用户 */
+ /** 添加用户:运维模式或已有本人直接跳添加页,否则弹出选择弹框 */
onTapAddUser() {
if (this.data.memberCount >= 10) {
wx.showToast({ title: '最多添加10位用户', icon: 'none' })
return
}
- const sn = targetDevice?.sn || ''
- wx.navigateTo({ url: `/pages/addUser/addUser?sn=${encodeURIComponent(sn)}` })
+ if (this.data.isOps || this.data.self) {
+ this.onTapAddNew()
+ } else {
+ this.setData({ addUserShow: true })
+ }
+ },
+
+ /** 关闭添加用户弹框 */
+ onCloseAddUser() {
+ this.setData({ addUserShow: false })
+ },
+
+ /** 弹框:一键添加本人 */
+ onAddSelfTap() {
+ this.setData({ addUserShow: false })
+ this.onTapAddSelf()
+ },
+
+ /** 弹框:添加其他用户 */
+ onAddOtherTap() {
+ this.setData({ addUserShow: false })
+ this.onTapAddNew()
},
/** 编辑成员:跳转 addUser 编辑模式 */
diff --git a/miniprogram/pages/userManagement/userManagement.wxml b/miniprogram/pages/userManagement/userManagement.wxml
index 7c07e90..aa6882b 100644
--- a/miniprogram/pages/userManagement/userManagement.wxml
+++ b/miniprogram/pages/userManagement/userManagement.wxml
@@ -24,7 +24,12 @@
@@ -104,17 +109,17 @@
+
+
+