From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/static/modular/system/tBroadcast/tBroadcast.js |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tBroadcast/tBroadcast.js b/management/guns-admin/src/main/webapp/static/modular/system/tBroadcast/tBroadcast.js
index 5734e4d..2257664 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tBroadcast/tBroadcast.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tBroadcast/tBroadcast.js
@@ -17,9 +17,9 @@
             {title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
         {title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
         {title: '消息内容', field: 'content', visible: true, align: 'center', valign: 'middle'},
-        {title: '是否显示', field: 'isShow', visible: true, align: 'center', valign: 'middle',
+        {title: '是否显示', field: 'show', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
-                if (row.isShow){
+                if (row.show){
                     return '<span>是</span>'
                 }else {
                     return '<span>否</span>'
@@ -30,10 +30,10 @@
         {title: '状态（1=正常，2=冻结，3=删除）', field: 'status', visible: false, align: 'center', valign: 'middle'},
         {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
             formatter: function (value, row) {
-                if (row.isShow){
-                    return '<a href="#" onclick="TBroadcast.updateStatus('+row.id+')" style="color:red">下架</a>'
+                if (row.upDown === 1){
+                    return '<a href="#" onclick="TBroadcast.down('+row.id+')" style="color:red">下架</a>'
                 }else{
-                    return '<a href="#" onclick="TBroadcast.updateStatus('+row.id+')" style="color:blue">上架</a>' +'&nbsp;' +
+                    return '<a href="#" onclick="TBroadcast.up('+row.id+')" style="color:blue">上架</a>' +'&nbsp;' +
                         '<a href="#" onclick="TBroadcast.delete('+row.id+')" style="color:red">删除</a>'
                 }
             }
@@ -62,7 +62,7 @@
     var index = layer.open({
         type: 2,
         title: '添加',
-        area: ['800px', '420px'], //宽高
+        area: ['100%', '100%'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tBroadcast/tBroadcast_add'
@@ -78,7 +78,7 @@
         var index = layer.open({
             type: 2,
             title: '详情',
-            area: ['800px', '420px'], //宽高
+            area: ['100%', '100%'], //宽高
             fix: false, //不固定
             maxmin: true,
             content: Feng.ctxPath + '/tBroadcast/tBroadcast_update/' + TBroadcast.seItem.id
@@ -92,8 +92,13 @@
  */
 TBroadcast.delete = function (id) {
     var ajax = new $ax(Feng.ctxPath + "/tBroadcast/delete", function (data) {
-        Feng.success("删除成功!");
-        TBroadcast.table.refresh();
+        if(500 == data.code){
+            Feng.error(data.message);
+            return;
+        }else {
+            Feng.success("删除成功!");
+            TBroadcast.table.refresh();
+        }
     }, function (data) {
         Feng.error("删除失败!" + data.responseJSON.message + "!");
     });
@@ -102,6 +107,44 @@
 };
 
 /**
+ * 上架
+ */
+TBroadcast.up = function (id) {
+    var ajax = new $ax(Feng.ctxPath + "/tBroadcast/up", function (data) {
+        if(500 == data.code){
+            Feng.error(data.message);
+            return;
+        }else {
+            Feng.success("上架成功!");
+            TBroadcast.table.refresh();
+        }
+    }, function (data) {
+        Feng.error("上架失败!" + data.responseJSON.message + "!");
+    });
+    ajax.set("id",id);
+    ajax.start();
+};
+
+/**
+ * 下架
+ */
+TBroadcast.down = function (id) {
+    var ajax = new $ax(Feng.ctxPath + "/tBroadcast/down", function (data) {
+        if(500 == data.code){
+            Feng.error(data.message);
+            return;
+        }else {
+            Feng.success("下架成功!");
+            TBroadcast.table.refresh();
+        }
+    }, function (data) {
+        Feng.error("下架失败!" + data.responseJSON.message + "!");
+    });
+    ajax.set("id",id);
+    ajax.start();
+};
+
+/**
  * 查询列表
  */
 TBroadcast.search = function () {

--
Gitblit v1.7.1