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

🐞 fix(修复ui):

Browse Source
This commit is contained in:
czm 2023-03-02 14:36:38 +08:00
parent f659bfb591
commit 990b8a4f1d
15 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/counter/index.module.scss
View File

@ -32,9 +32,9 @@
border-radius: 10px;
input {
font-size: $font_size_medium;
// text-align: right;
text-align: center;
width: 100%;
padding-right: 10px;
// padding-right: 10px;
}
}

3
src/components/selectList/index.module.scss
View File

@ -2,7 +2,7 @@
display: flex;
background-color: #fff;
font-size: 32px;
font-weight: 500;
color: #000000cc;
.select_list_item {
height: 96px;
text-align: center;
@ -18,6 +18,7 @@
.select_list_ed {
text {
border-bottom: 6px solid #337fff;
font-weight: 500;
}
color: #4581ff;
}

2
src/pages/colorCardClipping/components/cutProductItem/index.module.scss
View File

@ -82,6 +82,7 @@
font-size: 28px;
text-align: right;
margin-top: 16px;
font-weight: 700;
}
.btns {
padding-top: 32px;
@ -95,6 +96,7 @@
border: 1px solid rgba(0, 0, 0, 0.06);
text-align: center;
line-height: 72px;
font-size: 28px;
}
}
}

2
src/pages/colorCardClipping/components/productItem/index.module.scss
View File

@ -83,6 +83,7 @@
font-size: 28px;
text-align: right;
margin-top: 16px;
font-weight: 700;
}
.btns {
padding-top: 32px;
@ -96,6 +97,7 @@
border: 1px solid rgba(0, 0, 0, 0.06);
text-align: center;
line-height: 72px;
font-size: 28px;
}
}
}

6
src/pages/colorCardOrder/components/remark/index.module.scss
View File

@ -12,6 +12,9 @@
justify-content: space-between;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
text {
&:nth-child(1) {
font-weight: 700;
}
&:nth-child(2) {
color: rgba(0, 0, 0, 0.8);
}
@ -25,5 +28,8 @@
height: 82px;
line-height: 82px;
color: rgba(0, 0, 0, 0.4);
.seleced {
color: rgba(0, 0, 0, 0.8);
}
}
}

3
src/pages/colorCardOrder/components/remark/index.tsx
View File

