xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Haiyi
2022-11-09 16:28:07 +08:00
parent 41467256b0
commit 6ed3f7456b
26 changed files with 137 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/addAddress/index.module.scss
+12
View File
@@ -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
+5 -1
View File
@@ -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
+11 -9
View File
@@ -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;
}
}
src/pages/addCollection/components/form/index.tsx
-1
View File
@@ -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
+2 -1
View File
@@ -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
+2
View File
@@ -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
+2
View File
@@ -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
+2 -2
View File
@@ -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 {
src/pages/customerDetails/components/tabs/index.module.scss
+2 -2
View File
@@ -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
+1
View File
@@ -83,6 +83,7 @@
color: #337FFF;
text-align: center;
line-height: 80px;
background-color: #fff;
}
.button {
src/pages/customerDetails/index.module.scss
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
View File
@@ -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
+2
View File
@@ -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
+17 -2
View File
@@ -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
+7 -1
View File
@@ -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
+8 -5
View File
@@ -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
+2 -1
View File
@@ -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
+1
View File
@@ -215,6 +215,7 @@
color: #337FFF;
text-align: center;
line-height: 80px;
background-color: #fff;
}
.button {
src/pages/orderDetails/index.tsx
+1 -1
View File
@@ -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
+1
View File
@@ -162,6 +162,7 @@
color: #337FFF;
text-align: center;
line-height: 80px;
background-color: #fff;
}
.button2 {