✨ feat(码单管理开发):
This commit is contained in:
parent
f512717ba5
commit
926dca9752
@ -1,4 +1,4 @@
|
|||||||
export const BASE_URL = CURRENT_BASE_URL
|
// export const BASE_URL = CURRENT_BASE_URL
|
||||||
// export const BASE_URL = `http://192.168.0.75:50001/lymarket`
|
// export const BASE_URL = `http://192.168.0.75:50001/lymarket`
|
||||||
// export const BASE_URL = `http://192.168.0.89:50001/lymarket`
|
// export const BASE_URL = `http://192.168.0.89:50001/lymarket`
|
||||||
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
|
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
|
||||||
@ -12,7 +12,7 @@ export const BASE_URL = CURRENT_BASE_URL
|
|||||||
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
|
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
|
||||||
// export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
|
// export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
|
||||||
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
|
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
|
||||||
// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
|
export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
|
||||||
// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
|
// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
|
||||||
// export const BASE_URL = 'http://192.168.1.42:50001/lymarket' // 杰
|
// export const BASE_URL = 'http://192.168.1.42:50001/lymarket' // 杰
|
||||||
|
|
||||||
|
|||||||
23
src/pages/codeList/components/bottomBtn/index.module.scss
Normal file
23
src/pages/codeList/components/bottomBtn/index.module.scss
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
.bottom_btn {
|
||||||
|
height: 160px;
|
||||||
|
display: flex;
|
||||||
|
background-color: #fff;
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
width: 100%;
|
||||||
|
justify-content: flex-end;
|
||||||
|
padding: 24px 32px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
.bottom_btn_item {
|
||||||
|
width: 160px;
|
||||||
|
height: 72px;
|
||||||
|
border-radius: 40px;
|
||||||
|
border: 1px solid rgba(0, 0, 0, 0.6);
|
||||||
|
text-align: center;
|
||||||
|
line-height: 72px;
|
||||||
|
font-size: 28px;
|
||||||
|
&:nth-last-child(n + 2) {
|
||||||
|
margin-right: 24px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
13
src/pages/codeList/components/bottomBtn/index.tsx
Normal file
13
src/pages/codeList/components/bottomBtn/index.tsx
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
import { View } from '@tarojs/components'
|
||||||
|
import styles from './index.module.scss'
|
||||||
|
|
||||||
|
export default () => {
|
||||||
|
return <View>
|
||||||
|
<View className={styles.bottom_btn}>
|
||||||
|
<View className={styles.bottom_btn_item}>删除码单</View>
|
||||||
|
<View className={styles.bottom_btn_item}>预览码单</View>
|
||||||
|
<View className={styles.bottom_btn_item}>保存码单</View>
|
||||||
|
</View>
|
||||||
|
<View className="common_safe_area_y"></View>
|
||||||
|
</View>
|
||||||
|
}
|
||||||
@ -3,7 +3,6 @@
|
|||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
font-size: 32px;
|
font-size: 32px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: #4581ff;
|
|
||||||
.select_list_item {
|
.select_list_item {
|
||||||
height: 96px;
|
height: 96px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@ -12,9 +11,14 @@
|
|||||||
text {
|
text {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-bottom: 6px solid #337fff;
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 0 10px;
|
padding: 0 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.select_list_ed {
|
||||||
|
text {
|
||||||
|
border-bottom: 6px solid #337fff;
|
||||||
|
}
|
||||||
|
color: #4581ff;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,24 @@
|
|||||||
import { Text, View } from '@tarojs/components'
|
import { Text, View } from '@tarojs/components'
|
||||||
|
import classNames from 'classnames'
|
||||||
|
import { memo, useCallback, useEffect, useState } from 'react'
|
||||||
import styles from './index.module.scss'
|
import styles from './index.module.scss'
|
||||||
|
|
||||||
export default () => {
|
interface Param {
|
||||||
return <View className={styles.select_list}>
|
selectIndex: 1|2|3
|
||||||
<View className={styles.select_list_item}><Text>按整单</Text></View>
|
onSelect?: (val: number) => void
|
||||||
<View className={styles.select_list_item}><Text>按面料</Text></View>
|
|
||||||
<View className={styles.select_list_item}><Text>按颜色</Text></View>
|
|
||||||
</View>
|
|
||||||
}
|
}
|
||||||
|
export default memo((props: Param) => {
|
||||||
|
const { selectIndex = 1 } = props
|
||||||
|
const [index, setIndex] = useState(1)
|
||||||
|
useEffect(() => {
|
||||||
|
if (selectIndex != index) { setIndex(() => props.selectIndex) }
|
||||||
|
}, [selectIndex])
|
||||||
|
const getSelect = (index) => {
|
||||||
|
setIndex(() => index)
|
||||||
|
}
|
||||||
|
return <View className={styles.select_list} onClick={getSelect}>
|
||||||
|
<View onClick={() => getSelect(1)} className={classNames(styles.select_list_item, index === 1 && styles.select_list_ed)}><Text>按整单</Text></View>
|
||||||
|
<View onClick={() => getSelect(2)} className={classNames(styles.select_list_item, index === 2 && styles.select_list_ed)}><Text>按面料</Text></View>
|
||||||
|
<View onClick={() => getSelect(3)} className={classNames(styles.select_list_item, index === 3 && styles.select_list_ed)}><Text>按颜色</Text></View>
|
||||||
|
</View>
|
||||||
|
})
|
||||||
|
|||||||
43
src/pages/codeList/components/productItem/index.module.scss
Normal file
43
src/pages/codeList/components/productItem/index.module.scss
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
.product_list__item--con {
|
||||||
|
display: flex;
|
||||||
|
padding: 24px 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
&:nth-last-child(n + 2) {
|
||||||
|
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
.item_image {
|
||||||
|
width: 90px;
|
||||||
|
height: 90px;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
.item_desc {
|
||||||
|
flex: 1;
|
||||||
|
margin-left: 16px;
|
||||||
|
.item_name_count {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
.name {
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
font-size: 28px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.number {
|
||||||
|
justify-self: self-end;
|
||||||
|
font-size: 28px;
|
||||||
|
color: rgba(0, 0, 0, 0.4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.item_specs_new {
|
||||||
|
font-size: 25px;
|
||||||
|
color: rgba(0, 0, 0, 0.8);
|
||||||
|
margin-top: 17px;
|
||||||
|
}
|
||||||
|
.item_specs_old {
|
||||||
|
font-size: 25px;
|
||||||
|
color: rgba(0, 0, 0, 0.4);
|
||||||
|
margin-top: 16px;
|
||||||
|
text-decoration: line-through;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
23
src/pages/codeList/components/productItem/index.tsx
Normal file
23
src/pages/codeList/components/productItem/index.tsx
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import { Text, View } from '@tarojs/components'
|
||||||
|
import styles from './index.module.scss'
|
||||||
|
import LabAndImg from '@/components/LabAndImg'
|
||||||
|
import IconFont from '@/components/iconfont/iconfont'
|
||||||
|
|
||||||
|
export default () => {
|
||||||
|
return <View className={styles['product_list__item--con']}>
|
||||||
|
<View className={styles.item_image}>
|
||||||
|
<LabAndImg value={{}} />
|
||||||
|
</View>
|
||||||
|
<View className={styles.item_desc}>
|
||||||
|
<View className={styles.item_name_count}>
|
||||||
|
<View className={styles.name}>
|
||||||
|
<Text>001# 环保黑</Text>
|
||||||
|
<IconFont name="icon-shuru" size={50} />
|
||||||
|
</View>
|
||||||
|
<View className={styles.number}>x2条</View>
|
||||||
|
</View>
|
||||||
|
<View className={styles.item_specs_new}>重量:400.5kg|空差: 50.5k|单价:¥100.0/kg</View>
|
||||||
|
<View className={styles.item_specs_old}>重量:400.5kg|空差: 50.5k|单价:¥100.0/kg</View>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
}
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
.product_list {
|
||||||
|
width: 702px;
|
||||||
|
background: #ffffff;
|
||||||
|
border-radius: 16px;
|
||||||
|
margin-top: 24px;
|
||||||
|
padding: 0 32px 32px 32px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
.product_list__item {
|
||||||
|
.product_list__item--title {
|
||||||
|
height: 82px;
|
||||||
|
font-size: 28px;
|
||||||
|
display: flex;
|
||||||
|
color: #000000;
|
||||||
|
align-items: center;
|
||||||
|
.product_title {
|
||||||
|
margin-right: 8px;
|
||||||
|
}
|
||||||
|
.mode_status {
|
||||||
|
width: 60px;
|
||||||
|
height: 30px;
|
||||||
|
font-size: 20px;
|
||||||
|
background: #337fff;
|
||||||
|
border-radius: 8px;
|
||||||
|
text-align: center;
|
||||||
|
line-height: 30px;
|
||||||
|
color: #fff;
|
||||||
|
margin-left: 8px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
23
src/pages/codeList/components/productSetting/index.tsx
Normal file
23
src/pages/codeList/components/productSetting/index.tsx
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import { Text, View } from '@tarojs/components'
|
||||||
|
import SettingNumber from '../settingNumber'
|
||||||
|
import ProductItem from '../productItem'
|
||||||
|
import styles from './index.module.scss'
|
||||||
|
import IconFont from '@/components/iconfont/iconfont'
|
||||||
|
import LabAndImg from '@/components/LabAndImg'
|
||||||
|
|
||||||
|
export default () => {
|
||||||
|
return <>
|
||||||
|
|
||||||
|
<View className={styles.product_list}>
|
||||||
|
<View className={styles.product_list__item}>
|
||||||
|
<View className={styles['product_list__item--title']}>
|
||||||
|
<Text className={styles.product_title}>5215# 26S双纱亲水滑爽棉</Text>
|
||||||
|
<IconFont name="icon-shuru" size={50} />
|
||||||
|
<Text className={styles.mode_status}>大货</Text>
|
||||||
|
</View>
|
||||||
|
<SettingNumber />
|
||||||
|
{new Array(5).fill('').map((item, index) => <View key={index}><ProductItem /></View>)}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</>
|
||||||
|
}
|
||||||
@ -1,11 +1,20 @@
|
|||||||
.change_count {
|
.change_count {
|
||||||
display: flex;
|
display: flex;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
height: 162px;
|
||||||
|
border: 1px solid #e2e2e2;
|
||||||
|
border-radius: 16px;
|
||||||
|
align-items: center;
|
||||||
.change_count__item {
|
.change_count__item {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
height: 100%;
|
||||||
|
&:nth-child(n + 2) {
|
||||||
|
border-left: 1px solid #e2e2e2;
|
||||||
|
}
|
||||||
.change_count__item--title {
|
.change_count__item--title {
|
||||||
padding-bottom: 24px;
|
padding-bottom: 24px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
import { View } from "@tarojs/components"
|
import { View } from '@tarojs/components'
|
||||||
|
import Counter from '../counter'
|
||||||
import styles from './index.module.scss'
|
import styles from './index.module.scss'
|
||||||
import Counter from "../counter"
|
|
||||||
|
|
||||||
export default () => {
|
export default () => {
|
||||||
return <View className={styles.change_count}>
|
return <View className={styles.change_count}>
|
||||||
<View className={styles.change_count__item}>
|
<View className={styles.change_count__item}>
|
||||||
<View className={styles['change_count__item--title']}>重量</View>
|
<View className={styles['change_count__item--title']}>重量</View>
|
||||||
<Counter />
|
<Counter />
|
||||||
@ -17,4 +17,4 @@ export default () => {
|
|||||||
<Counter />
|
<Counter />
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,32 @@
|
|||||||
|
.product_list {
|
||||||
|
width: 702px;
|
||||||
|
background: #ffffff;
|
||||||
|
border-radius: 16px;
|
||||||
|
margin-top: 24px;
|
||||||
|
padding: 0 32px 32px 32px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
.product_list__item {
|
||||||
|
.product_list__item--title {
|
||||||
|
height: 82px;
|
||||||
|
font-size: 28px;
|
||||||
|
display: flex;
|
||||||
|
color: #000000;
|
||||||
|
align-items: center;
|
||||||
|
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
||||||
|
.product_title {
|
||||||
|
margin-right: 8px;
|
||||||
|
}
|
||||||
|
.mode_status {
|
||||||
|
width: 60px;
|
||||||
|
height: 30px;
|
||||||
|
font-size: 20px;
|
||||||
|
background: #337fff;
|
||||||
|
border-radius: 8px;
|
||||||
|
text-align: center;
|
||||||
|
line-height: 30px;
|
||||||
|
color: #fff;
|
||||||
|
margin-left: 8px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
22
src/pages/codeList/components/wholeOrderSetting/index.tsx
Normal file
22
src/pages/codeList/components/wholeOrderSetting/index.tsx
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import { Text, View } from '@tarojs/components'
|
||||||
|
import SettingNumber from '../settingNumber'
|
||||||
|
import ProductItem from '../productItem'
|
||||||
|
import styles from './index.module.scss'
|
||||||
|
import IconFont from '@/components/iconfont/iconfont'
|
||||||
|
import LabAndImg from '@/components/LabAndImg'
|
||||||
|
|
||||||
|
export default () => {
|
||||||
|
return <>
|
||||||
|
<SettingNumber />
|
||||||
|
<View className={styles.product_list}>
|
||||||
|
<View className={styles.product_list__item}>
|
||||||
|
<View className={styles['product_list__item--title']}>
|
||||||
|
<Text className={styles.product_title}>5215# 26S双纱亲水滑爽棉</Text>
|
||||||
|
<IconFont name="icon-shuru" size={50} />
|
||||||
|
<Text className={styles.mode_status}>大货</Text>
|
||||||
|
</View>
|
||||||
|
{new Array(5).fill('').map((item, index) => <View key={index}><ProductItem /></View>)}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</>
|
||||||
|
}
|
||||||
@ -1,8 +1,40 @@
|
|||||||
.code_list__main {
|
.code_list__main {
|
||||||
background-color: #f7f7f7;
|
background-color: #f7f7f7;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
|
padding-bottom: 150px;
|
||||||
.code_list__head {
|
.code_list__head {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
padding: 24px;
|
padding: 24px;
|
||||||
}
|
}
|
||||||
|
.code_list_con {
|
||||||
|
padding: 0 24px;
|
||||||
|
margin-top: 24px;
|
||||||
|
.code_des {
|
||||||
|
padding: 0 32px 32px 32px;
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 16px;
|
||||||
|
margin-top: 24px;
|
||||||
|
.code_des_title {
|
||||||
|
height: 82px;
|
||||||
|
line-height: 82px;
|
||||||
|
font-size: 28px;
|
||||||
|
color: #000000;
|
||||||
|
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
.code_des_item {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
font-size: 28px;
|
||||||
|
color: rgba(0, 0, 0, 0.8);
|
||||||
|
margin-top: 24px;
|
||||||
|
.code_des_weight {
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
.code_des_price {
|
||||||
|
color: #f64861;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,7 @@ export default () => {
|
|||||||
<View className={styles.code_list__head}>
|
<View className={styles.code_list__head}>
|
||||||
<PayeeHead />
|
<PayeeHead />
|
||||||
</View>
|
</View>
|
||||||
<SelectList selectIndex={} />
|
<SelectList />
|
||||||
<View className={styles.code_list_con}>
|
<View className={styles.code_list_con}>
|
||||||
{/* <WholeOrder /> */}
|
{/* <WholeOrder /> */}
|
||||||
<ProductSetting />
|
<ProductSetting />
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user