Merge remote-tracking branch 'origin/develop' into develop

Dockerfile

@@ -10,6 +10,7 @@ RUN npm run build
 
 # nginx
 FROM nginx:alpine as production
+VOLUME ["/var/log/nginx/"]
 ENV NODE_ENV production
 # Set working directory to nginx asset directory
 COPY --from=builder /app/dist /usr/share/nginx/html

kustomization/base/deployment.yaml

@@ -18,9 +18,16 @@ spec:
       containers:
         - name: admin
           image: REGISTRY/NAMESPACE/IMAGE:TAG
+          volumeMounts:
+            - name: log-of-nginx
+              mountPath: /var/log/nginx
           resources:
             limits:
               memory: 512Mi
               cpu: 100m
           ports:
             - containerPort: 80
+      volumes:
+        - name: log-of-nginx
+          hostPath:
+            path: /var/log/nginx

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: 6851eb63dc36d80358308873d2419644719a80bb
+  newTag: 626a3cf26ce739cd319c7fb17c66efad8c4c8b3e

src/router/router.tsx

@@ -3,10 +3,10 @@ import { Navigate, RouteObject } from 'react-router-dom';
 import ErrorPage from '~/pages/common/error';
 import LayoutView from '~/components/layout';
 import {
-  AccountBookOutlined,
+  // AccountBookOutlined,
   MacCommandOutlined,
-  GiftOutlined,
-  PayCircleOutlined,
+  // GiftOutlined,
+  // PayCircleOutlined,
   BarsOutlined,
   ShoppingOutlined,
   ShopOutlined,
@@ -33,13 +33,13 @@ import { Spin } from 'antd';
 // 登录
 import LoginView from '~/pages/common/login';
 // 积分
-import { PointList } from '~/pages/pointManage/pointList';
-import { PointDetail } from '~/pages/pointManage/pointList/detail';
-import { PointRules } from '~/pages/pointManage/pointRules';
-import PointDetailList from '~/pages/pointManage/pointDetail';
+// import { PointList } from '~/pages/pointManage/pointList';
+// import { PointDetail } from '~/pages/pointManage/pointList/detail';
+// import { PointRules } from '~/pages/pointManage/pointRules';
+// import PointDetailList from '~/pages/pointManage/pointDetail';
 // 分成
-import DivideOrder from '~/pages/pointManage/divideOrder';
-import DivideRules from '~/pages/pointManage/divideRules';
+// import DivideOrder from '~/pages/pointManage/divideOrder';
+// import DivideRules from '~/pages/pointManage/divideRules';
 // 客户列表
 import CustomListView from '~/pages/customManage/customList';
 import CustomMoneyView from '~/pages/customManage/customMoney';
@@ -47,16 +47,16 @@ import CustomMoneyDetail from '~/pages/customManage/customMoney/detail';
 import AccountManageView from '~/pages/systemManage/accountManage';
 import CourseManageView from '~/pages/mallManage/courseManage';
 // 活动
-const ActivityList = React.lazy(() => import('src/pages/activityManage/activityList')); //活动管理
+// 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'),
@@ -84,13 +84,13 @@ const ServiceOrderDetail = React.lazy(() => import('~/pages/orderManage/serviceO
 const EquipmentOrderDetail = React.lazy(() => import('~/pages/orderManage/equipmentOrder/detail'));
 
 // 优惠券
-const CouponList = React.lazy(() => import('src/pages/couponManage/couponList')); //优惠券管理
-const CouponDetail = React.lazy(() => import('src/pages/couponManage/couponList/detail')); //优惠券明细
-const SplitCouponList = React.lazy(() => import('src/pages/couponManage/splitCouponList')); //裂变优惠券
-const SplitCouponOperate = React.lazy(
-  () => import('src/pages/couponManage/splitCouponList/addOrEditOrDetail'),
-); // 裂变优惠券操作
-const CouponDetailed = React.lazy(() => import('src/pages/couponManage/couponDetailed')); //优惠券明细
+// const CouponList = React.lazy(() => import('src/pages/couponManage/couponList')); //优惠券管理
+// const CouponDetail = React.lazy(() => import('src/pages/couponManage/couponList/detail')); //优惠券明细
+// const SplitCouponList = React.lazy(() => import('src/pages/couponManage/splitCouponList')); //裂变优惠券
+// const SplitCouponOperate = React.lazy(
+//   () => import('src/pages/couponManage/splitCouponList/addOrEditOrDetail'),
+// ); // 裂变优惠券操作
+// const CouponDetailed = React.lazy(() => import('src/pages/couponManage/couponDetailed')); //优惠券明细
 
 // 分类管理
 const CategoryManage = React.lazy(() => import('~/pages/categoryManage/category'));