Merge branch 'feature/zhujian/0726/qwLiving' into dev

src/domains/brand/constants.ts

@@ -43,7 +43,10 @@ const XF_RWM_MAP: any = {
     syoo: 'https://image.xiaomaiketang.com/xm/Z2X2GTmKdj.png'
     syoo: 'https://image.xiaomaiketang.com/xm/Z2X2GTmKdj.png'
 }
 }
 
 
-
+const LiveNameMap: any = {
+    xiaomai: '小麦直播',
+    syoo: '商有直播'
+}
 
 
 
 
 export const brandName: string = BrandNameMap[BRAND];
 export const brandName: string = BrandNameMap[BRAND];
@@ -54,5 +57,6 @@ export const path: string = PATH_MAP[BRAND];
 export const live: string = LIVE_SHARE_MAP[BRAND];
 export const live: string = LIVE_SHARE_MAP[BRAND];
 export const corpType: string = CorpType_MAP[BRAND];
 export const corpType: string = CorpType_MAP[BRAND];
 export const xfrwm: string = XF_RWM_MAP[BRAND]
 export const xfrwm: string = XF_RWM_MAP[BRAND]
+export const brandLiveName: string = LiveNameMap[BRAND]
 window.brandName = BrandNameMap[BRAND];
 window.brandName = BrandNameMap[BRAND];
 
 

src/modules/course-manage/components/CreateWorkWXCourse.jsx

@@ -214,7 +214,7 @@ function CreateWorkWXCourse() {
     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;
@@ -441,7 +441,7 @@ function CreateWorkWXCourse() {
         <Breadcrumbs navList={type === 'add' ? '新建直播课' : '编辑直播课'} goBack={handleGoBack} />
         <Breadcrumbs navList={type === 'add' ? '新建直播课' : '编辑直播课'} goBack={handleGoBack} />
         <div className='box'>
         <div className='box'>
           <div className='show-tips'>
           <div className='show-tips'>
-            <ShowTips message='请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利' />
+            <ShowTips message={`请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，${window.brandName}保有依据国家规定及平台规则进行处理的权利`} />
           </div>
           </div>
           <div className='add-live-page__form'>
           <div className='add-live-page__form'>
             <div className='basic-info__wrap'>
             <div className='basic-info__wrap'>

src/modules/course-manage/components/LiveCourseFilter.jsx

@@ -14,6 +14,7 @@ import moment from 'moment'
 import StoreService from '@/domains/store-domain/storeService'
 import StoreService from '@/domains/store-domain/storeService'
 import User from '@/common/js/user'
 import User from '@/common/js/user'
 import './LiveCourseFilter.less'
 import './LiveCourseFilter.less'
+import { brandLiveName } from '@/domains/brand/constants'
 
 
 const { Search } = Input
 const { Search } = Input
 const { Option } = Select
 const { Option } = Select
@@ -325,7 +326,7 @@ class LiveCourseFilter extends React.Component {
                     </span>
                     </span>
                   }>
                   }>
                   <Option value='WECHAT'>企微直播</Option>
                   <Option value='WECHAT'>企微直播</Option>
-                  <Option value='TENCENT'>小麦直播</Option>
+                  <Option value='TENCENT'>{brandLiveName}</Option>
                 </Select>
                 </Select>
               </div>
               </div>
             )}
             )}

src/modules/course-manage/components/LiveCourseList.jsx

@@ -26,6 +26,7 @@ import RelatedPlanModal from '../modal/RelatedPlanModal';
 import ShareLiveModal from '../modal/ShareLiveModal';
 import ShareLiveModal from '../modal/ShareLiveModal';
 import Bus from '@/core/bus';
 import Bus from '@/core/bus';
 import './LiveCourseList.less';
 import './LiveCourseList.less';
+import { brandLiveName } from '@/domains/brand/constants';
 
 
 const { confirm } = Modal
 const { confirm } = Modal
 const courseStateShow = {
 const courseStateShow = {
@@ -234,7 +235,7 @@ class LiveCourseList extends React.Component {
           key: 'couseCatalog',
           key: 'couseCatalog',
           dataIndex: 'couseCatalog',
           dataIndex: 'couseCatalog',
           render: (val, item) => {
           render: (val, item) => {
-            return <div>{item.thirdPartType === "WECHAT" ? "企微直播":"小麦直播"}</div>;
+            return <div>{item.thirdPartType === "WECHAT" ? "企微直播":`${brandLiveName}`}</div>;
           },
           },
         },
         },
         {
         {

src/modules/course-manage/components/LiveModeSelect.tsx

 import React, { useState } from "react";
 import React, { useState } from "react";
 import "./LiveModeSelect.less"
 import "./LiveModeSelect.less"
 import { createPortal } from "react-dom";
 import { createPortal } from "react-dom";
+import { brandLiveName } from "@/domains/brand/constants";
 
 
 interface LiveModeSelectProps {
 interface LiveModeSelectProps {
     isShow: boolean;
     isShow: boolean;
@@ -32,8 +33,8 @@ export default function LiveModeSelect(props: LiveModeSelectProps) {
                 <div className="content">
                 <div className="content">
                 <div className="item xiaomai-logo">
                 <div className="item xiaomai-logo">
                     <div className="logo"></div>
                     <div className="logo"></div>
-                    <div className="item-title">小麦直播</div>
-                    <div className="des">通过小麦企学院“PC客户<br/>端”进行直播</div>
+                    <div className="item-title">{brandLiveName}</div>
+                    <div className="des">通过{window.brandName}“PC客户<br/>端”进行直播</div>
                     <div className="button" onClick={handleSelect0}>立即创建</div>
                     <div className="button" onClick={handleSelect0}>立即创建</div>
                 </div>
                 </div>
                 <div className="item qiwei-logo">
                 <div className="item qiwei-logo">