feat:修改商品列表询价商品样式

config/mallRoutes/index.ts

 
+import BASE_CONFIG from '../base.config.json'
+
+const shopInfo = BASE_CONFIG.web.shopInfo
+
+const webShopInfo = shopInfo.filter(item => item.environment === 1)
+let webMallInfo = webShopInfo.filter(item => item.environment === 1 && item.type === 1)[0]
+// console.log(webShopInfo, "webShopInfo")
+let USE_CONFIG = true // 是否使用pass平台配置的商城子域名
+
+
 const mallRoute = {
   path: '/',
   component: '@/pages/lxMall/layouts/LXMallLayout',

src/pages/afterService/exchangeGoods/waitSubmitOrderList/components/outerLog/index.tsx

-import React from 'react'
-import { Table } from 'antd'
-
-interface outerLogPropsType {
-  dataSource: []
-}
-
-const outerLog: React.FC<outerLogPropsType> = (props) => {
-  const { dataSource } = props
-
-  const columns = [
-    {
-      title: '序号',
-      dataIndex: 'step',
-      ellipsis: true,
-    },
-    {
-      title: '操作角色',
-      dataIndex: 'roleName',
-      ellipsis: true,
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      ellipsis: true,
-    },
-    {
-      title: '操作',
-      dataIndex: 'operate',
-      ellipsis: true,
-    },
-    {
-      title: '操作时间',
-      dataIndex: 'operateTime',
-      ellipsis: true,
-    },
-    {
-      title: '审核意见',
-      dataIndex: 'opinion',
-      ellipsis: true,
-    },
-  ]
-
-  return (
-    <div>
-      <Table
-        className="common_tb"
-        dataSource={dataSource}
-        rowClassName={(_, index) => (index === 0 || (index % 2) === 0) && "tb_bg"}
-        columns={columns}
-      />
-    </div>
-  )
-}
-
-export default outerLog

src/pages/afterService/exchangeGoods/waitSubmitOrderList/components/innerLog/index.tsx → src/pages/afterService/exchangeGoods/waitSubmitOrderList/components/taskLog/index.tsx

@@ -3,11 +3,11 @@ import { Table } from 'antd'
 import styles from '../../../../common/styles.less'
 
 
-interface innerLogPropsType {
+interface TaskLogPropsType {
   dataSource: []
 }
 
-const innerLog: React.FC<innerLogPropsType> = (props) => {
+const TaskLog: React.FC<TaskLogPropsType> = (props) => {
   const { dataSource } = props
 
   const columns = [
@@ -66,4 +66,4 @@ const innerLog: React.FC<innerLogPropsType> = (props) => {
   )
 }
 
-export default innerLog
+export default TaskLog

src/pages/afterService/exchangeGoods/waitSubmitOrderList/detail.tsx

@@ -9,8 +9,7 @@ import ExchangeGoods from './components/exchangeGoods'
 import ProofFile from './components/proofFile'
 import ReplaceAddress from './components/replaceAddress'
 import ReturnAddress from './components/returnAddress'
-import OuterLog from './components/outerLog'
-import InnerLog from './components/innerLog'
+import TaskLog from './components/taskLog'
 import styles from './detail.less'
 
 interface OrderDetailProps {
@@ -25,7 +24,7 @@ const OrderDetail: React.FC<OrderDetailProps> = (props) => {
   const [form] = Form.useForm()
   const [type, setType] = useState<'add' | 'edit' | 'detail'>()
   const [btnLoading, setBtnLoading] = useState<boolean>(false)
-  const [tabActiveKey, setTabActiveKey] = useState<string>('outerLog')
+  const [tabActiveKey, setTabActiveKey] = useState<string>('basicInfo')
   const [replaceApplyInfo, setReplaceApplyInfo] = useState<any>({})
 
   useEffect(() => {
@@ -106,11 +105,8 @@ const OrderDetail: React.FC<OrderDetailProps> = (props) => {
               <TabPane tab="换货收货地址" key="replaceAddress">
                 <ReplaceAddress />
               </TabPane>
-              <TabPane tab="外部单据流转记录" key="outerLog">
-                <OuterLog dataSource={[]} />
-              </TabPane>
-              <TabPane tab="内部单据流转记录" key="innerLog">
-                <InnerLog dataSource={[]} />
+              <TabPane tab="流转记录" key="taskLog">
+                <TaskLog dataSource={[]} />
               </TabPane>
             </Tabs>
           </Form>

src/pages/lxMall/commodity/list.less

@@ -189,6 +189,16 @@
         font-weight: 400;
       }
     }
+
+    .inquiry_price {
+      color: #FFF;
+      background-color: var(--mall_main_color);
+      font-size: 14px;
+      height: 18px;
+      line-height: 14px;
+      padding: 2px 8px;
+      display: inline-block;
+    }
   }
 
 }
\ No newline at end of file

src/pages/lxMall/commodity/list.tsx

@@ -29,7 +29,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
       // 价格需要询价
       case 2:
         return (
-          <div className={styles.goods_price}>
+          <div className={styles.inquiry_price}>
             <label>在线询价</label>
           </div>
         )
@@ -107,7 +107,19 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
                   <div className={styles.info_box}>
                     <div className={styles.info_box_content}>
                       <div className={styles.name}>{item.name}</div>
-                      <div className={styles.price}><span>￥</span>{priceFormat(item.min)}</div>
+                      <div className={styles.price}>
+                        {
+                          item.priceType === 1 ? (
+                            <>
+                              <span>￥</span>{priceFormat(item.min)}
+                            </>
+                          ) : (
+                              <div className={styles.inquiry_price}>
+                                <label>在线询价</label>
+                              </div>
+                            )
+                        }
+                      </div>
                       <div className={styles.count}>已售: {numFormat(item.sold) || 0} {item.unitName}</div>
                     </div>
                     <ul className={styles.tags_list}>