From e0ff252a9ad4ca646e5e3e94a66c1309ec0b7c54 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 20 十月 2023 09:35:03 +0800
Subject: [PATCH] 10.20
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java | 10
cloud-server-other/src/main/resources/mapper/BannerMapper.xml | 5
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js | 91 ++
cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java | 21
cloud-server-other/src/main/java/com/dsh/other/service/impl/BannerServiceImpl.java | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html | 102 +++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 10
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html | 107 +++
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html | 1209 +++++++++++++++++++++++++++++-----------
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 13
cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js | 4
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage.js | 66 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html | 75 +-
cloud-server-other/src/main/java/com/dsh/other/mapper/BannerMapper.java | 2
cloud-server-other/src/main/java/com/dsh/other/service/IBannerService.java | 1
17 files changed, 1,313 insertions(+), 415 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
index e9c5f0b..10dde53 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
@@ -13,13 +13,13 @@
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.util.ResultUtil;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -150,6 +150,8 @@
return PREFIX + "advertisement_benefits.html";
}
+
+
/**
* 跳转到广告编辑页面
*/
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index ffe051a..bf55a00 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -926,6 +926,16 @@
}
+ @ResponseBody
+ @PostMapping("/editCoursePackageState1")
+ public ResultUtil editCoursePackageState1(Integer id, Integer state){
+ TCoursePackage coursePackage = new TCoursePackage();
+ coursePackage.setId(id);
+ coursePackage.setStatus(state);
+ coursePackageService.editCoursePackageState(coursePackage);
+ return ResultUtil.success();
+ }
+
/**
* 编辑课包折扣
* @param json
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 8950925..686451f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -390,6 +390,12 @@
System.out.println("---------game------"+game);
model.addAttribute("game",game);
+ if (game.getOperationId() ==0){
+ model.addAttribute("opId","平台");
+ model.addAttribute("is","平台");
+ }else {
+ model.addAttribute("opId",game.getOperationId());
+ }
TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
model.addAttribute("kc",kc);
@@ -437,6 +443,13 @@
model.addAttribute("game",game);
+ if (game.getOperationId() ==0){
+ model.addAttribute("opId","平台");
+ model.addAttribute("is","平台");
+ }else {
+ model.addAttribute("opId",game.getOperationId());
+ }
+
TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
model.addAttribute("kc",kc);
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 5877e09..373f9fe 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -124,9 +124,13 @@
select * from t_js where id = #{id}
</select>
+
+
<select id="getConfig1" resultType="com.dsh.guns.modular.system.model.TImgConfig">
select * from t_img_config
</select>
+
+
<select id="getSelect" resultType="com.dsh.guns.modular.system.model.dto.SelectDto">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index f5f6803..1946b9c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -47,11 +47,13 @@
{
"type": "tpl",
"id": "u:587781d5d181",
- "tpl": "                                    *所属运营商：",
+ "tpl": "                 *所属运营商：",
"inline": true,
"wrapperComponent": "",
"style": {
- "marginLeft": "0"
+ "marginLeft": "0",
+ "fontFamily": "",
+ "fontSize": 18
}
},{
"type": "select",
@@ -246,12 +248,14 @@
},
{
"type": "tpl",
- "tpl": "                                设备ID：",
+ "tpl": "                       设备ID：",
"inline": true,
"wrapperComponent": "",
"id": "u:587781d5d181",
"style": {
- "marginLeft": "0"
+ "marginLeft": "0",
+ "fontFamily": "",
+ "fontSize": 18
}
},
{
@@ -339,6 +343,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -431,6 +444,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -522,6 +544,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -619,6 +650,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -711,6 +751,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -802,6 +851,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -899,6 +957,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -991,6 +1058,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -1082,6 +1158,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -1179,6 +1264,15 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
index a6507d2..be2f673 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
@@ -47,11 +47,13 @@
{
"type": "tpl",
"id": "u:587781d5d181",
- "tpl": "                                    *所属运营商：",
+ "tpl": "                 *所属运营商：",
"inline": true,
"wrapperComponent": "",
"style": {
- "marginLeft": "0"
+ "marginLeft": "0",
+ "fontFamily": "",
+ "fontSize": 18
}
},
{
@@ -88,7 +90,7 @@
},
"labelField": "value",
"valueField": "id",
- "value":`${game.operationId}`
+ "value":`${opId}`
},{
"type": "checkbox",
"option": "平台",
@@ -110,7 +112,8 @@
},
"trueValue": "平台",
"falseValue": 0,
- "mode": "inline"
+ "mode": "inline",
+ "value":`${is!}`
},
{
"type": "select",
@@ -246,12 +249,14 @@
},
{
"type": "tpl",
- "tpl": "                                设备ID：",
+ "tpl": "                       设备ID：",
"inline": true,
"wrapperComponent": "",
"id": "u:587781d5d181",
"style": {
- "marginLeft": "0"
+ "marginLeft": "0",
+ "fontFamily": "",
+ "fontSize": 18
}
},
{
@@ -340,6 +345,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${kc.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -453,6 +467,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${sq.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -557,6 +580,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${sm.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -667,6 +699,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${sd.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -772,6 +813,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${fk.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -876,6 +926,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${jx.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -986,6 +1045,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${qw.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -1091,6 +1159,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${zs.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -1198,6 +1275,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${zs2.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
@@ -1308,6 +1394,15 @@
"hideUploadButton": false,
"fixedSize": false,
"value":`${ly.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
},
{
"type": "hidden",
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
index 7ac554d..1ca4cf8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
@@ -90,7 +90,7 @@
},
"labelField": "value",
"valueField": "id",
- "value":`${game.operationId}`
+ "value":`${opId}`
},{
"type": "checkbox",
"option": "平台",
@@ -113,7 +113,8 @@
},
"trueValue": "平台",
"falseValue": 0,
- "mode": "inline"
+ "mode": "inline",
+ "value":`${is!}`
},
{
"type": "select",
@@ -394,8 +395,16 @@
"id": "u:99015dfd4264",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg"
- ,"value" :`${kc.playCoin}`
+ "labelClassName": "text-dark m-b text-lg m-l-xxl"
+ ,"value" :`${kc.playCoin}`,
+ "themeCss": {
+ "labelClassName": {
+ "padding-and-margin:default": {
+ "paddingLeft": "200px"
+ },
+ "font:default": {}
+ }
+ }
},
{
"type": "input-text",
@@ -404,7 +413,7 @@
"id": "u:31888fb92add",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value" :`${kc.cash}`
},
{
@@ -414,7 +423,7 @@
"id": "u:c42ab4593d20",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${kc.integral}`
}
],
@@ -503,7 +512,7 @@
"id": "u:99015dfd4264",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sq.playCoin}`
},
{
@@ -513,7 +522,7 @@
"id": "u:31888fb92add",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sq.cash}`
},
{
@@ -523,7 +532,7 @@
"id": "u:c42ab4593d20",
"static": true,
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sq.integral}`
}
],
@@ -611,7 +620,7 @@
"id": "u:99015dfd4264",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sm.playCoin}`
},
{
@@ -621,7 +630,7 @@
"id": "u:31888fb92add",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sm.cash}`
},
{
@@ -631,7 +640,7 @@
"id": "u:c42ab4593d20",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sm.integral}`
}
],
@@ -725,7 +734,7 @@
"id": "u:b6faed384d78",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sm.playCoin}`
},
{
@@ -735,7 +744,7 @@
"id": "u:c7181c9b3ded",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sm.cash}`
},
{
@@ -745,7 +754,7 @@
"id": "u:ee897e373acb",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${sm.integral}`
}
],
@@ -834,7 +843,7 @@
"id": "u:99015dfd4264",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${fk.playCoin}`
},
{
@@ -844,7 +853,7 @@
"id": "u:31888fb92add",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${fk.cash}`
},
{
@@ -854,7 +863,7 @@
"id": "u:c42ab4593d20",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value" :`${fk.integral}`
}
],
@@ -941,7 +950,7 @@
"name": "jxCoin",
"id": "u:99015dfd4264",
"mode": "inline", "static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${jx.playCoin}`
},
{
@@ -951,7 +960,7 @@
"id": "u:31888fb92add",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${jx.cash}`
},
{
@@ -961,7 +970,7 @@
"id": "u:c42ab4593d20",
"static": true,
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${jx.integral}`
}
],
@@ -1055,7 +1064,7 @@
"id": "u:a58559426478",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${qw.playCoin}`
},
{
@@ -1065,7 +1074,7 @@
"id": "u:e563cc483458",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${qw.cash}`
},
{
@@ -1075,7 +1084,7 @@
"id": "u:688f4b7c3392",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${qw.integral}`
}
],
@@ -1164,7 +1173,7 @@
"id": "u:af69b1a1d9cb",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${zs.playCoin}`
},
{
@@ -1174,7 +1183,7 @@
"id": "u:8ba3c740b10c",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${zs.cash}`
},
{
@@ -1184,7 +1193,7 @@
"id": "u:6d91bb154939",
"static": true,
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${zs.integral}`
}
],
@@ -1275,7 +1284,7 @@
"id": "u:b29c25f053d9",
"static": true,
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${zs2.playCoin}`
},
{
@@ -1285,7 +1294,7 @@
"id": "u:88a44c71abb0",
"static": true,
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${zs2.cash}`
},
{
@@ -1295,7 +1304,7 @@
"static": true,
"id": "u:fb82b3cf486c",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${zs2.integral}`
}
],
@@ -1389,7 +1398,7 @@
"id": "u:d78d236c5f95",
"mode": "inline",
"static": true,
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${ly.playCoin}`
},
{
@@ -1399,7 +1408,7 @@
"static": true,
"id": "u:20b24611e53c",
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${ly.cash}`
},
{
@@ -1409,7 +1418,7 @@
"id": "u:25e10253effb",
"static": true,
"mode": "inline",
- "labelClassName": "text-dark m-b text-lg",
+ "labelClassName": "text-dark m-b text-lg m-l-xxl",
"value":`${ly.integral}`
}
],
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html
index 8c39eb9..ab0f52f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html
@@ -40,6 +40,7 @@
"body": [
{
"type": "tabs",
+ "id": "u:56160148e468",
"tabsMode": "vertical",
"tabs": [
{
@@ -88,42 +89,87 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:91bfc503975f",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5fea7"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch",
+ "id": "u:5f159aae8bd6"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5fea7"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:91bfc503975f"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -188,43 +234,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:82085178ce49",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5fe22",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5fe22",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:82085178ce49"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -289,43 +380,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:60929d18d938",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f333",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f333",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:60929d18d938"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -390,43 +526,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:95a6bc834dc5",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f444",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f444",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:95a6bc834dc5"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -491,43 +672,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:f71511d042a8",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f555",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f555",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:f71511d042a8"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -592,43 +818,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:a37a95f8c2c6",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f666",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f666",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:a37a95f8c2c6"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -693,43 +964,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:0c61e0e5b4f4",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f777",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f777",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:0c61e0e5b4f4"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -794,43 +1110,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:e04f1bcae4aa",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f888",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f888",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:e04f1bcae4aa"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -895,43 +1256,88 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:6fbe66eae6e1",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f999",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f999",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:6fbe66eae6e1"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -996,6 +1402,85 @@
"method": "post"
},
"required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:30fd93656c25",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f50007",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
@@ -1082,43 +1567,88 @@
"menubar": true
},
"mode": "normal"
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:c0684967ad04",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f000",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
}
],
"actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f5f000",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:c0684967ad04"
- }
],
"resetAfterSubmit": false,
"api": {
@@ -1138,7 +1668,6 @@
"id": "u:254c9cdf53c1"
}
],
- "id": "u:56160148e468",
"toolbar": [
]
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html
index 9c6494b..945abaa 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html
@@ -72,6 +72,8 @@
<#button name="折扣管理" icon="fa-check-circle" clickFun="CoursePackage.coursePackageDiscount()" space="true"/>
<#button name="详情" icon="fa-check-circle" clickFun="CoursePackage.detailsCoursePackage()" space="true"/>
<#button name="报名信息" icon="fa-check-circle" clickFun="CoursePackage.registrationRecord()" space="true"/>
+ <#button name="暂停" icon="fa-refresh" clickFun="CoursePackage.editCoursePackageState1(1)" space="true"/>
+ <#button name="开课" icon="fa-warning" clickFun="CoursePackage.editCoursePackageState1(2)" space="true"/>
</div>
<#table id="managerTable"/>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js
index 00b5dba..3ba40bc 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js
@@ -220,8 +220,8 @@
};
TStudent.resetSearch = function () {
- $("#provinceCode").val("");
- $("#cityCode").val("");
+ $("#pCode").val("");
+ $("#cCode").val("");
$("#store").val("");
$("#site").val("");
TStudent.search();
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage.js
index cb142c0..b016738 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage.js
@@ -42,20 +42,20 @@
{title: '课程有效期', field: 'validDays', align: 'center', valign: 'middle'},
{title: '支付方式', field: 'payType', align: 'center', valign: 'middle'},
{title: '排序', field: 'sort', align: 'center', valign: 'middle'},
- {title: '课包状态', field: 'status', align: 'center', valign: 'middle',
- formatter: function (v) {
- switch (v) {
- case 1:
- return '未开始';
- case 2:
- return '售卖中';
- case 3:
- return '已结束';
- case 4:
- return '已取消';
- }
- }
- },
+ // {title: '课包状态', field: 'status', align: 'center', valign: 'middle',
+ // formatter: function (v) {
+ // switch (v) {
+ // case 1:
+ // return '未开始';
+ // case 2:
+ // return '售卖中';
+ // case 3:
+ // return '已结束';
+ // case 4:
+ // return '已取消';
+ // }
+ // }
+ // },
{title: '售卖状态', field: 'state', align: 'center', valign: 'middle',
formatter: function (v) {
switch (v) {
@@ -197,6 +197,44 @@
};
+
+
+CoursePackage.editCoursePackageState1 = function (state) {
+ if (this.check()) {
+
+ if (CoursePackage.seItem.type != 1){
+ Feng.error("请选择常规课")
+ return;
+ }
+ if(CoursePackage.seItem.status == state){
+ Feng.error("不能重复操作");
+ return
+ }
+ parent.layer.confirm(state == 1 ? '是否暂停' : "是否开课" , {
+ btn: ['确定', '取消']
+ }, function (index) {
+ let ajax = new $ax(Feng.ctxPath + "/coursePackage/editCoursePackageState1", function (data) {
+ Feng.success(state == 1 ? '暂停' : "开课" + "成功!");
+ CoursePackage.table.refresh();
+ }, function (data) {
+ Feng.error(state == 1 ? '暂停' : "开课" + "失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("id", CoursePackage.seItem.id);
+ ajax.set("state", state);
+ ajax.start();
+ parent.layer.close(index);
+
+ }, function (index) {
+ parent.layer.close(index);
+ }
+
+
+ )
+
+ }
+};
+
+
CoursePackage.detailsCoursePackage = function () {
if (this.check()) {
let index = layer.open({
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
index 9a624ee..f69558a 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
@@ -170,6 +170,7 @@
var checkboxes = document.getElementsByName('payType');
var isChecked = false;
+ var isChecked1 = false;
for (var i = 0; i < checkboxes.length; i++) {
if (checkboxes[i].checked && checkboxes[i].value === '1') {
@@ -178,17 +179,91 @@
}
}
- if (isChecked) {
- console.log("选择了现金");
- var cashElement = document.querySelector('.cash');
- var cashValue = cashElement.value.trim();
+ for (var i = 0; i < checkboxes.length; i++) {
+ if (checkboxes[i].checked && checkboxes[i].value === '2') {
+ isChecked1 = true;
+ break;
+ }
+ }
- if (cashValue === '' || cashValue === undefined) {
- console.log('金额为空或未定义');
- Feng.error("请输入金额")
- return;
+ if (isChecked1) {
+ var elements3 = document.getElementsByClassName('paiCoin');
+
+ for (var i = 0; i < elements3.length; i++) {
+ var value = elements3[i].value.trim();
+
+ if (value === '') {
+ Feng.error("请输入玩湃币价格")
+ return;
+ // Value is empty
+ // Perform your desired action
+ } else {
+ // Value is not empty
+ // Perform other actions
+ }
}
+
+ }
+
+
+
+ if (isChecked) {
+ var elements2 = document.getElementsByClassName('cash');
+
+ for (var i = 0; i < elements2.length; i++) {
+ var value = elements2[i].value.trim();
+
+ if (value === '') {
+ Feng.error("请输入现金价格")
+ return;
+ // Value is empty
+ // Perform your desired action
+ } else {
+ // Value is not empty
+ // Perform other actions
+ }
+ }
+
+
+ }
+
+
+ var elements1 = document.getElementsByClassName('classNumber');
+
+ for (var i = 0; i < elements1.length; i++) {
+ var value = elements1[i].value.trim();
+
+ if (value === '') {
+ Feng.error("请输入课时数")
+ return;
+ // Value is empty
+ // Perform your desired action
+ } else {
+ // Value is not empty
+ // Perform other actions
+ }
+ }
+
+
+
+
+ var elements = document.querySelectorAll('[name="classStartTime"]');
+ var isEmpty = false;
+
+ for (var i = 0; i < elements.length; i++) {
+ if (elements[i].value.trim() === '') {
+ isEmpty = true;
+ break;
+ }
+ }
+
+ if (isEmpty) {
+ Feng.error("请输入上课时间")
+ return;
+ console.log("At least one element with the name 'yourName' is empty.");
+ } else {
+ console.log("All elements with the name 'yourName' are filled.");
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
index 7dde961..7ad25e6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
@@ -1,12 +1,9 @@
package com.dsh.other.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.other.entity.Banner;
-import com.dsh.other.entity.FrequentlyAskedQuestions;
+import com.dsh.other.entity.*;
import com.dsh.other.feignclient.model.AdvertisementChangeStateDTO;
import com.dsh.other.feignclient.model.AdvertisementQuery;
-import com.dsh.other.entity.CreateHistoryDto;
-import com.dsh.other.entity.GetHistoryDto;
import com.dsh.other.model.BannerVo;
import com.dsh.other.model.dto.siteDto.SelectDto;
import com.dsh.other.model.vo.questionVo.QuestionSearchVO;
@@ -100,6 +97,22 @@
}
+
+
+ @ResponseBody
+ @PostMapping("/base/banner/index")
+ @ApiOperation(value = "获取首页图片", tags = {"获取首页图片"})
+ public ResultUtil querySiteTimes(){
+ try {
+ String result =bannerService.getFirst();
+ return ResultUtil.success(result);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
@ResponseBody
@PostMapping("/class/hisotory")
public void createHistory(@RequestBody CreateHistoryDto createHistoryDto){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/BannerMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/BannerMapper.java
index 929707c..f027d8f 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/mapper/BannerMapper.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/BannerMapper.java
@@ -25,4 +25,6 @@
int changeState(@Param("ids") List<Integer> ids,@Param("state") Integer state);
List<Banner> listAll(@Param("query") AdvertisementQuery query);
+
+ String getFirst();
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/IBannerService.java b/cloud-server-other/src/main/java/com/dsh/other/service/IBannerService.java
index de49917..801facb 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/IBannerService.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/IBannerService.java
@@ -23,4 +23,5 @@
List<GetHistoryDto> gethistory(Integer studentId);
+ String getFirst();
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/BannerServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/BannerServiceImpl.java
index 376f464..4a7a8d3 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/BannerServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/BannerServiceImpl.java
@@ -28,6 +28,12 @@
public List<GetHistoryDto> gethistory(Integer studentId) {
return baseMapper.getHistory(studentId);
}
+
+ @Override
+ public String getFirst() {
+ return baseMapper.getFirst();
+ }
+
@Autowired
private BannerMapper bannerMapper;
@Override
diff --git a/cloud-server-other/src/main/resources/mapper/BannerMapper.xml b/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
index dc7ae6b..4e65cce 100644
--- a/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
@@ -44,5 +44,10 @@
where hs.studentId = #{studentId}
</select>
+ <select id="getFirst" resultType="java.lang.String">
+ select content
+ from t_img_config
+ where position = 6
+ </select>
</mapper>
--
Gitblit v1.7.1