From 40f362f8c120a94f35e28dcba6e70b5e42c6d599 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 24 十月 2023 20:32:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html | 10 ++++++----
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html | 2 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html | 2 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 2 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html | 2 --
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html
index 0cc2693..b9e9b5f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html
@@ -9,7 +9,6 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
- @if(role=='1'){
<div class="col-sm-3">
<div class="input-group">
<div class="input-group-btn open">
@@ -25,7 +24,6 @@
</select>
</div>
</div>
- @}
<div class="col-sm-3">
<div class="input-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
index 387ef85..7e2c0a4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
@@ -45,7 +45,7 @@
<div class="form-horizontal">
<div class="row">
<br class="col-sm-10">
- @if(objectType==1){
+ @if(objectType!=3){
<div class="col-sm-3">
<div class="input-group">
<div class="input-group-btn open">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
index cf7583e..e885be1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
@@ -46,7 +46,7 @@
<div class="form-horizontal" id="carInfoForm">
<input hidden id="role" value="${role}">
-
+ @if(role=='1'){
<div class="form-group">
<label class="col-sm-3 control-label">门店类型：</label>
<div class="col-sm-9">
@@ -54,9 +54,11 @@
<input type="radio" name="type" value="2" onclick="updateType(2)" id="radio1" checked > 运营商门店
</div>
</div>
+ @}
+
@if(role=='1'){
<div id="yys" hidden>
- <div class="form-group" >
+ <div class="form-group">
<label class="col-sm-3 control-label">所属运营商：</label>
<div class="col-sm-9">
<select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange1(this)" >
@@ -83,9 +85,9 @@
</div>
</div>
</div>
-
@}
+ @if(role=='1'){
<div id="yys1" >
<div class="form-group" id="provinceCode1">
<label class="col-sm-3 control-label">所在省：</label>
@@ -107,7 +109,7 @@
</div>
</div>
</div>
-
+ @}
<#input id="name" name="门店名称" type="text"/>
<#input id="phone" name="联系电话" type="text"/>
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index 3a2b6fd..1c406c6 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -45,6 +45,7 @@
<input hidden id="role" value="${role}">
<input hidden id="type" value="${item.type}">
+ @if(role=='1'){
<div class="form-group">
<label class="col-sm-3 control-label">门店类型：</label>
<div class="col-sm-9">
@@ -52,6 +53,7 @@
<input type="radio" name="type" value="2" onclick="updateType(2)"> 运营商门店
</div>
</div>
+ @}
@if(role=='1'){
<div class="form-group" id="yys" hidden >
<label class="col-sm-3 control-label">所属运营商：</label>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html
index 6ae7cb9..a5e6e99 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html
@@ -66,7 +66,7 @@
<#NameCon id="name" name="场地名称" />
</div>
- @if(objectType !=3){
+ @if(objectType ==1){
<div class="col-sm-3">
<div class="input-group">
<div class="input-group-btn open">
--
Gitblit v1.7.1