diff --git a/app/admin/logic/shop/LocalStoreGoodsLogic.php b/app/admin/logic/shop/LocalStoreGoodsLogic.php index a1e2b652..5b0b634b 100755 --- a/app/admin/logic/shop/LocalStoreGoodsLogic.php +++ b/app/admin/logic/shop/LocalStoreGoodsLogic.php @@ -4,6 +4,7 @@ namespace app\admin\logic\shop; use app\common\basics\Logic; use app\common\enum\LocalStoreGoodsEnum; +use app\common\model\goods\GoodsSubsidy; use app\common\model\localstore\LocalStoreGoods; use app\common\model\localstore\LocalStoreGoodsItem; use think\facade\Config; @@ -80,6 +81,12 @@ class LocalStoreGoodsLogic extends Logic { $data = LocalStoreGoods::with('pic')->where(['id' => $id])->find()->toArray(); + $data['subsidy'] = []; + if ($data['subsidy_id'] > 0) { + $model = new GoodsSubsidy(); + $data['subsidy'] = $model->getSubsidyById($data['subsidy_id']); + } + // 查找多规格 if ($data['is_multiple_spec'] == 1) { $data['item'] = LocalStoreGoodsItem::where([ diff --git a/app/admin/view/goods/goods/add.html b/app/admin/view/goods/goods/add.html index 51b1ec68..0e6615c3 100755 --- a/app/admin/view/goods/goods/add.html +++ b/app/admin/view/goods/goods/add.html @@ -213,14 +213,12 @@ 商家利润比例 - 商品让利比例 商品全返比例 ${subsidy.profit} - ${subsidy.discount} ${subsidy.subsidy} diff --git a/app/admin/view/shop/local_store_goods/detail.html b/app/admin/view/shop/local_store_goods/detail.html index 711d2fe0..965c2a35 100755 --- a/app/admin/view/shop/local_store_goods/detail.html +++ b/app/admin/view/shop/local_store_goods/detail.html @@ -57,6 +57,26 @@ +
+ +
+ + + + + + + + + + + + + +
商家折扣比例商品最高返补比例
{$data.subsidy.profit}{$data.subsidy.subsidy}
+
+
+