diff --git a/src/pages/index/index.module.scss b/src/pages/index/index.module.scss index 3fa31cb..995b859 100644 --- a/src/pages/index/index.module.scss +++ b/src/pages/index/index.module.scss @@ -1,39 +1,39 @@ .main { - background-color: $color_bg_one; - // height: 100vh; + background-color: $color_bg_one; + // height: 100vh; + display: flex; + flex-direction: column; + + .search { + width: 100%; display: flex; - flex-direction: column; + justify-content: space-between; + padding: 20px; + box-sizing: border-box; + align-items: center; + background-color: #fff; - .search { - width: 100%; - display: flex; - justify-content: space-between; - padding: 20px; - box-sizing: border-box; - align-items: center; - - .search_collect { - font-size: 26px; - border: 2px solid #007AFF; - color: #007AFF; - border-radius: 50px; - width: 132px; - height: 44px; - text-align: center; - line-height: 44px; - } - - .search_input { - flex: 1; - margin-left: 20px; - } + .search_collect { + font-size: 26px; + border: 2px solid #007aff; + color: #007aff; + border-radius: 50px; + width: 132px; + height: 44px; + text-align: center; + line-height: 44px; } - .products { - padding-bottom: calc($customTabBarHeight + env(safe-area-inset-bottom)); - height: calc(100vh - $customTabBarHeight - env(safe-area-inset-bottom) - 100px); + .search_input { + flex: 1; + margin-left: 20px; } + } + .products { + padding-bottom: calc($customTabBarHeight + env(safe-area-inset-bottom)); + height: calc(100vh - $customTabBarHeight - env(safe-area-inset-bottom) - 100px); + } } //246 diff --git a/src/pages/refundPage/index.module.scss b/src/pages/refundPage/index.module.scss index 72e7d50..fc0916d 100644 --- a/src/pages/refundPage/index.module.scss +++ b/src/pages/refundPage/index.module.scss @@ -30,7 +30,7 @@ page { margin-right: 32px; font-size: 28px; font-weight: 400; - color: #000000; + color: #000; } .activeshai { @@ -50,7 +50,7 @@ page { } .scrllStyle { - height: 500px; + flex: 1 1 auto; } .safeBox { @@ -58,7 +58,9 @@ page { } .popupBox { - padding-bottom: env(safe-area-inset-bottom); + display: flex; + flex-flow: column nowrap; + height: 75vh; width: 100%; .thirdBox { @@ -72,8 +74,10 @@ page { } .timeBox2 { + display: flex; + justify-content: center; + align-items: center; margin-top: 24px; - background-color: #f6f6f6; height: 68px; background: #e9e9e9; border-radius: 8px; @@ -82,15 +86,7 @@ page { line-height: 68px; position: relative; font-size: 28px; - font-weight: 400; - color: #000000; - - .more { - position: absolute; - right: 30px; - top: 5px; - font-size: 40px; - } + color: #848484; } .flexModebox { @@ -98,39 +94,19 @@ page { display: flex; flex-wrap: wrap; - .activemodeBox { - margin-bottom: 16px; - margin-right: 16px; - // width: 152px; - // height: 68px; - padding: 17px 34px 17px 34px; - background: rgba(51, 127, 255, 0.1); - border-radius: 8px; - font-size: 28px; - font-weight: 400; - color: #337fff; - text-align: center; - // line-height: 68px; - border: 1px solid #337fff; - box-sizing: border-box; - } - .modeBox { margin-bottom: 16px; margin-right: 16px; + min-width: 152px; padding: 17px 34px 17px 34px; - // width: 152px; - // height: 68px; + color: #848484; background: #f6f6f6; border-radius: 8px; font-size: 28px; font-weight: 400; - color: #000000; border: 1px solid #f6f6f6; text-align: center; - // line-height: 68px; box-sizing: border-box; - // opacity: 0.4; } } } @@ -140,9 +116,6 @@ page { // width: 750px; height: 160px; background: #ffffff; - position: fixed; - bottom: 0; - z-index: 99; display: flex; padding-top: 16px; align-items: center; @@ -194,3 +167,9 @@ page { // width: 100%; // } } +.activemodeBox { + background: rgba(51, 127, 255, 0.1) !important; + color: #337fff !important; + font-weight: 550 !important; + border: 1px solid #337fff !important; +} diff --git a/src/pages/refundPage/index.tsx b/src/pages/refundPage/index.tsx index 9793790..c195506 100644 --- a/src/pages/refundPage/index.tsx +++ b/src/pages/refundPage/index.tsx @@ -269,6 +269,7 @@ const RefundPage = () => { setStart(myDate.toLocaleDateString()) getOrderList() setEnd('') + closePopup() } const handSure = () => { pageNum.current.page = 1 @@ -307,7 +308,6 @@ const RefundPage = () => { showSelctPopup()}> - {/* */} 筛选 @@ -334,7 +334,7 @@ const RefundPage = () => { })} - closePopup()}> + @@ -343,7 +343,7 @@ const RefundPage = () => { { stageList.map((item, index) => { return ( - { handCheckStange(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name} + { handCheckStange(item) }} className={classnames(styles.modeBox, item.checked && styles.activemodeBox)} key={index}>{item.name} ) }) } @@ -355,7 +355,7 @@ const RefundPage = () => { { modeList.map((item, index) => { return ( - { handCheckMode(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name} + { handCheckMode(item) }} className={classnames(styles.modeBox, item.checked && styles.activemodeBox)} key={index}>{item.name} ) }) } @@ -367,7 +367,7 @@ const RefundPage = () => { { typeList.map((item, index) => { return ( - { handType(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name} + { handType(item) }} className={classnames(styles.modeBox, item.checked && styles.activemodeBox)} key={index}>{item.name} ) }) } @@ -375,23 +375,19 @@ const RefundPage = () => { 售后时间 - { setShowTime(true) }}>{timeArea} + { setShowTime(true) }}>{timeArea} { - timeArea == '自定义起始时间' - && + timeArea == '自定义起始时间' && } - - - {/* */}