Merge branch 'release/2.0.0' of https://gitlab.mingwork.com/fengzhaoyu/schedule into release/2.0.0

api/login.js

@@ -25,7 +25,7 @@ export default async function login() {
               getApp().globalData.name = res.data.data.oapiUser.name;
               getApp().globalData.userid = res.data.data.oapiUser.userid;
               getApp().globalData.mwUserId = res.data.data.mwUserId;
-              dd.setStorageSync({ key: 'mwUserId', data: res.data.data.mwUserId })
+              dd.setStorageSync({ key: 'mwUserId', data: res.data.data.mwUserId, key: 'userid', data: res.data.data.oapiUser.userid })
               getApp().globalData.avatar = res.data.data.oapiUser.avatar;
               getApp().globalData.userInfo = JSON.stringify({
                 username: oapiUser.name,

components/meetingTimePicker/meetingTimePicker.js

@@ -12,7 +12,7 @@ function padZero(val) {
 // 生成分钟 每隔五分钟
 function generateMin(max) {
   const time = [];
-  for (let i = 0; i < max; i += 15) {
+  for (let i = 0; i < max; i += 5) {
     time.push(padZero(i))
   }
   return time;

pages/index/index.js

@@ -17,7 +17,8 @@ import {
   throttle,
   padZero,
   getCreateShowTime,
-  isJSON
+  isJSON,
+  removeHtml
 } from "../../utils/utils";
 import { checkFullScren } from "../../utils/checkFullScren";
 import create from "dd-store";
@@ -318,6 +319,10 @@ create.Page({
             if (itemData.updateTime) {
               itemData.updateTime = getCreateShowTime(itemData.updateTime);
             }
+            if (itemData.notes) {
+              itemData.notes = removeHtml(itemData.notes)
+            }
+
           }
           return item;
         });

pages/meetingDetail/meetingDetail.js

@@ -3,7 +3,7 @@ import { checkFullScren } from "../../utils/checkFullScren";
 import pageStore from './store';
 import { saveFileInfo, getMeetingRoomAffairs, createMeetingTask, deleteMeetingTask, updateMeetingTask, uploadPermissions } from '../../api/request';
 import { getOssPermission, getuploadResource, isParticipate, deleteSchedule, getScheduleDetail, getUserScheduleInTime, modifySchedule, getMeetingRoomRepeatAffairs, updateMoment, deleteMoment, setRead } from '../../api/request.js'
-import { selectedelRequired, selectPeople, getShowTime, modifyTimeImpactRepeat, throttle, getCreateShowTime, dealRepeatModal } from './../../utils/utils.js'
+import { selectedelRequired, selectPeople, getShowTime, modifyTimeImpactRepeat, throttle, getCreateShowTime, dealRepeatModal, removeHtml } from './../../utils/utils.js'
 import { observer } from '/utils/observer.js'
 import { resolve } from 'path';
 import { getFileInfo, aheadTimesList, getFileInfoFromOss } from './uploadFile.js';
@@ -112,7 +112,7 @@ create.Page({
       isIPX: checkFullScren(),
       placeholder: `${getApp().globalData.name}创建的会议`,
       scheduleItem,
-      currentPeople: getApp().globalData.userid
+      currentPeople: getApp().globalData.userid || dd.getStorageSync({ key: 'userid' }).data
     })
     this.getDetail();
     const _that = this
@@ -177,7 +177,9 @@ create.Page({
       })
 
       this.$store.data.originalData = res.data.data;
-      this.$store.data.locationName = res.data.data.location ? res.data.data.location.locationName : ''
+      if (res.data.data.location) {
+        this.$store.data.locationName = res.data.data.location.meetingRoomName || res.data.data.location.locationName;
+      }
       this.$store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId
       this.store.data.scheduleId = res.data.data.groupId
       this.$store.data.startTime = res.data.data.startTime.replace(/-/g, "/")
@@ -984,6 +986,9 @@ create.Page({
       if (it.createTime) {
         it.updateTime = getCreateShowTime(it.updateTime);
       }
+      if (it.notes) {
+        it.notes = removeHtml(it.notes);
+      }
       if (it.replyCommentList) {
         it.replyCommentList.map(item => {
           item.updateTime = getCreateShowTime(item.updateTime);

utils/utils.js

@@ -326,4 +326,6 @@ export function isJSON(str) {
     }
   }
   return false;
-}
\ No newline at end of file
+}
+
+export function removeHtml(str) { return str.replace(/<\/?.+?>/g, "") }