perf: 日志封装、图片异步优化

src/common/log.js

+const VERSION = process.uniEnv.version
+
+const canIUseLogManage = wx.canIUse("getLogManager");
+const logger = canIUseLogManage ? wx.getLogManager({ level: 0 }) : null;
+var realtimeLogger = wx.getRealtimeLogManager ? wx.getRealtimeLogManager() : null;
+
+/**
+ * @param {string} file 所在文件名
+ * @param  {...any} arg 参数
+ */
+
+export function DEBUG (file, ...args) {
+  console.debug(file, " | ", ...args);
+  if (canIUseLogManage) {
+    logger.debug(`[${VERSION}]`, file, " | ", ...args);
+  }
+  realtimeLogger && realtimeLogger.info(`[${VERSION}]`, file, " | ", ...args);
+}
+
+/**
+ *
+ * @param {string} file 所在文件名
+ * @param  {...any} arg 参数
+ */
+export function RUN (file, ...args) {
+  console.log(file, " | ", ...args);
+  if (canIUseLogManage) {
+    logger.log(`[${VERSION}]`, file, " | ", ...args);
+  }
+  realtimeLogger && realtimeLogger.info(`[${VERSION}]`, file, " | ", ...args);
+}
+
+/**
+ *
+ * @param {string} file 所在文件名
+ * @param  {...any} arg 参数
+ */
+export function ERROR (file, ...args) {
+  console.error(file, " | ", ...args);
+  if (canIUseLogManage) {
+    logger.warn(`[${VERSION}]`, file, " | ", ...args);
+  }
+  if (realtimeLogger) {
+    realtimeLogger.error(`[${VERSION}]`, file, " | ", ...args);
+    // 判断是否支持设置模糊搜索
+    // 错误的信息可记录到 FilterMsg，方便搜索定位
+    if (realtimeLogger.addFilterMsg) {
+      try {
+        realtimeLogger.addFilterMsg(
+          `[${VERSION}] ${file} ${JSON.stringify(args)}`
+        );
+      } catch (e) {
+        realtimeLogger.addFilterMsg(`[${VERSION}] ${file}`);
+      }
+    }
+  }
+}
+
+// 方便将页面名字自动打印
+export function getLogger (fileName) {
+  return {
+    DEBUG: function (...args) {
+      DEBUG(fileName, ...args);
+    },
+    RUN: function (...args) {
+      RUN(fileName, ...args);
+    },
+    ERROR: function (...args) {
+      ERROR(fileName, ...args);
+    }
+  };
+}
\ No newline at end of file

src/components/upload/index.js

