'fix:合并分支冲突'

99d7b9e4 · zhujian · 1eb551e7 · 18e64979 · 99d7b9e4 · 99d7b9e4
Commit 99d7b9e4 authored Aug 01, 2021 by zhujian
28 changed files
--- a/config/env.js
+++ b/config/env.js
@@ -72,6 +72,7 @@ function getClientEnvironment(publicUrl) {
        // Useful for determining whether we’re running in production mode.
        // Most importantly, it switches React into the correct mode.
        NODE_ENV: process.env.NODE_ENV || 'development',
+        BRAND: process.env.BRAND || 'xiaomai',
        DEPLOY_ENV: process.env.DEPLOY_ENV,
        // Useful for resolving the correct path to static assets in `public`.
        // For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.

--- a/package.json
+++ b/package.json
@@ -93,6 +93,7 @@
    "style-loader": "0.23.1",
    "terser-webpack-plugin": "2.3.8",
    "ts-pnp": "1.1.6",
+    "better-npm-run": "^0.1.0",
    "typescript": "^4.0.2",
    "underscore": "^1.10.2",
    "url-loader": "2.3.0",
@@ -111,12 +112,30 @@
    "start:rc": "cross-env DEPLOY_ENV=rc node scripts/start.js",
    "start:gray": "cross-env DEPLOY_ENV=gray node scripts/start.js",
    "start:prod": "cross-env DEPLOY_ENV=prod node scripts/start.js",
-    "build:dev": "cross-env DEPLOY_ENV=dev node --max_old_space_size=4096 scripts/build.js",
+    "start:syoo": "better-npm-run  start:syoo",
+    "build:dev": "cross-env DEPLOY_ENV=dev node scripts/build.js",
    "build:dev1": "cross-env DEPLOY_ENV=dev node scripts/build.js",
    "build:rc": "cross-env DEPLOY_ENV=rc node scripts/build.js",
    "build:gray": "cross-env DEPLOY_ENV=gray node scripts/build.js",
+    "build:syoo": "better-npm-run  build:syoo",
    "build:prod": "cross-env DEPLOY_ENV=prod node scripts/build.js"
  },
+  "betterScripts": {
+    "start:syoo": {
+      "command": "node scripts/start.js",
+      "env": {
+        "DEPLOY_ENV": "",
+        "BRAND": "syoo"
+      }
+    },
+    "build:syoo": {
+      "command": "node scripts/build.js",
+      "env": {
+        "DEPLOY_ENV": "prod",
+        "BRAND": "syoo"
+      }
+    }
+  },
  "eslintConfig": {
    "extends": "react-app"
  },
@@ -154,4 +173,4 @@
      "pre-push": "node hooks/pre-commit.js"
    }
  }
 }
\ No newline at end of file
--- a/public/h5.html
+++ b/public/h5.html
@@ -104,11 +104,12 @@
        const appTermEnum = getParameterByName('appTermEnum');
        const code = getParameterByName('code');
        const ticket = getParameterByName('ticket');
