Merge branch 'master' of ssh://193.112.35.168:29418/tejia

admin

2021-05-29 68da9c56aca6a45d401d9821fd0c9fe20af9d22a

Merge branch 'master' of ssh://193.112.35.168:29418/tejia

 app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java

@@ -88,18 +88,6 @@
    }


    public String getVipGradeSelect(List<VipGrade> listGrade, Long gradeId) {
        String str = "";
        for (VipGrade t : listGrade) {
            str += "<option value=\"" + t.getId() + "\" "
                    + (t.getId().longValue() == gradeId.longValue() ? "selected=\"selected\"" : "") + " > " + t.getName()
                    + "</option> ";
        }
        System.out.println(str);
        return str;
    }


    @ResponseBody
    @RequestMapping(value = "add")
    public Result add(VipCenter t, HttpServletRequest request) {

 app/src/main/resources/static/views/vip/vipCenter-add.html

@@ -42,57 +42,36 @@
                    <input type="text" id="uid" name="uid" required="" lay-verify="uid" autocomplete="off"
                           class="layui-input"></div>
            </div>



            <div class="layui-form-item">
                <label for="startTime" class="layui-form-label">
                    <span class="x-red">*</span>开始时间</label>
                    开始时间</label>
                <div class="layui-input-inline">
                    <input type="text" id="startTime" name="startTime" required="" lay-verify="icon"
                           autocomplete="off" class="layui-input"></div>
                    <input type="text" class="layui-input" id="startTime"  name="startTime" placeholder="yyyy-MM-dd HH:mm:ss"></div>
            </div>

            <div class="layui-form-item">
                <label for="endTime" class="layui-form-label">
                    结束时间</label>
                <div class="layui-input-inline">
                    <input type="text" id="endTime" name="endTime" required="" lay-verify="sort"
                           autocomplete="off" class="layui-input"></div>
                    <input type="text" class="layui-input" id="endTime"  name="endTime"  placeholder="yyyy-MM-dd HH:mm:ss">
                </div>
            </div>


            <div class="layui-form-item">
                <!--  <label for="L_remarks" class="layui-form-label"></label>-->
                <button class="layui-btn" lay-filter="add" lay-submit="">增加</button>
            </div>
        </form>
    </div>
</div>
<script>

    layui.use(['form', 'layer', 'jquery'],
<script>layui.use(['form', 'layer', 'jquery'],
    function () {
        $ = layui.jquery;
        var form = layui.form,
            layer = layui.layer;

        // //自定义验证规则
        // form.verify({
        //     username: function (value) {
        //         if (value.length < 3) {
        //             return '应用名称至少得3个字符啊';
        //         }
        //     },
        //     appcode: [/^([A-Za-z0-9]|\-|_)+$/, '应用标识只能包含 数字、英文字符、_ 、-'],
        //     desc: function (value) {
        //         if (value != null && value.length > 128) {
        //             return '简介最大为128个字符';
        //         }
        //     },
        //     remarks: function (value) {
        //         if (value != null && value.length > 128) {
        //             return '备注最大为128个字符';
        //         }
        //     },
        //
        // });



        $.ajax({
@@ -118,6 +97,7 @@
        });



        //监听提交
        form.on('submit(add)',
            function (data) {
@@ -137,12 +117,33 @@
                    } else {
                        layer.msg(res.msg);
                    }

                }, function (res) {
                });
                return false;
            });
    });




layui.use('laydate', function() {
    var laydate = layui.laydate;
    laydate.render({
        elem: '#startTime'
        , type: 'datetime'
        ,trigger: 'click'
    });
    laydate.render({
        elem: '#endTime'
        , type: 'datetime'
        ,trigger: 'click'
    });
});


</script>

</body>

</html>

 app/src/main/resources/static/views/vip/vipCenter-list.html

@@ -83,7 +83,7 @@
</body>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn" onclick="xadmin.open('添加等级','vipCenter-add.html',500,480)"><i class="layui-icon"></i>添加
        <button class="layui-btn" onclick="xadmin.open('添加等级','combo-add22.html',500,480)"><i class="layui-icon"></i>添加
        </button>
    </div>
</script>