@@ -45,14 +45,15 @@ export default {
 		 * 存储图片到任务队列
 		 * @param {Array} files 图片路径
 		 */
-		async saveToTask(files) {
+		async saveToTask(files, order) {
 			// 生成key返回，然后把key放到异步上传的任务队列
 			let lists = files.map(v => {
 				const key = randomChar(10)
 				return {
 					key: key,
 					path: v,
-					src: key
+					src: key,
+					...order
 				}
 			})
 			// for (let i = 0; i < files.length; i++) {
@@ -69,7 +70,7 @@ export default {
 		 * 选择图片
 		 * @param {Object} data option
 		 */
-		async chooseImg(data){
+		async chooseImg(data, order){
 			const self = this
 			return new Promise((resolve, reject) => {
 				uni.chooseImage({
@@ -77,7 +78,7 @@ export default {
 					sizeType: data.sizeType || ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					sourceType: data.sourceType || ['album', 'camera'], //从相册选择
 					success: function(res) {
-						const lists = self.saveToTask(res.tempFilePaths)
+						const lists = self.saveToTask(res.tempFilePaths, order)
 						resolve(lists)
 					},
 					fail: err => {

src/components/upload/task.js

-
 import uploader from '@/plugins/uploader/index.js'
-
+import { RUN, ERROR } from "@/common/log.js"
 export default {
     /**
      * 执行任务队列
@@ -11,7 +10,6 @@ export default {
         const options = {
             files: uploadTask, // 必填 临时文件路径 格式: [{path: "图片地址"}]
             load: false, //（默认 true 说明：本接口是否提示加载动画）
-            maxSize: 300000, //（默认 无 说明：上传的文件最大字节数限制，默认不限制）
             onEachUpdate: res => {
                 console.log("上传成功返回：",res);
             },
@@ -19,22 +17,31 @@ export default {
                 console.log("上传进度返回：",res);
             }
         }
-		const result = await uploader.qnFileUpload(options)
 
-        if (result && !result.statusCode) { // 匹配已上传完成的图片，更新缓存数据
-            let newTask = [] 
-            let delImg = [] 
-            uploadTask.forEach(v => {
-                if (result.includes(`/${v.key}`)) { // 删除已上传的图片
-                    delImg.push(v.path)
-                } else { // 未上传的重新存储
-                    newTask.push(v)
-                }
-            })
+        uploader.qnFileUpload(options).then(res => {
+            this.refreshTask(that, res)
+        }).catch(err => {
+            console.log("err", err)
+            ERROR('upload_photo', err)
+            if (err.errMsg && err.errMsg.indexOf('fail file not found') !== -1) { // 在任务中删除不存在的图片
+                this.refreshTask(that, ['failErr'])
+            }
+        })
+    },
+    refreshTask(that, result) {
+        console.log("result", result)
+        const uploadTask = JSON.parse(JSON.stringify(that.uploadTask))
+        let newTask = [] 
+        let delImg = [] 
+        uploadTask.forEach(v => {
+            if (result.includes(`/${v.key}`) || result.includes('failErr')) { // 删除已上传的图片
+                delImg.push(v.path)
+            } else { // 未上传的重新存储
+                newTask.push(v)
+            }
+        })
 
-            // uni.setStorageSync('delImg', delImg) // 已上传完的图片，会在启动系统的时候做一次清理
-            that.$u.vuex('uploadTask', newTask)
-        }
-        
+        // uni.setStorageSync('delImg', delImg) // 已上传完的图片，会在启动系统的时候做一次清理
+        that.$u.vuex('uploadTask', newTask)
     }
-}
+}
\ No newline at end of file

src/pages/index/order.vue

@@ -325,7 +325,9 @@ export default {
           '&brandId=' +
           item.lianbaoBrandId +
           '&auditResults=' +
-          (item.auditResults ? Object.keys(item.auditResults).join() : ''),
+          (item.auditResults ? Object.keys(item.auditResults).join() : '') + 
+          '&orderNumber=' +
+          item.orderNumber
       })
     },
     handleClick(item, type, showCountTime) {

src/pages/order/complete.vue

@@ -521,6 +521,7 @@ export default {
   onLoad(option) {
     getApp().trackPage('订单完工信息页')
     if (option) {
+      this.orderNumber = option.orderNumber
       this.maintainStep = option.maintainStep
       this.orderId = option.orderId
       this.categoryId = option.categoryId
@@ -1147,7 +1148,12 @@ export default {
     async closeTake(val) {
       if (val && val.length > 0) {
         const files = val.map((v) => v.path)
-        const value = await this.saveToTask(files)
+        const order = {
+          orderNumber: this.orderNumber,
+          fieldsName: this.photoItem.fieldsName,
+          fieldsTitle: this.photoItem.fieldsTitle
+        }
+        const value = await this.saveToTask(files, order)
         this.$refs[
           `fileChild${this.photoItem.groupIndex}${this.photoItem.itemIndex}`
         ][0].setTmpValue(value)
@@ -1162,9 +1168,14 @@ export default {
         let options = {
           sourceType: ['album'], //['album', 'camera']
           count: 3,
-          sizeType: ['original'],
+          sizeType: ['original']
+        }
+        const order = {
+          orderNumber: this.orderNumber,
+          fieldsName: this.photoItem.fieldsName,
+          fieldsTitle: this.photoItem.fieldsTitle
         }
-        const value = await this.chooseImg(options)
+        const value = await this.chooseImg(options, order)
         self.$refs[
           `fileChild${self.photoItem.groupIndex}${self.photoItem.itemIndex}`
         ][0].setTmpValue(value)

src/pages/order/detail.vue

@@ -515,7 +515,9 @@ export default {
           '&systemId=' +
           this.order.partnerCompanyId +
           '&classifyId=' +
-          this.order.categoryId,
+          this.order.categoryId +
+          '&orderNumber=' +
+          this.order.orderNumber,
       })
     },
     take() {
@@ -938,7 +940,9 @@ export default {
           '&orderStatus=' +
           this.order.orderStatus +
           '&brandId=' +
-          this.order.lianbaoBrandId,
+          this.order.lianbaoBrandId +
+          '&orderNumber=' +
+          this.order.orderNumber
       })
     },
     rejectOrder() {

src/plugins/uploader/request/upload/upload.js

@@ -92,6 +92,7 @@ export default class fileUpload extends request {
 			}
 			const parmas = JSON.parse(JSON.stringify(qnRes)) 
 			parmas.visitPrefix = ''
+
 			let requestResult = await qiniuUpload(requestInfo, parmas);
 			return Promise.resolve(requestResult);
 		} catch (err) {

src/plugins/uploader/request/upload/utils.js

@@ -115,7 +115,11 @@ export const qiniuUpload = function(requestInfo, qnRes) {
 								resolve(fileList);
 							}
 						}, (error) => {
-							reject(error);
+							const rejectMsg = {
+								...error,
+								...item
+							}
+							reject(rejectMsg);
 						}, {
 							region: qnRes.region || 'SCN', //地区
 							domain: qnRes.visitPrefix, // bucket 域名，下载资源时用到。