优化

4 years ago · 60b132f456
1 changed files with 0 additions and 4 deletions
--- a/src/components/page/Hoster/Listing.vue
+++ b/src/components/page/Hoster/Listing.vue
@ -722,11 +722,7 @@ export default {
            // if (this.ruleForm.payment_document=='') {
            //   this.editVisible=true
            // }else{
-<<<<<<< HEAD
              this.loading=true
-=======
-              // this.loading=true
->>>>>>> 4d64f54053961759a3b806da4fe29546dd47eb26
              if(this.query.type==2){
                this.update_cartellino()
              }else{