From 49cdeb7407cb5a28f370b8919f4d4c1b205681ee Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Wed, 21 Feb 2024 14:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/resource/GamePlayView.vue | 13 ++++-- src/views/room/RoomTabHomeView.vue | 61 ++++++++++++++++++++++----- src/views/room/RoomTabMapView.vue | 64 +++++++++++++++-------------- 3 files changed, 94 insertions(+), 44 deletions(-) diff --git a/src/views/resource/GamePlayView.vue b/src/views/resource/GamePlayView.vue index d4f3e3f..562d6f5 100644 --- a/src/views/resource/GamePlayView.vue +++ b/src/views/resource/GamePlayView.vue @@ -75,7 +75,7 @@
跳转位置 - + @@ -116,7 +116,7 @@ {{ rule.ruleName }} + :placeholder="rule.description" v-if="rule.ruleKind != 'IN' && (!resource.ruleValue['PLATFORM'] || resource.ruleValue['PLATFORM'] == '' || resource.ruleValue['PLATFORM'] == 'null' || (rule.ruleCode == 'IOS_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'IOS_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'ANDROID_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'android') || (rule.ruleCode == 'ANDROID_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'android'))"> @@ -354,13 +354,20 @@ export default { if (endTime) { this.resource.endTime = new Date(endTime).format("yyyy-MM-dd hh:mm:ss"); } + let id = this.resource.id; + let skipType = this.resource.skipType; + if (!id && skipType == 1) { + $("#tipMsg").text('APP NATIVE不允许新增'); + $("#tipModal").modal('show'); + return; + } saveResource({ id: this.resource.id, code: this.resource.code, name: this.resource.name, icon: this.resource.icon, type: 3, - skipType: this.resource.skipType, + skipType: skipType, showType: this.resource.showType, skipContent: this.resource.skipContent, url: this.resource.url, diff --git a/src/views/room/RoomTabHomeView.vue b/src/views/room/RoomTabHomeView.vue index eafbe9a..7a841d1 100644 --- a/src/views/room/RoomTabHomeView.vue +++ b/src/views/room/RoomTabHomeView.vue @@ -7,13 +7,6 @@

-
@@ -82,6 +75,16 @@
+
+ +
+ +
+
@@ -130,6 +133,23 @@ export default { { field: 'roomUid', title: '房主Uid', align: 'center', width: '5%' }, { field: 'roomTitle', title: '房间标题', align: 'center', width: '8%' }, { field: 'roomTag', title: '房间标签', align: 'center', width: '5%' }, + { + field: 'isPermitRoom', + title: '房间类型', + align: 'center', + width: '5%', + formatter: function (val, row, index) { + let value = ''; + if (val == 1) { + value = '牌照房'; + } else if (val == 4) { + value = '个播房'; + } else { + value = '非牌照房'; + } + return value; + } + }, { field: 'iconContent', title: '图标内容', @@ -140,7 +160,26 @@ export default { } }, { - field: 'isTop', title: '是否置顶', align: 'center', valign: 'middle', width: '5%', + field: 'isTop', + title: '是否置顶', + align: 'center', + valign: 'middle', + width: '5%', + formatter: function (val, row, index) { + if (val) { + return '是'; + } else { + return '否'; + } + + } + }, + { + field: 'isShow', + title: '是否在App首页展示', + align: 'center', + valign: 'middle', + width: '5%', formatter: function (val, row, index) { if (val) { return '是'; @@ -160,9 +199,7 @@ export default { width: '10%', formatter: function (val, row, index) { return '' + - '  '; + ' 编辑'; } } ], @@ -246,6 +283,7 @@ export default { iconContent: iconContent, topStart: topStart, topEnd: topEnd, + isShow: isShow, }, dataType: "json", success: function (json) { @@ -287,6 +325,7 @@ export default { $("#modal_isTop").val(json.isTop ? 1 : 0); $("#modal_topStart").val(formatTime(json.topStart)); $("#modal_topEnd").val(formatTime(json.topEnd)); + $("#modal_isShow").val(json.isShow ? 1 : 0); } else { $("#tipMsg").text("获取菜单信息出错"); $("#tipModal").modal('show'); diff --git a/src/views/room/RoomTabMapView.vue b/src/views/room/RoomTabMapView.vue index 9b3c02e..9a86b8d 100644 --- a/src/views/room/RoomTabMapView.vue +++ b/src/views/room/RoomTabMapView.vue @@ -71,14 +71,18 @@
- +
- + +
+
+
+ +
+
@@ -92,7 +96,6 @@ - -
@@ -169,6 +162,23 @@ export default { { field: 'erbanNo', title: '房主平台号', align: 'center', width: '5%' }, { field: 'roomUid', title: '房主Uid', align: 'center', width: '5%' }, { field: 'roomTitle', title: '房间标题', align: 'center', width: '8%' }, + { + field: 'isPermitRoom', + title: '房间类型', + align: 'center', + width: '8%', + formatter: function (val, row, index) { + let value = ''; + if (val == 1) { + value = '牌照房'; + } else if (val == 4) { + value = '个播房'; + } else { + value = '非牌照房'; + } + return value; + } + }, { field: 'roomTag', title: '房间标签', align: 'center', width: '5%' }, { field: 'isTop', title: '是否置顶', align: 'center', valign: 'middle', width: '5%', @@ -182,17 +192,6 @@ export default { } }, { field: 'seq', title: '置顶排序', align: 'center', width: '5%' }, - /*{ - field: 'isHome', title: '首页展示', align: 'center', valign: 'middle', width: '5%', - formatter: function (val, row, index) { - if (val) { - return '是'; - } else { - return '否'; - } - - } - },*/ { field: 'id', title: '操作', @@ -319,7 +318,8 @@ export default { var seq = $("#modal_seq").val(); var isHome = $("#modal_isHome").val(); var isTop = $("#modal_isTop").val(); - + var topStart = $('#modal_topStart').val(); + var topEnd = $('#modal_topEnd').val(); if ($("#addForm").validationEngine('validate')) { $.ajax({ type: "post", @@ -329,6 +329,8 @@ export default { seq: seq, isHome: isHome, isTop: isTop, + topStart: topStart, + topEnd: topEnd, }, dataType: "json", success: function (json) { @@ -364,6 +366,8 @@ export default { $("#modal_seq").val(json.seq); $("#modal_isTop").val(json.isTop ? 1 : 0); $("#modal_isHome").val(json.isHome ? 1 : 0); + $('#modal_topStart').val(json.topStart); + $('#modal_topEnd').val(json.topEnd); // 打开编辑弹窗 $("#roomTabMapModal").modal('show'); $("#modalLabel").text("编辑");