Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu into detail

package-lock.json

 {
-  "name": "my-julyedu",
+  "name": "mr-julyedu",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -3257,6 +3257,11 @@
       "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
       "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
     },
+    "callapp-lib": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/callapp-lib/-/callapp-lib-2.1.7.tgz",
+      "integrity": "sha512-pO8SuyjjkzL1dIqT7tazAojSF6ik6QlUKMKLDaQaTdkzBsKBecQLLgfRwE+S6IBhzaP8ZIhhtBhGh5aETogYYg=="
+    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",

package.json

@@ -16,6 +16,7 @@
     "babel-plugin-named-asset-import": "^0.3.1",
     "babel-preset-react-app": "^7.0.2",
     "bfj": "6.1.1",
+    "callapp-lib": "^2.1.7",
     "case-sensitive-paths-webpack-plugin": "2.2.0",
     "crypto-js": "^3.1.9-1",
     "css-loader": "1.0.0",

src/common/CallApp/index.js

+import React, { Component } from 'react'
+import CallApp from 'callapp-lib'
+
+const options = {
+    scheme: {
+        protocol: 'julyedu',
+        host: '',
+        port: ''
+    },
+    intent: {
+        package: "com.julyapp.julyonline",
+        scheme: "julyedu",
+        action: 'julyapp.julyedu',
+        category: 'category_julyedu'
+    },
+    universal: {
+        host: "api.julyedu.com/action",
+        pathKey: 'page'
+    },
+    appstore: "https://itunes.apple.com/cn/app/id1102275343?mt=8",
+    yingyongbao: "http://android.myapp.com/myapp/detail.htm?apkName=com.julyapp.julyonline",
+    fallback: "http://www-test.julyedu.com/weekend/redir1"
+}
+
+class OpenApp extends Component {
+
+    callApp = new CallApp(options)
+
+    handleClick = () => {
+        this.callApp.open({})
+    }
+
+    render() {
+        return (
+            <div className={this.props.className} onClick={this.handleClick}>在APP打开</div>
+        );
+    }
+}
+
+export default OpenApp;

src/common/ToApp/index.js

-import React from 'react'
-
-const ToApp = (props) => {
-    return (
-        <div className={props.className} onClick={props.toApp}>在APP打开</div>
-    );
-};
-
-export default ToApp;

src/common/index.js

@@ -3,7 +3,7 @@ export { default as Course } from './Course'  //  课程状态（试听 正在
 export { default as Tag } from './CategoryTag'
 export { default as OrderItem } from './OrderList'
 export { default as HeaderBar } from './HeaderBar'
-export { default as ToApp } from './ToApp'
+export { default as CallApp } from './CallApp'
 export { default as Captcha } from './Captcha'
 export { default as ClearableInput } from "./ClearableInput";
 

src/index.js

@@ -9,7 +9,7 @@ import rootReducers from './store'
 import App from './App'
 
 
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
+const composeEnhancers = window['__REDUX_DEVTOOLS_EXTENSION_COMPOSE__'] || compose
 
 const store = createStore(
     rootReducers,