diff --git a/app/data/controller/ShopGoods.php b/app/data/controller/ShopGoods.php index a08dce82a..dd5929005 100644 --- a/app/data/controller/ShopGoods.php +++ b/app/data/controller/ShopGoods.php @@ -54,7 +54,7 @@ class ShopGoods extends Controller else $this->error("无法加载 {$this->type} 数据列表!"); // 列表排序并显示 $query->like('code,name')->like('marks,cateids', ','); - $query->equal('status,vip_entry,truck_type')->order('sort desc,id desc')->page(); + $query->equal('status,vip_entry,truck_type,rebate_type')->order('sort desc,id desc')->page(); } /** diff --git a/app/data/view/shop_goods/index.html b/app/data/view/shop_goods/index.html index 82fc1d62b..41dcdc29e 100644 --- a/app/data/view/shop_goods/index.html +++ b/app/data/view/shop_goods/index.html @@ -84,7 +84,8 @@
{eq name='vo.status' value='0'}已下架{else}销售中{/eq} {eq name='vo.vip_entry' value='0'}非入会礼包{else}是入会礼包{/eq} - {eq name='vo.truck_type' value='0'}无需快递配送{else}需要快递配送{/eq} + {eq name='vo.truck_type' value='0'}无需发货{else}需要发货{/eq} + {eq name='vo.rebate_type' value='0'}非返利商品{else}是返利商品{/eq}
diff --git a/app/data/view/shop_goods/index_search.html b/app/data/view/shop_goods/index_search.html index fe727ae15..6ab6ab150 100644 --- a/app/data/view/shop_goods/index_search.html +++ b/app/data/view/shop_goods/index_search.html @@ -64,6 +64,21 @@ +
+ + +
+