From d1e10cb5db90a70e549336ecb6a520cbbeda03b0 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Mon, 30 Nov 2020 22:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Goods.php            | 2 +-
 application/index/view/default/goods/index.html | 2 +-
 application/service/WarehouseGoodsService.php   | 1 -
 application/tags.php                            | 4 ++++
 changelog.txt                                   | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php
index 2a6fd47af..65a590895 100755
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@@ -139,7 +139,7 @@ class Goods extends Common
         } else {
             if($goods['inventory'] <= 0)
             {
-                $result['nav_submit_text'] = '卖光了';
+                $result['nav_submit_text'] = '没货了';
                 $result['nav_submit_is_disabled'] = true;
             }
         }
diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html
index d92671473..8c8032c9b 100755
--- a/application/index/view/default/goods/index.html
+++ b/application/index/view/default/goods/index.html
@@ -466,7 +466,7 @@
                             </form>
                         {{/if}}
                     {{else /}}
-                        <p class="goods-not-buy-tips">商品卖光了</p>
+                        <p class="goods-not-buy-tips">没货了</p>
                     {{/if}}
                 {{/if}}
                 {{if $goods.is_shelves neq 1}}
diff --git a/application/service/WarehouseGoodsService.php b/application/service/WarehouseGoodsService.php
index e45d05dd2..6ca3d06c8 100644
--- a/application/service/WarehouseGoodsService.php
+++ b/application/service/WarehouseGoodsService.php
@@ -400,7 +400,6 @@ class WarehouseGoodsService
             return DataReturn($ret, -1);
         }
 
-        // 存在则校验状态并且启用
         // 不存在添加
         $where = [
             'goods_id'      => intval($params['goods_id']),
diff --git a/application/tags.php b/application/tags.php
index 9034c1193..62790e510 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -193,5 +193,9 @@ return array (
   array (
     0 => 'app\\plugins\\distribution\\Hook',
   ),
+  'plugins_view_admin_goods_list_operate' => 
+  array (
+    0 => 'app\\plugins\\goodsalledit\\Hook',
+  ),
 );
 ?>
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 3148b70bf..e3ebc18ae 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,6 +15,7 @@ web端
 	5. 分页组件新增自定义页码跳转
 	6. 后端动态表格数据列表组件优化高度固定
 	7. 首页轮播左侧商品分类和右侧聚合内容新增开关控制
+	8. 商品列表支持库存快捷配置
 
 小程序
 	1. 支付订单0金额错误修复