From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug:文档内容修改

---
 cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js b/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js
index 850d901..34103b0 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js
@@ -20,6 +20,10 @@
                 formatter:function(value,row,index){
                     return {1: '年度卡', 2: '年内卡'}[value];
                 }},
+            {title: '订单类型', field: 'paymentType', visible: true, align: 'center', valign: 'middle',
+                formatter:function(value,row,index){
+                    return value === 3 ? '赠送' : '售卖';
+                }},
             {title: '售卖金额', field: 'salesMoney', visible: true, align: 'center', valign: 'middle'},
             {title: '支付流水号', field: 'orderNumber', visible: true, align: 'center', valign: 'middle'},
             {title: '所属运营商', field: 'operatorName', visible: true, align: 'center', valign: 'middle'},
@@ -114,14 +118,18 @@
  */
 TPayHuimin.delete = function () {
     if (this.check()) {
+        var selectedId = this.seItem.id;
+        var operation = function () {
         var ajax = new $ax(Feng.ctxPath + "/tPayHuimin/delete", function (data) {
             Feng.success("删除成功!");
             TPayHuimin.table.refresh();
         }, function (data) {
             Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("tPayHuiminId",this.seItem.id);
+        ajax.set("tPayHuiminId", selectedId);
         ajax.start();
+        };
+        Feng.confirm("确认删除该惠民卡记录?", operation);
     }
 };
 TPayHuimin.getStaticsData = function (){
@@ -140,6 +148,10 @@
 }
 TPayHuimin.refund = function (){
     if (this.check()) {
+        if (TPayHuimin.seItem.paymentType === 3) {
+            Feng.error("赠送惠民卡不允许退款");
+            return;
+        }
         if (TPayHuimin.seItem.status == 3){
             Feng.error("该商品已退款");
             return;

--
Gitblit v1.7.1