From 70681c35b12cc15cf41c6323b8495fc548f382c0 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 10:19:09 +0800
Subject: [PATCH] bug

---
 src/saas/AppCountryAlbum/components/report/Daily.vue         | 5 +++--
 src/saas/AppCountryAlbum/components/report/InspectLog.vue    | 5 +++--
 .../AppCountryAlbum/components/report/MeetingMminutes.vue    | 5 +++--
 src/saas/AppCountryAlbum/components/report/WorkReport.vue    | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/saas/AppCountryAlbum/components/report/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue
index a20acde8..b85b0e3d 100644
--- a/src/saas/AppCountryAlbum/components/report/Daily.vue
+++ b/src/saas/AppCountryAlbum/components/report/Daily.vue
@@ -31,7 +31,7 @@
         </div>
       </div>
     </div>
-    <u-modal v-model="isShowText" @confirm="confirm" title="文本">
+    <u-modal v-model="isShowText" @confirm="confirm" title="文本" show-cancel-button>
 			<view class="slot-content">
 				<textarea placeholder="请输入文本" :maxlength="-1" v-model="content"></textarea>
 			</view>
@@ -144,6 +144,7 @@
           count: 1,
           sizeType: ['compressed'],
           success: res => {
+            this.$loading()
             let formData = new FormData()
             formData.append('file', res.tempFiles[0])
             this.$http.post('/admin/file/add2?type=image', formData).then(res => {
@@ -162,7 +163,7 @@
 
       confirm () {
         if (!this.content) {
-          return this.$toast('文本不能为空')
+          return this.$u.toast('文本不能为空')
         }
 
         if (this.currIndex >= 0) {
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index df522e78..eabb59e1 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -33,7 +33,7 @@
         </div>
       </div>
     </div>
-    <u-modal v-model="isShowText" @confirm="confirm" title="文本">
+    <u-modal v-model="isShowText" @confirm="confirm" title="文本" show-cancel-button>
 			<view class="slot-content">
 				<textarea placeholder="请输入文本" :maxlength="-1" v-model="content"></textarea>
 			</view>
@@ -153,6 +153,7 @@
           count: 1,
           sizeType: ['compressed'],
           success: res => {
+            this.$loading()
             let formData = new FormData()
             formData.append('file', res.tempFiles[0])
             this.$http.post('/admin/file/add2?type=image', formData).then(res => {
@@ -171,7 +172,7 @@
 
       confirm () {
         if (!this.content) {
-          return this.$toast('文本不能为空')
+          return this.$u.toast('文本不能为空')
         }
 
         if (this.currIndex >= 0) {
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index bd456d69..6e465c34 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -44,7 +44,7 @@
         </div>
       </div>
     </div>
-    <u-modal v-model="isShowText" @confirm="confirm" title="文本">
+    <u-modal v-model="isShowText" @confirm="confirm" title="文本" show-cancel-button>
 			<view class="slot-content">
 				<textarea placeholder="请输入文本" :maxlength="-1" v-model="content"></textarea>
 			</view>
@@ -174,6 +174,7 @@
           count: 1,
           sizeType: ['compressed'],
           success: res => {
+            this.$loading()
             let formData = new FormData()
             formData.append('file', res.tempFiles[0])
             this.$http.post('/admin/file/add2?type=image', formData).then(res => {
@@ -192,7 +193,7 @@
 
       confirm () {
         if (!this.content) {
-          return this.$toast('文本不能为空')
+          return this.$u.toast('文本不能为空')
         }
 
         if (this.currIndex >= 0) {
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index 2b5bbc16..0e2ce8fe 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -30,7 +30,7 @@
         </div>
       </div>
     </div>
-    <u-modal v-model="isShowText" @confirm="confirm" title="文本">
+    <u-modal v-model="isShowText" @confirm="confirm" title="文本" show-cancel-button>
 			<view class="slot-content">
 				<textarea placeholder="请输入文本" :maxlength="-1" v-model="content"></textarea>
 			</view>
@@ -144,6 +144,7 @@
           count: 1,
           sizeType: ['compressed'],
           success: res => {
+            this.$loading()
             let formData = new FormData()
             formData.append('file', res.tempFiles[0])
             this.$http.post('/admin/file/add2?type=image', formData).then(res => {
@@ -162,7 +163,7 @@
 
       confirm () {
         if (!this.content) {
-          return this.$toast('文本不能为空')
+          return this.$u.toast('文本不能为空')
         }
 
         if (this.currIndex >= 0) {