diff --git a/src/components/AddressList/index.scss b/src/components/AddressList/index.scss index 1a7e147..6ed9309 100644 --- a/src/components/AddressList/index.scss +++ b/src/components/AddressList/index.scss @@ -18,17 +18,17 @@ // height: 156px; background: #ffffff; border-radius: 20px; - box-shadow: 2px 4px 12px 0px rgba(0, 0, 0, 0.16); + // box-shadow: 2px 4px 12px 0px rgba(0, 0, 0, 0.16); padding: 30px; box-sizing: border-box; margin: 18px auto 0; - border: 1px solid #ffffff; - border: 1px solid rgba(0, 0, 0, 0.16); + // border: 1px solid #ffffff; + // border: 1px solid rgba(0, 0, 0, 0.16); } .address-active { border: 1px solid #68b4ff; - box-shadow: 0px 0px 10px 0px rgba(0, 122, 255, 0.27); + // box-shadow: 0px 0px 10px 0px rgba(0, 122, 255, 0.27); } .address-list:first-child { @@ -40,7 +40,7 @@ } .address-user { - font-size: 28px; + font-size: 32px; font-family: Microsoft YaHei, Microsoft YaHei-Bold; font-weight: 700; text-align: left; @@ -65,7 +65,7 @@ .address-list-phone { font-size: 28px; font-weight: 400; - color: #000000; + color: #717171; margin-left: 16px; margin-right: 16px; } @@ -138,6 +138,6 @@ margin-top: 16px; font-size: 28px; font-weight: 400; - color: #000000; + color: #676767; } } \ No newline at end of file diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx index ab26169..20f97dd 100644 --- a/src/components/AddressList/index.tsx +++ b/src/components/AddressList/index.tsx @@ -136,7 +136,7 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => { e.stopPropagation()} url={`/pages/addAddress/index?type=edit&id=${item.id}&&purchaser_id=${Number(props.purchaser_id)}`} hoverClass="none" className="address-edit"> {/* */} - + { diff --git a/src/pages/customerDetails/components/form/index.module.scss b/src/pages/customerDetails/components/form/index.module.scss index f6e495a..091a63d 100644 --- a/src/pages/customerDetails/components/form/index.module.scss +++ b/src/pages/customerDetails/components/form/index.module.scss @@ -15,7 +15,7 @@ .mainItem_right { font-size: 28px; font-weight: 400; - color: #000000; + color: #6c6c6c; margin-right: 16px; } @@ -55,7 +55,7 @@ .mainItem_right { font-size: 28px; font-weight: 400; - color: #000000; + color: #6c6c6c; margin-right: 16px; } diff --git a/src/pages/customerDetails/index.module.scss b/src/pages/customerDetails/index.module.scss index c9f544c..1f6d56f 100644 --- a/src/pages/customerDetails/index.module.scss +++ b/src/pages/customerDetails/index.module.scss @@ -49,7 +49,7 @@ font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #000000; + color: #646466; } } diff --git a/src/pages/customerEditor/components/Form/index.module.scss b/src/pages/customerEditor/components/Form/index.module.scss index 32846ef..351bcac 100644 --- a/src/pages/customerEditor/components/Form/index.module.scss +++ b/src/pages/customerEditor/components/Form/index.module.scss @@ -11,7 +11,7 @@ align-items: center; font-size: 28px; font-weight: 500; - color: #000000; + color: #333333; .xing { font-size: 28px; diff --git a/src/pages/customerEditor/index.module.scss b/src/pages/customerEditor/index.module.scss index 6cdb7d1..2f78e68 100644 --- a/src/pages/customerEditor/index.module.scss +++ b/src/pages/customerEditor/index.module.scss @@ -63,7 +63,6 @@ .modeName { font-size: 28px; - font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #337FFF; } @@ -82,11 +81,17 @@ .remarkFont { margin-top: 24px; font-size: 28px; - font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #000000; } +.remarkFontactive { + margin-top: 24px; + font-size: 28px; + font-weight: 400; + color: #aeaeae; +} + .safeBox { width: 100%; height: 160px; diff --git a/src/pages/customerEditor/index.tsx b/src/pages/customerEditor/index.tsx index 0618bc4..240831b 100644 --- a/src/pages/customerEditor/index.tsx +++ b/src/pages/customerEditor/index.tsx @@ -332,7 +332,7 @@ export default () => { > `} clickNode={() => setShowDesc(true)}> - {remarkDesc === '' ? '尚未备注信息' : remarkDesc} + {remarkDesc === '' ? '尚未备注信息' : remarkDesc} setShowDesc(false)}> getRemark(e)} defaultValue={infoObj?.remark} showInput={showDesc ? true : false} /> diff --git a/src/pages/customerManagement/components/ItemList/index.module.scss b/src/pages/customerManagement/components/ItemList/index.module.scss index d02dcf5..2ed40a7 100644 --- a/src/pages/customerManagement/components/ItemList/index.module.scss +++ b/src/pages/customerManagement/components/ItemList/index.module.scss @@ -45,7 +45,7 @@ font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #000000; + color: #6e6e6e; } } @@ -102,6 +102,18 @@ font-size: 24px; font-weight: 400; color: #000000; + + .flex_left { + color: #999999; + font-weight: 400; + font-size: 24px; + } + + .flex_right { + color: #999999; + font-weight: 400; + font-size: 24px; + } } } \ No newline at end of file diff --git a/src/pages/customerManagement/components/Sort/index.module.scss b/src/pages/customerManagement/components/Sort/index.module.scss index d5133a0..9848079 100644 --- a/src/pages/customerManagement/components/Sort/index.module.scss +++ b/src/pages/customerManagement/components/Sort/index.module.scss @@ -6,7 +6,7 @@ .itemFlex { padding: 23px 11px 23px 11px; background: #f6f6f6; - box-sizing: border-box; + // box-sizing: border-box; border: 1px solid #f6f6f6; font-size: 28px; font-weight: 400; @@ -21,7 +21,7 @@ background: rgba(51, 127, 255, 0.1); border-radius: 16px; border: 1px solid #337FFF; - box-sizing: border-box; + // box-sizing: border-box; font-size: 28px; font-weight: 400; color: #337FFF; diff --git a/src/pages/customerManagement/components/Tag/index.module.scss b/src/pages/customerManagement/components/Tag/index.module.scss index a08c8a3..570fbd8 100644 --- a/src/pages/customerManagement/components/Tag/index.module.scss +++ b/src/pages/customerManagement/components/Tag/index.module.scss @@ -18,7 +18,7 @@ .itemFlex { padding: 23px 47px 23px 47px; background: #f6f6f6; - box-sizing: border-box; + // box-sizing: border-box; border: 1px solid #f6f6f6; font-size: 28px; font-weight: 400; @@ -33,7 +33,7 @@ background: rgba(51, 127, 255, 0.1); border-radius: 16px; border: 1px solid #337FFF; - box-sizing: border-box; + // box-sizing: border-box; font-size: 28px; font-weight: 400; color: #337FFF; @@ -41,4 +41,4 @@ margin-bottom: 24px; } } -} \ No newline at end of file +} diff --git a/src/pages/customerManagement/index.module.scss b/src/pages/customerManagement/index.module.scss index ab66b92..4cf2db6 100644 --- a/src/pages/customerManagement/index.module.scss +++ b/src/pages/customerManagement/index.module.scss @@ -5,7 +5,7 @@ position: sticky; top: 0; z-index: 999; - padding-bottom: 24px; + // padding-bottom: 24px; background: #fff; // overflow: hidden; diff --git a/src/pages/order/components/itemList/index.module.scss b/src/pages/order/components/itemList/index.module.scss index 49fd41b..13701c1 100644 --- a/src/pages/order/components/itemList/index.module.scss +++ b/src/pages/order/components/itemList/index.module.scss @@ -46,8 +46,8 @@ // width: 638px; margin-right: 32px; height: 1px; - background: #000000; - opacity: 0.1; + background: #e7e7e7; + // opacity: 0.1; margin-top: 16px; margin-bottom: 24px; } @@ -94,7 +94,7 @@ justify-content: space-between; min-width: 76%; // width: 480px; - margin-bottom: 32px; + margin-bottom: 12px; .productBox { display: flex; @@ -185,8 +185,8 @@ // width: 638px; margin-right: 32px; height: 1px; - background: #000000; - opacity: 0.1; + background: #e7e7e7; + // opacity: 0.1; margin-left: 32px; margin-top: 24px; } @@ -201,9 +201,8 @@ .msgLeft { margin-left: 32px; font-size: 24px; - font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #000000; + color: #a1a1a1; } .msgRight { @@ -211,7 +210,7 @@ font-size: 24px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #000000; + color: #a1a1a1; } .msgRightOne { diff --git a/src/pages/order/index.module.scss b/src/pages/order/index.module.scss index 94a9793..547bbfd 100644 --- a/src/pages/order/index.module.scss +++ b/src/pages/order/index.module.scss @@ -60,6 +60,14 @@ justify-content: space-between; margin-right: 16px; + .lefttopSelectNameactive { + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #8b8b8b; + margin-left: 24px; + } + .lefttopSelectName { font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; @@ -142,7 +150,7 @@ } .thirdBox { - margin-top: 40px; + margin-top: 30px; padding-left: 48px; .thirdTopfont { diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 34c8280..98241a7 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -636,14 +636,14 @@ export default () => { navTo(1)}> 客户信息 - {searchObj.clientName === '' ? '请选择客户' : searchObj.clientName} + {searchObj.clientName === '' ? '请选择客户' : searchObj.clientName} navTo(2)}> 业务员 - {searchObj.saleuserName === '' ? '请选择客户' : searchObj.saleuserName} + {searchObj.saleuserName === '' ? '请选择客户' : searchObj.saleuserName} diff --git a/src/pages/orderDetails/components/addressDetailBox/index.module.scss b/src/pages/orderDetails/components/addressDetailBox/index.module.scss index 2c1e07f..4260b47 100644 --- a/src/pages/orderDetails/components/addressDetailBox/index.module.scss +++ b/src/pages/orderDetails/components/addressDetailBox/index.module.scss @@ -74,7 +74,7 @@ font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #000000; + color: #343434; margin-right: 16px; } @@ -83,7 +83,7 @@ font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #000000; + color: #343434; margin-right: 70px; } diff --git a/src/pages/orderDetails/index.module.scss b/src/pages/orderDetails/index.module.scss index b2f8721..f2ce68c 100644 --- a/src/pages/orderDetails/index.module.scss +++ b/src/pages/orderDetails/index.module.scss @@ -182,13 +182,13 @@ page { .itemMoney { font-size: 28px; font-weight: 400; - color: #000000; + color: #a5a5a5; } .itemMoneyOne { font-size: 28px; font-weight: 500; - color: #000000; + color: #333333; } } } @@ -241,13 +241,13 @@ page { .itemMoney { font-size: 28px; font-weight: 400; - color: #000000; + color: #a5a5a5; } .itemMoneyOne { font-size: 28px; font-weight: 500; - color: #000000; + color: #333333; } } } @@ -294,7 +294,7 @@ page { .detailFont { font-size: 28px; font-weight: 400; - color: #000000; + color: #b8b8b8; } }