From f30a3e55f262726fb3303e3a8d4182b473a23106 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 27 May 2022 09:18:51 +0800
Subject: [PATCH] bug

---
 src/saas/AppCountryAlbum/AddAlbum.vue  | 26 +++++++++++---------------
 src/saas/AppCountryAlbum/EditAlbum.vue | 10 +++++++++-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AddAlbum.vue b/src/saas/AppCountryAlbum/AddAlbum.vue
index 489bb372..fc14fdff 100644
--- a/src/saas/AppCountryAlbum/AddAlbum.vue
+++ b/src/saas/AppCountryAlbum/AddAlbum.vue
@@ -7,17 +7,7 @@
           <span>相册名称</span>
         </div>
         <div class="right">
-          <input placeholder="请输入相册名称" v-model="albumName" placeholder-style="color: #999" />
-        </div>
-      </div>
-      <div class="form-group__item">
-        <div class="left">
-          <label>*</label>
-          <span>水印</span>
-        </div>
-        <div class="right" @click="linkTo('./WatermarkSetting?value=' + watermarkId)">
-          <span>{{ watermarkId ? '已选择' : '不限' }}</span>
-          <image src="./images/right.png" />
+          <input placeholder="请输入相册名称" :disabled="!id || isAdmin" v-model="albumName" placeholder-style="color: #999" />
         </div>
       </div>
       <div class="form-group__item">
@@ -27,7 +17,7 @@
         </div>
         <div class="right" @click="linkTo('./PersonnelSetting?id=' + id)">
           <span>{{ albumUserList.length ? '已选择' : '不限' }}</span>
-          <image src="./images/right.png" />
+          <image src="./images/right.png" v-if="!id || isAdmin" />
         </div>
       </div>
       <div class="form-group__item" @click="linkTo('./SourceSetting?value=' + photoSource)">
@@ -37,12 +27,12 @@
         </div>
         <div class="right">
           <span>{{ photoSource == 1 ? '仅限乡村相册拍摄' : '不限' }}</span>
-          <image src="./images/right.png" />
+          <image src="./images/right.png" v-if="!id || isAdmin" />
         </div>
       </div>
     </div>
-    <button v-if="user.openId === info.createUserId" @click="remove" class="form-btn form-btn__remove" hover-class="text-hover">删除相册</button>
-    <button :loading="isLoading" @click="save" class="form-btn" hover-class="text-hover">保存</button>
+    <button v-if="id || isAdmin" @click="remove" class="form-btn form-btn__remove" hover-class="text-hover">删除相册</button>
+    <button v-if="!id || isAdmin" :loading="isLoading" @click="save" class="form-btn" hover-class="text-hover">保存</button>
   </div>
 </template>
 <script>
@@ -62,6 +52,7 @@
         isLoading: false,
         id: '',
         info: {},
+        isAdmin: false,
         albumUserList: []
       }
     },
@@ -71,6 +62,7 @@
     },
 
     onLoad (query) {
+      this.isAdmin = !!this.$store.state.user.adminAuthType
       this.id = query.id || ''
 
       if (query.id) {
@@ -94,6 +86,10 @@
 
     methods: {
       linkTo (url) {
+        if (this.id && !this.isAdmin) {
+          return false
+        }
+
         uni.navigateTo({
           url
         })
diff --git a/src/saas/AppCountryAlbum/EditAlbum.vue b/src/saas/AppCountryAlbum/EditAlbum.vue
index 623fc916..191f83e7 100644
--- a/src/saas/AppCountryAlbum/EditAlbum.vue
+++ b/src/saas/AppCountryAlbum/EditAlbum.vue
@@ -55,6 +55,7 @@
         isShow: false,
         list: [],
         currIndex: 0,
+        isAdmin: false,
         albumList: []
       }
     },
@@ -70,6 +71,7 @@
     },
 
     onLoad (query) {
+      this.isAdmin = !!this.$store.state.user.adminAuthType
       this.id = query.id
       this.getAlbumList()
 
@@ -80,7 +82,13 @@
 
     methods: {
       getList () {
-        this.$http.post(`/api/appalbumphoto/DetailByAlbumID?albumId=${this.id}&pageSize=100000`).then(res => {
+        this.$http.post(`/api/appalbumphoto/DetailByAlbumID`, null, {
+          params: {
+            albumId: this.id,
+            pageSize: 100000,
+            userId: this.isAdmin ? '' : this.$store.state.user.openId
+          }
+        }).then(res => {
           if (res.code === 0) {
             this.list = res.data.records.map(v => {
               return {