chuweiqiang 1 year ago
parent
commit
92907b38e5

+ 1 - 0
app/admin/controller/BestKnowledge.php

@@ -173,6 +173,7 @@ class BestKnowledge extends Controller
             })
             ->with(['user','classTo'])
 //            ->whereIn('type','1,2')
+            ->where('audit',2)
             ->where('is_del',1)
             ->where($where)
             ->whereLike('title',"%{$title}%")

+ 2 - 1
app/data/controller/shop/Goods.php

@@ -334,7 +334,7 @@ class Goods extends Controller
         // 加载对应数据
         $query->where(['deleted' => 0])->where($admin_id);
         // 列表排序并显示
-        $query->where('examine',0)->whereOr('examine',2)->like('code|name#name')->like('marks,cateids', ',');
+        $query->where('examine','in','0,2')->like('code|name#name')->like('marks,cateids', ',');
         $list = $query->equal('status,vip_entry,truck_type,rebate_type')->order('sort desc,id desc')->select();
         $list->page();
 
@@ -342,6 +342,7 @@ class Goods extends Controller
 
     protected function _examine_page_filter(&$data)
     {
+
         foreach ($data as &$v){
             $arr = explode("|", $v['cover']);
             $v['cover'] = $arr[0];

+ 11 - 11
app/data/view/shop/goods/examine.html

@@ -93,17 +93,17 @@
                 </td>
                 <td class='nowrap'>
                     库存 <b>{$vo.stock_total}</b> 件;
-                    <div class="notselect margin-top-5">
-                        {eq name='vo.status' value='0'}
-                        <span class="layui-badge layui-bg-gray layui-border-red">已下架</span>
-                        {/eq}
-                        {eq name='vo.status' value='1'}
-                        <span class="layui-badge layui-bg-gray layui-border-green">销售中</span>
-                        {/eq}
-                        {eq name='vo.status' value='2'}
-                        <span class="layui-badge layui-bg-gray layui-border-green">已售罄</span>
-                        {/eq}
-                    </div>
+<!--                    <div class="notselect margin-top-5">-->
+<!--                        {eq name='vo.status' value='0'}-->
+<!--                        <span class="layui-badge layui-bg-gray layui-border-red">已下架</span>-->
+<!--                        {/eq}-->
+<!--                        {eq name='vo.status' value='1'}-->
+<!--                        <span class="layui-badge layui-bg-gray layui-border-green">销售中</span>-->
+<!--                        {/eq}-->
+<!--                        {eq name='vo.status' value='2'}-->
+<!--                        <span class="layui-badge layui-bg-gray layui-border-green">已售罄</span>-->
+<!--                        {/eq}-->
+<!--                    </div>-->
                 </td>
 <!--                <td class='nowrap'>-->
 <!--                    库存 <b>{$vo.stock_total}</b> 件;( 已销售 <b>{$vo.stock_sales}</b> 件 )-->