修改

pages.json

@@ -396,7 +396,6 @@
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "医疗服务中心转运系统",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   }

pages/otherCompleteOrder/otherCompleteOrder.vue

@@ -167,6 +167,8 @@
           }else{
             this.postWorkerOrder(data, accountObj);
           }
+        }else{
+          uni.hideLoading();
         }
       },
       
@@ -267,7 +269,6 @@
           taskTypeId: data.taskType.id,
           gdState: data.gdState.id,
         }).then((result) => {
-          uni.hideLoading();
           this.currentCode = result.code;
           if (result.state == 200 || result.state == 201) {
             let accountObj = undefined;
@@ -291,8 +292,10 @@
               this.uploadToOther(data, accountObj, type);
             }
           } else if (result.state == '0000') {
+            uni.hideLoading();
             this.showSelectAccount();
           } else {
+            uni.hideLoading();
             uni.showToast({
               icon: "none",
               title: "请求失败！",
@@ -345,14 +348,12 @@
                     success: (uploadFileRes) => {
                       console.log(uploadFileRes);
                       if (--n === 0) {
-                        uni.hideLoading();
                         this.nextDeptOrder_ss(data, accountObj, type);
                       }
                     },
                     fail: (err) => {
                       n--;
                       console.error(err);
-                      uni.hideLoading();
                       uni.showToast({
                         icon: "none",
                         title: "上传失败",
@@ -362,7 +363,7 @@
                   });
                 },
                 "image/jpeg",
-                0.3
+                0.1
               );
               // 图片上传 end
             });
@@ -391,14 +392,12 @@
                     success: (uploadFileRes) => {
                       console.log(uploadFileRes);
                       if (--n === 0) {
-                        uni.hideLoading();
                         this.nextDeptOrder_ss(data, accountObj, type);
                       }
                     },
                     fail: (err) => {
                       n--;
                       console.error(err);
-                      uni.hideLoading();
                       uni.showToast({
                         icon: "none",
                         title: "上传失败",
@@ -419,6 +418,8 @@
               // 图片上传 end
             });
             //#endif
+          }else{
+            uni.hideLoading();
           }
         })
       },

pages/receiptpage/receiptpage.vue

@@ -749,6 +749,7 @@
         }
         //#ifdef H5
         uni.chooseImage({
+          count: 1,
           sourceType: ['camera'],
           success: (chooseImageRes) => {
             console.log(chooseImageRes, pathUrl)
@@ -828,7 +829,9 @@
         //#endif
         //#ifdef APP-PLUS
         uni.chooseImage({
+          count: 1,
           sourceType: ['camera'],
+          sizeType: ['compressed'],
           success: (chooseImageRes) => {
             console.log(chooseImageRes, pathUrl)
             const tempFilePaths = chooseImageRes.tempFilePaths;
@@ -897,40 +900,75 @@
         //#endif
       },
       // 拍照-其他
-      photographToOther(data, type) {
+      async photographToOther(data, type) {
         this.currentData = data;
         uni.showLoading({
           title: "加载中",
           mask: true,
         });
         // 其他临床服务
-        //检验二维码的有效性
-        post("/dept/scanning", {
+        let result = await post("/dept/scanning", {
           content: type === 'start' ? data.startDept.qrcode : data.endDepts[0].qrcode,
           taskTypeId: data.taskType.id,
           gdState: data.gdState.id,
-        }).then((result) => {
-          uni.hideLoading();
-          this.currentCode = result.code;
-          if (result.state == 200 || result.state == 201) {
-            if (result.account) {
-              this.uploadToOther(data, {
-                account: result.account,
-                accountName: result.name,
-                accountId: result.id,
-              }, type);
-            } else {
-              this.uploadToOther(data, undefined, type);
-            }
-          } else if (result.state == '0000') {
-            this.showSelectAccount();
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
-          }
         });
+        uni.hideLoading();
+        this.currentCode = result.code;
+        if (result.state == 200 || result.state == 201) {
+          uni.showModal({
+          	title: '提示',
+          	content: '请尽量拍摄角度覆盖清洁区域？',
+          	success: (res) => {
+          		if (res.confirm) {
+          			if (result.account) {
+          			  this.uploadToOther(data, {
+          			    account: result.account,
+          			    accountName: result.name,
+          			    accountId: result.id,
+          			  }, type);
+          			} else {
+          			  this.uploadToOther(data, undefined, type);
+          			}
+          		} else if (res.cancel) {
+          			console.log('用户点击取消');
+          		}
+          	}
+          });
+        } else if (result.state == '0000') {
+          this.showSelectAccount();
+        } else {
+          uni.showToast({
+            icon: "none",
+            title: "请求失败！",
+          });
+        }
+        //检验二维码的有效性
+        // post("/dept/scanning", {
+        //   content: type === 'start' ? data.startDept.qrcode : data.endDepts[0].qrcode,
+        //   taskTypeId: data.taskType.id,
+        //   gdState: data.gdState.id,
+        // }).then((result) => {
+        //   uni.hideLoading();
+        //   this.currentCode = result.code;
+        //   if (result.state == 200 || result.state == 201) {
+        //     if (result.account) {
+        //       this.uploadToOther(data, {
+        //         account: result.account,
+        //         accountName: result.name,
+        //         accountId: result.id,
+        //       }, type);
+        //     } else {
+        //       this.uploadToOther(data, undefined, type);
+        //     }
+        //   } else if (result.state == '0000') {
+        //     this.showSelectAccount();
+        //   } else {
+        //     uni.showToast({
+        //       icon: "none",
+        //       title: "请求失败！",
+        //     });
+        //   }
+        // });
       },
       // 悬浮按钮点击事件
       trigger(e) {

tools/photograph.js

@@ -19,6 +19,7 @@ export function photographTool(data, deptObj) {
   }
   //#ifdef H5
   uni.chooseImage({
+    count: 1,
     sourceType: ['camera'],
     success: (chooseImageRes) => {
       console.log(chooseImageRes, pathUrl)
@@ -26,6 +27,7 @@ export function photographTool(data, deptObj) {
       const tempFiles = chooseImageRes.tempFiles;
       let tp = tempFilePaths[0];
       uni.showLoading({
+        mask: true,
         title: '上传中'
       });
       post('/workerOrder/findPatientCodeByWorkOrderId', {
@@ -210,6 +212,7 @@ export function photographTool(data, deptObj) {
   //#endif
   // #ifdef APP-PLUS
   uni.chooseImage({
+    count: 1,
     sourceType: ['camera'],
     sizeType: ['compressed'],
     success: (chooseImageRes) => {
@@ -218,6 +221,7 @@ export function photographTool(data, deptObj) {
       const tempFiles = chooseImageRes.tempFiles;
       let tp = tempFilePaths[0];
       uni.showLoading({
+        mask: true,
         title: '上传中'
       });
       post('/workerOrder/findPatientCodeByWorkOrderId', {