功能：商城商品添加显示价格字段，商城订单买家信息

src/api/interface/orderManageType.ts

@@ -1123,6 +1123,8 @@ type mallOrderType = {
    */
   walletAmount?: number;
   userName: string;
+  phoneNum: string;
+  nickname: string;
   contractInfoDTO?: {
     id: number;
     unionId: string;

src/pages/mallManage/mallGoods/goodsAddOrEditOrDetail/components/baseInfo/index.tsx

@@ -139,7 +139,7 @@ const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
         labelCol={{ span: 2 }}
         wrapperCol={{ span: 8 }}
         form={baseInfoForm}
-        initialValues={{ labelShow: 0, shelfStatus: 1 }}
+        initialValues={{ labelShow: 0, shelfStatus: 1, priceShow: 1 }}
       >
         <Form.Item
           label='商品名称'
@@ -224,6 +224,12 @@ const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
             <Select.Option value={0}>下架</Select.Option>
           </Select>
         </Form.Item>
+        <Form.Item label='显示价格' name='priceShow'>
+          <Radio.Group>
+            <Radio value={1}>显示</Radio>
+            <Radio value={0}>不显示</Radio>
+          </Radio.Group>
+        </Form.Item>
         <Form.Item label='显示标签' name='labelShow'>
           <Radio.Group onChange={labelRadioChange}>
             <Radio value={1}>显示</Radio>

src/pages/orderManage/productOrder/orderDetail/comp/detailPurchaser/index.tsx

@@ -39,10 +39,10 @@ const DetailPurchaser: React.FC<PropsType> = ({ detail }) => {
   return (
     <div className='detail-purchaser detail-half'>
       <div className='detail-title'>买家信息</div>
-      <div className='detail-text'>UID：</div>
-      <div className='detail-text'>姓名： </div>
-      <div className='detail-text'>手机号： </div>
-      <div className='detail-text'>备注：</div>
+      <div className='detail-text'>UID：{detail?.userAccountId}</div>
+      <div className='detail-text'>姓名： {detail?.userName || detail?.nickname}</div>
+      <div className='detail-text'>手机号：{detail?.phoneNum} </div>
+      <div className='detail-text'>备注：{detail?.userRemark}</div>
       {detail?.contractInfoDTO ? (
         <div>
           <div className='detail-title'>合同信息</div>

src/pages/orderManage/productOrder/orderList/index.tsx

 import { useEffect, useState } from 'react';
 import SearchBox from '~/components/search-box';
-import { Button, Table, Image } from 'antd';
+import { Button, Table, Image, Tooltip } from 'antd';
 import { ColumnsType } from 'antd/es/table';
 import { useNavigate } from 'react-router-dom';
 import qs from 'query-string';
@@ -13,6 +13,7 @@ import ShipmentsOrder from './components/shipmentsOrder';
 import './index.scss';
 import { filterObjAttr } from '~/utils';
 import RemarkModal from '~/pages/orderManage/productOrder/orderList/components/remarkModal';
+import { CommentOutlined } from '@ant-design/icons';
 
 // 表格数据类型
 type TableType = InterListType<mallOrderListType>;
@@ -284,7 +285,7 @@ function ProductOrderView() {
       ),
     },
     {
-      title: '抵扣云享金/余额',
+      title: '抵扣云享金',
       dataIndex: 'shareAmount',
       align: 'center',
       render: (text) => (
@@ -292,19 +293,37 @@ function ProductOrderView() {
       ),
     },
     {
+      title: '抵扣佣金',
+      dataIndex: 'salaryAmount',
+      align: 'center',
+      render: (text) => (
+        <TableItem tr={<div className='goods-text'>¥{text?.toLocaleString()}</div>} />
+      ),
+    },
+    {
       title: '买家',
       dataIndex: 'uid',
       align: 'center',
-      width: '15%',
+      width: '10%',
       render: (_text: any, record) => (
         <TableItem
           tr={
             <>
-              <div className='goods-text'>
-                <div>{record.userName}</div>
+              <div>
+                <div>
+                  {record.userName || record.nickname}({record.userAccountId})
+                </div>
+                <div>{record.phoneNum}</div>
+                {record.userRemark ? (
+                  <div>
+                    <Tooltip placement='top' title={record.userRemark}>
+                      <Button icon={<CommentOutlined />}></Button>
+                    </Tooltip>
+                  </div>
+                ) : (
+                  ''
+                )}
               </div>
-
-              {/*<div>{record.entName}</div>*/}
             </>
           }
         />
@@ -330,12 +349,12 @@ function ProductOrderView() {
       align: 'center',
       render: (_text) => <TableItem tr={<div className='goods-text'>--</div>} />,
     },
-    // {
-    //   title: '订单交期',
-    //   dataIndex: 'deliveryTime',
-    //   align: 'center',
-    //   render: (_text) => <TableItem tr={<div className='goods-text'>--</div>} />,
-    // },
+    {
+      title: '订单交期',
+      dataIndex: 'deliveryTime',
+      align: 'center',
+      render: (text: string) => <TableItem tr={<div className='goods-text'>{text}</div>} />,
+    },
     {
       title: '备注',
       dataIndex: 'sellerRemark',