Merge branch '0918bug' of gitlab.julyedu.com:baiguangyao/mr-julyedu

30f257c7 · xuzhenghua · b8100714 · 10cab6bd · 30f257c7
Commit 30f257c7 authored Sep 18, 2019 by xuzhenghua
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

src/App.js
+2 -1

No files found.
--- a/src/App.js
+++ b/src/App.js
@@ -123,8 +123,9 @@ class App extends Component {
        })
        //微信
        let code = getParam('code')
+        let oid = getParam('oid')

-        if (code) {
+        if (code && !oid) {

            http.get(`${API['home']}/m/wx_loginInfo/code/${code}`)
                .then(res => {