y595705120 2 роки тому
батько
коміт
1a61466329

+ 1 - 1
src/App.vue

@@ -7,7 +7,7 @@
         <router-view v-if="!$route.meta.keepAlive"></router-view>
         <router-view v-if="!$route.meta.keepAlive"></router-view>
     </div>
     </div>
 
 
-    <div class="p-wrap-full">
+    <div>
       <div class="footer ng-scope" style="z-index: 10">
       <div class="footer ng-scope" style="z-index: 10">
         <div class="footer-bd">
         <div class="footer-bd">
           <p>技术支持:{{settings.title}}</p>
           <p>技术支持:{{settings.title}}</p>

+ 1 - 1
src/containers/center/center.vue

@@ -1,7 +1,7 @@
 <template lang="html">
 <template lang="html">
   <div clss="">
   <div clss="">
     <center-navbar :user="userInfo"></center-navbar>
     <center-navbar :user="userInfo"></center-navbar>
-    <div class="p-wrap-full m-content clear body-bg">
+    <div class="p-wrap-full m-content clear body-bg w1360">
       <center-menu :user="userInfo"></center-menu>
       <center-menu :user="userInfo"></center-menu>
       <router-view></router-view>
       <router-view></router-view>
     </div>
     </div>

+ 2 - 2
src/containers/login/login.vue

@@ -2,7 +2,7 @@
   <div class="ng-scope">
   <div class="ng-scope">
     <navbar :user="userInfo" @openLoginDialog="openLoginDialog"></navbar>
     <navbar :user="userInfo" @openLoginDialog="openLoginDialog"></navbar>
     <div class="banner-box">
     <div class="banner-box">
-      <div class="p-wrap-full clear pt30">
+      <div class="p-wrap-full clear pt30 ">
         <keep-alive>
         <keep-alive>
           <NoticeList/>
           <NoticeList/>
         </keep-alive>
         </keep-alive>
@@ -14,7 +14,7 @@
     </div>
     </div>
 
 
     <!-- <learn-time></learn-time> -->
     <!-- <learn-time></learn-time> -->
-    <div class="p-wrap-full mb20 ng-scope">
+    <div class="p-wrap-full mb20 ng-scope ">
       <div class="title-box mt5 clear">
       <div class="title-box mt5 clear">
         <h2 class="title">课程分类</h2>
         <h2 class="title">课程分类</h2>
       </div>
       </div>

+ 1 - 0
src/containers/sign/index.css

@@ -1,5 +1,6 @@
 
 
 .sign-body {
 .sign-body {
+    width: 100%;
     background: url("/static/sign/bg.jpg") no-repeat fixed bottom;
     background: url("/static/sign/bg.jpg") no-repeat fixed bottom;
     background-size: 100% auto;
     background-size: 100% auto;
     background-color:#4eaceb;
     background-color:#4eaceb;

+ 16 - 3
src/containers/sign/index.vue

@@ -24,11 +24,22 @@
             <span>课程名称:</span><strong>{{info.courseName}}</strong>
             <span>课程名称:</span><strong>{{info.courseName}}</strong>
           </li>
           </li>
           <li class="sign-info">
           <li class="sign-info">
-            <span>应修学时:</span><strong>{{info.totalXs/10}}</strong>
+            <span>应修学时:</span><strong style="color: red;">{{info.totalXs/10}}</strong>学时
           </li>
           </li>
+
           <li class="sign-info">
           <li class="sign-info">
-            <span>已修学时:</span><strong>{{info.getXs/10}}</strong>
+            <span>已修学时:</span><strong style="color: red;">{{info.getXs/10}}</strong>学时
+          </li>
+
+          <li class="sign-info" v-if="other.examXs>0">
+            <span>考试学时:</span><strong style="color: red;">{{other.examXs/10}}</strong>学时
+            <span><strong style="color: red;">{{other.score}}</strong>分</span>
           </li>
           </li>
+
+          <li class="sign-info" v-if="other.testXs>0">
+            <span>线下复习:</span><strong style="color: red;">{{other.testXs/10}}</strong>学时
+          </li>
+
         </ul>
         </ul>
       </div>
       </div>
     </div>
     </div>
@@ -65,6 +76,7 @@
     data() {
     data() {
       return {
       return {
         id: '',
         id: '',
+        other:{},
         info: {}
         info: {}
       };
       };
     },
     },
@@ -85,7 +97,8 @@
           id
           id
         }).then(res => {
         }).then(res => {
           if (res.code == 200) {
           if (res.code == 200) {
-            this.info = JSON.parse(res.data)
+            this.other = res.data
+            this.info = JSON.parse(res.data.data)
           }
           }
         })
         })
       }
       }

+ 1 - 0
src/router/index.js

@@ -68,6 +68,7 @@ export default new Router({
     {
     {
       path: '/sign',
       path: '/sign',
       name: 'sign',
       name: 'sign',
+      component: login,
       component: PublicSign,
       component: PublicSign,
     },
     },
     {
     {