Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

src/views/trainRoom/index.vue

@@ -182,6 +182,22 @@
           </div>
         </div>
         <div class="start-box">
+          <el-button
+            v-if="userId == roomInfo.creatorId"
+            style="margin-left: 10px"
+            type="danger"
+            :loading="loading"
+            @click="exit"
+          >销毁房间
+          </el-button>
+          <el-button
+            v-if="userId == roomInfo.creatorId"
+            style="margin-left: 10px"
+            type="success"
+            :loading="loading"
+            @click="postCode"
+          >生成二维码
+          </el-button>
           <template v-if="!starting">
             <el-button
               v-if="userId == roomInfo.creatorId"
@@ -209,22 +225,6 @@
             >
               结束仿真</el-button>
           </template>
-          <el-button
-            v-if="userId == roomInfo.creatorId"
-            style="margin-left: 10px"
-            type="success"
-            :loading="loading"
-            @click="postCode"
-          >生成二维码
-          </el-button>
-          <el-button
-            v-if="userId == roomInfo.creatorId"
-            style="margin-left: 10px"
-            type="danger"
-            :loading="loading"
-            @click="exit"
-          >销毁房间
-          </el-button>
           <el-button type="" @click="backRoom">返回
           </el-button>
         </div>