拍照支持裁剪

pages/writeReading/components/photo/index.js

@@ -32,16 +32,43 @@ Component({
         success: async function(res) {
           // console.log(res.tempFiles[0].tempFilePath)
           // console.log(res.tempFiles[0].size)
-          loadingFunc(async () => {
-            const { code, message, data } = await uploadOcrFile(res.tempFiles[0].tempFilePath)
-            if (code !== OK) {
-              alertError(message)
-              return
+          wx.cropImage({
+            src: res.tempFiles[0].tempFilePath, // 图片路径
+            cropScale: '16:9', // 裁剪比例
+            success: function (res) {
+              if (!/(\.jpg|\.png|\.jpeg)$/.test(res.tempFilePath.toLowerCase())) {
+                wx.showToast({
+                  title: '请上传jpg、png或jpeg格式的图片',
+                  icon: 'none',
+                });
+                return;
+              }
+              var tempFilePaths = res.tempFilePath;
+              loadingFunc(async () => {
+                const { code, message, data } = await uploadOcrFile(tempFilePaths)
+                if (code !== OK) {
+                  alertError(message)
+                  return
+                }
+                setTimeout(() => {
+                  that.triggerEvent("finish", { number: data?.integer, success: data?.integer != null && data?.integer !== "" })
+                }, 100)
+              })
+   
             }
-            setTimeout(() => {
-              that.triggerEvent("finish", { number: data?.integer, success: data?.integer != null && data?.integer !== "" })
-            }, 100)
+    
           })
+  
+          // loadingFunc(async () => {
+          //   const { code, message, data } = await uploadOcrFile(res.tempFiles[0].tempFilePath)
+          //   if (code !== OK) {
+          //     alertError(message)
+          //     return
+          //   }
+          //   setTimeout(() => {
+          //     that.triggerEvent("finish", { number: data?.integer, success: data?.integer != null && data?.integer !== "" })
+          //   }, 100)
+          // })
           
         }
       })

pages/writeReading/components/readingInfo/index.js

@@ -53,7 +53,7 @@ Component({
       this.setData({
         currentNumber: e.detail,
         calcNumber: isNaN(Number(e.detail)) ? 0 : Number(e.detail),
-        diff: isNaN(Number(e.detail)) ? "-" : Number(e.detail) - this.data.meterInfo?.overall
+        diff: isNaN(Number(e.detail)) ? "-" : (Number(e.detail) - this.data.meterInfo?.overall).toFixed(2)
       })
     },
     handleClear() {
@@ -82,7 +82,7 @@ Component({
         })
         alertSuccess("获取成功")
       } else {
-        alertInfo("未能获取到")
+        alertInfo("未能识别数字")
       }
     },
     async onSubmit() {
@@ -98,6 +98,11 @@ Component({
         alertError(message)
         return
       }
+      this.setData({
+        currentNumber: null,
+        calcNumber: null,
+        diff: "-"
+      })
       alertSuccess("录入成功")
       const that = this;
       setTimeout(async () => {
@@ -115,11 +120,11 @@ Component({
               if (res.confirm) {
                 // await that.changeEndStatus()
                 wx.navigateBack()
-                const pages = getCurrentPages();
-                const prevPage = pages[pages.length - 2];
-                if (prevPage.init){
-                  prevPage.init()
-                }
+                // const pages = getCurrentPages();
+                // const prevPage = pages[pages.length - 2];
+                // if (prevPage.init){
+                //   prevPage.init()
+                // }
               }
             }
           })

pages/writeReading/index.js

@@ -19,7 +19,6 @@ Page({
    */
   onLoad(options) {
     const { id } = options;
-
     this.getMeterList(id)
   },
   async getMeterList(id) {
@@ -52,7 +51,7 @@ Page({
       newIndex = meterList?.length - 1
     }
     this.setData({
-      active: newIndex
+      active: newIndex,
     })
   },
   handlePrev() {