@ -1,5 +1,6 @@
import { Text, View } from '@tarojs/components'
import { useEffect, useState } from 'react'
import classNames from 'classnames'
import styles from './index.module.scss'
import Remark from '@/components/remark'
import IconFont from '@/components/iconfont/iconfont'
@ -26,7 +27,7 @@ export default (props: Param) => {
<View className={styles.more}>填写/修改备注 <IconFont color="#000000FF" name="icon-rukou" size={30} /></View>
</View>
<View className={styles.remarks_message}>
<Text>{data || '尚未备注信息'}</Text>
<Text className={classNames(data ? styles.seleced : '')}>{data || '尚未备注信息'}</Text>
</View>
</View>
<Remark show={showRemark} onSave={getOnSave} onClose={() => setShowRemark(false)} />

1
src/pages/colorCardOrderDetail/components/orderInfo/index.module.scss
View File

@ -10,6 +10,7 @@
font-size: 28px;
color: rgba(0, 0, 0, 0.8);
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
font-weight: 700;
}
.order_info_list {
font-size: 28px;

3
src/pages/colorCardOrderDetail/components/remark/index.module.scss
View File

@ -11,6 +11,9 @@
justify-content: space-between;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
text {
&:nth-child(1) {
font-weight: 700;
}
&:nth-child(2) {
color: rgba(0, 0, 0, 0.8);
}

10
src/pages/cutSampleListOrder/components/productCard/index.tsx
View File

@ -1,6 +1,7 @@
import { Text, View } from '@tarojs/components'
import Taro, { getCurrentPages, useDidShow } from '@tarojs/taro'
import { memo, useCallback, useEffect, useState } from 'react'
import classNames from 'classnames'
import styles from './index.module.scss'
import Counter from '@/components/counter'
import LabAndImg from '@/components/LabAndImg'
@ -36,14 +37,15 @@ export interface Param {
value: ColorItem
onChangeNum?: (val: { id: number; count: number }) => void
onDelData?: (val: number) => void
bottomStatus?: boolean
}
export default memo((props: Param) => {
return <ProductItem onChangeNum={props.onChangeNum} onDelData={props.onDelData} value={props.value} />
return <ProductItem onChangeNum={props.onChangeNum} onDelData={props.onDelData} value={props.value} bottomStatus={props.bottomStatus} />
})
const ProductItem = memo((props: Param) => {
const { value } = props
const { value, bottomStatus = true } = props
const labAndImgObj = useCallback(
(item) => {
return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
@ -72,7 +74,7 @@ const ProductItem = memo((props: Param) => {
return <>
<View key={value.id} className={styles.card_item}>
<View className={styles.img}><LabAndImg value={labAndImgObj(props.value)} /></View>
<View className={styles.name_count}>
<View className={classNames(styles.name_count, bottomStatus && styles.bottom_styles)}>
<Text>{formatHashTag(value.code, value.name)}</Text>
<View className={styles.btns}>
<View className={styles.count_btn}>
@ -82,7 +84,7 @@ const ProductItem = memo((props: Param) => {
defaultNum={value.count}
onClickBtn={onChangeNum}
onBlue={onChangeNum}
unit="件"
unit="份"
onMin={onMin}
onMax={onMax}
/>

3
src/pages/cutSampleListOrder/components/remark/index.module.scss
View File

@ -12,6 +12,9 @@
justify-content: space-between;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
text {
&:nth-child(1) {
font-weight: 700;
}
&:nth-child(2) {
color: rgba(0, 0, 0, 0.8);
}

5
src/pages/cutSampleListOrder/index.module.scss
View File

@ -5,6 +5,11 @@
.backIcon {
transform: rotate(180deg);
}
.address_info {
padding: 20px 20px 0 20px;
}
.remark {
}
.add_card_btn {
margin: 24px;
height: 82px;

8
src/pages/cutSampleListOrder/index.tsx
View File

@ -223,18 +223,18 @@ export default () => {
</View>
} title="领取剪样"
></NavBar>
<Address onSelect={getAddress} defaultValue={addressInfo} />
<View className={styles.address_info}><Address onSelect={getAddress} defaultValue={addressInfo} /></View>
<View className={styles.add_card_btn} onClick={onAddCard}>添加剪样</View>
{list?.map(item => <View key={item.id} className={styles.card_con}>
{list?.map((item, index) => <View key={item.id} className={styles.card_con}>
<View className={styles.card_header}>{formatHashTag(item.code, item.name)}</View>
<View className={styles.card_list}>
{item.colors?.map(citem =>
<ProductCard key={citem.id} value={citem} onDelData={onDelData(item)} onChangeNum={onChangeNum} />,
)}
<View className={styles.express_btn}>快递到付</View>
{(list?.length - 1 === index) && <View className={styles.express_btn}>快递到付</View>}
</View>
</View>)}
<Remark onSave={onRemark} defaultValue={remarkData} />
<View className={styles.remark}><Remark onSave={onRemark} defaultValue={remarkData} /></View>
<View className={styles.order_btn}>
<View className={styles.btn_con} onClick={onSubmitData}>
<Text>{numText}</Text>

2
src/pages/cutSampleListOrderDetail/components/orderInfo/index.module.scss
View File

@ -10,6 +10,7 @@
font-size: 28px;
color: rgba(0, 0, 0, 0.8);
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
font-weight: 700;
}
.order_info_list {
font-size: 28px;
@ -31,6 +32,7 @@
line-height: 32px;
color: #337fffff;
margin-left: 10px;
font-size: 24px;
}
}
}

4
src/pages/cutSampleListOrderDetail/components/productCard/index.tsx
View File

@ -38,7 +38,7 @@ export default (props: Param) => {
[value],
)
return <>
{value?.map((pitem) => {
{value?.map((pitem, pindex) => {
return <View key={pitem.product_id} className={styles.card_con}>
<View className={styles.card_header}>{formatHashTag(pitem.code, pitem.name)}</View>
<View className={styles.card_list}>
@ -54,7 +54,7 @@ export default (props: Param) => {
</View>
</View>
})}
<View className={styles.express_btn}>快递到付</View>
{(value.length - 1 === pindex) && <View className={styles.express_btn}>快递到付</View>}
</>
</View>
</View>

3
src/pages/cutSampleListOrderDetail/components/remark/index.module.scss
View File

@ -11,6 +11,9 @@
justify-content: space-between;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
text {
&:nth-child(1) {
font-weight: 700;
}
&:nth-child(2) {
color: rgba(0, 0, 0, 0.8);
}