From aa89d67a4ec7560cee226d53dd2be555a9e5df99 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 12 十月 2023 15:11:51 +0800
Subject: [PATCH] 10.12bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 3 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html | 42 ++++++++++++-
cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java | 3
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 26 ++++++++
.idea/workspace.xml | 48 +++++++++++-----
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 40 +++++++++++-
6 files changed, 136 insertions(+), 26 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0a1b284..6590132 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,20 +25,12 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.12">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.13">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/ball_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/ball_info.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -143,6 +135,19 @@
</option>
</component>
<component name="RunManager" selected="Spring Boot.ManagementApplication">
+ <configuration name="AccountApplicationTests" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
+ <module name="mb-cloud-account" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.dsh.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
<configuration name="BigDecimalToChineseWords" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsh.guns.modular.system.util.BigDecimalToChineseWords" />
<module name="mb-cloud-management" />
@@ -266,10 +271,12 @@
<item itemvalue="Spring Boot.AuthApplication" />
<item itemvalue="Spring Boot.CourseApplication" />
<item itemvalue="Spring Boot.CompetitionApplication" />
+ <item itemvalue="应用程序.AccountApplicationTests" />
<item itemvalue="应用程序.BigDecimalToChineseWords" />
</list>
<recent_temporary>
<list>
+ <item itemvalue="应用程序.AccountApplicationTests" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
</list>
</recent_temporary>
@@ -366,7 +373,10 @@
<workItem from="1697008680148" duration="240000" />
<workItem from="1697009049694" duration="7913000" />
<workItem from="1697017354280" duration="2337000" />
- <workItem from="1697020450777" duration="4036000" />
+ <workItem from="1697020450777" duration="4953000" />
+ <workItem from="1697072437579" duration="8289000" />
+ <workItem from="1697092527442" duration="204000" />
+ <workItem from="1697092830953" duration="1837000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -731,7 +741,15 @@
<option name="project" value="LOCAL" />
<updated>1697011234286</updated>
</task>
- <option name="localTasksCounter" value="48" />
+ <task id="LOCAL-00048" summary="10.13">
+ <option name="closed" value="true" />
+ <created>1697024509448</created>
+ <option name="number" value="00048" />
+ <option name="presentableId" value="LOCAL-00048" />
+ <option name="project" value="LOCAL" />
+ <updated>1697024509448</updated>
+ </task>
+ <option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -749,7 +767,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="9.15" />
<MESSAGE value="学员" />
<MESSAGE value="学员2" />
<MESSAGE value="学员4" />
@@ -774,7 +791,8 @@
<MESSAGE value="10.8。1" />
<MESSAGE value="10.11" />
<MESSAGE value="10.12" />
- <option name="LAST_COMMIT_MESSAGE" value="10.12" />
+ <MESSAGE value="10.13" />
+ <option name="LAST_COMMIT_MESSAGE" value="10.13" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
index 455dcdd..e3455a0 100644
--- a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
+++ b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
@@ -14,9 +14,10 @@
@Autowired
private CoachTypeController controller;
+
@Test
void contextLoads() {
- System.out.println("==============="+controller.list());
+
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index ee74721..dbdbffd 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -317,9 +317,12 @@
@ResponseBody
public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
+
+
if(yyId==null){
yyId=0;
}
+
if(yyId!=0) {
List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
if(list1.size()>0){
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 39319cd..86bccdf 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
@@ -35,6 +35,9 @@
.col-sm-12 select {
height: 33px;
}
+
+
+
</style>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
@@ -189,11 +192,40 @@
- laydate.render({
- elem: '#time'
- ,type: 'time',format: "HH:mm"
- ,range: true
- });
+
+ layui.use('laydate', function(){
+ var laydate = layui.laydate;
+ //时间范围
+ laydate.render({
+ elem: '#time'
+ , type: 'time'
+ , range: true
+ , format: 'HH:mm'
+ , theme: '#368ee0'
+ , ready: function (date) {
+ var dom = $(".laydate-time-list").children("li");
+ for (var i = 0; i < dom.length; i++) {
+ if (i == 2 || i == 5) {
+ $(dom[i]).remove();
+ } else if(i==1||i==4) {
+ var li = $(dom[i]).children("ol").children("li")
+ //console.log(li.length);
+ for (var j = 0; j < li.length; j++) {
+ //console.log($(li[j]).text())
+ if ($(li[j]).text() != 00 && $(li[j]).text()!=30) {
+ $(li[j]).remove();
+ }
+ }
+ }
+ }
+ }
+ });
+ })
+
+
+
+
+
var vue2 = new Vue({
el: '#app1',
props: {
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 362ff1b..50e6fb4 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
@@ -152,11 +152,41 @@
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
- laydate.render({
- elem: '#time'
- ,type: 'time',format: "HH:mm"
- ,range: true
- });
+ layui.use('laydate', function(){
+ var laydate = layui.laydate;
+ //时间范围
+ laydate.render({
+ elem: '#time'
+ , type: 'time'
+ , range: true
+ , format: 'HH:mm'
+ , theme: '#368ee0'
+ , ready: function (date) {
+ var dom = $(".laydate-time-list").children("li");
+ for (var i = 0; i < dom.length; i++) {
+ if (i == 2 || i == 5) {
+ $(dom[i]).remove();
+ } else if(i==1||i==4) {
+ var li = $(dom[i]).children("ol").children("li")
+ //console.log(li.length);
+ for (var j = 0; j < li.length; j++) {
+ //console.log($(li[j]).text())
+ if ($(li[j]).text() != 00 && $(li[j]).text()!=30) {
+ $(li[j]).remove();
+ }
+ }
+ }
+ }
+ }
+ });
+ })
+
+
+
+
+
+
+
let id = "${item.realPicture}"
let obj = []
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
index dc85985..862075b 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -203,6 +203,12 @@
Feng.info("门店名称不能为空")
return;
}
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
if(phone==''){
Feng.info("联系电话不能为空")
return;
@@ -232,7 +238,15 @@
Feng.info("请输入店长姓名")
return;
}
+
+
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+
+ Feng.info("请输入正确手机号")
+ return false;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
@@ -446,6 +460,13 @@
Feng.info("门店名称不能为空")
return;
}
+
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(phone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(phone==''){
Feng.info("联系电话不能为空")
return;
@@ -477,6 +498,11 @@
}
let userPhone = $("#userPhone").val()
+ if (!phonePattern.test(userPhone)) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+
if(userPhone==''){
Feng.info("请输入店长手机号")
return;
--
Gitblit v1.7.1