diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx
index ec68f66..ab26169 100644
--- a/src/components/AddressList/index.tsx
+++ b/src/components/AddressList/index.tsx
@@ -123,7 +123,6 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => {
{item.phone}
{
item.is_default && 默认
-
}
diff --git a/src/components/BottomBtns/index.tsx b/src/components/BottomBtns/index.tsx
index ce28384..81a6091 100644
--- a/src/components/BottomBtns/index.tsx
+++ b/src/components/BottomBtns/index.tsx
@@ -165,11 +165,11 @@ export default memo(forwardRef((props: prosObj, ref) => {
{
- (showTuihuo && showDetail && itemNums === 0) && handApplyGoods?.()}>申请退货
+ (showTuihuo && showDetail && itemNums < 4) && handApplyGoods?.()}>申请退货
}
{
- (showTuikuan && showDetail && itemNums === 0) && handApplyMoney?.()}>申请退款
+ (showTuikuan && showDetail && itemNums < 4) && handApplyMoney?.()}>申请退款
}
{
diff --git a/src/components/address/index.module.scss b/src/components/address/index.module.scss
index 854206d..ca700c7 100644
--- a/src/components/address/index.module.scss
+++ b/src/components/address/index.module.scss
@@ -1,59 +1,85 @@
-.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;
- height: 2px;
- border-radius: 50px;
- background-color:$color_main;
+
+ .bottom_index {
+ width: 88px;
+ height: 6px;
+ 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;
}
}
}
-
+
}
- .addresst_select{
- color:$color_font_one;
+
+ .addresst_select {
+ color: #337fff;
}
-}
+}
\ No newline at end of file
diff --git a/src/components/address/index.tsx b/src/components/address/index.tsx
index b304084..eebab03 100644
--- a/src/components/address/index.tsx
+++ b/src/components/address/index.tsx
@@ -187,10 +187,11 @@ export default memo(({
<>
-
+ {/*
addressOnClose?.()}>取消
submitSelect()}>确定
-
+ */}
+ submitSelect()}>确定
selectTab(0)} className={classnames(styles.address_item, { [styles.addresst_select]: (selectIndex == 0) })}>{selectArr[0] ? selectArr[0].name : '请选择'}
{cityStatus && selectTab(1)} className={classnames(styles.address_item, { [styles.addresst_select]: (selectIndex == 1) })}>{selectArr[1] ? selectArr[1].name : '请选择'}}
@@ -207,6 +208,10 @@ export default memo(({
{(selectArr[selectIndex]?.id == item.id) &&
}
+ {
+ (selectArr[selectIndex]?.id !== item.id) &&
+
+ }
)
})}
diff --git a/src/components/uploadImage/index.module.scss b/src/components/uploadImage/index.module.scss
index 3eaf064..ceffb46 100644
--- a/src/components/uploadImage/index.module.scss
+++ b/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;
diff --git a/src/pages/addAddress/index.module.scss b/src/pages/addAddress/index.module.scss
index ba95d08..e8ee99d 100644
--- a/src/pages/addAddress/index.module.scss
+++ b/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;
diff --git a/src/pages/addAddress/index.tsx b/src/pages/addAddress/index.tsx
index 66a339e..8f211ee 100644
--- a/src/pages/addAddress/index.tsx
+++ b/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(
@@ -286,6 +287,7 @@ export default () => {
}
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;'
>
+ {
+ item.type === 'select' &&
+ }
)
})}
diff --git a/src/pages/addCollection/components/form/index.module.scss b/src/pages/addCollection/components/form/index.module.scss
index a3f9148..1f280e6 100644
--- a/src/pages/addCollection/components/form/index.module.scss
+++ b/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-bottom: 40px;
+ padding-top: 30px;
+ 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;
+ }
}
\ No newline at end of file
diff --git a/src/pages/addCollection/components/form/index.tsx b/src/pages/addCollection/components/form/index.tsx
index 792f9f7..b3232f4 100644
--- a/src/pages/addCollection/components/form/index.tsx
+++ b/src/pages/addCollection/components/form/index.tsx
@@ -40,7 +40,6 @@ export default memo((pros: Params) => {
pros.isOpen &&
{pros.title}
diff --git a/src/pages/addCollection/index.module.scss b/src/pages/addCollection/index.module.scss
index 6dffd07..56713f1 100644
--- a/src/pages/addCollection/index.module.scss
+++ b/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 {
diff --git a/src/pages/applyGoods/index.module.scss b/src/pages/applyGoods/index.module.scss
index 5d11299..25d3bc1 100644
--- a/src/pages/applyGoods/index.module.scss
+++ b/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 {
diff --git a/src/pages/applyMoney/index.module.scss b/src/pages/applyMoney/index.module.scss
index 890f58b..92a2ab1 100644
--- a/src/pages/applyMoney/index.module.scss
+++ b/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 {
diff --git a/src/pages/collectionDetail/components/form/index.module.scss b/src/pages/collectionDetail/components/form/index.module.scss
index 8d81edb..778a99c 100644
--- a/src/pages/collectionDetail/components/form/index.module.scss
+++ b/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-bottom: 40px;
+ padding-top: 30px;
+ padding-bottom: 30px;
.itemLeft {
diff --git a/src/pages/customerDetails/components/tabs/index.module.scss b/src/pages/customerDetails/components/tabs/index.module.scss
index fa9ec85..aeaad92 100644
--- a/src/pages/customerDetails/components/tabs/index.module.scss
+++ b/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;
}
diff --git a/src/pages/customerDetails/components/tagPopup/index.module.scss b/src/pages/customerDetails/components/tagPopup/index.module.scss
index 991e675..a063ddf 100644
--- a/src/pages/customerDetails/components/tagPopup/index.module.scss
+++ b/src/pages/customerDetails/components/tagPopup/index.module.scss
@@ -83,6 +83,7 @@
color: #337FFF;
text-align: center;
line-height: 80px;
+ background-color: #fff;
}
.button {
diff --git a/src/pages/customerDetails/index.module.scss b/src/pages/customerDetails/index.module.scss
index 71f89c5..c9f544c 100644
--- a/src/pages/customerDetails/index.module.scss
+++ b/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;
diff --git a/src/pages/customerEditor/components/Form/index.module.scss b/src/pages/customerEditor/components/Form/index.module.scss
index bbfb183..32846ef 100644
--- a/src/pages/customerEditor/components/Form/index.module.scss
+++ b/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 {
diff --git a/src/pages/customerEditor/index.module.scss b/src/pages/customerEditor/index.module.scss
index cddd5ba..6cdb7d1 100644
--- a/src/pages/customerEditor/index.module.scss
+++ b/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 {
diff --git a/src/pages/customerManagement/components/ChoseCity/index.tsx b/src/pages/customerManagement/components/ChoseCity/index.tsx
index 82aa835..2bc5b06 100644
--- a/src/pages/customerManagement/components/ChoseCity/index.tsx
+++ b/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)
}
diff --git a/src/pages/customerManagement/components/ItemList/index.tsx b/src/pages/customerManagement/components/ItemList/index.tsx
index abd7ce9..9b8151b 100644
--- a/src/pages/customerManagement/components/ItemList/index.tsx
+++ b/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 (
handNav()}>
@@ -75,7 +90,7 @@ export default memo((props: Props) => {
{props.obj.default_address.province_name + props.obj.default_address.city_name + props.obj.default_address.district_name || '暂无'}
- 更新时间：{formatDateTime(time) || '暂无'}
+ {timeFont}：{formatDateTime(time) || '暂无'}
)
diff --git a/src/pages/customerManagement/components/Sort/index.tsx b/src/pages/customerManagement/components/Sort/index.tsx
index 65e3916..e5d3730 100644
--- a/src/pages/customerManagement/components/Sort/index.tsx
+++ b/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()
@@ -22,7 +28,7 @@ export default memo(forwardRef((props: Props, ref) => {
}))
- const [list, setlist] = useState([
+ const [list, setlist] = useState([
{
name: '下单时间正序',
id: '1',
diff --git a/src/pages/customerManagement/index.tsx b/src/pages/customerManagement/index.tsx
index 5db1f57..2c7b595 100644
--- a/src/pages/customerManagement/index.tsx
+++ b/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 }))
}, [])
diff --git a/src/pages/newCollection/index.module.scss b/src/pages/newCollection/index.module.scss
index 4225669..c72c65b 100644
--- a/src/pages/newCollection/index.module.scss
+++ b/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 {
diff --git a/src/pages/order/index.module.scss b/src/pages/order/index.module.scss
index ae2a12b..94a9793 100644
--- a/src/pages/order/index.module.scss
+++ b/src/pages/order/index.module.scss
@@ -215,6 +215,7 @@
color: #337FFF;
text-align: center;
line-height: 80px;
+ background-color: #fff;
}
.button {
diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx
index 05ebbcf..214c57d 100644
--- a/src/pages/orderDetails/index.tsx
+++ b/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 {
diff --git a/src/pages/refundPage/index.module.scss b/src/pages/refundPage/index.module.scss
index 39ffbd3..869d693 100644
--- a/src/pages/refundPage/index.module.scss
+++ b/src/pages/refundPage/index.module.scss
@@ -162,6 +162,7 @@
color: #337FFF;
text-align: center;
line-height: 80px;
+ background-color: #fff;
}
.button2 {