From 4148531038d4c1ff0fab0383c07fe3d288209c1f Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 20 Dec 2022 17:26:34 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E7=A0=81=E5=8D=95=E6=8A=AC?= =?UTF-8?q?=E5=A4=B4=E5=88=97=E8=A1=A8=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= =?UTF-8?q?):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 6 +++ src/common/constant.ts | 4 +- .../codeList/codeColorList/index.config.ts | 3 -- .../codeList/codeColorList/index.module.scss | 35 --------------- src/pages/codeList/codeColorList/index.tsx | 17 ------- .../components/bottomBtn/index.module.scss | 23 ---------- .../codeList/components/bottomBtn/index.tsx | 13 ------ .../colorItemSetting/index.module.scss | 40 ----------------- .../components/colorItemSetting/index.tsx | 24 ---------- .../components/colorSetting/index.module.scss | 43 ------------------ .../components/colorSetting/index.tsx | 27 ----------- .../components/payeeHead/selectList/index.tsx | 26 ----------- .../components/productItem/index.module.scss | 43 ------------------ .../codeList/components/productItem/index.tsx | 24 ---------- .../productSetting/index.module.scss | 31 ------------- .../components/productSetting/index.tsx | 23 ---------- .../wholeOrderSetting/index.module.scss | 41 ----------------- .../components/wholeOrderSetting/index.tsx | 26 ----------- src/pages/codeList/index.module.scss | 45 ++++++++----------- .../components/companyItem/index.module.scss | 10 ++++- 20 files changed, 35 insertions(+), 469 deletions(-) delete mode 100644 src/pages/codeList/codeColorList/index.config.ts delete mode 100644 src/pages/codeList/codeColorList/index.module.scss delete mode 100644 src/pages/codeList/codeColorList/index.tsx delete mode 100644 src/pages/codeList/components/bottomBtn/index.module.scss delete mode 100644 src/pages/codeList/components/bottomBtn/index.tsx delete mode 100644 src/pages/codeList/components/colorItemSetting/index.module.scss delete mode 100644 src/pages/codeList/components/colorItemSetting/index.tsx delete mode 100644 src/pages/codeList/components/colorSetting/index.module.scss delete mode 100644 src/pages/codeList/components/colorSetting/index.tsx delete mode 100644 src/pages/codeList/components/payeeHead/selectList/index.tsx delete mode 100644 src/pages/codeList/components/productItem/index.module.scss delete mode 100644 src/pages/codeList/components/productItem/index.tsx delete mode 100644 src/pages/codeList/components/productSetting/index.module.scss delete mode 100644 src/pages/codeList/components/productSetting/index.tsx delete mode 100644 src/pages/codeList/components/wholeOrderSetting/index.module.scss delete mode 100644 src/pages/codeList/components/wholeOrderSetting/index.tsx diff --git a/src/app.config.ts b/src/app.config.ts index 9fc3bd2..44368f0 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -198,5 +198,11 @@ export default { 'codeColorList/index', ], }, + { + root: 'pages/codeList', + pages: [ + 'index', + ], + }, ], } diff --git a/src/common/constant.ts b/src/common/constant.ts index 670a626..5126f35 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -5,12 +5,12 @@ // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境 -// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/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.7:50002/lymarket' // 添 // export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 diff --git a/src/pages/codeList/codeColorList/index.config.ts b/src/pages/codeList/codeColorList/index.config.ts deleted file mode 100644 index 127552b..0000000 --- a/src/pages/codeList/codeColorList/index.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default { - navigationBarTitleText: '颜色详情', -} diff --git a/src/pages/codeList/codeColorList/index.module.scss b/src/pages/codeList/codeColorList/index.module.scss deleted file mode 100644 index b9b6d54..0000000 --- a/src/pages/codeList/codeColorList/index.module.scss +++ /dev/null @@ -1,35 +0,0 @@ -.main { - padding: 24px; - background-color: #f7f7f7ff; - padding-bottom: 200px; - .bottom_btn { - display: flex; - justify-content: space-between; - padding: 16px 48px; - position: fixed; - width: 100%; - bottom: 0; - left: 0; - box-sizing: border-box; - background-color: #fff; - height: 160px; - z-index: 999; - text { - display: block; - width: 311px; - height: 80px; - border-radius: 44px; - text-align: center; - line-height: 80px; - &:nth-child(2) { - background: #337fff; - color: #fff; - } - &:nth-child(1) { - border: 1px solid #087eff; - color: #337fffff; - box-sizing: border-box; - } - } - } -} diff --git a/src/pages/codeList/codeColorList/index.tsx b/src/pages/codeList/codeColorList/index.tsx deleted file mode 100644 index d6f188b..0000000 --- a/src/pages/codeList/codeColorList/index.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { CoverView, Text, View } from '@tarojs/components' -import ColorItemSetting from '../components/colorItemSetting' -import styles from './index.module.scss' - -export default () => { - return - - - - 取消 - 确认 - - - - - -} diff --git a/src/pages/codeList/components/bottomBtn/index.module.scss b/src/pages/codeList/components/bottomBtn/index.module.scss deleted file mode 100644 index 16e2636..0000000 --- a/src/pages/codeList/components/bottomBtn/index.module.scss +++ /dev/null @@ -1,23 +0,0 @@ -.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 deleted file mode 100644 index 89a9541..0000000 --- a/src/pages/codeList/components/bottomBtn/index.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { View } from '@tarojs/components' -import styles from './index.module.scss' - -export default () => { - return - - 删除码单 - 预览码单 - 保存码单 - - - -} diff --git a/src/pages/codeList/components/colorItemSetting/index.module.scss b/src/pages/codeList/components/colorItemSetting/index.module.scss deleted file mode 100644 index 868ce86..0000000 --- a/src/pages/codeList/components/colorItemSetting/index.module.scss +++ /dev/null @@ -1,40 +0,0 @@ -.product_list { - width: 702px; - border-radius: 16px; - margin-top: 24px; - 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); - background-color: #fff; - padding: 0 32px; - box-sizing: border-box; - border-radius: 16px 16px 0 0; - .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; - } - } - .product_list__item--con { - background-color: #fff; - padding: 24px 32px 18px 32px; - box-sizing: border-box; - margin-bottom: 8px; - } - } -} diff --git a/src/pages/codeList/components/colorItemSetting/index.tsx b/src/pages/codeList/components/colorItemSetting/index.tsx deleted file mode 100644 index 85a7f91..0000000 --- a/src/pages/codeList/components/colorItemSetting/index.tsx +++ /dev/null @@ -1,24 +0,0 @@ -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/colorSetting/index.module.scss b/src/pages/codeList/components/colorSetting/index.module.scss deleted file mode 100644 index a66a67f..0000000 --- a/src/pages/codeList/components/colorSetting/index.module.scss +++ /dev/null @@ -1,43 +0,0 @@ -.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; - justify-content: space-between; - 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; - } - .con { - display: flex; - align-items: center; - } - .update { - display: flex; - align-items: center; - color: #337fffff; - font-size: 28px; - } - } - } -} diff --git a/src/pages/codeList/components/colorSetting/index.tsx b/src/pages/codeList/components/colorSetting/index.tsx deleted file mode 100644 index 1391562..0000000 --- a/src/pages/codeList/components/colorSetting/index.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import { Text, View } from '@tarojs/components' -import ProductItem from '../productItem' -import styles from './index.module.scss' -import IconFont from '@/components/iconfont/iconfont' -import LabAndImg from '@/components/LabAndImg' -import { goLink } from '@/common/common' - -export default () => { - return <> - - - - - 5215# 26S双纱亲水滑爽棉 - - 大货 - - goLink('/pages/codeList/codeColorList/index')}> - 编辑 - - - - {new Array(5).fill('').map((item, index) => )} - - - -} diff --git a/src/pages/codeList/components/payeeHead/selectList/index.tsx b/src/pages/codeList/components/payeeHead/selectList/index.tsx deleted file mode 100644 index 16f08ef..0000000 --- a/src/pages/codeList/components/payeeHead/selectList/index.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { Text, View } from '@tarojs/components' -import classNames from 'classnames' -import { memo, useCallback, useEffect, useState } from 'react' -import styles from './index.module.scss' - -export type SelectStatus = 1|2|3 -interface Param { - defaultIndex?: SelectStatus - onSelect?: (val: number) => void -} -export default memo((props: Param) => { - const { defaultIndex = 1, onSelect } = props - const [selectIndex, setSelectIndex] = useState(1) - useEffect(() => { - if (defaultIndex != selectIndex) { setSelectIndex(() => defaultIndex) } - }, [defaultIndex]) - const getSelect = useCallback((index) => { - setSelectIndex(() => index) - onSelect?.(index) - }, []) - return - getSelect(1)} className={classNames(styles.select_list_item, selectIndex == 1 && styles.select_list_ed)}>按整单 - getSelect(2)} className={classNames(styles.select_list_item, selectIndex == 2 && styles.select_list_ed)}>按面料 - getSelect(3)} className={classNames(styles.select_list_item, selectIndex == 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 deleted file mode 100644 index 1ebe988..0000000 --- a/src/pages/codeList/components/productItem/index.module.scss +++ /dev/null @@ -1,43 +0,0 @@ -.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 deleted file mode 100644 index 204c329..0000000 --- a/src/pages/codeList/components/productItem/index.tsx +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index cd3bcc5..0000000 --- a/src/pages/codeList/components/productSetting/index.module.scss +++ /dev/null @@ -1,31 +0,0 @@ -.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 deleted file mode 100644 index d5d68fe..0000000 --- a/src/pages/codeList/components/productSetting/index.tsx +++ /dev/null @@ -1,23 +0,0 @@ -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/wholeOrderSetting/index.module.scss b/src/pages/codeList/components/wholeOrderSetting/index.module.scss deleted file mode 100644 index 01985ea..0000000 --- a/src/pages/codeList/components/wholeOrderSetting/index.module.scss +++ /dev/null @@ -1,41 +0,0 @@ -.product_list { - width: 702px; - background: #ffffff; - border-radius: 16px; - margin-top: 24px; - padding: 0 32px 0 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; - } - } - .up_btn { - width: 100%; - height: 72px; - display: flex; - justify-content: center; - align-items: center; - font-size: 28px; - color: rgba(0, 0, 0, 0.4); - } - } -} diff --git a/src/pages/codeList/components/wholeOrderSetting/index.tsx b/src/pages/codeList/components/wholeOrderSetting/index.tsx deleted file mode 100644 index 271c7d6..0000000 --- a/src/pages/codeList/components/wholeOrderSetting/index.tsx +++ /dev/null @@ -1,26 +0,0 @@ -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 814fc12..b830b0c 100644 --- a/src/pages/codeList/index.module.scss +++ b/src/pages/codeList/index.module.scss @@ -30,36 +30,27 @@ .code_list_con { padding: 24px; box-sizing: border-box; - } - .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; + align-items: center; + margin-top: 1px; + .code_list_search--code { + width: 558px; + height: 72px; + background: #f7f7f7; + border-radius: 36px; + margin-right: 32px; + } + .code_list_search--data { + display: flex; + align-items: center; + text { 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; - } + margin-right: 8px; } } } + .code_list_con { + padding: 24px; + box-sizing: border-box; + } } diff --git a/src/pages/weightList/components/companyItem/index.module.scss b/src/pages/weightList/components/companyItem/index.module.scss index e13df9c..aed10d4 100644 --- a/src/pages/weightList/components/companyItem/index.module.scss +++ b/src/pages/weightList/components/companyItem/index.module.scss @@ -8,7 +8,15 @@ padding: 0 24px; align-items: center; box-sizing: border-box; - + .name { + width: 78px; + height: 78px; + background: linear-gradient(337deg, #7bb7ff 0%, #4581ff 100%); + border-radius: 50%; + color: #fff; + text-align: center; + line-height: 78px; + } .desc { display: flex; flex-direction: column;