From d09d95e1ba4420833527a0c001b83c5ecca82bae Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 14:21:12 +0800
Subject: [PATCH] 10.16
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 2
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageDiscount.js | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html | 490 ++++++++++++++++++------------------------------------
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html | 2
4 files changed, 166 insertions(+), 330 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
index 1412236..2a03a70 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
@@ -1,47 +1,4 @@
- @layout("/common/_container.html"){
-
- <style>
- .avatar-uploader .el-upload {
- border: 1px dashed #d9d9d9;
- border-radius: 6px;
- cursor: pointer;
- position: relative;
- height: 100px;
- width: 100px;
- overflow: hidden;
- }
-
- .avatar-uploader .el-upload:hover {
- border-color: #409EFF;
- }
- .avatar-uploader-icon {
- font-size: 28px;
- color: #8c939d;
- width: 100px;
- height: 100px;
- line-height: 100px;
- margin-top: 32px;
- text-align: center;
- }
- .avatar {
- width: 100px;
- height: 100px;
- display: block;
- }
-
- .col-sm-12 {
- margin-top: 20px;
- }
-
- .col-sm-12 select {
- height: 33px;
- }
- #app1{
- margin-left: 255px;
- }
-
-
- </style>
+@layout("/common/_container.html"){
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal">
@@ -89,307 +46,184 @@
</div>
<div class="form-group" ${type == 1||type == 3 ? 'hidden=hidden' : ''}>
- <label class="col-sm-3 control-label">*假期有效期：</label>
- <div class="col-sm-4">
- <input class="form-control" id="holitime" name="holitime">
- </div>
+ <label class="col-sm-3 control-label">*假期有效期：</label>
+ <div class="col-sm-4">
+ <input class="form-control" id="holitime" name="holitime">
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">*课包名称：</label>
- <div class="col-sm-4">
- <input class="form-control" id="name" name="name">
- </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*课包名称：</label>
+ <div class="col-sm-4">
+ <input class="form-control" id="name" name="name">
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">*上课场地：</label>
- <div class="col-sm-4">
- <select class="form-control" id="siteId" name="siteId">
- @for(obj in site){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*上课场地：</label>
+ <div class="col-sm-4">
+ <select class="form-control" id="siteId" name="siteId">
+ @for(obj in site){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">*授课教师：</label>
- <div class="col-sm-4">
- <select class="form-control" id="coachId" name="coachId">
- <option value="">请选择</option>
- @for(obj in coach){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*授课教师：</label>
+ <div class="col-sm-4">
+ <select class="form-control" id="coachId" name="coachId">
+ <option value="">请选择</option>
+ @for(obj in coach){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
</div>
- <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
- <label class="col-sm-3 control-label">*最多预约人数：</label>
- <div class="col-sm-4">
- <input class="form-control" id="maxSubscribeNumber" name="maxSubscribeNumber" type="number" min="0" placeholder="请输入最多预约人数">
- </div>
- </div>
+ </div>
+ <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
+ <label class="col-sm-3 control-label">*最多预约人数：</label>
+ <div class="col-sm-4">
+ <input class="form-control" id="maxSubscribeNumber" name="maxSubscribeNumber" type="number" min="0" placeholder="请输入最多预约人数">
+ </div>
+ </div>
- <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
- <label class="col-sm-3 control-label">*上课时间：</label>
- <div class="col-sm-4">
- <input type="checkbox" name="classWeeks" value="周一"> 周一
- <input type="checkbox" name="classWeeks" value="周二"> 周二
- <input type="checkbox" name="classWeeks" value="周三"> 周三
- <input type="checkbox" name="classWeeks" value="周四"> 周四
- <input type="checkbox" name="classWeeks" value="周五"> 周五
- <input type="checkbox" name="classWeeks" value="周六"> 周六
- <input type="checkbox" name="classWeeks" value="周日"> 周日
- </div>
- </div>
- <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''} >
- <label class="col-sm-3 control-label"></label>
-
- <div class="form-group" style="display: flex; align-items: center;" id = "dayTime" >
- <div style="display:flex">
- <input class="form-control" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;">
-
-
- <i class="fa fa-plus-circle" style="font-size: 24px; margin-left: 10px;" onclick="addTime()"></i>
- </div>
-
- </div>
-
-
- </div>
- <div class="form-group" ${type == 2||type == 3 ? 'hidden=hidden' : ''}>
- <label class="col-sm-3 control-label">*扣除课时数：</label>
- <div class="col-sm-4">
- <input class="form-control" id="codeTime" name="codeTime" type="number" min="0" placeholder="请输入每节课扣除课时数">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">*课包封面：</label>
- <div class="col-sm-4">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label">*列表页</label>
- <div class="col-sm-2">
- <div id="coverDrawingPreId">
- <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
- </div>
- </div>
- <div class="col-sm-2">
- <div class="head-scu-btn upload-btn" id="coverDrawingBtnId">
- <i class="fa fa-upload"></i> 上传
- </div>
- </div>
- <input type="hidden" id="coverDrawing" value=""/>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label"></label>
- <label>推荐像素：210x280px</label>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label">*详情页</label>
- <div class="col-sm-2">
- <div id="detailDrawingPreId">
- <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
- </div>
- </div>
- </div>
-<!-- <div class="form-group">-->
-<!-- <label class="col-sm-3 control-label head-scu-label">*详情页</label>-->
-<!-- <div class="col-sm-2">-->
-<!-- <div id="detailDrawingPreId">-->
-<!-- <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="col-sm-2">-->
-<!-- <div class="head-scu-btn upload-btn" id="detailDrawingBtnId">-->
-<!-- <i class="fa fa-upload"></i> 上传-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <input type="hidden" id="detailDrawing" value=""/>-->
-<!-- </div>-->
-
- <div class="row" id="app1">
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label">*赛事活动图片(请上传不超过五张图片): </label>
- <div class="col-sm-2" style="width: 100%;margin-left: 11%;margin-top: 1%">
- <el-upload
- :limit="5"
- class="avatar-uploader"
- action="/tCouponManage/uploadPic"
- list-type="picture-card"
- accept="."
- :on-success="handleAvatarSuccess"
- :on-remove="handleRemove">
- <i class="el-icon-plus"></i>
- </el-upload>
- <el-dialog :visible.sync="dialogVisible">
- <img width="100%" :src="imageUrl1" alt="">
- </el-dialog>
+ <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
+ <label class="col-sm-3 control-label">*上课时间：</label>
+ <div class="col-sm-4">
+ <input type="checkbox" name="classWeeks" value="周一"> 周一
+ <input type="checkbox" name="classWeeks" value="周二"> 周二
+ <input type="checkbox" name="classWeeks" value="周三"> 周三
+ <input type="checkbox" name="classWeeks" value="周四"> 周四
+ <input type="checkbox" name="classWeeks" value="周五"> 周五
+ <input type="checkbox" name="classWeeks" value="周六"> 周六
+ <input type="checkbox" name="classWeeks" value="周日"> 周日
</div>
</div>
+ <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''} >
+ <label class="col-sm-3 control-label"></label>
+
+ <div class="form-group" style="display: flex; align-items: center;" id = "dayTime" >
+ <div style="display:flex">
+ <input class="form-control" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;">
+
+
+ <i class="fa fa-plus-circle" style="font-size: 24px; margin-left: 10px;" onclick="addTime()"></i>
+ </div>
</div>
-
-
-
-
+</div>
+<div class="form-group" ${type == 2||type == 3 ? 'hidden=hidden' : ''}>
+<label class="col-sm-3 control-label">*扣除课时数：</label>
+<div class="col-sm-4">
+ <input class="form-control" id="codeTime" name="codeTime" type="number" min="0" placeholder="请输入每节课扣除课时数">
+</div>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label">*课包封面：</label>
+ <div class="col-sm-4">
</div>
-
-
-
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label"></label>
- <label>推荐像素：780x440px</label>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label">*课包介绍</label>
- <div class="col-sm-2">
- <div id="introduceDrawingPreId">
- <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
- </div>
- </div>
- <div class="col-sm-2">
- <div class="head-scu-btn upload-btn" id="introduceDrawingBtnId">
- <i class="fa fa-upload"></i> 上传
- </div>
- </div>
- <input type="hidden" id="introduceDrawing" value=""/>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label"></label>
- <label>推荐像素：宽780x</label>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">排序：</label>
- <div class="col-sm-4">
- <input class="form-control" id="sort" name="sort" type="number" placeholder="请输入排序">
- </div>
- </div>
- <div class="hr-line-dashed"></div>
- <h3>课时设置</h3>
- <div class="form-group">
- <label class="col-sm-3 control-label">*支付方式：</label>
- <div class="col-sm-4" style="margin-top: 6px;">
- <input type="checkbox" name="payType" value="1"> 现金
- <input type="checkbox" name="payType" value="2"> 玩湃币
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label"${type == 2||type == 3 ? 'hidden=hidden' : ''}>*课时有效期：</label>
- <div class="col-sm-4" ${type == 2||type == 3 ? 'hidden=hidden' : ''}>
- 购买后 <input id="validDays" name="validDays" type="number" min="0" placeholder="天数" style="width: 80px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;" > 天内有效
- </div>
- </div>
- <div id="price">
- <div class="form-group">
- <label class="col-sm-3 control-label" >${type == 2||type == 3 ? '' : '*课时数：'}</label>
- <div class="col-sm-8">
- <span class="classNumber_span" ${type == 2||type == 3 ? 'hidden=hidden' : ''}><input class="classNumber" type="number" min="0" placeholder="请输入" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> </span>
- <span class="cash_span" ></span>
- <span class="paiCoin_span"></span>
- <#button btnCss="info" name="优惠券" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia(1)"/>
- <i class="fa fa-plus-circle" style="font-size:24px" onclick="addPrice(${type})"></i>
- <input type="text" id = "counpons1" class="counpons" hidden="hidden" >
- </div>
- </div>
- </div>
-<!-- <input type="text" id = "counpons">-->
- </div>
- <div class="row btn-group-m-t">
- <div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.addSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="CoursePackageInfo.close()"/>
- </div>
- </div>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">*列表页</label>
+ <div class="col-sm-2">
+ <div id="coverDrawingPreId">
+ <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="head-scu-btn upload-btn" id="coverDrawingBtnId">
+ <i class="fa fa-upload"></i> 上传
+ </div>
+ </div>
+ <input type="hidden" id="coverDrawing" value=""/>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label"></label>
+ <label>推荐像素：210x280px</label>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">*详情页</label>
+ <div class="col-sm-2">
+ <div id="detailDrawingPreId">
+ <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="head-scu-btn upload-btn" id="detailDrawingBtnId">
+ <i class="fa fa-upload"></i> 上传
+ </div>
+ </div>
+ <input type="hidden" id="detailDrawing" value=""/>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label"></label>
+ <label>推荐像素：780x440px</label>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">*课包介绍</label>
+ <div class="col-sm-2">
+ <div id="introduceDrawingPreId">
+ <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="head-scu-btn upload-btn" id="introduceDrawingBtnId">
+ <i class="fa fa-upload"></i> 上传
+ </div>
+ </div>
+ <input type="hidden" id="introduceDrawing" value=""/>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label"></label>
+ <label>推荐像素：宽780x</label>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label">排序：</label>
+ <div class="col-sm-4">
+ <input class="form-control" id="sort" name="sort" type="number" placeholder="请输入排序">
+ </div>
+</div>
+<div class="hr-line-dashed"></div>
+<h3>课时设置</h3>
+<div class="form-group">
+ <label class="col-sm-3 control-label">*支付方式：</label>
+ <div class="col-sm-4" style="margin-top: 6px;">
+ <input type="checkbox" name="payType" value="1"> 现金
+ <input type="checkbox" name="payType" value="2"> 玩湃币
+ </div>
+</div>
+<div class="form-group">
+ <label class="col-sm-3 control-label"${type == 2||type == 3 ? 'hidden=hidden' : ''}>*课时有效期：</label>
+ <div class="col-sm-4" ${type == 2||type == 3 ? 'hidden=hidden' : ''}>
+ 购买后 <input id="validDays" name="validDays" type="number" min="0" placeholder="天数" style="width: 80px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;" > 天内有效
+</div>
+</div>
+<div id="price">
+ <div class="form-group">
+ <label class="col-sm-3 control-label" >${type == 2||type == 3 ? '' : '*课时数：'}</label>
+ <div class="col-sm-8">
+ <span class="classNumber_span" ${type == 2||type == 3 ? 'hidden=hidden' : ''}><input class="classNumber" type="number" min="0" placeholder="请输入" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> </span>
+ <span class="cash_span" ></span>
+ <span class="paiCoin_span"></span>
+ <#button btnCss="info" name="优惠券" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia(1)"/>
+ <i class="fa fa-plus-circle" style="font-size:24px" onclick="addPrice(${type})"></i>
+ <input type="text" id = "counpons1" class="counpons" hidden="hidden" >
</div>
</div>
</div>
+<!-- <input type="text" id = "counpons">-->
+</div>
+<div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="CoursePackageInfo.close()"/>
+ </div>
+</div>
+</div>
+</div>
+</div>
<script src="${ctxPath}/modular/system/coursePackage/coursePackage_info.js"></script>
- <script src="${ctxPath}/js/vue/vue.js"></script>
- <script src="${ctxPath}/js/elementui/index.js"></script>
- <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script type="text/javascript">
- var vue2 = new Vue({
- el: '#app1',
- props: {
- // 数量限制
- limit: {
- type: Number,
- default: 2
- },
- },
- data: {
- autoUpload: true,//自动上传
- imageUrl1: '',//模型数据，用于上传图片完成后图片预览
- dialogVisible: false
- },
- methods: {
- handleAvatarSuccess(res, file) {
- CoursePackageInfo.goodsPicArray.push(file);
- },
- beforeAvatarUpload(file) {
- const isLt2M = file.size / 1024 / 1024 < 10;
- if (!isLt2M) {
- this.$message.error('上传图片大小不能超过 10MB!');
- }
- return isLt2M;
- },
- handleRemove(file, fileList) {
- TSite.goodsPicArray = TSite.goodsPicArray.filter(item => {
- return item.uid != file.uid;
- });
- },
- },
- created() {
- },
- });
- <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
- <script src="${ctxPath}/js/elementui/index.js"></script>
- <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
- <script src="${ctxPath}/js/vue/vue.js"></script>
-
- <script type="text/javascript">
-
- var vue2 = new Vue({
- el: '#app1',
- props: {
- // 数量限制
- limit: {
- type: Number,
- default: 2
- },
- },
- data: {
- autoUpload: true,//自动上传
- imageUrl1: '',//模型数据，用于上传图片完成后图片预览
- dialogVisible: false
- },
- methods: {
- handleAvatarSuccess(res, file) {
- console.log(TCarInfoDlg.goodsPicArray1)
- TCarInfoDlg.goodsPicArray1.push(file);
- },
- beforeAvatarUpload(file) {
- const isLt2M = file.size / 1024 / 1024 < 10;
- if (!isLt2M) {
- this.$message.error('上传图片大小不能超过 10MB!');
- }
- return isLt2M;
- },
- handleRemove(file, fileList) {
- TCarInfoDlg.goodsPicArray1 = TCarInfoDlg.goodsPicArray1.filter(item => {
- return item.uid != file.uid;
- });
- },
- },
- created() {
- },
- });
-
-
-
-
laydate.render({
elem: '#classStartTime'
,type: 'time'
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
index 1cff518..dbb2842 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
@@ -22,7 +22,7 @@
</div>
<div class="col-sm-2" style="margin-left: 280px">
<div class="head-scu-btn upload-btn webuploader-container" id="welfarePictureBtnId"><div class="webuploader-pick">
- <i class="fa fa-upload"></i> Upload
+ <i class="fa fa-upload"></i> 文件上传
</div><div id="rt_rt_1h6lka0hk9mucj87vf1t21qk31" style="position: absolute; inset: 0px auto auto 0px; width: 82px; height: 28px; overflow: hidden;"><input type="file" name="file" class="webuploader-element-invisible" accept="image/gif,image/jpg,image/jpeg,image/bmp,image/png"><label style="opacity: 0; width: 100%; height: 100%; display: block; cursor: pointer; background: rgb(255, 255, 255);"></label></div></div>
</div>
@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageDiscount.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageDiscount.js
index 9b77955..07f3d30 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageDiscount.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageDiscount.js
@@ -93,7 +93,7 @@
}
lay('.startAndEndDay').each(function(i, e){
laydate.render({
- elem: this
+ elem: e
,type: 'datetime'
,range: true
,done: function(value, date, endDate){
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 0344d49..50f4faf 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
@@ -148,6 +148,8 @@
var ajax = new $ax(Feng.ctxPath + "/tShop/saveImg", function(data){
if(data.code == 200){
Feng.success("保存成功")
+ TCarInfoDlg.close();
+
}
});
ajax.set("id",id);
--
Gitblit v1.7.1