From cd3caa65fbd97037a19727b500db89f4d7ba51fb Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 15 Jun 2022 16:02:50 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A1=E6=9D=91?=
 =?UTF-8?q?=E7=9B=B8=E5=86=8C=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 51dbd5e0..b13ea412 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,7 +35,7 @@ const app = new Vue({
   ...App
 });
 let params = {}
-if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {
+if (sessionStorage.getItem("prj")?.indexOf("saas") > -1 || /AppCountryAlbum/.test(location.pathname)) {
   params = {action: "/app/wxcptp/portal/agentSign", corpId: "ww596787bb70f08288"}
 }
 store.dispatch("agentSign", params).finally(() => app.$mount())

From ca1967cabc1c1a8c6564ef2b858987bef75cfec0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 15 Jun 2022 16:06:22 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A1=E6=9D=91?=
 =?UTF-8?q?=E7=9B=B8=E5=86=8C=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index b13ea412..5906a95a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,8 +35,11 @@ const app = new Vue({
   ...App
 });
 let params = {}
-if (sessionStorage.getItem("prj")?.indexOf("saas") > -1 || /AppCountryAlbum/.test(location.pathname)) {
+if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {
   params = {action: "/app/wxcptp/portal/agentSign", corpId: "ww596787bb70f08288"}
 }
+if (/AppCountryAlbum/.test(location.pathname)) {
+  params = {action: "/app/wxcptp/portal/agentSign", corpId: "wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg"}
+}
 store.dispatch("agentSign", params).finally(() => app.$mount())
 

From c3d440d1f7adfa099a35729f6eca8723c7d939a5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 15 Jun 2022 16:06:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A1=E6=9D=91?=
 =?UTF-8?q?=E7=9B=B8=E5=86=8C=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.js b/src/main.js
index 5906a95a..4dc73ac7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,10 +35,10 @@ const app = new Vue({
   ...App
 });
 let params = {}
-if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {
+if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {//上架版
   params = {action: "/app/wxcptp/portal/agentSign", corpId: "ww596787bb70f08288"}
 }
-if (/AppCountryAlbum/.test(location.pathname)) {
+if (/AppCountryAlbum/.test(location.pathname)) {//乡村相册版
   params = {action: "/app/wxcptp/portal/agentSign", corpId: "wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg"}
 }
 store.dispatch("agentSign", params).finally(() => app.$mount())

From 07d8bb7dc064cc04dda4d7d9393cd262841daab7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 15 Jun 2022 16:10:14 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A1=E6=9D=91?=
 =?UTF-8?q?=E7=9B=B8=E5=86=8C=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 4dc73ac7..126bd4e8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,7 +39,7 @@ if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {//上架版
   params = {action: "/app/wxcptp/portal/agentSign", corpId: "ww596787bb70f08288"}
 }
 if (/AppCountryAlbum/.test(location.pathname)) {//乡村相册版
-  params = {action: "/app/wxcptp/portal/agentSign", corpId: "wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg"}
+  params = {action: "/app/wxcptp/portal/agentSign", corpId: "wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg", suiteId: "ww0da13777658d1262"}
 }
 store.dispatch("agentSign", params).finally(() => app.$mount())
 

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 5/7] 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()
     },

From 77799cefe9700d6e290cc60acc935150f0b5bab0 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 15 Jun 2022 16:35:38 +0800
Subject: [PATCH 6/7] bug

---
 src/saas/AppCountryAlbum/AddReport.vue | 2 +-
 src/saas/AppCountryAlbum/ReportImg.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index 2ec78263..74e2b660 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}&fileId=${res.data.fileId}&type=${data.watermarkType}&templateId=${data.id}`
+                url: `./ReportImg?albumId=${this.albumId}&img=${res.data.url}&fileId=${res.data.id}&type=${data.watermarkType}&templateId=${data.id}`
               })
             }
 
diff --git a/src/saas/AppCountryAlbum/ReportImg.vue b/src/saas/AppCountryAlbum/ReportImg.vue
index a38f96a3..c048390f 100644
--- a/src/saas/AppCountryAlbum/ReportImg.vue
+++ b/src/saas/AppCountryAlbum/ReportImg.vue
@@ -109,6 +109,7 @@
           albumId: this.albumId,
           photoUrl: this.img,
           watermarkType: this.type,
+          fileId: this.fileId,
           templateId: this.templateId
         }).then(res => {
           if (res.code === 0) {

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

---
 src/saas/AppCountryAlbum/AlbumDetail.vue | 2 +-
 src/saas/AppCountryAlbum/Photo.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue
index 64a660af..8eb971d3 100644
--- a/src/saas/AppCountryAlbum/AlbumDetail.vue
+++ b/src/saas/AppCountryAlbum/AlbumDetail.vue
@@ -6,7 +6,7 @@
         class="right"
         @click="linkTo('./AddAlbum?id=' + id)"
         hover-class="text-hover"
-        v-if="info.albumName !== '系统相册' && info.createUserId === user.wxUserId">
+        v-if="info.albumName !== '系统相册' && info.createUserId === user.openId">
         <image src="./images/setting.png" />
         <span>相册设置</span>
       </div>
diff --git a/src/saas/AppCountryAlbum/Photo.vue b/src/saas/AppCountryAlbum/Photo.vue
index 773cea36..7f648a36 100644
--- a/src/saas/AppCountryAlbum/Photo.vue
+++ b/src/saas/AppCountryAlbum/Photo.vue
@@ -14,7 +14,7 @@
           <image src="./images/fanhui-black.png" />
           <span>返回</span>
         </div>
-        <div class="btn-item" hover-class="bg-hover" v-if="createUserId === user.wxUserId" @click="remove">
+        <div class="btn-item" hover-class="bg-hover" v-if="createUserId === user.openId" @click="remove">
           <image src="./images/remove-black.png" />
           <span>删除</span>
         </div>