Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html

@@ -16,6 +16,7 @@
                                <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">隐私协议</a></li>
                                <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">运动安全告知书</a></li>
                                <li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false">注销账号说明</a></li>
                                <li class=""><a data-toggle="tab" href="#tab-5" aria-expanded="false">社区世界杯报名协议</a></li>
                            </ul>
                            <div class="tab-content">
                                <div id="tab-1" class="tab-pane active">
@@ -59,6 +60,17 @@
                                        </div>
                                    </div>
                                </div>

                                <div id="tab-5" class="tab-pane">
                                    <div class="panel-body">
                                        <textarea type="text/plain" id="editor_5" style="width:1200px;height:400px;">${five.content}</textarea>
                                        <div class="row btn-group-m-t">
                                            <div class="col-sm-10 col-sm-offset-5">
                                                <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_5(${five.id});"/>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
@@ -73,12 +85,14 @@
    var editor_2 = null;
    var editor_3 = null;
    var editor_4 = null;
    var editor_5 = null;
    $(function () {
        //初始化编辑器
        editor_1 = UE.getEditor('editor_1');
        editor_2 = UE.getEditor('editor_2');
        editor_3 = UE.getEditor('editor_3');
        editor_4 = UE.getEditor('editor_4');
        editor_5 = UE.getEditor('editor_5');
    });

    function update_1(id){
@@ -109,6 +123,13 @@
        }
        submitData(editor_4.getContent(),id);
    }
    function update_5(id){
        if (editor_5.getContentTxt() == ""){
            Feng.error("内容不能为空!");
            return;
        }
        submitData(editor_5.getContent(),id);
    }

    function submitData(content,id) {
        //提交信息