1

app/data/controller/api/Goods.php

@@ -138,6 +138,9 @@ class Goods extends Auth
         $id = input('goods_id');
          $query = ShopGoods::mQuery()->where('id',$id);
          $result = $query->where(['deleted' => 0])->whereIn('status','0,1,2')->order('sort desc,id desc')->page(true, false, false, 10);
+         if(!$result){
+             $this->error('该商品已被删除');
+         }
          if (count($result['list']) > 0) GoodsService::bindData($result['list']);
          $result['list'][0]['admin_name']=SystemUser::mk()->where('id',$result['list'][0]['admin_id'])->value('nickname');
          $result['list'][0]['is_collection']=0;

app/data/controller/shop/Goods.php

@@ -70,6 +70,8 @@ class Goods extends Controller
     protected function _index_page_filter(&$data)
     {
         foreach ($data as &$v){
+            $arr = explode("|", $v['cover']);
+            $v['cover'] = $arr[0];
             $users = SystemUser::mk()->whereIn('id', $v['admin_id'])->column('contact_phone,nickname', 'id');
             $v['user'] = $users[$v['admin_id']];
         }
@@ -127,6 +129,16 @@ class Goods extends Controller
         ShopGoods::mForm('form', 'code');
     }
 
+    protected function _index_edit_filter(&$data)
+    {
+        foreach ($data as &$v){
+            $arr = explode("|", $v['cover']);
+            $v['cover'] = $arr[0];
+            $users = SystemUser::mk()->whereIn('id', $v['admin_id'])->column('contact_phone,nickname', 'id');
+            $v['user'] = $users[$v['admin_id']];
+        }
+    }
+
     /**
      * 复制编辑商品
      * @auth true
@@ -308,9 +320,22 @@ class Goods extends Controller
         // 加载对应数据
         $query->where(['deleted' => 0])->where($admin_id);
         // 列表排序并显示
-        $query->where('examine',0)->like('code|name#name')->like('marks,cateids', ',');
-        $query->equal('status,vip_entry,truck_type,rebate_type')->order('sort desc,id desc')->page();
+        $query->where('examine',0)->whereOr('examine',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();
+
     }
+
+    protected function _examine_page_filter(&$data)
+    {
+        foreach ($data as &$v){
+            $arr = explode("|", $v['cover']);
+            $v['cover'] = $arr[0];
+            $users = SystemUser::mk()->whereIn('id', $v['admin_id'])->column('contact_phone,nickname', 'id');
+            $v['user'] = $users[$v['admin_id']];
+        }
+    }
+
     /**
      * 商品审核
      * @auth true

app/data/view/shop/goods/examine.html

@@ -48,9 +48,9 @@
 <!--                </th>-->
                 <th class='text-left nowrap'>商品信息</th>
                 <th class='text-left nowrap'>商品分类</th>
-<!--                <th class='text-left nowrap'>商家名称</th>-->
-<!--                <th class='text-left nowrap'>商家电话</th>-->
-<!--                <th class='text-left nowrap'>商品状态</th>-->
+                <th class='text-left nowrap'>商家名称</th>
+                <th class='text-left nowrap'>商家电话</th>
+                <th class='text-left nowrap'>商品状态</th>
                 <th>操作</th>
             </tr>
             </thead>
@@ -85,6 +85,26 @@
                         {/notempty}
                     </div>
                 </td>
+                <td>
+                    {$vo.user.nickname}
+                </td>
+                <td>
+                    {$vo.user.contact_phone}
+                </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>
+                </td>
 <!--                <td class='nowrap'>-->
 <!--                    库存 <b>{$vo.stock_total}</b> 件;( 已销售 <b>{$vo.stock_sales}</b> 件 )-->
 <!--                    <div class="notselect margin-top-5">-->

app/data/view/shop/goods/form.html

@@ -315,7 +315,10 @@
         <div class="layui-form-item text-center">
             <button class="layui-btn layui-btn-danger" ng-click="pageBack()" type="button">取消编辑</button>
             <button class="layui-btn" type="submit">保存商品</button>
-<!--            <button class="layui-btn" type="submit">通 过</button>-->
+            {if $type == 'examine'}
+            <button class="layui-btn" type="submit">通 过</button>
+            {/if}
+<!--            -->
         </div>
     </div>
 </form>