diff --git a/src/views/room/RoomTabHomeView.vue b/src/views/room/RoomTabHomeView.vue
index 0ff74a2..7841f86 100644
--- a/src/views/room/RoomTabHomeView.vue
+++ b/src/views/room/RoomTabHomeView.vue
@@ -16,6 +16,7 @@
+
diff --git a/src/views/room/RoomTabView.vue b/src/views/room/RoomTabView.vue
index 2d8224d..6a0882b 100644
--- a/src/views/room/RoomTabView.vue
+++ b/src/views/room/RoomTabView.vue
@@ -184,7 +184,16 @@ export default {
console.log(res);
request.success({
"rows": res.rows.map(i=>{
- i.name = JSON.parse(i.name);
+ let name = i.name;
+ if (name.startsWith('{') && name.endsWith('}')) {
+ i.name = JSON.parse(i.name);
+ } else {
+ i.name = {
+ zh: i.name,
+ ar: i.name,
+ en: i.name,
+ };
+ }
return i;
}),
"total": res.total
@@ -287,12 +296,21 @@ export default {
if (ret.code == 200) {
var json = ret.data.roomTab;
$("#id").val(id);
- var jsonName = JSON.parse(json.name);
- $("#modal_name").val(jsonName.zh);
- // 阿语名称
- $("#ar_modal_name").val(jsonName.ar);
- // 英语名称
- $("#en_modal_name").val(jsonName.en);
+ let name = json.name;
+ if (name.startsWith('{') && name.endsWith('}')) {
+ var jsonName = JSON.parse(json.name);
+ $("#modal_name").val(jsonName.zh);
+ // 阿语名称
+ $("#ar_modal_name").val(jsonName.ar);
+ // 英语名称
+ $("#en_modal_name").val(jsonName.en);
+ } else {
+ $("#modal_name").val(name);
+ // 阿语名称
+ $("#ar_modal_name").val(name);
+ // 英语名称
+ $("#en_modal_name").val(name);
+ }
$("#modal_seq").val(json.seq);
if (json.status == 1) {
$("#modal_status").val(1);