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

解决360浏览器时间控件问题  code reviewer: 张平

解决360浏览器时间控件问题  code reviewer: 张平

See merge request !152

src/components/education/template/templateMessage.vue

@@ -22,6 +22,7 @@
           <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
@@ -49,6 +50,7 @@
           <p @click="checkDefault"> 我的机构： {{ formData.creatorOrganizationName }} </p>
         </el-popover>
       </el-form-item>
+
       <div>
         <el-form-item label="项目时间：" required>
           <el-col :span="5">
@@ -58,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"
@@ -73,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%;"
@@ -84,6 +88,7 @@
         </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="列表图片：">
@@ -111,6 +116,7 @@
         </el-form-item>
         <p class="upload-message" v-if="uploadImgMessage">请选择列表图片</p>
       </div>
+
       <el-form-item label="封面类型：">
         <el-radio-group
           size="small"
@@ -122,6 +128,7 @@
           <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="封面文件：">
@@ -168,6 +175,7 @@
         </el-form-item>
         <p class="upload-message" v-if="uploadImgMessage2">请选择封面</p>
       </div>
+
       <el-form-item label="项目简介：" prop="projectIntro">
         <el-col :span="13">
           <el-input
@@ -183,12 +191,15 @@
         </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";
+import { convertTime } from "../../../utils";
 import dialog from "./dialog";
 let vm = null;
 export default {
@@ -292,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
           ); //减去一天的时间代表可以选择同一天;
         }
@@ -361,6 +373,11 @@ export default {
   methods: {
     // 设置已有的基本信息
     setBaseMessage(data) {
+      console.log('#####', data);
+      console.log(data.projectData.projectBegintime);
+      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]);
@@ -427,7 +444,7 @@ export default {
       // 机构输入提示显示与否
       vm.visibleName = textLength == 0;
     },
-    // 离开机构名称焦点
+    // 离开机构名称焦点 
     blurName() {
       vm.visibleName = false;
       setTimeout(() => {
@@ -607,6 +624,7 @@ 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;
@@ -615,7 +633,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;
       }
@@ -689,6 +710,7 @@ export default {
   }
 </style>
 <style lang="scss" scoped>
+
   .base-message-wrap {
     padding-top: 80px;
     .p_label {

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

src/utils/index.js

@@ -225,4 +225,20 @@ export function getItemFileUrl(url) {
 // 获取老的cms接口域名地址
 export function getCmsUrl(url) {
   return getConfigByEnvType('cmsUrl') + url
+}
+
+// 获取老的cms接口域名地址
+export function convertTime(time, isToSlash = true) {
+  console.log('#########time', time);
+  // 2020-04-16 15:06:19
+  if(!time) {
+    return ''
+  } else {
+    time = time + '';
+    if(isToSlash) {
+      return time.replace(/-/g, '/')
+    } else {
+      return time.replace(/\//g, '-')
+    }
+  }
 }
\ No newline at end of file