pull

package-lock.json

@@ -6990,6 +6990,11 @@
         "pify": "^3.0.0"
       }
     },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
     "handle-thing": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",

package.json

@@ -35,6 +35,7 @@
     "file-loader": "2.0.0",
     "formik": "^1.5.8",
     "fs-extra": "7.0.1",
+    "hammerjs": "^2.0.8",
     "html-webpack-plugin": "4.0.0-alpha.2",
     "http-proxy-middleware": "^0.19.1",
     "identity-obj-proxy": "3.0.0",

src/common/WxLogin/index.js

+import React, {Component} from 'react'
+import './index.scss'
+
+class WxLogin extends Component {
+    constructor(props) {
+        super(props)
+    }
+
+    // 提示微信登录还是账号登录，微信授权登录不需要绑定手机号
+    wxLogin = () => {
+        let url = window.location.href
+        if (url.includes('code=') && url.includes('state=STATE')) {
+            let index = url.lastIndexOf('code=')
+            url = url.substr(0, index - 1)
+        }
+       window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(url + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"
+    }
+    zhLogin = () => {
+        this.props.history.push('/passport')
+    }
+
+    render() {
+        return (
+            <div className="change-login-type">
+                <div className="login-type-content">
+                    <div className="wx-login" onClick={this.wxLogin}>
+                        <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/mlCourse/m/wx-icon.png" alt=""/>
+                        <span>微信登录</span>
+                    </div>
+                    <div className="zh-login" onClick={this.zhLogin}>
+                        <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/mlCourse/m/zh-icon.png" alt=""/>
+                        <span>账号登录</span>
+                    </div>
+                </div>
+            </div>
+        )
+    }
+}
+
+export default WxLogin

src/common/WxLogin/index.scss

+.change-login-type {
+  background: rgba(0, 0, 0, .5);
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 100;
+
+  .login-type-content {
+    width: 290px;
+    height: 138px;
+    background-color: #fff;
+    border-radius: 8px;
+    position: relative;
+    left: 50%;
+    top: 50%;
+    margin-left: -145px;
+    margin-top: -69px;
+    padding: 40px 70px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .wx-login, .zh-login {
+    text-align: center;
+    img {
+      width: 34px;
+      height: 34px;
+    }
+
+    span {
+      display: block;
+      color: #525C65;
+      font-size: 14px;
+      margin-top: 3px;
+    }
+  }
+}
\ No newline at end of file

src/common/index.js

@@ -9,5 +9,6 @@ export { default as ClearableInput } from "./ClearableInput"
 export { default as Loading } from './Loading'
 export { default as RenderTabBar } from './renderTabBar'
 export { default as Popup } from './closable-popup'
+export { default as WxLogin } from './WxLogin'
 
 

src/components/myOrders/index.js

@@ -180,6 +180,10 @@ function OrderInfo(props) {
     return (
         <div className='order-head'>
             <span className='oid-num'>订单号：{props.item.oid}</span>
+            {
+                props.item.type == 4 &&  props.item.course.length == 3 &&
+                <span>付费试学</span>
+            }
             {btn}
         </div>
     )

src/components/vip/index.js

@@ -27,24 +27,32 @@ class NewVip extends Component {
         tobuyID: '',
         list1: [
             {
+                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/39376e2038.png',
+                src: '/getDetail?id=280'
+            },
+            {
+                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/e61f810c30.png',
+                src: '/getDetail?id=293'
+            },
+            {
                 img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/1b56e21e68.png',
                 src: '/getDetail?id=196'
             },
             {
-                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/c9a6779b75.png',
-                src: '/getDetail?id=181'
+                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/07dafc3480.png',
+                src: '/getDetail?id=216'
             },
             {
-                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/be4b7de643.jpg',
-                src: '/getDetail?id=146'
+                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/d9ca2ad5e8.png',
+                src: '/getDetail?id=262'
             },
             {
-                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/2ec904c98b.png',
-                src: '/getDetail?id=158'
+                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/a7e5ab0af6.png',
+                src: '/getDetail?id=232'
             },
             {
-                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/6996ee5c57.png',
-                src: '/getDetail?id=180'
+                img: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/c9a6779b75.png',
+                src: '/getDetail?id=181'
             },
             {
                 img: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/19VIP/newvip/h5/more2.png',