From b6fe3d7e8ebb3e7a5877e8e602a12e36f157ab1d Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 22 Dec 2021 19:11:23 +0800
Subject: [PATCH] bug

---
 src/apps/AppCountryAlbum/AppCountryAlbum.vue       |   4 ++--
 .../AppCountryAlbum/{components => }/detail.vue    |   7 ++++---
 .../{components => }/img/local-icon.png            | Bin
 src/apps/AppCountryAlbum/{components => }/list.vue |  10 +---------
 src/apps/AppMailList/AppMailList.vue               |   6 +++---
 src/apps/AppMailList/{components => }/add.vue      |   7 +++----
 .../AppMailList/{components => }/img/del-icon.png  | Bin
 .../AppMailList/{components => }/img/edit-icon.png | Bin
 .../AppMailList/{components => }/img/empty.png     | Bin
 src/apps/AppMailList/{components => }/list.vue     |   7 ++++---
 .../AppMailList/{components => }/myAddList.vue     |  13 +++++++------
 11 files changed, 24 insertions(+), 30 deletions(-)
 rename src/apps/AppCountryAlbum/{components => }/detail.vue (98%)
 rename src/apps/AppCountryAlbum/{components => }/img/local-icon.png (100%)
 rename src/apps/AppCountryAlbum/{components => }/list.vue (92%)
 rename src/apps/AppMailList/{components => }/add.vue (97%)
 rename src/apps/AppMailList/{components => }/img/del-icon.png (100%)
 rename src/apps/AppMailList/{components => }/img/edit-icon.png (100%)
 rename src/apps/AppMailList/{components => }/img/empty.png (100%)
 rename src/apps/AppMailList/{components => }/list.vue (96%)
 rename src/apps/AppMailList/{components => }/myAddList.vue (95%)

