Merge branch 'decoration' of http://10.0.0.22:3000/lingxi/lingxi-business-system into decoration

6a355196 · 前端-许佳敏 · c014528d · bfa14772 · 6a355196 · 6a355196
Commit 6a355196 authored Sep 29, 2020 by 前端-许佳敏
38 changed files
--- a/config/theme.config.ts
+++ b/config/theme.config.ts
@@ -18,4 +18,15 @@ export default {
  // 'link-color': MAIN_COLOR,
  // 'link-hover-color': MAIN_COLOR,
  // 'link-active-color': MAIN_COLOR,
+  // Font-size
+  '@font-size-base': '12px',
+  '@font-size-lg': '14px',
+  '@font-size-sm': '12px',
+  // Layout
+  '@layout-header-height': '48px',
+  // PageHeader
+  // '@page-header-padding': '8px 24px',     // 这里替换会出现前边拼接了 '6px 8px 24px'这样，所以直接改成修改样式好了
 }
--- a/src/components/AvatarWrap/index.less
+++ b/src/components/AvatarWrap/index.less
 .head {
  display: flex;
  align-items: center;
-  font-size: 20px;
+  font-size: 18px;
  font-weight: 500;
  &-prefix {

--- a/src/components/Charts/Pie/index.less
+++ b/src/components/Charts/Pie/index.less
@@ -88,7 +88,7 @@
      margin-bottom: 8px;
      color: @text-color-secondary;
      font-weight: normal;
-      font-size: 14px;
+      font-size: 12px;
      line-height: 22px;
    }

--- a/src/components/DetailPage/index.less
+++ b/src/components/DetailPage/index.less
@@ -11,7 +11,7 @@
    .title {
      margin-left: 16px;
-      font-size: 20px;
+      font-size: 18px;
      color: #303133;
      font-weight: 500;
    }
@@ -19,11 +19,11 @@
    .back_btn {
      color: #909399;
      margin-left: 27px;
-      font-size: 16px;
+      font-size: 14px;
      cursor: pointer;
      &>span {
-        font-size: 14px;
+        font-size: 12px;
        margin-left: 6px;
      }
    }

--- a/src/components/MellowCard/index.less
+++ b/src/components/MellowCard/index.less
@@ -9,7 +9,7 @@
        &-title {
          line-height: 24px;
          padding-bottom: 0;
-          font-size: 16px;
+          font-size: 14px;
          font-weight: 500;
          color: rgba(23, 43, 77, 1);
        }

--- a/src/components/NiceForm/components/CardCheckBox.tsx
+++ b/src/components/NiceForm/components/CardCheckBox.tsx
@@ -51,7 +51,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
    font-size: 12px;
  }
  .card-checkbox-title {
-    font-size: 14px;
+    font-size: 12px;
    color: #606266;
  }
 `

--- a/src/components/NiceForm/index.less
+++ b/src/components/NiceForm/index.less
@@ -5,7 +5,7 @@
  background: #fff;
  text-align: center;
  line-height: 160px;
-  font-size: 20px;
+  font-size: 18px;
  border-radius: 50%;
 }
@@ -39,12 +39,12 @@
  align-items: center;
  height: 32px;
  color: rgba(0, 0, 0, 0.85);
-  font-size: 14px;
+  font-size: 12px;
  &::before {
    display: inline-block;
    margin-right: 4px;
    color: #ff4d4f;
-    font-size: 14px;
+    font-size: 12px;
    font-family: SimSun, sans-serif;
    line-height: 1;
    content: '*';

--- a/src/components/RequireItem/index.less
+++ b/src/components/RequireItem/index.less
@@ -8,7 +8,7 @@
      display: inline-block;
      margin-left: 4px;
      color: #ff4d4f;
-      font-size: 14px;
+      font-size: 12px;
      font-family: SimSun, sans-serif;
      line-height: 1;
      content: '*';

--- a/src/components/StatusTag/index.less
+++ b/src/components/StatusTag/index.less
 .tag {
  line-height: 22px;
  padding: 0 8px;
-  font-size: 14px;
+  font-size: 12px;
  font-weight: 400;
  color: #00B37A;
  background: #EBF7F2;

--- a/src/components/TabTree/index.less
+++ b/src/components/TabTree/index.less
@@ -5,7 +5,7 @@
  align-items: center;
  height: 54px;
  background: #fff;
-  font-size: 18px;
+  font-size: 16px;
  font-weight: 700;
  color: @main-font-bold-color;
 }

--- a/src/components/UploadModal/index.less
+++ b/src/components/UploadModal/index.less
@@ -5,20 +5,20 @@
  list-style-type: decimal;
  li{
    color: #909399;
-    font-size: 14px;
+    font-size: 12px;
  }
 }
 .step1Description{
  h4{
    height:22px;
-    font-size:14px;
+    font-size: 12px;
    font-weight:500;
    color:rgba(23,43,77,1);
    line-height:22px;
  }
  p{
    height:20px;
-    font-size:14px;
+    font-size: 12px;
    font-weight:400;
    color:rgba(107,119,140,1);
    line-height:20px;

--- a/src/global.less
+++ b/src/global.less
@@ -210,19 +210,9 @@ ol {
 #root {
  .ant-pro-global-header {
-    height: 56px;
    background: @header-global-nav-bg;
  }
-  .ant-layout-header {
-    height: 56px;
-    line-height: 56px;
-  }
-  .ant-pro-global-header-trigger {
-    height: 56px;
-  }
  .ant-pro-global-header-trigger:hover {
    background: @header-global-nav-bg;
  }
@@ -369,7 +359,7 @@ ol {
  .ant-tree .ant-tree-switcher .ant-tree-switcher-icon,
  .ant-tree .ant-tree-switcher .ant-select-tree-switcher-icon {
-    font-size: 14px;
+    font-size: 12px;
  }
  .black-tabs {

--- a/src/global/styles/reset.less
+++ b/src/global/styles/reset.less
 @import './mixins/layout.less';
 #root {
+  .ant-pro-global-footer {
+    margin: 8px auto 32px auto;
+  }
  .identityRadio{
    display: flex;
    flex-direction: column;

--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -42,9 +42,9 @@
  justify-content: space-between;
  background: #fff;
  padding: 0 24px;
-  height: 64px;
+  height: 56px;
-  line-height: 64px;
+  line-height: 56px;
-  font-size: 20px;
+  font-size: 18px;
  font-weight: bold;
  color: #303133;
 }
@@ -63,9 +63,9 @@
  display: flex;
  justify-content: center;
  align-items: center;
-  height: 56px;
+  height: 48px;
  background: @header-global-nav-bg;
-  font-size: 18px;
+  font-size: 16px;
  color: #fff;
 }

--- a/src/pages/comment/manage/detailed/components/EvaluationList/index.tsx
+++ b/src/pages/comment/manage/detailed/components/EvaluationList/index.tsx
@@ -69,7 +69,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
    &-title {
      line-height: 14px;
      margin-bottom: 18px;
-      font-size: 14px;
+      font-size: 12px;
      font-weight: 400;
      color: #303133;
    }
@@ -84,7 +84,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
    &-price {
      line-height: 14px;
-      font-size: 14px;
+      font-size: 12px;
      font-weight: 500;
      color: #303133;
    }

--- a/src/pages/comment/query/detailed/components/EvaluationList/index.tsx
+++ b/src/pages/comment/query/detailed/components/EvaluationList/index.tsx
@@ -69,7 +69,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
    &-title {
      line-height: 14px;
      margin-bottom: 18px;
-      font-size: 14px;
+      font-size: 12px;
      font-weight: 400;
      color: #303133;
    }
@@ -84,7 +84,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
    &-price {
      line-height: 14px;
-      font-size: 14px;
+      font-size: 12px;
      font-weight: 500;
      color: #303133;
    }

--- a/src/pages/comment/query/detailed/components/RecordList/index.less
+++ b/src/pages/comment/query/detailed/components/RecordList/index.less
@@ -18,7 +18,7 @@
      &-name {
        line-height: 14px;
        margin-bottom: 13px;
-        font-size: 14px;
+        font-size: 12px;
        font-weight: 400;
      }

--- a/src/pages/comment/query/detailed/components/Shelves/index.less
+++ b/src/pages/comment/query/detailed/components/Shelves/index.less
@@ -5,7 +5,7 @@
    line-height: 14px;
    padding: 12px;
    position: relative;
-    font-size: 14px;
+    font-size: 12px;
    font-weight: 400;
    color: #606266;
    border-bottom: 1px solid #EEF0F3;

--- a/src/pages/commodity/productWillCheck/index.less
+++ b/src/pages/commodity/productWillCheck/index.less
@@ -5,20 +5,20 @@
  list-style-type: decimal;
  li{
    color: #909399;
-    font-size: 14px;
+    font-size: 12px;
  }
 }
 .step1Description{
  h4{
    height:22px;
-    font-size:14px;
+    font-size: 12px;
    font-weight:500;
    color:rgba(23,43,77,1);
    line-height:22px;
  }
  p{
    height:20px;
-    font-size:14px;
+    font-size: 12px;
    font-weight:400;
    color:rgba(107,119,140,1);
    line-height:20px;

--- a/src/pages/commodity/products/index.less
+++ b/src/pages/commodity/products/index.less
@@ -5,20 +5,20 @@
  list-style-type: decimal;
  li{
    color: #909399;
-    font-size: 14px;
+    font-size: 12px;
  }
 }
 .step1Description{
  h4{
    height:22px;
-    font-size:14px;
+    font-size: 12px;
    font-weight:500;
    color:rgba(23,43,77,1);
    line-height:22px;
  }
  p{
    height:20px;
-    font-size:14px;
+    font-size: 12px;
    font-weight:400;
    color:rgba(107,119,140,1);
    line-height:20px;

--- a/src/pages/content/components/Tags/Tags.less
+++ b/src/pages/content/components/Tags/Tags.less
@@ -8,7 +8,7 @@
    .selectionItem {
      height: 24px;
-      font-size: 14px;
+      font-size: 12px;
      padding: 0px 7px;
      margin: 0 16px 16px 0;
      display: flex;
@@ -45,7 +45,7 @@
      padding: 0 6px;
      background: #F4F5F7;
      border-radius: 4px;
-      font-size: 14px;
+      font-size: 12px;
      color: #606266;
      display: flex;
      justify-content: center;

--- a/src/pages/home.tsx
+++ b/src/pages/home.tsx
@@ -2,9 +2,19 @@ import React, { Component } from 'react';
 class Home extends Component {
  render() {
-    return <div>
+    return (
-      <h1>home页面</h1>
+      <div
-    </div>;
+        style={{
+          margin: '-24px',
+        }}
+      >
+        <img 
+          src="https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/bc7f3a2385c0438bafcf1b74212cc7721601275065050.png" 
+          width="100%"
+          height="auto"
+        />
+      </div>
+    );
  }
 }

--- a/src/pages/member/components/EquityInfo/index.less
+++ b/src/pages/member/components/EquityInfo/index.less
@@ -13,7 +13,7 @@
    &-title {
      margin-bottom: 20px;
      line-height: 24px;
-      font-size: 16px;
+      font-size: 14px;
      font-weight: 500;
      color: rgba(23, 43, 77, 1);
    }
@@ -50,7 +50,7 @@
      &-title {
        margin-bottom: 9px;
        line-height: 22px;
-        font-size: 14px;
+        font-size: 12px;
        font-weight: 400;
        color: rgba(23, 43, 77, 1);
        text-align: center;
@@ -69,7 +69,7 @@
      &-tag {
        line-height: 22px;
        padding: 0 6px;
-        font-size: 14px;
+        font-size: 12px;
        font-weight: 400;
        text-align: center;
        border-radius: 4px;
@@ -107,7 +107,7 @@
    &-title {
      line-height: 20px;
      margin-bottom: 24px;
-      font-size: 14px;
+      font-size: 12px;
      font-weight: 400;
      color: rgba(107, 119, 140, 1);
    }

--- a/src/pages/member/components/HeadInfo/index.less
+++ b/src/pages/member/components/HeadInfo/index.less
 .head {
  display: flex;
  align-items: center;
-  font-size: 20px;
+  font-size: 18px;
  font-weight: 500;
  &-prefix {

--- a/src/pages/member/components/SincerityInfo/index.less
+++ b/src/pages/member/components/SincerityInfo/index.less
@@ -39,7 +39,7 @@
  .title {
    margin-bottom: 20px;
    line-height: 20px;
-    font-size: 14px;
+    font-size: 12px;
    font-weight: 400;
    color: rgba(107, 119, 140, 1);

--- a/src/pages/member/components/StatusTag/index.less
+++ b/src/pages/member/components/StatusTag/index.less
 .tag {
  line-height: 22px;
  padding: 0 8px;
-  font-size: 14px;
+  font-size: 12px;
  font-weight: 400;
  color: #00B37A;
  background: #EBF7F2;

--- a/src/pages/member/memberLevel/addEquity.less
+++ b/src/pages/member/memberLevel/addEquity.less
 .headerTop {
  display: flex;
  align-items: center;
-  font-size: 20px;
+  font-size: 18px;
  font-family: PingFangSC-Medium, PingFang SC;
  font-weight: 500;
@@ -28,7 +28,7 @@
    background-color: #FFEBE6;
    border-radius: 4px;
    color: #E63F3B;
-    font-size: 14px;
+    font-size: 12px;
    font-weight: 400;
    text-align: center;
  }
@@ -47,7 +47,7 @@
      display: flex;
      width: calc(100% / 3);
      margin-bottom: 17px;
-      font-size: 14px;
+      font-size: 12px;
      font-family: PingFangSC-Regular, PingFang SC;
      font-weight: 400;
      color: #909399;

--- a/src/pages/pageCustomized/components/SettingList/index.less
+++ b/src/pages/pageCustomized/components/SettingList/index.less
@@ -71,7 +71,7 @@
        line-height: 36px;
        background: rgba(0, 0, 0, 0.65);
        color: #ffffff;
-        font-size: 16px;
+        font-size: 14px;
        text-align: center;
        cursor: pointer;
      }

--- a/src/pages/pageCustomized/components/SettingPanel/index.less
+++ b/src/pages/pageCustomized/components/SettingPanel/index.less
@@ -10,7 +10,7 @@
    flex-grow: 1;
    padding: 24px;
    overflow: auto;
-    font-size: 14px;
+    font-size: 12px;
    line-height: 1.5715;
  }

--- a/src/pages/pageCustomized/components/templateItem/index.less
+++ b/src/pages/pageCustomized/components/templateItem/index.less
@@ -62,7 +62,7 @@
      color: #ffffff;
      text-align: center;
      line-height: 24px;
-      font-size: 14px;
+      font-size: 12px;
      background: #4279DF;
      border-radius: 8px 0px 8px 0px;
      z-index: 3;
@@ -112,7 +112,7 @@
      .template_info_content_text_wrap {
        flex: 1;
-        font-size: 14px;
+        font-size: 12px;
        line-height: 22px;
        .template_info_content_text_line {
@@ -141,7 +141,7 @@
        border: 1px solid rgba(235, 236, 240, 1);
        cursor: pointer;
        color: #606266;
-        font-size: 14px;
+        font-size: 12px;
        // margin-top: auto;
        margin-left: auto;

--- a/src/pages/pageCustomized/components/toolBar/index.less
+++ b/src/pages/pageCustomized/components/toolBar/index.less
@@ -21,11 +21,11 @@
    color: #909399;
    padding-left: 12px;
-    font-size: 14px;
+    font-size: 12px;
    &>label {
      color: #303133;
-      font-size: 20px;
+      font-size: 18px;
      margin-left: 4px;
    }
  }

--- a/src/pages/pageCustomized/mallEdit/index.less
+++ b/src/pages/pageCustomized/mallEdit/index.less
@@ -34,7 +34,7 @@
  .loading_text {
    margin-top: 16px;
-    font-size: 16px;
+    font-size: 14px;
    font-weight: bold;
  }
 }
\ No newline at end of file
--- a/src/pages/pageCustomized/settingsPanel/propsSettings/Animate/index.less
+++ b/src/pages/pageCustomized/settingsPanel/propsSettings/Animate/index.less
@@ -17,7 +17,7 @@
 .select-box, .animate-btn {
  height: 24px;
  font-family: PingFang-SC-Regular;
-  font-size: 14px;
+  font-size: 12px;
  letter-spacing: 0.2px;
  color: #555;
  border-radius: 2px;

--- a/src/pages/pageCustomized/settingsPanel/propsSettings/components/BrandSetting/index.less
+++ b/src/pages/pageCustomized/settingsPanel/propsSettings/components/BrandSetting/index.less
@@ -38,13 +38,13 @@
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
-      font-size: 14px;
+      font-size: 12px;
      color: #303133;
    }
    &_price {
      color: #D32F2F;
-      font-size: 14px;
+      font-size: 12px;
      margin-top: 8px;
      margin-bottom: 4px;

--- a/src/pages/pageCustomized/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.less
+++ b/src/pages/pageCustomized/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.less
@@ -6,7 +6,7 @@
    padding: 8px;
    border-bottom: 1px solid #F4F5F7;
    color: #606266;
-    font-size: 14px;
+    font-size: 12px;
    &::before {
      position: absolute;

--- a/src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.less
+++ b/src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.less
@@ -23,13 +23,13 @@
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
-      font-size: 14px;
+      font-size: 12px;
      color: #303133;
    }
    &_price {
      color: #D32F2F;
-      font-size: 14px;
+      font-size: 12px;
      margin-top: 8px;
      margin-bottom: 4px;

--- a/src/pages/pageCustomized/settingsPanel/propsSettings/components/ShopSetting/index.less
+++ b/src/pages/pageCustomized/settingsPanel/propsSettings/components/ShopSetting/index.less
@@ -25,13 +25,13 @@
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
-      font-size: 14px;
+      font-size: 12px;
      color: #303133;
    }
    &_price {
      color: #D32F2F;
-      font-size: 14px;
+      font-size: 12px;
      margin-top: 8px;
      margin-bottom: 4px;

--- a/src/pages/pageCustomized/templateDetail/index.less
+++ b/src/pages/pageCustomized/templateDetail/index.less
@@ -8,7 +8,7 @@
  .back_btn {
    color: #909399;
    margin-left: 27px;
-    font-size: 16px;
+    font-size: 14px;
    margin-top: 40px;
    cursor: pointer;
    align-self: flex-start;
@@ -35,7 +35,7 @@
        color: #ffffff;
        text-align: center;
        line-height: 24px;
-        font-size: 14px;
+        font-size: 12px;
        background: #4279DF;
        border-radius: 8px 0px 8px 0px;
        z-index: 3;