Merge branch 'dev-mvp-20200331' into release

src/components/education/template/templateMessage.vue

@@ -22,7 +22,6 @@
           <span class="word-num">{{(formData.projectName).replace(/\s+/g,"").length}}/24</span>
         </el-col>
       </el-form-item>
-
       <el-form-item label="发起机构名称：">
         <el-col :span="13" v-for="(item, index) in formData.organizationNameList" :key="index">
           <el-input
@@ -50,7 +49,6 @@
           <p @click="checkDefault"> 我的机构： {{ formData.creatorOrganizationName }} </p>
         </el-popover>
       </el-form-item>
-
       <div>
         <el-form-item label="项目时间：" required>
           <el-col :span="5">
@@ -86,7 +84,6 @@
         </el-form-item>
         <p class="time-message"><i class="el-icon-warning-outline"></i>项目有效期为{{formData.expireDay}}天,选择项目起止时间须在有效期内</p>
       </div>
-
       <div class="basic-item-icon">
         <span class="require">*</span>
         <el-form-item label="列表图片：">
@@ -114,7 +111,6 @@
         </el-form-item>
         <p class="upload-message" v-if="uploadImgMessage">请选择列表图片</p>
       </div>
-
       <el-form-item label="封面类型：">
         <el-radio-group
           size="small"
@@ -126,7 +122,6 @@
           <el-radio :label="2">视频</el-radio>
         </el-radio-group>
       </el-form-item>
-
       <div class="basic-item-icon">
         <span class="require">*</span>
         <el-form-item label="封面文件：">
@@ -173,7 +168,6 @@
         </el-form-item>
         <p class="upload-message" v-if="uploadImgMessage2">请选择封面</p>
       </div>
-
       <el-form-item label="项目简介：" prop="projectIntro">
         <el-col :span="13">
           <el-input
@@ -189,11 +183,9 @@
         </el-col>
       </el-form-item>
     </el-form>
-
     <dialog-componet :dialogObj="dialogObj" @confirm="confirm" @hide="hide"></dialog-componet>
   </div>
 </template>
-
 <script>
 import { doUpload, getFilePath } from "../../../utils/qiniu-util";
 import { openLoading, closeLoading } from "../../../utils/utils";
@@ -300,7 +292,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
           ); //减去一天的时间代表可以选择同一天;
         }
       },
@@ -615,7 +607,6 @@ export default {
     },
     // 新增或者更新基本信息
     insertOrupdate(status) {
-
       if(new Date(vm.formData.projectEndtime).getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay) {
         vm.$message.warning('项目结束时间应在有效期内');
         return;
@@ -698,7 +689,6 @@ export default {
   }
 </style>
 <style lang="scss" scoped>
-
   .base-message-wrap {
     padding-top: 80px;
     .p_label {
@@ -827,4 +817,4 @@ export default {
     margin: -6px 0 20px 150px;
     font-size: 14px;
   }
-</style>
+</style>
\ No newline at end of file

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'] = '7EB3BFDED9FC45C397B14231BFD4C09A';
+      config.headers['token'] = 'EFA586DEF1CC46D7A31B8FE19C8762D5';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')