+ type="tel" placeholder="CMND/CCCD" />
diff --git a/src/app/components/auth/signup/signup.component.scss b/src/app/components/auth/signup/signup.component.scss
index 31b53bb..7ccbe14 100644
--- a/src/app/components/auth/signup/signup.component.scss
+++ b/src/app/components/auth/signup/signup.component.scss
@@ -9,7 +9,7 @@
}
.change-height {
- height: 100%;
+ height: calc(100% - 1px);
}
diff --git a/src/app/components/shippers/list-shipper/list-shipper.component.html b/src/app/components/shippers/list-shipper/list-shipper.component.html
index cb616d6..02a2f54 100644
--- a/src/app/components/shippers/list-shipper/list-shipper.component.html
+++ b/src/app/components/shippers/list-shipper/list-shipper.component.html
@@ -37,7 +37,7 @@
- | # |
+ STT |
Ảnh |
Họ và tên |
Shop |
@@ -50,7 +50,7 @@
| {{ i + 1 }} |
-
+
|
{{ shipper.user.fullName }} |
{{ shipper.shop.name }} |
diff --git a/src/app/components/users/list-user/list-user.component.html b/src/app/components/users/list-user/list-user.component.html
index d5558d2..a33772e 100644
--- a/src/app/components/users/list-user/list-user.component.html
+++ b/src/app/components/users/list-user/list-user.component.html
@@ -14,7 +14,7 @@
- | # |
+ STT |
Ảnh đại diện |
Họ và tên
|
diff --git a/src/app/components/utility/list-address/list-address.component.html b/src/app/components/utility/list-address/list-address.component.html
index 4905ab9..32ca8cf 100644
--- a/src/app/components/utility/list-address/list-address.component.html
+++ b/src/app/components/utility/list-address/list-address.component.html
@@ -16,7 +16,7 @@
- | # |
+ STT |
Địa chỉ cụ thể |
Quận |
Phường |
diff --git a/src/app/components/vendors/list-vendors/list-vendors.component.html b/src/app/components/vendors/list-vendors/list-vendors.component.html
index cdcaf11..82cc921 100644
--- a/src/app/components/vendors/list-vendors/list-vendors.component.html
+++ b/src/app/components/vendors/list-vendors/list-vendors.component.html
@@ -21,7 +21,7 @@
- | # |
+ STT |
Ảnh cửa hàng |
Tên cửa hàng |
Mô tả |
diff --git a/src/app/constants/Validation.ts b/src/app/constants/Validation.ts
index b89a5f4..f1f2460 100644
--- a/src/app/constants/Validation.ts
+++ b/src/app/constants/Validation.ts
@@ -1,7 +1,7 @@
export class Validation {
static Regex = {
Phone: new RegExp(/^(((\+|)84)|0)([1-9]{1})([0-9]{8})\b/),
- IdentifiedCode: new RegExp(/^(\d{9}|\d{12})$/),
+ IdentifiedCode: new RegExp(/^0\d{8}$|^0\d{11}$|^\d{9}$|^\d{12}$/),
Password: new RegExp(/(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@$!%*#?&^_-]).{8,}/),
};
}
diff --git a/src/assets/scss/theme/_admin_style.scss b/src/assets/scss/theme/_admin_style.scss
index 5a94dd3..c599870 100644
--- a/src/assets/scss/theme/_admin_style.scss
+++ b/src/assets/scss/theme/_admin_style.scss
@@ -361,7 +361,7 @@ ngb-datepicker {
// datatable
.vendor-list {
img {
- margin-right: 20px;
+ // margin-right: 20px;
height: 40px;
width: 40px !important;
border-radius: 100%;