From d8eadba6ba2710f91b9e287d3f7c827a0911b968 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 15 Jun 2022 16:30:45 +0800
Subject: [PATCH] bug

---
 src/pages/login.vue                    |  2 +-
 src/saas/AppCountryAlbum/AddReport.vue |  2 +-
 src/saas/AppCountryAlbum/Photo.vue     | 33 +-------------------------
 src/saas/AppCountryAlbum/ReportImg.vue |  4 +++-
 4 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/pages/login.vue b/src/pages/login.vue
index 87b789de..dc6eeed4 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -60,7 +60,7 @@ export default {
             module = 'wangge'
           }
           this.setModule(module)
-          this.getToken({...this.form, module, corpId}).then(token => {
+          this.getToken({...this.form, module, corpId: 'wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg'}).then(token => {
             if (token) {
               this.login(token)
               if (module != 'AppCountryAlbum') {
diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index 043bddda..2ec78263 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -93,7 +93,7 @@
             if (res.code === 0) {
               const data = this.configList[this.currIndex]
               uni.navigateTo({
-                url: `./ReportImg?albumId=${this.albumId}&img=${res.data.url}&type=${data.watermarkType}&templateId=${data.id}`
+                url: `./ReportImg?albumId=${this.albumId}&img=${res.data.url}&fileId=${res.data.fileId}&type=${data.watermarkType}&templateId=${data.id}`
               })
             }
 
diff --git a/src/saas/AppCountryAlbum/Photo.vue b/src/saas/AppCountryAlbum/Photo.vue
index 3f0833ba..773cea36 100644
--- a/src/saas/AppCountryAlbum/Photo.vue
+++ b/src/saas/AppCountryAlbum/Photo.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-  import { mapActions, mapState } from 'vuex'
+  import { mapState } from 'vuex'
   export default {
     name: 'Photo',
 
@@ -62,43 +62,12 @@
     },
 
     methods: {
-      ...mapActions(['wxInvoke']),
-
       back () {
         uni.navigateBack({
           delta: 1
         })
       },
 
-      share () {
-        uni.showActionSheet({
-          itemList: ['分享', '微信分享'],
-          success: data => {
-            if (data.tapIndex === 0 || data.tapIndex === 1) {
-              if (data.tapIndex === 0) {
-                this.wxInvoke(['shareAppMessage', {
-                  title: this.info.title,
-                  desc: this.info.tableExplain,
-                  link: this.linkUrl,
-                  imgUrl: this.info.headPicture
-                }, () => {
-                  this.isShow = false
-                }])
-              } else {
-                this.wxInvoke(['shareWechatMessage', {
-                  title: this.info.title,
-                  desc: this.info.tableExplain,
-                  link: this.linkUrl,
-                  imgUrl: this.info.headPicture
-                }, () => {
-                  this.isShow = false
-                }])
-              }
-            }
-          }
-        })
-      },
-
       remove () {
         this.$confirm('确定删除该图片？').then(() => {
           this.$http.post(`/api/appalbumphoto/delete?ids=${this.id}`).then(res => {
diff --git a/src/saas/AppCountryAlbum/ReportImg.vue b/src/saas/AppCountryAlbum/ReportImg.vue
index ef1a0b55..a38f96a3 100644
--- a/src/saas/AppCountryAlbum/ReportImg.vue
+++ b/src/saas/AppCountryAlbum/ReportImg.vue
@@ -71,7 +71,8 @@
         albumId: '',
         templateId: '',
         isShow: false,
-        currIndex: 0
+        currIndex: 0,
+        fileId: ''
       }
     },
 
@@ -90,6 +91,7 @@
       this.type = query.type
       this.templateId = query.templateId
       this.albumId = query.albumId
+      this.fileId = query.fileId
 
       this.getWatermarkList()
     },