Merge remote-tracking branch 'origin/master'

nickchange

2023-10-18 062fb1ed6efcaac5d75bbe184524c4929dff7fcd

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html

@@ -50,7 +50,13 @@
                    <input type="radio" name="type" value="3" > 年卡
                </div>
            </div>
            <#input id="price" name="原价" type="text"/>
            <div class="form-group">
                <label class="col-sm-3 control-label">原价：</label>
                <div class="col-sm-9">
                    <input class="form-control" id="price" name="price" type="number">

                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">兑换方式：</label>
                <div class="col-sm-9">
@@ -62,14 +68,14 @@
            <div class="form-group" id="y1" hidden>
                <label class="col-sm-3 control-label">所需现金：</label>
                <div class="col-sm-9">
                    <input class="form-control" id="cash" name="cash" type="text">
                    <input class="form-control" id="cash" name="cash" type="number">

                </div>
            </div>
            <div class="form-group" id="y2">
                <label class="col-sm-3 control-label">所需积分：</label>
                <div class="col-sm-9">
                    <input class="form-control" id="integral" name="integral" type="text">
                    <input class="form-control" id="integral" name="integral" type="number">

                </div>
            </div>
@@ -112,14 +118,14 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">发放数量：</label>
                <div class="col-sm-9">
                    <input class="form-control" id="quantityIssued" name="quantityIssued" type="text">
                    <input class="form-control" id="quantityIssued" name="quantityIssued" type="number">
                </div>
            </div>

            <div class="form-group">
                <label class="col-sm-3 control-label">限领数量：</label>
                <div class="col-sm-9">
                    <input class="form-control" id="pickUpQuantity" name="pickUpQuantity" type="text">
                    <input class="form-control" id="pickUpQuantity" name="pickUpQuantity" type="number">
                </div>
            </div>
            <#input id="startTime" name="有效期" type="text"/>
@@ -164,7 +170,7 @@
                                <option value="">请选择</option>
                            </select>
                            <label class="col-sm-1" style="width: 7%;margin-top: 7px">市</label>
                            <label name="addBranch" class="col-sm-1" onclick="TCarInfoDlg.addBranch()" style="border: 0px;cursor: pointer;margin-top: 1%"><i class="fa fa-plus-circle"></i></label>
                            <label name="addBranch" class="col-sm-1" onclick="TGoodsInfoDlg.addBranch()" style="border: 0px;cursor: pointer;margin-top: 1%"><i class="fa fa-plus-circle"></i></label>
                        </div>
                        <div id="cityDemo"></div>
                    </div>
@@ -209,7 +215,7 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">排序：</label>
                <div class="col-sm-9">
                    <input class="form-control" id="sort" name="sort" type="text">
                    <input class="form-control" id="sort" name="sort" type="number">

                </div>
            </div>