fix:合并分支

src/domains/basic-domain/constants.ts

@@ -16,7 +16,7 @@ const BASIC_HOST_MAP: MapInterface = {
   dev1: 'https://dev1-heimdall.xiaomai5.com/',
   dev1: 'https://dev1-heimdall.xiaomai5.com/',
   rc: 'https://rc-heimdall.xiaomai5.com/',
   rc: 'https://rc-heimdall.xiaomai5.com/',
   gray: 'https://gray-heimdall.xiaomai5.com/',
   gray: 'https://gray-heimdall.xiaomai5.com/',
-  prod: 'https://gateway-heimdall.xiaomai5.com/'
+  prod: 'https://gateway.xiaomai5.com/'
 };
 };
 
 
 // axios headers config
 // axios headers config

src/index.html

 <!--
 <!--
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-24 12:20:57
  * @Date: 2020-08-24 12:20:57
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-12 15:26:36
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-01-18 21:18:43
  * @Description: 
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
 -->
 -->

src/modules/personalInfo/index.tsx

@@ -2,7 +2,7 @@
  * @Author: zhangleyuan
  * @Author: zhangleyuan
  * @Date: 2020-11-27 15:06:31
  * @Date: 2020-11-27 15:06:31
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-01-11 19:19:03
+ * @LastEditTime: 2021-01-18 21:22:16
  * @Description: 描述一下
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */

src/modules/root/App.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2019-07-10 10:30:49
  * @Date: 2019-07-10 10:30:49
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-01-18 10:23:23
+ * @LastEditTime: 2021-01-18 21:22:33
  * @Description:
  * @Description:
  */
  */
 import React, { useContext, useEffect, useState } from 'react';
 import React, { useContext, useEffect, useState } from 'react';

src/modules/store-manage/StoreH5DecorationTab.jsx

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Author: wufan
  * @Date: 2020-11-30 10:47:38
  * @Date: 2020-11-30 10:47:38
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-01-18 14:53:17
+ * @LastEditTime: 2021-01-18 21:22:44
  * @Description: web店铺banner页面
  * @Description: web店铺banner页面
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */

src/routes/config/mainRoutes.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-04-29 10:26:32
  * @Date: 2020-04-29 10:26:32
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-01-18 10:26:58
+ * @LastEditTime: 2021-01-18 21:23:08
  * @Description: 内容线路由配置
  * @Description: 内容线路由配置
  */
  */
 import EmployeesManagePage from '@/modules/store-manage/EmployeesManagePage';
 import EmployeesManagePage from '@/modules/store-manage/EmployeesManagePage';
@@ -70,7 +70,6 @@ const mainRoutes = [
 		component:ResourceDisk,
 		component:ResourceDisk,
 		name: '资料云盘'
 		name: '资料云盘'
   },
   },
-
   {
   {
     path: '/switch-route',
     path: '/switch-route',
 		component: SwitchRoute,
 		component: SwitchRoute,