modified the position of delete btn in room

frontend/public/index.html

@@ -13,7 +13,7 @@
       <strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app">
-      <div id="preloadingAnimation"><div class=lds-roller><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div><div class=load-tips>Loading</div></div>
+      <div id="preloadingAnimation"><div class=lds-roller><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div><div class=load-tips>加载中</div></div>
     </div>
     <!-- built files will be auto injected -->
   </body>

frontend/src/views/room/Room.vue

@@ -29,11 +29,6 @@
                 <a-button type="primary" @click="$router.push({name: 'roomEdit', params: {id: record.id.toString()}})">
                   编辑
                 </a-button>
-                <a-popconfirm title="确定删除吗？" @confirm="handleDelete(record)">
-                  <a-button type="danger">
-                    删除
-                  </a-button>
-                </a-popconfirm>
                 <a-button @click="$router.push({name: 'seat', params: {id: record.id.toString()}})">座位管理</a-button>
                 <a-button @click="handleDownload">二维码</a-button>
               </a-button-group>
@@ -106,13 +101,6 @@
             this.state.loading = false
           })
       },
-      handleDelete (room) {
-        api.deleteRoom(room.id)
-          .then(data => {
-            this.$notification.success({ message: '成功', description: '成功删除房间', key: 'SUCCESS' })
-            this.getData()
-          })
-      },
       handleDownload () {
 
       }

frontend/src/views/room/RoomDetail.vue

@@ -65,7 +65,16 @@
             <a-button type="primary" @click="handleSubmit" style="float: right">
               保存
             </a-button>
-            <a-button style="float: right; margin: 0 4px;" @click="$router.go(-1)">
+            <a-popconfirm
+              v-if="isEdit"
+              title="确定删除吗？"
+              @confirm="handleDelete"
+              style="float: right; margin: 0 8px 0 0;">
+              <a-button type="danger">
+                删除
+              </a-button>
+            </a-popconfirm>
+            <a-button style="float: right; margin: 0 8px 0 0;" @click="$router.go(-1)">
               返回
             </a-button>
           </a-form-item>
@@ -130,6 +139,13 @@
           }
         )
       },
+      handleDelete () {
+        api.deleteRoom(this.id)
+          .then(data => {
+            this.$notification.success({ message: '成功', description: '成功删除房间', key: 'SUCCESS' })
+            this.$router.push({ name: 'room' })
+          })
+      },
     },
     computed: {
       isEdit () {

frontend/vue.config.js

@@ -64,14 +64,6 @@ module.exports = {
         ws: false,
         changeOrigin: true
       }
-      // '/gateway': {
-      //   target: 'https://www.easy-mock.com/mock/5b7bce071f130e5b7fe8cd7d/antd-pro',
-      //   ws: false,
-      //   changeOrigin: true,
-      //   pathRewrite: {
-      //     '^/gateway': '/api'
-      //   }
-      // }
     }
   },