优化

src/components/UserGuide.js

@@ -29,9 +29,9 @@ class UserGuide extends React.Component {
     let plancoursebtn = null;
     let classdetailTab3 = null;
     // let callwarnbtn = null;
-    let planwarnbtn = null;
-    let birthwarnbtn = null;
-    let paywarnbtn = null;
+    // let planwarnbtn = null;
+    // let birthwarnbtn = null;
+    // let paywarnbtn = null;
     switch (Number(guideStep)) {
       case 1:
         dispatch(routerRedux.push({
@@ -140,6 +140,15 @@ class UserGuide extends React.Component {
           document.getElementById('menu_3').style.position = '';
           document.getElementById('menu_3').style.zIndex = '';
         }
+        document.body.style.maxHeight = 'initial';
+        document.body.style.overflowY = 'initial';
+        dispatch({
+          type: 'userguide/updateState',
+          payload: {
+            guideShow: false, // 引导步骤
+            guideStep: 1, // 引导步骤
+          },
+        });
         dispatch(routerRedux.push({
           pathname: '/sjd/indexstaic',
         }));
@@ -162,75 +171,75 @@ class UserGuide extends React.Component {
       //     });
       //   }
       //   break;
+      // case 7:
+      //   console.log(document.getElementById('index_callwarn'), 'adasdsadas');
+      //   if (document.getElementById('index_callwarn')) {
+      //     document.getElementById('index_callwarn').style.position = '';
+      //     document.getElementById('index_callwarn').style.zIndex = '';
+      //   }
+      //   planwarnbtn = document.getElementById('index_planwarn');
+      //   if (planwarnbtn) {
+      //     dispatch({
+      //       type: 'userguide/getposition',
+      //       payload: {
+      //         page: 'indexstatic3',
+      //         doms: {
+      //           planwarnbtn,
+      //         },
+      //       },
+      //     });
+      //   }
+      //   break;
+      // case 8:
+      //   if (document.getElementById('index_planwarn')) {
+      //     document.getElementById('index_planwarn').style.position = '';
+      //     document.getElementById('index_planwarn').style.zIndex = '';
+      //   }
+      //   birthwarnbtn = document.getElementById('index_birthwarn');
+      //   if (birthwarnbtn) {
+      //     dispatch({
+      //       type: 'userguide/getposition',
+      //       payload: {
+      //         page: 'indexstatic4',
+      //         doms: {
+      //           birthwarnbtn,
+      //         },
+      //       },
+      //     });
+      //   }
+      //   break;
+      // case 9:
+      //   if (document.getElementById('index_birthwarn')) {
+      //     document.getElementById('index_birthwarn').style.position = '';
+      //     document.getElementById('index_birthwarn').style.zIndex = '';
+      //   }
+      //   paywarnbtn = document.getElementById('index_paywarn');
+      //   if (paywarnbtn) {
+      //     dispatch({
+      //       type: 'userguide/getposition',
+      //       payload: {
+      //         page: 'indexstatic5',
+      //         doms: {
+      //           paywarnbtn,
+      //         },
+      //       },
+      //     });
+      //   }
+      //   break;
+      // case 10:
+      //   if (document.getElementById('index_paywarn')) {
+      //     document.getElementById('index_paywarn').style.position = '';
+      //     document.getElementById('index_paywarn').style.zIndex = '';
+      //   }
+      //   // dispatch({
+      //   //   type: 'userguide/updateState',
+      //   //   payload: {
+      //   //     guideShow: false, // 引导步骤
+      //   //     guideStep: 1, // 引导步骤
+      //   //   },
+      //   // });
+      //   break;
       case 7:
-        console.log(document.getElementById('index_callwarn'), 'adasdsadas');
-        if (document.getElementById('index_callwarn')) {
-          document.getElementById('index_callwarn').style.position = '';
-          document.getElementById('index_callwarn').style.zIndex = '';
-        }
-        planwarnbtn = document.getElementById('index_planwarn');
-        if (planwarnbtn) {
-          dispatch({
-            type: 'userguide/getposition',
-            payload: {
-              page: 'indexstatic3',
-              doms: {
-                planwarnbtn,
-              },
-            },
-          });
-        }
-        break;
-      case 8:
-        if (document.getElementById('index_planwarn')) {
-          document.getElementById('index_planwarn').style.position = '';
-          document.getElementById('index_planwarn').style.zIndex = '';
-        }
-        birthwarnbtn = document.getElementById('index_birthwarn');
-        if (birthwarnbtn) {
-          dispatch({
-            type: 'userguide/getposition',
-            payload: {
-              page: 'indexstatic4',
-              doms: {
-                birthwarnbtn,
-              },
-            },
-          });
-        }
-        break;
-      case 9:
-        if (document.getElementById('index_birthwarn')) {
-          document.getElementById('index_birthwarn').style.position = '';
-          document.getElementById('index_birthwarn').style.zIndex = '';
-        }
-        paywarnbtn = document.getElementById('index_paywarn');
-        if (paywarnbtn) {
-          dispatch({
-            type: 'userguide/getposition',
-            payload: {
-              page: 'indexstatic5',
-              doms: {
-                paywarnbtn,
-              },
-            },
-          });
-        }
-        break;
-      case 10:
-        if (document.getElementById('index_paywarn')) {
-          document.getElementById('index_paywarn').style.position = '';
-          document.getElementById('index_paywarn').style.zIndex = '';
-        }
-        // dispatch({
-        //   type: 'userguide/updateState',
-        //   payload: {
-        //     guideShow: false, // 引导步骤
-        //     guideStep: 1, // 引导步骤
-        //   },
-        // });
-        break;
-      case 11:
         document.body.style.maxHeight = 'initial';
         document.body.style.overflowY = 'initial';
         dispatch({
@@ -575,7 +584,7 @@ class UserGuide extends React.Component {
                   }}
                   onClick={this.continueGuide}
                 >
-                  下一步
+                  完成
                 </div>
               </div>
             }

src/models/userguide.js

@@ -135,54 +135,54 @@ export default {
         //     },
         //   });
         //   break;
-        case 'indexstatic2':
-          doms.callwarnbtn.style.position = 'relative';
-          doms.callwarnbtn.style.zIndex = 105;
-          yield put({
-            type: 'updateState',
-            payload: {
-              position: {
-                callwarnbtn: caculateCirclePosition('bottom', doms.callwarnbtn.getClientRects()[0]),
-              },
-            },
-          });
-          break;
-        case 'indexstatic3':
-          doms.planwarnbtn.style.position = 'relative';
-          doms.planwarnbtn.style.zIndex = 105;
-          yield put({
-            type: 'updateState',
-            payload: {
-              position: {
-                planwarnbtn: caculateCirclePosition('bottom', doms.planwarnbtn.getClientRects()[0]),
-              },
-            },
-          });
-          break;
-        case 'indexstatic4':
-          doms.birthwarnbtn.style.position = 'relative';
-          doms.birthwarnbtn.style.zIndex = 105;
-          yield put({
-            type: 'updateState',
-            payload: {
-              position: {
-                birthwarnbtn: caculateCirclePosition('bottom', doms.birthwarnbtn.getClientRects()[0]),
-              },
-            },
-          });
-          break;
-        case 'indexstatic5':
-          doms.paywarnbtn.style.position = 'relative';
-          doms.paywarnbtn.style.zIndex = 105;
-          yield put({
-            type: 'updateState',
-            payload: {
-              position: {
-                paywarnbtn: caculateCirclePosition('bottom', doms.paywarnbtn.getClientRects()[0]),
-              },
-            },
-          });
-          break;
+        // case 'indexstatic2':
+        //   doms.callwarnbtn.style.position = 'relative';
+        //   doms.callwarnbtn.style.zIndex = 105;
+        //   yield put({
+        //     type: 'updateState',
+        //     payload: {
+        //       position: {
+        //         callwarnbtn: caculateCirclePosition('bottom', doms.callwarnbtn.getClientRects()[0]),
+        //       },
+        //     },
+        //   });
+        //   break;
+        // case 'indexstatic3':
+        //   doms.planwarnbtn.style.position = 'relative';
+        //   doms.planwarnbtn.style.zIndex = 105;
+        //   yield put({
+        //     type: 'updateState',
+        //     payload: {
+        //       position: {
+        //         planwarnbtn: caculateCirclePosition('bottom', doms.planwarnbtn.getClientRects()[0]),
+        //       },
+        //     },
+        //   });
+        //   break;
+        // case 'indexstatic4':
+        //   doms.birthwarnbtn.style.position = 'relative';
+        //   doms.birthwarnbtn.style.zIndex = 105;
+        //   yield put({
+        //     type: 'updateState',
+        //     payload: {
+        //       position: {
+        //         birthwarnbtn: caculateCirclePosition('bottom', doms.birthwarnbtn.getClientRects()[0]),
+        //       },
+        //     },
+        //   });
+        //   break;
+        // case 'indexstatic5':
+        //   doms.paywarnbtn.style.position = 'relative';
+        //   doms.paywarnbtn.style.zIndex = 105;
+        //   yield put({
+        //     type: 'updateState',
+        //     payload: {
+        //       position: {
+        //         paywarnbtn: caculateCirclePosition('bottom', doms.paywarnbtn.getClientRects()[0]),
+        //       },
+        //     },
+        //   });
+        //   break;
         default:
           break;
       }

src/pages/index/index.js

@@ -79,19 +79,19 @@ class StaticCenter extends React.Component {
   }
   componentDidMount() { // 挂载
     pageIn('轻校-概况');
-    const callwarnbtn = document.getElementById('index_callwarn');
-    const { dispatch } = this.props;
-    if (callwarnbtn) {
-      dispatch({
-        type: 'userguide/getposition',
-        payload: {
-          page: 'indexstatic2',
-          doms: {
-            callwarnbtn,
-          },
-        },
-      });
-    }
+    // const callwarnbtn = document.getElementById('index_callwarn');
+    // const { dispatch } = this.props;
+    // if (callwarnbtn) {
+    //   dispatch({
+    //     type: 'userguide/getposition',
+    //     payload: {
+    //       page: 'indexstatic2',
+    //       doms: {
+    //         callwarnbtn,
+    //       },
+    //     },
+    //   });
+    // }
   }
   componentDidUpdate() {
   }
@@ -1059,7 +1059,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 0 }} xl={{ span: 4, offset: 0 }} xxl={{ span: 4, offset: 0 }}>
                   <div className={pageStyle.fasterItem} onClick={this.createTheme}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon1.png`} alt="" />
                     </div>
                     <span>新建作业打卡</span>
                   </div>
@@ -1067,7 +1067,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                   <div className={pageStyle.fasterItem} onClick={this.createCalendarTheme}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon2.png`} alt="" />
                     </div>
                     <span>新建日历打卡</span>
                   </div>
@@ -1075,7 +1075,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                   <div className={pageStyle.fasterItem} onClick={this.createUnlockTheme}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon3.png`} alt="" />
                     </div>
                     <span>新建闯关打卡</span>
                   </div>
@@ -1083,7 +1083,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                   <div className={pageStyle.fasterItem} onClick={() => this.setModal1Visible(true)}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon4.png`} alt="" />
                     </div>
                     <span>学员报名</span>
                   </div>
@@ -1091,7 +1091,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                   <div className={pageStyle.fasterItem} onClick={this.createClass}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon5.png`} alt="" />
                     </div>
                     <span>新建班级</span>
                   </div>
@@ -1101,7 +1101,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 0 }} xl={{ span: 4, offset: 0 }} xxl={{ span: 4, offset: 0 }}>
                   <div className={pageStyle.fasterItem} onClick={this.createCourse}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon6.png`} alt="" />
                     </div>
                     <span>新建课程</span>
                   </div>
@@ -1109,7 +1109,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                   <div className={pageStyle.fasterItem} onClick={this.goCallStudent}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon7.png`} alt="" />
                       <Badge className={pageStyle.fasterNum} overflowCount={999} count={callData.total}>
                       </Badge>
                     </div>
@@ -1120,7 +1120,7 @@ class StaticCenter extends React.Component {
                   <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                     <div className={pageStyle.fasterItem} onClick={this.goPlanStudent}>
                       <div className={pageStyle.fasterLeft}>
-                        <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                        <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon8.png`} alt="" />
                         <Badge className={pageStyle.fasterNum} overflowCount={999} count={assign.total}>
                         </Badge>
                       </div>
