陈剑华

Merge remote-tracking branch 'origin/main'

@@ -190,11 +190,14 @@ export struct ZhSingleColumn09 { @@ -190,11 +190,14 @@ export struct ZhSingleColumn09 {
190 .onClick(() => { 190 .onClick(() => {
191 if (this.currentOperDataListIndex > 0) { 191 if (this.currentOperDataListIndex > 0) {
192 this.currentOperDataListIndex-- 192 this.currentOperDataListIndex--
  193 + } else {
  194 + return
193 } 195 }
194 if (this.compDTO?.operDataList.length > 8) { 196 if (this.compDTO?.operDataList.length > 8) {
195 - if (this.pageModel) {  
196 - this.pageModel.compList.deleteItem(this.compIndex)  
197 - } 197 + this.operDataList = this.shuffleArray(this.operDataList)
  198 + // if (this.pageModel) {
  199 + // this.pageModel.compList.deleteItem(this.compIndex)
  200 + // }
198 this.activeIndexs = []; 201 this.activeIndexs = [];
199 } 202 }
200 }) 203 })
@@ -589,6 +589,8 @@ export struct MultiPictureDetailPageComponent { @@ -589,6 +589,8 @@ export struct MultiPictureDetailPageComponent {
589 if (user_id) { 589 if (user_id) {
590 this.getInteractBrowsOperate() 590 this.getInteractBrowsOperate()
591 this.getBatchAttentionStatus() 591 this.getBatchAttentionStatus()
  592 + } else {
  593 + this.isShowButton = true
592 } 594 }
593 }) 595 })
594 .catch((err: Error) => { 596 .catch((err: Error) => {