修改整体布局

src/App.vue

@@ -50,4 +50,8 @@ export default {
   color: #FFFFFF;
 }
 
+.el-dialog__headerbtn {
+  color: #FFFFFF;
+}
+
 </style>

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
   })

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;

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.

src/styles/elDialog.scss

@@ -6,6 +6,10 @@
   color: #FFFFFF;
 }
 
+.el-dialog__headerbtn {
+  color: #FFFFFF;
+}
+
 .fenye {
   padding-top: 20px;
 }

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;

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;

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;

src/views/active/couponlist/index.vue

@@ -266,6 +266,8 @@ export default {
 <style lang="scss" scoped>
 .couponPage{
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
   .tableBox{
     .fenye{
       margin: 20px;

src/views/active/discountlist/discountDetail.vue

@@ -633,6 +633,8 @@ export default {
 @import url("../../../styles/elDialog.scss");
 .pending {
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
   margin-top: 20px;

src/views/active/discountlist/index.vue

@@ -240,6 +240,8 @@ export default {
 <style lang="scss" scoped>
 .zhekouPage{
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
   .tableBox{
     .fenye{
       margin: 20px;

src/views/active/index.vue

@@ -214,6 +214,8 @@ export default {
 @import url("../../styles/elDialog.scss");
 .pending {
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
   margin-top: 20px;

src/views/active/politelist/index.vue

@@ -238,6 +238,8 @@ export default {
 <style lang="scss" scoped>
 .payreturnPage{
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
   .tableBox{
     .fenye{
       margin: 20px;

src/views/active/politelist/politeDetail.vue

@@ -271,6 +271,8 @@ export default {
 @import url("../../../styles/elDialog.scss");
 .pending {
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
   margin-top: 20px;

src/views/active/seckilllist/index.vue

@@ -253,6 +253,8 @@ export default {
 <style lang="scss" scoped>
 .miaoshaPage{
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
   .tableBox{
     .fenye{
       margin: 20px;

src/views/active/seckilllist/seckillDetail.vue

@@ -656,6 +656,8 @@ export default {
 @import url("../../../styles/elDialog.scss");
 .pending {
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
   margin-top: 20px;

src/views/ad/coverConfig/index.vue

@@ -245,6 +245,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyle {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 20px;
   .topSearch {
     display: flex;

src/views/business/businessList/index.vue

@@ -776,6 +776,8 @@ export default {
 
 .pending {
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 
 .fenye {

src/views/business/settlement/index.vue

@@ -133,9 +133,7 @@ import AddSettlement from '@/views/business/settlement/addSettlement'
 
 import {
   settlementGetAll,
-  settlementDelete
-} from '@/api/business'
-import {
+  settlementDelete,
   settlementGetById
 } from '@/api/business'
 
@@ -231,7 +229,9 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .pdl {
-  padding-left: 20px;
+  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 
 </style>

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;

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 {

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;

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;

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;

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 {

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 {

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 {

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;

src/views/integral/configuration.vue

@@ -204,6 +204,8 @@ export default {
 
 <style lang="scss" scpoed>
 .integralPage {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 32px 20px;
   .configuration {
     width: 600px;

src/views/integral/record.vue

@@ -121,6 +121,8 @@ export default {
 @import url("../../styles/elDialog.scss");
 .record{
   padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 </style>
 <style scoped>

src/views/integral/signConfiguration.vue

@@ -248,6 +248,8 @@ export default {
 @import url("../../styles/elDialog.scss");
 .history{
   padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
   .toolbar {
     margin-bottom: 20px;
   }

src/views/liveMenu/liveRoom/index.vue

@@ -371,6 +371,8 @@ img {
 }
 .liveRoomPage {
   padding: 32px 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
   nav {
     .search {
       line-height: 40px;

src/views/member/equity/index.vue

@@ -281,6 +281,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyle {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 20px;
 }
 </style>

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 {

src/views/member/memberList/details.vue

@@ -391,6 +391,8 @@ export default {
 // 评论详情
 .comment_manage_page {
   padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .pinStyle {
   .comment {

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;

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;

src/views/notice/history.vue

@@ -221,6 +221,8 @@ export default {
 @import url("../../styles/elDialog.scss");
 .history{
   padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 </style>
 <style scoped>

src/views/notice/push.vue

@@ -119,5 +119,7 @@ export default {
 <style lang="scss" scoped>
 .push{
     padding: 20px;
+    background: #FFFFFF;
+  border-radius: 10px;
 }
 </style>

src/views/order/after/details/index.vue

@@ -528,6 +528,10 @@ export default {
       font-size: 24px;
       color: #fff;
     }
+
+    .el-dialog__headerbtn {
+  color: #FFFFFF;
+}
   }
 }
 </style>

src/views/order/after/index.vue

@@ -189,6 +189,9 @@ export default {
 <style lang='scss' scoped>
 .refundPage {
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
+  
   .fenye {
     margin-top: 20px;
   }

src/views/order/pending/index.vue

@@ -231,6 +231,11 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .tab_show {
-  padding-left: 30px;
+  // padding-left: 30px;
+}
+.pending {
+  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 </style>

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;

src/views/renovation/commdityClass/Edit.vue

@@ -52,10 +52,8 @@
                   height="80"
                   :src="data.categoryImgArray.length && data.categoryImgArray[0].imgPath"
                 >
-                <i
-                  v-else
-                  class="el-icon-plus"
-                />
+                <div  v-else><i class="el-icon-plus" /> <span style="display:none; font-size: 10px; color: #909399 !important;">建议尺寸:1252*356</span></div>
+                
               </el-upload>
             </template>
             <template v-else>

src/views/renovation/commdityClass/index.vue

@@ -159,6 +159,8 @@ export default {
 
 .classification-page {
   padding: 15px 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
   .toolbar {
     margin-bottom: 15px;
     text-align: right;

src/views/renovation/commoditySystem/index.vue

@@ -407,6 +407,8 @@ export default {
 @import url("../../../styles/elDialog.scss");
 .pending {
   padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
   margin-top: 20px;

src/views/renovation/custom/index.vue

@@ -201,6 +201,8 @@ export default {
 
 .classification-page {
   padding: 15px 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
   .toolbar {
     margin-bottom: 15px;
     text-align: right;

src/views/risk/IPBlacklist/index.vue

@@ -209,6 +209,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyle {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 20px;
   .topSearch {
     display: flex;

src/views/risk/riskRules/index.vue

@@ -199,6 +199,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyle {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 20px;
   .topSearch {
     min-height: 62px;

src/views/risk/userBlacklist/index.vue

@@ -211,6 +211,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyle {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 20px;
   .topSearch {
     display: flex;

src/views/setup/businessMenus/index.vue

@@ -514,6 +514,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyleMenus {
+  background: #FFFFFF;
+  border-radius: 10px;
   .formSearch{
     padding: 20px 30px;
     display: flex;

src/views/setup/dict/index.vue

@@ -331,9 +331,12 @@ export default {
 <style lang='scss' scoped>
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
+.box-card{
+  background: #FFFFFF;
+  border-radius: 10px;
+}
 .dictStyle {
   display: flex;
-  padding: 20px;
   justify-content: space-between;
   align-items: flex-start;
 }
@@ -344,8 +347,16 @@ export default {
   width: 49%;
 }
 .cardSpan {
-  font-size: 15px;
-  color: #606266;
+  font-size: 14px;
+  color: #404F64;
+  font-weight: bold;
+}
+.el-form-item__label{
+  color: #404F64 !important;
   font-weight: bold;
 }
+.el-button--primary.is-plain{
+  color: #183ECD;
+  background-color: #EBF3FF;
+}
 </style>

src/views/setup/phone/index.vue

@@ -211,6 +211,8 @@ export default {
 
 <style lang="scss" scpoed>
 .integralPage {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 32px 20px;
   .configuration {
     width: 600px;

src/views/setup/privacy/index.vue

@@ -203,6 +203,8 @@ export default {
 
 <style lang="scss" scpoed>
 .integralPage {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 32px 20px;
   .configuration {
     width: 600px;

src/views/setup/role/index.vue

@@ -376,6 +376,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyle {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 20px;
 }
 </style>

src/views/setup/tabs/index.vue

@@ -394,6 +394,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyleMenus {
+  background: #FFFFFF;
+  border-radius: 10px;
   .formSearch{
     padding: 20px 30px;
     display: flex;

src/views/setup/user/index.vue

@@ -399,6 +399,8 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .userStyle {
+  background: #FFFFFF;
+  border-radius: 10px;
   padding: 20px;
   .newPhone {
     width: 100%;