Merge branch 'master' into develop

env/.env.development

 #请求接口地址
-#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
+VITE_REQUEST_BASE_URL='https://www.iuav.shop'
 #VITE_REQUEST_BASE_URL='https://test.iuav.shop'
 #VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
-VITE_REQUEST_BASE_URL='/api'
+#VITE_REQUEST_BASE_URL='/api'
 #旧版接口地址
 #VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
 #VITE_REQUEST_BASE_URL='https://test.iuav.mmcuav.cn'

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

@@ -173,7 +173,11 @@ const GoodsAddOrEditOrDetail = () => {
         {
           imgType: 0,
           imgUrl: values.mainImg[0].url,
-          id: goodsDetail ? values.mainImg[0].id : undefined,
+          id: goodsDetail
+            ? goodsDetail.images.some((i) => i.id === values.mainImg[0].id)
+              ? values.mainImg[0].id
+              : undefined
+            : undefined,
         },
       ];
       //副图

src/router/router.tsx

@@ -50,13 +50,13 @@ import CourseManageView from '~/pages/mallManage/courseManage';
 // const ActivityList = React.lazy(() => import('src/pages/activityManage/activityList')); //活动管理
 
 //商品管理
-const ServiceListView = React.lazy(() => import('~/pages/mallManage/serviceManage/serviceList')); //服务列表
-const ServiceDetailView = React.lazy(
-  () => import('~/pages/mallManage/serviceManage/serviceDetail'),
-); //服务详情
-const ServiceIntroduceView = React.lazy(
-  () => import('~/pages/mallManage/serviceManage/serviceIntroduce'),
-); //服务介绍
+// const ServiceListView = React.lazy(() => import('~/pages/mallManage/serviceManage/serviceList')); //服务列表
+// const ServiceDetailView = React.lazy(
+//   () => import('~/pages/mallManage/serviceManage/serviceDetail'),
+// ); //服务详情
+// const ServiceIntroduceView = React.lazy(
+//   () => import('~/pages/mallManage/serviceManage/serviceIntroduce'),
+// ); //服务介绍
 const RentListView = React.lazy(() => import('~/pages/mallManage/rentGoods/rentList')); //租赁列表
 const RentAddOrEditOrDetailView = React.lazy(
   () => import('~/pages/mallManage/rentGoods/rentAddOrEditOrDetail'),
@@ -236,35 +236,35 @@ export const routerList: Array<RouteObjectType> = [
           title: '课程管理',
         },
       },
-      {
-        path: '/mallManage/serviceList',
-        element: withLoadingComponent(<ServiceListView />),
-        meta: {
-          id: 10110,
-          icon: <SmileOutlined />,
-          title: '服务管理',
-        },
-      },
-      {
-        path: '/mallManage/serviceDetail',
-        element: withLoadingComponent(<ServiceDetailView />),
-        meta: {
-          id: 10120,
-          icon: <SmileOutlined />,
-          title: '服务详情',
-          hidden: true,
-        },
-      },
-      {
-        path: '/mallManage/serviceIntroduce',
-        element: withLoadingComponent(<ServiceIntroduceView />),
-        meta: {
-          id: 10120,
-          icon: <SmileOutlined />,
-          title: '服务介绍',
-          hidden: true,
-        },
-      },
+      // {
+      //   path: '/mallManage/serviceList',
+      //   element: withLoadingComponent(<ServiceListView />),
+      //   meta: {
+      //     id: 10110,
+      //     icon: <SmileOutlined />,
+      //     title: '服务管理',
+      //   },
+      // },
+      // {
+      //   path: '/mallManage/serviceDetail',
+      //   element: withLoadingComponent(<ServiceDetailView />),
+      //   meta: {
+      //     id: 10120,
+      //     icon: <SmileOutlined />,
+      //     title: '服务详情',
+      //     hidden: true,
+      //   },
+      // },
+      // {
+      //   path: '/mallManage/serviceIntroduce',
+      //   element: withLoadingComponent(<ServiceIntroduceView />),
+      //   meta: {
+      //     id: 10120,
+      //     icon: <SmileOutlined />,
+      //     title: '服务介绍',
+      //     hidden: true,
+      //   },
+      // },
       {
         path: '/mallManage/rentGoods',
         element: withLoadingComponent(<RentListView />),