合并11-11

build/service-worker.js

@@ -14,7 +14,15 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
 
 importScripts(
+<<<<<<< HEAD
   "/precache-manifest.46895332b1bd430002163bc2bdb1ee05.js"
+=======
+<<<<<<< HEAD
+  "/precache-manifest.5100a01b55c0144d15b42e4df5ff6c1b.js"
+=======
+  "/precache-manifest.70bf3c0539f1e2c1ad56cc1c20e50a58.js"
+>>>>>>> 1ef670f9f92c37d4fb0d6d3d4f45da114df627f5
+>>>>>>> 11-11
 );
 
 workbox.clientsClaim();

src/components/activity/invite.js

@@ -119,12 +119,12 @@ class Invite extends Component {
         history.push('/passport');
       }else {
         if(is_weixin()) {
-          wxShare({
-            title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
-            desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
-            link: encodeURI(location.origin + `/invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`),
-            imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
-          });
+          // wxShare({
+          //   title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
+          //   desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
+          //   link: encodeURI(location.origin + `/invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`),
+          //   imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
+          // });
           this.setState({
             showTip: true,
             isWeiXin: true,