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: 6ead8b7e1bdf75b8c97ffc78abf4103685ba3d3f
+  newTag: c7b06cfdc1ce7a6344f11547707084588c3930c9

src/components/messageBox/index.scss

@@ -48,7 +48,7 @@
         width: 32px;
         height: 32px;
         border-radius: 50%;
-        background-image: url('https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/mine_user.png');
+        background-image: url('https://file.iuav.com/file/mine_user.png');
         background-size: 100% 100%;
         box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
       }

src/pages/activityManage/activityListOld/index.tsx

@@ -122,8 +122,7 @@ const ActivityList: FC = () => {
         id: 4,
         activityName: '裂变活动测试',
         activityCode: 'AC77674',
-        activityImg:
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/87681f78-67db-4603-aaf3-4bdbdb4546d2.jpg',
+        activityImg: 'https://file.iuav.com/file/87681f78-67db-4603-aaf3-4bdbdb4546d2.jpg',
         bindingCouponId: 10000148,
         bindingCouponName: '裂变优惠券测试',
         activityStatus: 2,
@@ -142,8 +141,7 @@ const ActivityList: FC = () => {
         id: 3,
         activityName: '裂变活动测试',
         activityCode: 'AC55159',
-        activityImg:
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/6e4f318f-3081-43b7-ad6a-79afabd9ddb9.jpg',
+        activityImg: 'https://file.iuav.com/file/6e4f318f-3081-43b7-ad6a-79afabd9ddb9.jpg',
         bindingCouponId: 10000141,
         bindingCouponName: '测试裂变',
         activityStatus: 2,
@@ -162,8 +160,7 @@ const ActivityList: FC = () => {
         id: 2,
         activityName: '认证裂变',
         activityCode: 'AC17946',
-        activityImg:
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/b22e0f43-fd04-4147-adc6-73d96b76c740.png',
+        activityImg: 'https://file.iuav.com/file/b22e0f43-fd04-4147-adc6-73d96b76c740.png',
         bindingCouponId: null,
         bindingCouponName: null,
         activityStatus: 2,
@@ -182,8 +179,7 @@ const ActivityList: FC = () => {
         id: 1,
         activityName: '测试裂变',
         activityCode: 'AC01841',
-        activityImg:
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/40f09893-01c5-4cc6-a64a-75dac1963791.jpg',
+        activityImg: 'https://file.iuav.com/file/40f09893-01c5-4cc6-a64a-75dac1963791.jpg',
         bindingCouponId: 10000141,
         bindingCouponName: '测试裂变',
         activityStatus: 2,

src/pages/orderManage/serviceOrder/comp/detailDelivery/index.tsx

@@ -20,8 +20,8 @@ function DetailDelivery() {
       <div className={'detail-text'}>验收凭证：</div>
       <div className={'detail-image'}>
         {[
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
         ].map((i, j) => (
           <Image key={j} className={'image'} src={i} alt='付款凭证' />
         ))}

src/pages/orderManage/serviceOrder/comp/detailPurchaser/index.tsx

@@ -23,8 +23,8 @@ function DetailPurchaser() {
       <div className={'detail-text'}>预付款：</div>
       <div className={'detail-image'}>
         {[
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
         ].map((i, j) => (
           <Image key={j} className={'image'} src={i} alt='付款凭证' />
         ))}
@@ -32,8 +32,8 @@ function DetailPurchaser() {
       <div className={'detail-text'}>尾款：</div>
       <div className={'detail-image'}>
         {[
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
         ].map((i, j) => (
           <Image key={j} className={'image'} src={i} alt='付款凭证' />
         ))}
@@ -41,8 +41,8 @@ function DetailPurchaser() {
       <div className={'detail-text'}>全款：</div>
       <div className={'detail-image'}>
         {[
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
-          'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
+          'https://file.iuav.com/file/infrastructure-05-05.png',
         ].map((i, j) => (
           <Image key={j} className={'image'} src={i} alt='付款凭证' />
         ))}

src/router/router.tsx

@@ -684,11 +684,23 @@ export const routerList: Array<RouteObjectType> = [
         errorElement: <ErrorPage />,
         meta: {
           id: 630,
+          // title: '任务发单',
           title: '任务订单',
           icon: <CreditCardOutlined />,
         },
       },
       {
+        path: '/serviceManage/demandOrderList',
+        element: withLoadingComponent(<DemandOrderListView />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 640,
+          title: '任务接单',
+          icon: <CreditCardOutlined />,
+          // develop: true,
+        },
+      },
+      {
         path: '/serviceManage/demandOrderDetail',
         element: withLoadingComponent(<DemandOrderDetailView />),
         errorElement: <ErrorPage />,