fix style bug

front/project/www/app.less

@@ -51,7 +51,7 @@
 }
 
 .f-w-b {
-  font-weight: bold;
+  font-weight: 600;
 }
 
 .f-w-d {

front/project/www/assets/jijing.svg

@@ -8,7 +8,7 @@
             <g id="课程-2" transform="translate(1030.000000, 47.000000)">
                 <g id="1备份" transform="translate(0.000000, 60.000000)">
                     <g id="jijing" transform="translate(20.000000, 16.000000)">
-                        <rect id="矩形" fill="#4292F0" x="1" y="0" width="10" height="12" rx="1"></rect>
+                        <rect id="矩形" fill="#000" x="1" y="0" width="10" height="12" rx="1"></rect>
                         <rect id="矩形备份" fill="#FFFFFF" x="3" y="3" width="6" height="1.5" rx="0.75"></rect>
                         <rect id="矩形备份-2" fill="#FFFFFF" x="3" y="7" width="4" height="1.5" rx="0.75"></rect>
                     </g>

front/project/www/assets/jijing_more.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>jijing</title>
+    <desc>Created with Sketch.</desc>
+    <g id="题库搜索" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="菜单" transform="translate(-1050.000000, -123.000000)">
+            <g id="课程-2" transform="translate(1030.000000, 47.000000)">
+                <g id="1备份" transform="translate(0.000000, 60.000000)">
+                    <g id="jijing" transform="translate(20.000000, 16.000000)">
+                        <rect id="矩形" fill="#4292F0" x="1" y="0" width="10" height="12" rx="1"></rect>
+                        <rect id="矩形备份" fill="#FFFFFF" x="3" y="3" width="6" height="1.5" rx="0.75"></rect>
+                        <rect id="矩形备份-2" fill="#FFFFFF" x="3" y="7" width="4" height="1.5" rx="0.75"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

front/project/www/assets/message.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>massage</title>
+    <desc>Created with Sketch.</desc>
+    <g id="题库搜索" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="菜单" transform="translate(-1050.000000, -243.000000)">
+            <g id="课程-2" transform="translate(1030.000000, 47.000000)">
+                <g id="1备份-3" transform="translate(0.000000, 180.000000)">
+                    <g id="massage" transform="translate(20.000000, 16.000000)">
+                        <rect id="矩形" fill="#000" x="0" y="2" width="12" height="8" rx="1"></rect>
+                        <path d="M1.24325986,2.62852654 C1.00816733,2.48366069 0.700150204,2.55680387 0.555284354,2.79189639 C0.410418504,3.02698892 0.483561678,3.33500605 0.718654206,3.4798719 L6.0017879,6.7353801 L11.2163008,3.47827001 C11.4505087,3.33197817 11.5217786,3.02352224 11.3754868,2.78931441 C11.229195,2.55510658 10.920739,2.48383658 10.6865312,2.63012843 L5.9982121,5.55856521 L1.24325986,2.62852654 Z" id="路径-2" fill="#FFFFFF" fill-rule="nonzero"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

front/project/www/assets/yaoqing.svg

@@ -4,7 +4,7 @@
     <title>yaoqing</title>
     <desc>Created with Sketch.</desc>
     <g id="题库搜索" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="菜单" transform="translate(-1050.000000, -185.000000)" fill="#4292F0">
+        <g id="菜单" transform="translate(-1050.000000, -185.000000)" fill="#000">
             <g id="课程-2" transform="translate(1030.000000, 47.000000)">
                 <g id="1备份-2" transform="translate(0.000000, 120.000000)">
                     <g id="编组-6" transform="translate(20.000000, 16.000000)">

front/project/www/assets/yaoqing_more.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>yaoqing</title>
+    <desc>Created with Sketch.</desc>
+    <g id="题库搜索" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="菜单" transform="translate(-1050.000000, -185.000000)" fill="#4292F0">
+            <g id="课程-2" transform="translate(1030.000000, 47.000000)">
+                <g id="1备份-2" transform="translate(0.000000, 120.000000)">
+                    <g id="编组-6" transform="translate(20.000000, 16.000000)">
+                        <g id="yaoqing" transform="translate(0.000000, 2.000000)">
+                            <path d="M4,-1 C5.65685425,-1 7,0.343145751 7,2 L7,2.999 L8,3 C9.65685425,3 11,4.34314575 11,6 C11,7.65685425 9.65685425,9 8,9 L7,8.999 L7,9 L1,9 L1,2 C1,0.343145751 2.34314575,-1 4,-1 Z" id="形状结合" transform="translate(6.000000, 4.000000) rotate(-45.000000) translate(-6.000000, -4.000000) "></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

front/project/www/components/Header/index.js

@@ -39,9 +39,9 @@ function Header(props) {
               overlayClassName="header-user-overlay"
               overlay={
                 <div className="list">
-                  <div className={`item ${info.previewNumber > 0 ? 'more' : ''}`} onClick={() => linkTo('/my/course')}>
+                  <div className={`item ${info.previewNumber > 0 ? 'more-message' : ''}`} onClick={() => linkTo('/my/course')}>
                     <div className="t-1">
-                      <Assets name="course" svg />
+                      <Assets name={info.previewNumber > 0 ? 'course_more' : 'course'} svg />
                       课程
                     </div>
                     {info.previewNumber > 0 && <div className="t-s-12 nowrap" onClick={(e) => {
@@ -51,23 +51,23 @@ function Header(props) {
                       <span className="t-4">{info.previewNumber}</span> 份作业待完成
                     </div>}
                   </div>
-                  <div className={`item ${info.textbook ? 'more' : ''}`} onClick={() => linkTo('/textbook')}>
+                  <div className={`item ${info.textbook ? 'more-message' : ''}`} onClick={() => linkTo('/textbook')}>
                     <div className="t-1">
-                      <Assets name="jijing" svg />
+                      <Assets name={info.textbook ? 'jijing_more' : 'jijing'} svg />
                       机经
                     </div>
                     {info.textbook && <div className="t-s-12 nowrap">最近更新:{formatDate(info.textbook, 'YYYY-MM-DD')}</div>}
                   </div>
-                  <div className={`item ${inviteStatus ? 'more' : ''}`}>
+                  <div className={`item ${inviteStatus ? 'more-message' : ''}`}>
                     <div className="t-1">
-                      <Assets name="yaoqing" svg />
+                      <Assets name={inviteStatus ? 'yaoqing_more' : 'yaoqing'} svg />
                       邀请好友
                     </div>
                     {inviteStatus && <div className="t-s-12 nowrap">第{info.inviteNumber}位好友加入</div>}
                   </div>
-                  <div className={`item ${info.messageNumber > 0 ? 'more' : ''}`} onClick={() => linkTo('/my/message')}>
+                  <div className={`item ${info.messageNumber > 0 ? 'more-message' : ''}`} onClick={() => linkTo('/my/message')}>
                     <div className="t-1">
-                      <Assets name="massage" svg />
+                      <Assets name={info.messageNumber > 0 ? 'message_more' : 'message'} svg />
                       消息
                     </div>
                     {info.messageNumber > 0 && <div className="t-s-12 nowrap" onClick={(e) => {

front/project/www/components/Header/index.less

@@ -117,21 +117,17 @@
 
       .assets {
         margin-right: 5px;
-
         path {
-          fill: #4292F0FF !important;
+          fill: #303139FF !important;
         }
       }
     }
 
-    .item.more {
+    .item.more-message {
       line-height: 16px;
       padding: 20px;
-
-      .assets {
-        path {
-          fill: #303139FF !important;
-        }
+      path {
+        fill: #4292F0FF !important;
       }
     }
 

front/project/www/components/Item/index.js

@@ -46,7 +46,7 @@ export class SingleItem extends Component {
         <div className="img" onClick={() => linkTo(`/course/detail/${data.id}`)}>
           <div className="title">
             <div className="tag">{CrowdMap[data.crowd]}</div>
-            <Link to={`/course/detail/${data.id}`} target="_blank">{data.title}</Link>
+            <Link className='f-w-b' to={`/course/detail/${data.id}`} target="_blank">{data.title}</Link>
           </div>
           <div className="left">
             <span>课时数: {data.noNumber}</span>
@@ -89,7 +89,7 @@ export class SingleItem extends Component {
                 size="lager"
                 onClick={() => this.add()}
               >
-                <Assets name="add" />
+                <Assets name={data.add || add ? 'add_disabled' : 'add'} />
               </Button>
             )}
           </div>
@@ -139,11 +139,11 @@ export class PackageItem extends Component {
     return (
       <div className="package-item">
         <div className="block m-b-1 c-p" onClick={() => linkTo(`/course/package/detail/${data.id}`)}>
-          <div className="title t-1 m-b-5 f-w-b">
-            <div hidden={!novice} className="tag f-w-d">
+          <div className="title t-1 m-b-5">
+            <div hidden={!novice} className="tag">
               新手
             </div>
-            <Link to={`/course/package/detail/${data.id}`} target="_blank">{data.title}</Link>
+            <Link className='t-1 f-w-b' to={`/course/package/detail/${data.id}`} target="_blank">{data.title}</Link>
           </div>
           <div className="t-1 t-s-12 m-b-5">授课老师 {teachers.join(' ')}</div>
           <div className="t-1 t-s-12 m-b-2">{data.description}</div>
@@ -200,7 +200,7 @@ export class PackageItem extends Component {
             disabled={data.add || add}
             onClick={() => this.add()}
           >
-            <Assets name="add" />
+            <Assets name={data.add || add ? 'add_disabled' : 'add'} />
           </Button>
         </div>
       </div>
@@ -240,8 +240,8 @@ export class DataItem extends Component {
     return (
       <div className="data-item">
         <Assets
-          width="309"
-          height="264"
+          width={264}
+          height={309}
           name=""
           src={data.cover}
           onClick={() => linkTo(`/course/data/detail/${data.id}`)}
@@ -276,7 +276,7 @@ export class DataItem extends Component {
               size="lager"
               onClick={() => this.add()}
             >
-              <Assets name="add" />
+              <Assets name={data.add || add ? 'add_disabled' : 'add'} />
             </Button>
           )}
         </div>

front/project/www/components/Item/index.less

@@ -16,7 +16,7 @@
 
     .title {
       font-weight: 500;
-      color: rgba(255, 255, 255, 1);
+      color: rgba(255, 255, 255, 1)!important;
       line-height: 24px;
       font-size: 16px;
       margin-left: 15px;
@@ -32,6 +32,9 @@
         text-align: center;
         margin-right: 5px;
       }
+       a{
+        color: rgba(255, 255, 255, 1)!important;
+       }
     }
 
     .left {
@@ -160,8 +163,8 @@
 
   .buyed {
     position: absolute;
-    bottom: 15px;
-    left: 15px;
+    bottom: 85px;
+    left: 30px;
   }
 }
 

front/project/www/components/Other/index.js

@@ -95,8 +95,8 @@ export class AnswerCarousel extends Component {
             </Carousel>
           )}
           {!tabs && <div className="fixed" />}
-          <Assets name="footer_next_highlight_1 c-p" className="next" onClick={() => this.onNext()} />
-          <Assets name="footer_previous_highlight_1 c-p" className="prev" onClick={() => this.onPrev()} />
+          <Assets name="footer_next_highlight_1" className="next c-p" onClick={() => this.onNext()} />
+          <Assets name="footer_previous_highlight_1" className="prev c-p" onClick={() => this.onPrev()} />
         </div>
         {!hideBtn && (
           <Button size="lager" radius onClick={() => User.needLogin().then(() => onFaq())}>

front/project/www/routes/course/main/index.less

@@ -11,8 +11,8 @@
       margin: 0 auto;
       transform: translateY(100px);
       text-align: center;
-      padding-top: 135px;
       background: #eee;
+      position: relative;
 
       .main-title {
         font-size: 70px;
@@ -22,6 +22,10 @@
       }
 
       .btn-list {
+        position: absolute;
+        top: 290px;
+        left: 50%;
+        transform: translateX(-50%);
         .button {
           margin: 0 20px;
           font-weight: 600;
@@ -69,6 +73,12 @@
           color: #fff;
           font-size: 20px;
           font-weight: 600;
+          line-height: 24px;
+          cursor: pointer;
+          border-bottom: 1px solid transparent;
+        }
+        .name:hover {
+          border-bottom: 1px solid #fff;
         }
       }
     }

front/project/www/routes/course/main/page.js

@@ -46,8 +46,7 @@ export default class extends Page {
       <div>
         <div className="block-1">
           <div className="body">
-            <Assets name="" />
-            <div className="main-title">Waste Less, Learn More.</div>
+            <Assets name="course_main_banner" />
             <div className="btn-list">
               <Button width={100} size="lager" onClick={() => linkTo('/course/online?tab=package')}>
                 查看套餐

front/project/www/routes/my/main/index.less

@@ -1,7 +1,28 @@
 @charset "utf-8";
 
 #my-main {
-  .total-layout {}
+  .top-layout {
+    position: relative;
+    .assets {
+      width: 100%;
+    }
+    .close {
+      top: 12px;
+      right: 12px;
+      width: 20px;
+      height: 20px;
+      cursor: pointer;
+      position: absolute;
+    }
+    .go {
+      top: 37px;
+      right: 51px;
+      width: 42px;
+      height: 42px;
+      cursor: pointer;
+      position: absolute;
+    }
+  }
 
   .log-layout {
     .header {
@@ -255,6 +276,21 @@
     }
   }
 
+  .vip-layout {
+    text-align: center;
+    .body {
+      padding: 20px 20px 10px;
+      border-bottom: 1px solid #eee;
+      text-align: left;
+      .t {
+        line-height: 30px;
+      }
+    }
+    .footer {
+      padding: 12px 0;
+    }
+  }
+
   .message-layout {
     .header {
       font-size: 12px;
@@ -289,6 +325,10 @@
           top: 3px;
           cursor: pointer;
         }
+
+        .dot:after {
+          top: 8px;
+        }
       }
     }
 

front/project/www/routes/my/main/page.js

@@ -380,7 +380,11 @@ export default class extends Page {
 
   renderTop() {
     const { info } = this.props.user;
-    return !info.bindPrepare && <div className="total-layout" onClick={() => this.setState({ showExamination: true })}><Assets /></div>;
+    return !info.bindPrepare && <div className="top-layout">
+      <Assets name='my_main_banner' />
+      <div className='close' />
+      <div className='go' onClick={() => this.setState({ showExamination: true })} />
+    </div>;
   }
 
   renderLog() {
@@ -643,9 +647,16 @@ export default class extends Page {
 
   renderVip() {
     const { info } = this.props.user;
-    return !info.vip && <div className="info-layout">
+    return !info.vip && <div className="vip-layout">
       <div className="body">
-        开通<Assets className="m-r-5" name="VIP" />解锁海量权限
+        <div className='m-b-1'>
+        开通 <Assets className="m-r-5" name="VIP" />解锁海量权限
+        </div>
+        <div className='t d-i-b m-r-2 t-1 t-s-12'><Icon className='t-4' type='check' /> 自由组卷</div>
+        <div className='t d-i-b m-r-2 t-1 t-s-12'><Icon className='t-4' type='check' /> 导出笔记</div>
+        <div className='t d-i-b m-r-2 t-1 t-s-12'><Icon className='t-4' type='check' /> 专享解析</div>
+        <div className='t d-i-b m-r-2 t-1 t-s-12'><Icon className='t-4' type='check' /> 换库提醒</div>
+        <div className='t d-i-b m-r-2 t-1 t-s-12'><Icon className='t-4' type='check' /> 加强版报告</div>
       </div>
       <div className="footer">
         <Button
@@ -655,7 +666,7 @@ export default class extends Page {
             this.setState({ showVip: true });
           }}
         >
-          立即开通
+          去开通
             </Button>
       </div>
     </div>;

front/project/www/routes/question/search/index.less

@@ -6,6 +6,7 @@
 
   .content {
     width: 1140px !important;
+    position: relative;
   }
 
   .search-layout {

front/project/www/routes/question/search/page.js

@@ -206,6 +206,7 @@ export default class extends Page {
     return (
       <div className="filter-layout">
         <div className="content">
+          <div style={{ right: 0, top: 0 }} className='p-a' hidden={!login}><Link to="/question/search/history"><Icon type="history" /> 浏览历史 ></Link></div>
           <Tabs
             border
             type="division"
@@ -217,7 +218,6 @@ export default class extends Page {
             tabs={questionSubjectSelect}
             onChange={key => this.onRefreshFilter({ subject: key })}
           />
-          <div hidden={!login}><Link to="/question/search/history">浏览历史</Link></div>
           <UserAction
             selectList={[
               {