diff --git a/app/data/controller/api/Data.php b/app/data/controller/api/Data.php index d9f22cc8e..4c4eeb2c1 100644 --- a/app/data/controller/api/Data.php +++ b/app/data/controller/api/Data.php @@ -34,7 +34,7 @@ class Data extends Controller $query = $this->_query('DataBaseMessage')->where(['status' => 1, 'deleted' => 0]); $result = $query->equal('id')->order('sort desc,id desc')->page(true, false, false, 20); if (($id = input('id')) > 0) { - $this->app->db->name('DataBaseNotify')->where(['id' => $id])->inc('num_read')->update(); + $this->app->db->name('DataBaseMessage')->where(['id' => $id])->inc('num_read')->update(); } $this->success('获取系统通知数据', $result); } diff --git a/app/data/controller/base/Upgrade.php b/app/data/controller/base/Upgrade.php index d458478ba..2f5c3ed89 100644 --- a/app/data/controller/base/Upgrade.php +++ b/app/data/controller/base/Upgrade.php @@ -78,10 +78,8 @@ class Upgrade extends Controller { if ($this->request->isGet()) { $this->prizes = RebateService::PRIZES; + $vo['number'] = $vo['number'] ?? $this->app->db->name($this->table)->max('number') + 1; $vo['rebate_rule'] = str2arr($vo['rebate_rule'] ?? ''); - if (empty($vo['number'])) { - $vo['number'] = $this->app->db->name($this->table)->max('number') + 1; - } } else { $vo['utime'] = time(); $vo['rebate_rule'] = arr2str($vo['rebate_rule'] ?? []); @@ -99,7 +97,7 @@ class Upgrade extends Controller // 检查升级条件配置 $count = 0; foreach ($vo as $k => $v) if (is_numeric(stripos($k, '_status'))) $count += $v; - if (empty($count)) $this->error('升级条件不能为空!'); + if (empty($count) && $vo['number'] > 0) $this->error('升级条件不能为空!'); } } @@ -112,9 +110,9 @@ class Upgrade extends Controller { if ($state) { $order = 'number asc,utime desc'; - if (input('old_number', 100) < input('number', '0')) $order = 'number asc,utime asc'; + if (input('old_number', 100) <= input('number', 0)) $order = 'number asc,utime asc'; foreach ($this->app->db->name($this->table)->order($order)->cursor() as $k => $vo) { - $this->app->db->name($this->table)->where(['id' => $vo['id']])->update(['number' => $k + 1]); + $this->app->db->name($this->table)->where(['id' => $vo['id']])->update(['number' => $k]); } } } diff --git a/app/data/view/base/upgrade/form.html b/app/data/view/base/upgrade/form.html index 6a5b22a94..a68829b74 100644 --- a/app/data/view/base/upgrade/form.html +++ b/app/data/view/base/upgrade/form.html @@ -7,7 +7,7 @@
等级序号Number {/notempty} - {notempty name='vo.number'}{/notempty} + {if isset($vo.id)}{/if} + {if isset($vo.number)}{/if}
diff --git a/app/data/view/shop/goods/form.html b/app/data/view/shop/goods/form.html index 516b07a9f..d2aabf40c 100644 --- a/app/data/view/shop/goods/form.html +++ b/app/data/view/shop/goods/form.html @@ -345,7 +345,13 @@ $rootScope.specs = angular.fromJson(angular.element('#GoodsSpecs').val() || '[{"name":"默认分组","list":[{"name":"默认规格","check":true}]}]'); /*! 批量设置数值 */ $rootScope.batchSet = function (name, fixed) { - layer.prompt({title: '请输入数值', formType: 0}, function (value, index) { + layer.prompt({ + title: '请输入数量【 取值范围:1 - 999999 】', + formType: 0, value: (1).toFixed(fixed), success: function ($fn) { + var min = (1).toFixed(fixed), max = (999999).toFixed(fixed); + $fn.find('.layui-layer-input').attr({'data-value-min': min, 'data-value-max': max, 'data-blur-number': fixed}); + } + }, function (value, index) { layer.close(index), $rootScope.$apply(function () { if (fixed !== null) value = (parseFloat(value) || 0).toFixed(fixed); $rootScope.items.forEach(function (rows) { diff --git a/app/data/view/shop/goods/stock.html b/app/data/view/shop/goods/stock.html index 0e7a2771c..6c1b1f2f5 100644 --- a/app/data/view/shop/goods/stock.html +++ b/app/data/view/shop/goods/stock.html @@ -89,7 +89,11 @@