微信分享

build/manifest.json

+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

src/components/detail/index.js

@@ -46,18 +46,6 @@ class Detail extends Component {
     }
 
     componentDidMount() {
-<<<<<<< HEAD
-=======
-        if(browser.isWeixin){
-            wxShare({
-                title: `课程详情页`,
-                desc: `课程详情页`,
-                link: location.href,
-                imgUrl: `${location.origin}/favicon.ico`
-            })
-        }
-
->>>>>>> 41f6c77df0ea5567680fccdfa8f0f3095768af5d
         this.fetchCourseInfo();
         const { location: { state = {} } } = this.props;
         if(state.oid) {