Merge branch 'release' into dev-edu-phrase2.6-0418

* release: (25 commits)
  修改没有模板时候的样式
  修改一样Ui的问题
  修改样式
  时间格式问题
  转换时间格式
  解决时间格式问题
  时间显示问题
  修改时间问题
  设置已有的基本信息
  减去一天的时间代表可以选择同一天
  结束时间问题
  设置已有的基本信息
  获取老的cms接口域名地址
  修改时间的格式
  更改dev的token
  将控件代码还原
  去掉开发时的调试
  解决IE对时间中-的兼容新问题
  优化时间控件代码
  解决uat的时间控件的问题
  ...

# Conflicts:
#	src/utils/env-config.js
#	src/utils/fetch.js

src/components/education/template/selectTemplate.vue

@@ -524,6 +524,8 @@ export default {
       if (editData.certificateRule.length > 0) {
         this.formComponent.configure = 1;
       }
+      // 初始化学习时间长
+      this.formComponent.courseRequire = editData.portalOpenTemplateModel.courseRequire;
       //初始化考试平均分配置数据
       this.formExam.certificateType = editData.portalOpenTemplateModel.certificateType;
       this.formExam.passType = editData.portalOpenTemplateModel.passType;

src/components/education/template/templateList.vue

@@ -7,7 +7,8 @@
             <div class="title-icon">{{item.subjectName}}</div>
             <div class="title">{{item.openTemplateName}}</div>
             <div class="sj" v-if="item.isclick">
-              <i class="el-icon-check"></i>
+              <!-- <i class="el-icon-check"></i> -->
+              <img src="../../../assets/image/checked.png" alt="" srcset="">
             </div>
           </div>
           <div class="main">
@@ -46,7 +47,14 @@
             </div>
           </div>
         </div>
+        <div class="empty" v-if="!list.lenght || !list">
+          <div class="table-empty">
+            <img src="../../../assets/image/no-content1.png">
+            <p>暂时还没有项目模版哦</p>
+          </div>
+        </div>
         <i></i><i></i><i></i><i></i><i></i><i></i>
+        
     </div>
     <el-dialog title="项目详情" :visible.sync="dialogTableVisible" class="dialog-list-wrap">
       <div class="dialog-line"></div>
@@ -164,6 +172,9 @@ export default {
 
 <style lang="scss">
 .template-list-wrap {
+  .el-dialog__headerbtn {
+    font-size: 20px;
+  }
   .list-wrap {
     padding: 8px 30px 30px 8px;
     display: flex;
@@ -181,9 +192,8 @@ export default {
       border-radius:4px;
       border:2px solid rgba(241,247,246,1);
       cursor: pointer;
-      &.clicked {
-        position: relative;
-        border:2px solid rgba(68,146,132,1);
+      &:hover {
+        box-shadow:0px 6px 10px 0px rgba(0,0,0,0.1);
       }
       .title-wrap {
         width:336px;
@@ -191,12 +201,13 @@ export default {
         background:rgba(241,247,246,1);
         border-radius:4px 4px 2px 2px;
         .title-icon {
-          width: 72px;
-          height: 22px;
+          // width: 72px;
+          // height: 22px;
+          display: inline-block;
+          padding: 4px 8px;
           background:rgba(68,146,132,1);
           border-radius:4px 0px 4px 0px;
           font-size: 14px;
-          font-family: PingFangSC-Medium,PingFang SC;
           font-weight: 500;
           color:rgba(255,255,255,1);
           line-height: 22px;
@@ -206,26 +217,21 @@ export default {
           margin-top: 16px;
           padding: 0 24px;
           font-size:18px;
-          font-family: PingFangSC-Medium,PingFang SC;
           font-weight: 500;
           color: rgba(55,56,57,1);
           line-height: 26px;
         }
         .sj {
           position: absolute;
-          top: 0;
-          right: 0;
-          height: 0;
-          width: 0;
-          border: 30px solid;
-          border-color: #449284 #449284 transparent transparent;
-          i {
-            position: absolute;
-            top: -20px;
-            right: -20px;
-            font-size: 20px;
-            color: #fff;
-          }
+          top: -1px;
+          right: -1px;
+        }
+      }
+      &.clicked {
+        position: relative;
+        border:2px solid rgba(68,146,132,1);
+        .title-icon {
+          border-radius: 1px 0px 4px 0px;
         }
       }
       .main {
@@ -236,7 +242,6 @@ export default {
           width:90px;
           height:20px;
           font-size:14px;
-          font-family:PingFangSC-Regular,PingFang SC;
           font-weight: 400;
           color:rgba(151,152,153,1);
           line-height:20px;
@@ -256,12 +261,10 @@ export default {
               border-radius: 50%;
             }
             .icon-message {
-              height:16px;
               font-size:16px;
-              font-family:PingFangSC-Regular,PingFang SC;
               font-weight:400;
               color:rgba(55,56,57,1);
-              line-height:20px;
+              line-height:18px;
             }
           }
         }
@@ -281,14 +284,12 @@ export default {
           .pice {
             // width:151px;
             // font-size:18px;
-            // font-family:PingFangSC-Medium,PingFang SC;
             // line-height:25px;
             .pice-icon {
               margin-right: 2px;
               width:10px;
               height:20px;
               font-size:16px;
-              font-family:'PingFangSC-Medium,PingFang SC';
               font-weight:500;
               color:rgba(55,56,57,1);
               line-height:20px;
@@ -297,7 +298,6 @@ export default {
               width:80px;
               height:20px;
               font-size:20px;
-              font-family: 'PingFangSC-Medium,PingFang SC';
               font-weight:500;
               color:rgba(216,43,43,1);
               line-height:20px;
@@ -311,7 +311,6 @@ export default {
             margin-top: 7px;
             height:20px;
             font-size:14px;
-            font-family:PingFangSC-Regular,PingFang SC;
             font-weight:400;
             color:rgba(159,159,159,1);
             line-height:20px;
@@ -323,7 +322,6 @@ export default {
           width:98px;
           height:50px;
           font-size:14px;
-          font-family:PingFangSC-Regular,PingFang SC;
           font-weight:400;
           color:rgba(68,146,132,1);
           line-height:50px;
@@ -331,6 +329,24 @@ export default {
         }
       }
     }
+    .empty {
+      width: 100%;
+      height: 60vh;
+      .table-empty {
+        width: 400px;
+        text-align: center;
+        margin: 10vh auto 0;
+        img {
+          width: 100px;
+          height: 100px;
+        }
+        p {
+          margin-top: -30px;
+          line-height: 60px;
+          color: #909399;
+        }
+      }
+    }
   }
   .dialog-list-wrap {
     .el-dialog {
@@ -338,6 +354,9 @@ export default {
       max-height: 80%;
       overflow: hidden;
     }
+    .el-dialog__body {
+      padding-top: 12px;
+    }
     .dialog-line {
       width:750px;
       height:1px;
@@ -356,7 +375,6 @@ export default {
       background:rgba(241,247,246,1);
       border-radius:4px 4px 2px 2px;
       font-size:18px;
-      font-family:PingFangSC-Medium,PingFang SC;
       font-weight:500;
       color:rgba(55,56,57,1);
       line-height:80px;
@@ -377,7 +395,6 @@ export default {
         width:72px;
         height:20px;
         font-size:18px;
-        font-family:PingFangSC-Medium,PingFang SC;
         font-weight:500;
         color:rgba(0,0,0,0.85);
         line-height:20px;
@@ -392,7 +409,6 @@ export default {
           margin-top: 14px;
           font-size:14px;
           line-height: 20px;
-          font-family:PingFangSC-Regular,PingFang SC;
           font-weight:400;
           color:rgba(103,104,105,1);
           line-height:20px;
@@ -410,7 +426,6 @@ export default {
         margin-left: 17px;
         margin-top: 16px;
         font-size:14px;
-        font-family:PingFangSC-Regular,PingFang SC;
         font-weight:400;
         color:rgba(103,104,105,1);
         line-height:24px;

src/components/education/template/templateMessage.vue

@@ -60,7 +60,8 @@
                 size="small"
                 type="datetime"
                 placeholder="请选择开始时间"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                format="yyyy/MM/dd HH:mm:ss"
                 :picker-options="pickerOptions0"
                 style="width: 100%;"
                 :disabled="formData.status4Flag == 1 || isPreview==1"
@@ -75,7 +76,8 @@
                 size="small"
                 type="datetime"
                 placeholder="请选择结束时间"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                format="yyyy/MM/dd HH:mm:ss"
                 :picker-options="pickerOptions1"
                 default-time="00:00:00"
                 style="width: 100%;"
@@ -197,6 +199,7 @@
 <script>
 import { doUpload, getFilePath } from "../../../utils/qiniu-util";
 import { openLoading, closeLoading } from "../../../utils/utils";
+import { convertTime } from "../../../utils";
 import dialog from "./dialog";
 let vm = null;
 export default {
@@ -300,6 +303,7 @@ export default {
       pickerOptions1: {
         disabledDate: time => {
           return (
+            // time.getTime() < new Date((vm.formData.projectBegintime).replace(/\-/g, '/')).getTime() || time.getTime() > new Date((vm.formData.projectBegintime).replace(/\-/g, '/')).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay
             time.getTime() < new Date(vm.formData.projectBegintime).getTime() || time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay
           ); //减去一天的时间代表可以选择同一天;
         }
@@ -369,6 +373,9 @@ export default {
   methods: {
     // 设置已有的基本信息
     setBaseMessage(data) {
+      data.projectData.projectBegintime = convertTime(data.projectData.projectBegintime);
+      data.projectData.projectEndtime = convertTime(data.projectData.projectEndtime);
+
       vm.formData = Object.assign(vm.formData, data.projectData);
       vm.formData.attachmentUrl1 = data.attachmentData[0].attachmentUrl;
       vm.formData.attachmentMore1 = Object.assign(vm.formData.attachmentMore1, data.attachmentData[0]);
@@ -435,7 +442,7 @@ export default {
       // 机构输入提示显示与否
       vm.visibleName = textLength == 0;
     },
-    // 离开机构名称焦点
+    // 离开机构名称焦点 
     blurName() {
       vm.visibleName = false;
       setTimeout(() => {
@@ -624,7 +631,10 @@ export default {
         vm.$message.warning('项目结束时间应大于开始时间');
         return;
       }
-     
+
+
+      vm.formData.projectBegintime = convertTime(vm.formData.projectBegintime, false);
+      vm.formData.projectEndtime = convertTime(vm.formData.projectEndtime, false);
       if (status) {
         vm.formData.projectStatus = status;
       }
@@ -827,4 +837,4 @@ export default {
     margin: -6px 0 20px 150px;
     font-size: 14px;
   }
-</style>
+</style>
\ No newline at end of file

src/utils/index.js

@@ -225,4 +225,27 @@ export function getItemFileUrl(url) {
 // 获取老的cms接口域名地址
 export function getCmsUrl(url) {
   return getConfigByEnvType('cmsUrl') + url
+}
+
+// 转换时间格式
+export function convertTime(time, isToSlash = true) {
+  console.log('#########time', time);
+  // 2020-04-16 15:06:19
+  if(!time) {
+    return ''
+  } else {
+    if(isToSlash) {
+      if(typeof(time) == 'object') {
+        return time.format("yyyy/MM/dd hh:mm:ss");
+      } else {
+        return time.replace(/-/g, '/')
+      }
+    } else {
+      if(typeof(time) == 'object') {
+        return time.format("yyyy-MM-dd hh:mm:ss");
+      } else {
+        return time.replace(/\//g, '-')
+      }      
+    }
+  }
 }
\ No newline at end of file

src/views/education/item-manager.vue

@@ -689,12 +689,14 @@ export default {
           warnType: 1
         };
         vm.GET("portal/portalCheck/remindPortalCheck", req).then(res => {
-          if (res.code == "000000") {
-            console.log(res);
-            vm.getProjectList();
-          } else {
-            vm.$message.info(res.message);
-          }
+          vm.$message.info(res.message);
+          vm.getProjectList();
+          // if (res.code == "000000") {
+          //   console.log(res);
+          //   vm.getProjectList();
+          // } else {
+          //   vm.$message.info(res.message);
+          // }
         });
       } else {
         let req = {