Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html

@@ -49,23 +49,29 @@
        <div class="form-horizontal" id="carInfoForm">

            @if(type==1){
            <div class="form-group"   >
                <label class="col-sm-3 control-label" id="yys1">所属运营商：</label>
            <div class="form-group">
                <label class="col-sm-3 control-label">*门店类型：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)">
                    <input type="radio" name="type" value="1" onclick="updateType(1)" checked > 平台门店
                    <input type="radio" name="type" value="2" onclick="updateType(2)" id="radio1" > 运营商门店
                </div>
            </div>
            <div id="yys" hidden>
            <div class="form-group">
                <label class="col-sm-3 control-label">*所属运营商：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)" >
                        <option value="">选择运营商</option>
                        @for(i in yysList){
                        <option value="${i.id}">${i.name}</option>
                        <option value="${i.id}" >${i.name}</option>
                        @}
                    </select>
                    <input type="checkbox" value="0" name="pt" id="pt" onchange="TCarInfoDlg.oneChangeYys(this)">平台</input>
                </div>
            </div>
            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">所在省：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">

                    </select>
                </div>
            </div>
@@ -77,28 +83,30 @@
                    </select>
                </div>
            </div>
            @}
            @if(type==2){
            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">所在省：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
                        <option value="">选择省</option>
                        @for(i in province){
                        <option value="${i.code}">${i.name}</option>
                        @}
                    </select>
                </div>
            </div>
            <div class="form-group" id="cityCode">
                <label class="col-sm-3 control-label">举办市：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="cCode" name="cCode" onchange="TCarInfoDlg.oneChangeNext9(this)">
                        <option value="">选择市</option>

                    </select>
            <div id="yys1">
                <div class="form-group" >
                    <label class="col-sm-3 control-label">所在省：</label>
                    <div class="col-sm-9">
                        <select class="form-control" id="pCode1" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
                            <option value="">选择省</option>
                            @for(i in list){
                            <option value="${i.code}" >${i.name}</option>
                            @}
                        </select>
                    </div>
                </div>
                <div class="form-group" >
                    <label class="col-sm-3 control-label">举办市：</label>
                    <div class="col-sm-9">
                        <select class="form-control" id="cCode1" name="cCode" onchange="TCarInfoDlg.oneChangeNext(this)">
                            <option value="">选择市</option>
                        </select>
                    </div>
                </div>
            </div>

            @}
            @if(type==1){
            <div class="form-group" id="shop">
@@ -115,7 +123,10 @@
                <label class="col-sm-3 control-label">举办门店：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="shopId" name="shopId" multiple>

                        <option value="">选择门店</option>
                        @for(i in stores){
                        <option value="${i.id}" >${i.name}</option>
                        @}
                    </select>
                </div>
            </div>
@@ -143,9 +154,9 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">支付方式：</label>
                <div class="col-sm-9">
                    <input type="checkbox"  onclick="updateType(1,this)"> 现金支付
                    <input type="checkbox" onclick="updateType(2,this)"> 玩湃币支付
                    <input type="checkbox" onclick="updateType(3,this)"> 课时支付
                    <input type="checkbox"  onclick="updateType1(1,this)"> 现金支付
                    <input type="checkbox" onclick="updateType1(2,this)"> 玩湃币支付
                    <input type="checkbox" onclick="updateType1(3,this)"> 课时支付
                </div>
            </div>

@@ -364,6 +375,36 @@
            }else {
                $("#payType1").hide();
            }
            $("#yys").hide();
            $("#yys1").show();
            $("#pCode1").val("");
            $("#cCode1").val("");
            $("#pCode").val("");
            $("#cCode").val("");

        }
        if(e==2){
            if($(o).is(":checked")){
                $("#payType2").show();
            }else {
                $("#payType2").hide();
            }
            $("#yys").show();
            $("#yys1").hide();
            $("#pCode1").val("");
            $("#cCode1").val("");
            $("#pCode").val("");
            $("#cCode").val("");

        }
    }
    function updateType1(e,o) {
        if(e==1){
            if($(o).is(":checked")){
                $("#payType1").show();
            }else {
                $("#payType1").hide();
            }
        }
        if(e==2){
            if($(o).is(":checked")){