🌈 style(【ID:1000663】):修改部分样式

src/components/AddressList/index.tsx

@@ -123,7 +123,6 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => {
                       <Text className="address-list-phone">{item.phone}</Text>
                       {
                         item.is_default && <Text className="address-list-default">默认</Text>
-
                       }
                     </View>
                     <View className="address-list-bottom">

src/components/BottomBtns/index.tsx

@@ -165,11 +165,11 @@ export default memo(forwardRef((props: prosObj, ref) => {
         <View className={style.flexBox}>
 
             {
-                (showTuihuo && showDetail && itemNums === 0) && <View className={style.nextBuy} onClick={() => handApplyGoods?.()}>申请退货</View>
+                (showTuihuo && showDetail && itemNums < 4) && <View className={style.nextBuy} onClick={() => handApplyGoods?.()}>申请退货</View>
             }
 
             {
-                (showTuikuan && showDetail && itemNums === 0) && <View className={style.nextBuy} onClick={() => handApplyMoney?.()}>申请退款</View>
+                (showTuikuan && showDetail && itemNums < 4) && <View className={style.nextBuy} onClick={() => handApplyMoney?.()}>申请退款</View>
 
             }
             {

src/components/address/index.module.scss

@@ -1,51 +1,76 @@
-.address_main{
+.address_main {
     width: 100%;
     box-sizing: border-box;
-    .address_title{
+    position: relative;
+
+    .sure {
+        font-size: 28px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #337FFF;
+        position: absolute;
+        top: 35px;
+        right: 40px;
+    }
+
+    .address_title {
         display: flex;
         justify-content: space-between;
         font-size: $font_size;
         padding: 20px;
         padding-bottom: 0;
     }
-    .address_select{
+
+    .address_select {
         display: flex;
         padding: 30px 0;
         margin-top: 10px;
         font-size: $font_size_medium;
         border-bottom: 1px solid #eaeaea;
-        color: $color_font_two;
+        color: #337fff;
         position: relative;
-        .address_item{
+
+        .address_item {
             padding: 0 20px;
             max-width: 200px;
             @include common_ellipsis()
         }
-        .bottom_index{
+
-            width: 100px;
+        .bottom_index {
-            height: 2px;
+            width: 88px;
-            border-radius: 50px;
+            height: 6px;
-            background-color:$color_main;
+            background: #337FFF;
+            border-radius: 3px;
+            // width: 100px;
+            // height: 2px;
+            // border-radius: 50px;
+            // background-color: $color_main;
             position: absolute;
             bottom: 0;
             left: 0;
             transition: left 0.1s;
         }
     }
-    .address_scroll{
+
+    .address_scroll {
         height: 600px;
-        .address_scroll_list{
+
+        .address_scroll_list {
             padding: 0 20px;
             font-size: $font_size;
-            .address_list_item{
+
+            .address_list_item {
                 padding: 20px 0;
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
-                .address_list_item_name{
+                border-bottom: 1px solid #f5f5f5;
+
+                .address_list_item_name {
                     @include common_ellipsis()
                 }
-                .address_iconfont{
+
+                .address_iconfont {
                     font-size: 30px !important;
                     color: $color_main;
                 }
@@ -53,7 +78,8 @@
         }
 
     }
-    .addresst_select{
+
-        color:$color_font_one;
+    .addresst_select {
+        color: #337fff;
     }
 }

src/components/address/index.tsx

@@ -187,10 +187,11 @@ export default memo(({
         <>
             <Drawer showTitle={false} show={show} onClose={submitSelect}>
                 <View className={styles.address_main}>
-                    <View className={styles.address_title}>
+                    {/* <View className={styles.address_title}>
                         <View onClick={() => addressOnClose?.()}>取消</View>
                         <View onClick={() => submitSelect()}>确定</View>
-                    </View>
+                    </View> */}
+                    <View className={styles.sure} onClick={() => submitSelect()}>确定</View>
                     <View className={styles.address_select}>
                         <View id="address_tab_0" onClick={() => selectTab(0)} className={classnames(styles.address_item, { [styles.addresst_select]: (selectIndex == 0) })}>{selectArr[0] ? selectArr[0].name : '请选择'}</View>
                         {cityStatus && <View id="address_tab_1" onClick={() => selectTab(1)} className={classnames(styles.address_item, { [styles.addresst_select]: (selectIndex == 1) })}>{selectArr[1] ? selectArr[1].name : '请选择'}</View>}
@@ -207,6 +208,10 @@ export default memo(({
                                             {(selectArr[selectIndex]?.id == item.id) &&
                                                 <IconFont name={'icon-lujing'} color={'#327fff'} size={30}></IconFont>
                                             }
+                                            {
+                                                (selectArr[selectIndex]?.id !== item.id) &&
+                                                <IconFont name={'icon-chakanquanbukehu'} color={'#d8d8d8'} size={30}></IconFont>
+                                            }
                                         </View>
                                     )
                                 })}

src/components/uploadImage/index.module.scss

@@ -53,7 +53,7 @@
         .miconfont_close {
             width: 43px;
             height: 43px;
-            background-color: #ccc;
+            background-color: #7f7f7f;
             border-radius: 50%;
             position: absolute;
             right: -10px;

src/pages/addAddress/index.module.scss

@@ -25,6 +25,12 @@
             // margin-right: 50px;
         }
 
+        .placeholderStyle {
+            color: #f7f7f7;
+            font-size: 28px;
+            font-weight: 400;
+        }
+
         .inputClass {
             font-size: 28px;
             font-family: PingFangSC-Regular, PingFang SC;
@@ -57,6 +63,12 @@
         // padding-right: 25px;
     }
 
+    .placeholderStyle {
+        color: #f7f7f7;
+        font-size: 28px;
+        font-weight: 400;
+    }
+
     .inputClass {
         font-size: 28px;
         font-family: PingFangSC-Regular, PingFang SC;

src/pages/addAddress/index.tsx

@@ -8,6 +8,7 @@ import styles from "./index.module.scss"
 import classnames from "classnames";
 import { mppurchaseraddress, mppurchaseraddressget, mppurchaseraddressput, mppurchaseraddressdelect } from '@/api/addressList'
 import { getFilterData } from '@/common/util'
+import IconFont from '@/components/iconfont/iconfont'
 export default () => {
 
     const [itemList, setItemList] = useState<any[]>(
@@ -286,6 +287,7 @@ export default () => {
                                 }
                             </View>
                             <Input
+                                placeholderStyle={styles.placeholderStyle}
                                 maxlength={item.maxLength ? 11 : 100}
                                 onInput={(e) => changeInput(e, item)}
                                 type={item.type}
@@ -295,8 +297,10 @@ export default () => {
                                 placeholder={item.placeholderFont}
                                 value={item.value}
                                 className={styles.inputClass}
-                                placeholderStyle='font-size: 28rpx;color: #000000;'
                             ></Input>
+                            {
+                                item.type === 'select' && <IconFont name={'icon-chakanquanbukehu'} color={'#000000'} size={40}></IconFont>
+                            }
                         </View>
                     )
                 })}

src/pages/addCollection/components/form/index.module.scss

@@ -3,8 +3,8 @@
     border-bottom: 1px solid #f7f7f7;
     display: flex;
     // align-items: center;
-    padding-top: 40px;
+    padding-top: 30px;
-    padding-bottom: 40px;
+    padding-bottom: 30px;
 
     .itemLeft {
 
@@ -83,13 +83,6 @@
                 font-size: 50px !important;
             }
 
-            .shu {
-                width: 2px;
-                height: 36px;
-                background: #000000;
-                opacity: 0.2;
-                margin-left: 24px;
-            }
 
             .saomiao {
                 margin-left: 24px;
@@ -99,4 +92,13 @@
         }
 
     }
+
+    .shu {
+        width: 2px;
+        height: 36px;
+        background: #000000;
+        opacity: 0.2;
+        margin-left: 24px;
+        margin-right: 24px;
+    }
 }

src/pages/addCollection/components/form/index.tsx

@@ -40,7 +40,6 @@ export default memo((pros: Params) => {
                 pros.isOpen && <View className={styles.itemBox}
                     style={{ justifyContent: `${pros.styleNone ? 'space-between' : ''}`, alignItems: `${pros.styleNone ? 'center' : ''}` }}>
                     <View className={styles.itemLeft}
-
                     >
                         <View className={styles.finkFlex}>
                             <View className={styles.itemTitle}>{pros.title}</View>

src/pages/addCollection/index.module.scss

@@ -37,7 +37,7 @@
         display: flex;
         font-size: 28px;
         font-weight: 400;
-        color: #000000;
+        color: grey;
 
     }
 
@@ -67,6 +67,7 @@
         color: #337FFF;
         text-align: center;
         line-height: 80px;
+        background-color: #fff;
     }
 
     .button {

src/pages/applyGoods/index.module.scss

@@ -395,6 +395,7 @@
         color: #337FFF;
         text-align: center;
         line-height: 80px;
+        background-color: #fff;
     }
 
     .button {
@@ -538,6 +539,7 @@
             color: #337FFF;
             text-align: center;
             line-height: 80px;
+            background-color: #fff;
         }
 
         .button1 {

src/pages/applyMoney/index.module.scss

@@ -376,6 +376,7 @@
         color: #337FFF;
         text-align: center;
         line-height: 80px;
+        background-color: #fff;
     }
 
     .button {
@@ -519,6 +520,7 @@
             color: #337FFF;
             text-align: center;
             line-height: 80px;
+            background-color: #fff;
         }
 
         .button1 {

src/pages/collectionDetail/components/form/index.module.scss

@@ -3,8 +3,8 @@
     border-bottom: 1px solid #f7f7f7;
     display: flex;
     // align-items: center;
-    padding-top: 40px;
+    padding-top: 30px;
-    padding-bottom: 40px;
+    padding-bottom: 30px;
 
     .itemLeft {
 

src/pages/customerDetails/components/tabs/index.module.scss

@@ -19,14 +19,14 @@
         .itemFont {
             font-size: 28px;
             font-family: Microsoft YaHei, Microsoft YaHei-Bold;
-            font-weight: 700;
+            font-weight: 400;
             color: #000000;
         }
 
         .activeItems {
             font-size: 28px;
             font-family: Microsoft YaHei, Microsoft YaHei-Regular;
-            font-weight: 400;
+            font-weight: 700;
             color: #337FFF;
         }
 

src/pages/customerDetails/components/tagPopup/index.module.scss

@@ -83,6 +83,7 @@
         color: #337FFF;
         text-align: center;
         line-height: 80px;
+        background-color: #fff;
     }
 
     .button {

src/pages/customerDetails/index.module.scss

@@ -100,7 +100,7 @@
 
         .pos {
             position: absolute;
-            top: 25px;
+            top: 35px;
             right: 24px;
             font-size: 28px;
             font-weight: 400;

src/pages/customerEditor/components/Form/index.module.scss

@@ -2,7 +2,7 @@
     margin-bottom: 40px;
     display: flex;
     align-items: center;
-    padding-bottom: 40px;
+    padding-bottom: 20px;
     border-bottom: 1px solid #e8e8e8;
 
     .leftItem {

src/pages/customerEditor/index.module.scss

@@ -2,6 +2,7 @@
     margin: 24px;
     background: #fff;
     padding: 40px 32px 40px 32px;
+    border-radius: 16px;
 
     .flexBox {
         display: flex;
@@ -116,6 +117,7 @@
         color: #337FFF;
         text-align: center;
         line-height: 80px;
+        background-color: #fff;
     }
 
     .button2 {

src/pages/customerManagement/components/ChoseCity/index.tsx

@@ -106,6 +106,8 @@ export default memo(forwardRef((props: Props, ref) => {
             })
             setcityList([...res.data.list])
         }
+        let provinceArr = list.filter(next => { return next.check })
+        props.handCity?.(provinceArr, choseCityArr.current.list)
     }
 
 

src/pages/customerManagement/components/ItemList/index.tsx

@@ -27,7 +27,7 @@ export default memo((props: Props) => {
     }
 
     const time = useMemo(() => {
-        if (props?.sortId == '') {
+        if (props?.sortId == '' || !props?.sortId) {
             return props?.obj?.recent_order_time
         }
         if (props?.sortId == 1 || props?.sortId == -1) {
@@ -41,6 +41,21 @@ export default memo((props: Props) => {
         }
     }, [props?.sortId])
 
+    const timeFont = useMemo(() => {
+        if (props?.sortId == '' || !props?.sortId) {
+            return '下单时间'
+        }
+        if (props?.sortId == 1 || props?.sortId == -1) {
+            return '下单时间'
+        }
+        if (props?.sortId == 2 || props?.sortId == -2) {
+            return '创建时间'
+        }
+        if (props?.sortId == 3 || props?.sortId == -3) {
+            return '更新时间'
+        }
+    }, [props?.sortId])
+
     return (
         <View className={styles.mainItem} onClick={() => handNav()}>
             <View className={styles.itemTop}>
@@ -75,7 +90,7 @@ export default memo((props: Props) => {
             <View className={styles.line}></View>
             <View className={styles.flex_bottom}>
                 <View className={styles.flex_left}>{props.obj.default_address.province_name + props.obj.default_address.city_name + props.obj.default_address.district_name || '暂无'}</View>
-                <View className={styles.flex_right}>更新时间：{formatDateTime(time) || '暂无'}</View>
+                <View className={styles.flex_right}>{timeFont}：{formatDateTime(time) || '暂无'}</View>
             </View>
         </View >
     )

src/pages/customerManagement/components/Sort/index.tsx

@@ -11,6 +11,12 @@ interface Props {
     value?: any
 }
 
+type ListType = {
+    name: string,
+    id: string,
+    checked: boolean
+}
+
 export default memo(forwardRef((props: Props, ref) => {
 
     const DropDownItemRef = useRef<any>()
@@ -22,7 +28,7 @@ export default memo(forwardRef((props: Props, ref) => {
     }))
 
 
-    const [list, setlist] = useState<any[]>([
+    const [list, setlist] = useState<ListType[]>([
         {
             name: '下单时间正序',
             id: '1',

src/pages/customerManagement/index.tsx

@@ -22,7 +22,7 @@ export default () => {
         {
             page: number;
             size: number;
-            label_ids: any[] | '',
+            label_ids: string,
             purchaser_type: number | string,
             name_phone_or_sale_user: string,
             province_id: any[] | string,
@@ -108,9 +108,11 @@ export default () => {
         cityVal.length && cityVal.forEach(item => {
             cityArr.push(item.id)
         })
-        console.log(provinceArr, cityArr)
         pageNum.current.page = 1
-        setSearchField((val) => ({ ...val, province_id: provinceArr.length > 0 ? provinceArr : '', city_id: cityArr.length > 0 ? cityArr : '', size: 10 }))
+        let provinceRes = provinceArr?.toString()
+        let cityRes = cityArr?.toString()
+        console.log(provinceRes, cityRes)
+        setSearchField((val) => ({ ...val, province_id: provinceArr.length > 0 ? provinceRes : '', city_id: cityArr.length > 0 ? cityRes : '', size: 10 }))
         // ChoseCityRef.current.close()
     }, [])
 
@@ -123,13 +125,14 @@ export default () => {
 
     //选择标签
     const handTags = useCallback((val) => {
-        const arr: number[] = []
+        const arr: any[] = []
         const arrOne = val.filter(item => { return item.checked })
         arrOne.forEach(item => {
             arr.push(item.id)
         })
         pageNum.current.page = 1
-        setSearchField((val) => ({ ...val, size: 10, label_ids: arr.length === 0 ? '' : arr }))
+        let res = arr.toString()
+        setSearchField((val) => ({ ...val, size: 10, label_ids: arr.length === 0 ? '' : res }))
     }, [])
 
 

src/pages/newCollection/index.module.scss

@@ -73,7 +73,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 20px;
+    // margin-bottom: 10px;
 
     .pageTopLeft {
         font-size: 24px;
@@ -203,6 +203,7 @@
             color: #337FFF;
             text-align: center;
             line-height: 80px;
+            background-color: #fff;
         }
 
         .button {

src/pages/order/index.module.scss

@@ -215,6 +215,7 @@
             color: #337FFF;
             text-align: center;
             line-height: 80px;
+            background-color: #fff;
         }
 
         .button {

src/pages/orderDetails/index.tsx

@@ -600,7 +600,7 @@ export default () => {
     const [showOther, setshowOther] = useState(false)
     useMemo(() => {
         Taro.nextTick(() => {
-            if (BottomBtnsRef.current?.itemNums >= 3) {
+            if (BottomBtnsRef.current?.itemNums >= 4) {
                 setshowOther(true)
                 return true
             } else {

src/pages/refundPage/index.module.scss

@@ -162,6 +162,7 @@
             color: #337FFF;
             text-align: center;
             line-height: 80px;
+            background-color: #fff;
         }
 
         .button2 {