合并

build/service-worker.js

@@ -14,7 +14,11 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
 
 importScripts(
+<<<<<<< HEAD
   "/precache-manifest.acbdf032cb9971436ba49864a715c835.js"
+=======
+  "/precache-manifest.89806a8078d7e2e3c273482d014de26d.js"
+>>>>>>> 26f7c73380d6305ee14a9bdd86aa3bfa84682065
 );
 
 workbox.clientsClaim();

src/components/blessingPreheat/banner/index.js

@@ -64,7 +64,7 @@ class Banner extends Component {
   //     } else {
   //       !nav.classList.contains('fixed') && nav.classList.add('fixed')
   //     }
-  
+
   //     if (swipeDirection === 'up') {
   //       if (y + 30 + 30 >= top) {
   //         this.setState({
@@ -80,7 +80,7 @@ class Banner extends Component {
   //     }
   //     this.prevY = y
   //   }
-    
+
   // }
 
   // toSection = (i, e) => {
@@ -100,7 +100,7 @@ class Banner extends Component {
     const { toSection, navs, index, isFormal } = this.props;
     return (
       <div id={'main-banner'}>
-        <div className={`banner ${isFormal?'formal_banner':''}`}></div>
+        <div className={`banner ${isFormal ? 'formal_banner' : ''}`}></div>
         <nav id={'main-nav'}>
           <ul>
             {

src/components/blessingPreheat/index.js

@@ -97,7 +97,7 @@ class BlessingPreheat extends Component {
   }
 
   componentDidMount() {
-    document.title = `11.11-11.13 AI充电节，预热来袭！积福气享1折秒课，海量奖品来就送-七月在线`;
+    document.title = '11.11-11.13 AI充电节，预热来袭！积福气享1折秒课，海量奖品来就送-七月在线';
     this.fetchUserBlessing()
     this.setInitialNavActiveStatus()
     window.addEventListener('scroll', throttle(this.calcNavActive, 100))
@@ -614,7 +614,7 @@ class BlessingPreheat extends Component {
         }
         {
           showRecordList &&
-          <RecordPopup 
+          <RecordPopup
             history={this.props.history}
             handleToHide={() => this.handleToHide('showRecordList')}
           />