Merge branch 'dev' into release/1.0.0

api/login.js

@@ -51,14 +51,6 @@ export default async function login() {
     })
   })
 }
-// let time =setInterval(function() {
-//    if (lock == false) {
-//      clearInterval(time)
-//       return;
-//     }
-
-// }, 100)
-
 async function waitLockRelease(retry) {
   for (let i = 0; i < retry; i++) {
     if (lock == false) {

api/xFetch.js

@@ -24,7 +24,7 @@ export default function xFetch({ url, method, data, type }) {
                     if (res.data.code == 401) {
                         login();
                     }
-                    alertOnce(res.data.msg || '请求异常，请重试', rejects);
+                    alertOnce(res.data.msg || '请求异常，请重试', rejects, res);
                 }
             },
             fail: function (err) {
@@ -35,7 +35,7 @@ export default function xFetch({ url, method, data, type }) {
 
                 } else {
                     console.log(err)
-                    alertOnce((err && err.errorMsg) || '网络异常，请重试', rejects);
+                    alertOnce((err && err.errorMsg) || '网络异常，请重试', rejects, err);
                 }
             }
         });
@@ -43,8 +43,9 @@ export default function xFetch({ url, method, data, type }) {
 }
 
 let alert = false;
-function alertOnce(content, rejects) {
+function alertOnce(content, rejects, err) {
     if (alert == false) {
+        sendError(JSON.stringify(err))
         dd.alert({
             content: content,
             buttonText: "确定",
@@ -55,4 +56,22 @@ function alertOnce(content, rejects) {
         });
     }
     alert = true;
+}
+function sendError(err) {
+    let url = `${getApp().globalData.globalUrl}/meet/job/addLog`
+    dd.httpRequest({
+        headers: {
+            "Content-Type": "application/json;charset=UTF-8",
+            Authorization: `Bearer ${getApp().globalData.token}`
+        },
+        data: err,
+        url: url,
+        method: 'post',
+        dataType: "json",
+        timeout: 15000,
+        success: function (res) {
+        },
+        fail: function (err) {
+        }
+    });
 }
\ No newline at end of file

pages/meetingDetail/uploadFile.js

@@ -9,7 +9,12 @@ function getImg() {
         dd.chooseImage({
             count: 1,
             success: (res) => {
-                resolve(res)
+                console.log(JSON.stringify())
+                if (res.files[0].size > 20 * 1024 * 1024) {
+                    rejects({ code: -1, msg: '文件小一点', ...res })
+                } else {
+                    resolve(res)
+                }
             },
             fail: (err) => {
                 rejects({ code: -1, msg: '选择图片失败', ...err })