Merge branch 'dev' into release_beta/1.0.0

# Conflicts:
#	pages/index/index.js

api/request.js

@@ -237,3 +237,19 @@ export function getZoomUrl(data) {
     type: "binding"
   });
 }
+// oss 上传 获取授权
+export function getOssPermission() {
+  return $http({
+    method: "get",
+    data: "",
+    url: `/meet/meeting-log-resource/getOssUploadSignature`
+  });
+}
+// oss 上传 获取授权
+export function getuploadResource(data) {
+  return $http({
+    method: "post",
+    data: JSON.stringify(data),
+    url: `/meet/meeting-log-resource/uploadResource`
+  });
+}
\ No newline at end of file

components/fileList/fileList.axml

@@ -8,7 +8,7 @@
       <view class="file-title">
         <text>{{item.fileName.slice(0, item.fileName.length  - 5)}}</text>
         <text>{{item.fileName.slice(-5)}}</text></view>
-      <view class="file-size">{{(item.fileSize/1024/1024).toFixed(2)}}KB</view>
+      <view class="file-size">{{(item.fileSize/1024/1024).toFixed(2)}}M</view>
       <view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
     </view>
   </view>

config.js

 export const globalUrl = "https://gateway-beta.mingwork.com";
 export const globalUrl2 = "https://third-authentication-beta.mingwork.com";
+

pages/index/index.js

@@ -879,7 +879,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "0.0.22"
+        content: "0.0.23"
       });
       maxClickCount = 5;
     }

pages/meetingDetail/meetingDetail.axml

@@ -207,6 +207,12 @@
         <view onTap="addMeetingFile">
           <text class="iconfont iconicon_data"></text>文件
         </view>
+        <view onTap="addOssFile">
+          <text class="iconfont iconicon_data"></text>
+          <view>
+            oss
+          </view>
+        </view>
         <text class="devider"></text>
         <view onTap="onShareAppMessage">
           <text class="iconfont iconicon_share1"></text>

pages/meetingDetail/meetingDetail.js

 import create from 'dd-store';
 import { checkFullScren } from "../../utils/checkFullScren";
 import pageStore from './store';
-import { getMeetingRoomAffairs, createMeetingTask, deleteMeetingTask, updateMeetingTask, uploadPermissions } from '../../api/request';
-import { isParticipate, deleteSchedule, getScheduleDetail, getUserScheduleInTime, modifySchedule, getMeetingRoomRepeatAffairs } from '../../api/request.js'
-import { throttle, getCreateShowTime } from './../../utils/utils.js'
+import { saveFileInfo, getMeetingRoomAffairs, createMeetingTask, deleteMeetingTask, updateMeetingTask, uploadPermissions } from '../../api/request';
+import { getOssPermission, getuploadResource, isParticipate, deleteSchedule, getScheduleDetail, getUserScheduleInTime, modifySchedule, getMeetingRoomRepeatAffairs } from '../../api/request.js'
+import { throttle, getCreateShowTime, getRndInteger } from './../../utils/utils.js'
 import { observer } from '/utils/observer.js'
 import { resolve } from 'path';
 create.Page({
@@ -1608,6 +1608,74 @@ create.Page({
       }
     })
   },
+  // 上传oss文件
+  async addOssFile() {
+    const timestamp = new Date().getTime()
+    const random = getRndInteger(1000, 10000)
+    const permisson = await getOssPermission()
+    const imgInfo = await this.getOssImg()
+    const key = await new Promise((resolve) => { resolve(permisson.data.data.dir + timestamp + random + '.' + imgInfo.files[0].fileType) })
+    const fileName = await new Promise((resolve) => { resolve(timestamp + random + '.' + imgInfo.files[0].fileType) })
+    await this.uploadOssFile(permisson, imgInfo, key)
+    await this.saveOssFileInfo(permisson, imgInfo, key, fileName)
+  },
+  // 获取oss上传图片 选择图片 上传图片到oss
+  getOssImg() {
+    return new Promise((resolve, rejects) => {
+      dd.chooseImage({
+        count: 1,
+        success: (res) => {
+          resolve(res)
+        },
+      });
+    })
+  },
+  // 获取的图片上传到oss
+  uploadOssFile(permisson, imgInfo, key) {
+    return new Promise(resolve => {
+      dd.uploadFile({
+        url: permisson.data.data.host,
+        fileType: 'image',
+        fileName: 'file',
+        filePath: imgInfo.filePaths[0],
+        formData: {
+          key: key,
+          policy: permisson.data.data.policy,
+          OSSAccessKeyId: permisson.data.data.accessId,
+          success_action_status: 200,
+          signature: permisson.data.data.signature
+        },
+        success: () => {
+          resolve()
+        }
+      })
+    })
+  },
+  // 上传oss文件
+  saveOssFileInfo(permisson, imgInfo, key, fileName) {
+    const data = {
+      resourceType: 'accessory',
+      creatorId: getApp().globalData.userid,
+      category: '2',
+      scheduleId: this.store.data.scheduleId,
+      groupId: this.store.data.groupId,
+      creatorInfo: getApp().globalData.userInfo,
+      description: '',
+      logType: 'schedule_accessory_add',
+      fileInfos: JSON.stringify({
+        fileId: key,
+        fileName: fileName,
+        fileType: imgInfo.files[0].fileType,
+        fileSize: imgInfo.files[0].size
+      })
+    }
+    saveFileInfo(data).then(result => {
+      dd.alert({
+        title: '上传成功',
+        content: JSON.stringify(result)
+      })
+    })
+  },
   //隐藏文件操作浮窗
   hideFileOperate() {
     this.store.data.logId = '';

utils/utils.js

@@ -134,7 +134,7 @@ export function getCreateShowTime(createdTime) {
         if (leftDay < 1) {
           timeResule = (leftDay * 24).toFixed(0) + '小时前'
         } else {
-          timeResule = letDay.toFixed(0) + '天前'
+          timeResule = leftDay.toFixed(0) + '天前'
         }
       } else {
         timeResule = `${creatTime.substring(5, 7)}月${creatTime.substring(8, 10)}日 ${creatTime.substring(11, 16)}`
@@ -150,4 +150,14 @@ export function getCreateShowTime(createdTime) {
 
 export function padZero(val) {
   return ("00" + val).slice(-2);
+}
+
+/*
+获取随机数
+min = 0 区间范围 默认0
+max = 100 区间范围 默认100
+[min, max) 
+ */
+export function getRndInteger(min = 0, max = 100) {
+  return Math.floor(Math.random() * (max - min)) + min;
 }
\ No newline at end of file