From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

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

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js
index fdbeaef..442c354 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js
@@ -18,7 +18,7 @@
         {title: '商品名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
         {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',
@@ -128,6 +128,11 @@
  */
 TPointProducts.payDetail = function () {
     if (this.check()) {
+        var state = TPointProducts.seItem.status;
+        if (state=="3"){
+            Feng.error("当前门票不能再次审核!")
+            return;
+        }
             layer.open({
                 type: 1
                 , title: '审核'
@@ -156,11 +161,7 @@
                 , btnAlign: 'c' //按钮居中
                 , shade: 0.5 //不显示遮罩
                 , yes: function () {
-                    var state = TPointProducts.seItem.status;
-                    if (state=="3"){
-                        Feng.error("当前门票不能再次审核!")
-                        return;
-                    }
+
                     var OBJradio= $("input[name='type1']:checked").val();
                     console.log(OBJradio)
                    let remark =  $("#remark").val()

--
Gitblit v1.7.1