fix:合并分支冲突123

public/h5.html

@@ -75,7 +75,7 @@
     $(document).ready(function () {
         var BASIC_HOST_MAP = {
             dev: 'https://dev-heimdall.xiaomai5.com/',
-            dev1: 'https://dev1-heimdall.xiaomai5.com/',
+            dev1: 'https://dev-heimdall.xiaomai5.com/',
             rc: 'https://rc-heimdall.xiaomai5.com/',
             gray: 'https://gray-heimdall.xiaomai5.com/',
             prod: 'https://gateway.xiaomai5.com/'

src/components/ContactWidget.tsx

 import React, { ReactElement } from "react";
 import { Popover } from "antd";
 import { TooltipPlacement } from "antd/lib/tooltip";
+import { brandLogo,xfrwm } from '@/domains/brand/constants'
 import "./ContactWidget.less"
 
 interface ContactWidgetProps {
@@ -14,7 +15,7 @@ function Content() {
     return (
         <div className="contact-widget">
         <div className="qrcode">
-          <img src="https://cdn.xiaomai5.com/qixueyuankehu.png" alt=""></img>
+          <img src={xfrwm} alt=""></img>
           <div className="des">微信/企业微信扫码咨询</div>
         </div>
         <div className="phone"><svg style={{position:"relative",top:"2px",marginRight:"4px"}} viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M512.651 3.78c-281.433 0-509.21 228.324-509.21 509.209 0 281.43 228.325 509.203 509.21 509.203 281.427 0 509.202-228.317 509.202-509.203 0.55-280.885-227.775-509.21-509.202-509.21z m198.205 743.553c-36.14 36.136-169.737 1.641-302.24-130.312-131.953-131.959-165.902-266.104-129.768-301.695 31.211-31.21 68.99-85.417 125.939-14.782 56.943 70.629 29.016 90.34-3.291 122.647-22.449 22.448 24.642 79.392 73.37 128.125 49.283 48.73 105.678 95.818 128.126 73.368 32.306-32.305 52.017-60.23 122.646-3.288 71.182 56.949 16.426 95.276-14.782 125.937z" p-id="4409" fill="#999999"></path></svg>

src/domains/brand/constants.ts

@@ -38,6 +38,12 @@ const CorpType_MAP: any = {
 }
 
 
+const XF_RWM_MAP:any={
+    xiaomai:'https://cdn.xiaomai5.com/qixueyuankehu.png',
+    syoo:'https://image.xiaomaiketang.com/xm/Z2X2GTmKdj.png'
+}
+
+
 
 
 export const brandName: string = BrandNameMap[BRAND];
@@ -47,5 +53,6 @@ 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];
+export const xfrwm:string =XF_RWM_MAP[BRAND]
 window.brandName = BrandNameMap[BRAND];
 

src/modules/college-manage/LimitTip.tsx

 /*
  * @Author: your name
  * @Date: 2021-08-04 15:21:36
- * @LastEditTime: 2021-08-04 15:27:16
+ * @LastEditTime: 2021-08-04 15:23:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /xiaomai-cloud-class-web/src/modules/college-manage/LimitTip.tsx
@@ -34,7 +34,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>人)，将无法添加新员工、新学员，如需增加人数限制，请联系{window.brandName}服务平台。</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>

src/modules/root/CollegeManagePage.jsx

@@ -6,8 +6,8 @@ import User from "@/common/js/user";
 import { LIVE_SHARE } from "@/domains/course-domain/constants";
 import { Modal, message } from 'antd';
 import WechatApi from '@/common/js/wechatApi';
-import { brandLogo } from '@/domains/brand/constants'
 import WWOpenDataCom from '@/components/WWOpenData';
+import { brandLogo,xfrwm } from '@/domains/brand/constants'
 import './CollegeManagePage.less';
 import storage from '@/common/js/storage';
 
@@ -94,7 +94,7 @@ function ExpirationPopover(props) {
               }
 
               <div className="qrcode">
-                <img src="https://cdn.xiaomai5.com/qixueyuankehu.png" alt=""></img>
+                <img src={xfrwm} alt=""></img>
                 <div className="des">微信/企业微信扫码咨询</div>
               </div>
               <div className="phone"><svg style={{ position: "relative", top: "2px", marginRight: "4px" }} viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M512.651 3.78c-281.433 0-509.21 228.324-509.21 509.209 0 281.43 228.325 509.203 509.21 509.203 281.427 0 509.202-228.317 509.202-509.203 0.55-280.885-227.775-509.21-509.202-509.21z m198.205 743.553c-36.14 36.136-169.737 1.641-302.24-130.312-131.953-131.959-165.902-266.104-129.768-301.695 31.211-31.21 68.99-85.417 125.939-14.782 56.943 70.629 29.016 90.34-3.291 122.647-22.449 22.448 24.642 79.392 73.37 128.125 49.283 48.73 105.678 95.818 128.126 73.368 32.306-32.305 52.017-60.23 122.646-3.288 71.182 56.949 16.426 95.276-14.782 125.937z" p-id="4409" fill="#999999"></path></svg>