修改前端bug

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralDetail.html

@@ -67,59 +67,19 @@
     </div>
     <th:block th:include="include :: footer"/>
     <script th:inline="javascript">
+        let datas = [];
         var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
         var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
         var prefix = ctx + "stone/logs";
 
         var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
         var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
-
+        
         var couType = [[${couType}]];
         $(function () {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add/{id}",
-                removeUrl: prefix + "/cancel/{id}",
-                // updateUrl: prefix + "/edit/{id}",
-                // exportUrl: prefix + "/export",
-                sortName: "createdAt",
-                sortOrder: "desc",
-                modalName: "积分",
-                columns: [
-                    {
-                        field: 'valFace',
-                        title: '时间',
-                        formatter: function (value, row, index) {
-                            return '¥' + value;
-                        }
-                    },
-                    {
-                        field: 'eventAmt',
-                        title: '类型'
-                    },
-                    {
-                        field: 'bindType',
-                        title: '任务名称',
-                        formatter: function(value, row, index) {
-                            return $.table.selectDictLabel(dicCouponBindType, value);
-                        }
-                    },
-                    {
-                        field: 'busiType',
-                        title: '获得积分',
-                        formatter: function(value, row, index) {
-                            return $.table.selectDictLabel(dicCouponBusiType, value);
-                        }
-                    },
-                    {
-                        field: 'title',
-                        title: '变更原因'
-                    }
-                ]
-            };
-            $.table.init(options);
+            getAllData();
+            
         });
-        getAllData();
         function getAllData() {
             let uid = getUrlParms('id');
             let data = {
@@ -133,6 +93,45 @@
                     console.log(e)
                     if (e.code == 0) {
                         const { dto } = e.data;
+                        datas= e.data.scoreLogs;
+                        var options = {
+                            data: datas,
+                            pagination: false,
+                            showSearch: false,
+                            showRefresh: false,
+                            showToggle: false,
+                            showColumns: false,
+                            sidePagination: "client",
+                            columns: [
+                                {
+                                    field: 'createdAt',
+                                    title: '时间',
+                                    formatter: function (value, row, index) {
+                                        return $.common.dateFormat(startTime, 'yyyy-MM-dd HH:mm:ss');
+                                    }
+                                },
+                                // {
+                                //     field: 'eventAmt',
+                                //     title: '类型'
+                                // },
+                                // {
+                                //     field: 'content',
+                                //     title: '任务名称',
+                                //     formatter: function(value, row, index) {
+                                //         return $.table.selectDictLabel(dicCouponBindType, value);
+                                //     }
+                                // },
+                                {
+                                    field: 'score',
+                                    title: '获得积分',
+                                },
+                                {
+                                    field: 'reason',
+                                    title: '变更原因'
+                                }
+                            ]
+                        };
+                        $.table.init(options);
                         $('#name').text(dto.nickName);
                         let statusName = '';
                         $('#scoreAll').text(dto.scoreAll);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralList.html

@@ -131,6 +131,7 @@
                     data,
                     success:function(e) {
                         console.log(e)
+                        $("button[name=refresh]").click();
                     }
                 })
             });

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html

@@ -154,7 +154,7 @@
         </div>
     </div>
     <div class="scope_application" id="scope_application">
-        <span class="labelName"><i class="required">*</i>商品名称：</span>
+        <span class="labelName"><i class="required">*</i>券名称：</span>
         <div class="search_ipt" style="position: relative;display: inline;">
             <input type="text" id="searchIpt" autocomplete="off" class="layui-input" placeholder="全部">
             <ul id="dataList" style="position: absolute;"></ul>
@@ -505,14 +505,17 @@
             targetId: showId, // 目标物品id
             targetTitle: $('#searchIpt').val() // 目标物品标题
         }
+        let type = 'post';
         if (!itemId) {
             delete data.itemId
+        } else {
+            type = 'put';
         }
         if (shelves == 1) {
             delete data.startTime
             delete data.endTime
         }
-        promiseMethods(ctx+'stone/item','put',data).then(res=>{
+        promiseMethods(ctx+'stone/item',type,data).then(res=>{
             layer.msg('' + res);
             if (res.code != undefined && res.code != web_status.SUCCESS) {
                 $.modal.alertWarning(res.msg);