Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

Helius

2022-05-19 46950524044428ed3a53b9776aa01cb1a08a51ca

 src/main/resources/templates/febs/views/modules/act/actUpdateNew.html

@@ -53,6 +53,26 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item">
                                    <label class="layui-form-label febs-form-item-require">活动缩略图：</label>
                                    <div class="layui-input-block">
                                        <div class="layui-upload">
                                            <button type="button" class="layui-btn layui-btn-normal layui-btn" id="test2">上传</button>
                                            <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                                                <div class="layui-upload-list">
                                                    <img class="layui-upload-img" id="demo2" style="width: 100px" >
                                                </div>
                                            </blockquote>
                                        </div>
                                    </div>
                                </div>

                                <div class="layui-form-item febs-hide">
                                    <label class="layui-form-label">缩略图链接：</label>
                                    <div class="layui-input-block">
                                        <input type="text" id="actImage" lay-verify="required" name="actImage" autocomplete="off" class="layui-input" readonly>
                                    </div>
                                </div>

                                <div class="layui-form-item">
                                    <label class="layui-form-label">活动说明：</label>
@@ -145,6 +165,16 @@
        });
        formSelects.render();

        //图片上传
        upload.render({
            elem: '#test2'
            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
            ,done: function(res){
                $('#demo2').attr('src', res.data.src);
                $("#actImage").val(res.data.src);
            }
        });

        var tableAwardData=[];
        var tableIns = table.render({
            elem: '#multiAward'
@@ -155,7 +185,7 @@
                {type: 'checkbox'}
                ,{field: 'index', title: '序号', width:70}
                ,{field: 'awardName', title: '奖品名称', edit:'text'}
                ,{field: 'awardImage', title: '奖品图'}
                ,{field: 'awardImage', title: '奖品图', hide:true}
                ,{templet: '#awardtableImgUpload', title: '缩略图', width:150}
                ,{field: 'awardTotal', title: '奖品总数', edit:'text'}
                ,{field: 'awardCnt', title: '已中奖数量', edit:'text'}
@@ -291,12 +321,18 @@
                "id": actInfo.id,
                "actCode": actInfo.actCode,
                "actName": actInfo.actName,
                "actImage": actInfo.actImage,
                "actStartTime": actInfo.actStartTime,
                "actEndTime": actInfo.actEndTime,
                "actEndTime": actInfo.actEndTime,
                "actScoreCnt": actInfo.actScoreCnt,
                "actRemark": actInfo.actRemark
            });

            // $('#demo2').append('<img src="' + actInfo.actImage + '" alt="" class="layui-upload-img" style="width: 100px">')

            $('#demo2').attr('src', actInfo.actImage);

            var award = actInfo.mallActAwardSets;
            for (let i = 0; i < award.length; i++) {
                award[i].index = i+1;