diff --git a/src/apps/AppCountryAlbum/AppCountryAlbum.vue b/src/apps/AppCountryAlbum/AppCountryAlbum.vue
index 34325877..04e27b4c 100644
--- a/src/apps/AppCountryAlbum/AppCountryAlbum.vue
+++ b/src/apps/AppCountryAlbum/AppCountryAlbum.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script>
-import Detail from './components/detail'
-import List from './components/list'
+import Detail from './detail'
+import List from './list'
 
 export default {
   name: 'AppCountryAlbum',
diff --git a/src/apps/AppCountryAlbum/components/detail.vue b/src/apps/AppCountryAlbum/detail.vue
similarity index 98%
rename from src/apps/AppCountryAlbum/components/detail.vue
rename to src/apps/AppCountryAlbum/detail.vue
index bc4cb181..79f3d057 100644
--- a/src/apps/AppCountryAlbum/components/detail.vue
+++ b/src/apps/AppCountryAlbum/detail.vue
@@ -44,18 +44,19 @@
 <script>
 import { mapState } from 'vuex'
 export default {
-  props: ['params'],
   data() {
     return {
       list: [],
       limit: 9,
       size: 10 * 1024 * 1024,
       fileList: [],
-      numInfo: {}
+      numInfo: {},
+      params: {}
     }
   },
   computed: { ...mapState(['user']) },
-  mounted() {
+  onLoad(option) {
+    this.params = option
     console.log(this.params)
     this.getList()
     this.getStatistic()
diff --git a/src/apps/AppCountryAlbum/components/img/local-icon.png b/src/apps/AppCountryAlbum/img/local-icon.png
similarity index 100%
rename from src/apps/AppCountryAlbum/components/img/local-icon.png
rename to src/apps/AppCountryAlbum/img/local-icon.png
diff --git a/src/apps/AppCountryAlbum/components/list.vue b/src/apps/AppCountryAlbum/list.vue
similarity index 92%
rename from src/apps/AppCountryAlbum/components/list.vue
rename to src/apps/AppCountryAlbum/list.vue
index 8b01134b..d9acad08 100644
--- a/src/apps/AppCountryAlbum/components/list.vue
+++ b/src/apps/AppCountryAlbum/list.vue
@@ -57,15 +57,7 @@ export default {
       })
     },
     toDetail(item) {
-      this.$emit('change', {
-        type: 'Detail',
-        params: {
-          type: item.type,
-          areaId: this.areaId,
-          title: item.name,
-          titleImgUrl: item.url
-        }
-      })
+      uni.navigateTo({url: `./detail?type=${item.type}&areaId=${this.areaId}&title=${item.name}&titleImgUrl=${item.url}`})
     },
   },
   onReachBottom() {
diff --git a/src/apps/AppMailList/AppMailList.vue b/src/apps/AppMailList/AppMailList.vue
index 2df322bd..4c9c2d2b 100644
--- a/src/apps/AppMailList/AppMailList.vue
+++ b/src/apps/AppMailList/AppMailList.vue
@@ -9,9 +9,9 @@
 </template>
 
 <script>
-import Add from './components/add'
-import List from './components/list'
-import MyAddList from './components/myAddList'
+import Add from './add'
+import List from './list'
+import MyAddList from './myAddList'
 
 export default {
   name: 'AppMailList',
diff --git a/src/apps/AppMailList/components/add.vue b/src/apps/AppMailList/add.vue
similarity index 97%
rename from src/apps/AppMailList/components/add.vue
rename to src/apps/AppMailList/add.vue
index d7719e2b..d3ea578f 100644
--- a/src/apps/AppMailList/components/add.vue
+++ b/src/apps/AppMailList/add.vue
@@ -69,13 +69,12 @@ export default {
     }
   },
   computed: { ...mapState(['user']) },
-  created() {  
+  onLoad(option) {  
     this.userInfo.areaId = this.user.areaId  
     this.userInfo.areaName = this.user.areaName  
     this.$dict.load('yesOrNo').then(() => {
-      if(this.params.id) {
-        console.log(122)
-        this.userInfo.id = this.params.id
+      if(option.id) {
+        this.userInfo.id = option.id
         this.getDetail()
       }
     })
diff --git a/src/apps/AppMailList/components/img/del-icon.png b/src/apps/AppMailList/img/del-icon.png
similarity index 100%
rename from src/apps/AppMailList/components/img/del-icon.png
rename to src/apps/AppMailList/img/del-icon.png
diff --git a/src/apps/AppMailList/components/img/edit-icon.png b/src/apps/AppMailList/img/edit-icon.png
similarity index 100%
rename from src/apps/AppMailList/components/img/edit-icon.png
rename to src/apps/AppMailList/img/edit-icon.png
diff --git a/src/apps/AppMailList/components/img/empty.png b/src/apps/AppMailList/img/empty.png
similarity index 100%
rename from src/apps/AppMailList/components/img/empty.png
rename to src/apps/AppMailList/img/empty.png
diff --git a/src/apps/AppMailList/components/list.vue b/src/apps/AppMailList/list.vue
similarity index 96%
rename from src/apps/AppMailList/components/list.vue
rename to src/apps/AppMailList/list.vue
index 2b47e252..f253990c 100644
--- a/src/apps/AppMailList/components/list.vue
+++ b/src/apps/AppMailList/list.vue
@@ -64,9 +64,10 @@ export default {
       })
     },
     toAddList() {
-      this.$emit('change', {
-        type: 'MyAddList',
-      })
+      // this.$emit('change', {
+      //   type: 'MyAddList',
+      // })
+      uni.navigateTo({url: `./myAddList`})
     },
   },
 }
diff --git a/src/apps/AppMailList/components/myAddList.vue b/src/apps/AppMailList/myAddList.vue
similarity index 95%
rename from src/apps/AppMailList/components/myAddList.vue
rename to src/apps/AppMailList/myAddList.vue
index b93d5219..4e827096 100644
--- a/src/apps/AppMailList/components/myAddList.vue
+++ b/src/apps/AppMailList/myAddList.vue
@@ -51,12 +51,13 @@ export default {
       })
     },
     edit(id) {
-      this.$emit('change', {
-        type: 'Add',
-        params: {
-          id: id,
-        }
-      })
+      // this.$emit('change', {
+      //   type: 'Add',
+      //   params: {
+      //     id: id,
+      //   }
+      // })
+      uni.navigateTo({url: `./add?id=${id}`})
     },
     del(item) {
       this.$confirm("是否确认删除该发布信息？").then(() => {