提交

config/index.js

@@ -23,7 +23,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.110.157', // can be overwritten by process.env.HOST
+    host: '192.168.110.160', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/views/modules/miniClass/miniClassList.vue

@@ -90,6 +90,8 @@
           <span>创建日期：{{ scope.row.createTime }}<br /></span>
           <span v-if="scope.row.state >= 1">开班日期：{{ scope.row.startTime }}<br /></span>
           <span v-if="scope.row.state == 2">结班日期：{{ scope.row.endTime }}<br /></span>
+          <span v-if="scope.row.examStartTime">考试周开始日期：{{ scope.row.examStartTime }}<br /></span>
+          <span v-if="scope.row.examEndTime">考试周结束日期：{{ scope.row.examEndTime }}<br /></span>
           <!-- <img
             v-if="scope.row.avatar && scope.row.avatar != ''"
             :src="scope.row.avatar"

src/views/modules/talents/talents-list.vue

@@ -264,6 +264,7 @@ export default {
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.dataList = data.list;
+          this.totalPage = this.dataList.length;
         }
         this.dataListLoading = false;
       });

src/views/modules/trainingCourse/training-course-list.vue

@@ -148,7 +148,7 @@
       :current-page="pageIndex"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="pageSize"
-      :total="totalPage"
+      :total="total"
       layout="total, sizes, prev, pager, next, jumper"
     >
     </el-pagination>
@@ -328,7 +328,7 @@ export default {
       dataList: [],
       pageIndex: 1,
       pageSize: 10,
-      totalPage: 0,
+      total: 0,
       dataListLoading: false,
       addOrUpdateVisible: false,
       titlesub: '新增',
@@ -402,7 +402,7 @@ export default {
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.dataList = data.trainingClassList.records;
-          this.totalPage = data.trainingClassList.total;
+          this.total = data.trainingClassList.total;
         }
         this.dataListLoading = false;
       });

src/views/modules/user/userCertificate.vue

@@ -193,7 +193,7 @@
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
-      :page-sizes="[50, 100, 200]"
+      :page-sizes="[10, 20, 50, 100]"
       :page-size="pageSize"
       :total="total"
       layout="total, sizes, prev, pager, next, jumper"
@@ -403,7 +403,7 @@ export default {
       pageIndex: 1,
       pageSize: 10,
       totalPage: 0,
-      total: 0,
+      total: '',
       totalLaoding: false,
       dataListLoading: false,
       dataListSelections: [],
@@ -441,7 +441,7 @@ export default {
   },
   activated() {
     this.userId = this.$route.query.id;
-    this.init();
+    //this.init();
     // this.getDataList()
     // this.getcourpeList()
   },

static/config/index-prod.js

@@ -5,8 +5,8 @@
   window.SITE_CONFIG = {};
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';
-  //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
+  //window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名

static/config/index.js

@@ -5,8 +5,8 @@
   window.SITE_CONFIG = {};
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';         // 线上正式环境
-  //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';  //川
+  //window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';         // 线上正式环境
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';  //川
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain'] = './'; // 域名