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

---
 application/admin/controller/Warehousegoods.php     | 3 ++-
 application/admin/form/Warehousegoods.php           | 4 ++--
 application/admin/view/default/warehouse/index.html | 8 ++++++++
 changelog.txt                                       | 3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/Warehousegoods.php b/application/admin/controller/Warehousegoods.php
index 12356fd13..b4de4b846 100644
--- a/application/admin/controller/Warehousegoods.php
+++ b/application/admin/controller/Warehousegoods.php
@@ -80,7 +80,8 @@ class WarehouseGoods extends Common
         $data_params = [
             'field'     => 'id,name',
             'where'     => [
-                'is_enable' => 1,
+                'is_enable'         => 1,
+                'is_delete_time'    => 0,
             ],
         ];
         $warehouse = WarehouseService::WarehouseList($data_params);
diff --git a/application/admin/form/Warehousegoods.php b/application/admin/form/Warehousegoods.php
index ce79d15ad..730a7b720 100644
--- a/application/admin/form/Warehousegoods.php
+++ b/application/admin/form/Warehousegoods.php
@@ -150,10 +150,10 @@ class Warehousegoods
     public function WarehouseList()
     {
         $result = [];
-        $ids = Db::name('WarehouseGoods')->column('warehouse_id');
+        $ids = array_unique(Db::name('WarehouseGoods')->column('warehouse_id'));
         if(!empty($ids))
         {
-            $result = Db::name('Warehouse')->field('id,name')->where(['id'=>$ids])->select();
+            $result = Db::name('Warehouse')->field('id,name')->where(['id'=>$ids, 'is_delete_time'=>0])->select();
         }
         return $result;
     }
diff --git a/application/admin/view/default/warehouse/index.html b/application/admin/view/default/warehouse/index.html
index 4ee9a249c..b2aec03ba 100644
--- a/application/admin/view/default/warehouse/index.html
+++ b/application/admin/view/default/warehouse/index.html
@@ -6,4 +6,12 @@
     <a href="{{:MyUrl('admin/warehouse/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
     <!-- 父级内容 -->
     {__block__}
+{{/block}}
+
+{{block name="form_extend"}}
+    <div class="am-alert am-alert-warning" data-am-alert>
+        <button type="button" class="am-close">&times;</button>
+        <p>1. 权重（数值越大权重越高、扣除库存按照权重依次扣除）</p>
+        <p>2. 删除（数据仅软删除、删除后仓库将不可用、仅数据库中保留数据）</p>
+    </div>
 {{/block}}
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 34c8d0f67..973929682 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -35,6 +35,9 @@ web端
 	15. 商品详情二维码改为静态、更容易适配各种服务器环境
 	16. 后台首页新增收益走势
 
+小程序
+	1. 微信小程序支持分享到朋友圈
+
 插件
 	1. 分销插件新增返积分模块、海报高清
 	2. 微信小程序直播分享海报高清