resolve conflict

src/components/Index/index.js

@@ -238,7 +238,7 @@ class Index extends Component {
         <HomeCourseList modules={this.state.modules} />
         <TeacherList />
         <p className="borderTop" />
-        {/* <botton className="fix"><a href="http://q.url.cn/s/Vbkup6m?_type=wpa"><span>点击</span><span>咨询</span></a></botton> */}
+        {/* <botton className="fix"><a href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"><span>点击</span><span>咨询</span></a></botton> */}
         <Teaching />
 
         {/* <AllCourseNavigation /> */}

src/components/Index/tercher/index.js

@@ -8,71 +8,76 @@ class TeacherList extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      data:[],
-      active: '',
+      data: [],
+      active: "",
       isToggleOn: false,
-      liClass1:''
+      liClass1: "",
     }
-
   }
-  bgChange = index => {
-    console.log(index,999)
+  bgChange = (index) => {
+    console.log(index, 999)
     this.setState({
-        active: index,
-    });
-    this.setState(prevState => ({
+      active: index,
+    })
+    this.setState((prevState) => ({
       isToggleOn: !prevState.isToggleOn,
-      liClass1: prevState.isToggleOn ? '': 'active1'
-    }));
-};
+      liClass1: prevState.isToggleOn ? "" : "active1",
+    }))
+  }
 
   componentDidMount() {
-    
     http.get(`${API.home}/m/mobTeachers`).then((res) => {
       if (res.data.code === 200) {
         this.setState({
-          data:res.data.data
-        });
+          data: res.data.data,
+        })
       } else {
         Toast.info(res.data.msg, 2)
       }
     })
   }
 
-
   render() {
-    const { active,liClass1,isToggleOn } = this.state;
+    const { active, liClass1, isToggleOn } = this.state
     return (
       <div className="teacher">
-      <p className="cont">超强师资团队</p>
-      <div className="teabox">
-      {this.state.data.map((item, i) => {
-        const liClass = active === i && isToggleOn? 'active1' : '';
-        // const liClass1 = isToggleOn ? 'active1' : '';
-        return <div key={i} className={`tealist ${liClass}`} onClick={() => {
-          this.bgChange(i);
-      }}>
-          <div className="pic">
-            <img src={item.thumb_img} alt=""/>
-          </div>
-          <div className="detail">
-            <h2 className="name"><b>{item.teacher_name}</b></h2>
-            <p><span className="title">{item.title}</span></p>
-            <p className="desc">{item.desc} </p>
-          </div>
+        <p className="cont">超强师资团队</p>
+        <div className="teabox">
+          {this.state.data.map((item, i) => {
+            const liClass = active === i && isToggleOn ? "active1" : ""
+            // const liClass1 = isToggleOn ? 'active1' : '';
+            return (
+              <div
+                key={i}
+                className={`tealist ${liClass}`}
+                onClick={() => {
+                  this.bgChange(i)
+                }}
+              >
+                <div className="pic">
+                  <img src={item.thumb_img} alt="" />
+                </div>
+                <div className="detail">
+                  <h2 className="name">
+                    <b>{item.teacher_name}</b>
+                  </h2>
+                  <p>
+                    <span className="title">{item.title}</span>
+                  </p>
+                  <p className="desc">{item.desc} </p>
+                </div>
+              </div>
+            )
+          })}
+        </div>
+        <div className="consult">
+          <a href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372">
+            咨询更多师资信息
+          </a>
         </div>
-    })}
-
       </div>
-      <div className="consult">
-            <a href="http://q.url.cn/s/Vbkup6m?_type=wpa">咨询更多师资信息</a>
-          </div>
-    </div>
     )
   }
 }
 
 export default TeacherList
-
-
-

src/components/activity/newyear-2019/preheat/YearCourse/index.js

@@ -236,7 +236,8 @@ class YearCourse extends Component {
 
   toQQque = () => {
     if (!getParam("version")) {
-      window.location.href = "http://q.url.cn/s/Vbkup6m?_type=wpa"
+      window.location.href =
+        "https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
     } else {
       SendMessageToApp("toQQ", "https://q.url.cn/AB8aue?_type=wpa&qidian=true")
     }

src/components/activity/treasure-box/preheat/YearCourse/index.js

@@ -233,7 +233,8 @@ class YearCourse extends Component {
 
   toQQque = () => {
     if (!getParam("version")) {
-      window.location.href = "http://q.url.cn/s/Vbkup6m?_type=wpa"
+      window.location.href =
+        "https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
     } else {
       SendMessageToApp("toQQ", "https://q.url.cn/AB8aue?_type=wpa&qidian=true")
     }

src/components/detail/btnstatus/index.js

@@ -370,7 +370,7 @@ class BtnStatus extends Component {
           <div className="btns-box">
             <a
               className="consult consult-s"
-              href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
             >
               <i className="iconfont iconerji"></i>
               <span>课程咨询</span>
@@ -402,7 +402,7 @@ class BtnStatus extends Component {
           <div className="btns-box">
             <a
               className="consult consult-m"
-              href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
             >
               <i className="iconfont iconerji" />
               <span>课程咨询</span>
@@ -421,7 +421,7 @@ class BtnStatus extends Component {
           <div className="btns-box">
             <a
               className="consult consult-m"
-              href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
             >
               <i className="iconfont iconerji" />
               <span>课程咨询</span>
@@ -439,7 +439,7 @@ class BtnStatus extends Component {
           <div className="btns-box">
             <a
               className="consult consult-s"
-              href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
             >
               <i className="iconfont iconerji"></i>
               <span>课程咨询</span>
@@ -461,7 +461,7 @@ class BtnStatus extends Component {
           <div className="btns-box">
             <a
               className="consult consult-s"
-              href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
             >
               <i className="iconfont iconerji"></i>
               <span>课程咨询</span>
@@ -482,7 +482,7 @@ class BtnStatus extends Component {
             <div className="btns-box">
               <a
                 className="consult consult-s"
-                href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+                href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
               >
                 <i className="iconfont iconerji"></i>
                 <span>课程咨询</span>
@@ -511,7 +511,10 @@ class BtnStatus extends Component {
         {/*特殊课程*/}
         {this.state.isbuy === 20 && (
           <div className="btns-box">
-            <a className="consult-l" href="http://q.url.cn/s/Vbkup6m?_type=wpa">
+            <a
+              className="consult-l"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
+            >
               <i className="iconfont iconerji"></i>
               <span>课程咨询</span>
             </a>
@@ -523,7 +526,7 @@ class BtnStatus extends Component {
           <div className="btns-box">
             <a
               className="consult consult-m"
-              href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
             >
               <i className="iconfont iconerji"></i>
               <span>课程咨询</span>
@@ -542,7 +545,7 @@ class BtnStatus extends Component {
           <div className="btns-box">
             <a
               className="consult consult-m"
-              href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+              href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
             >
               <i className="iconfont iconerji"></i>
               <span>课程咨询</span>
@@ -590,7 +593,7 @@ class BtnStatus extends Component {
               <div className="btns-box">
                 <a
                   className="consult consult-m"
-                  href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+                  href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
                 >
                   <i className="iconfont iconerji"></i>
                   <span>课程咨询</span>

src/components/intelligent-recommend/index.js

@@ -288,7 +288,7 @@ class IntelligentRecommend extends Component {
                             {item.c_type === 2 && (
                               <React.Fragment key={item.course_id}>
                                 <a
-                                  href="http://q.url.cn/s/Vbkup6m?_type=wpa"
+                                  href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
                                   className={"contact"}
                                   onClick={this.consult}
                                 >