From f6ca121e7c2da529f1b2df979a27717be4a45769 Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Sun, 9 Jul 2023 23:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=BD=93=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 4 ++++ src/api/order.js | 2 +- src/layout/components/AppMain.vue | 1 + src/permission.js | 1 - src/styles/elDialog.scss | 4 ++++ src/views/active/activeDetails.vue | 2 ++ src/views/active/couponlist/component/shopList.vue | 2 ++ src/views/active/couponlist/couponDetail.vue | 2 ++ src/views/active/couponlist/index.vue | 2 ++ src/views/active/discountlist/discountDetail.vue | 2 ++ src/views/active/discountlist/index.vue | 2 ++ src/views/active/index.vue | 2 ++ src/views/active/politelist/index.vue | 2 ++ src/views/active/politelist/politeDetail.vue | 2 ++ src/views/active/seckilllist/index.vue | 2 ++ src/views/active/seckilllist/seckillDetail.vue | 2 ++ src/views/ad/coverConfig/index.vue | 2 ++ src/views/business/businessList/index.vue | 2 ++ src/views/business/settlement/index.vue | 8 ++++---- src/views/channel/list/index.vue | 2 ++ src/views/comment/commentSys/index.vue | 2 ++ src/views/comment/keyword/index.vue | 2 ++ src/views/customer/customerMage/index.vue | 2 ++ src/views/customer/tips/index.vue | 2 ++ src/views/finance/application/index.vue | 2 ++ src/views/finance/bond/index.vue | 2 ++ src/views/finance/overview/index.vue | 2 ++ src/views/finance/withdrawal/index.vue | 2 ++ src/views/integral/configuration.vue | 2 ++ src/views/integral/record.vue | 2 ++ src/views/integral/signConfiguration.vue | 2 ++ src/views/liveMenu/liveRoom/index.vue | 2 ++ src/views/member/equity/index.vue | 2 ++ src/views/member/levelList/index.vue | 2 ++ src/views/member/memberList/details.vue | 2 ++ src/views/member/memberList/index.vue | 2 ++ src/views/member/tips/index.vue | 2 ++ src/views/notice/history.vue | 2 ++ src/views/notice/push.vue | 2 ++ src/views/order/after/details/index.vue | 4 ++++ src/views/order/after/index.vue | 3 +++ src/views/order/pending/index.vue | 7 ++++++- src/views/renovation/brand/index.vue | 2 ++ src/views/renovation/commdityClass/Edit.vue | 6 ++---- src/views/renovation/commdityClass/index.vue | 2 ++ src/views/renovation/commoditySystem/index.vue | 2 ++ src/views/renovation/custom/index.vue | 2 ++ src/views/risk/IPBlacklist/index.vue | 2 ++ src/views/risk/riskRules/index.vue | 2 ++ src/views/risk/userBlacklist/index.vue | 2 ++ src/views/setup/businessMenus/index.vue | 2 ++ src/views/setup/dict/index.vue | 17 ++++++++++++++--- src/views/setup/phone/index.vue | 2 ++ src/views/setup/privacy/index.vue | 2 ++ src/views/setup/role/index.vue | 2 ++ src/views/setup/tabs/index.vue | 2 ++ src/views/setup/user/index.vue | 2 ++ 57 files changed, 135 insertions(+), 14 deletions(-) diff --git a/src/App.vue b/src/App.vue index aad30b8..8a0bd87 100644 --- a/src/App.vue +++ b/src/App.vue @@ -50,4 +50,8 @@ export default { color: #FFFFFF; } +.el-dialog__headerbtn { + color: #FFFFFF; +} + diff --git a/src/api/order.js b/src/api/order.js index 70258b0..9c1a592 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -21,7 +21,7 @@ export function orderGetById(data) { // 选择快递公司查询 export function orderGetSelect(data) { return request({ - url: '/express/getExpressSelect', + url: '/express/getExpressSelectNew', method: 'post', data }) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 127e4f6..845f2eb 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -25,6 +25,7 @@ export default { position: relative; overflow: hidden; background: #F2F6FA; + padding: 20px; } .fixed-header + .app-main { padding-top: 50px; diff --git a/src/permission.js b/src/permission.js index 11f9f7b..19a522c 100644 --- a/src/permission.js +++ b/src/permission.js @@ -68,7 +68,6 @@ router.beforeEach(async(to, from, next) => { /* has no token*/ if (whiteList.indexOf(to.path) !== -1) { // in the free login whitelist, go directly - console.log('no token') next() } else { // other pages that do not have permission to access are redirected to the login page. diff --git a/src/styles/elDialog.scss b/src/styles/elDialog.scss index 1b851a8..a8aa3c6 100644 --- a/src/styles/elDialog.scss +++ b/src/styles/elDialog.scss @@ -6,6 +6,10 @@ color: #FFFFFF; } +.el-dialog__headerbtn { + color: #FFFFFF; +} + .fenye { padding-top: 20px; } diff --git a/src/views/active/activeDetails.vue b/src/views/active/activeDetails.vue index e3449b6..3380ba7 100644 --- a/src/views/active/activeDetails.vue +++ b/src/views/active/activeDetails.vue @@ -490,6 +490,8 @@ export default { @import url("../../styles/elDialog.scss"); .pending { padding: 30px; + background: #FFFFFF; + border-radius: 10px; } .fenye { margin-top: 20px; diff --git a/src/views/active/couponlist/component/shopList.vue b/src/views/active/couponlist/component/shopList.vue index 6314818..f63e56c 100644 --- a/src/views/active/couponlist/component/shopList.vue +++ b/src/views/active/couponlist/component/shopList.vue @@ -132,6 +132,8 @@ export default { @import url("../../../../styles/elDialog.scss"); .pending { padding: 30px; + background: #FFFFFF; + border-radius: 10px; } .fenye { margin-top: 20px; diff --git a/src/views/active/couponlist/couponDetail.vue b/src/views/active/couponlist/couponDetail.vue index 8d56b1d..9ac2c19 100644 --- a/src/views/active/couponlist/couponDetail.vue +++ b/src/views/active/couponlist/couponDetail.vue @@ -734,6 +734,8 @@ export default { @import url("../../../styles/elDialog.scss"); .pending { padding: 30px; + background: #FFFFFF; + border-radius: 10px; } .fenye { margin-top: 20px; diff --git a/src/views/active/couponlist/index.vue b/src/views/active/couponlist/index.vue index 1b4f93e..75dffdf 100644 --- a/src/views/active/couponlist/index.vue +++ b/src/views/active/couponlist/index.vue @@ -266,6 +266,8 @@ export default { diff --git a/src/views/channel/list/index.vue b/src/views/channel/list/index.vue index 12e02e7..e9a34a8 100644 --- a/src/views/channel/list/index.vue +++ b/src/views/channel/list/index.vue @@ -234,6 +234,8 @@ export default { .content { padding: 20px; box-sizing: border-box; + background: #FFFFFF; + border-radius: 10px; .table { margin: 20px 0; diff --git a/src/views/comment/commentSys/index.vue b/src/views/comment/commentSys/index.vue index cd7c99e..c645a3d 100644 --- a/src/views/comment/commentSys/index.vue +++ b/src/views/comment/commentSys/index.vue @@ -291,6 +291,8 @@ export default { @import url("../../../styles/elDialog.scss"); .comment_manage_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .pinStyle { .comment { diff --git a/src/views/comment/keyword/index.vue b/src/views/comment/keyword/index.vue index cad3b13..332ca89 100644 --- a/src/views/comment/keyword/index.vue +++ b/src/views/comment/keyword/index.vue @@ -233,6 +233,8 @@ export default { @import url("../../../styles/elDialog.scss"); .custom_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .checkBoxStyle { margin-bottom: 20px; diff --git a/src/views/customer/customerMage/index.vue b/src/views/customer/customerMage/index.vue index 2843bc1..168d624 100644 --- a/src/views/customer/customerMage/index.vue +++ b/src/views/customer/customerMage/index.vue @@ -347,6 +347,8 @@ export default { @import url("../../../styles/elDialog.scss"); .custom_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .checkBoxStyle { margin-bottom: 20px; diff --git a/src/views/customer/tips/index.vue b/src/views/customer/tips/index.vue index f802680..fc3fda7 100644 --- a/src/views/customer/tips/index.vue +++ b/src/views/customer/tips/index.vue @@ -260,6 +260,8 @@ export default { @import url("../../../styles/elDialog.scss"); .tipStyle { padding: 20px; + background: #FFFFFF; + border-radius: 10px; .topSearch { display: flex; justify-content: space-between; diff --git a/src/views/finance/application/index.vue b/src/views/finance/application/index.vue index 7dc9fdc..a03fd87 100644 --- a/src/views/finance/application/index.vue +++ b/src/views/finance/application/index.vue @@ -240,6 +240,8 @@ export default { @import url("../../../styles/elDialog.scss"); .custom_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .box { .dioBox { diff --git a/src/views/finance/bond/index.vue b/src/views/finance/bond/index.vue index 18e9167..dac7704 100644 --- a/src/views/finance/bond/index.vue +++ b/src/views/finance/bond/index.vue @@ -145,6 +145,8 @@ export default { @import url("../../../styles/elDialog.scss"); .custom_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .bondClass { diff --git a/src/views/finance/overview/index.vue b/src/views/finance/overview/index.vue index 7dd7067..3d8414f 100644 --- a/src/views/finance/overview/index.vue +++ b/src/views/finance/overview/index.vue @@ -155,6 +155,8 @@ export default { @import url("../../../styles/elDialog.scss"); .custom_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .cardLIst { diff --git a/src/views/finance/withdrawal/index.vue b/src/views/finance/withdrawal/index.vue index 6eb338b..cafecdd 100644 --- a/src/views/finance/withdrawal/index.vue +++ b/src/views/finance/withdrawal/index.vue @@ -258,6 +258,8 @@ export default { @import url("../../../styles/elDialog.scss"); .pdl { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .seeModel { padding: 20px; diff --git a/src/views/integral/configuration.vue b/src/views/integral/configuration.vue index f88ca7e..06d7b33 100644 --- a/src/views/integral/configuration.vue +++ b/src/views/integral/configuration.vue @@ -204,6 +204,8 @@ export default { diff --git a/src/views/member/levelList/index.vue b/src/views/member/levelList/index.vue index 4fa94d8..c36ebde 100644 --- a/src/views/member/levelList/index.vue +++ b/src/views/member/levelList/index.vue @@ -366,6 +366,8 @@ export default { //@import url(); 引入公共css类 @import url("../../../styles/elDialog.scss"); .userStyle { + background: #FFFFFF; + border-radius: 10px; padding: 20px; } .formInfo { diff --git a/src/views/member/memberList/details.vue b/src/views/member/memberList/details.vue index 3a4e2c8..f63a491 100644 --- a/src/views/member/memberList/details.vue +++ b/src/views/member/memberList/details.vue @@ -391,6 +391,8 @@ export default { // 评论详情 .comment_manage_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .pinStyle { .comment { diff --git a/src/views/member/memberList/index.vue b/src/views/member/memberList/index.vue index b4b28c0..6adef5a 100644 --- a/src/views/member/memberList/index.vue +++ b/src/views/member/memberList/index.vue @@ -423,6 +423,8 @@ export default { @import url("../../../styles/elDialog.scss"); .custom_page { padding: 20px; + background: #FFFFFF; + border-radius: 10px; } .checkBoxStyle { margin-bottom: 20px; diff --git a/src/views/member/tips/index.vue b/src/views/member/tips/index.vue index 3349a83..0a1e098 100644 --- a/src/views/member/tips/index.vue +++ b/src/views/member/tips/index.vue @@ -241,6 +241,8 @@ export default { @import url("../../../styles/elDialog.scss"); .tipStyle { padding: 20px; + background: #FFFFFF; + border-radius: 10px; .topSearch { display: flex; justify-content: space-between; diff --git a/src/views/notice/history.vue b/src/views/notice/history.vue index 29de3e9..444e44a 100644 --- a/src/views/notice/history.vue +++ b/src/views/notice/history.vue @@ -221,6 +221,8 @@ export default { @import url("../../styles/elDialog.scss"); .history{ padding: 20px; + background: #FFFFFF; + border-radius: 10px; } diff --git a/src/views/order/after/details/index.vue b/src/views/order/after/details/index.vue index 2665225..5b4303f 100644 --- a/src/views/order/after/details/index.vue +++ b/src/views/order/after/details/index.vue @@ -528,6 +528,10 @@ export default { font-size: 24px; color: #fff; } + + .el-dialog__headerbtn { + color: #FFFFFF; +} } } diff --git a/src/views/order/after/index.vue b/src/views/order/after/index.vue index 2cc48ba..2576664 100644 --- a/src/views/order/after/index.vue +++ b/src/views/order/after/index.vue @@ -189,6 +189,9 @@ export default { diff --git a/src/views/renovation/brand/index.vue b/src/views/renovation/brand/index.vue index f8526b5..5f04400 100644 --- a/src/views/renovation/brand/index.vue +++ b/src/views/renovation/brand/index.vue @@ -127,6 +127,8 @@ export default { > .content{ padding: 30px; + background: #FFFFFF; + border-radius: 10px; } .padding-bottom{ padding-bottom: 30px; diff --git a/src/views/renovation/commdityClass/Edit.vue b/src/views/renovation/commdityClass/Edit.vue index 1709ff2..03124f3 100644 --- a/src/views/renovation/commdityClass/Edit.vue +++ b/src/views/renovation/commdityClass/Edit.vue @@ -52,10 +52,8 @@ height="80" :src="data.categoryImgArray.length && data.categoryImgArray[0].imgPath" > - +
建议尺寸:1252*356
+