🌈 style(ID1001328): 【内部商城】领取色卡剪样-UI还原

【【内部商城】领取色卡剪样-UI还原】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001328
2023-02-28 12:10:31 +08:00 · 2023-02-28 12:10:31 +08:00 · 118c1ba987
commit 118c1ba987
parent f50ccb6f80
8 changed files with 65 additions and 59 deletions
--- 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",
--- 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
        }
      ]
    }
--- 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
 // 生成密钥
--- 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;
-    }   
-    
-}
+  }
+
+  .unit {
+    font-size: $font_size_min;
+    color: $color_font_two;
+  }
+}
--- 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 (
    <View className={styles.main}>
      <View className={styles.reduce} onClick={minus}>
-          -
+        <IconFont name="icon-jianshaoanniu" size={45}></IconFont>
      </View>
      <View className={styles.input} onClick={noop}>
        <InputX value={String(value)} onInput={onInputEven} onBlur={onBluerEven} type="digit" disabled={disable} />
        <View className={styles.unit}>{unit}</View>
      </View>
      <View className={styles.plus} onClick={onPlus}>
-          +
+        <IconFont name="icon-xinzenganniu" size={45}></IconFont>
      </View>
    </View>
  )
--- 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<PropsType> = ({
          className={classnames(icon, customClassName)}
        />
      )} */}
-      {/* icon-xuanzhongyanse */}
+      {/* icon-xinzenganniu */}
+
+      { name === 'icon-xinzenganniu' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M341.333 0h341.334Q1024 0 1024 341.333v341.334Q1024 1024 682.667 1024H341.333Q0 1024 0 682.667V341.333Q0 0 341.333 0z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(51,127,255)'}'/%3E%3Cpath d='M512 256a32 32 0 0 1 32 32l-0.021 192H736a32 32 0 0 1 0 64H543.979L544 736a32 32 0 0 1-64 0l-0.021-192H288a32 32 0 0 1 0-64h191.979L480 288a32 32 0 0 1 32-32z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}'/%3E%3C/svg%3E${quot})`, width: `${svgSize}px`, height: `${svgSize}px`, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-jianshaoanniu */}
+
+      { name === 'icon-jianshaoanniu' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M675.84 10.24H348.16c-186.634 0-337.92 151.286-337.92 337.92v327.68c0 186.634 151.286 337.92 337.92 337.92h327.68c186.634 0 337.92-151.286 337.92-337.92V348.16c0-186.634-151.286-337.92-337.92-337.92z m0 20.48c175.309 0 317.44 142.131 317.44 317.44v327.68c0 175.309-142.131 317.44-317.44 317.44H348.16c-175.309 0-317.44-142.131-317.44-317.44V348.16c0-175.309 142.131-317.44 317.44-317.44h327.68z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(51,127,255)'}'/%3E%3Cpath d='M327.68 481.28h368.64q30.72 0 30.72 30.72t-30.72 30.72H327.68q-30.72 0-30.72-30.72t30.72-30.72z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(51,127,255)'}'/%3E%3C/svg%3E${quot})`, width: `${svgSize}px`, height: `${svgSize}px`, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-xuanzhongyanse */}

      { name === 'icon-xuanzhongyanse' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 0c282.784 0 512 229.216 512 512s-229.216 512-512 512S0 794.784 0 512 229.216 0 512 0z m0 85.344C276.352 85.344 85.344 276.384 85.344 512c0 235.648 191.04 426.656 426.656 426.656 235.648 0 426.656-191.04 426.656-426.656 0-235.648-191.04-426.656-426.656-426.656z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(255,255,255)'}'/%3E%3Cpath d='M512 512m-426.656 0a426.656 426.656 0 1 0 853.312 0 426.656 426.656 0 1 0-853.312 0Z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(51,127,255)'}'/%3E%3Cpath d='M764.8 372.576c16.64 16.64 16.64 43.68 0 60.352l-286.624 286.592c-16.64 16.672-43.68 16.672-60.352 0L275.84 577.504a42.656 42.656 0 1 1 60.352-60.32L448 628.992l256.448-256.416a42.656 42.656 0 0 1 57.28-2.784l3.04 2.784z' fill='${(isStr ? colors : colors?.[2]) || 'rgb(255,255,255)'}'/%3E%3C/svg%3E${quot})`, width: `${svgSize}px`, height: `${svgSize}px`, ...customStyle}} className={classnames("icon", customClassName)} />) }
 {/* icon-jianyang */}
--- 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%;
    }
  }
 }
--- 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 = () => {
                        <View className={styles.rightCont__left}></View>
                        <View className={styles.rightCont__right}>
                          <Counter
-                            onBlue={getInputValue}
                            defaultNum={mul?.count || 1}
                            onChange={e => handleCountChange(e, item.product_id, mul.product_color_id)}
-                            onClickBtn={getInputValue}
                            unit="份"
                            minNum={0}
                            maxNum={999}