44323
2023-10-16 ef9a326f927e66835901cc9fa32536ed85cb97d6
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
4个文件已修改
180 ■■■■■ 已修改文件
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageDiscount.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
@@ -191,53 +148,13 @@
                            <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>&nbsp;上传-->
<!--                        </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="col-sm-2">
        <div class="head-scu-btn upload-btn" id="detailDrawingBtnId">
            <i class="fa fa-upload"></i>&nbsp;上传
        </div>
    </div>
    <input type="hidden" id="detailDrawing" value=""/>
    </div>
    </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label head-scu-label"></label>
                    <label>推荐像素:780x440px</label>
@@ -306,90 +223,7 @@
    </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'
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>&nbsp;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>
            @}
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){
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);