Merge branch 'dev-mvp-20200331' into 'release'

优化时间控件代码   codereviewer 张平

优化时间控件代码   codereviewer 张平

See merge request !150

src/components/education/template/templateMessage.vue

@@ -51,7 +51,7 @@
         </el-popover>
       </el-form-item>
 
-      <div v-if="formData.expireDay">
+      <div>
         <el-form-item label="项目时间：" required>
           <el-col :span="5">
             <el-form-item prop="projectBegintime">
@@ -299,15 +299,6 @@ export default {
       },
       pickerOptions1: {
         disabledDate: time => {
-          if( !(time.getTime() < new Date(vm.formData.projectBegintime).getTime() || time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay)) {
-            console.log('开始时间:',vm.formData.projectBegintime);
-            console.log('今天之前：',time.getTime() < new Date(vm.formData.projectBegintime).getTime());
-            console.log('当前时间大于有效期:', time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay);
-            console.log('当前时间：',new Date(time.getTime()));
-            console.log('有效期最后一天:',new Date(new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay));
-            console.log('可以使用的天数:',vm.formData.expireDay);
-            console.log('====================================');
-          }
           return (
             time.getTime() < new Date(vm.formData.projectBegintime).getTime() || time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay
           ); //减去一天的时间代表可以选择同一天;

src/utils/fetch.js

@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
-      config.headers['token'] = '2141D101894D43C9BC7A14C54837EDCD';
+      // config.headers['token'] = '2141D101894D43C9BC7A14C54837EDCD';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')