@@ -1132,7 +1132,7 @@ class StaticCenter extends React.Component {
                   <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                     <div className={pageStyle.fasterItem} onClick={this.goBirthStudent}>
                       <div className={pageStyle.fasterLeft}>
-                        <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                        <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon9.png`} alt="" />
                         <Badge className={pageStyle.fasterNum} overflowCount={999} count={birthday.total}>
                         </Badge>
                       </div>
@@ -1143,7 +1143,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 1 }} xl={{ span: 4, offset: 1 }} xxl={{ span: 4, offset: 1 }}>
                   <div className={pageStyle.fasterItem} onClick={this.goLeaveShow}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon10.png`} alt="" />
                       <Badge className={pageStyle.fasterNum} overflowCount={999} count={leaveNum}>
                       </Badge>
                     </div>
@@ -1156,7 +1156,7 @@ class StaticCenter extends React.Component {
                 <Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 0 }} xl={{ span: 4, offset: 0 }} xxl={{ span: 4, offset: 0 }}>
                   <div className={pageStyle.fasterItem} onClick={this.goDeadlineStudent}>
                     <div className={pageStyle.fasterLeft}>
-                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}course/book_icon.png`} alt="" />
+                      <img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon11.png`} alt="" />
                       <Badge className={pageStyle.fasterNum} overflowCount={999} count={renew.total}>
                       </Badge>
                     </div>

src/pages/index/index.less

@@ -58,13 +58,16 @@
     .fasterLeft {
       position: relative;
       margin-right: 18px;
+      width: 40px;
+      height: 40px;
       .fasterImg {
-
+        width: 40px;
+        height: 40px;
       }
       .fasterNum {
         position: absolute;
         top: -15px;
-        right: -25px
+        right: -15px
       }
     }
     &>span {