修改整体布局

2 years ago · 6c2497e39e
48 changed files with 127 additions and 19 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -50,4 +50,8 @@ export default {
  color: #FFFFFF;
 }

+.el-dialog__headerbtn {
+  color: #FFFFFF;
+}
+
 </style>
--- 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
  })
--- 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;
--- 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;
 }
--- a/src/views/active/index.vue
+++ b/src/views/active/index.vue
@ -279,6 +279,9 @@ export default {
 .commonActivityPage{
  // padding: 20px;
  $bothSides: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
+  
  .acTab{
    margin: 0 $bothSides;
  }
--- a/src/views/commodity/commodityList/index.vue
+++ b/src/views/commodity/commodityList/index.vue
@ -284,6 +284,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .group-dialog {
  .btn-wrap {
--- a/src/views/commodity/commoditySystem/index.vue
+++ b/src/views/commodity/commoditySystem/index.vue
@ -680,6 +680,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/customer/addClustering.vue
+++ b/src/views/customer/addClustering.vue
@ -442,6 +442,8 @@ export default {
 }
 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 </style>
 <style scoped>
--- a/src/views/customer/clusteringList/index.vue
+++ b/src/views/customer/clusteringList/index.vue
@ -261,10 +261,12 @@ export default {
 //@import url(); 引入公共css类
@import url("../../../styles/elDialog.scss");
 .clusteringPage{
+  background: #FFFFFF;
+  border-radius: 10px;
+  padding: 20px;
  .formSearch{
    width: 100%;
    margin: 10px 0;
-    padding: 0 12px;
    display: flex;
    flex-wrap: wrap;
    line-height: 60px;
@ -286,7 +288,7 @@ export default {
    }
  }
  .tableBox{
-    margin: 0 12px;
+    // margin: 0 12px;
  }
  .fenye {
    margin-top: 20px;
--- a/src/views/customer/customerList/customerDetail.vue
+++ b/src/views/customer/customerList/customerDetail.vue
@ -209,6 +209,8 @@ export default {

 .pending {
  margin: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .customerDetail {
  padding: 0px 0px 100px 0px;
--- a/src/views/customer/customerList/index.vue
+++ b/src/views/customer/customerList/index.vue
@ -420,6 +420,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/customer/operate/index.vue
+++ b/src/views/customer/operate/index.vue
@ -268,6 +268,8 @@ export default {
 <style lang="scss" scoped>
 .padding {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .operate {
 }
--- a/src/views/customer/tagList.vue
+++ b/src/views/customer/tagList.vue
@ -264,10 +264,11 @@ export default {
 <style lang='scss' scoped>
@import url("../../styles/elDialog.scss");
 .tagListPage{
+  background: #FFFFFF;
+  border-radius: 10px;
+  padding: 20px;
  .formSearch{
    width: 100%;
-    margin: 10px 0;
-    padding: 0 12px;
    display: flex;
    flex-wrap: wrap;
    line-height: 60px;
@ -289,7 +290,7 @@ export default {
    }
  }
  .tableBox{
-    margin: 0 12px;
+    // margin: 0 12px;
  }
  .fenye {
    margin-top: 20px;
--- a/src/views/customerService/service/index.vue
+++ b/src/views/customerService/service/index.vue
@ -490,6 +490,8 @@ export default {
 <style lang='scss' scoped>
 .userStyle {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .avatar-uploader .el-upload {
  border: 1px dashed #d9d9d9;
--- a/src/views/distributor/achievement/humens.vue
+++ b/src/views/distributor/achievement/humens.vue
@ -230,6 +230,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .custom_page {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .checkBoxStyle {
  margin-bottom: 20px;
--- a/src/views/distributor/achievement/order.vue
+++ b/src/views/distributor/achievement/order.vue
@ -176,6 +176,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .custom_page {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .checkBoxStyle {
  margin-bottom: 20px;
--- a/src/views/distributor/achievement/programme.vue
+++ b/src/views/distributor/achievement/programme.vue
@ -421,6 +421,9 @@ h2 {
      font-size: 24px;
      color: #fff;
    }
+    .el-dialog__headerbtn {
+      color: #FFFFFF;
+    }
  }
 }

--- a/src/views/distributor/customer/popSearch.vue
+++ b/src/views/distributor/customer/popSearch.vue
@ -270,6 +270,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .custom_page {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .checkBoxStyle {
  margin-bottom: 20px;
--- a/src/views/distributor/index.vue
+++ b/src/views/distributor/index.vue
@ -130,7 +130,9 @@ export default {
 <style lang="scss" scope>
@import url("../../styles/elDialog.scss");
 .topPadding {
-  padding-left: 30px;
+  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .seacherBox {
  padding-top: 30px;
--- a/src/views/distributor/personnel/list.vue
+++ b/src/views/distributor/personnel/list.vue
@ -358,6 +358,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .custom_page {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .checkBoxStyle {
  margin-bottom: 20px;
--- a/src/views/distributor/personnel/msg.vue
+++ b/src/views/distributor/personnel/msg.vue
@ -198,6 +198,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .custom_page {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .checkBoxStyle {
  margin-bottom: 20px;
--- a/src/views/finance/account/index.vue
+++ b/src/views/finance/account/index.vue
@ -440,7 +440,7 @@ export default {
      }
    },
    async bankName() {
-      const res = await getSelect({ dictName: '所属银行' })
+      const res = await getSelect({ dictName: '新生支付支持银行' })
      this.options = res.data
      console.log(this.options)
    },
@ -467,6 +467,10 @@ export default {

 <style scoped lang='scss'>
@import url("../../../styles/elDialog.scss");
+.account_Page{
+  background: #FFFFFF;
+  border-radius: 10px;
+}
 .text_item {
  padding: 20px;
  display: flex;
--- a/src/views/finance/bond/index.vue
+++ b/src/views/finance/bond/index.vue
@ -95,6 +95,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .custom_page {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }

 .bondClass {
--- a/src/views/finance/list/index.vue
+++ b/src/views/finance/list/index.vue
@ -2,7 +2,6 @@
  <div class="finance_page">
    <!-- 顶部卡片 -->
    <div class="topCard">
-      <el-card class="topCard">
        <div slot="header" class="clearfix">
          <span class="leftText">财务数据</span>
          <span class="leftTip">所有交易成功的金额，微信侧将收取6‰的交易手续费</span>
@ -19,7 +18,6 @@
            </div>
          </div>
        </div>
-      </el-card>
    </div>
    <!-- 选项卡 -->
    <div class="cardList">
@ -346,6 +344,9 @@ export default {
 .finance_page {
  width: 100%;
  height: 100%;
+  background: #FFFFFF;
+  border-radius: 10px;
+  padding: 30px;
  .leftText {
    font-size: 24px;
    font-weight: bold;
--- a/src/views/liveMenu/liveProduct/index.vue
+++ b/src/views/liveMenu/liveProduct/index.vue
@ -621,6 +621,8 @@ export default {
 <style lang="scss" scpoed>
 .liveRoomPage {
  padding: 32px 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
  nav {
    .search {
      line-height: 40px;
--- a/src/views/liveMenu/liveRoom/index.vue
+++ b/src/views/liveMenu/liveRoom/index.vue
@ -922,6 +922,8 @@ img {
 }
 .liveRoomPage {
  padding: 32px 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
  nav {
    .search {
      line-height: 40px;
--- a/src/views/marketing/channelActivity/index.vue
+++ b/src/views/marketing/channelActivity/index.vue
@ -232,6 +232,8 @@ export default {
 >
 .content {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;

  .table {
    margin: 20px 0;
--- a/src/views/marketing/channelActivity/selectChannelCoupons.vue
+++ b/src/views/marketing/channelActivity/selectChannelCoupons.vue
@ -389,6 +389,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }

 .fenye {
--- a/src/views/marketing/channelCoupons/index.vue
+++ b/src/views/marketing/channelCoupons/index.vue
@ -261,6 +261,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .userStyle {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
  .topSearch {
    display: flex;
    justify-content: space-between;
--- a/src/views/marketing/channelManage/index.vue
+++ b/src/views/marketing/channelManage/index.vue
@ -418,6 +418,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }

 .fenye {
--- a/src/views/marketing/compose/index.vue
+++ b/src/views/marketing/compose/index.vue
@ -190,6 +190,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/marketing/coupon/index.vue
+++ b/src/views/marketing/coupon/index.vue
@ -276,6 +276,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/marketing/discount/index.vue
+++ b/src/views/marketing/discount/index.vue
@ -284,6 +284,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/marketing/group/index.vue
+++ b/src/views/marketing/group/index.vue
@ -287,6 +287,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/marketing/price/index.vue
+++ b/src/views/marketing/price/index.vue
@ -186,11 +186,15 @@ export default {
 //@import url(); 引入公共css类
@import url("../../../styles/elDialog.scss");
 .activityPricePage{
+  background: #FFFFFF;
+  border-radius: 10px;
+  padding: 20px;
  .formSearch{
-    padding: 20px;
+    // padding: 20px;
  }
  .tableBox{
-    margin: 20px;
+    margin-top: 20px;
+    margin-bottom: 20px;
  }
  .fenye {
    margin-top: 20px;
--- a/src/views/marketing/scene/index.vue
+++ b/src/views/marketing/scene/index.vue
@ -166,6 +166,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/marketing/spike/index.vue
+++ b/src/views/marketing/spike/index.vue
@ -285,6 +285,8 @@ export default {

 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/order/aftersale/index.vue
+++ b/src/views/order/aftersale/index.vue
@ -219,6 +219,11 @@ export default {
 //@import url(); 引入公共css类
@import url("../../../styles/elDialog.scss");
 .tab_show {
-  padding-left: 30px;
+  // padding-left: 30px;
+}
+.pending{
+  background: #FFFFFF;
+  border-radius: 10px;
+  padding: 30px;
 }
 </style>
--- a/src/views/order/pending/index.vue
+++ b/src/views/order/pending/index.vue
@ -220,6 +220,11 @@ export default {
 //@import url(); 引入公共css类
@import url("../../../styles/elDialog.scss");
 .tab_show {
-  padding-left: 30px;
+  // padding-left: 30px;
+}
+.pending{
+  background: #FFFFFF;
+  border-radius: 10px;
+  padding: 30px;
 }
 </style>
--- a/src/views/setup/phone/index.vue
+++ b/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;
--- a/src/views/setup/privacy/index.vue
+++ b/src/views/setup/privacy/index.vue
@ -202,6 +202,8 @@ export default {

 <style lang="scss" scpoed>
 .integralPage {
+  background: #FFFFFF;
+  border-radius: 10px;
  padding: 32px 20px;
  .configuration {
    width: 600px;
--- a/src/views/setup/role/index.vue
+++ b/src/views/setup/role/index.vue
@ -376,5 +376,7 @@ export default {
@import url("../../../styles/elDialog.scss");
 .userStyle {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 </style>
--- a/src/views/setup/tabs/index.vue
+++ b/src/views/setup/tabs/index.vue
@ -379,6 +379,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .userStyle {
  $comPadding: 12px 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
  .formSearch{
    padding: $comPadding;
    line-height: 40px;
--- a/src/views/setup/user/index.vue
+++ b/src/views/setup/user/index.vue
@ -369,5 +369,7 @@ export default {
@import url("../../../styles/elDialog.scss");
 .userStyle {
  padding: 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 </style>
--- a/src/views/system/logistics/index.vue
+++ b/src/views/system/logistics/index.vue
@ -206,6 +206,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;
--- a/src/views/system/shopCrossDetail/index.vue
+++ b/src/views/system/shopCrossDetail/index.vue
@ -101,7 +101,8 @@ export default {
 .setting-shop-page {
  margin-top: 20px;
  min-height: calc(100% - 20px);
-  background-color: #ffffff;
+  background: #FFFFFF;
+  border-radius: 10px;
  padding: 15px 20px;
  .h5 {
    max-width: 1000px;
--- a/src/views/system/shopSys/index.vue
+++ b/src/views/system/shopSys/index.vue
@ -77,9 +77,12 @@
      <div class="h5">
        <div class="title">店铺认证</div>
      </div>
-      <div class="shop-details" style="overflow: hidden; line-height: 40px">
-        微信支付-商户认证
-        <!-- <el-button type="primary" style="float:right" @click="approve">立即认证</el-button> -->
+      <div class="shop-details" v-if="storeDetails.xsPayId && storeDetails.xsPayId.length > 0" style="overflow: hidden; line-height: 40px">
+        支付信息已认证 {{storeDetails.xsPayId}}
+      </div>
+      <div class="shop-details" v-else style="overflow: hidden; line-height: 40px">
+        支付信息认证
+        <el-button type="primary" style="float:right" @click="approve">立即认证</el-button>
      </div>
      <div class="h5">
        <div class="title">退货地址</div>
@ -287,8 +290,9 @@ export default {
 .setting-shop-page {
  margin-top: 20px;
  min-height: calc(100% - 20px);
-  background-color: #ffffff;
  padding: 15px 20px;
+  background: #FFFFFF;
+  border-radius: 10px;
  .h5 {
    max-width: 1000px;
    display: flex;
--- a/src/views/system/storehouse/index.vue
+++ b/src/views/system/storehouse/index.vue
@ -210,6 +210,8 @@ export default {
@import url("../../../styles/elDialog.scss");
 .pending {
  padding: 30px;
+  background: #FFFFFF;
+  border-radius: 10px;
 }
 .fenye {
  margin-top: 20px;