Merge branch 'feature_20260506_增加照片上传进度UI效果' into uat(dev)

src/components/uploadVNormalTaskPhoto.vue

@@ -387,8 +387,13 @@ export default {
     },
     // 正常流程
     normalFlow(res) {
-      this.runD2(100, false, () => {
+      if (this.d2timer) {
         clearTimeout(this.d2timer);
+      }
+      this.runD2(100, false, () => {
+        if (this.d2timer) {
+          clearTimeout(this.d2timer);
+        }
         this.d2running = false;
         this.d2count = 0;
         this.uploadImgTotal = 0;
@@ -566,14 +571,14 @@ export default {
   z-index: 9998;
 }
 .uploadImgDemo {
-  width: 90%;
+  width: 95%;
   position: fixed;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
   z-index: 9999;
   background: #fff;
-  padding: 10px 0;
+  padding: 10px 5px;
 }
 .uploadImgDemo .ring-area {
   display: none;