feat:解决合并代码后的冲突

src/domains/basic-domain/constants.ts

 /*
 /*
  * @Author: 陈剑宇
  * @Author: 陈剑宇
  * @Date: 2020-05-07 14:43:01
  * @Date: 2020-05-07 14:43:01
- * @LastEditTime: 2020-12-22 15:30:00
+ * @LastEditTime: 2020-12-22 15:32:32
  * @LastEditors: zhangleyuan
  * @LastEditors: zhangleyuan
  * @Description: 
  * @Description: 
  * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
  * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
@@ -9,7 +9,7 @@
 import { MapInterface } from '@/domains/basic-domain/interface'
 import { MapInterface } from '@/domains/basic-domain/interface'
 
 
 // 默认是 dev 环境
 // 默认是 dev 环境
-const ENV: string = process.env.DEPLOY_ENV || 'rc';
+const ENV: string = process.env.DEPLOY_ENV || 'dev';
 console.log("process.env.DEPLOY_ENV",process)
 console.log("process.env.DEPLOY_ENV",process)
 const BASIC_HOST_MAP: MapInterface = {
 const BASIC_HOST_MAP: MapInterface = {
   dev: 'https://dev-heimdall.xiaomai5.com/',
   dev: 'https://dev-heimdall.xiaomai5.com/',

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: zhangleyuan
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-22 15:27:33
+ * @LastEditTime: 2020-12-22 15:36:48
  * @Description:
  * @Description:
  */
  */
 import React, { useContext, useEffect, useState } from 'react';
 import React, { useContext, useEffect, useState } from 'react';
@@ -21,9 +21,11 @@ declare var window: any;
 const App: React.FC = (props: any) => {
 const App: React.FC = (props: any) => {
   const ctx: any = useContext(XMContext);
   const ctx: any = useContext(XMContext);
   const userId = User.getUserId();
   const userId = User.getUserId();
+  const { menuType , setMenuType} =useState(false)
   window.currentUserInstInfo = {adminId: "1305385165390426114", adminName: "吴帆", gender: "UNKNOWN", parentId: "1305385165390426114", roleRemark: "", instId: "1213001850820476929" }
   window.currentUserInstInfo = {adminId: "1305385165390426114", adminName: "吴帆", gender: "UNKNOWN", parentId: "1305385165390426114", roleRemark: "", instId: "1213001850820476929" }
   window.ctx = ctx;
   window.ctx = ctx;
 
 
+  
   useEffect(() => {
   useEffect(() => {
     getStoreAndUserInfo();
     getStoreAndUserInfo();
   },[userId])
   },[userId])

src/modules/root/Login.jsx

@@ -9,7 +9,6 @@ import User from '@/common/js/user';
 import BaseService from "@/domains/basic-domain/baseService";
 import BaseService from "@/domains/basic-domain/baseService";
 import axios  from 'axios';
 import axios  from 'axios';
 import _ from 'underscore';
 import _ from 'underscore';
-import BaseService from "@/domains/basic-domain/baseService";
 
 
 function Login(props) {
 function Login(props) {
   const [phone, setPhone] = useState(''); // 登录手机号
   const [phone, setPhone] = useState(''); // 登录手机号