From fe7c2fff004e4a64dae5f0982ab28663c600c778 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 15:20:17 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard.js |   37 +++++++++++++++----------------------
 1 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard.js b/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard.js
index 6999a9d..91a3eed 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard.js
@@ -58,7 +58,7 @@
     var index = layer.open({
         type: 2,
         title: '添加惠民卡',
-        area: ['800px', '420px'], //宽高
+        area: ['100%', '100%'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tHuiminCard/tHuiminCard_add'
@@ -69,18 +69,17 @@
 /**
  * 打开查看惠民卡详情
  */
-THuiminCard.openTHuiminCardDetail = function () {
-    if (this.check()) {
-        var index = layer.open({
-            type: 2,
-            title: '惠民卡详情',
-            area: ['800px', '420px'], //宽高
-            fix: false, //不固定
-            maxmin: true,
-            content: Feng.ctxPath + '/tHuiminCard/tHuiminCard_update/' + THuiminCard.seItem.id
-        });
-        this.layerIndex = index;
-    }
+THuiminCard.openTHuiminCardDetail = function (id, pageType) {
+    console.log(id)
+    let index = layer.open({
+        type: 2,
+        title: '惠民卡详情',
+        area: ['100%', '100%'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        content: Feng.ctxPath + '/tHuiminCard/tHuiminCard_detail/' + id+'?pageType='+pageType
+    });
+    this.layerIndex = index;
 };
 
 /**
@@ -99,18 +98,12 @@
     }
 };
 
+
+
 /**
  * 查询惠民卡列表
  */
 THuiminCard.search = function () {
-    var queryData = {};
-    queryData['condition'] = $("#condition").val();
-    THuiminCard.table.refresh({query: queryData});
+
 };
 
-$(function () {
-    var defaultColunms = THuiminCard.initColumn();
-    var table = new BSTable(THuiminCard.id, "/tHuiminCard/list", defaultColunms);
-    table.setPaginationType("client");
-    THuiminCard.table = table.init();
-});

--
Gitblit v1.7.1