merge

components/fileList/fileList.js

@@ -84,20 +84,28 @@ create.Component({
           projectName: 'MING_MEETING',
           fileIds: file.fileId
         }
-        uploadPermissions(data).then(res => {
+        if (file.spaceId) {
           dd.previewFileInDingTalk({
             corpId: dd.corpId,
-            spaceId: res.data.data,
+            spaceId: file.spaceId,
             fileId: file.fileId,
             fileName: file.name,
             fileSize: file.size,
             fileType: file.mimeType,
           })
-        })
-
+        } else {
+          uploadPermissions(data).then(res => {
+            dd.previewFileInDingTalk({
+              corpId: dd.corpId,
+              spaceId: res.data.data,
+              fileId: file.fileId,
+              fileName: file.name,
+              fileSize: file.size,
+              fileType: file.mimeType,
+            })
+          })
+        }
       }
-
-
     },
     //显示操作框
     showOperate(e) {

components/setting/setting.js

 Component({
   data: {
-    userInfo: {}
+    userInfo: {
+      username: '明我智会'
+    }
   },
   props: {},
   didMount() {
-    this.setData({
-      userInfo: dd.getStorageSync({ key: 'userInfo' }).data
-    });
+    if (dd.getStorageSync({ key: 'userInfo' }).data) {
+      this.setData({
+        userInfo: dd.getStorageSync({ key: 'userInfo' }).data
+      });
+    }
+    if (getApp().globalData.userInfo) {
+      this.setData({
+        userInfo: JSON.parse(getApp().globalData.userInfo)
+      });
+    }
   },
   didUpdate() {
   },

config.js

 export const globalUrl = "https://gateway-beta.mingwork.com";
 export const globalUrl2 = "https://third-authentication.mingwork.com";
-export const version = 0.0320;
+export const version = 0.0321;
 export const websocketUrl = 'ws://139.196.213.18:9999';

pages/index/index.js

@@ -38,7 +38,9 @@ const uuid = Math.random().toString(36).substr(2);
 create.Page({
   store: pageStore,
   data: {
-    userInfo: {},
+    userInfo: {
+      username: '明我智会'
+    },
     actionLog: {
       "comment_reply": "添加了评论",
       "file_create": "上传了文件",
@@ -186,9 +188,17 @@ create.Page({
       this.onSocketMessageCallback(res.data)
     });
 
-    this.setData({
-      userInfo: dd.getStorageSync({ key: 'userInfo' }).data
-    });
+    if (dd.getStorageSync({ key: 'userInfo' }).data) {
+      this.setData({
+        userInfo: dd.getStorageSync({ key: 'userInfo' }).data
+      });
+    }
+    if (getApp().globalData.userInfo) {
+      this.setData({
+        userInfo: JSON.parse(getApp().globalData.userInfo)
+      });
+    }
+
   },
   connect_start() {
     const userId = dd.getStorageSync({ key: 'mwUserId' }).data;

pages/meetingDetail/meetingDetail.js

@@ -324,6 +324,8 @@ create.Page({
       modifyModel: modifyModel,
       needNotice: needNotice,
       modifyContent: 'modify_location',
+      startTime: this.$store.data.startTime.replace(/\//g, "-"),
+      endTime: this.$store.data.endTime.replace(/\//g, "-"),
       location: {
         longitude: '-999',
         latitude: '-999',