From 926dca97523b3763468457533fe6712c452b2cee Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Fri, 16 Dec 2022 18:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E7=A0=81=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=BC=80=E5=8F=91):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.ts | 4 +- .../components/bottomBtn/index.module.scss | 23 ++++++++++ .../codeList/components/bottomBtn/index.tsx | 13 ++++++ .../payeeHead/selectList/index.module.scss | 8 +++- .../components/payeeHead/selectList/index.tsx | 26 ++++++++--- .../components/productItem/index.module.scss | 43 +++++++++++++++++++ .../codeList/components/productItem/index.tsx | 23 ++++++++++ .../productSetting/index.module.scss | 31 +++++++++++++ .../components/productSetting/index.tsx | 23 ++++++++++ .../settingNumber/index.module.scss | 9 ++++ .../components/settingNumber/index.tsx | 8 ++-- .../wholeOrderSetting/index.module.scss | 32 ++++++++++++++ .../components/wholeOrderSetting/index.tsx | 22 ++++++++++ src/pages/codeList/index.module.scss | 32 ++++++++++++++ src/pages/codeList/index.tsx | 2 +- 15 files changed, 284 insertions(+), 15 deletions(-) create mode 100644 src/pages/codeList/components/bottomBtn/index.module.scss create mode 100644 src/pages/codeList/components/bottomBtn/index.tsx create mode 100644 src/pages/codeList/components/productItem/index.module.scss create mode 100644 src/pages/codeList/components/productItem/index.tsx create mode 100644 src/pages/codeList/components/productSetting/index.module.scss create mode 100644 src/pages/codeList/components/productSetting/index.tsx create mode 100644 src/pages/codeList/components/wholeOrderSetting/index.module.scss create mode 100644 src/pages/codeList/components/wholeOrderSetting/index.tsx diff --git a/src/common/constant.ts b/src/common/constant.ts index ea43c74..f8d1e6f 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -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.89: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://www.zzfzyc.com/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.42:50001/lymarket' // 杰 diff --git a/src/pages/codeList/components/bottomBtn/index.module.scss b/src/pages/codeList/components/bottomBtn/index.module.scss new file mode 100644 index 0000000..16e2636 --- /dev/null +++ b/src/pages/codeList/components/bottomBtn/index.module.scss @@ -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; + } + } +} diff --git a/src/pages/codeList/components/bottomBtn/index.tsx b/src/pages/codeList/components/bottomBtn/index.tsx new file mode 100644 index 0000000..89a9541 --- /dev/null +++ b/src/pages/codeList/components/bottomBtn/index.tsx @@ -0,0 +1,13 @@ +import { View } from '@tarojs/components' +import styles from './index.module.scss' + +export default () => { + return + + 删除码单 + 预览码单 + 保存码单 + + + +} diff --git a/src/pages/codeList/components/payeeHead/selectList/index.module.scss b/src/pages/codeList/components/payeeHead/selectList/index.module.scss index 7d29143..4fec545 100644 --- a/src/pages/codeList/components/payeeHead/selectList/index.module.scss +++ b/src/pages/codeList/components/payeeHead/selectList/index.module.scss @@ -3,7 +3,6 @@ background-color: #fff; font-size: 32px; font-weight: 500; - color: #4581ff; .select_list_item { height: 96px; text-align: center; @@ -12,9 +11,14 @@ text { display: inline-block; height: 100%; - border-bottom: 6px solid #337fff; box-sizing: border-box; padding: 0 10px; } } + .select_list_ed { + text { + border-bottom: 6px solid #337fff; + } + color: #4581ff; + } } diff --git a/src/pages/codeList/components/payeeHead/selectList/index.tsx b/src/pages/codeList/components/payeeHead/selectList/index.tsx index 506939f..1fdd857 100644 --- a/src/pages/codeList/components/payeeHead/selectList/index.tsx +++ b/src/pages/codeList/components/payeeHead/selectList/index.tsx @@ -1,10 +1,24 @@ import { Text, View } from '@tarojs/components' +import classNames from 'classnames' +import { memo, useCallback, useEffect, useState } from 'react' import styles from './index.module.scss' -export default () => { - return - 按整单 - 按面料 - 按颜色 - +interface Param { + selectIndex: 1|2|3 + onSelect?: (val: number) => void } +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 + getSelect(1)} className={classNames(styles.select_list_item, index === 1 && styles.select_list_ed)}>按整单 + getSelect(2)} className={classNames(styles.select_list_item, index === 2 && styles.select_list_ed)}>按面料 + getSelect(3)} className={classNames(styles.select_list_item, index === 3 && styles.select_list_ed)}>按颜色 + +}) diff --git a/src/pages/codeList/components/productItem/index.module.scss b/src/pages/codeList/components/productItem/index.module.scss new file mode 100644 index 0000000..1ebe988 --- /dev/null +++ b/src/pages/codeList/components/productItem/index.module.scss @@ -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; + } + } +} diff --git a/src/pages/codeList/components/productItem/index.tsx b/src/pages/codeList/components/productItem/index.tsx new file mode 100644 index 0000000..207d3b5 --- /dev/null +++ b/src/pages/codeList/components/productItem/index.tsx @@ -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 + + + + + + + 001# 环保黑 + + + x2条 + + 重量:400.5kg｜空差: 50.5k｜单价：¥100.0/kg + 重量:400.5kg｜空差: 50.5k｜单价：¥100.0/kg + + +} diff --git a/src/pages/codeList/components/productSetting/index.module.scss b/src/pages/codeList/components/productSetting/index.module.scss new file mode 100644 index 0000000..cd3bcc5 --- /dev/null +++ b/src/pages/codeList/components/productSetting/index.module.scss @@ -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; + } + } + } +} diff --git a/src/pages/codeList/components/productSetting/index.tsx b/src/pages/codeList/components/productSetting/index.tsx new file mode 100644 index 0000000..d5d68fe --- /dev/null +++ b/src/pages/codeList/components/productSetting/index.tsx @@ -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 <> + + + + + 5215# 26S双纱亲水滑爽棉 + + 大货 + + + {new Array(5).fill('').map((item, index) => )} + + + +} diff --git a/src/pages/codeList/components/settingNumber/index.module.scss b/src/pages/codeList/components/settingNumber/index.module.scss index b2002ba..2da0d00 100644 --- a/src/pages/codeList/components/settingNumber/index.module.scss +++ b/src/pages/codeList/components/settingNumber/index.module.scss @@ -1,11 +1,20 @@ .change_count { display: flex; background-color: #fff; + height: 162px; + border: 1px solid #e2e2e2; + border-radius: 16px; + align-items: center; .change_count__item { flex: 1; display: flex; flex-direction: column; align-items: center; + justify-content: center; + height: 100%; + &:nth-child(n + 2) { + border-left: 1px solid #e2e2e2; + } .change_count__item--title { padding-bottom: 24px; } diff --git a/src/pages/codeList/components/settingNumber/index.tsx b/src/pages/codeList/components/settingNumber/index.tsx index 671bceb..5190547 100644 --- a/src/pages/codeList/components/settingNumber/index.tsx +++ b/src/pages/codeList/components/settingNumber/index.tsx @@ -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 Counter from "../counter" export default () => { - return + return 重量 @@ -17,4 +17,4 @@ export default () => { -} \ No newline at end of file +} diff --git a/src/pages/codeList/components/wholeOrderSetting/index.module.scss b/src/pages/codeList/components/wholeOrderSetting/index.module.scss new file mode 100644 index 0000000..8514034 --- /dev/null +++ b/src/pages/codeList/components/wholeOrderSetting/index.module.scss @@ -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; + } + } + } +} diff --git a/src/pages/codeList/components/wholeOrderSetting/index.tsx b/src/pages/codeList/components/wholeOrderSetting/index.tsx new file mode 100644 index 0000000..35b0443 --- /dev/null +++ b/src/pages/codeList/components/wholeOrderSetting/index.tsx @@ -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 <> + + + + + 5215# 26S双纱亲水滑爽棉 + + 大货 + + {new Array(5).fill('').map((item, index) => )} + + + +} diff --git a/src/pages/codeList/index.module.scss b/src/pages/codeList/index.module.scss index 54f16a6..1d10add 100644 --- a/src/pages/codeList/index.module.scss +++ b/src/pages/codeList/index.module.scss @@ -1,8 +1,40 @@ .code_list__main { background-color: #f7f7f7; min-height: 100vh; + padding-bottom: 150px; .code_list__head { background-color: #fff; 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; + } + } + } + } } diff --git a/src/pages/codeList/index.tsx b/src/pages/codeList/index.tsx index 0e00e8f..f77e1e4 100644 --- a/src/pages/codeList/index.tsx +++ b/src/pages/codeList/index.tsx @@ -18,7 +18,7 @@ export default () => { - + {/* */}