Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-26 a139dba9262dbb4b70f34d3c2034c255561abcad

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
@layout("/common/_container.html"){
<style>
    .newWidth {
        max-width: 200px !important;
        display: initial !important;
    }
</style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="merchantCouponInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="type" name="id" value="${type}">
            <input type="hidden" id="merchantId_" name="id" value="${item.merchantId}">
 
            <div class="row">
                <div class="col-sm-11">
                    <div class="form-group">
                        <label class="col-sm-2 control-label">商家</label>
                        <div class="col-sm-10 " style="padding-top: 0px">
                            <select class="form-control newWidth" id="merchantId">
                                @for(merchant in merchantList){
                                <option value="${merchant.id}">${merchant.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
 
                    <div class="form-group">
                        <label class="col-sm-2 control-label">商家商品券：</label>
                        <div class="col-sm-10">
                            <input type="text" name="name" id="name" class="form-control newWidth" value="${item.name}"/>
                        </div>
                    </div>
 
                    @if(type==1){
                    <div class="form-group">
                        <label class="col-sm-2 control-label">赠送：</label>
                        <div class="col-sm-10">
                            满&nbsp;<input type="text" name="fullAmount" id="fullAmount" value="${item.fullAmount}" class="form-control newWidth"/>&nbsp;元，抵扣&nbsp;<input
                                type="text" name="discount" id="discount" value="${item.discount}" class="form-control newWidth"/>&nbsp;元。
                        </div>
                    </div>
                    @}
 
                    @if(type==2){
                    <div class="form-group">
                        <label class="col-sm-2 control-label">备注：</label>
                        <div class="col-sm-6">
                        <textarea class="form-control" id="content" maxlength="50"
                                  style="height: 200px; ">${item.content}</textarea>
                            <div class="weui-textarea-counter" style="text-align: right;position: absolute;
                                                                 right: 25px;bottom: 10px;"><span id="length">0</span>/50
                            </div>
                        </div>
                    </div>
                    @}
                </div>
            </div>
 
            <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="MerchantCouponInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MerchantCouponInfoDlg.close()"/>
                </div>
            </div>
        </div>
 
    </div>
</div>
<script src="${ctxPath}/static/modular/system/merchantCoupon/merchantCoupon_info.js"></script>
<script type="text/javascript">
    $("#content").on("keyup",function () {
        $("#length").text($("#content").val().length)
    })
</script>
@}