diff --git a/src/components/AddressList/index.scss b/src/components/AddressList/index.scss index 1224a8e..d2b9ee4 100644 --- a/src/components/AddressList/index.scss +++ b/src/components/AddressList/index.scss @@ -1,45 +1,46 @@ -.address-scroll-view{ +.address-scroll-view { height: 100%; box-sizing: border-box; position: relative; - scroll-view{ + scroll-view { height: 100%; box-sizing: border-box; } - .address-scroll-view-content{ + .address-scroll-view-content { padding-bottom: 300px; } - .address-list{ + .address-list { width: 704px; 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 rgba(0, 0, 0, 0.16); } - .address-active{ + .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{ + .address-list:first-child { margin-top: 0; } - .address-list-last{ + .address-list-last { margin-bottom: 300px; } - .address-user{ + .address-user { font-size: 28px; font-family: Microsoft YaHei, Microsoft YaHei-Bold; font-weight: 700; text-align: left; color: #000000; - display: flex;align-items: center; + display: flex; + align-items: center; } - .address-list-default{ + .address-list-default { width: 58px; height: 28px; background: #cde5ff; @@ -47,52 +48,57 @@ font-size: 20px; font-weight: 400; text-align: center; - color: #007aff; + color: $color_main; margin-left: 30px; - } - .address-list-phone{ + .address-list-phone { font-size: 24px; font-weight: 400; color: #ababab; margin-left: 30px; } - .address-edit{ + .address-edit { padding: 10px; } - .address-edit .icon-bianji{ + .address-edit .icon-bianji { font-size: 40px; } - .address-list-info{ + .address-list-info { font-size: 24px; font-weight: 400; color: #3c3c3c; display: flex; width: 100%; } - .address-list-info view{ + .address-list-info view { max-width: 60%; text-overflow: ellipsis; - overflow: hidden;white-space: nowrap; + overflow: hidden; + white-space: nowrap; } - .address-list-bottom{ - display: flex;justify-content: space-between; + .address-list-bottom { + display: flex; + justify-content: space-between; margin-top: 18px; } - .add-address{ + .add-address { width: 668px; height: 82px; - background: #007aff; + background: $color_main; border-radius: 40px; font-size: 32px; font-weight: 400; color: #ffffff; - display: flex;align-items: center;justify-content: center; - position: absolute;bottom: 100px;left: 50%; + display: flex; + align-items: center; + justify-content: center; + position: absolute; + bottom: 100px; + left: 50%; transform: translateX(-50%); } - .address-no-data{ + .address-no-data { font-size: 24px; font-weight: 400; text-align: center; @@ -101,4 +107,4 @@ padding-top: 40%; box-sizing: border-box; } -} \ No newline at end of file +} diff --git a/src/components/FromList/index.scss b/src/components/FromList/index.scss index 969922e..ffed035 100644 --- a/src/components/FromList/index.scss +++ b/src/components/FromList/index.scss @@ -1,92 +1,100 @@ -.form-list{ +.form-list { display: flex; justify-content: space-between; margin: 30px 30px 0; - .form-list-label{ + .form-list-label { font-size: 28px; font-weight: 700; color: #000000; margin-top: 20px; } - .form-list-label-required::before{ - content: "*"; - color: #FF0000; + .form-list-label-required::before { + content: '*'; + color: #ff0000; font-size: 28px; } - .form-list-right{ + .form-list-right { width: 506px; font-size: 26px; font-weight: 400; } - .form-list-right-meet{ + .form-list-right-meet { background: #f6f6f6; width: 506px; min-height: 80px; border-radius: 20px; box-sizing: border-box; padding: 10px 20px; - display: flex;justify-content: space-between; + display: flex; + justify-content: space-between; align-items: center; } - .form-list-input{ + .form-list-input { width: 100%; - display: flex;align-items: center; + display: flex; + align-items: center; } - .form-list-input view{ + .form-list-input view { height: 100%; padding: 0 10px; box-sizing: border-box; } - .form-list-input text{ + .form-list-input text { width: 30px; min-width: 30px; height: 30px; - background: rgba(0,0,0,0.3); + background: rgba(0, 0, 0, 0.3); border-radius: 50%; font-size: 18px; - display: flex;align-items: center; + display: flex; + align-items: center; justify-content: center; flex: 1; color: white; } - .form-list-right input,.form-list-right textarea{ + .form-list-right input, + .form-list-right textarea { // flex: 0 0 auto; min-height: 100%; width: 100%; color: #000000; } - .form-list-right textarea{ + .form-list-right textarea { height: 186px; border-radius: 10px; padding: 10px 0; } - .form-list-right .phcolor{ + .form-list-right .phcolor { color: #ababab; } - .form-list-right-placeholder{ + .form-list-right-placeholder { color: #ababab; } - .form-list-right-enter .icon-a-moreback{ + .form-list-right-enter .icon-a-moreback { font-size: 28px; } - .add-address-default{ - display: flex;align-items: center;justify-content: space-between; + .add-address-default { + display: flex; + align-items: center; + justify-content: space-between; margin: 70px 30px 0; font-size: 26px; font-weight: 700; color: #000000; } - .add-address-save{ + .add-address-save { width: 668px; height: 82px; - background: #007aff; + background: $color_main; border-radius: 40px; font-size: 32px; font-weight: 400; color: #ffffff; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; margin: 620px auto 0; } -} \ No newline at end of file +} diff --git a/src/components/FromListCertification/index.scss b/src/components/FromListCertification/index.scss index b2e4f71..9697363 100644 --- a/src/components/FromListCertification/index.scss +++ b/src/components/FromListCertification/index.scss @@ -1,97 +1,108 @@ -.From-list-certification{ +.From-list-certification { display: flex; justify-content: space-between; margin: 0 30px; - border-bottom: 1px solid #F0F0F0; + border-bottom: 1px solid #f0f0f0; padding: 15px 0; - .From-list-certification-label{ + .From-list-certification-label { font-size: 28px; font-weight: 400; color: #000000; width: 200px; - border-right: 1px solid #F0F0F0; - display: flex;align-items: center; + border-right: 1px solid #f0f0f0; + display: flex; + align-items: center; } - .From-list-certification-label-required::before{ - content: "*"; - color: #FF0000; + .From-list-certification-label-required::before { + content: '*'; + color: #ff0000; font-size: 28px; } - .From-list-certification-right{ + .From-list-certification-right { min-width: 100px; flex: 1; font-size: 26px; font-weight: 400; } - .From-list-certification-right-meet{ + .From-list-certification-right-meet { min-height: 45px; border-radius: 20px; box-sizing: border-box; padding: 10px 20px; - display: flex;justify-content: space-between; + display: flex; + justify-content: space-between; align-items: center; } - .From-list-certification-input{ + .From-list-certification-input { width: 100%; - display: flex;align-items: center; + display: flex; + align-items: center; } - .From-list-certification-input view{ + .From-list-certification-input view { height: 100%; padding: 0 10px; box-sizing: border-box; } - .From-list-certification-input text{ + .From-list-certification-input text { width: 30px; min-width: 30px; height: 30px; - background: rgba(0,0,0,0.3); + background: rgba(0, 0, 0, 0.3); border-radius: 50%; font-size: 18px; - display: flex;align-items: center; + display: flex; + align-items: center; justify-content: center; flex: 1; color: white; } - .From-list-certification-right input,.From-list-certification-right textarea{ + .From-list-certification-right input, + .From-list-certification-right textarea { // flex: 0 0 auto; min-height: 100%; width: 100%; color: #000000; } - .From-list-certification-right textarea{ + .From-list-certification-right textarea { height: 186px; border-radius: 10px; padding: 10px 0; } - .From-list-certification-right .phcolor{ + .From-list-certification-right .phcolor { color: #ababab; } - .From-list-certification-right-placeholder{ + .From-list-certification-right-placeholder { color: #ababab; - text-overflow: ellipsis;overflow: hidden;white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; width: 100%; } - .From-list-certification-right-enter .icon-a-moreback{ + .From-list-certification-right-enter .icon-a-moreback { font-size: 28px; } - .add-address-default{ - display: flex;align-items: center;justify-content: space-between; + .add-address-default { + display: flex; + align-items: center; + justify-content: space-between; margin: 70px 30px 0; font-size: 26px; font-weight: 700; color: #000000; } - .add-address-save{ + .add-address-save { width: 668px; height: 82px; - background: #007aff; + background: $color_main; border-radius: 40px; font-size: 32px; font-weight: 400; color: #ffffff; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; margin: 620px auto 0; } -} \ No newline at end of file +} diff --git a/src/components/addCollection/index.module.scss b/src/components/addCollection/index.module.scss index 556b704..eef869f 100644 --- a/src/components/addCollection/index.module.scss +++ b/src/components/addCollection/index.module.scss @@ -20,7 +20,7 @@ } .miconfont { font-size: 36px; - color: #007aff; + color: $color_main; } .text { margin-left: 10px; diff --git a/src/components/counter/index.module.scss b/src/components/counter/index.module.scss index a3defe2..bcdbe1b 100644 --- a/src/components/counter/index.module.scss +++ b/src/components/counter/index.module.scss @@ -20,7 +20,7 @@ height: 46px; text-align: center; line-height: 43px; - color: #007aff; + color: $color_main; } .input { display: flex; diff --git a/src/components/filter/index.module.scss b/src/components/filter/index.module.scss index 4add5fa..7cc0f3f 100644 --- a/src/components/filter/index.module.scss +++ b/src/components/filter/index.module.scss @@ -1,126 +1,124 @@ -.popup_main{ - width: 608px; - height: 100vh; - padding: 20px; - box-sizing: border-box; - display: flex; - flex-direction: column; - .popup_title{ - font-size: $font_size; - font-weight: 700; +.popup_main { + width: 608px; + height: 100vh; + padding: 20px; + box-sizing: border-box; + display: flex; + flex-direction: column; + .popup_title { + font-size: $font_size; + font-weight: 700; + text-align: center; + padding: 20px 0; + } + .scroll { + flex: 1; + height: 0; + } + .popup_filter { + padding-bottom: 100px; + } + .popup_filter_item { + margin-bottom: 20px; + .title { + font-size: $font_size; + color: $color_font_one; + font-weight: 700; + padding: 20px 0; + } + .btn_list { + display: grid; + grid-template-columns: repeat(3, 165.75px); + justify-content: space-between; + .btn_item { + height: 69.2px; + background: #f0f0f0; + border-radius: 34px; + line-height: 69.2px; text-align: center; - padding: 20px 0; - } - .scroll{ - flex:1; - height: 0; - } - .popup_filter{ - padding-bottom: 100px; - } - .popup_filter_item{ + font-size: $font_size_medium; + color: $color_font_one; margin-bottom: 20px; - .title{ - font-size: $font_size; - color: $color_font_one; - font-weight: 700; - padding: 20px 0; - } - .btn_list{ - display: grid; - grid-template-columns: repeat(3, 165.75px); - justify-content: space-between; - .btn_item{ - height: 69.2px; - background: #f0f0f0; - border-radius: 34px; - line-height: 69.2px; - text-align: center; - font-size: $font_size_medium; - color: $color_font_one; - margin-bottom: 20px; - @include common_ellipsis(); - } - .select_btn_item{ - color: $color_main; - background: #ecf5ff; - border: 2px solid #007aff; - box-sizing: border-box; - } - } - .btn_list_input{ - display: flex; - // justify-content: space-between; - align-items: center; - .btn_width { - flex:1; - height: 70px; - background: #f0f0f0; - border-radius: 50px; - padding: 10px 20px; - box-sizing: border-box; - input{ - width: 100%; - height: 100%; - font-size: $font_size_medium; - } - } - .unit{ - color: $color_font_one; - font-size: $font_size; - margin-left: 20px; - } - text{ - color: #ccc; - padding: 0 20px; - } - .width_main{ - - } - } - .btn_list_element{ - background-color: #F0F0F0; - border-radius: 30px; - padding: 20px; - box-sizing: border-box; - textarea{ - width: 100%; - height: 126px; - font-size: $font_size_medium; - } - } + @include common_ellipsis(); + } + .select_btn_item { + color: $color_main; + background: #ecf5ff; + border: 2px solid $color_main; + box-sizing: border-box; + } } - .btns_con{ + .btn_list_input { + display: flex; + // justify-content: space-between; + align-items: center; + .btn_width { + flex: 1; + height: 70px; + background: #f0f0f0; + border-radius: 50px; + padding: 10px 20px; + box-sizing: border-box; + input { + width: 100%; + height: 100%; + font-size: $font_size_medium; + } + } + .unit { + color: $color_font_one; + font-size: $font_size; + margin-left: 20px; + } + text { + color: #ccc; + padding: 0 20px; + } + .width_main { + } + } + .btn_list_element { + background-color: #f0f0f0; + border-radius: 30px; + padding: 20px; + box-sizing: border-box; + textarea { width: 100%; - position: fixed; - bottom:0; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); - .btns_two{ - display: flex; - width: 552px; - height: 82px; - border: 2px solid #cde5ff; - box-sizing: border-box; - font-size: $font_size_big; - border-radius: 40px; - margin-bottom: 20px; - .rest_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - text-align: center; - line-height: 82px; - color: $color_main; - - } - .verify_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - background: #007aff; - text-align: center; - line-height: 82px; - color: #fff; - } - } + height: 126px; + font-size: $font_size_medium; + } } -} \ No newline at end of file + } + .btns_con { + width: 100%; + position: fixed; + bottom: 0; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .btns_two { + display: flex; + width: 552px; + height: 82px; + border: 2px solid #cde5ff; + box-sizing: border-box; + font-size: $font_size_big; + border-radius: 40px; + margin-bottom: 20px; + .rest_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + text-align: center; + line-height: 82px; + color: $color_main; + } + .verify_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + background: $color_main; + text-align: center; + line-height: 82px; + color: #fff; + } + } + } +} diff --git a/src/components/filterV2/index.module.scss b/src/components/filterV2/index.module.scss index b3e4df7..a499b22 100644 --- a/src/components/filterV2/index.module.scss +++ b/src/components/filterV2/index.module.scss @@ -1,126 +1,124 @@ -.popup_main{ - width: 608px; - height: 100vh; - padding: 20px; - box-sizing: border-box; - display: flex; - flex-direction: column; - .popup_title{ - font-size: $font_size; - font-weight: 700; +.popup_main { + width: 608px; + height: 100vh; + padding: 20px; + box-sizing: border-box; + display: flex; + flex-direction: column; + .popup_title { + font-size: $font_size; + font-weight: 700; + text-align: center; + padding: 20px 0; + } + .scroll { + flex: 1; + height: 0; + } + .popup_filter { + padding-bottom: 100px; + } + .popup_filter_item { + margin-bottom: 20px; + .title { + font-size: $font_size; + color: $color_font_one; + font-weight: 700; + padding: 20px 0; + } + .btn_list { + display: grid; + grid-template-columns: repeat(3, 165.75px); + justify-content: space-between; + .btn_item { + // width: 165.75px; + height: 69.2px; + background: #f0f0f0; + border-radius: 34px; text-align: center; - padding: 20px 0; - } - .scroll{ - flex:1; - height: 0; - } - .popup_filter{ - padding-bottom: 100px; - } - .popup_filter_item{ + line-height: 69.2px; + font-size: $font_size_medium; + color: $color_font_one; margin-bottom: 20px; - .title{ - font-size: $font_size; - color: $color_font_one; - font-weight: 700; - padding: 20px 0; - } - .btn_list{ - display: grid; - grid-template-columns: repeat(3, 165.75px); - justify-content: space-between; - .btn_item{ - // width: 165.75px; - height: 69.2px; - background: #f0f0f0; - border-radius: 34px; - text-align: center; - line-height: 69.2px; - font-size: $font_size_medium; - color: $color_font_one; - margin-bottom: 20px; - } - .select_btn_item{ - color: $color_main; - background: #ecf5ff; - border: 2px solid #007aff; - width: 161.75px; - height: 65.2px; - } - } - .btn_list_input{ - display: flex; - // justify-content: space-between; - align-items: center; - .btn_width { - width: 220px; - height: 70px; - background: #f0f0f0; - border-radius: 50px; - padding: 10px 20px; - box-sizing: border-box; - input{ - width: 100%; - height: 100%; - font-size: $font_size_medium; - } - } - .unit{ - color: $color_font_one; - font-size: $font_size; - margin-left: 20px; - } - text{ - color: #ccc; - padding: 0 20px; - } - .width_main{ - - } - } - .btn_list_element{ - background-color: #F0F0F0; - border-radius: 30px; - padding: 20px; - box-sizing: border-box; - textarea{ - width: 100%; - height: 126px; - font-size: $font_size_medium; - } - } + } + .select_btn_item { + color: $color_main; + background: #ecf5ff; + border: 2px solid $color_main; + width: 161.75px; + height: 65.2px; + } } - .btns_con{ + .btn_list_input { + display: flex; + // justify-content: space-between; + align-items: center; + .btn_width { + width: 220px; + height: 70px; + background: #f0f0f0; + border-radius: 50px; + padding: 10px 20px; + box-sizing: border-box; + input { + width: 100%; + height: 100%; + font-size: $font_size_medium; + } + } + .unit { + color: $color_font_one; + font-size: $font_size; + margin-left: 20px; + } + text { + color: #ccc; + padding: 0 20px; + } + .width_main { + } + } + .btn_list_element { + background-color: #f0f0f0; + border-radius: 30px; + padding: 20px; + box-sizing: border-box; + textarea { width: 100%; - position: fixed; - bottom:0; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); - .btns_two{ - display: flex; - width: 552px; - height: 82px; - border: 2px solid #cde5ff; - font-size: $font_size_big; - border-radius: 40px; - margin-bottom: 20px; - .rest_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - text-align: center; - line-height: 82px; - color: $color_main; - - } - .verify_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - background: #007aff; - text-align: center; - line-height: 82px; - color: #fff; - } - } + height: 126px; + font-size: $font_size_medium; + } } -} \ No newline at end of file + } + .btns_con { + width: 100%; + position: fixed; + bottom: 0; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .btns_two { + display: flex; + width: 552px; + height: 82px; + border: 2px solid #cde5ff; + font-size: $font_size_big; + border-radius: 40px; + margin-bottom: 20px; + .rest_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + text-align: center; + line-height: 82px; + color: $color_main; + } + .verify_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + background: $color_main; + text-align: center; + line-height: 82px; + color: #fff; + } + } + } +} diff --git a/src/components/sideBar/index.module.scss b/src/components/sideBar/index.module.scss index 5cb25b9..1f94976 100644 --- a/src/components/sideBar/index.module.scss +++ b/src/components/sideBar/index.module.scss @@ -44,7 +44,7 @@ } } .sideBar_select_title_select { - background-color: #007aff; + background-color: $color_main; color: #fff; border-radius: 0px 14px 14px 0px; } diff --git a/src/pages/addressAdd/index.scss b/src/pages/addressAdd/index.scss index 8443556..28a5e2a 100644 --- a/src/pages/addressAdd/index.scss +++ b/src/pages/addressAdd/index.scss @@ -1,37 +1,42 @@ -.add-address{ +.add-address { display: flex; flex-direction: column; - .add-address-default{ - display: flex;align-items: center;justify-content: space-between; + .add-address-default { + display: flex; + align-items: center; + justify-content: space-between; margin: 70px 30px 0; font-size: 26px; font-weight: 700; color: #000000; } - .add-address-default-active{ + .add-address-default-active { width: 50px; height: 50px; - background: #007aff; + background: $color_main; border-radius: 50%; - display: flex;align-items: center; + display: flex; + align-items: center; justify-content: center; font-size: 45px; color: white; box-sizing: border-box; } - .add-address-default-active text{ + .add-address-default-active text { font-size: 35px; } - .add-address-default-noactive{ + .add-address-default-noactive { width: 50px; height: 50px; border: 2px solid #707070; border-radius: 50%; box-sizing: border-box; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; } - .add-address-save{ + .add-address-save { width: 668px; height: 82px; background: #68b4ff; @@ -39,9 +44,13 @@ font-size: 32px; font-weight: 400; color: #ffffff; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; // margin: 620px auto 0; - position: fixed;left: 50%;bottom: 50px; + position: fixed; + left: 50%; + bottom: 50px; transform: translateX(-50%); } -} \ No newline at end of file +} diff --git a/src/pages/applyAfterSales/index.module.scss b/src/pages/applyAfterSales/index.module.scss index b8d2820..19432d1 100644 --- a/src/pages/applyAfterSales/index.module.scss +++ b/src/pages/applyAfterSales/index.module.scss @@ -1,110 +1,105 @@ +.apply_after_sales_main { + .apply_after_sales_head { + font-size: 30px; + text-align: center; + padding: 20px 0; + font-weight: 700; + } + .kind_number { + width: 100%; + padding: 20px; + box-sizing: border-box; + border-bottom: 1px solid #f3f3f3; + text { + background-color: #f6f6f6; + border-radius: 10px; + font-size: $font_size_medium; + padding: 5px 0; + text-align: center; + width: 100%; + display: block; + color: $color_font_three; + } + } + .apply_after_sales_con { + .scroll { + height: calc(100% - 170px); + } + .scroll_con { + padding: 20px 0 150px 0; + } + .returnSaleInput { + margin: 0 20px; + padding-top: 30px; + border-top: 1px solid #f6f6f6; + .returnSaleInput_item { + display: flex; + align-items: center; + padding-bottom: 30px; + flex-wrap: wrap; + .title { + font-size: $font_size; + font-weight: 700; + width: 119px; + } + .select { + flex: 1; + height: 60px; + border: 2px solid #e6e6e6; + border-radius: 10px; + margin-left: 20px; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 20px; + font-size: 26px; + color: $color_font_two; + .miconfont { + font-size: 30px; + } + .selected { + color: #000; + } + } + .upload_image { + flex: 1; + } + } + } + } -.apply_after_sales_main{ - .apply_after_sales_head{ - font-size: 30px; + .btns_con { + width: 100%; + position: fixed; + bottom: 0; + padding: 0 20px; + box-sizing: border-box; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .btns_two { + display: flex; + height: 82px; + // border: 1PX solid $color_main; + font-size: $font_size_big; + border-radius: 40px; + margin-bottom: 20px; + .rest_btn { + flex: 1; + border: 1px solid $color_main; + border-radius: 40px 0 0 40px; text-align: center; - padding: 20px 0; - font-weight: 700; - } - .kind_number{ - width: 100%; - padding: 20px; - box-sizing: border-box; - border-bottom: 1PX solid #f3f3f3; - text{ - background-color: #F6F6F6; - border-radius: 10px; - font-size: $font_size_medium; - padding: 5px 0; - text-align: center; - width: 100%; - display: block; - color: $color_font_three; - } - } - .apply_after_sales_con{ - .scroll{ - height: calc(100% - 170px); - } - .scroll_con{ - padding: 20px 0 150px 0; - } - .returnSaleInput{ - margin: 0 20px; - padding-top: 30px; - border-top: 1px solid #F6F6F6; - .returnSaleInput_item{ - display: flex; - align-items: center; - padding-bottom: 30px; - flex-wrap: wrap; - .title{ - font-size: $font_size; - font-weight: 700; - width: 119px; - } - .select{ - flex:1; - height: 60px; - border: 2px solid #e6e6e6; - border-radius: 10px; - margin-left: 20px; - display: flex; - align-items: center; - justify-content: space-between; - padding: 0 20px; - font-size: 26px; - color: $color_font_two; - .miconfont{ - font-size: 30px; - } - .selected{ - color: #000; - } - } - .upload_image{ - flex:1; - } - } - } - - } - - - .btns_con{ - width: 100%; - position: fixed; - bottom:0; - padding: 0 20px; - box-sizing: border-box; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); - .btns_two{ - display: flex; - height: 82px; - // border: 1PX solid #007aff; - font-size: $font_size_big; - border-radius: 40px; - margin-bottom: 20px; - .rest_btn{ - flex:1; - border: 1PX solid #007aff; - border-radius: 40px 0 0 40px; - text-align: center; - line-height: 82px; - color: $color_main; - background-color: #fff; - - } - .verify_btn{ - flex:1; - border-radius: 0 40px 40px 0; - background: #007aff; - text-align: center; - line-height: 82px; - color: #fff; - } - } + line-height: 82px; + color: $color_main; + background-color: #fff; + } + .verify_btn { + flex: 1; + border-radius: 0 40px 40px 0; + background: $color_main; + text-align: center; + line-height: 82px; + color: #fff; + } } + } } - diff --git a/src/pages/certification/index.scss b/src/pages/certification/index.scss index a6c7bcf..692d3ec 100644 --- a/src/pages/certification/index.scss +++ b/src/pages/certification/index.scss @@ -1,16 +1,16 @@ -.certification{ +.certification { display: flex; flex-direction: column; - background-color: #F0F0F0; + background-color: #f0f0f0; padding-bottom: 300px; - .certification-content{ + .certification-content { background-color: white; padding-bottom: 50px; } - .certification-content:nth-of-type(3){ + .certification-content:nth-of-type(3) { margin-top: 18px; } - .certification-title{ + .certification-title { font-size: 26px; font-weight: 700; margin-left: 30px; @@ -19,75 +19,94 @@ padding-bottom: 20px; // border-top: 18px solid #F0F0F0; } - .certification-upload{ + .certification-upload { width: 642px; height: 316px; border: 10px solid #cde5ff; border-radius: 30px; margin: 0 auto; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; font-size: 34px; font-weight: 700; color: #68b4ff; - background-color: #ECF5FF; + background-color: #ecf5ff; position: relative; margin-top: 60px; } - .certification-upload text{ + .certification-upload text { margin-bottom: 60px; } - .certification-upload-no{ - display: flex;flex-direction: column;align-items: center; + .certification-upload-no { + display: flex; + flex-direction: column; + align-items: center; } - .certification-upload image{ - position: absolute;width: 100%;height: 100%; - object-fit: cover;border-radius: 30px; + .certification-upload image { + position: absolute; + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 30px; } - .certification-upload-no-icon{ + .certification-upload-no-icon { width: 104px; height: 104px; background: #68b4ff; - box-shadow: 0px 0px 12px 0px #68b4ff; - display: flex;align-items: center;justify-content: center; + box-shadow: 0px 0px 12px 0px #68b4ff; + display: flex; + align-items: center; + justify-content: center; border-radius: 50%; color: white; } - .certification-upload-no-tips{ + .certification-upload-no-tips { margin-top: 30px; border-radius: 30px; font-size: 24px; font-weight: 400; color: #000000; } - .certification-button{ - position: absolute;bottom: -10px;left: -10px;right: -10px; - background-color: rgba(0,0,0,0.65); + .certification-button { + position: absolute; + bottom: -10px; + left: -10px; + right: -10px; + background-color: rgba(0, 0, 0, 0.65); display: flex; height: 86px; border-radius: 0 0 30px 30px; z-index: 1; } - .certification-button view{ + .certification-button view { flex: 1; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; font-size: 24px; font-weight: 400; color: #ffffff; } - .certification-button view:first-child{ - border-right: 1px solid #CCCCCC; + .certification-button view:first-child { + border-right: 1px solid #cccccc; } - .certification-footer{ + .certification-footer { width: 750px; height: 174px; background: #ffffff; - box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16); - position: fixed;bottom: 0;left: 0;right: 0; + box-shadow: 6px 0px 12px 0px rgba(0, 0, 0, 0.16); + position: fixed; + bottom: 0; + left: 0; + right: 0; width: 100%; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; z-index: 2; } - .certification-footer-button{ + .certification-footer-button { width: 696px; height: 82px; background: #ffffff; @@ -97,19 +116,24 @@ box-sizing: border-box; overflow: hidden; } - .certification-footer-button view,.certification-footer-button navigator{ + .certification-footer-button view, + .certification-footer-button navigator { flex: 1; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; font-size: 32px; font-weight: 400; - color: #007aff; - border: 0;border-radius: none; + color: $color_main; + border: 0; + border-radius: none; } - .certification-footer-button navigator::after{ - border: 0;border-radius: none; + .certification-footer-button navigator::after { + border: 0; + border-radius: none; } - .certification-footer-button view:last-child{ + .certification-footer-button view:last-child { color: white; - background-color: #007AFF; + background-color: $color_main; } -} \ No newline at end of file +} diff --git a/src/pages/classList/components/filter/index.module.scss b/src/pages/classList/components/filter/index.module.scss index 599cdd0..9116b0c 100644 --- a/src/pages/classList/components/filter/index.module.scss +++ b/src/pages/classList/components/filter/index.module.scss @@ -1,126 +1,124 @@ -.popup_main{ - width: 608px; - height: 100vh; - padding: 20px; - box-sizing: border-box; - display: flex; - flex-direction: column; - .popup_title{ - font-size: $font_size; - font-weight: 700; +.popup_main { + width: 608px; + height: 100vh; + padding: 20px; + box-sizing: border-box; + display: flex; + flex-direction: column; + .popup_title { + font-size: $font_size; + font-weight: 700; + text-align: center; + padding: 20px 0; + } + .scroll { + flex: 1; + height: 0; + } + .popup_filter { + padding-bottom: 100px; + } + .popup_filter_item { + margin-bottom: 20px; + .title { + font-size: $font_size; + color: $color_font_one; + font-weight: 700; + padding: 20px 0; + } + .btn_list { + display: grid; + grid-template-columns: repeat(3, 165.75px); + justify-content: space-between; + .btn_item { + width: 165.75px; + height: 69.2px; + background: #f0f0f0; + border-radius: 34px; text-align: center; - padding: 20px 0; - } - .scroll{ - flex:1; - height: 0; - } - .popup_filter{ - padding-bottom: 100px; - } - .popup_filter_item{ + line-height: 69.2px; + font-size: $font_size_medium; + color: $color_font_one; margin-bottom: 20px; - .title{ - font-size: $font_size; - color: $color_font_one; - font-weight: 700; - padding: 20px 0; - } - .btn_list{ - display: grid; - grid-template-columns: repeat(3, 165.75px); - justify-content: space-between; - .btn_item{ - width: 165.75px; - height: 69.2px; - background: #f0f0f0; - border-radius: 34px; - text-align: center; - line-height: 69.2px; - font-size: $font_size_medium; - color: $color_font_one; - margin-bottom: 20px; - } - .select_btn_item{ - color: $color_main; - background: #ecf5ff; - border: 2px solid #007aff; - width: 161.75px; - height: 65.2px; - } - } - .btn_list_input{ - display: flex; - // justify-content: space-between; - align-items: center; - .btn_width { - width: 220px; - height: 70px; - background: #f0f0f0; - border-radius: 50px; - padding: 10px 20px; - box-sizing: border-box; - input{ - width: 100%; - height: 100%; - font-size: $font_size_medium; - } - } - .unit{ - color: $color_font_one; - font-size: $font_size; - margin-left: 20px; - } - text{ - color: #ccc; - padding: 0 20px; - } - .width_main{ - - } - } - .btn_list_element{ - background-color: #F0F0F0; - border-radius: 30px; - padding: 20px; - box-sizing: border-box; - textarea{ - width: 100%; - height: 126px; - font-size: $font_size_medium; - } - } + } + .select_btn_item { + color: $color_main; + background: #ecf5ff; + border: 2px solid $color_main; + width: 161.75px; + height: 65.2px; + } } - .btns_con{ + .btn_list_input { + display: flex; + // justify-content: space-between; + align-items: center; + .btn_width { + width: 220px; + height: 70px; + background: #f0f0f0; + border-radius: 50px; + padding: 10px 20px; + box-sizing: border-box; + input { + width: 100%; + height: 100%; + font-size: $font_size_medium; + } + } + .unit { + color: $color_font_one; + font-size: $font_size; + margin-left: 20px; + } + text { + color: #ccc; + padding: 0 20px; + } + .width_main { + } + } + .btn_list_element { + background-color: #f0f0f0; + border-radius: 30px; + padding: 20px; + box-sizing: border-box; + textarea { width: 100%; - position: fixed; - bottom:0; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); - .btns_two{ - display: flex; - width: 552px; - height: 82px; - border: 2px solid #cde5ff; - font-size: $font_size_big; - border-radius: 40px; - margin-bottom: 20px; - .rest_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - text-align: center; - line-height: 82px; - color: $color_main; - - } - .verify_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - background: #007aff; - text-align: center; - line-height: 82px; - color: #fff; - } - } + height: 126px; + font-size: $font_size_medium; + } } -} \ No newline at end of file + } + .btns_con { + width: 100%; + position: fixed; + bottom: 0; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .btns_two { + display: flex; + width: 552px; + height: 82px; + border: 2px solid #cde5ff; + font-size: $font_size_big; + border-radius: 40px; + margin-bottom: 20px; + .rest_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + text-align: center; + line-height: 82px; + color: $color_main; + } + .verify_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + background: $color_main; + text-align: center; + line-height: 82px; + color: #fff; + } + } + } +} diff --git a/src/pages/classList/index.module.scss b/src/pages/classList/index.module.scss index 773a28b..efafc0b 100644 --- a/src/pages/classList/index.module.scss +++ b/src/pages/classList/index.module.scss @@ -98,7 +98,7 @@ .select_btn_item { color: $color_main; background: #ecf5ff; - border: 2px solid #007aff; + border: 2px solid $color_main; width: 161.75px; height: 65.2px; } diff --git a/src/pages/collection/components/moveCollectionPopup/index.module.scss b/src/pages/collection/components/moveCollectionPopup/index.module.scss index 9e385b1..b498fd6 100644 --- a/src/pages/collection/components/moveCollectionPopup/index.module.scss +++ b/src/pages/collection/components/moveCollectionPopup/index.module.scss @@ -20,7 +20,7 @@ } .miconfont { font-size: 36px; - color: #007aff; + color: $color_main; } .text { margin-left: 10px; diff --git a/src/pages/collection/index.module.scss b/src/pages/collection/index.module.scss index 5fb67e6..96bb99a 100644 --- a/src/pages/collection/index.module.scss +++ b/src/pages/collection/index.module.scss @@ -25,8 +25,8 @@ page { } .miconfont { font-size: 30px; - color: #007aff; - border: 1px solid #007aff; + color: $color_main; + border: 1px solid $color_main; border-radius: 50%; } } diff --git a/src/pages/company/index.scss b/src/pages/company/index.scss index 17d4e67..b36f3dc 100644 --- a/src/pages/company/index.scss +++ b/src/pages/company/index.scss @@ -1,23 +1,26 @@ -.company{ +.company { display: flex; flex-direction: column; - .save-button{ + .save-button { width: 668px; height: 82px; - background: #007aff; + background: $color_main; border-radius: 40px; font-size: 32px; font-weight: 400; color: #ffffff; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; margin: 320px auto 0; } - .form-radio{ + .form-radio { display: flex; - flex-wrap: wrap;align-items: center; + flex-wrap: wrap; + align-items: center; } - .form-radio view{ + .form-radio view { height: 54px; background: #f0f0f0; border-radius: 28px; @@ -26,7 +29,9 @@ color: #707070; padding: 10px 28px; box-sizing: border-box; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; margin: 10px; border: 2px solid #f0f0f0; max-width: 100%; @@ -37,8 +42,8 @@ -webkit-line-clamp: 1; overflow: hidden; } - .form-radio .form-radio-active{ + .form-radio .form-radio-active { background: #ecf5ff; border: 2px solid #cde5ff; } -} \ No newline at end of file +} diff --git a/src/pages/creditLine/index.scss b/src/pages/creditLine/index.scss index 21f24ab..792359e 100644 --- a/src/pages/creditLine/index.scss +++ b/src/pages/creditLine/index.scss @@ -1,11 +1,11 @@ -.credit-line{ +.credit-line { height: 100vh; background-color: #f3f3f3; - canvas{ + canvas { width: 238px; height: 238px; } - .credit-line-card{ + .credit-line-card { width: 702px; background: #ffffff; border-radius: 20px; @@ -13,80 +13,86 @@ padding: 0 30px; box-sizing: border-box; } - .credit-line-card-top{ - display: flex;align-items: flex-end; + .credit-line-card-top { + display: flex; + align-items: flex-end; padding: 30px 20px; border-bottom: 1px solid #f6f6f6; position: relative; } - .credit-line-card-top-info{ + .credit-line-card-top-info { text-align: center; flex: 1; } - .credit-line-card-top-info-title{ + .credit-line-card-top-info-title { font-size: 24px; font-weight: 700; color: #000000; margin-bottom: 16px; } - .credit-line-card-top-info-price{ + .credit-line-card-top-info-price { font-size: 44px; font-weight: 700; - color: #007aff; + color: $color_main; margin-bottom: 48px; } - .credit-line-card-top-info-price text{ + .credit-line-card-top-info-price text { font-size: 20px; } - .credit-line-card-top-info-date{ + .credit-line-card-top-info-date { font-size: 22px; font-weight: 400; color: #ababab; } - .credit-line-card-top-status{ + .credit-line-card-top-status { padding: 0 20px; height: 38px; background: #ebfaea; font-size: 22px; font-weight: 400; color: #07c160; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; border-top-right-radius: 20px; border-bottom-left-radius: 20px; - position: absolute;right: 0;top: 30px; + position: absolute; + right: 0; + top: 30px; } - .credit-line-card-bottom{ + .credit-line-card-bottom { padding: 30px 0; display: grid; grid-template-columns: repeat(2, 1fr); text-align: center; } - .credit-line-card-bottom-item-title{ + .credit-line-card-bottom-item-title { font-size: 24px; font-weight: 700; color: #000000; display: flex; - align-items: center;justify-content: center; + align-items: center; + justify-content: center; margin-bottom: 15px; line-height: 38px; } - .credit-line-card-bottom-item-title text{ + .credit-line-card-bottom-item-title text { font-size: 40px; margin-right: 10px; - color: #007AFF; + color: $color_main; } - .credit-line-card-bottom-item-title .miconfont{ + .credit-line-card-bottom-item-title .miconfont { color: #ccc; } - .credit-line-card-bottom-item:nth-child(2) .credit-line-card-bottom-item-title text{ + .credit-line-card-bottom-item:nth-child(2) .credit-line-card-bottom-item-title text { font-size: 28px; } - .credit-line-card-bottom-item-price{ + .credit-line-card-bottom-item-price { font-size: 40px; font-weight: 400; color: #ababab; } - .credit-line-card-bottom-item-price text{ + .credit-line-card-bottom-item-price text { font-size: 20px; } -} \ No newline at end of file +} diff --git a/src/pages/depositBeforehand/index.module.scss b/src/pages/depositBeforehand/index.module.scss new file mode 100644 index 0000000..6065887 --- /dev/null +++ b/src/pages/depositBeforehand/index.module.scss @@ -0,0 +1,146 @@ +.deposit-beforehand { + height: 100vh; + background-color: #f3f3f3; + display: flex; + flex-direction: column; + + &-card { + width: 702px; + background: #ffffff; + border-radius: 20px; + margin: 30px auto; + padding: 30px; + box-sizing: border-box; + } + &-balance { + display: flex; + flex-direction: column; + align-items: center; + &-title { + font-size: 28px; + font-weight: 400; + color: #000000; + margin-bottom: 35px; + } + &-price { + font-size: 40px; + font-weight: 700; + color: #000000; + margin-bottom: 70px; + } + &-button { + width: 276px; + height: 74px; + background: $color_main; + border-radius: 38px; + display: flex; + align-items: center; + justify-content: center; + color: white; + margin-bottom: 10px; + } + } + + &-info-title { + display: flex; + justify-content: space-between; + margin-bottom: 50px; + &-left { + font-size: 28px; + font-weight: 700; + color: #000000; + } + &-copy { + font-size: 24px; + font-weight: 400; + color: $color_main; + } + } + &-info-list { + display: flex; + align-items: center; + margin-bottom: 38px; + &-left { + width: 160px; + font-size: 24px; + font-weight: 400; + color: #3c3c3c; + border-right: 1px solid #dddddd; + margin-right: 25px; + } + &-right { + font-size: 26px; + font-weight: 400; + color: #000000; + } + } + + &-particulars { + display: flex; + align-items: center; + justify-content: space-between; + &-left { + font-size: 28px; + font-weight: 700; + color: #000000; + } + &-right { + font-size: 24px; + font-weight: 400; + color: #ababab; + } + &-right text { + font-size: 28px; + } + } + &-dialog { + width: 75vw; + padding-top: 40px; + border-radius: 20px; + display: flex; + flex-flow: column nowrap; + justify-content: center; + background-color: #fff; + &-title { + text-align: center; + font-size: 35px; + font-weight: 700; + color: #000000; + margin-bottom: 30px; + } + &-content { + text-align: center; + font-size: 28px; + font-weight: 400; + color: #000000; + margin-bottom: 30px; + } + &-bottom { + display: flex; + justify-content: space-between; + align-items: center; + border-top: 1px solid #eee; + } + &-button { + height: 74px; + width: 50%; + display: flex; + align-items: center; + justify-content: center; + color: #333; + box-sizing: border-box; + margin-bottom: 10px; + &-cancel { + border-right: 1px solid #eee; + display: flex; + align-items: center; + justify-content: center; + color: #000000; + margin-bottom: 10px; + } + &-confirm { + color: $color_main; + } + } + } +} diff --git a/src/pages/depositBeforehand/index.scss b/src/pages/depositBeforehand/index.scss deleted file mode 100644 index 157ea4f..0000000 --- a/src/pages/depositBeforehand/index.scss +++ /dev/null @@ -1,88 +0,0 @@ -.deposit-beforehand{ - height: 100vh; - background-color: #f3f3f3; - display: flex; - flex-direction: column; - - .deposit-beforehand-card{ - width: 702px; - background: #ffffff; - border-radius: 20px; - margin: 30px auto; - padding: 30px; - box-sizing: border-box; - } - .deposit-beforehand-balance{ - display: flex;flex-direction: column;align-items: center; - } - .deposit-beforehand-balance-title{ - font-size: 28px; - font-weight: 400; - color: #000000; - margin-bottom: 35px; - } - .deposit-beforehand-balance-price{ - font-size: 40px; - font-weight: 700; - color: #000000; - margin-bottom: 70px; - } - .deposit-beforehand-balance-button{ - width: 276px; - height: 74px; - background: #007aff; - border-radius: 38px; - display: flex;align-items: center;justify-content: center; - color: white; - margin-bottom: 10px; - } - - .deposit-beforehand-info-title{ - display: flex;justify-content: space-between; - margin-bottom: 50px; - } - .deposit-beforehand-info-title-left{ - font-size: 28px; - font-weight: 700; - color: #000000; - } - .deposit-beforehand-info-title-copy{ - font-size: 24px; - font-weight: 400; - color: #007aff; - } - .deposit-beforehand-info-list{ - display: flex;align-items: center; - margin-bottom: 38px; - } - .deposit-beforehand-info-list-left{ - width: 160px; - font-size: 24px; - font-weight: 400; - color: #3c3c3c; - border-right: 1px solid #dddddd; - margin-right: 25px; - } - .deposit-beforehand-info-list-right{ - font-size: 26px; - font-weight: 400; - color: #000000; - } - - .deposit-beforehand-particulars{ - display: flex;align-items: center;justify-content: space-between; - } - .deposit-beforehand-particulars-left{ - font-size: 28px; - font-weight: 700; - color: #000000; - } - .deposit-beforehand-particulars-right{ - font-size: 24px; - font-weight: 400; - color: #ababab; - } - .deposit-beforehand-particulars-right text{ - font-size: 28px; - } -} \ No newline at end of file diff --git a/src/pages/depositBeforehand/index.tsx b/src/pages/depositBeforehand/index.tsx index b720552..7b8e41f 100644 --- a/src/pages/depositBeforehand/index.tsx +++ b/src/pages/depositBeforehand/index.tsx @@ -1,12 +1,16 @@ import { Button, Canvas, Navigator, ScrollView, Text, View } from '@tarojs/components' -import './index.scss' -import { setClipboardData } from '@tarojs/taro' -import { useEffect } from 'react' +import Taro, { setClipboardData } from '@tarojs/taro' +import { useEffect, useState } from 'react' +import classNames from 'classnames' +import styles from './index.module.scss' import { depositInfoApi } from '@/api/deposit' import { formatPriceDiv, toDecimal2 } from '@/common/fotmat' import Message from '@/components/Message' import useLogin from '@/use/useLogin' +import Dialog from '@/components/Dialog' +import { useSelector } from '@/reducers/hooks' +import { alert } from '@/common/common' const DepositBeforehand = () => { useLogin() @@ -22,46 +26,76 @@ const DepositBeforehand = () => { setClipboardData({ data: state.data?.transfer_remittance_account }) } + const [showModal, setShowModal] = useState(false) + + const handleClick = () => { + setShowModal(true) + } + const handleCloseModal = () => { + setShowModal(false) + } + const handleChangeModal = (val: boolean) => { + setShowModal(val) + } + const userInfo = useSelector(state => state.userInfo) + // 联系业务经理 + const handleCallPhone = () => { + if (!userInfo?.adminUserInfo?.sale_user_phone) { return alert.error('手机号不能为空') } + Taro.makePhoneCall({ + phoneNumber: userInfo?.adminUserInfo?.sale_user_phone, + }) + handleCloseModal() + } return ( - + - - - 余额 (元) - {toDecimal2(formatPriceDiv(state.data?.amount)).toLocaleString()} - 转出 + + + 余额 (元) + {toDecimal2(formatPriceDiv(state.data?.amount)).toLocaleString()} + 转出 - - - - 预存款充值 - 复制 + + + + 预存款充值 + 复制 - - - 开户名称 - {state.data?.account_name} + + + 开户名称 + {state.data?.account_name} - - 开户银行 - {state.data?.bank_of_deposit} + + 开户银行 + {state.data?.bank_of_deposit} - - 专属汇款账号 - {state.data?.transfer_remittance_account} + + 专属汇款账号 + {state.data?.transfer_remittance_account} - - - 收支明细 + + + 收支明细 全部 + + + 提示 + 若需提现,请联系业务经理进行转出 + + 取消 + 联系业务经理 + + + ) } diff --git a/src/pages/depositBeforehandDetail/index.scss b/src/pages/depositBeforehandDetail/index.scss index 662f147..1189d67 100644 --- a/src/pages/depositBeforehandDetail/index.scss +++ b/src/pages/depositBeforehandDetail/index.scss @@ -1,86 +1,87 @@ -.deposit-detail{ +.deposit-detail { // height: 100vh; // background-color: #f3f3f3; - .deposit-detail-tips{ + .deposit-detail-tips { width: 100%; height: 66px; - background: #FFE6CE; + background: #ffe6ce; border: 2px solid #ffe6ce; padding: 0 30px; - display: flex;align-items: center; + display: flex; + align-items: center; font-size: 24px; font-weight: 400; - color: #EE7500; + color: #ee7500; margin: 0; } - .deposit-detail-tips text{ + .deposit-detail-tips text { margin-right: 10px; font-size: 30px; } - &>view{ + & > view { padding: 30px 0; margin: 0 25px; - border-bottom: 1px solid #F6F6F6; + border-bottom: 1px solid #f6f6f6; } - &>view:last-child{ + & > view:last-child { border-bottom: 0; } - .deposit-amount{ + .deposit-amount { text-align: center; } - .deposit-type{ + .deposit-type { font-size: 28px; font-weight: 400; color: #000000; margin-bottom: 35px; } - .deposit-price{ + .deposit-price { font-size: 40px; font-weight: 700; color: #000000; } - .deposit-status{ + .deposit-status { display: flex; } - .deposit-status-title{ + .deposit-status-title { font-size: 24px; font-weight: 400; color: #707070; margin-right: 105px; } - .deposit-voucher-title{ + .deposit-voucher-title { font-size: 24px; font-weight: 400; color: #707070; margin-bottom: 28px; } - .deposit-voucher-title::before{ - content: "*"; - color: #007AFF; + .deposit-voucher-title::before { + content: '*'; + color: $color_main; } - .deposit-voucher-content{ + .deposit-voucher-content { display: grid; grid-template-columns: repeat(5, 1fr); gap: 30px; height: 98px; } - .deposit-voucher-content image{ + .deposit-voucher-content image { width: 100%; height: 100%; object-fit: cover; } - .deposit-info-list{ + .deposit-info-list { display: flex; margin-bottom: 20px; } - .deposit-info-list-title{ + .deposit-info-list-title { width: 140px; font-size: 24px; font-weight: 400; color: #707070; - border-right: 1px solid #F0F0F0; + border-right: 1px solid #f0f0f0; } - .deposit-info-list-content{ + .deposit-info-list-content { width: 468px; font-size: 24px; font-weight: 400; @@ -88,69 +89,77 @@ padding-left: 25px; box-sizing: border-box; } - .deposit-info-list-copy{ + .deposit-info-list-copy { font-size: 20px; font-weight: 400; color: #ababab; padding-left: 18px; - border-left: 1px solid #F0F0F0; + border-left: 1px solid #f0f0f0; } - .deposit-timeline{ - + .deposit-timeline { } - .deposit-timeline-item{ + .deposit-timeline-item { display: flex; margin-left: 50px; height: 100px; } - .deposit-timeline-item-title{ + .deposit-timeline-item-title { font-size: 24px; font-weight: 400; color: #3c3c3c; } - .deposit-timeline-item-date{ + .deposit-timeline-item-date { font-size: 24px; font-weight: 400; color: #ababab; } - .deposit-timeline-item-left{ + .deposit-timeline-item-left { position: relative; margin-right: 55px; width: 12px; } - .deposit-timeline-item-left::before{ - content: " "; + .deposit-timeline-item-left::before { + content: ' '; width: 12px; height: 12px; - background: #007aff; + background: $color_main; border-radius: 50%; display: block; margin-top: 10px; } - .deposit-timeline-item-left::after{ - content: " "; - border-right: 1px dashed #007aff; - position: absolute;top: 25px;bottom: -8px; - left: 50%;transform: translateX(-50%); + .deposit-timeline-item-left::after { + content: ' '; + border-right: 1px dashed $color_main; + position: absolute; + top: 25px; + bottom: -8px; + left: 50%; + transform: translateX(-50%); } - .deposit-timeline-item-success,.deposit-timeline-item-error{ + .deposit-timeline-item-success, + .deposit-timeline-item-error { position: relative; margin-right: 55px; width: 12px; } - .deposit-timeline-item-error Text,.deposit-timeline-item-success Text{ + .deposit-timeline-item-error Text, + .deposit-timeline-item-success Text { display: inline-block; width: 38px; height: 38px; - background: #007aff; + background: $color_main; border-radius: 50%; - position: absolute;left: 50%;transform: translateX(-50%); + position: absolute; + left: 50%; + transform: translateX(-50%); color: white; font-size: 30px; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; } - .deposit-timeline-item-error Text{ + .deposit-timeline-item-error Text { background: #cccccc; } -} \ No newline at end of file +} diff --git a/src/pages/details/components/counter/index.module.scss b/src/pages/details/components/counter/index.module.scss index 0f73251..b03ccad 100644 --- a/src/pages/details/components/counter/index.module.scss +++ b/src/pages/details/components/counter/index.module.scss @@ -20,7 +20,7 @@ height: 46px; text-align: center; line-height: 43px; - color: #007aff; + color: $color_main; } .input { display: flex; diff --git a/src/pages/details/components/orderCount/index.module.scss b/src/pages/details/components/orderCount/index.module.scss index a16693e..c24ec47 100644 --- a/src/pages/details/components/orderCount/index.module.scss +++ b/src/pages/details/components/orderCount/index.module.scss @@ -189,7 +189,7 @@ background: linear-gradient(38deg, #5cabff, #7cbcfc 100%, #99ccff 100%); } .select_add_cart { - background: linear-gradient(38deg, #007aff, #4fa6ff 100%, #68b4ff 100%); + background: linear-gradient(38deg, $color_main, #4fa6ff 100%, #68b4ff 100%); } } } diff --git a/src/pages/details/components/productItem/index.module.scss b/src/pages/details/components/productItem/index.module.scss index 705cf29..50cd327 100644 --- a/src/pages/details/components/productItem/index.module.scss +++ b/src/pages/details/components/productItem/index.module.scss @@ -1,176 +1,175 @@ -.shop_cart_main{ - .popup_con{ - height: 80vh; +.shop_cart_main { + .popup_con { + height: 80vh; + display: flex; + flex-direction: column; + } + .header { + color: $color_font_one; + font-size: 32px; + font-weight: 700; + padding: 20px; + } + .colorFind { + padding: 10px 20px; + display: flex; + align-items: center; + .search { + flex: 1; + } + .text { + font-size: $font_size_medium; + color: $color_main; + } + } + .search { + display: flex; + align-items: center; + padding: 20px; + .search_title { + font-size: $font_size; + color: #000; + width: 160px; + } + .search_list { + display: flex; + justify-content: space-between; + flex: 1; + } + .search_item { + width: 148px; + height: 55px; + text-align: center; + line-height: 55px; + color: $color_font_two; + font-size: $font_size_medium; + background-color: #f0f0f0; + border-radius: 50px; + } + .search_item_select { + border: 2px solid $color_main; + background-color: #ecf5ff; + color: $color_main; + width: 144px; + height: 51px; + } + } + .colorNum { + display: flex; + justify-content: space-between; + padding: 20px; + .title { + font-size: 26px; + } + .miconfont { + font-size: 36px; + color: $color_font_two; + } + } + .product_color_con { + flex: 1; + height: 0; + padding-bottom: 151px; + } + .color_con { + .virtual_list { + padding-bottom: 300px; + } + .item { + display: flex; + justify-content: space-between; + padding: 0 20px; + margin-bottom: 40px; + .item_color { + width: 156.5px; + height: 156.5px; + border-radius: 20px; + } + .item_con { + flex: 1; display: flex; flex-direction: column; - } - .header{ - color: $color_font_one; - font-size: 32px; - font-weight: 700; - padding: 20px; - } - .colorFind{ - padding: 10px 20px; - display: flex; - align-items: center; - .search{ - flex:1; - } - .text{ - font-size: $font_size_medium; - color: $color_main; - } - } - .search{ - display: flex; - align-items: center; - padding: 20px; - .search_title{ - font-size: $font_size; - color: #000; - width: 160px; - } - .search_list{ - display: flex; - justify-content: space-between; - flex:1; - } - .search_item{ - width: 148px; - height: 55px; - text-align: center; - line-height: 55px; - color: $color_font_two; - font-size: $font_size_medium; - background-color: #f0f0f0; - border-radius: 50px; - } - .search_item_select{ - border: 2px solid $color_main; - background-color: #ecf5ff; - color: $color_main; - width: 144px; - height: 51px; - } - } - .colorNum{ - display: flex; justify-content: space-between; - padding: 20px; - .title{ - font-size: 26px; + padding: 20px 0 20px 20px; + .title { + font-size: $font_size_big; + font-weight: 700; } - .miconfont{ - font-size: 36px; - color: $color_font_two; + .num { + font-size: $font_size; + color: $color_main; } - } - .product_color_con{ - flex:1; - height: 0; - padding-bottom:151px; - } - .color_con{ - .virtual_list{ - padding-bottom: 300px; + .priceText { + font-size: $font_size_big; + Text { + font-size: $font_size_min; + } } - .item { - display: flex; - justify-content: space-between; - padding: 0 20px; - margin-bottom: 40px; - .item_color{ - width: 156.5px; - height: 156.5px; - border-radius: 20px; - - } - .item_con{ - flex:1; - display: flex; - flex-direction: column; - justify-content: space-between; - padding: 20px 0 20px 20px; - .title{ - font-size: $font_size_big; - font-weight: 700; - } - .num{ - font-size: $font_size; - color: $color_main; - } - .priceText{ - font-size: $font_size_big; - Text{ - font-size: $font_size_min; - } - } - } - .btn_con{ - display: flex; - align-items: flex-end; - .btn{ - width: 116px; - height: 64px; - background-color: $color_main; - border-radius: 40px 0px 16px 0px; - font-size: $font_size_medium; - text-align: center; - line-height: 64px; - color: #fff; - } - .btn_count{ - width: 235px; - height: 64px; - background-color: #ECF5FF; - border-radius: 40px 0px 16px 0px; - padding: 0 20px; - display: flex; - align-items: center; - } - } - } - } - .noData{ - width:100%; - height: 100%; + } + .btn_con { display: flex; - justify-content: center; - align-items: center; - color: $color_font_three; - font-size: $font_size_medium; + align-items: flex-end; + .btn { + width: 116px; + height: 64px; + background-color: $color_main; + border-radius: 40px 0px 16px 0px; + font-size: $font_size_medium; + text-align: center; + line-height: 64px; + color: #fff; + } + .btn_count { + width: 235px; + height: 64px; + background-color: #ecf5ff; + border-radius: 40px 0px 16px 0px; + padding: 0 20px; + display: flex; + align-items: center; + } + } } - .buy_btn{ - width: 100%; - padding: 0 40px; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); - box-sizing: border-box; - position: fixed; - bottom:0; - font-size: $font_size_medium; - color: $color_font_two; - background-color: #fff; - box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16); - .buy_btn_con{ - display: flex; - justify-content: space-between; - align-items: center; - height: 151px; - } - .add_cart{ - width: 260px; - height: 90px; - font-size: $font_size_big; - text-align: center; - line-height: 90px; - border-radius: 50px; - color: #fff; - background: linear-gradient(38deg,#5cabff, #7cbcfc 100%, #99ccff 100%); - } - .select_add_cart{ - background: linear-gradient(38deg,#007aff, #4fa6ff 100%, #68b4ff 100%); - } + } + .noData { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + color: $color_font_three; + font-size: $font_size_medium; + } + .buy_btn { + width: 100%; + padding: 0 40px; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + box-sizing: border-box; + position: fixed; + bottom: 0; + font-size: $font_size_medium; + color: $color_font_two; + background-color: #fff; + box-shadow: 6px 0px 12px 0px rgba(0, 0, 0, 0.16); + .buy_btn_con { + display: flex; + justify-content: space-between; + align-items: center; + height: 151px; } -} \ No newline at end of file + .add_cart { + width: 260px; + height: 90px; + font-size: $font_size_big; + text-align: center; + line-height: 90px; + border-radius: 50px; + color: #fff; + background: linear-gradient(38deg, #5cabff, #7cbcfc 100%, #99ccff 100%); + } + .select_add_cart { + background: linear-gradient(38deg, $color_main, #4fa6ff 100%, #68b4ff 100%); + } + } +} diff --git a/src/pages/index/index.module.scss b/src/pages/index/index.module.scss index 59764b8..d49ac69 100644 --- a/src/pages/index/index.module.scss +++ b/src/pages/index/index.module.scss @@ -16,8 +16,8 @@ align-items: center; .search_collect { font-size: 26px; - border: 2px solid #007aff; - color: #007aff; + border: 2px solid $color_main; + color: $color_main; border-radius: 50px; width: 132px; height: 44px; diff --git a/src/pages/order/comfirm.module.scss b/src/pages/order/comfirm.module.scss index b43e26c..8ac6bfb 100644 --- a/src/pages/order/comfirm.module.scss +++ b/src/pages/order/comfirm.module.scss @@ -88,7 +88,7 @@ width: 250px; height: 90px; opacity: 0.6; - background: linear-gradient(38deg, #007aff, #4fa6ff 100%, #68b4ff 100%); + background: linear-gradient(38deg, $color_main, #4fa6ff 100%, #68b4ff 100%); border-radius: 46px; display: flex; justify-content: center; diff --git a/src/pages/order/components/applyRefund/index.module.scss b/src/pages/order/components/applyRefund/index.module.scss index dc7e177..89c526d 100644 --- a/src/pages/order/components/applyRefund/index.module.scss +++ b/src/pages/order/components/applyRefund/index.module.scss @@ -41,13 +41,13 @@ .btns_two { display: flex; height: 82px; - // border: 1PX solid #007aff; + // border: 1PX solid $color_main; font-size: $font_size_big; border-radius: 40px; margin-bottom: 20px; .rest_btn { flex: 1; - border: 1px solid #007aff; + border: 1px solid $color_main; border-radius: 40px 0 0 40px; text-align: center; line-height: 82px; @@ -57,7 +57,7 @@ .verify_btn { flex: 1; border-radius: 0 40px 40px 0; - background: #007aff; + background: $color_main; text-align: center; line-height: 82px; color: #fff; diff --git a/src/pages/order/components/offlinePay/index.module.scss b/src/pages/order/components/offlinePay/index.module.scss index c3df59a..1a586e1 100644 --- a/src/pages/order/components/offlinePay/index.module.scss +++ b/src/pages/order/components/offlinePay/index.module.scss @@ -80,7 +80,7 @@ $top: 170px; } } .btns { - background: #007aff; + background: $color_main; border-radius: 40px; width: 702px; height: 82px; diff --git a/src/pages/order/components/payment/index.module.scss b/src/pages/order/components/payment/index.module.scss index bc5e958..4077b60 100644 --- a/src/pages/order/components/payment/index.module.scss +++ b/src/pages/order/components/payment/index.module.scss @@ -114,7 +114,7 @@ $top: 190px; } .miconfont { font-size: 30px; - color: #007aff; + color: $color_main; padding-right: 30px; } .advance_payment { @@ -135,7 +135,7 @@ $top: 190px; } } .btns { - background: #007aff; + background: $color_main; border-radius: 40px; width: 668px; height: 82px; diff --git a/src/pages/order/components/remark/index.module.scss b/src/pages/order/components/remark/index.module.scss index d624050..faac4cb 100644 --- a/src/pages/order/components/remark/index.module.scss +++ b/src/pages/order/components/remark/index.module.scss @@ -1,48 +1,48 @@ -.order_popup{ - display: flex; - flex-direction: column; - align-items: center; - padding: 20px 0; - .order_popup_title{ - color: $font_size_big; - font-weight: 700; - color: #000000; - padding-bottom: 20px; - } - .order_popup_input{ - width: 100%; - padding: 0 25px; - box-sizing: border-box; - margin-top: 43px; - position: relative; - .descDataNum{ - position: absolute; - right: 40px; - bottom: 10px; - height: 39px; - font-size: $font_size_medium; - color: $color_font_two; - } - textarea{ - background-color: #f3f3f3; - border-radius: 10px; - width: 100%; - height: 313px; - padding: 20px; - padding-bottom: 50px; - box-sizing: border-box; - font-size: $font_size; - border: 2px solid #e6e6e6; - } +.order_popup { + display: flex; + flex-direction: column; + align-items: center; + padding: 20px 0; + .order_popup_title { + color: $font_size_big; + font-weight: 700; + color: #000000; + padding-bottom: 20px; + } + .order_popup_input { + width: 100%; + padding: 0 25px; + box-sizing: border-box; + margin-top: 43px; + position: relative; + .descDataNum { + position: absolute; + right: 40px; + bottom: 10px; + height: 39px; + font-size: $font_size_medium; + color: $color_font_two; } - .order_save_address{ - height: 82px; - background: #007aff; - border-radius: 40px; - width: 668px; - text-align: center; - line-height: 82px; - color: #fff; - margin-top: 60px; - } -} \ No newline at end of file + textarea { + background-color: #f3f3f3; + border-radius: 10px; + width: 100%; + height: 313px; + padding: 20px; + padding-bottom: 50px; + box-sizing: border-box; + font-size: $font_size; + border: 2px solid #e6e6e6; + } + } + .order_save_address { + height: 82px; + background: $color_main; + border-radius: 40px; + width: 668px; + text-align: center; + line-height: 82px; + color: #fff; + margin-top: 60px; + } +} diff --git a/src/pages/order/components/scanPay/index.module.scss b/src/pages/order/components/scanPay/index.module.scss index dcb356d..8d40c2b 100644 --- a/src/pages/order/components/scanPay/index.module.scss +++ b/src/pages/order/components/scanPay/index.module.scss @@ -1,54 +1,53 @@ -$top:170px; -.scanPay_main{ - .scanPay_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - - } +$top: 170px; +.scanPay_main { + .scanPay_con { + padding: 20px; + background-color: #f6f6f6; + border-radius: 20px; + .miconfont_title { + transform: rotate(-180deg); + position: absolute; + left: 20px; + top: 27px; + font-size: 37px; + color: $color_font_three; + z-index: 99; } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; + } + .title { + font-size: $font_size_big; + color: #000000; + text-align: center; + font-weight: 700; + position: relative; + } + .desc { + font-size: $font_size_min; + color: $color_main; + text-align: center; + padding: 10px 0; + .miconfont { + font-size: 25px; } - .desc{ - font-size: $font_size_min; - color: $color_main; - text-align: center; - padding: 10px 0; - .miconfont{ - font-size: 25px; - } + } + + .scanPay_list { + border-radius: 10px; + height: 900px; + image { + width: 100%; } - - .scanPay_list{ - border-radius: 10px; - height: 900px; - image{ - width: 100%; - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file + } + .btns { + background: $color_main; + border-radius: 40px; + width: 668px; + height: 82px; + text-align: center; + line-height: 80px; + width: 100%; + color: #fff; + font-size: 32px; + margin-top: 30px; + } +} diff --git a/src/pages/order/components/scanPayCheck/index.module.scss b/src/pages/order/components/scanPayCheck/index.module.scss index 1aa0537..6653e4c 100644 --- a/src/pages/order/components/scanPayCheck/index.module.scss +++ b/src/pages/order/components/scanPayCheck/index.module.scss @@ -1,55 +1,54 @@ -$top:170px; -.scanPay_main{ - .scanPay_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - - } +$top: 170px; +.scanPay_main { + .scanPay_con { + padding: 20px; + background-color: #f6f6f6; + border-radius: 20px; + .miconfont_title { + transform: rotate(-180deg); + position: absolute; + left: 20px; + top: 27px; + font-size: 37px; + color: $color_font_three; + z-index: 99; } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; - padding: 10px 0; + } + .title { + font-size: $font_size_big; + color: #000000; + text-align: center; + font-weight: 700; + position: relative; + padding: 10px 0; + } + .desc { + font-size: $font_size_min; + color: $color_main; + text-align: center; + padding: 10px 0; + .miconfont { + font-size: 25px; } - .desc{ - font-size: $font_size_min; - color: $color_main; - text-align: center; - padding: 10px 0; - .miconfont{ - font-size: 25px; - } + } + + .scanPay_list { + border-radius: 10px; + height: 900px; + image { + width: 100%; } - - .scanPay_list{ - border-radius: 10px; - height: 900px; - image{ - width: 100%; - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file + } + .btns { + background: $color_main; + border-radius: 40px; + width: 668px; + height: 82px; + text-align: center; + line-height: 80px; + width: 100%; + color: #fff; + font-size: 32px; + margin-top: 30px; + } +} diff --git a/src/pages/salesAfter/components/addressInfoDetail/index.module.scss b/src/pages/salesAfter/components/addressInfoDetail/index.module.scss index 95a6490..3d86d7e 100644 --- a/src/pages/salesAfter/components/addressInfoDetail/index.module.scss +++ b/src/pages/salesAfter/components/addressInfoDetail/index.module.scss @@ -78,9 +78,9 @@ width: 152px; font-size: 28px; height: 60px; - color: #007aff; + color: $color_main; z-index: 999; - border: 2px solid #007aff; + border: 2px solid $color_main; border-radius: 36px; text-align: center; line-height: 60px; diff --git a/src/pages/salesAfter/components/kindList/index.module.scss b/src/pages/salesAfter/components/kindList/index.module.scss index 0b99988..c8307da 100644 --- a/src/pages/salesAfter/components/kindList/index.module.scss +++ b/src/pages/salesAfter/components/kindList/index.module.scss @@ -1,150 +1,148 @@ - -.kindsList_main{ - margin-top: 20px; +.kindsList_main { + margin-top: 20px; } -.orders_list_con{ - - background-color: #fff; - border-radius: 20px; - padding: 20px; - .orders_return_title{ +.orders_list_con { + background-color: #fff; + border-radius: 20px; + padding: 20px; + .orders_return_title { + font-size: 28px; + font-weight: 700; + padding-bottom: 20px; + } + .order_list { + &:nth-child(n + 2) { + margin-top: 30px; + } + .order_list_title { + display: flex; + align-items: center; + .tag { + font-size: $font_size_min; + background-color: #cde5ff; + padding: 5px 10px; + border-radius: 6px; + color: $color_main; + } + .title { + font-weight: 700; + font-size: $font_size; + margin-left: 20px; + flex: 1; + } + .num { + color: $color_font_two; + font-size: $font_size_min; + } + } + } + .order_list_scroll { + margin-top: 30px; + .order_list_item { + display: flex; + &:nth-child(n + 2) { + margin-top: 30px; + } + .order_list_item_img { + width: 126px; + height: 126px; + border-radius: 20px; + } + .order_list_item_con { + display: flex; + width: 100%; + flex: 1; + border-bottom: 1px solid #f0f0f0; + height: 150px; + padding-top: 20px; + box-sizing: border-box; + } + .order_list_item_des { + flex: 1; + box-sizing: border-box; + padding-left: 30px; + .order_list_item_title { + font-weight: 700; + font-size: $font_size; + margin-bottom: 15px; + } + .order_list_item_price { + font-size: 26px; + color: $color_font_three; + text { + &:nth-child(n + 1) { + margin-right: 20px; + } + } + } + } + .order_list_item_count { + display: flex; + flex-direction: column; + align-items: flex-end; + .count_num { + color: $color_main; + font-size: $font_size; + margin-bottom: 15px; + font-weight: 400; + text { + font-size: $font_size_min; + } + } + .count_price { + font-size: $font_size; + font-weight: 700; + text { + font-size: $font_size_min; + } + } + } + } + } + .order_total { + padding-top: 20px; + display: flex; + justify-content: space-between; + text { + &:nth-child(1) { font-size: 28px; font-weight: 700; - padding-bottom: 20px; - } - .order_list{ - &:nth-child(n+2) { - margin-top: 30px; - } - .order_list_title{ - display: flex; - align-items: center; - .tag{ - font-size: $font_size_min; - background-color: #CDE5FF; - padding: 5px 10px; - border-radius: 6px; - color: $color_main; - } - .title{ - font-weight: 700; - font-size: $font_size; - margin-left: 20px; - flex:1; - } - .num{ - color: $color_font_two; - font-size: $font_size_min; - } - } - } - .order_list_scroll{ - margin-top: 30px; - .order_list_item { - display: flex; - &:nth-child(n + 2) { - margin-top: 30px; - } - .order_list_item_img{ - width: 126px; - height: 126px; - border-radius: 20px; - } - .order_list_item_con{ - display: flex; - width: 100%; - flex:1; - border-bottom: 1px solid #f0f0f0; - height: 150px; - padding-top: 20px; - box-sizing: border-box; - } - .order_list_item_des{ - flex:1; - box-sizing: border-box; - padding-left: 30px; - .order_list_item_title{ - font-weight: 700; - font-size: $font_size; - margin-bottom: 15px; - } - .order_list_item_price{ - font-size: 26px; - color: $color_font_three; - text{ - &:nth-child(n+1) { - margin-right: 20px; - } - } - } - } - .order_list_item_count{ - display: flex; - flex-direction: column; - align-items: flex-end; - .count_num{ - color: $color_main; - font-size: $font_size; - margin-bottom: 15px; - font-weight: 400; - text{ - font-size: $font_size_min; - } - } - .count_price { - font-size: $font_size; - font-weight: 700; - text{ - font-size: $font_size_min; - } - } - } - } - } - .order_total{ - padding-top: 20px; - display: flex; - justify-content: space-between; - text{ - &:nth-child(1) { - font-size: 28px; - font-weight: 700; - } - &:nth-child(2) { - font-size: 24px; - font-weight: 700; - } - } - } - .order_estimated_amount{ - display: flex; - align-items: flex-end; - flex-direction: column; - padding: 30px 0; - .order_price_des{ - font-size: $font_size_medium; - color: $color_font_two; - } - } -} -.inspection{ - background: linear-gradient(38deg,#007aff, #4fa6ff 100%, #68b4ff 100%); - border-radius: 20px; - color: #fff; - height: 176px; - padding: 30px ; - box-sizing: border-box; - font-size: 28px; - .inspection_title{ + } + &:nth-child(2) { + font-size: 24px; font-weight: 700; + } } - .inspection_con{ - margin-top: 20px; - display: flex; - align-items: center; - .miconfont{ - font-size: 50px; - margin-right: 10px; - } + } + .order_estimated_amount { + display: flex; + align-items: flex-end; + flex-direction: column; + padding: 30px 0; + .order_price_des { + font-size: $font_size_medium; + color: $color_font_two; } + } +} +.inspection { + background: linear-gradient(38deg, $color_main, #4fa6ff 100%, #68b4ff 100%); + border-radius: 20px; + color: #fff; + height: 176px; + padding: 30px; + box-sizing: border-box; + font-size: 28px; + .inspection_title { + font-weight: 700; + } + .inspection_con { + margin-top: 20px; + display: flex; + align-items: center; + .miconfont { + font-size: 50px; + margin-right: 10px; + } + } } diff --git a/src/pages/salesAfter/components/offlinePay/index.module.scss b/src/pages/salesAfter/components/offlinePay/index.module.scss index f84e995..1d4f01b 100644 --- a/src/pages/salesAfter/components/offlinePay/index.module.scss +++ b/src/pages/salesAfter/components/offlinePay/index.module.scss @@ -1,46 +1,45 @@ -$top:170px; -.offlinePay_main{ - .offlinePay_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - } +$top: 170px; +.offlinePay_main { + .offlinePay_con { + padding: 20px; + background-color: #f6f6f6; + border-radius: 20px; + .miconfont_title { + transform: rotate(-180deg); + position: absolute; + left: 20px; + top: 27px; + font-size: 37px; + color: $color_font_three; + z-index: 99; } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; - + } + .title { + font-size: $font_size_big; + color: #000000; + text-align: center; + font-weight: 700; + position: relative; + } + + .offlinePay_list { + border-radius: 10px; + padding: 60px 0; + .offlinePay_con_text { + font-size: $font_size; + font-weight: 700; } - - .offlinePay_list{ - border-radius: 10px; - padding: 60px 0; - .offlinePay_con_text{ - font-size: $font_size; - font-weight: 700; - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file + } + .btns { + background: $color_main; + border-radius: 40px; + width: 668px; + height: 82px; + text-align: center; + line-height: 80px; + width: 100%; + color: #fff; + font-size: 32px; + margin-top: 30px; + } +} diff --git a/src/pages/salesAfter/components/payment/index.module.scss b/src/pages/salesAfter/components/payment/index.module.scss index 340b0ed..9e57ccc 100644 --- a/src/pages/salesAfter/components/payment/index.module.scss +++ b/src/pages/salesAfter/components/payment/index.module.scss @@ -1,126 +1,123 @@ -$top:190px; -.payment_main{ - .payment_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - } - +$top: 190px; +.payment_main { + .payment_con { + padding: 20px; + background-color: #f6f6f6; + border-radius: 20px; + .miconfont_title { + transform: rotate(-180deg); + position: absolute; + left: 20px; + top: 27px; + font-size: 37px; + color: $color_font_three; + z-index: 99; } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; - - } - .amount{ - text-align: center; - padding: 25px 0; - } - - .payment_list{ - background-color: #fff; - // box-shadow: 2px 2px 6px 0px rgba(0,0,0,0.16); - min-height: 300px; - border-radius: 10px; - padding-bottom: 100px; - position: relative; - background: radial-gradient(circle 20px at left $top, transparent 20px, #fff 20px + 3px) left 0px/60% no-repeat , - radial-gradient(circle 20px at right $top, transparent 20px, #fff 20px + 3px) right 0px/60% no-repeat; - filter: drop-shadow(2px 2px 6px rgba(0, 0, 0, .16)); - position: relative; - &::before{ - content: ''; - position: absolute; - border-bottom: 3px dashed #ccc; - top: $top; - width: calc(100% - 100px); - left:0; - right: 0; - margin: auto; + } + .title { + font-size: $font_size_big; + color: #000000; + text-align: center; + font-weight: 700; + position: relative; + } + .amount { + text-align: center; + padding: 25px 0; + } - } - .payment_list_top_border{ - height: 32px; - width: 100%; - background: linear-gradient(215deg,#cde5ff 2%, #cde5ff 2%, #68b4ff 72%); - border-radius: 10px 10px 0px 0px; - } - .payment_list_title{ - text-align: center; - padding: 30px 0 50px 0; - font-size: $font_size; - color: $color_font_three; - .payment_list_title_price_item{ - display: flex; - justify-content: space-between; - padding: 0 90px; - &:nth-child(1) { - margin-bottom: 15px; - } - } - text{ - &:nth-child(2) { - color: $color_main; - } - } - } - .payment_list_con{ - padding: 20px 30px 0 30px; - .payment_list_item{ - display: flex; - justify-content: space-between; - align-items: center; - height: 123px; - &:nth-last-child(n+2) { - border-bottom: 2px solid #F3F3F3; - } - } - .payment_list_item_left{ - display: flex; - flex-direction: column; - font-size: $font_size; - .payment_list_item_left_name{ - display: flex; - align-items: center; - } - .miconfont{ - font-size: 30px; - color: #FFC300; - padding-right: 10px; - } - .payment_list_item_left_price{ - font-size: $font_size_min; - color: $color_font_two; - padding-left: 35px; - padding-top: 5px; - } - } - .miconfont_more{ - font-size: 20px; - } - } + .payment_list { + background-color: #fff; + // box-shadow: 2px 2px 6px 0px rgba(0,0,0,0.16); + min-height: 300px; + border-radius: 10px; + padding-bottom: 100px; + position: relative; + background: radial-gradient(circle 20px at left $top, transparent 20px, #fff 20px + 3px) left 0px/60% no-repeat, + radial-gradient(circle 20px at right $top, transparent 20px, #fff 20px + 3px) right 0px/60% no-repeat; + filter: drop-shadow(2px 2px 6px rgba(0, 0, 0, 0.16)); + position: relative; + &::before { + content: ''; + position: absolute; + border-bottom: 3px dashed #ccc; + top: $top; + width: calc(100% - 100px); + left: 0; + right: 0; + margin: auto; } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; + .payment_list_top_border { + height: 32px; + width: 100%; + background: linear-gradient(215deg, #cde5ff 2%, #cde5ff 2%, #68b4ff 72%); + border-radius: 10px 10px 0px 0px; } -} \ No newline at end of file + .payment_list_title { + text-align: center; + padding: 30px 0 50px 0; + font-size: $font_size; + color: $color_font_three; + .payment_list_title_price_item { + display: flex; + justify-content: space-between; + padding: 0 90px; + &:nth-child(1) { + margin-bottom: 15px; + } + } + text { + &:nth-child(2) { + color: $color_main; + } + } + } + .payment_list_con { + padding: 20px 30px 0 30px; + .payment_list_item { + display: flex; + justify-content: space-between; + align-items: center; + height: 123px; + &:nth-last-child(n + 2) { + border-bottom: 2px solid #f3f3f3; + } + } + .payment_list_item_left { + display: flex; + flex-direction: column; + font-size: $font_size; + .payment_list_item_left_name { + display: flex; + align-items: center; + } + .miconfont { + font-size: 30px; + color: #ffc300; + padding-right: 10px; + } + .payment_list_item_left_price { + font-size: $font_size_min; + color: $color_font_two; + padding-left: 35px; + padding-top: 5px; + } + } + .miconfont_more { + font-size: 20px; + } + } + } + .btns { + background: $color_main; + border-radius: 40px; + width: 668px; + height: 82px; + text-align: center; + line-height: 80px; + width: 100%; + color: #fff; + font-size: 32px; + margin-top: 30px; + } +} diff --git a/src/pages/salesAfter/components/remark/index.module.scss b/src/pages/salesAfter/components/remark/index.module.scss index d624050..faac4cb 100644 --- a/src/pages/salesAfter/components/remark/index.module.scss +++ b/src/pages/salesAfter/components/remark/index.module.scss @@ -1,48 +1,48 @@ -.order_popup{ - display: flex; - flex-direction: column; - align-items: center; - padding: 20px 0; - .order_popup_title{ - color: $font_size_big; - font-weight: 700; - color: #000000; - padding-bottom: 20px; - } - .order_popup_input{ - width: 100%; - padding: 0 25px; - box-sizing: border-box; - margin-top: 43px; - position: relative; - .descDataNum{ - position: absolute; - right: 40px; - bottom: 10px; - height: 39px; - font-size: $font_size_medium; - color: $color_font_two; - } - textarea{ - background-color: #f3f3f3; - border-radius: 10px; - width: 100%; - height: 313px; - padding: 20px; - padding-bottom: 50px; - box-sizing: border-box; - font-size: $font_size; - border: 2px solid #e6e6e6; - } +.order_popup { + display: flex; + flex-direction: column; + align-items: center; + padding: 20px 0; + .order_popup_title { + color: $font_size_big; + font-weight: 700; + color: #000000; + padding-bottom: 20px; + } + .order_popup_input { + width: 100%; + padding: 0 25px; + box-sizing: border-box; + margin-top: 43px; + position: relative; + .descDataNum { + position: absolute; + right: 40px; + bottom: 10px; + height: 39px; + font-size: $font_size_medium; + color: $color_font_two; } - .order_save_address{ - height: 82px; - background: #007aff; - border-radius: 40px; - width: 668px; - text-align: center; - line-height: 82px; - color: #fff; - margin-top: 60px; - } -} \ No newline at end of file + textarea { + background-color: #f3f3f3; + border-radius: 10px; + width: 100%; + height: 313px; + padding: 20px; + padding-bottom: 50px; + box-sizing: border-box; + font-size: $font_size; + border: 2px solid #e6e6e6; + } + } + .order_save_address { + height: 82px; + background: $color_main; + border-radius: 40px; + width: 668px; + text-align: center; + line-height: 82px; + color: #fff; + margin-top: 60px; + } +} diff --git a/src/pages/salesAfter/components/returnLogistics/index.module.scss b/src/pages/salesAfter/components/returnLogistics/index.module.scss index 1a22287..525a186 100644 --- a/src/pages/salesAfter/components/returnLogistics/index.module.scss +++ b/src/pages/salesAfter/components/returnLogistics/index.module.scss @@ -1,35 +1,34 @@ - -.logistics_main{ - padding: 20px 30px; - box-sizing: border-box; - .logistics_image{ - display: flex; - .title_desc{ - font-size: 28px; - font-weight: 700; - padding-top: 50px; - box-sizing: border-box; - } - .upload_image{ - flex:1; - } +.logistics_main { + padding: 20px 30px; + box-sizing: border-box; + .logistics_image { + display: flex; + .title_desc { + font-size: 28px; + font-weight: 700; + padding-top: 50px; + box-sizing: border-box; } - .logistics_desc{ - margin-top: 50px; + .upload_image { + flex: 1; } - .btns_two{ - display: flex; - height: 82px; - font-size: $font_size_big; - border-radius: 40px; - margin-top: 50px; - .verify_btn{ - flex:1; - border-radius: 40px; - background: #007aff; - text-align: center; - line-height: 82px; - color: #fff; - } + } + .logistics_desc { + margin-top: 50px; + } + .btns_two { + display: flex; + height: 82px; + font-size: $font_size_big; + border-radius: 40px; + margin-top: 50px; + .verify_btn { + flex: 1; + border-radius: 40px; + background: $color_main; + text-align: center; + line-height: 82px; + color: #fff; } + } } diff --git a/src/pages/salesAfter/components/returnPayCheck/index.module.scss b/src/pages/salesAfter/components/returnPayCheck/index.module.scss index 1aa0537..6653e4c 100644 --- a/src/pages/salesAfter/components/returnPayCheck/index.module.scss +++ b/src/pages/salesAfter/components/returnPayCheck/index.module.scss @@ -1,55 +1,54 @@ -$top:170px; -.scanPay_main{ - .scanPay_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - - } +$top: 170px; +.scanPay_main { + .scanPay_con { + padding: 20px; + background-color: #f6f6f6; + border-radius: 20px; + .miconfont_title { + transform: rotate(-180deg); + position: absolute; + left: 20px; + top: 27px; + font-size: 37px; + color: $color_font_three; + z-index: 99; } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; - padding: 10px 0; + } + .title { + font-size: $font_size_big; + color: #000000; + text-align: center; + font-weight: 700; + position: relative; + padding: 10px 0; + } + .desc { + font-size: $font_size_min; + color: $color_main; + text-align: center; + padding: 10px 0; + .miconfont { + font-size: 25px; } - .desc{ - font-size: $font_size_min; - color: $color_main; - text-align: center; - padding: 10px 0; - .miconfont{ - font-size: 25px; - } + } + + .scanPay_list { + border-radius: 10px; + height: 900px; + image { + width: 100%; } - - .scanPay_list{ - border-radius: 10px; - height: 900px; - image{ - width: 100%; - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file + } + .btns { + background: $color_main; + border-radius: 40px; + width: 668px; + height: 82px; + text-align: center; + line-height: 80px; + width: 100%; + color: #fff; + font-size: 32px; + margin-top: 30px; + } +} diff --git a/src/pages/salesAfter/components/scanPay/index.module.scss b/src/pages/salesAfter/components/scanPay/index.module.scss index dcb356d..8d40c2b 100644 --- a/src/pages/salesAfter/components/scanPay/index.module.scss +++ b/src/pages/salesAfter/components/scanPay/index.module.scss @@ -1,54 +1,53 @@ -$top:170px; -.scanPay_main{ - .scanPay_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - - } +$top: 170px; +.scanPay_main { + .scanPay_con { + padding: 20px; + background-color: #f6f6f6; + border-radius: 20px; + .miconfont_title { + transform: rotate(-180deg); + position: absolute; + left: 20px; + top: 27px; + font-size: 37px; + color: $color_font_three; + z-index: 99; } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; + } + .title { + font-size: $font_size_big; + color: #000000; + text-align: center; + font-weight: 700; + position: relative; + } + .desc { + font-size: $font_size_min; + color: $color_main; + text-align: center; + padding: 10px 0; + .miconfont { + font-size: 25px; } - .desc{ - font-size: $font_size_min; - color: $color_main; - text-align: center; - padding: 10px 0; - .miconfont{ - font-size: 25px; - } + } + + .scanPay_list { + border-radius: 10px; + height: 900px; + image { + width: 100%; } - - .scanPay_list{ - border-radius: 10px; - height: 900px; - image{ - width: 100%; - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file + } + .btns { + background: $color_main; + border-radius: 40px; + width: 668px; + height: 82px; + text-align: center; + line-height: 80px; + width: 100%; + color: #fff; + font-size: 32px; + margin-top: 30px; + } +} diff --git a/src/pages/salesAfter/salesAfterList/components/returnLogistics/index.module.scss b/src/pages/salesAfter/salesAfterList/components/returnLogistics/index.module.scss index 1a22287..525a186 100644 --- a/src/pages/salesAfter/salesAfterList/components/returnLogistics/index.module.scss +++ b/src/pages/salesAfter/salesAfterList/components/returnLogistics/index.module.scss @@ -1,35 +1,34 @@ - -.logistics_main{ - padding: 20px 30px; - box-sizing: border-box; - .logistics_image{ - display: flex; - .title_desc{ - font-size: 28px; - font-weight: 700; - padding-top: 50px; - box-sizing: border-box; - } - .upload_image{ - flex:1; - } +.logistics_main { + padding: 20px 30px; + box-sizing: border-box; + .logistics_image { + display: flex; + .title_desc { + font-size: 28px; + font-weight: 700; + padding-top: 50px; + box-sizing: border-box; } - .logistics_desc{ - margin-top: 50px; + .upload_image { + flex: 1; } - .btns_two{ - display: flex; - height: 82px; - font-size: $font_size_big; - border-radius: 40px; - margin-top: 50px; - .verify_btn{ - flex:1; - border-radius: 40px; - background: #007aff; - text-align: center; - line-height: 82px; - color: #fff; - } + } + .logistics_desc { + margin-top: 50px; + } + .btns_two { + display: flex; + height: 82px; + font-size: $font_size_big; + border-radius: 40px; + margin-top: 50px; + .verify_btn { + flex: 1; + border-radius: 40px; + background: $color_main; + text-align: center; + line-height: 82px; + color: #fff; } + } } diff --git a/src/pages/sampleComparison/index.module.scss b/src/pages/sampleComparison/index.module.scss index e46e9fe..255212f 100644 --- a/src/pages/sampleComparison/index.module.scss +++ b/src/pages/sampleComparison/index.module.scss @@ -1,253 +1,251 @@ page { - background: #f3f3f3; - overflow: hidden; + background: #f3f3f3; + overflow: hidden; } .body { - overflow: hidden; + overflow: hidden; - .topBox { - margin-top: 24px; - margin-left: 30px; - width: 690px; - height: 86px; - background: #ffffff; - border-radius: 10px; - display: flex; - align-items: center; - justify-content: space-between; + .topBox { + margin-top: 24px; + margin-left: 30px; + width: 690px; + height: 86px; + background: #ffffff; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: space-between; - .leftBox { - display: flex; - align-items: center; - padding-left: 19px; + .leftBox { + display: flex; + align-items: center; + padding-left: 19px; - .leftFont { - font-size: 28px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - text-align: left; - color: #707070; - margin-right: 14px; - } + .leftFont { + font-size: 28px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: left; + color: #707070; + margin-right: 14px; + } - .borderBox { - width: 0px; - height: 62px; - border: 2px solid #f3f3f3; - margin-right: 39px; - } + .borderBox { + width: 0px; + height: 62px; + border: 2px solid #f3f3f3; + margin-right: 39px; + } - .cricleBox { - width: 12px; - height: 12px; - background: #cccccc; - border-radius: 50%; - margin-right: 12px; - } + .cricleBox { + width: 12px; + height: 12px; + background: #cccccc; + border-radius: 50%; + margin-right: 12px; + } - .notNet { - font-size: 28px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - color: #aaaaaa; - } - } - - .iconMore { - margin-right: 30px; - font-size: 30px; - } + .notNet { + font-size: 28px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + color: #aaaaaa; + } } - .contBox { - margin-top: 53px; - display: flex; - padding-left: 56px; - - .firstBox { - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; - - .firstLeftName { - font-size: 26px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - color: #707070; - } - - .firstLeftbox { - width: 290px; - height: 290px; - background: #dddddd; - margin-top: 13px; - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; - border-radius: 50%; - - .clickFont { - font-size: 28px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - color: #707070; - - } - - } - - .color_bock { - width: 290px; - height: 290px; - border-radius: 50%; - } - - .color_bocktwo { - width: 290px; - height: 290px; - border-radius: 50%; - } - - .nameColor { - font-size: 24px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - color: #707070; - margin-top: 30px; - } - } + .iconMore { + margin-right: 30px; + font-size: 30px; } + } - .reslutBox { - width: 692px; - height: 180px; - background: #ffffff; - margin-top: 30px; - margin-left: 29px; - border-radius: 20px; - overflow: hidden; - } + .contBox { + margin-top: 53px; + display: flex; + padding-left: 56px; - .reslutTitle { - overflow: hidden; - width: 100%; - margin-top: 41px; - display: flex; - align-items: center; - justify-content: space-between; + .firstBox { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; - .titleLeft { - margin-left: 48px; - font-size: 26px; - font-family: Microsoft YaHei, Microsoft YaHei-Bold; - font-weight: 700; - color: #707070; - } - - .titleRiht { - margin-right: 37px; - width: 136px; - height: 46px; - background: #ffd9d9; - border-radius: 10px; - font-size: 28px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - text-align: center; - color: #ff4a4a; - line-height: 46px; - } - - .titleRiht1 { - background: #cdf3df; - margin-right: 37px; - width: 136px; - height: 46px; - border-radius: 10px; - font-size: 28px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - text-align: center; - line-height: 46px; - color: #07C160; - } - } - - .notResult { - width: 100%; - text-align: center; + .firstLeftName { font-size: 26px; font-family: Microsoft YaHei, Microsoft YaHei-Regular; font-weight: 400; - color: #ababab; - margin-top: 14px; - } + color: #707070; + } - .notBox { - margin-top: 32px; + .firstLeftbox { + width: 290px; + height: 290px; + background: #dddddd; + margin-top: 13px; display: flex; align-items: center; - justify-content: space-between; - overflow: hidden; + justify-content: center; + flex-direction: column; + border-radius: 50%; - .notLeft { - font-size: 26px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - color: #707070; - margin-left: 40px; + .clickFont { + font-size: 28px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + color: #707070; } + } - .notright { - font-size: 26px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - color: #707070; - margin-right: 37px; - } + .color_bock { + width: 290px; + height: 290px; + border-radius: 50%; + } + + .color_bocktwo { + width: 290px; + height: 290px; + border-radius: 50%; + } + + .nameColor { + font-size: 24px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + color: #707070; + margin-top: 30px; + } + } + } + + .reslutBox { + width: 692px; + height: 180px; + background: #ffffff; + margin-top: 30px; + margin-left: 29px; + border-radius: 20px; + overflow: hidden; + } + + .reslutTitle { + overflow: hidden; + width: 100%; + margin-top: 41px; + display: flex; + align-items: center; + justify-content: space-between; + + .titleLeft { + margin-left: 48px; + font-size: 26px; + font-family: Microsoft YaHei, Microsoft YaHei-Bold; + font-weight: 700; + color: #707070; } - .bottomBox { - position: fixed; - bottom: 0; - width: 750px; - height: 182px; - background: #f3f3f3; - box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.16); - overflow: hidden; - display: flex; - - .leftBtn { - width: 264px; - height: 82px; - background: #ffffff; - border-radius: 42px; - font-size: 32px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - text-align: center; - color: #007aff; - line-height: 82px; - margin-top: 34px; - margin-left: 67px; - } - - .rightBtn { - width: 264px; - height: 82px; - background: #007aff; - border-radius: 42px; - font-size: 32px; - font-family: Microsoft YaHei, Microsoft YaHei-Regular; - font-weight: 400; - text-align: center; - color: #ffffff; - line-height: 82px; - margin-top: 34px; - margin-left: 88px; - } + .titleRiht { + margin-right: 37px; + width: 136px; + height: 46px; + background: #ffd9d9; + border-radius: 10px; + font-size: 28px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + color: #ff4a4a; + line-height: 46px; } -} \ No newline at end of file + + .titleRiht1 { + background: #cdf3df; + margin-right: 37px; + width: 136px; + height: 46px; + border-radius: 10px; + font-size: 28px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + line-height: 46px; + color: #07c160; + } + } + + .notResult { + width: 100%; + text-align: center; + font-size: 26px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + color: #ababab; + margin-top: 14px; + } + + .notBox { + margin-top: 32px; + display: flex; + align-items: center; + justify-content: space-between; + overflow: hidden; + + .notLeft { + font-size: 26px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + color: #707070; + margin-left: 40px; + } + + .notright { + font-size: 26px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + color: #707070; + margin-right: 37px; + } + } + + .bottomBox { + position: fixed; + bottom: 0; + width: 750px; + height: 182px; + background: #f3f3f3; + box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.16); + overflow: hidden; + display: flex; + + .leftBtn { + width: 264px; + height: 82px; + background: #ffffff; + border-radius: 42px; + font-size: 32px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + color: $color_main; + line-height: 82px; + margin-top: 34px; + margin-left: 67px; + } + + .rightBtn { + width: 264px; + height: 82px; + background: $color_main; + border-radius: 42px; + font-size: 32px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + color: #ffffff; + line-height: 82px; + margin-top: 34px; + margin-left: 88px; + } + } +} diff --git a/src/pages/subjectList/components/filter/index.module.scss b/src/pages/subjectList/components/filter/index.module.scss index 599cdd0..9116b0c 100644 --- a/src/pages/subjectList/components/filter/index.module.scss +++ b/src/pages/subjectList/components/filter/index.module.scss @@ -1,126 +1,124 @@ -.popup_main{ - width: 608px; - height: 100vh; - padding: 20px; - box-sizing: border-box; - display: flex; - flex-direction: column; - .popup_title{ - font-size: $font_size; - font-weight: 700; +.popup_main { + width: 608px; + height: 100vh; + padding: 20px; + box-sizing: border-box; + display: flex; + flex-direction: column; + .popup_title { + font-size: $font_size; + font-weight: 700; + text-align: center; + padding: 20px 0; + } + .scroll { + flex: 1; + height: 0; + } + .popup_filter { + padding-bottom: 100px; + } + .popup_filter_item { + margin-bottom: 20px; + .title { + font-size: $font_size; + color: $color_font_one; + font-weight: 700; + padding: 20px 0; + } + .btn_list { + display: grid; + grid-template-columns: repeat(3, 165.75px); + justify-content: space-between; + .btn_item { + width: 165.75px; + height: 69.2px; + background: #f0f0f0; + border-radius: 34px; text-align: center; - padding: 20px 0; - } - .scroll{ - flex:1; - height: 0; - } - .popup_filter{ - padding-bottom: 100px; - } - .popup_filter_item{ + line-height: 69.2px; + font-size: $font_size_medium; + color: $color_font_one; margin-bottom: 20px; - .title{ - font-size: $font_size; - color: $color_font_one; - font-weight: 700; - padding: 20px 0; - } - .btn_list{ - display: grid; - grid-template-columns: repeat(3, 165.75px); - justify-content: space-between; - .btn_item{ - width: 165.75px; - height: 69.2px; - background: #f0f0f0; - border-radius: 34px; - text-align: center; - line-height: 69.2px; - font-size: $font_size_medium; - color: $color_font_one; - margin-bottom: 20px; - } - .select_btn_item{ - color: $color_main; - background: #ecf5ff; - border: 2px solid #007aff; - width: 161.75px; - height: 65.2px; - } - } - .btn_list_input{ - display: flex; - // justify-content: space-between; - align-items: center; - .btn_width { - width: 220px; - height: 70px; - background: #f0f0f0; - border-radius: 50px; - padding: 10px 20px; - box-sizing: border-box; - input{ - width: 100%; - height: 100%; - font-size: $font_size_medium; - } - } - .unit{ - color: $color_font_one; - font-size: $font_size; - margin-left: 20px; - } - text{ - color: #ccc; - padding: 0 20px; - } - .width_main{ - - } - } - .btn_list_element{ - background-color: #F0F0F0; - border-radius: 30px; - padding: 20px; - box-sizing: border-box; - textarea{ - width: 100%; - height: 126px; - font-size: $font_size_medium; - } - } + } + .select_btn_item { + color: $color_main; + background: #ecf5ff; + border: 2px solid $color_main; + width: 161.75px; + height: 65.2px; + } } - .btns_con{ + .btn_list_input { + display: flex; + // justify-content: space-between; + align-items: center; + .btn_width { + width: 220px; + height: 70px; + background: #f0f0f0; + border-radius: 50px; + padding: 10px 20px; + box-sizing: border-box; + input { + width: 100%; + height: 100%; + font-size: $font_size_medium; + } + } + .unit { + color: $color_font_one; + font-size: $font_size; + margin-left: 20px; + } + text { + color: #ccc; + padding: 0 20px; + } + .width_main { + } + } + .btn_list_element { + background-color: #f0f0f0; + border-radius: 30px; + padding: 20px; + box-sizing: border-box; + textarea { width: 100%; - position: fixed; - bottom:0; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); - .btns_two{ - display: flex; - width: 552px; - height: 82px; - border: 2px solid #cde5ff; - font-size: $font_size_big; - border-radius: 40px; - margin-bottom: 20px; - .rest_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - text-align: center; - line-height: 82px; - color: $color_main; - - } - .verify_btn{ - flex:1; - border-radius: 0px 40px 40px 0px; - background: #007aff; - text-align: center; - line-height: 82px; - color: #fff; - } - } + height: 126px; + font-size: $font_size_medium; + } } -} \ No newline at end of file + } + .btns_con { + width: 100%; + position: fixed; + bottom: 0; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .btns_two { + display: flex; + width: 552px; + height: 82px; + border: 2px solid #cde5ff; + font-size: $font_size_big; + border-radius: 40px; + margin-bottom: 20px; + .rest_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + text-align: center; + line-height: 82px; + color: $color_main; + } + .verify_btn { + flex: 1; + border-radius: 0px 40px 40px 0px; + background: $color_main; + text-align: center; + line-height: 82px; + color: #fff; + } + } + } +} diff --git a/src/pages/subjectList/index.module.scss b/src/pages/subjectList/index.module.scss index 7b62533..2da729d 100644 --- a/src/pages/subjectList/index.module.scss +++ b/src/pages/subjectList/index.module.scss @@ -1,150 +1,148 @@ -.main{ +.main { + display: flex; + flex-direction: column; + height: 100vh; + background-color: $color_bg_one; + .search { + padding: 20px; + } + .filter { + .filter_all { + display: flex; + justify-content: space-between; + padding: 20px 50px; + font-size: $font_size_medium; + color: $color_font_three; + .text_one { + color: $color_main; + display: flex; + align-items: center; + } + .text_two { + position: relative; + .miconfont { + font-size: 20px; + margin-left: 10px; + } + &::before { + content: ''; + width: 2px; + height: 32px; + background-color: #c2c2c2; + position: absolute; + top: 0; + left: -50px; + } + } + } + .filter_btns { + display: flex; + justify-content: space-between; + padding: 20px; + + .selected { + background-color: #ecf5ff; + border: 2px solid #cde5ff; + color: $color_main; + width: 122px; + height: 42.93px; + } + } + } + .list { + flex: 1; + height: 0; + } + .popup_main { + width: 608px; + height: 100vh; + padding: 20px; + box-sizing: border-box; display: flex; flex-direction: column; - height: 100vh; - background-color: $color_bg_one; - .search{ - padding: 20px; + .popup_title { + font-size: $font_size; + font-weight: 700; + text-align: center; + padding: 20px 0; } - .filter{ - .filter_all { - display: flex; - justify-content: space-between; - padding: 20px 50px; + .scroll { + flex: 1; + height: 0; + } + .popup_filter { + } + .popup_filter_item { + margin-bottom: 20px; + .title { + font-size: $font_size; + color: $color_font_one; + font-weight: 700; + padding: 20px 0; + } + .btn_list { + display: grid; + grid-template-columns: repeat(3, 165.75px); + justify-content: space-between; + .btn_item { + width: 165.75px; + height: 69.2px; + background: #f0f0f0; + border-radius: 34px; + text-align: center; + line-height: 69.2px; + font-size: $font_size_medium; + color: $color_font_one; + margin-bottom: 20px; + } + .select_btn_item { + color: $color_main; + background: #ecf5ff; + border: 2px solid $color_main; + width: 161.75px; + height: 65.2px; + } + } + .btn_list_input { + display: flex; + // justify-content: space-between; + align-items: center; + .btn_width { + width: 220px; + height: 70px; + background: #f0f0f0; + border-radius: 50px; + padding: 10px 20px; + box-sizing: border-box; + input { + width: 100%; + height: 100%; font-size: $font_size_medium; - color: $color_font_three; - .text_one{ - color: $color_main; - display: flex; - align-items: center; - } - .text_two{ - position: relative; - .miconfont{ - font-size: 20px; - margin-left: 10px; - } - &::before{ - content: ''; - width: 2px; - height: 32px; - background-color: #C2C2C2; - position: absolute; - top: 0; - left: -50px; - } - } + } } - .filter_btns{ - display: flex; - justify-content: space-between; - padding: 20px; - - .selected{ - background-color: #ecf5ff; - border: 2px solid #cde5ff; - color: $color_main; - width: 122px; - height: 42.93px; - } + .unit { + color: $color_font_one; + font-size: $font_size; + margin-left: 20px; } - } - .list{ - flex:1; - height: 0; - } - .popup_main{ - width: 608px; - height: 100vh; + text { + color: #ccc; + padding: 0 20px; + } + .width_main { + } + } + .btn_list_element { + background-color: #f0f0f0; + border-radius: 30px; padding: 20px; box-sizing: border-box; - display: flex; - flex-direction: column; - .popup_title{ - font-size: $font_size; - font-weight: 700; - text-align: center; - padding: 20px 0; - } - .scroll{ - flex:1; - height: 0; - } - .popup_filter{ - - } - .popup_filter_item{ - margin-bottom: 20px; - .title{ - font-size: $font_size; - color: $color_font_one; - font-weight: 700; - padding: 20px 0; - } - .btn_list{ - display: grid; - grid-template-columns: repeat(3, 165.75px); - justify-content: space-between; - .btn_item{ - width: 165.75px; - height: 69.2px; - background: #f0f0f0; - border-radius: 34px; - text-align: center; - line-height: 69.2px; - font-size: $font_size_medium; - color: $color_font_one; - margin-bottom: 20px; - } - .select_btn_item{ - color: $color_main; - background: #ecf5ff; - border: 2px solid #007aff; - width: 161.75px; - height: 65.2px; - } - } - .btn_list_input{ - display: flex; - // justify-content: space-between; - align-items: center; - .btn_width { - width: 220px; - height: 70px; - background: #f0f0f0; - border-radius: 50px; - padding: 10px 20px; - box-sizing: border-box; - input{ - width: 100%; - height: 100%; - font-size: $font_size_medium; - } - } - .unit{ - color: $color_font_one; - font-size: $font_size; - margin-left: 20px; - } - text{ - color: #ccc; - padding: 0 20px; - } - .width_main{ - - } - } - .btn_list_element{ - background-color: #F0F0F0; - border-radius: 30px; - padding: 20px; - box-sizing: border-box; - textarea{ - width: 100%; - height: 126px; - font-size: $font_size_medium; - } - } + textarea { + width: 100%; + height: 126px; + font-size: $font_size_medium; } + } } -} \ No newline at end of file + } +} diff --git a/src/pages/user copy/index.module.scss b/src/pages/user copy/index.module.scss index ffe17de..cfeae30 100644 --- a/src/pages/user copy/index.module.scss +++ b/src/pages/user copy/index.module.scss @@ -100,7 +100,7 @@ border-radius: 20px; font-size: 22px; font-weight: 400; - color: #007aff; + color: $color_main; display: flex; align-items: center; justify-content: center; @@ -190,7 +190,7 @@ .card-main-title-content-item-badge { padding: 0 10px; height: 32px; - background: #007aff; + background: $color_main; border: 2px solid #ffffff; border-radius: 32px; box-sizing: border-box; @@ -224,7 +224,7 @@ } .assets-content-item-top { - color: #007aff; + color: $color_main; font-weight: 400; } @@ -324,14 +324,14 @@ .auth-status, .auth-status-adopt { - color: #007aff; + color: $color_main; background-color: #cde5ff; } .auth-tips { font-size: 18px; font-weight: 400; - color: #007aff; + color: $color_main; text-align: right; } @@ -459,7 +459,7 @@ .tips-modal-button view { font-size: 26px; font-weight: 400; - color: #007aff; + color: $color_main; } .auth-box { @@ -522,14 +522,14 @@ align-items: center; font-size: 30px; margin-right: 3px; - color: #007aff; + color: $color_main; } .auth-font { font-size: 20px; font-family: Microsoft YaHei, Microsoft YaHei-Regular; font-weight: 400; - color: #007aff; + color: $color_main; } } diff --git a/src/pages/userEdit copy/components/ModifyModal.scss b/src/pages/userEdit copy/components/ModifyModal.scss index fe370e9..1baab4b 100644 --- a/src/pages/userEdit copy/components/ModifyModal.scss +++ b/src/pages/userEdit copy/components/ModifyModal.scss @@ -1,76 +1,76 @@ - .modify-ickname-content { - margin: 0 auto; +.modify-ickname-content { + margin: 0 auto; + width: 658px; + padding-bottom: 50px; + + .modify-ickname-input { width: 658px; - padding-bottom: 50px; + height: 182px; + background: #f3f3f3; + border: 2px solid #e6e6e6; + border-radius: 10px; + padding: 15px; + box-sizing: border-box; + font-size: 22px; + font-weight: 400; + color: #ababab; + display: flex; + flex-direction: column; + align-items: flex-end; + } - .modify-ickname-input { - width: 658px; - height: 182px; - background: #f3f3f3; - border: 2px solid #e6e6e6; - border-radius: 10px; - padding: 15px; - box-sizing: border-box; - font-size: 22px; - font-weight: 400; - color: #ababab; - display: flex; - flex-direction: column; - align-items: flex-end; - } + .modify-ickname-input textarea { + width: 100%; + height: 80%; + font-size: 26px; + font-weight: 400; + color: #3c3c3c; + } - .modify-ickname-input textarea { - width: 100%; - height: 80%; - font-size: 26px; - font-weight: 400; - color: #3c3c3c; - } + .modify-ickname-tips { + font-size: 22px; + font-weight: 400; + color: #ababab; + margin-top: 30px; + } - .modify-ickname-tips { - font-size: 22px; - font-weight: 400; - color: #ababab; - margin-top: 30px; - } + .modify-ickname-operation { + width: 658px; + height: 82px; + background: #ffffff; + border: 2px solid #cde5ff; + border-radius: 40px; + display: flex; + overflow: hidden; + margin-top: 105px; + display: flex; + } - .modify-ickname-operation { - width: 658px; - height: 82px; - background: #ffffff; - border: 2px solid #cde5ff; - border-radius: 40px; - display: flex; - overflow: hidden; - margin-top: 105px; - display: flex; - } + .modify-ickname-operation button { + height: 100%; + width: 50%; + font-size: 32px; + font-weight: 400; + color: $color_main; + background-color: white; + border: none; + outline: none; + padding: 0; + border-radius: 0; + } - .modify-ickname-operation button { - height: 100%; - width: 50%; - font-size: 32px; - font-weight: 400; - color: #007aff; - background-color: white; - border: none; - outline: none; - padding: 0; - border-radius: 0; - } + .modify-ickname-operation button::after, + .user-edit-logout::after { + border-radius: 0; + border: none; + } - .modify-ickname-operation button::after, - .user-edit-logout::after { - border-radius: 0; - border: none; - } + .modify-ickname-operation .modify-ickname-operation-save { + background: $color_main; + color: #ffffff; + } - .modify-ickname-operation .modify-ickname-operation-save { - background: #007aff; - color: #ffffff; - } - - .modify-ickname-operation button::after { - border-radius: 0; - } - } \ No newline at end of file + .modify-ickname-operation button::after { + border-radius: 0; + } +} diff --git a/src/pages/userEdit copy/index.scss b/src/pages/userEdit copy/index.scss index 2899aa8..2b02515 100644 --- a/src/pages/userEdit copy/index.scss +++ b/src/pages/userEdit copy/index.scss @@ -1,16 +1,18 @@ -.user-edit{ +.user-edit { height: 100vh; background: #f3f3f3; - .user-edit-portrait{ + .user-edit-portrait { font-size: 22px; font-weight: 400; color: #ababab; - display: flex;flex-direction: column; - align-items: center;justify-content: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; background-color: white; height: 300px; } - .user-edit-portrait image{ + .user-edit-portrait image { width: 170px; height: 170px; border-radius: 50%; @@ -19,72 +21,81 @@ margin-bottom: 15px; } - .user-edit-content{ + .user-edit-content { background-color: white; margin-top: 24px; padding: 0 30px; } - .user-edit-content-title{ + .user-edit-content-title { font-size: 26px; font-weight: 700; color: #000000; padding: 40px; } - .user-edit-content-title text{ + .user-edit-content-title text { margin-right: 10px; } - .user-edit-content-phone{ + .user-edit-content-phone { font-size: 26px; font-weight: 400; color: #000000; - display: flex;justify-content: space-between; + display: flex; + justify-content: space-between; } - .user-edit-content-phone text{ + .user-edit-content-phone text { font-size: 24px; font-weight: 400; color: #ababab; } - .user-edit-content-bindphone{ - padding: 0;width: auto;height: auto; - margin: 0;background: none;border: 0; + .user-edit-content-bindphone { + padding: 0; + width: auto; + height: auto; + margin: 0; + background: none; + border: 0; text-align: left; font-size: 26px; font-weight: 400; color: #ababab; } - .user-edit-content-bindphone::after{ + .user-edit-content-bindphone::after { border: 0; } - .user-edit-content-company{ + .user-edit-content-company { width: 118px; height: 40px; background: #dddddd; border-radius: 6px; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; font-size: 24px; font-weight: 400; color: #707070; } - .user-edit-content-company,.user-edit-content-company-adopt{ - background: #CDF3DF; - color: #07C160; + .user-edit-content-company, + .user-edit-content-company-adopt { + background: #cdf3df; + color: #07c160; } - .user-edit-content-company text{ + .user-edit-content-company text { margin-left: 5px; } - .user-edit-content-company.user-edit-content-company-auth{ - background-color: #CDF3DF; - color: #07C160; + .user-edit-content-company.user-edit-content-company-auth { + background-color: #cdf3df; + color: #07c160; } - .user-edit-list{ + .user-edit-list { height: 90px; - display: flex;align-items: center; + display: flex; + align-items: center; border-bottom: 2px solid #f0f0f0; } - .user-edit-list:last-of-type{ + .user-edit-list:last-of-type { border: none; } - .user-edit-list-left{ + .user-edit-list-left { width: 120px; border-right: 2px solid #f3f3f3; margin-right: 30px; @@ -92,35 +103,39 @@ font-weight: 400; color: #000000; } - .user-edit-list-right{ - display: flex;justify-content: space-between;align-items: center; + .user-edit-list-right { + display: flex; + justify-content: space-between; + align-items: center; flex: auto; font-size: 26px; font-weight: 400; color: #000000; } - .user-edit-list-right>view{ + .user-edit-list-right > view { flex: 1; } - .user-edit-list-right-placeholder{ + .user-edit-list-right-placeholder { color: #cccccc; } - .user-edit-list-right .icon-a-moreback{ + .user-edit-list-right .icon-a-moreback { font-size: 30px; } - .user-edit-logout{ + .user-edit-logout { width: 668px; height: 82px; background: #ffffff; border: 2px solid #cde5ff; border-radius: 40px; // margin: 359px auto 0; - position: fixed;left: 50%;bottom: 50px; + position: fixed; + left: 50%; + bottom: 50px; transform: translateX(-50%); font-size: 32px; font-weight: 400; text-align: center; - color: #007aff; + color: $color_main; } -} \ No newline at end of file +} diff --git a/src/pages/userEdit/components/ModifyModal.scss b/src/pages/userEdit/components/ModifyModal.scss index fe370e9..1baab4b 100644 --- a/src/pages/userEdit/components/ModifyModal.scss +++ b/src/pages/userEdit/components/ModifyModal.scss @@ -1,76 +1,76 @@ - .modify-ickname-content { - margin: 0 auto; +.modify-ickname-content { + margin: 0 auto; + width: 658px; + padding-bottom: 50px; + + .modify-ickname-input { width: 658px; - padding-bottom: 50px; + height: 182px; + background: #f3f3f3; + border: 2px solid #e6e6e6; + border-radius: 10px; + padding: 15px; + box-sizing: border-box; + font-size: 22px; + font-weight: 400; + color: #ababab; + display: flex; + flex-direction: column; + align-items: flex-end; + } - .modify-ickname-input { - width: 658px; - height: 182px; - background: #f3f3f3; - border: 2px solid #e6e6e6; - border-radius: 10px; - padding: 15px; - box-sizing: border-box; - font-size: 22px; - font-weight: 400; - color: #ababab; - display: flex; - flex-direction: column; - align-items: flex-end; - } + .modify-ickname-input textarea { + width: 100%; + height: 80%; + font-size: 26px; + font-weight: 400; + color: #3c3c3c; + } - .modify-ickname-input textarea { - width: 100%; - height: 80%; - font-size: 26px; - font-weight: 400; - color: #3c3c3c; - } + .modify-ickname-tips { + font-size: 22px; + font-weight: 400; + color: #ababab; + margin-top: 30px; + } - .modify-ickname-tips { - font-size: 22px; - font-weight: 400; - color: #ababab; - margin-top: 30px; - } + .modify-ickname-operation { + width: 658px; + height: 82px; + background: #ffffff; + border: 2px solid #cde5ff; + border-radius: 40px; + display: flex; + overflow: hidden; + margin-top: 105px; + display: flex; + } - .modify-ickname-operation { - width: 658px; - height: 82px; - background: #ffffff; - border: 2px solid #cde5ff; - border-radius: 40px; - display: flex; - overflow: hidden; - margin-top: 105px; - display: flex; - } + .modify-ickname-operation button { + height: 100%; + width: 50%; + font-size: 32px; + font-weight: 400; + color: $color_main; + background-color: white; + border: none; + outline: none; + padding: 0; + border-radius: 0; + } - .modify-ickname-operation button { - height: 100%; - width: 50%; - font-size: 32px; - font-weight: 400; - color: #007aff; - background-color: white; - border: none; - outline: none; - padding: 0; - border-radius: 0; - } + .modify-ickname-operation button::after, + .user-edit-logout::after { + border-radius: 0; + border: none; + } - .modify-ickname-operation button::after, - .user-edit-logout::after { - border-radius: 0; - border: none; - } + .modify-ickname-operation .modify-ickname-operation-save { + background: $color_main; + color: #ffffff; + } - .modify-ickname-operation .modify-ickname-operation-save { - background: #007aff; - color: #ffffff; - } - - .modify-ickname-operation button::after { - border-radius: 0; - } - } \ No newline at end of file + .modify-ickname-operation button::after { + border-radius: 0; + } +} diff --git a/src/pages/userEdit/index.scss b/src/pages/userEdit/index.scss index a0f5a8c..5c135e9 100644 --- a/src/pages/userEdit/index.scss +++ b/src/pages/userEdit/index.scss @@ -202,6 +202,6 @@ font-size: 32px; font-weight: 400; text-align: center; - color: #007aff; + color: $color_main; } } diff --git a/src/pages/weightList/index.scss b/src/pages/weightList/index.scss index cc6af58..49092d2 100644 --- a/src/pages/weightList/index.scss +++ b/src/pages/weightList/index.scss @@ -1,45 +1,46 @@ -.weight-list-manager{ +.weight-list-manager { height: 100vh; - .weight-list-scroll-view{ + .weight-list-scroll-view { height: 100%; box-sizing: border-box; position: relative; - scroll-view{ + scroll-view { height: 100%; box-sizing: border-box; } - - .weight-list-list{ + + .weight-list-list { width: 704px; 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; } - .weight-list-list:first-child{ + .weight-list-list:first-child { margin-top: 0; } - .address-active{ + .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); } - .weight-list-list:last-child{ + .weight-list-list:last-child { margin-bottom: 300px; } - .weight-list-user{ + .weight-list-user { font-size: 28px; font-family: Microsoft YaHei, Microsoft YaHei-Bold; font-weight: 700; text-align: left; color: #000000; - display: flex;align-items: center; + display: flex; + align-items: center; } - .weight-list-list-default{ + .weight-list-list-default { width: 58px; height: 28px; background: #cde5ff; @@ -47,42 +48,46 @@ font-size: 20px; font-weight: 400; text-align: center; - color: #007aff; + color: $color_main; margin-left: 30px; - } - .weight-list-list-phone{ + .weight-list-list-phone { font-size: 24px; font-weight: 400; color: #ababab; margin-left: 30px; } - .weight-list-edit .icon-bianji{ + .weight-list-edit .icon-bianji { font-size: 40px; } - - .weight-list-list-info{ + + .weight-list-list-info { font-size: 24px; font-weight: 400; color: #3c3c3c; } - .weight-list-list-bottom{ - display: flex;justify-content: space-between; + .weight-list-list-bottom { + display: flex; + justify-content: space-between; margin-top: 18px; } - .add-weight-list{ + .add-weight-list { width: 668px; height: 82px; - background: #007aff; + background: $color_main; border-radius: 40px; font-size: 32px; font-weight: 400; color: #ffffff; - display: flex;align-items: center;justify-content: center; - position: absolute;bottom: 8%;left: 50%; + display: flex; + align-items: center; + justify-content: center; + position: absolute; + bottom: 8%; + left: 50%; transform: translateX(-50%); } - .weight-list-no-data{ + .weight-list-no-data { font-size: 24px; font-weight: 400; text-align: center; @@ -92,4 +97,4 @@ box-sizing: border-box; } } -} \ No newline at end of file +} diff --git a/src/pages/weightListAdd/index.scss b/src/pages/weightListAdd/index.scss index 3dbacf0..4fe5c03 100644 --- a/src/pages/weightListAdd/index.scss +++ b/src/pages/weightListAdd/index.scss @@ -1,8 +1,10 @@ -.add-address{ +.add-address { display: flex; flex-direction: column; - .add-address-default{ - display: flex;align-items: center;justify-content: space-between; + .add-address-default { + display: flex; + align-items: center; + justify-content: space-between; margin: 70px 30px 0; font-size: 26px; font-weight: 700; @@ -10,30 +12,33 @@ padding-right: 20px; box-sizing: border-box; } - .add-address-default-active{ + .add-address-default-active { width: 50px; height: 50px; - background: #007aff; + background: $color_main; border-radius: 50%; - display: flex;align-items: center; + display: flex; + align-items: center; justify-content: center; font-size: 45px; color: white; box-sizing: border-box; } - .add-address-default-active text{ + .add-address-default-active text { font-size: 35px; } - .add-address-default-noactive{ + .add-address-default-noactive { width: 50px; height: 50px; border: 2px solid #707070; border-radius: 50%; box-sizing: border-box; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; } - .add-address-save{ + .add-address-save { width: 668px; height: 82px; background: #68b4ff; @@ -41,7 +46,9 @@ font-size: 32px; font-weight: 400; color: #ffffff; - display: flex;align-items: center;justify-content: center; + display: flex; + align-items: center; + justify-content: center; margin: 620px auto 0; } -} \ No newline at end of file +}