70adf0ac by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 5a61518d 9947d394
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-31 14:39:57 4 * @LastEditTime: 2023-11-10 10:55:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -329,6 +329,7 @@ ...@@ -329,6 +329,7 @@
329 deleteClmx(bsmClmx).then(res => { 329 deleteClmx(bsmClmx).then(res => {
330 if (res.code == 200) { 330 if (res.code == 200) {
331 that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj }) 331 that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
332 that.initialIndex = that.previewImg.index
332 that.$message({ 333 that.$message({
333 message: '删除成功!', 334 message: '删除成功!',
334 type: 'success' 335 type: 'success'
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-01 08:55:44 4 * @LastEditTime: 2023-11-10 10:55:18
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -328,6 +328,7 @@ ...@@ -328,6 +328,7 @@
328 deleteClmx(bsmClmx).then(res => { 328 deleteClmx(bsmClmx).then(res => {
329 if (res.code == 200) { 329 if (res.code == 200) {
330 that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj }) 330 that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
331 that.initialIndex = that.previewImg.index
331 that.$message({ 332 that.$message({
332 message: '删除成功!', 333 message: '删除成功!',
333 type: 'success' 334 type: 'success'
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-01 08:51:46 4 * @LastEditTime: 2023-11-10 10:53:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -330,6 +330,7 @@ ...@@ -330,6 +330,7 @@
330 deleteFile(bsmFile).then(res => { 330 deleteFile(bsmFile).then(res => {
331 if (res.code == 200) { 331 if (res.code == 200) {
332 that.$emit('updateList', { children: this.previewImg.imgList, bsmMaterial: bsmMaterial }) 332 that.$emit('updateList', { children: this.previewImg.imgList, bsmMaterial: bsmMaterial })
333 that.initialIndex = that.previewImg.index
333 that.$message({ 334 that.$message({
334 message: '删除成功!', 335 message: '删除成功!',
335 type: 'success' 336 type: 'success'
......