diff --git a/src/pages/colorCardOrder/components/remark/index.module.scss b/src/pages/colorCardOrder/components/remark/index.module.scss index 2d34c54..2643ff3 100644 --- a/src/pages/colorCardOrder/components/remark/index.module.scss +++ b/src/pages/colorCardOrder/components/remark/index.module.scss @@ -16,6 +16,10 @@ color: rgba(0, 0, 0, 0.8); } } + .more { + display: flex; + align-items: center; + } } .remarks_message { height: 82px; diff --git a/src/pages/colorCardOrder/components/remark/index.tsx b/src/pages/colorCardOrder/components/remark/index.tsx index 9bce054..d492c6a 100644 --- a/src/pages/colorCardOrder/components/remark/index.tsx +++ b/src/pages/colorCardOrder/components/remark/index.tsx @@ -2,6 +2,7 @@ import { Text, View } from '@tarojs/components' import { useEffect, useState } from 'react' import styles from './index.module.scss' import Remark from '@/components/remark' +import IconFont from '@/components/iconfont/iconfont' interface Param { onSave?: (val: string) => void @@ -22,7 +23,7 @@ export default (props: Param) => { setShowRemark(true)}> 备注信息 - 填写/修改备注 + 填写/修改备注 {data || '尚未备注信息'} diff --git a/src/pages/colorCardOrder/index.module.scss b/src/pages/colorCardOrder/index.module.scss index 584fccb..438b652 100644 --- a/src/pages/colorCardOrder/index.module.scss +++ b/src/pages/colorCardOrder/index.module.scss @@ -38,6 +38,7 @@ width: 100%; text-align: right; padding: 32px 0 24px 0; + font-weight: 700; } } } diff --git a/src/pages/colorCardOrderDetail/components/address/index.module.scss b/src/pages/colorCardOrderDetail/components/address/index.module.scss index 97c83af..ca32322 100644 --- a/src/pages/colorCardOrderDetail/components/address/index.module.scss +++ b/src/pages/colorCardOrderDetail/components/address/index.module.scss @@ -27,11 +27,13 @@ justify-content: space-between; font-size: 28px; color: rgba(0, 0, 0, 0.8); + text { display: flex; align-items: center; &:nth-child(2) { color: #337fffff; + font-weight: 700; } } } diff --git a/src/pages/colorCardOrderDetail/components/address/index.tsx b/src/pages/colorCardOrderDetail/components/address/index.tsx index b0b8aba..1fd206d 100644 --- a/src/pages/colorCardOrderDetail/components/address/index.tsx +++ b/src/pages/colorCardOrderDetail/components/address/index.tsx @@ -33,7 +33,7 @@ export default (props: Param) => { }, [props.defaultValue]) return <> - + {data.address_title || '请选择收货地址'} diff --git a/src/pages/colorCardOrderDetail/components/orderState/index.module.scss b/src/pages/colorCardOrderDetail/components/orderState/index.module.scss index 41bc389..227dd19 100644 --- a/src/pages/colorCardOrderDetail/components/orderState/index.module.scss +++ b/src/pages/colorCardOrderDetail/components/orderState/index.module.scss @@ -72,10 +72,10 @@ color: $color_font_two; } .order_status_select { - color: $color_main; + color: rgba(0, 0, 0, 0.8); } .order_status_tag_select { - color: $color_main; + color: rgba(0, 0, 0, 0.8); } } .order_status_des { diff --git a/src/pages/colorCardOrderDetail/components/productCard/index.module.scss b/src/pages/colorCardOrderDetail/components/productCard/index.module.scss index 291d2bf..66b04a0 100644 --- a/src/pages/colorCardOrderDetail/components/productCard/index.module.scss +++ b/src/pages/colorCardOrderDetail/components/productCard/index.module.scss @@ -79,6 +79,7 @@ width: 100%; text-align: right; padding: 32px 0 24px 0; + font-weight: 700; } } } diff --git a/src/pages/colorCardOrderDetail/index.module.scss b/src/pages/colorCardOrderDetail/index.module.scss index ee6524a..afa71be 100644 --- a/src/pages/colorCardOrderDetail/index.module.scss +++ b/src/pages/colorCardOrderDetail/index.module.scss @@ -41,6 +41,7 @@ text-align: center; line-height: 72px; color: #000000; + font-size: 28px; } } } diff --git a/src/pages/cutSampleListOrder/components/remark/index.module.scss b/src/pages/cutSampleListOrder/components/remark/index.module.scss index b46782c..d051d7b 100644 --- a/src/pages/cutSampleListOrder/components/remark/index.module.scss +++ b/src/pages/cutSampleListOrder/components/remark/index.module.scss @@ -16,6 +16,10 @@ color: rgba(0, 0, 0, 0.8); } } + .more { + display: flex; + align-items: center; + } } .remarks_message { height: 82px; diff --git a/src/pages/cutSampleListOrder/components/remark/index.tsx b/src/pages/cutSampleListOrder/components/remark/index.tsx index 41c9e56..4fddcbc 100644 --- a/src/pages/cutSampleListOrder/components/remark/index.tsx +++ b/src/pages/cutSampleListOrder/components/remark/index.tsx @@ -3,6 +3,7 @@ import { useEffect, useState } from 'react' import classNames from 'classnames' import styles from './index.module.scss' import Remark from '@/components/remark' +import IconFont from '@/components/iconfont/iconfont' interface Param { onSave?: (val: string) => void @@ -23,7 +24,7 @@ export default (props: Param) => { setShowRemark(true)}> 备注信息 - 填写/修改备注 + 填写/修改备注 {data || '尚未备注信息'} diff --git a/src/pages/cutSampleListOrder/index.module.scss b/src/pages/cutSampleListOrder/index.module.scss index 5827fea..bf198ec 100644 --- a/src/pages/cutSampleListOrder/index.module.scss +++ b/src/pages/cutSampleListOrder/index.module.scss @@ -38,6 +38,7 @@ width: 100%; text-align: right; padding: 32px 0 24px 0; + font-weight: 700; } } } diff --git a/src/pages/cutSampleListOrderDetail/components/address/index.module.scss b/src/pages/cutSampleListOrderDetail/components/address/index.module.scss index 97c83af..e224b39 100644 --- a/src/pages/cutSampleListOrderDetail/components/address/index.module.scss +++ b/src/pages/cutSampleListOrderDetail/components/address/index.module.scss @@ -32,6 +32,7 @@ align-items: center; &:nth-child(2) { color: #337fffff; + font-weight: 700; } } } diff --git a/src/pages/cutSampleListOrderDetail/components/address/index.tsx b/src/pages/cutSampleListOrderDetail/components/address/index.tsx index b0b8aba..1fd206d 100644 --- a/src/pages/cutSampleListOrderDetail/components/address/index.tsx +++ b/src/pages/cutSampleListOrderDetail/components/address/index.tsx @@ -33,7 +33,7 @@ export default (props: Param) => { }, [props.defaultValue]) return <> - + {data.address_title || '请选择收货地址'} diff --git a/src/pages/cutSampleListOrderDetail/components/orderState/index.module.scss b/src/pages/cutSampleListOrderDetail/components/orderState/index.module.scss index 41bc389..227dd19 100644 --- a/src/pages/cutSampleListOrderDetail/components/orderState/index.module.scss +++ b/src/pages/cutSampleListOrderDetail/components/orderState/index.module.scss @@ -72,10 +72,10 @@ color: $color_font_two; } .order_status_select { - color: $color_main; + color: rgba(0, 0, 0, 0.8); } .order_status_tag_select { - color: $color_main; + color: rgba(0, 0, 0, 0.8); } } .order_status_des { diff --git a/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss b/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss index 7e28419..2c13962 100644 --- a/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss +++ b/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss @@ -61,6 +61,7 @@ width: 100%; text-align: right; padding: 32px 0 24px 0; + font-weight: 700; } } } diff --git a/src/pages/cutSampleListOrderDetail/index.module.scss b/src/pages/cutSampleListOrderDetail/index.module.scss index ee6524a..afa71be 100644 --- a/src/pages/cutSampleListOrderDetail/index.module.scss +++ b/src/pages/cutSampleListOrderDetail/index.module.scss @@ -41,6 +41,7 @@ text-align: center; line-height: 72px; color: #000000; + font-size: 28px; } } }