Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/main.js

@@ -35,8 +35,11 @@ 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)) {//乡村相册版
+  params = {action: "/app/wxcptp/portal/agentSign", corpId: "wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg", suiteId: "ww0da13777658d1262"}
+}
 store.dispatch("agentSign", params).finally(() => app.$mount())
 

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') {

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.id}&type=${data.watermarkType}&templateId=${data.id}`
               })
             }
 

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>

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>
@@ -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 => {

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()
     },
@@ -107,6 +109,7 @@
           albumId: this.albumId,
           photoUrl: this.img,
           watermarkType: this.type,
+          fileId: this.fileId,
           templateId: this.templateId
         }).then(res => {
           if (res.code === 0) {