From 9b921645a1f7f2bae621965df3b1105082bbf7da Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Tue, 31 Oct 2023 17:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/estate/estate-flows.vue      |  6 ++++--
 src/pages/estate/estate-industry.vue   | 12 ++++++++----
 src/pages/estate/estate-materiels.vue  | 12 ++++++++----
 src/pages/estate/estate-price.vue      | 12 +++++++++---
 src/pages/estate/estate-week-price.vue |  6 ++++--
 src/pages/user/user.vue                |  2 +-
 6 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/pages/estate/estate-flows.vue b/src/pages/estate/estate-flows.vue
index 345d66b..fb6bcf6 100644
--- a/src/pages/estate/estate-flows.vue
+++ b/src/pages/estate/estate-flows.vue
@@ -510,8 +510,9 @@ export default {
             }
             uni.showToast({ title: data.message, icon: 'none' })
           })
-          .catch(() => {
+          .catch(({data}) => {
             hideLoading()
+            this.$u.toast(data.message)
           })
       } else {
         delete params['id']
@@ -527,8 +528,9 @@ export default {
               uni.showToast({ title: data.message, icon: 'none' })
             }
           })
-          .catch(() => {
+          .catch(({data}) => {
             hideLoading()
+            this.$u.toast(data.message)
           })
       }
     },
diff --git a/src/pages/estate/estate-industry.vue b/src/pages/estate/estate-industry.vue
index 7635a1e..6a52f36 100644
--- a/src/pages/estate/estate-industry.vue
+++ b/src/pages/estate/estate-industry.vue
@@ -454,9 +454,11 @@
 							
 						}
 						uni.showToast({ title: data.message, icon: 'none' });
-					}).catch(()=>{
-						hideLoading();
 					})
+					.catch(({data}) => {
+            hideLoading()
+            this.$u.toast(data.message)
+          })
 				}else{
 					delete params['id'];
 					this.$http.post(`/api/rice-shrimp-industries`,params).then(({data})=>{
@@ -468,9 +470,11 @@
 						}else{
 							uni.showToast({ title: data.message, icon: 'none' });
 						}
-					}).catch(()=>{
-						hideLoading();
 					})
+					.catch(({data}) => {
+            hideLoading()
+            this.$u.toast(data.message)
+          })
 				}
 				
 			},
diff --git a/src/pages/estate/estate-materiels.vue b/src/pages/estate/estate-materiels.vue
index 18e8d47..4542020 100644
--- a/src/pages/estate/estate-materiels.vue
+++ b/src/pages/estate/estate-materiels.vue
@@ -524,9 +524,11 @@
 							
 						}
 						uni.showToast({ title: data.message, icon: 'none' });
-					}).catch(()=>{
-						hideLoading()
 					})
+					.catch(({data}) => {
+            hideLoading()
+            this.$u.toast(data.message)
+          })
 				}else{
 					delete params['id'];
 					this.$http.post(`/api/materiels`,params).then(({data})=>{
@@ -538,9 +540,11 @@
 						}else{
 							uni.showToast({ title: data.message, icon: 'none' });
 						}
-					}).catch(()=>{
-						hideLoading()
 					})
+					.catch(({data}) => {
+            hideLoading()
+            this.$u.toast(data.message)
+          })
 				}
 				
 			},
diff --git a/src/pages/estate/estate-price.vue b/src/pages/estate/estate-price.vue
index f53cca6..f5ed310 100644
--- a/src/pages/estate/estate-price.vue
+++ b/src/pages/estate/estate-price.vue
@@ -440,6 +440,7 @@ export default {
       this.$http
         .get('/api/rice-shrimp-prices', { params: params })
         .then(({ data }) => {
+          console.log("===~~===");
           console.log(data)
           this.screenShow = false
           if (refresh) {
@@ -456,11 +457,14 @@ export default {
             if (this.list.length >= data.meta.total) {
               this.loading = 'nomore'
             }
+          }else{
+            console.log(data);
           }
         })
-        .catch(() => {
+        .catch((e) => {
           this.loading = 'loadmore'
           this.screenShow = false
+          console.log(e);
         })
     },
     //修改
@@ -482,8 +486,9 @@ export default {
             }
             uni.showToast({ title: data.message, icon: 'none' })
           })
-          .catch(() => {
+          .catch(({data}) => {
             hideLoading()
+            this.$u.toast(data.message)
           })
       } else {
         delete params['id']
@@ -499,8 +504,9 @@ export default {
               uni.showToast({ title: data.message, icon: 'none' })
             }
           })
-          .catch(() => {
+          .catch(({data}) => {
             hideLoading()
+            this.$u.toast(data.message)
           })
       }
     },
diff --git a/src/pages/estate/estate-week-price.vue b/src/pages/estate/estate-week-price.vue
index e334fcf..8ba794a 100644
--- a/src/pages/estate/estate-week-price.vue
+++ b/src/pages/estate/estate-week-price.vue
@@ -459,8 +459,9 @@ export default {
             }
             uni.showToast({ title: data.message, icon: 'none' })
           })
-          .catch(() => {
+          .catch(({data}) => {
             hideLoading()
+            this.$u.toast(data.message)
           })
       } else {
         delete params['id']
@@ -476,8 +477,9 @@ export default {
               uni.showToast({ title: data.message, icon: 'none' })
             }
           })
-          .catch(() => {
+          .catch(({data}) => {
             hideLoading()
+            this.$u.toast(data.message)
           })
       }
     },
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 280c8e2..bb6cf38 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -25,7 +25,7 @@
 					</view>
 					<view class="p-list clamp">
 						<view class="txt">{{userInfo.department?userInfo.department:'——'}}</view>
-						<view class="tit">角色</view>
+						<view class="tit">部门</view>
 					</view>
 				</view>
 			</view>