Browse Source

fix: 解决代码冲突;

pull/4/head
Fox-33 1 week ago
parent
commit
032efabd45
4 changed files with 19 additions and 27 deletions
  1. +0
    -3
      pages_order/record/articleSharing.vue
  2. +7
    -7
      pages_order/record/groupSharing.vue
  3. +6
    -10
      pages_order/record/personalSharing.vue
  4. +6
    -7
      pages_order/record/videoSharing.vue

+ 0
- 3
pages_order/record/articleSharing.vue View File

@ -354,9 +354,6 @@
}
},
onPublish() {
// todo
},
}
}


+ 7
- 7
pages_order/record/groupSharing.vue View File

@ -237,13 +237,13 @@
imageUrl: indexImage,
path: `/pages_order/sharing/group?id=${this.id}&state=2&shareId=${this.userInfo.id}`
}
//
const params = {
id:this.id,
state:"3",
}
this.$fetch('addLogShareInfo', params)
// todo: get times and check is unlocked
//
const params = {
id:this.id,
state:"3",
}
this.$fetch('addLogShareInfo', params)
this.isLocked = false


+ 6
- 10
pages_order/record/personalSharing.vue View File

@ -220,7 +220,6 @@
const {
textDetails,
indexImage,
textDetails,
} = this.form
let o = {
@ -229,15 +228,12 @@
path: `/pages_order/sharing/personal?id=${this.id}&state=0&shareId=${this.userInfo.id}`
}
//
const params = {
id:this.id,
state:"0",
}
this.$fetch('addLogShareInfo', params)
//
const params = {
id:this.id,
state:"0",
}
this.$fetch('addLogShareInfo', params)
this.isLocked = false


+ 6
- 7
pages_order/record/videoSharing.vue View File

@ -228,13 +228,12 @@
path: `/pages_order/sharing/video?id=${this.id}&state=1&shareId=${this.userInfo.id}`
}
//
const params = {
id:this.id,
state:"0",
}
this.$fetch('addLogShareInfo', params)
// todo: get times and check is unlocked
//
const params = {
id:this.id,
state:"0",
}
this.$fetch('addLogShareInfo', params)
this.isLocked = false


Loading…
Cancel
Save