+        const corpType = getParameterByName('corpType');
        if (!code) {
-            postJSON('hades/anon/hades/getCorpTrainSuiteId', {}, (res) => {
+            postJSON('hades/anon/hades/getCorpTrainSuiteId', { corpType }, (res) => {
                const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${res.result}&redirect_uri=${encodeURIComponent(location.href)}&response_type=code&scope=snsapi_privateinfo&state=STATE#wechat_redirect`
                location.href = url
            })

--- a/src/common/js/axios.ts
+++ b/src/common/js/axios.ts
@@ -8,7 +8,7 @@
 */
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosPromise, AxiosError } from 'axios';
 import { message, Modal } from 'antd';
+import { corpType } from '@/domains/brand/constants'
 import { BASIC_HOST, TIME_OUT, USER_TYPE, VERSION, PROJECT } from '@/domains/basic-domain/constants';
 import User from './user';
@@ -24,12 +24,12 @@ interface FetchOptions {
  requestType: string,   // 请求类型  form为表单类型   json为json类型，默认json类型
  reject: boolean,
 }
-interface HeadersType{
+interface HeadersType {
-  storeId?:any,
+  storeId?: any,
-  storeUserId?:any,
+  storeUserId?: any,
-  userId?:any,
+  userId?: any,
-  xmtoken?:any,
+  xmtoken?: any,
-  enterpriseId?:string|null
+  enterpriseId?: string | null
 }
 class Axios {
  static post(
@@ -40,18 +40,18 @@ class Axios {
  ): Promise<any> {
    const _url = `${url}?storeId=${User.getStoreId()}&token=${User.getToken()}&storeUserId=${User.getStoreUserId()}&userId=${User.getUserId()}`;
    return new Promise((resolve, reject) => {
-      let headerObject:HeadersType={};
+      let headerObject: HeadersType = {};
-      if(User.getStoreId()){
+      if (User.getStoreId()) {
-        headerObject.storeId =  User.getStoreId();
+        headerObject.storeId = User.getStoreId();
      }
-      if(User.getStoreUserId()){
+      if (User.getStoreUserId()) {
-        headerObject.storeUserId =  User.getStoreUserId();
+        headerObject.storeUserId = User.getStoreUserId();
      }
-      if(User.getUserId()){
+      if (User.getUserId()) {
-        headerObject.userId =  User.getUserId();
+        headerObject.userId = User.getUserId();
      }
-      if(User.getToken()){
+      if (User.getToken()) {
-        headerObject.xmtoken =  User.getToken();
+        headerObject.xmtoken = User.getToken();
      }
      if (User.getEnterpriseId()) {
        headerObject.enterpriseId = User.getEnterpriseId();
@@ -65,7 +65,7 @@ class Axios {
          'Content-Type': options.requestType === 'form' ? 'application/x-www-form-urlencoded' : 'application/json; charset=UTF-8',
        }
      });
      if (method !== 'GET' && options.requestType === 'form') {
        instance.defaults.transformRequest = [(queryParam): string => {
          let ret: string = '';
@@ -92,8 +92,8 @@ class Axios {
        const { message: ResMessage, success, resultMsg, code: resultCode } = response.data;
        if (resultCode === "CROP_DEPLOY_PAST_BETTER") {
          Modal.warning({
-            title:"服务已到期",
+            title: "服务已到期",
-            content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
+            content: `当前企业购买的${window.brandName}服务已到期，如需继续使用学院功能，请尽快续费购买`,
            okText: "我知道了"
          })
        } else if (success || resultCode === 0) {
@@ -104,24 +104,24 @@ class Axios {
        return Promise.reject(response.data);
      }, (error): AxiosPromise => {
        const requestStatus = error.request.status
-        switch (requestStatus){
+        switch (requestStatus) {
          case 401:
            User.removeUserId();
            User.removeToken();
            window.RCHistory.replace('/login');
-          break;
+            break;
          case 403:
            message.error('暂无查看权限');
            window.RCHistory.replace('/login');
            return Promise.reject();
-          break;
+            break;
          case 504:
            message.error('网络状况不稳定，如果出现数据异常，请刷新页面');
            Promise.reject();
-          break;
+            break;
          default:
            message.error(error.message);
-          break;
+            break;
        }
        return Promise.reject(error.message);
      });
@@ -130,7 +130,7 @@ class Axios {
      if (method === 'GET') {
        config = Object.assign({ params, url: `${BASIC_HOST}${_url}`, method });
      } else {
-        config = Object.assign({ data: params, url: `${BASIC_HOST}${_url}`, method });
+        config = Object.assign({ data: { corpType, ...(params || {}) }, url: `${BASIC_HOST}${_url}`, method });
      }
      instance(config).then((res: AxiosResponse): void => {

--- a/src/domains/basic-domain/constants.ts
+++ b/src/domains/basic-domain/constants.ts
@@ -7,10 +7,11 @@
 * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
 */
 import { MapInterface } from '@/domains/basic-domain/interface'
+import { path,live } from '@/domains/brand/constants'
 // 默认是 dev 环境
 const ENV: string = process.env.DEPLOY_ENV || 'dev'
-console.log('process.env.DEPLOY_ENV', process)
+console.log('process.env.DEPLOY_ENV', process.env, ENV, 'hjkkkk')
 const BASIC_HOST_MAP: MapInterface = {
  dev: 'https://dev-heimdall.xiaomai5.com/',
  dev1: 'https://dev1-heimdall.xiaomai5.com/',
@@ -23,7 +24,7 @@ const PATH_MAP: MapInterface = {
  dev1: 'https://dev.xiaomai5.com/xiaomai-cloud-class-web/h5.html',
  rc: 'https://rc.xiaomai5.com/xiaomai-cloud-class-web/h5.html',
  gray: 'https://res.xiaomai0.com/xiaomai-cloud-class-web/gray/h5.html',
-  prod: 'https://res.xiaomai0.com/xiaomai-cloud-class-web/h5.html',
+  prod: path,
 }
 export const YZ_APPId = "yozoqvpO2Hvz8346";

--- a/src/domains/brand/constants.ts
+++ b/src/domains/brand/constants.ts
+export const BRAND: any = process.env.BRAND;
+const BrandNameMap: any = {
+    xiaomai: '小麦企学院',
+    syoo: '云课堂'
+}
+const BrandIconMap: any = {
+    xiaomai: 'https://image.xiaomaiketang.com/xm/bFkRBz7teA.png',
+    syoo: 'https://image.xiaomaiketang.com/xm/PfDseQHZtB.png'
+}
+const BrandLogoMap: any = {
+    xiaomai: 'https://image.xiaomaiketang.com/xm/6k8PPCmywG.png',
+    syoo: 'https://image.xiaomaiketang.com/xm/T7NRKwrfQE.png'
+}
+const BrandBannerMap: any = {
+    xiaomai: 'https://image.xiaomaiketang.com/xm/CDCcdAdaPs.png',
+    syoo: 'https://image.xiaomaiketang.com/xm/DzMHpX7GWF.png'
+}
+const PATH_MAP: any = {
+    prod: 'https://res.xiaomai0.com/xiaomai-cloud-class-web/h5.html',
+    syoo: 'https://res.xiaomai0.com/xiaomai-cloud-class-web/h5.html',
+}
+const LIVE_SHARE_MAP: any = {
+    xiaomai: 'https://res.xiaomai0.com/store-live/index.html#/',
+    syoo: 'https://res.xiaomai0.com/store-live/index.html#/',
+}
+const CorpType_MAP: any = {
+    xiaomai: 'X_Mai',
+    syoo: 'S_You',
+}
+export const brandName: string = BrandNameMap[BRAND];
+export const brandIcon: string = BrandIconMap[BRAND];
+export const brandLogo: string = BrandLogoMap[BRAND];
+export const brandBanner: string = BrandBannerMap[BRAND];
+export const path: string = PATH_MAP[BRAND];
+export const live: string = LIVE_SHARE_MAP[BRAND];
+export const corpType: string = CorpType_MAP[BRAND];
+window.brandName = BrandNameMap[BRAND];
--- a/src/domains/course-domain/constants.ts
+++ b/src/domains/course-domain/constants.ts
@@ -7,6 +7,7 @@
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
 import { MapInterface } from '@/domains/basic-domain/interface'
+import { path, live } from '@/domains/brand/constants'
 const ENV: string = process.env.DEPLOY_ENV || 'dev';
 const appIdMap: MapInterface = {
@@ -14,7 +15,7 @@ const appIdMap: MapInterface = {
  dev1: 'wx3ea60e78ddfa277e',
  rc: 'wx5c5a1fb71ecab7bc',
  gray: "wx3dda02036493ada6", // 小麦校讯通
-  prod: 'wx3dda02036493ada6'
+  prod: 'wx3dda02036493ada6',
 }
 const shareUrlMap: MapInterface = {
@@ -22,7 +23,7 @@ const shareUrlMap: MapInterface = {
  'dev1': 'https://dev.xiaomai5.com/share/show?appid=',
  'rc': 'https://rc.xiaomai5.com/share/show?appid=',
  'prod': 'https://prod.xiaomai5.com/share/show?appid=',
-  'gray': 'https://prod.xiaomai5.com/share/show?appid='
+  'gray': 'https://prod.xiaomai5.com/share/show?appid=',
 }
 const LIVE_SHARE_MAP: MapInterface = {
@@ -30,7 +31,7 @@ const LIVE_SHARE_MAP: MapInterface = {
  dev1: 'https://dev.xiaomai5.com/store-live/index.html#/',
  rc: 'https://rc.xiaomai5.com/store-live/index.html#/',
  gray: 'https://res.xiaomai0.com/store-live/gray/index.html#/',
-  prod: 'https://res.xiaomai0.com/store-live/index.html#/',
+  prod: live,
 }

--- a/src/index.html
+++ b/src/index.html
@@ -22,7 +22,8 @@
      content="小麦企学院,企业培训,员工培训,企业大学,企业内训,企业外训,培训计划,培训素材,企培,企训,素材库,培训课程,培训任务,直播课,线上课,图文课,线下活动,知识库,作业,考试,排行榜,培训类别管理,定制培训计划,管理数据,学习数据,企学院,资料共享,培训数字化,数字化培训,培训工具,在线培训,线上培训,培训saas,培训管理,企业微信培训,对客培训,客户培训,直播培训,互联网培训,新员工培训,管理培训,管理者培训,工人培训,制造业培训,餐饮培训,服务业培训,零售培训,门店培训,工厂培训,车间培训,培训补贴,人事培训,财务培训,职场培训,企业学院平台,教育企业学院,教育企业平台,教育平台学院,企业学习,酷学院,小鹅通,企业学院,云学堂,时代光华,云课堂,魔学院,云大学,米知云,授课学堂"
    />
    <!-- <link rel="apple-touch-icon" href="../src/common/images/logo.png" /> -->
-    <link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/c4KiP2epBP.png" />
+    <!-- <link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/c4KiP2epBP.png" /> -->
+    <!-- <link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/WGWCtxiGzE.png"> -->
    <!--
      manifest.json provides metadata used when your web app is installed on a

--- a/src/index.tsx
+++ b/src/index.tsx
@@ -23,12 +23,24 @@ import '@/core/xmTD';
 import User from '@/common/js/user';
 import Service from "@/common/js/service";
 import BaseService from '@/domains/basic-domain/baseService';
+import {brandName,BRAND,brandIcon} from '@/domains/brand/constants'
 declare var getParameterByName: any;
 declare var window: any;
 window.currentStoreUserInfo = {}
 const history = createHashHistory();
+document.title=brandName;
+var  iconUrl ='https://image.xiaomaiketang.com/xm/WGWCtxiGzE.png'
+if(BRAND !='xiaomai'){
+  iconUrl =brandIcon
+}
+var linkzh = document.createElement('link');
+linkzh.setAttribute('rel',"shortcut icon");
+linkzh.setAttribute('href',iconUrl);
+document.head.appendChild(linkzh);
 window.RCHistory = _.extend({}, history, {
  push: (obj: any) => {
    history.push(obj)

--- a/src/modules/college-manage/LimitTip.tsx
+++ b/src/modules/college-manage/LimitTip.tsx
@@ -26,7 +26,7 @@ export default function LimitTip(props:{total:number,type:string,tip:() => React
        {
          isOver ? (
            <>
-            <div style={{marginLeft:"14px",display:"inline-block"}}>当前企业使用人数已达到上限 (<span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人)，将无法添加新员工、新学员，如需增加人数限制，请联系小麦企学院服务平台。</div>
+            <div style={{marginLeft:"14px",display:"inline-block"}}>{`当前企业使用人数已达到上限 (<span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人)，将无法添加新员工、新学员，如需增加人数限制，请联系${window.brandName}服务平台。`}</div>
            <ContactWidget trigger="hover" placement="bottom">
              <div className="renew-text">立即续费<span className="icon iconfont" style={{fontSize:"10px"}}>&#59291;</span></div>
            </ContactWidget>

--- a/src/modules/course-manage/AddLive.jsx
+++ b/src/modules/course-manage/AddLive.jsx
@@ -279,7 +279,7 @@ class AddLive extends React.Component {
    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
      Modal.warning({
        title: '服务已到期',
-        content: '当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买',
+        content: `当前企业购买的${window.brandName}服务已到期，如需继续使用学院功能，请尽快续费购买`,
        okText: '我知道了',
      });
      return;
@@ -541,7 +541,7 @@ class AddLive extends React.Component {
        <Breadcrumbs navList={type == 'add' ? '新建直播课' : '编辑直播课'} goBack={this.handleGoBack} />
        <div className='box'>
          <div className='show-tips'>
-            <ShowTips message='请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利' />
+            <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
          </div>
          <div className='add-live-page__form'>
            <div className='basic-info__wrap'>

--- a/src/modules/course-manage/graphics-course/AddGraphicsCourse.jsx
+++ b/src/modules/course-manage/graphics-course/AddGraphicsCourse.jsx
@@ -280,7 +280,7 @@ class AddGraphicsCourse extends React.Component {
    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
      Modal.warning({
        title: '服务已到期',
-        content: '当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买',
+        content: `当前企业购买的${window.brandName}服务已到期，如需继续使用学院功能，请尽快续费购买`,
        okText: '我知道了',
      })
      return
@@ -423,7 +423,7 @@ class AddGraphicsCourse extends React.Component {
        <div className='box'>
          <div className='show-tips'>
-            <ShowTips message='请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利' />
+            <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
          </div>
          <div className='form'>

--- a/src/modules/course-manage/offline-course/AddOfflineCourse.jsx
+++ b/src/modules/course-manage/offline-course/AddOfflineCourse.jsx
@@ -373,7 +373,7 @@ class AddOfflineCourse extends React.Component {
    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
      Modal.warning({
        title: '服务已到期',
-        content: '当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买',
+        content: `当前企业购买的${window.brandName}服务已到期，如需继续使用学院功能，请尽快续费购买`,
        okText: '我知道了',
      })
      return
@@ -711,7 +711,7 @@ class AddOfflineCourse extends React.Component {
        <div className='box'>
          <div className='show-tips'>
-            <ShowTips message='请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利' />
+            <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
          </div>
          <div className='form'>

--- a/src/modules/course-manage/video-course/AddVideoCourse.jsx
+++ b/src/modules/course-manage/video-course/AddVideoCourse.jsx
@@ -387,15 +387,15 @@ class AddVideoCourse extends React.Component {
  // 保存
  handleSubmit = () => {
-    //过期判断
+        //过期判断
-    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
+        if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
-      Modal.warning({
+          Modal.warning({
-        title: '服务已到期',
+            title:"服务已到期",
-        content: '当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买',
+            content:`当前企业购买的${window.brandName}服务已到期，如需继续使用学院功能，请尽快续费购买`,
-        okText: '我知道了',
+            okText: "我知道了"
-      })
+          })
-      return
+          return
-    }
+        }
    const {
      id,
@@ -719,7 +719,7 @@ class AddVideoCourse extends React.Component {
        <div className='box'>
          <div className='show-tips'>
-            <ShowTips message='请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利' />
+            <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
          </div>
          <div className='form'>

--- a/src/modules/home/HomeTip.tsx
+++ b/src/modules/home/HomeTip.tsx
@@ -7,59 +7,59 @@ import moment from "moment";
 export default function HomeTip() {
-    const [isOverNum, setIsOverNum] = useState<boolean>(false)
+  const [isOverNum, setIsOverNum] = useState<boolean>(false)
-    const [tipType, setTipType] = useState(0) //0不显示1即将过期2已过期
+  const [tipType, setTipType] = useState(0) //0不显示1即将过期2已过期
-    const [expirationTime, setExpirationTime] = useState("")
+  const [expirationTime, setExpirationTime] = useState("")
-    const [surplusDay, setSurplusDay] = useState(0)
+  const [surplusDay, setSurplusDay] = useState(0)
-    const versionInfo = useContext(VersionContext)
+  const versionInfo = useContext(VersionContext)
-    useEffect(()=> {
+  useEffect(() => {
-      if (versionInfo) {
+    if (versionInfo) {
-        setIsOverNum(versionInfo.userNum === -1 ? false : versionInfo.whetherReachUserNum)
+      setIsOverNum(versionInfo.userNum === -1 ? false : versionInfo.whetherReachUserNum)
-        setSurplusDay(versionInfo.surplusDayTime)
+      setSurplusDay(versionInfo.surplusDayTime)
-        setExpirationTime(versionInfo.validEndTime)
+      setExpirationTime(versionInfo.validEndTime)
-        if (versionInfo.stateEnum === "NO") {
+      if (versionInfo.stateEnum === "NO") {
-            setTipType(2)
+        setTipType(2)
-          } else if (versionInfo.surplusDayTime === 30 || versionInfo.surplusDayTime <= 7) {
+      } else if (versionInfo.surplusDayTime === 30 || versionInfo.surplusDayTime <= 7) {
-            setTipType(1)
+        setTipType(1)
-          }
      }
+    }
-    },[versionInfo])
+  }, [versionInfo])
-    return (
-      <div className="home-tip">
+  return (
-        {
+    <div className="home-tip">
-          (isOverNum || tipType !== 0) &&
+      {
+        (isOverNum || tipType !== 0) &&
        <div className="tip">
          <Carousel dotPosition="left" dots={false} autoplay={true} autoplaySpeed={5000}>
            {
              isOverNum && (
                <div className="content">
-                  <span className="icon iconfont" style={{color:"#FF4F4F",marginRight:"8px"}}>&#xe61d;</span>温馨提示：企业使用人数已达上限，将无法新增员工、学员，如需增加人数限制，请联系小麦企学院服务平台。
+                  <span className="icon iconfont" style={{ color: "#FF4F4F", marginRight: "8px" }}>&#xe61d;</span>{`温馨提示：企业使用人数已达上限，将无法新增员工、学员，如需增加人数限制，请联系${window.brandName}服务平台。`}
-                  <ContactWidget placement="bottom" trigger="hover"><div className="renew-btn">立即续费</div></ContactWidget> 
+                  <ContactWidget placement="bottom" trigger="hover"><div className="renew-btn">立即续费</div></ContactWidget>
                </div>
              )
            }
            {
              tipType === 2 && (
                <div className="content">
-                  <span className="icon iconfont" style={{color:"#FF4F4F",marginRight:"8px"}}>&#xe61d;</span>版本到期提醒：当前企业购买的小麦企学院服务已于{moment(versionInfo?.validEndTimeST).format("YYYY-MM-DD HH:mm:ss")}到期，到期后仍可访问，但功能不可使用，建议尽快续费购买哦~
+                  <span className="icon iconfont" style={{ color: "#FF4F4F", marginRight: "8px" }}>&#xe61d;</span>版本到期提醒：当前企业购买的{`${window.brandName}`}服务已于{moment(versionInfo?.validEndTimeST).format("YYYY-MM-DD HH:mm:ss")}到期，到期后仍可访问，但功能不可使用，建议尽快续费购买哦~
-                  <ContactWidget placement="bottom" trigger="hover"><div className="renew-btn">立即续费</div></ContactWidget> 
+                  <ContactWidget placement="bottom" trigger="hover"><div className="renew-btn">立即续费</div></ContactWidget>
                </div>
              )
            }
            {
              tipType === 1 && (
                <div className="content">
-                  <span className="icon iconfont" style={{color:"#FF4F4F",marginRight:"8px"}}>&#xe61d;</span>当前企业购买的小麦企学院服务仅剩{surplusDay}天（于{expirationTime}到期），为了不影响使用，建议尽快续费购买哦~
+                  <span className="icon iconfont" style={{ color: "#FF4F4F", marginRight: "8px" }}>&#xe61d;</span>当前企业购买的{`${window.brandName}`}服务仅剩{surplusDay}天（于{expirationTime}到期），为了不影响使用，建议尽快续费购买哦~
-                  <ContactWidget placement="bottom" trigger="hover"><div className="renew-btn">立即续费</div></ContactWidget> 
+                  <ContactWidget placement="bottom" trigger="hover"><div className="renew-btn">立即续费</div></ContactWidget>
                </div>
              )
            }
          </Carousel>
        </div>
-        }
+      }
    </div>
-    )
+  )
-  }
+}
\ No newline at end of file
--- a/src/modules/knowledge-base/components/KnowledgeBaseList.jsx
+++ b/src/modules/knowledge-base/components/KnowledgeBaseList.jsx
@@ -22,7 +22,6 @@ import "./KnowledgeBaseList.less";
 const DEFAULT_SIZE_UNIT = 1000 * 1000 // 将B转换成M
 const { confirm } = Modal
-const ENV = process.env.DEPLOY_ENV || "dev"
 class KnowledgeBaseList extends React.Component {
  constructor(props) {

--- a/src/modules/knowledge-base/modal/VideoList.jsx
+++ b/src/modules/knowledge-base/modal/VideoList.jsx
@@ -19,7 +19,6 @@ import "./LiveList.less";
 import CourseService from "@/domains/course-domain/CourseService";
 import User from "@/common/js/user";
-const ENV = process.env.DEPLOY_ENV || "dev";
 class VideoList extends React.Component {
  constructor(props) {

--- a/src/modules/plan-manage/AddPlan.jsx
+++ b/src/modules/plan-manage/AddPlan.jsx
@@ -281,7 +281,7 @@ function AddPlan() {
      <Breadcrumbs navList={type == 'add' ? '新建培训计划' : '编辑培训计划'} goBack={handleGoBack} />
      <div className='box'>
        <div className='show-tips'>
-          <ShowTips message='请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利' />
+          <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
        </div>
        <div className='add-plan-page__form'>
          <div className='basic-info__wrap'>

--- a/src/modules/root/CollegeManagePage.jsx
+++ b/src/modules/root/CollegeManagePage.jsx
--- a/src/modules/root/CreateCollege.jsx
+++ b/src/modules/root/CreateCollege.jsx
@@ -6,6 +6,7 @@ import BaseService from "@/domains/basic-domain/baseService";
 import User from "@/common/js/user";
 import Breadcrumbs from "@/components/Breadcrumbs";
 import ImgClipModal from '@/components/ImgClipModal'
+import { brandLogo } from '@/domains/brand/constants'
 import './CreateCollege.less';
 let cutFlag = false;
@@ -16,7 +17,7 @@ export default class CreateCollege extends React.Component {
    super(props);
    this.state = {
      avatar: 'https://image.xiaomaiketang.com/xm/rJeQaZxtc7.png',
-      logo: 'https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png',
+      logo: brandLogo,
      name: '',
      enterpriseId: User.getEnterpriseId(),
      imageFile: null, // 需要被截取的图片
@@ -111,7 +112,7 @@ export default class CreateCollege extends React.Component {
      <div className="college-manage-page">
        <div className="college-header">
          <div className="box">
-            <img className="box-image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png" />
+            <img className="box-image" src={brandLogo} />
          </div>
        </div>
        <div className="breadcrumb-wrap">
@@ -134,7 +135,7 @@ export default class CreateCollege extends React.Component {
                className="icon iconfont"
                onClick={() => {
                  this.setState({
-                    logo: 'https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png',
+                    logo: brandLogo,
                    visible: false,
                  })
                }}

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -9,7 +9,7 @@ import BaseService from '@/domains/basic-domain/baseService';
 import storage from '@/common/js/storage';
 import axios from 'axios';
 import _ from 'underscore';
-import user from '@/common/js/user';
+import {brandLogo,brandBanner} from '@/domains/brand/constants'
 const { TabPane } = Tabs;
 function Login(props) {
@@ -156,12 +156,12 @@ function Login(props) {
  return (
    <div className='login-page'>
      <div className='logo-img-box'>
-        <img src='https://image.xiaomaiketang.com/xm/6k8PPCmywG.png' className='logo-img' />
+        <img src={brandLogo} className='logo-img' />
      </div>
      <div className='login-main'>
        <div className='left-banner'>
          <div className='img-box'>
-            <img src='https://image.xiaomaiketang.com/xm/CDCcdAdaPs.png' alt='' />
+            <img src={brandBanner} alt='' />
          </div>
        </div>
        <div className='login-box'>

--- a/src/modules/root/Menu.tsx
+++ b/src/modules/root/Menu.tsx
@@ -12,6 +12,7 @@ import classNames from 'classnames';
 import User from "@/common/js/user"
 import _ from 'underscore';
 import tBus from '@/core/tbus'
+import { brandLogo } from '@/domains/brand/constants'
 import "./Menu.less";
 import { display } from 'html2canvas/dist/types/css/property-descriptors/display';
 import ContactWidget from '@/components/ContactWidget';
@@ -157,7 +158,7 @@ function Aside(props: any) {
    if (User.getToken()) {
      StoreService.getStoreDetail({ storeId: User.getStoreId() }).then((res) => {
        if (_.isEmpty(res.result.logo)) {
-          setTopLogoUrl('https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png');
+          setTopLogoUrl(brandLogo);
        } else {
          setTopLogoUrl(res.result.logo);
        }

--- a/src/modules/root/WechatLogin.tsx
+++ b/src/modules/root/WechatLogin.tsx
@@ -2,9 +2,9 @@ import React, { useState, useRef, useEffect } from 'react';
 import qrcode from '@/libs/qrcode/qrcode.js';
 import Service from '@/common/js/service';
 import User from '@/common/js/user';
-import { PATH } from '@/domains/basic-domain/constants';
+import { PATH, corpType } from '@/domains/basic-domain/constants';
 import './WechatLogin.less';
-const Logo = require('@/common/images/logo.png');
+import { brandName, BRAND, brandIcon, brandLogo } from '@/domains/brand/constants'
 declare var location: any;
 declare var window: any;
 export default function WechatLogin(props: any) {
@@ -26,13 +26,13 @@ export default function WechatLogin(props: any) {
    if (status === 0) {
      Service.Hades('anon/hades/getTicket', {}).then((res: any) => {
        setTicket(res.result);
-        const redirect = `${PATH}?ticket=${res.result}&appTermEnum=XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN&env=${process.env.DEPLOY_ENV || 'dev'}`;
+        const redirect = `${PATH}?ticket=${res.result}&appTermEnum=XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN&env=${process.env.DEPLOY_ENV || 'dev'}&corpType=${corpType}`;
        const qrcodeWrapDom: any = document.querySelector('#qrcode');
        let qrnode = new qrcode({
          text: redirect,
          correctLevel: 2,
          size: 180,
-          image: 'https://image.xiaomaiketang.com/xm/bFkRBz7teA.png',
+          image: brandIcon,
          imageSize: 50,
        });
        qrcodeWrapDom.innerHTML = '';

--- a/src/modules/store-manage/EmployeesManagePage.tsx
+++ b/src/modules/store-manage/EmployeesManagePage.tsx
@@ -266,7 +266,7 @@ function EmployeesManagePage() {
  function handleDeleteWorkWechatEmployeeConfirm(record: RecordTypes) {
    return confirm({
      title: "你确定要删除此员工吗？",
-      content: "管理员需在企业微信后台的“小麦企学院”应用管理中移除此员工，此员工才无法继续登陆小麦企学院",
+      content:`管理员需在企业微信后台的“${window.brandName}”应用管理中移除此员工，此员工才无法继续登陆${window.brandName}`,
      icon: (
        <span className="icon iconfont default-confirm-icon">&#xe839; </span>
      ),

--- a/src/modules/teach-tool/examination-manager/AddExam.tsx
+++ b/src/modules/teach-tool/examination-manager/AddExam.tsx
@@ -84,7 +84,7 @@ function AddExam(props: any) {
            tenantId: User.getStoreId(),
            source: 0,
        }
-        Service.Hades('public/hades/queryExamPageList', param).then(res=> {
+        Service.Hades('public/hades/queryExamPageList', param).then(res => {
            const { result = {} } = res;
            setExamList(result.records || [])
        })
@@ -155,7 +155,7 @@ function AddExam(props: any) {
            return
        }
-        if(checkExist(param.examName)) {
+        if (checkExist(param.examName)) {
            message.warning('此考试名称已存在');
            return
        }
@@ -275,14 +275,14 @@ function AddExam(props: any) {
    // 校验考试名称是否存在
    function checkExist(examName: any) {
-        var result:any = null;
+        var result: any = null;
-        examList.length > 0 && examList.forEach((item:any) => {
+        examList.length > 0 && examList.forEach((item: any) => {
            if (result != null) {
                return result;
            }
            if (props.type === 'edit') {
                if (item.examName === examName && item.examId !== match.params.id) {
-                result = item;
+                    result = item;
                }
            } else {
                if (item.examName === examName) {
@@ -314,9 +314,9 @@ function AddExam(props: any) {
        <Breadcrumbs navList={title} goBack={handleGoBack} />
        <div className="box">
-        <div className="show-tips">
+            <div className="show-tips">
-            <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" />
+                <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
-          </div>            <div className="form">
+            </div>            <div className="form">
                <div className="title">基本信息</div>
                <Form
                    labelCol={{ span: 3 }}
@@ -324,7 +324,7 @@ function AddExam(props: any) {
                    layout="horizontal"
                >
                    <Form.Item label="考试名称"
-                        validateStatus={(check && (!examName || (examName.length > 40 || checkExist(examName)) )) ? 'error' : ''}
+                        validateStatus={(check && (!examName || (examName.length > 40 || checkExist(examName)))) ? 'error' : ''}
                        help={check && (!examName ? '请输入考试名称' : (examName.length > 40 ? '考试名称最多40字' : (checkExist(examName) && '此考试名称已存在')))}
                        required>
@@ -458,7 +458,7 @@ function AddExam(props: any) {
                                onChange={(val) => { setNeedPhone(val ? 'NEED_PHONE_VERIFY' : 'DO_NOT_NEED_PHONE_VERIFY') }}
                            ></Switch>
                            <div style={{ position: 'relative', left: 8, color: "#999" }}>
-                              {needPhone == 'NEED_PHONE_VERIFY' ? '已开启，学员需绑定手机号才可参与考试' : '已关闭，学员无需绑定手机号即可参与考试'}
+                                {needPhone == 'NEED_PHONE_VERIFY' ? '已开启，学员需绑定手机号才可参与考试' : '已关闭，学员无需绑定手机号即可参与考试'}
                            </div>
                        </div>
                    </Form.Item>
@@ -470,7 +470,7 @@ function AddExam(props: any) {
                                onChange={(val) => { setNeedOptionDisorder(val ? 'OPTION_RANDOM' : 'OPTION_SORT') }}
                            ></Switch>
                            <div style={{ position: 'relative', left: 8, color: "#999" }}>
-                              {needOptionDisorder == 'OPTION_RANDOM' ? '已开启，选项随机排序' : '已关闭，选项按设置顺序排序'}
+                                {needOptionDisorder == 'OPTION_RANDOM' ? '已开启，选项随机排序' : '已关闭，选项按设置顺序排序'}
                            </div>
                        </div>

--- a/src/modules/teach-tool/paper-manage/OperatePaper.jsx
+++ b/src/modules/teach-tool/paper-manage/OperatePaper.jsx
@@ -826,7 +826,7 @@ class OperatePaper extends Component {
          <Spin spinning={loading}>
            <div className='box'>
              <div className='show-tips'>
-                <ShowTips message='请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利' />
+                <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
              </div>
              <Form ref={this.formRef} style={{ marginTop: 24, marginBottom: '85px' }}>
                <Form.Item

--- a/src/modules/teach-tool/question-manage/OperateQuestion.jsx
+++ b/src/modules/teach-tool/question-manage/OperateQuestion.jsx
@@ -303,7 +303,7 @@ class OperateQuestion extends Component {
        />
        <div className="box">
          <div className="show-tips">
-            <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" />
+            <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
          </div>
          <Tabs
            style={{ marginTop: 32 }}

--- a/src/modules/teach-tool/question-manage/modal/BatchImportQuestionModal.jsx
+++ b/src/modules/teach-tool/question-manage/modal/BatchImportQuestionModal.jsx
@@ -53,7 +53,7 @@ class BatchImportQuestionModal extends Component {
    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
      Modal.warning({
        title:"服务已到期",
-        content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
+        content: `当前企业购买的${window.brandName}服务已到期，如需继续使用学院功能，请尽快续费购买`,
        okText: "我知道了"
      })
      return