From 6c837e44d1d185472a6a27eed3b6a523ae5a4013 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 15 三月 2024 09:44:30 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html | 5 +++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 2 +-
cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 81d79a9..f78c454 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -504,7 +504,7 @@
if (UserExt.getUser().getObjectType()==3){
if (StringUtils.hasLength(sites)){
useScope = 4;
- sites="";
+ storeIds="";
pointsMerchandise.setUseScope(4);
}else{
useScope = 3;
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
index 3f983a3..6459c66 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
@@ -221,7 +221,12 @@
<div class="form-group">
<div class="form-group">
<div class="col-sm-12">
+ @if(userType!=3){
<label class="col-sm-3 control-label">*指定场地: </label>
+ @}
+ @if(userType==3){
+ <label class="col-sm-3 control-label">指定场地: </label>
+ @}
<button onclick="siteList1()"
style="height: 22px;width: 82px;background-color: #4a8ff1;color: white;z-index: 15;position:relative;border: none;margin-top: 1%">
选择场地
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 6bf954a..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',
--
Gitblit v1.7.1