Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: f623fb1574d20d15c86e64df7e7cc7ac7e473a57
+  newTag: bc7db2dff2f059d24103b84d1193e4ff4bfe6818

src/pages/orderManage/demandOrder/orderDetail/index.tsx

@@ -56,6 +56,20 @@ const dutyOptionList = [
     value: 3,
   },
 ];
+const orderLevelList = [
+  {
+    label: '加急单',
+    code: 'RUSH_ORDER',
+  },
+  {
+    label: '置顶单',
+    code: 'TOP_ORDER',
+  },
+  {
+    label: '普通单',
+    code: 'REGULAR_ORDER',
+  },
+];
 
 const DemandOrderDetail = () => {
   const navigate = useNavigate();
@@ -172,6 +186,10 @@ const DemandOrderDetail = () => {
   const handleRefresh = () => {
     getServiceOrderFormDetails(Number(searchParams.get('id')));
   };
+  // 转换订单类型
+  const transformOrderLevel = (code?: string) => {
+    return orderLevelList.find((v) => v.code === code)?.label;
+  };
 
   useEffect(() => {
     getServiceOrderFormDetails(Number(searchParams.get('id')));
@@ -198,31 +216,38 @@ const DemandOrderDetail = () => {
         </Descriptions.Item>
       </Descriptions>
       <Descriptions title='订单信息' bordered style={{ marginTop: '10px' }}>
-        <Descriptions.Item label='发单时间'>
-          {demandDetail?.serviceOrderFormDetailsDTO?.createTime}
+        <Descriptions.Item label='订单描述'>
+          {demandDetail?.serviceOrderFormDetailsDTO?.requireDescription}
         </Descriptions.Item>
-        <Descriptions.Item label='订单类型'>
+        <Descriptions.Item label='服务行业'>
           {demandDetail?.serviceOrderFormDetailsDTO?.serviceName}
         </Descriptions.Item>
+        <Descriptions.Item label='订单类型'>
+          {transformOrderLevel(
+            demandDetail?.serviceOrderFormDetailsDTO?.orderEarningsDTO?.orderLevel,
+          )}
+        </Descriptions.Item>
+        <Descriptions.Item label='任务地址'>
+          {demandDetail?.serviceOrderFormDetailsDTO?.taskAddress}
+        </Descriptions.Item>
         <Descriptions.Item label='订单编号'>
           {demandDetail?.serviceOrderFormDetailsDTO?.publisherNumber}
         </Descriptions.Item>
-        <Descriptions.Item label='订单描述'>
-          {demandDetail?.serviceOrderFormDetailsDTO?.requireDescription}
-        </Descriptions.Item>
         <Descriptions.Item label='任务时间'>
-          {demandDetail?.serviceOrderFormDetailsDTO?.taskStartTime}~
-          {demandDetail?.serviceOrderFormDetailsDTO?.taskEndTime}
+          {`${demandDetail?.serviceOrderFormDetailsDTO?.taskStartTime} ~ ${demandDetail?.serviceOrderFormDetailsDTO?.taskEndTime}`}
         </Descriptions.Item>
-        <Descriptions.Item label='任务地址'>
-          {demandDetail?.serviceOrderFormDetailsDTO?.taskAddress}
+        <Descriptions.Item label='发单时间'>
+          {demandDetail?.serviceOrderFormDetailsDTO?.createTime}
         </Descriptions.Item>
+
         <Descriptions.Item label='订单金额'>
           {demandDetail?.serviceOrderFormDetailsDTO?.orderAmount.toFixed(2).toLocaleString()}
         </Descriptions.Item>
         <Descriptions.Item label='平台收益'>
           {demandDetail?.serviceOrderFormDetailsDTO?.orderEarnings.toFixed(2).toLocaleString()}
         </Descriptions.Item>
+        <Descriptions.Item label='发单方'>-</Descriptions.Item>
+        <Descriptions.Item label='接单方'>-</Descriptions.Item>
       </Descriptions>
       {demandDetail?.serviceArriveSceneDTO && (
         <>