From ed4964774713d8d13d83823448ef0b85f359fb53 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Wed, 14 Dec 2022 11:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(ID1000820=20=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E5=95=86=E5=9F=8E=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BC=98=E5=8C=96):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.scss | 1 + src/common/constant.ts | 4 +- src/pages/order/components/scanPay/index.tsx | 3 +- .../components/applyRecord/index.tsx | 10 ++--- src/pages/user/components/customer/index.tsx | 4 +- src/pages/userEdit/index.tsx | 37 ++++++++++--------- src/styles/svg.scss | 37 +++++++++++++++++++ 7 files changed, 67 insertions(+), 29 deletions(-) create mode 100644 src/styles/svg.scss diff --git a/src/app.scss b/src/app.scss index 97a024e..596779b 100644 --- a/src/app.scss +++ b/src/app.scss @@ -1,3 +1,4 @@ +@import './styles/svg.scss'; @import './styles/common.scss'; @import './styles/iconfont.scss'; page { diff --git a/src/common/constant.ts b/src/common/constant.ts index cc281c1..32af514 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -5,14 +5,14 @@ // 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 = `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:50002/lymarket` // 杰 diff --git a/src/pages/order/components/scanPay/index.tsx b/src/pages/order/components/scanPay/index.tsx index d3158da..f309db6 100644 --- a/src/pages/order/components/scanPay/index.tsx +++ b/src/pages/order/components/scanPay/index.tsx @@ -181,8 +181,7 @@ const ScanPay = ({ show = true, onClose, company, orderInfo }: Param) => { 扫码支付 - - 扫码支付成功后，自动更新状态 + 1.保存图片 2.微信支付宝扫一扫付款 {(state.loading && ) || ( diff --git a/src/pages/salesAfter/components/applyRecord/index.tsx b/src/pages/salesAfter/components/applyRecord/index.tsx index f881455..8d1035c 100644 --- a/src/pages/salesAfter/components/applyRecord/index.tsx +++ b/src/pages/salesAfter/components/applyRecord/index.tsx @@ -116,18 +116,18 @@ export default memo(({ show, onClose, onSubmit, id }: Param) => { {`${colorItem.code} ${colorItem.name}`} ¥{standardPrice(colorItem.sale_price)} - 总重{formatWeightDiv(colorItem.estimate_weight)}kg + {/* 总重{formatWeightDiv(colorItem.estimate_weight)}kg */} - + {/* ×{formatCount(colorItem)} {formatDetailOrder.unit} - - + */} + {/* ¥ {formatPriceDiv(colorItem.estimate_amount, 100, true)} - + */} diff --git a/src/pages/user/components/customer/index.tsx b/src/pages/user/components/customer/index.tsx index d103f2b..38be4dc 100644 --- a/src/pages/user/components/customer/index.tsx +++ b/src/pages/user/components/customer/index.tsx @@ -27,13 +27,13 @@ export default (props: Param) => { 请选择您要的服务 - 我们根据选择为您提供服务 + {/* 我们根据选择为您提供服务 */} - 官方微信客服 + 在线官方客服 竭诚为您服务！ diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx index 2dd167a..b3b4dd7 100644 --- a/src/pages/userEdit/index.tsx +++ b/src/pages/userEdit/index.tsx @@ -15,9 +15,24 @@ import useUserInfo from '@/use/useUserInfo' import IconFont from '@/components/iconfont/iconfont' import { formatImgUrl } from '@/common/fotmat' +// 列表 +const UserEditList = memo((props: any) => { + return ( + + {props.label} + + {props.children ? props.children : props.data ? props.data : {props.placeholder}} + {!props.useIcon && } + + + ) +}) + export default () => { const { getPhoneNumber, getAdminUserInfo } = useLogin() const { adminUserInfo } = useSelector(state => state.userInfo) + // 表单数据 + const [formData, setFormData] = useState(adminUserInfo) // 用户信息 useEffect(() => { setFormData({ @@ -32,8 +47,7 @@ export default () => { }) getCompanyTypeData() }, []) - // 表单数据 - const [formData, setFormData] = useState(adminUserInfo) + // 昵称修改保存 const { fetchData: realNameUpdateFetch } = realNameUpdateApi() const rules = { @@ -221,12 +235,12 @@ export default () => { {userInfo?.adminUserInfo?.sale_user_name} - 专属客服经理 + 专属客户经理 - 客服热线 {userInfo?.adminUserInfo?.sale_user_phone} + {userInfo?.adminUserInfo?.sale_user_phone} onPhone()}> - + 拨打 } @@ -245,16 +259,3 @@ export default () => { ) } - -// 列表 -const UserEditList = memo((props: any) => { - return ( - - {props.label} - - {props.children ? props.children : props.data ? props.data : {props.placeholder}} - {!props.useIcon && } - - - ) -}) diff --git a/src/styles/svg.scss b/src/styles/svg.scss new file mode 100644 index 0000000..c8b5570 --- /dev/null +++ b/src/styles/svg.scss @@ -0,0 +1,37 @@ +@font-face { + font-family: 'icomoon'; + src: url('data:font/woff2;charset=utf-8;base64,d09GMgABAAAAAAJgAA0AAAAABpQAAAILAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGh4GYACCXhEICoIggXkLEAABNgIkAxoEIAWDGwdPG3YFEVWbX8h+JmRyf1jeIHfJTfyeG4nofgTf7/dln3s/zbBawL/LaurNEoACZgWEARYmteWjSKaiyUZP/4f3ky8b9wCYusmtBRg+Rl0gL5hhgH9pgmNRF4Vd2nmAga1FiyIMA/TAKHXbP3n02AznQUQM5U0UbEYnIeCPD8Nq8NfP/9WrA83ohiSEilBCQs4X444y6Wn6BbepPP41MhqonmhXOU38Hflz12fTMjQIUNYF8r59BFgnC/RRMgmNapIk1P+OrgMj/ZzpWveyLDQCCJmoEBmIhAQACEpwb4gubaAKWlHDemwGlACBELKUc24nOp4703L9K+nil43N176OfOmbFg/bKh1pIhthTXUAoDGvqLcMaE3CwJas1gHfcdq912KZ+tMyIZfF/Yn3AwEsuZ0NbZP+rzWVhL8b8sW8AjUJBIE1lXT8+RuhUgLEaiChxMVUF6gqZJAAANDqewFCVbsASdVwAbKqaQKUVK0ToKzJSQEqqh4I0KiXX2VRahBaMSxRWA8sUwVWouaBsm4bQUWrqy0bjXqxa8uBfQcO7LdrfQ85sJ8V23Yc27vpsDdoSYxGbKnXbDt8ZJe93tlROJ3ydXYUc8gcv/Vofce2/dsObzq6bWt986n6fKYWow43Yt9ejeZvOfB7wwIkZVuVSFJkOUpRruzYe+rgzs7qsf27iqKo8uzxRWF0AgA=') + format('woff2'), + url('data:font/woff;charset=utf-8;base64,d09GRgABAAAAAAQsAA0AAAAABpQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEEAAAABoAAAAclSIA5UdERUYAAAP0AAAAHAAAAB4AJwANT1MvMgAAAZQAAAA+AAAAYA8TBaxjbWFwAAAB7AAAAFUAAAFeF1fZ4Wdhc3AAAAPsAAAACAAAAAgAAAAQZ2x5ZgAAAlQAAACGAAABID7uCVNoZWFkAAABMAAAACoAAAA2IhseK2hoZWEAAAFcAAAAHQAAACQHQgPHaG10eAAAAdQAAAAXAAAAGg11AIBsb2NhAAACRAAAABAAAAAQAHgAsG1heHAAAAF8AAAAGAAAACAACwAybmFtZQAAAtwAAADcAAABm/pYTdhwb3N0AAADuAAAADIAAABPfL1sUnjaY2BkAIO4/vtN8fw2Xxm4WcD8+/vevEOmmRuYg4AUBwMTiAcAXYQLzgAAeNpjYGRgYD7w/wADAwsDCDA3MDAyoAI2AFXEAxIAAAB42mNgZGBgYGcwYGBmAAEmBjQAAAYTAD542mNgZm5gnMDAysDANJPpDAMDQz+EZnzNYMzIyYAKGAXQBBgcGBhfMjIf+H+AwYEZiEFqkGQVGBgBSP0KygAAeNpjYYAAxlAIzQTELAwMDUwKAAgJAQMAeNpjYGBgZoBgGQZGBhCIAPIYwXwWBhsgzcXAwcAEhIwMCi8Z///9/x+sSuElA4T9/4k4K1gHFwMMMILMY2QDYmaoABOQYGJABUA7WBiGNwAAJK8NIAAAAAAAAAAACAAIABAAGABgAJB42mNgZIABJgYGSyYGQnxmhgaGIOYG5iAGfgZ5Bn0GBmFFIzFRQRE2ZUUlNVNBEzNNRlQ+I5r8AkYFXmFh3n8PgCTjWiTOv1wkDnOQEB+YwcuowCeEzP6XgMxjYGJSALmHcRPYPQyMxhDbtBkhtlkzovKZHAJAWkHEXTiLcRMuyxgAzz4qaAAAeNp1zrFqwlAYxfF/NFq0IJ1K6XRHp6DgA3QqdXDpIB0b4yUE9F6IEXTvI3TsM/RhfCJPwrcmcMPvOzfnI8CMfxLaJ+GBJ/NAnpuH8ps5lb/MIx65mMfKf81TXrmplaQTJbNuQ+uB/GIeygtzKn+YRzzzbR4r/zFPWfFHRUHkqBMJUBXxGKPwiafkzIGcWqMvz4dc6Pu+L99qT81J923uWJLpL9n6+lTF4JbZor/73s2NWqW2hG5TrtmzV7bjqve6626sm6kUQ+NKH3ydN37vdle3LuJG+zLu5ds+Q3jaY2BiwA/YGRgYmRiYGJkZmBlZGFnZ0nMqCzIM2UvzMg0MDMC0q6WBAZQ2BACYRgjzAAAAAQAB//8AD3jaY2BkYGDgAWIxIGZiYARCNiBmAfMYAAPgADV42mNgYGBkAIKrS9Q5QPT9fW/ewWgATPsImAAA') + format('woff'); + font-weight: normal; + font-style: normal; + font-display: swap; +} +[class^='icon-'], +[class*=' icon-'] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-mdgl .path1:before { + content: '\e900'; + color: rgb(164, 175, 204); + opacity: 0.95; +} +.icon-mdgl .path2:before { + content: '\e901'; + margin-left: -1em; + color: rgb(152, 162, 192); + opacity: 0.5; +}