feat: ⚡

07dac285 · liguokang · e7aadbfc · 07dac285 · 07dac285 · 07dac285
Commit 07dac285 authored Jul 15, 2021 by liguokang
12 changed files
--- a/.eslintrc.js
+++ b/.eslintrc.js
 /*
 * @Author: liguokang
- * @Date: 2021-05-27 11:32:32
+ * @Date: 2021-07-14 20:38:28
 * @LastEditors: liguokang
- * @LastEditTime: 2021-07-14 20:41:52
+ * @LastEditTime: 2021-07-15 10:25:01
- * @Description:
+ * @Description:  
 * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 // http://eslint.org/docs/user-guide/configuring
 module.exports = {

--- a/common/api/hello.js
+++ b/common/api/hello.js
@@ -2,10 +2,11 @@
 * @Author: liguokang
 * @Date: 2021-07-14 21:28:01
 * @LastEditors: liguokang
- * @LastEditTime: 2021-07-14 21:28:39
+ * @LastEditTime: 2021-07-15 10:26:57
 * @Description:  
 * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import request from '@/utils/request';
 import { getHeaders } from '@/utils/headers';

--- a/common/utils/auth.js
+++ b/common/utils/auth.js
 /*
 * @Author: liguokang
- * @Date: 2021-06-03 10:01:31
+ * @Date: 2021-07-14 20:59:44
 * @LastEditors: liguokang
- * @LastEditTime: 2021-06-03 17:24:54
+ * @LastEditTime: 2021-07-15 10:25:10
- * @Description:
+ * @Description:  
 * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 const appId = window.getParameterByName('appid') || Cache.get('appid') || window.LS.getItem('appid');
 export function getToken() {

--- a/common/utils/headers.js
+++ b/common/utils/headers.js
 /*
 * @Author: liguokang
- * @Date: 2021-06-03 13:46:20
+ * @Date: 2021-07-14 20:59:44
 * @LastEditors: liguokang
- * @LastEditTime: 2021-06-16 15:24:26
+ * @LastEditTime: 2021-07-15 10:27:15
- * @Description:
+ * @Description:  
 * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 import { getToken } from '@/utils/auth';
 import User from '@/core/user';

--- a/common/utils/index.js
+++ b/common/utils/index.js
 /*
 * @Author: liguokang
- * @Date: 2021-06-10 11:59:24
+ * @Date: 2021-07-14 20:59:44
 * @LastEditors: liguokang
- * @LastEditTime: 2021-07-06 15:11:39
+ * @LastEditTime: 2021-07-15 10:25:22
- * @Description:
+ * @Description:  
 * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 export function formatSecond(second) {
  const days = Math.floor(second / 86400);
  const hours = Math.floor((second % 86400) / 3600);

--- a/components/CarouselArea.jsx
+++ b/components/CarouselArea.jsx
 /*
- * @Author: zhujiapeng
+ * @Author: liguokang
- * @Date: 2021-06-03 16:50:59
+ * @Date: 2021-07-14 20:36:28
 * @LastEditors: liguokang
- * @LastEditTime: 2021-07-14 20:43:58
+ * @LastEditTime: 2021-07-15 10:25:29
- * @Description: 轮播图
+ * @Description:  
- * @Copyright: ©2021 杭州杰竞科技有限公司 版权所有
+ * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 import { Carousel } from 'antd';
 import './CarouselArea.less';

--- a/components/Footer.jsx
+++ b/components/Footer.jsx
 /*
- * @Author: zhujiapeng
+ * @Author: liguokang
- * @Date: 2021-06-03 15:13:39
+ * @Date: 2021-07-14 20:36:28
- * @LastEditors: zhujiapeng
+ * @LastEditors: liguokang
- * @LastEditTime: 2021-06-07 14:14:29
+ * @LastEditTime: 2021-07-15 10:25:37
- * @Description: 页脚
+ * @Description:
- * @Copyright: ©2021 杭州杰竞科技有限公司 版权所有
+ * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 import Link from 'next/link';
 import { useEffect } from 'react';
-import lottie from "lottie-web";
+import lottie from 'lottie-web';
 import './Footer.less';
 interface FooterProps {
  isTrial?: boolean;
@@ -18,26 +18,25 @@ interface FooterProps {
 export default function Footer(props: FooterProps) {
  useEffect(() => {
    if (props.isTrial) {
-      generateAnimation()
+      generateAnimation();
    }
  }, []);
  // 生成动画
  function generateAnimation() {
    lottie.loadAnimation({
-      container: document.getElementById("big-img-svg"),
+      container: document.getElementById('big-img-svg'),
-      path: "https://image.xiaomaiketang.com/xm/JPpibc4xdD.json",
+      path: 'https://image.xiaomaiketang.com/xm/JPpibc4xdD.json',
-      renderer: "svg",
+      renderer: 'svg',
      loop: true,
      autoplay: true,
-      name: "Hello World",
+      name: 'Hello World',
    });
  }
  return (
    <footer>
-      {
+      {props.isTrial && (
-        props.isTrial &&
        <div className="content-module content-module-8">
          <div className="module-model">
            <div className="center">
@@ -47,13 +46,16 @@ export default function Footer(props: FooterProps) {
                    <div className="text">体验教育信息化新模式</div>
                    <div className="module-img">
                      <span className="btn-wrap">
-                        <div className="btn-click free-trial" id="btn-free-try"
+                        <div
+                          className="btn-click free-trial"
+                          id="btn-free-try"
                          onClick={() => {
                            // window.WEBTRACING('WebG_foot_clickEvent_clickFreeUse', 'WebG_页面底部_点击事件_点击免费试用', { page: this.props.page })
                            this.renderModal(true);
-                          }}>
+                          }}
+                        >
                          免费试用
-                      </div>
+                        </div>
                      </span>
                    </div>
                  </div>
@@ -62,7 +64,7 @@ export default function Footer(props: FooterProps) {
            </div>
          </div>
        </div>
-      }
+      )}
      <div className="center">
        <div className="footer-middle">
          <ul>
@@ -73,8 +75,7 @@ export default function Footer(props: FooterProps) {
                  <span>小麦助教</span>
                </Link>
                <Link href="/cloud-class">
-                  <span>
+                  <span>云课堂</span>
-                    云课堂</span>
                </Link>
                <Link href="/xm-school-info">
                  <span>小麦校讯通</span>
@@ -83,7 +84,7 @@ export default function Footer(props: FooterProps) {
                  <span>微官网</span>
                </Link>
              </div>
-              <div className="fr" style={{ marginLeft: "30px" }}>
+              <div className="fr" style={{ marginLeft: '30px' }}>
                <Link href="/xm-show">
                  <span>小麦秀</span>
                </Link>
@@ -120,11 +121,7 @@ export default function Footer(props: FooterProps) {
              <Link href="/join-us">
                <span>加入我们</span>
              </Link>
-              <a
+              <a href="https://image.xiaomaiketang.com/xm/XGSwRGwacP.pdf" target="_blank" rel="noopener noreferrer">
-                href="https://image.xiaomaiketang.com/xm/XGSwRGwacP.pdf"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
                <span>隐私声明</span>
              </a>
            </li>
@@ -152,50 +149,36 @@ export default function Footer(props: FooterProps) {
        <div className="footer-bottom">
          <p>
            ©2015-2021&nbsp;&nbsp;杭州杰竞科技有限公司&nbsp;&nbsp;&nbsp;&nbsp;
-            <a
+            <a target="_blank" rel="noopener noreferrer" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=33010602006090">
-              target="_blank"
-              rel="noopener noreferrer"
-              href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=33010602006090"
-            >
              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
              <img
                src="https://image.xiaomaiketang.com/xm/6mH2HnzP3k.png"
                alt=""
                style={{
-                  width: "16px",
+                  width: '16px',
-                  height: "16px",
+                  height: '16px',
-                  display: "inline-block",
+                  display: 'inline-block',
-                  margin: "0 4px 0 0",
+                  margin: '0 4px 0 0',
-                  verticalAlign: "-3px",
+                  verticalAlign: '-3px',
                }}
              />
              浙公网安备33010602006090号
            </a>
            &nbsp;&nbsp;&nbsp;&nbsp;
-            <a
+            <a style={{ marginLeft: '20px' }} target="_blank" rel="noopener noreferrer" href="https://beian.miit.gov.cn/#/Integrated/index">
-              style={{ marginLeft: "20px" }}
-              target="_blank"
-              rel="noopener noreferrer"
-              href="https://beian.miit.gov.cn/#/Integrated/index"
-            >
              浙ICP备15025826号-2
            </a>
            &nbsp;&nbsp;&nbsp;&nbsp;
-            <a
+            <a style={{ marginLeft: '20px' }} target="_blank" rel="noopener noreferrer" href="https://image.xiaomaiketang.com/xm/ffXeG5fXn8.jpg">
-              style={{ marginLeft: "20px" }}
-              target="_blank"
-              rel="noopener noreferrer"
-              href="https://image.xiaomaiketang.com/xm/ffXeG5fXn8.jpg"
-            >
              增值电信业务经营许可证：浙B2-20180802
            </a>
          </p>
          <p>
-            <span style={{ marginLeft: "20px" }}>教APP备3300311号</span>
+            <span style={{ marginLeft: '20px' }}>教APP备3300311号</span>
            &nbsp;&nbsp;&nbsp;&nbsp;
-            <span style={{ marginLeft: "20px" }}>教APP备3300313号</span>
+            <span style={{ marginLeft: '20px' }}>教APP备3300313号</span>
            &nbsp;&nbsp;&nbsp;&nbsp;
-            <span style={{ marginLeft: "20px" }}>教APP备3300315号</span>
+            <span style={{ marginLeft: '20px' }}>教APP备3300315号</span>
          </p>
        </div>
      </div>

--- a/components/SiderBar.jsx
+++ b/components/SiderBar.jsx
 /*
- * @Author: zhujiapeng
+ * @Author: liguokang
- * @Date: 2021-06-04 14:01:52
+ * @Date: 2021-07-14 20:36:28
 * @LastEditors: liguokang
- * @LastEditTime: 2021-07-14 20:43:47
+ * @LastEditTime: 2021-07-15 10:25:45
- * @Description: 侧边导航栏
+ * @Description:
- * @Copyright: ©2021 杭州杰竞科技有限公司 版权所有
+ * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 import './SiderBar.less';
@@ -17,7 +17,11 @@ export default function SiderBar() {
        <p>咨询热线</p>
        <div className="content">
          <div className="consult-img fl"></div>
-          <div className="title fl">了解产品和优惠<br />免费拨打</div>
+          <div className="title fl">
+            了解产品和优惠
+            <br />
+            免费拨打
+          </div>
          <div className="detail fl">400-6677-456</div>
        </div>
      </div>

--- a/pages/wheat-school/index.jsx
+++ b/pages/wheat-school/index.jsx
 /*
- * @Description:
+ * @Author: liguokang
- * @Author: zangsuyun
+ * @Date: 2021-07-14 20:36:28
- * @Date: 2020-07-23 13:38:22
 * @LastEditors: liguokang
- * @LastEditTime: 2021-07-15 10:15:28
+ * @LastEditTime: 2021-07-15 10:26:52
- * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
+ * @Description:  
+ * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 import React from "react";
 import { Carousel, Modal } from "antd";
 import Header from '../../components/Header';

--- a/redux/action/action-types/index.js
+++ b/redux/action/action-types/index.js
 /*
- * @Description: 
+ * @Author: liguokang
- * @Date: 2020-03-18 18:19:52
+ * @Date: 2021-07-15 10:12:48
- * @LastEditTime: 2021-04-19 13:50:38
+ * @LastEditors: liguokang
- * @LastEditors: JamosLi
+ * @LastEditTime: 2021-07-15 10:24:26
+ * @Description:  
+ * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 export const actionTypes = {
  CHANGE_CITY: 'CHANGE_CITY',
 };
--- a/redux/reducer/index.js
+++ b/redux/reducer/index.js
 /*
- * @Description:
+ * @Author: liguokang
- * @Date: 2020-03-18 18:19:52
+ * @Date: 2021-07-15 10:12:48
- * @LastEditTime: 2021-07-15 10:17:35
 * @LastEditors: liguokang
+ * @LastEditTime: 2021-07-15 10:26:23
+ * @Description:  
+ * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 import { actionTypes } from '../action/action-types';
 let initState = {

--- a/redux/store.js
+++ b/redux/store.js
 /*
- * @Description: 
+ * @Author: liguokang
- * @Date: 2020-03-18 18:19:52
+ * @Date: 2021-07-15 10:12:48
- * @LastEditTime: 2021-04-19 13:50:30
+ * @LastEditors: liguokang
- * @LastEditors: JamosLi
+ * @LastEditTime: 2021-07-15 10:26:17
+ * @Description:  
+ * @Copyrigh: ©2021 杭州杰竞科技有限公司 版权所有
 */
 import { createStore } from 'redux';
 import Reducer from './reducer';