修改前端bug

1ff7d427 · dongchun · aa934f36 · aa934f36 · 1ff7d427 · 1ff7d427
Commit 1ff7d427 authored Nov 15, 2021 by dongchun
7 changed files
--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/LuckyDraw.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/LuckyDraw.html
-转盘抽奖
\ No newline at end of file
--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralDetail.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralDetail.html
@@ -126,7 +126,7 @@
                                    title: '获得积分',
                                },
                                {
-                                    field: 'reason',
+                                    field: 'content',
                                    title: '变更原因'
                                }
                            ]

--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralList.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralList.html
@@ -63,6 +63,7 @@
                // exportUrl: prefix + "/export",
                // sortName: "createdAt",
                // sortOrder: "desc",
+                pagination: false,
                modalName: "积分",
                columns: [
                    {
@@ -130,7 +131,6 @@
                    url: prefix + '/change/status',
                    data,
                    success:function(e) {
-                        console.log(e)
                        $("button[name=refresh]").click();
                    }
                })
@@ -141,7 +141,6 @@
        	var userIds = $.table.selectColumns("uid");
        	// var dataParam = $("#export-form").serializeArray();
        	var tipMsg = "确定导出所有数据吗？";
-            console.log(userIds, 'kakn')
        	if($.common.isNotEmpty(userIds)){
        		tipMsg = "确定导出勾选" + userIds.length + "条数据吗？";
        		// dataParam.push({ "name": "uid", "value": userIds });

--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralOrder.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralOrder.html
-积分订单
\ No newline at end of file
--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStore.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStore.html
@@ -146,9 +146,7 @@
            $.modal.openTab("积分明细列表", url);
        }
        function openShelvesModal(id, status, notice) {
-            // console.log('111111')
            $.modal.confirm(notice, function() {
-                console.log(id, status)
                $.ajax({
                    type: 'put',
                    url: '/stone/item/change/status',
@@ -157,7 +155,6 @@
                        status
                    },
                    success:function(e) {
-                        console.log(e)
                        layer.msg("操作成功！")
                        $("button[name=refresh]").click()
                    }

--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html
@@ -144,7 +144,7 @@
 <body>
 <form id="form-user-add"  class="layui-form">
    
-    <div class="main_type">
+    <div id="scoreType" class="main_type">
        <span class="labelName">商品类型：</span>
        <div class="layui-input-block" style="display: flex">
            <input type="radio" value="0" name="typeOne" checked><span>全场</span>
@@ -306,7 +306,6 @@
                processData: false,
                type: 'POST',
                success: function (data) {
-                    console.log(data, data.data.ossPath, '????')
                    $summernote.summernote('insertImage', 'https://img.zhengzai.tv/' + data.data.ossPath)
                }
            });
@@ -326,8 +325,9 @@
            let data = {
                itemId: itemId
            }
+            $("#scoreType").hide();
+            $("#searchIpt").attr('disabled', true);
            promiseMethods(ctx + "stone/item/details",'get',data).then(res=>{
-                console.log(res, '???')
                let data = res.data;
                if (res.code == 0) {
                    showPicture = data.img;
@@ -335,6 +335,7 @@
                    $("#searchIpt").val(data.targetTitle);
                    $("#integralNum").val(data.score);
                    $("#inventory").val(data.generalTotal);
+                    showId = data.generalTotal;
                    // $("#goodsDetail").val(data.details);
                    $('#summernote').summernote('code', data.details)
                    $('.summernote').eq(1).summernote('code', data.notice)
@@ -412,7 +413,6 @@
        } )
        // $("#searchIpt").val(name);
        showId = id;
-        console.log(showId, 'showId')
    };
    $("#searchIpt").focus(function(){
        getMallList()
@@ -468,7 +468,6 @@
    });
    
    function create() {
-        console.log($('#searchIpt').val(),showPicture,$('#integralNum').val(),$('#moneyNum').val(),$('#inventory').val(),$('#summernote').summernote('code'),$('#summernoteNotice').summernote('code'))
        if (!$('#searchIpt').val() || !showPicture || !$('#integralNum').val() || !$('#moneyNum').val() || !$('#inventory').val() || !$('#summernote').summernote('code') || !$('.summernote').eq(1).summernote('code')) {
            return layer.msg('请将必填项输入完整～！');
        }

--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html
@@ -427,7 +427,7 @@
                        }
                        // prizeList: data,
                        $("#startTime").val($.common.dateFormat(res.startTime, 'yyyy-MM-dd HH:mm:ss'));
-                        timeType = timeType;
+                        timeType = res.timeType;
                        if (timeType == 2) {
                            $("input[name='sendType'][value='2']").attr('checked', true).siblings().removeAttr('checked');
                        }