修改前端bug

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

@@ -126,9 +126,15 @@
                         // align: 'center',
                         formatter: function (value, row, index) {
                             let dataArr = [];
-                            return `<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="$.operate.editTab('${row.itemId}')">编辑</span>
-                            <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', 7, '确定下架此商品吗？')">下架</span>
-                            <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', '-1', '确定删除此商品吗？')">删除</span>`
+                            if (row.status == 7) {
+                                return `<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="$.operate.editTab('${row.itemId}')">编辑</span>
+                                <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', 1, '确定下架此商品吗？')">上架</span>
+                                <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', '-1', '确定删除此商品吗？')">删除</span>`
+                            } else {
+                                return `<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="$.operate.editTab('${row.itemId}')">编辑</span>
+                                <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', 7, '确定下架此商品吗？')">下架</span>
+                                <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', '-1', '确定删除此商品吗？')">删除</span>`
+                            }
                         }
                     }]
             };

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

@@ -512,7 +512,7 @@
             delete data.startTime
             delete data.endTime
         }
-        promiseMethods(ctx+'stone/item','post',data).then(res=>{
+        promiseMethods(ctx+'stone/item','put',data).then(res=>{
             layer.msg('' + res);
             if (res.code != undefined && res.code != web_status.SUCCESS) {
                 $.modal.alertWarning(res.msg);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -286,10 +286,11 @@
                     let arr = ['谢谢惠顾', '积分', '代金券', '满减券', '优先购买', '实物'];
                     let str = '';
                     arr.forEach((item,i)=> {
+                        i++
                         if (i == data[index].prizeType) {
-                            str += `<option value="${i+1}" selected>${item}</option>`
+                            str += `<option value="${i}" selected>${item}</option>`
                         } else {
-                            str += `<option value="${i+1}">${item}</option>`
+                            str += `<option value="${i}">${item}</option>`
                         }
                     })
                     let dom = `<select id='prizeType${index}' class='form-control' name=''>
@@ -361,7 +362,7 @@
                 title: '奖品剩余',
                 formatter: function(value, row, index) {
                     if (itemId) {
-                        return row.prizeNum - row.WinPrizeNum
+                        return (row.prizeNum - row.WinPrizeNum) || '-'
                     } else {
                         return '-'
                     }