From 118c1ba98742cbfc1ae262431fa3da78dccb3f4c Mon Sep 17 00:00:00 2001 From: xuan Date: Tue, 28 Feb 2023 12:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=88=20style(ID1001328):=20=E3=80=90?= =?UTF-8?q?=E5=86=85=E9=83=A8=E5=95=86=E5=9F=8E=E3=80=91=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E8=89=B2=E5=8D=A1=E5=89=AA=E6=A0=B7-UI=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【【内部商城】领取色卡剪样-UI还原】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001328 --- iconfont.json | 2 +- project.private.config.json | 7 ++ src/common/constant.ts | 4 +- src/components/counter/index.module.scss | 86 +++++++++---------- src/components/counter/index.tsx | 5 +- src/components/iconfont/iconfont.tsx | 10 ++- .../addSampleCutting/index.module.scss | 4 +- .../sampleCutting/addSampleCutting/index.tsx | 6 -- 8 files changed, 65 insertions(+), 59 deletions(-) diff --git a/iconfont.json b/iconfont.json index 38da2b2..b2df217 100644 --- a/iconfont.json +++ b/iconfont.json @@ -1,5 +1,5 @@ { - "symbol_url": "http://at.alicdn.com/t/c/font_3619513_3ohlcpete6g.js", + "symbol_url": "http://at.alicdn.com/t/c/font_3619513_at0bezg87xk.js", "parse_local_svg": true, "local_svg_dir": "./src/styles/svg", "save_dir": "./src/components/iconfont", diff --git a/project.private.config.json b/project.private.config.json index c66a3ea..14ae573 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -65,6 +65,13 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "pages/sampleCutting/addSampleCutting/index", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/src/common/constant.ts b/src/common/constant.ts index 14bc3f1..d61dedd 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` @@ -15,7 +15,7 @@ export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 // export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华 -// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 +export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 // CDN // 生成密钥 diff --git a/src/components/counter/index.module.scss b/src/components/counter/index.module.scss index 2748cef..df134f5 100644 --- a/src/components/counter/index.module.scss +++ b/src/components/counter/index.module.scss @@ -1,46 +1,44 @@ - -.main{ +.main { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + .plus { + color: $color_main; + width: 46px; + height: 46px; + text-align: center; + line-height: 43px; + font-size: 50px; + background-color: $color_main; + color: #fff; + border-radius: 8px; + } + .reduce { + font-size: 50px; + width: 46px; + height: 46px; + text-align: center; + line-height: 43px; + color: #007aff; + } + .input { display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - .plus{ - color: $color_main; - width: 46px; - height: 46px; - text-align: center; - line-height: 43px; - font-size: 50px; - background-color: $color_main; - color: #fff; - border-radius: 8px; + align-items: flex-end; + background-color: #fff; + padding: 5px 10px; + box-sizing: border-box; + width: 106px; + border-radius: 10px; + input { + font-size: $font_size_medium; + width: 100%; + padding-right: 10px; } - .reduce { - font-size: 50px; - width: 46px; - height: 46px; - text-align: center; - line-height: 43px; - color:#007AFF; - } - .input{ - display: flex; - align-items: flex-end; - background-color: #fff; - padding: 5px 10px; - box-sizing: border-box; - width: 106px; - border-radius: 10px; - input{ - font-size: $font_size_medium; - text-align: right; - padding-right: 10px; - } - } - - .unit{ - font-size: $font_size_min; - color: $color_font_two; - } - -} \ No newline at end of file + } + + .unit { + font-size: $font_size_min; + color: $color_font_two; + } +} diff --git a/src/components/counter/index.tsx b/src/components/counter/index.tsx index d4cf18f..117fef9 100644 --- a/src/components/counter/index.tsx +++ b/src/components/counter/index.tsx @@ -1,6 +1,7 @@ import { View } from '@tarojs/components' import Big from 'big.js' import InputX from '../InputX' +import IconFont from '../iconfont/iconfont' import styles from './index.module.scss' import { usePropsValue } from '@/use/useCommon' @@ -130,14 +131,14 @@ const Counter = ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum return ( - - + {unit} - + + ) diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx index 39247ef..f51e707 100644 --- a/src/components/iconfont/iconfont.tsx +++ b/src/components/iconfont/iconfont.tsx @@ -24,7 +24,7 @@ function hex2rgb(hex) { return "rgb(" + rgb.join(",") + ")"; } -export type IconNames = 'icon-xuanzhongyanse' | 'icon-jianyang' | 'icon-huozhuziti' | 'icon-a-0tianzhangqi' | 'icon-shangchuanwenli' | 'icon-gouwuche' | 'icon-zixun' | 'icon-dianhua' | 'icon-peibu' | 'icon-zhankai1' | 'icon-shouqi1' | 'icon-shouhou1' | 'icon-cangku1' | 'icon-saoma' | 'icon-dizhi1' | 'icon-huodaofukuan' | 'icon-yufukuan1' | 'icon-yue' | 'icon-zidingyi' | 'icon-jinetiaozheng' | 'icon-tuikuan1' | 'icon-zhankai' | 'icon-shouqi' | 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu' | 'icon-wpassword'; +export type IconNames = 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-xuanzhongyanse' | 'icon-jianyang' | 'icon-huozhuziti' | 'icon-a-0tianzhangqi' | 'icon-shangchuanwenli' | 'icon-gouwuche' | 'icon-zixun' | 'icon-dianhua' | 'icon-peibu' | 'icon-zhankai1' | 'icon-shouqi1' | 'icon-shouhou1' | 'icon-cangku1' | 'icon-saoma' | 'icon-dizhi1' | 'icon-huodaofukuan' | 'icon-yufukuan1' | 'icon-yue' | 'icon-zidingyi' | 'icon-jinetiaozheng' | 'icon-tuikuan1' | 'icon-zhankai' | 'icon-shouqi' | 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu' | 'icon-wpassword'; type PropsType = { name: IconNames; @@ -84,7 +84,13 @@ const IconFont:FC = ({ className={classnames(icon, customClassName)} /> )} */} - {/* icon-xuanzhongyanse */} + {/* icon-xinzenganniu */} + + { name === 'icon-xinzenganniu' && () } +{/* icon-jianshaoanniu */} + + { name === 'icon-jianshaoanniu' && () } +{/* icon-xuanzhongyanse */} { name === 'icon-xuanzhongyanse' && () } {/* icon-jianyang */} diff --git a/src/pages/sampleCutting/addSampleCutting/index.module.scss b/src/pages/sampleCutting/addSampleCutting/index.module.scss index 9802cdd..a18b03d 100644 --- a/src/pages/sampleCutting/addSampleCutting/index.module.scss +++ b/src/pages/sampleCutting/addSampleCutting/index.module.scss @@ -40,6 +40,7 @@ page { .colorCardTop { font-size: 28px; + font-weight: 550; } .colorCardBottom { width: 100%; @@ -62,7 +63,6 @@ page { justify-content: space-between; &__top { font-size: 28px; - font-weight: 550; @include common_ellipsis(1); } &__bottom { @@ -77,7 +77,7 @@ page { overflow: hidden; } &__right { - width: 30%; + width: 35%; } } } diff --git a/src/pages/sampleCutting/addSampleCutting/index.tsx b/src/pages/sampleCutting/addSampleCutting/index.tsx index 6a48131..67a22d0 100644 --- a/src/pages/sampleCutting/addSampleCutting/index.tsx +++ b/src/pages/sampleCutting/addSampleCutting/index.tsx @@ -139,10 +139,6 @@ const AddColorCard = () => { return { lab: item?.lab, rgb: item?.rgb, texture_url: item?.texture_url } }, []) - const getInputValue = () => { - - } - const deleteColorCard = (productId: number, colorId: number) => { setOrder((prev) => { let newOlder: SampleCuttingCache[] = [] @@ -391,10 +387,8 @@ const AddColorCard = () => { handleCountChange(e, item.product_id, mul.product_color_id)} - onClickBtn={getInputValue} unit="份" minNum={0} maxNum={999}