From 999902dd007e228121b9c85642177d2e7cf4181a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 七月 2025 15:29:53 +0800
Subject: [PATCH] 修改支付宝资金结算

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

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
index 4d66d36..93e8afe 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
@@ -14,7 +14,7 @@
 TPointProducts.initColumn = function () {
     return [
         {field: 'selectItem', checkbox: true},
-        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
         {title: '商品名称', field: 'name', visible: true, align: 'center', valign: 'middle',
             // formatter: function (value, row, index) {
             //     return {1: "日卡票", 2: "月卡票", 3: "季卡票", 4: "年卡票"}[value]
@@ -30,7 +30,7 @@
         },
         {title: '兑换地点', field: 'useScope', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row, index) {
-                return {1: "全国", 2: "指定城市", 3: "指定门店"}[value]
+                return {1: "全国", 2: "指定城市", 3: "指定门店",4:"指定场地"}[value]
             }
         },
         {title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle',
@@ -42,9 +42,9 @@
         },
         {title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle'
         },
-        {title: '已领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'
+        {title: '已领数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle'
         },
-        {title: '已兑换数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle'
+        {title: '已兑换数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'
         },
         {title: '排序', field: 'sort', visible: true, align: 'center', valign: 'middle'},
         {title: '活动状态', field: 'activeStatus', visible: true, align: 'center', valign: 'middle',
@@ -57,6 +57,10 @@
                 return {1: "上架", 2: "下架"}[value]
             }
         },
+        {title: '审核状态', field: 'auditStatus', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row, index) {
+                return {2: "待审核", 1: "已通过",3: "已拒绝"}[value]
+            }},
     ];
 };
 function currentTime(timestamp){
@@ -132,7 +136,7 @@
             area: ['100%', '100%'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
+            content: Feng.ctxPath + '/tGoods/goods_info/' + TPointProducts.seItem.id
         });
         this.layerIndex = index;
     }
@@ -149,7 +153,7 @@
             area: ['70%', '70%'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/tGoods/tPay_detail/' + TPointProducts.seItem.id
+            content: Feng.ctxPath + '/tGoods/tPay_detail1/' + TPointProducts.seItem.id
         });
         this.layerIndex = index;
     }
@@ -178,6 +182,7 @@
  */
 TPointProducts.onShelf = function () {
     if (this.check()){
+
         var selected = $('#' + this.id).bootstrapTable('getSelections');
         const data1 = {
             ids:[],
@@ -211,6 +216,11 @@
  */
 TPointProducts.offShelf = function () {
     if (this.check()){
+        // let size =  TPointProducts.seItem.size
+        // if(size>0){
+        //     Feng.info("没有操作权限");
+        //     return;
+        // }
         var selected = $('#' + this.id).bootstrapTable('getSelections');
         const data1 = {
             ids:[],

--
Gitblit v1.7.1