developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yuzhilin
7f8c39a8 2 parents bbe03481 eb372414

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -121,7 +121,7 @@ struct ModifyPasswordPage { @@ -121,7 +121,7 @@ struct ModifyPasswordPage {
121 .alignItems(VerticalAlign.Center) 121 .alignItems(VerticalAlign.Center)
122 122
123 Column() { 123 Column() {
124 - Text("提示：密码长度6~20，需大写字母、小写字母、数字、特殊符合中组合三种及三种以上").fontSize(12).maxLines(3).fontColor(0x999999).padding({top:'10lpx'}) 124 + Text("提示：密码长度6~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上").fontSize(12).maxLines(3).fontColor(0x999999).padding({top:'10lpx'})
125 } 125 }
126 .width('100%') 126 .width('100%')
127 .height('85lpx') 127 .height('85lpx')
@@ -93,7 +93,7 @@ export struct SettingPasswordLayout { @@ -93,7 +93,7 @@ export struct SettingPasswordLayout {
93 this.listData.push(new AccoutPageDataModel(0, '设置密码', '', '', '', '', 0)) 93 this.listData.push(new AccoutPageDataModel(0, '设置密码', '', '', '', '', 0))
94 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入密码', 10086)) 94 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入密码', 10086))
95 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '再次输入密码', 10087)) 95 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '再次输入密码', 10087))
96 - this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度6~20，需大写字母、小写字母、数字、特殊符合中组合三种及三种以上', '', '', 0)) 96 + this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度6~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上', '', '', 0))
97 this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0)) 97 this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
98 break; 98 break;
99 99
@@ -103,7 +103,7 @@ export struct SettingPasswordLayout { @@ -103,7 +103,7 @@ export struct SettingPasswordLayout {
103 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入原密码', 10010)) 103 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入原密码', 10010))
104 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入新密码', 10086)) 104 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入新密码', 10086))
105 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请再请输入原密码', 10087)) 105 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请再请输入原密码', 10087))
106 - this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度6~20，需大写字母、小写字母、数字、特殊符合中组合三种及三种以上', '', '', 0)) 106 + this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度6~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上', '', '', 0))
107 this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0)) 107 this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
108 this.listData.push(new AccoutPageDataModel(3, '', '', '忘记密码', '', '', 0)) 108 this.listData.push(new AccoutPageDataModel(3, '', '', '忘记密码', '', '', 0))
109 break; 109 break;
@@ -124,7 +124,7 @@ export struct SettingPasswordLayout { @@ -124,7 +124,7 @@ export struct SettingPasswordLayout {
124 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入新密码', 10086)) 124 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入新密码', 10086))
125 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请再请输入原密码', 10087)) 125 this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请再请输入原密码', 10087))
126 this.listData.push(new AccoutPageDataModel(2, '', '', '', '', '验证码', 10088)) 126 this.listData.push(new AccoutPageDataModel(2, '', '', '', '', '验证码', 10088))
127 - this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度6~20，需大写字母、小写字母、数字、特殊符合中组合三种及三种以上', '', '', 0)) 127 + this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度6~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上', '', '', 0))
128 this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0)) 128 this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
129 this.listData.push(new AccoutPageDataModel(3, '', '', '忘记密码', '', '', 0)) 129 this.listData.push(new AccoutPageDataModel(3, '', '', '忘记密码', '', '', 0))
130 break; 130 break;