diff --git a/src/assets/icons/CFree.svg b/src/assets/icons/CFree.svg index 9f3661b2..159d3673 100644 --- a/src/assets/icons/CFree.svg +++ b/src/assets/icons/CFree.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/src/assets/images/sendEmailPage/3-1/3-1-1.png b/src/assets/images/sendEmailPage/3-1/3-1-1.png new file mode 100644 index 00000000..0ac54f76 Binary files /dev/null and b/src/assets/images/sendEmailPage/3-1/3-1-1.png differ diff --git a/src/assets/images/sendEmailPage/3-1/3-1-2.png b/src/assets/images/sendEmailPage/3-1/3-1-2.png new file mode 100644 index 00000000..f94628d5 Binary files /dev/null and b/src/assets/images/sendEmailPage/3-1/3-1-2.png differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 7d046635..0f7d7168 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -829,11 +829,9 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte width: 100%; } .generalModel_state .generalModel_state_item .el-cascader .el-input .el-input__wrapper .el-input__inner { + padding: 0; font-size: 1.8rem; } -.generalModel_state .generalModel_state_item .el-cascader__tags { - padding-left: 1rem; -} .generalModel_state .generalModel_state_item .el-cascader__tags, .generalModel_state .generalModel_state_item .el-cascader__collapse-tag { --el-color-primary: #d9d9d9; @@ -867,7 +865,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte margin: 0; width: 100%; height: 4.6rem; - padding-left: 2.1rem; + padding-left: 1.1rem; line-height: 4.6rem; font-size: 1.8rem; box-sizing: border-box; @@ -1370,12 +1368,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte border-radius: 3rem; color: #fff; cursor: pointer; - margin: 0 2rem 2rem 0; + margin: 0 1.5rem 1.5rem 0; + border: 1.8px solid #000; background-color: #000; } .admin_page .admin_search_item:hover { color: #000; - border: 2px solid #000; background-color: #fff; } .admin_page .admin_search_item:last-child { diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 93e0a985..5b383061 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -905,6 +905,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte padding: 0; width: 100%; .el-input__inner{ + padding: 0; font-size: 1.8rem; } } @@ -913,7 +914,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .el-cascader:hover{ } .el-cascader__tags{ - padding-left: 1rem; + // padding-left: 1rem; } .el-cascader__tags,.el-cascader__collapse-tag{ --el-color-primary: #d9d9d9; @@ -943,7 +944,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte margin: 0; width: 100%; height: 4.6rem; - padding-left: 2.1rem; + padding-left: 1.1rem; line-height: 4.6rem; font-size: 1.8rem; box-sizing: border-box; @@ -1498,11 +1499,11 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte border-radius: 3rem; color: #fff; cursor: pointer; - margin: 0 2rem 2rem 0; + margin: 0 1.5rem 1.5rem 0; + border: 1.8px solid #000; background-color: #000; &:hover{ color: #000; - border: 2px solid #000; background-color: #fff; } } diff --git a/src/component/Account/message/comment.vue b/src/component/Account/message/comment.vue index 89ff25dd..e7561cf1 100644 --- a/src/component/Account/message/comment.vue +++ b/src/component/Account/message/comment.vue @@ -148,6 +148,7 @@ export default defineComponent({ .account_comment{ width: 100%; .account_generalMessage_item{ + font-size: var(--aida-fsize1-6); .account_generalMessage_item_right{ display: flex; align-items: center; diff --git a/src/component/Account/message/likeMessage.vue b/src/component/Account/message/likeMessage.vue index a60f3a93..2ea1e6c5 100644 --- a/src/component/Account/message/likeMessage.vue +++ b/src/component/Account/message/likeMessage.vue @@ -140,6 +140,7 @@ export default defineComponent({ } .account_generalMessage_center{ .account_generalMessage_item{ + font-size: var(--aida-fsize1-6); .account_generalMessage_item_right{ display: flex; align-items: center; diff --git a/src/component/Account/message/newFollow.vue b/src/component/Account/message/newFollow.vue index 158e2971..e94ab707 100644 --- a/src/component/Account/message/newFollow.vue +++ b/src/component/Account/message/newFollow.vue @@ -149,6 +149,7 @@ export default defineComponent({ width: 100%; .account_generalMessage_center{ .account_generalMessage_item{ + font-size: var(--aida-fsize1-6); .account_generalMessage_item_right{ display: flex; align-items: center; diff --git a/src/component/Administrator/SE/allUser/addAllUser.vue b/src/component/Administrator/SE/allUser/addAllUser.vue index d20eefb2..bbfddd46 100644 --- a/src/component/Administrator/SE/allUser/addAllUser.vue +++ b/src/component/Administrator/SE/allUser/addAllUser.vue @@ -45,11 +45,11 @@
-
{{ title }} User
+
{{ title.label }} User
- User Name: * + {{ $t('adminSeAllUser.UserName') }}: *
- User Email: * + {{ $t('adminSeAllUser.UserEmail') }}: *
- Password: * + {{ $t('adminSeAllUser.Password') }}: *
- Maximum Credits: + {{ $t('adminSeAllUser.MaximumCredits') }}:
-
Close
-
OK
+
{{ $t('adminSeAllUser.Close') }}
+
{{ $t('adminSeAllUser.OK') }}
@@ -119,7 +119,7 @@ export default defineComponent({ operationsModal: false, operationsEdit: false, loadingShow: false, - title: "", + title: null, }); let operationsData = reactive({ accountId: -1, @@ -151,8 +151,8 @@ export default defineComponent({ operations.operationsModal = true; operations.operationsEdit = true; operations.title = funStr; - if (funStr == "Add") operations.operationsEdit = false; - if (funStr == "Edit") { + if (funStr.value == "Add") operations.operationsEdit = false; + if (funStr.value == "Edit") { operationsData.accountId = data.id; operationsData.userName = data.userName; operationsData.userEmail = data.userEmail; @@ -195,7 +195,7 @@ export default defineComponent({ userEmail: operationsData.userEmail, userPassword: operationsData.password == operationsData.oldPassword - ? "" + ? null : md5(operationsData.password + "abc"), }; }; @@ -209,19 +209,18 @@ export default defineComponent({ }; let setOk = () => { let data; - if (operations.title == "Add") { + if (operations.title?.value == "Add") { data = setAddData(); if (!isEmail(data.userEmail)) { - message.info("The email format is incorrect"); + message.info(t('adminSeAllUser.jsContent1')); return; } if ( !data.userName || !data.userEmail || - !data.userPassword || - !data.creditsUsageLimit + !data.userPassword ) - return message.warning("Please check the input box marked with *"); + return message.warning(t('adminSeAllUser.jsContent2')); Https.axiosPost(Https.httpUrls.addOrUpdateSubAccount, data).then( (rv) => { if (rv) { @@ -236,7 +235,7 @@ export default defineComponent({ message.info("The email format is incorrect"); return; } - if (!data.userName || !data.userEmail || !data.creditsUsageLimit) + if (!data.userName || !data.userEmail) return message.warning("Please check the input box marked with *"); Https.axiosPost(Https.httpUrls.addOrUpdateSubAccount, data).then( (rv) => { diff --git a/src/component/Administrator/SE/allUser/index.vue b/src/component/Administrator/SE/allUser/index.vue index c322e48a..7e802262 100644 --- a/src/component/Administrator/SE/allUser/index.vue +++ b/src/component/Administrator/SE/allUser/index.vue @@ -3,7 +3,7 @@
- Create Time: + {{ $t('adminSeAllUser.CreateTime') }}:
-->
- User Name: + {{ $t('adminSeAllUser.UserName') }}:
- Search + {{ $t('adminSeAllUser.search') }}
- Add + {{ $t('adminSeAllUser.add') }}
- Download template + {{ $t('adminSeAllUser.DownloadTemplate') }}
- Upload template + {{ $t('adminSeAllUser.UploadTemplate') }} +
+
+ {{ $t('adminSeAllUser.ExportAccountData') }} +
+
+ {{ $t('adminSeAllUser.Delete') }}
@@ -91,19 +97,19 @@ class="admin_state_list_item" @click="lastGeTrialList('year')" > - Nearly a year + {{ $t('adminSeAllUser.NearlyAYear') }}
- Last month + {{ $t('adminSeAllUser.LastMonth') }}
- Last week + {{ $t('adminSeAllUser.LastWeek') }}
@@ -113,6 +119,8 @@ :loading="tableLoading" :columns="columns" :data-source="dataList" + :row-selection="rowSelection" + rowKey="id" :scroll="{ y: historyTableHeight }" @change="changePage" :showSorterTooltip='false' @@ -132,13 +140,13 @@ @click="setAagree(record)" style="margin-right: 2rem;" > - Edit + {{ $t('adminSeAllUser.Edit') }}
- Delete + {{ $t('adminSeAllUser.Delete') }}
+
- Amount: * + Amount:
- Status: * + Status: { if (rv) { diff --git a/src/component/Administrator/affiliate/affiliateReferral/index.vue b/src/component/Administrator/affiliate/affiliateReferral/index.vue index 81716b4d..e6a012c1 100644 --- a/src/component/Administrator/affiliate/affiliateReferral/index.vue +++ b/src/component/Administrator/affiliate/affiliateReferral/index.vue @@ -109,7 +109,7 @@
- +