diff --git a/app/admin/controller/Goods.php b/app/admin/controller/Goods.php index 4cca38e..65f310f 100755 --- a/app/admin/controller/Goods.php +++ b/app/admin/controller/Goods.php @@ -910,9 +910,16 @@ class Goods extends Base } else { return $this->err('奖品类型选择错误'); } - //2023-11-17无作用 $data['reward_num'] = 0; - // + if (RegZero($data['sort'])) { + return $this->renderError('排序请输入整数'); + } + + $data['card_no'] = NULL; + if (empty($data['imgurl'])) { + return $this->renderError('请上传图片'); + } + $data['addtime'] = time(); if ($type == 1 || $type == 5 || $type == 10 || $type == 6 || $type == 11) { if ($data['shang_id'] == 1 || $data['shang_id'] == 2 || $data['shang_id'] == 3 || $data['shang_id'] == 5) { if ($data['stock'] != 1) { @@ -1008,8 +1015,9 @@ class Goods extends Base ]); } } - return $this->renderSuccess('添加成功'); + } + return $this->renderSuccess('添加成功'); } elseif (in_array($type, [2, 8, 9, 16])) { if (RegMoney($data['real_pro'] * 10000)) { return $this->renderError('真实概率设置错误,最多保留四位小数'); @@ -1132,17 +1140,7 @@ class Goods extends Base } else { return $this->err('请求参数错误'); } - if (RegZero($data['sort'])) { - return $this->renderError('排序请输入整数'); - } - $data['card_no'] = NULL; - // } - - if (empty($data['imgurl'])) { - return $this->renderError('请上传图片'); - } - $data['addtime'] = time(); if (isset($save_sports_data)) { $res = GoodsList::insertAll($save_sports_data); } else { diff --git a/app/admin/view/Goods/goodslist.html b/app/admin/view/Goods/goodslist.html index 54c5fbe..166d6e8 100755 --- a/app/admin/view/Goods/goodslist.html +++ b/app/admin/view/Goods/goodslist.html @@ -324,6 +324,8 @@ content: url, end: function () { // 刷新表格 + console.log('aaaa'); + table.reload('goodsListTable'); } }); @@ -340,6 +342,7 @@ if (data.status == 1) { layer.msg(title + '成功', { icon: 1, time: 1000 }, function () { // 刷新表格 + layer.close(load); table.reload('goodsListTable'); }); } else { diff --git a/app/admin/view/Statistics/profit.html b/app/admin/view/Statistics/profit.html index 3220e5b..8f5743d 100755 --- a/app/admin/view/Statistics/profit.html +++ b/app/admin/view/Statistics/profit.html @@ -146,8 +146,7 @@ 微信-支付金额:{$vo['count_price']}
- 余额-支付金额: {$vo['count_yue']}
- 潮币抵扣-支付金额:{$vo['count_use_integral']}
+ 钻石-支付金额: {$vo['count_yue']}
积分抵扣: {$vo['count_use_score']}
diff --git a/public/storage/poster/share/21542.png b/public/storage/poster/share/21542.png new file mode 100644 index 0000000..f627a50 Binary files /dev/null and b/public/storage/poster/share/21542.png differ