冲突解决

back/src/views/modules/ability/bsabilityai.vue

@@ -330,7 +330,6 @@ export default {
     this.dataForm.type = '组件服务'
     this.$http.get('/sys/user/info').then(res => {
       this.superAdmin = res.data.data.superAdmin
- 
     })
   },
   mounted () {
@@ -441,12 +440,8 @@ export default {
       }
     },
     showDetail (val) {
-<<<<<<< HEAD
-      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
-=======
       console.log(val)
       window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
->>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
       // this.addOrUpdateHandle(id)
       // this.addOrUpdateVisible = true
       // this.disabled = false
@@ -631,12 +626,8 @@ export default {
     },
     // 新上架
     clear () {
-<<<<<<< HEAD
-      this.$router.push(this.routePath)
-=======
       // this.$router.push(this.routePath)
       console.log('清空----------------------------------------')
->>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
       this.notFilled = []
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = false
@@ -729,7 +720,6 @@ export default {
               child.name === '应用场景' ||
               child.name === '功能介绍'
             ) {
-           
               arr.push(child.name)
               if (
                 this.submitFrom.infoList.filter(