修改页面

src/containers/center/components/menu/menu.js

@@ -24,13 +24,13 @@ const menu = [
      name: '推荐课程',
      icon: 'ico-course',
      children: [
-       {
-         path: '/center/market',
-         name: '继续教育'
-       },
        {
          path: '/center/trainMarket',
          name: '培训测试'
+       },
+       {
+         path: '/center/market',
+         name: '继续教育'
        }
      ]
    },

src/containers/center/home/index.vue

@@ -6,24 +6,25 @@
           <p class="fl">学习向导</p>
         </div>
         <div class="train_step_box clear mt10">
-          <div class="train_step fl">
+         <!-- <div class="train_step fl">
             <p><span class="fs3 t-b b v-m">第1步</span>
               <a @click="gotoPage('/center/setting')" class="train_btn" title="实名认证">实名认证</a>
             </p>
 
             <p class="fs15 mt10">编辑用户信息，完成实名认证</p>
-          </div><span class="p-ico2 step-ico fl"></span>
+          </div>
+          <span class="p-ico2 step-ico fl"></span> -->
           <div class="train_step fl">
-            <p><span class="fs3 t-b b v-m">第2步</span>
+            <p><span class="fs3 t-b b v-m">第1步</span>
               <a @click="gotoPage('/center/class/train')" class="train_btn w150" title="进班学习">进班学习</a></p>
-            <p class="fs15 mt10">完成班级内培训内容，通过班级考核</p>
+            <p class="fs15 mt10">学完培训内容，通过课程考核</p>
           </div><span class="p-ico2 step-ico fl"></span>
           <div class="train_step fl">
             <p>
-              <span class="fs3 t-b b v-m">第3步</span>
+              <span class="fs3 t-b b v-m">第2步</span>
               <a @click="gotoPage('/center/sign')" class="train_btn w150" title="下载证明">下载证明</a>
             </p>
-            <p class="fs15 mt10">班级培训合格，即可以下载学时证明</p>
+            <p class="fs15 mt10">培训合格，即可以下载学时证明</p>
           </div>
         </div>
 
@@ -35,22 +36,21 @@
           <p class="fl">最近学习课程</p>
         </div>
         <div class="clear mt10">
-          <div class="m-history-course fl ng-scope" v-for="item in list" :key="item.courseId"
-            style="width:460px; margin-left:8px;cursor:pointer">
-            <a  class="course-img" @click="gotoPlay(item.courseId)">
+          <div class="m-history-course fl ng-scope" v-for="item in list" :key="item.courseId" style="width:460px; margin-left:8px;cursor:pointer">
+            <a class="course-img" @click="gotoPlay(item.courseId)">
               <img :src="item.tb">
               <span class="p-ico2"></span>
             </a>
             <div class="history-course-bd" style="width:276px">
               <p class="tit ng-binding">{{item.name}}[{{item.nd}}]</p>
-              <div class="info" v-if="curDate>=item.startDate" >课程进度
+              <div class="info" v-if="curDate>=item.startDate">课程进度
                 <span class="num ml10 ng-binding">{{getPercent(item)}}</span>
                 <span class="t-b">%</span>
               </div>
-              <div class="info" v-else >课程进度
+              <div class="info" v-else>课程进度
                 <span class="p10 t-b">学习时间未到</span>
               </div>
-              <div class="info" >最近一次学习
+              <div class="info">最近一次学习
                 <span>{{item.endDate>curDate?curDate:item.endDate}}</span>
               </div>
             </div>
@@ -68,7 +68,9 @@
     httpServer
   } from "@/components/httpServer/httpServer.js";
   import setting from '@/setting';
