puzhibing
2024-03-21 b1069cdbce2086877055c32a19a0ab51b29331a8
修改bug
5个文件已修改
34 ■■■■■ 已修改文件
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/benefits/TBenefitsVideos_add.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/benefits/TBenefits.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -892,8 +892,7 @@
    @RequestMapping(value = "/deleteTwo")
    public Object delete2(Integer id) {
        try {
            storeOtherConfigService.removeById(id);
            tStoreOtherConfigTrueService.removeById(id);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
cloud-server-management/src/main/webapp/WEB-INF/view/system/benefits/TBenefitsVideos_add.html
@@ -48,7 +48,7 @@
                    <select style="width: 300px"  class="form-control" id="name" name = "name" onchange="TQuestion.oneChange()">
                        <option value="" style="color: #b6b6b6" disabled selected>请选择</option>
                        @for(obj in data){
                        <option value="${obj.id}">${obj.name}</option>
                        <option value="${obj.id}" coverDrawing="${obj.coverDrawing}" introduce="${obj.introduce}">${obj.name}</option>
                        @}
                    </select>
                </div>
@@ -58,14 +58,13 @@
                <label class="col-sm-3 control-label">*视频封面:</label>
                <div class="col-sm-9" style="display: flex;">
                    <img id="img" src="" width="150px" height="150px">
<!--                    <#avatar id="img" name="" avatarImg=""/>-->
                </div>
            </div>
            <div class="form-group" >
                <label class="col-sm-3 control-label">*视频简介:</label>
                <div class="col-sm-9" style="display: flex;">
                    <textarea readonly id="introduce" rows="10" COLS="30" placeholder="请输入视频简介"></textarea>
                    <textarea readonly id="introduce" rows="10" COLS="50" placeholder="请输入视频简介"></textarea>
                </div>
            </div>
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html
@@ -107,7 +107,6 @@
            $("#t1").hide()
            $("#t2").hide()
            $("#t3").hide()
            $("#turnId").hide()
        }else {
            $("#t1").show()
            $("#t2").show()
@@ -156,7 +155,6 @@
            $("#t1").hide()
            $("#t2").hide()
            $("#t3").hide()
            $("#turnId").hide()
        }
    }
</script>
cloud-server-management/src/main/webapp/static/modular/system/benefits/TBenefits.js
@@ -18,7 +18,7 @@
        {title: '分类名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
        {title: '所在位置', field: 'position', visible: true, align: 'center', valign: 'middle',
            formatter:function (data) {
                return {1:"先上课得积分",2:"看视频得奖励"}[data]
                return {1:"线上课得积分",2:"看视频得奖励"}[data]
            }
        },
        {title: '视频数', field: 'count', visible: true, align: 'center', valign: 'middle'},
cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js
@@ -60,19 +60,15 @@
 * 选择视频 回显视频封面
 * @param e
 */
TCompetition.oneChange = function (e) {
    var oneId=$(e).val();
    var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
        if(data!=null){
            var content='<option value="">选择市</option>';
            $.each(data, function(k,v) {
                content += "<option value='"+v.code+"'>"+v.name+"</option>";
            });
            $("#cCode").empty().append(content);
        }
    });
    ajax.set("oneId",oneId);
    ajax.start();
TQuestion.oneChange = function () {
    let op = $('#siteType option:selected');
    if(op.val() == ""){
        $('#img').attr('src', "")
        $('#introduce').text("")
    }else{
        $('#img').attr('src', op.attr('coverDrawing'))
        $('#introduce').text(op.attr('introduce'))
    }
};
/**
 * 点击添加