-  import {curDate} from '@/utils/date.js'
+  import {
+    curDate
+  } from '@/utils/date.js'
   export default {
     name: "Index",
     data() {
@@ -77,7 +79,7 @@
         size: 6,
         total: 1,
         media: {},
-        curDate:curDate(),
+        curDate: curDate(),
         list: [],
         setting
       };
@@ -87,7 +89,12 @@
     },
     methods: {
       gotoPlay(courseId) {
-        this.$router.push({name:'play', params:{courseId}})
+        this.$router.push({
+          name: 'play',
+          params: {
+            courseId
+          }
+        })
       },
       gotoPage(route) {
         this.$router.push(route);

src/containers/center/market/index.vue

@@ -105,6 +105,9 @@
           </div>
         </li>
       </ul>
+      <div v-if="list.length==0" class="tc mt20 red">
+        <span style="color: red;padding:40px;font-size: 26px;">已经最后一页了</span>
+      </div>
 
       <el-pagination class="m-pages"
         @current-change="(page)=>{this.page=page}"
@@ -537,7 +540,7 @@
         });
       },
       gotoPlay(courseId) {
-        this.$router.push(`/center/class/train`);
+        this.$router.push(`/center/play/${courseId}`);
       },
       handleCurrentChange(page) {
         this.page = page;

src/containers/center/market/trainIndex.vue

@@ -94,6 +94,9 @@
           </div>
         </li>
       </ul>
+      <div v-if="list.length==0" class="tc mt20 red">
+        <span style="color: red;padding:40px;font-size: 26px;">已经最后一页了</span>
+      </div>
 
       <el-pagination class="m-pages"
         @current-change="(page)=>{this.page=page}"
@@ -484,39 +487,41 @@
         this.buyForm.buyImg = url;
       },
       goPay( item ) {
-        this.buyForm = Object.assign(this.buyForm, item)
-        this.buyForm.company = this.userInfo.company;
-        this.buyForm.temp = item;
-        this.buyForm.courseName = item.name;
-        let isEdu = this.type == '施工现场专业人员';
-
-        // 绕开检查
-        // this.stage = 2;
-        // this.isCompanyPay = 1;
-        // this.isCommitment=''
-        // this.buyForm.rzCode = item.rzCode;
-        // this.buyForm.company = 'ssss';
-        // this.buyForm.courseName = item.courseName;
-        // this.buyCourseDialog = true;
-        // 检查
-        httpServer("weixin.docheckpay", {
-          courseId: item.course_id
-        }).then((res) => {
-          if (res.code == 200) {
-            this.stage = 2;
-            this.isCompanyPay = 0;
-            this.isCommitment=''
-            Object.assign( this.buyForm, res.data);
-            if( isEdu){
-              this.buyCourseDialog = true;
-            }else{
-              this.commitmentDialog = true;
-            }
-          }
-        });
+        this.$message.successMsg("请联系管理员开通", 1);
+        return;
+        // this.buyForm = Object.assign(this.buyForm, item)
+        // this.buyForm.company = this.userInfo.company;
+        // this.buyForm.temp = item;
+        // this.buyForm.courseName = item.name;
+        // let isEdu = this.type == '施工现场专业人员';
+
+        // // 绕开检查
+        // // this.stage = 2;
+        // // this.isCompanyPay = 1;
+        // // this.isCommitment=''
+        // // this.buyForm.rzCode = item.rzCode;
+        // // this.buyForm.company = 'ssss';
+        // // this.buyForm.courseName = item.courseName;
+        // // this.buyCourseDialog = true;
+        // // 检查
+        // httpServer("weixin.docheckpay", {
+        //   courseId: item.course_id
+        // }).then((res) => {
+        //   if (res.code == 200) {
+        //     this.stage = 2;
+        //     this.isCompanyPay = 0;
+        //     this.isCommitment=''
+        //     Object.assign( this.buyForm, res.data);
+        //     if( isEdu){
+        //       this.buyCourseDialog = true;
+        //     }else{
+        //       this.commitmentDialog = true;
+        //     }
+        //   }
+        // });
       },
       gotoPlay(courseId) {
-        this.$router.push(`/center/class/train`);
+        this.$router.push(`/center/play/${courseId}`);
       },
       handleCurrentChange(page) {
         this.page = page;

src/containers/center/myOrder/index.vue

@@ -23,7 +23,13 @@
 
           <el-table-column label="证书类型" >
             <template slot-scope="{row, $index}">
-              <span>{{row.type}}-{{row.nd}}</span>
+              <span>{{row.type}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="年度">
+            <template slot-scope="{row}">
+              <span>{{row.nd}}</span>
             </template>
           </el-table-column>
 
@@ -33,11 +39,6 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="金额(元)">
-            <template slot-scope="{row}">
-              <span>{{ row.fee|money }} </span>
-            </template>
-          </el-table-column>
 
           <el-table-column label="订单状态" min-width="120">
             <template slot-scope="{row}">

src/containers/center/setting/index.vue

@@ -4,10 +4,10 @@
       <div class="m-account">
         <div class="account-tit" style="height:30px">
           <a :class="{'current':show===1}" style="text-decoration: none;padding-bottom: 5px" @click="show=1" class="">基础资料</a>
-          <a :class="{'current':show===2}" style="text-decoration: none;padding-bottom: 5px" @click="show=2" class="">实名认证</a>
+          <!-- <a :class="{'current':show===2}" style="text-decoration: none;padding-bottom: 5px" @click="show=2" class="">实名认证</a> -->
           <a :class="{'current':show===3}" style="text-decoration: none;padding-bottom: 5px" @click="show=3" class="">额外信息</a>
           <!-- <a :class="{'current':show===4}" style="text-decoration: none;padding-bottom: 5px" @click="show=4" class="">密码修改</a> -->
-          <a :class="{'current':show===5}" style="text-decoration: none;padding-bottom: 5px" @click="show=5" class="">手机修改</a>
+          <!-- <a :class="{'current':show===5}" style="text-decoration: none;padding-bottom: 5px" @click="show=5" class="">手机修改</a> -->
         </div>
 
         <div v-if="show===1" class="lwh-ul-form">
@@ -58,10 +58,10 @@
                   <span class="p-ico2"></span>手机格式不对
                 </span>
               </li>
-              <li class="mt20">
+              <!-- <li class="mt20">
                 <span class="l-t"></span>
                 <el-button type="primary" class="confirm" @click="doSaveBaseInfo()">保 存</el-button>
-              </li>
+              </li> -->
             </ul>
 
           </form>

src/containers/center/sign/index.vue

@@ -17,7 +17,7 @@
 
           <el-table-column label="证书类型" align="center" width="220">
             <template slot-scope="{row, $index}">
-              <span>{{row.type}}【{{row.nd}}】</span>
+              <span>{{row.type}}</span>
             </template>
           </el-table-column>
 
@@ -34,9 +34,9 @@
           </el-table-column>
 
 
-          <el-table-column label="费用(元)" align="center" width="80">
+          <el-table-column label="学习年度" align="center" width="80">
             <template slot-scope="{row}">
-              <span>￥{{ row.fee/100 }}</span>
+              <span>{{ row.nd }}</span>
             </template>
           </el-table-column>