Showing
1 changed file
with
7 additions
and
4 deletions
| @@ -11,7 +11,7 @@ class Package extends Common | @@ -11,7 +11,7 @@ class Package extends Common | ||
| 11 | if(Request::isAjax()){ | 11 | if(Request::isAjax()){ |
| 12 | $data = Request::except('file'); | 12 | $data = Request::except('file'); |
| 13 | 13 | ||
| 14 | - $where = ' 1=1 and '; | 14 | + $where = ''; |
| 15 | $channel = $data['channel'] ? $data['channel'] : 1; | 15 | $channel = $data['channel'] ? $data['channel'] : 1; |
| 16 | 16 | ||
| 17 | $where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)"; | 17 | $where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)"; |
| @@ -20,13 +20,16 @@ class Package extends Common | @@ -20,13 +20,16 @@ class Package extends Common | ||
| 20 | $offset = ($data["page"] - 1) * $data["limit"]; | 20 | $offset = ($data["page"] - 1) * $data["limit"]; |
| 21 | $limit = " LIMIT $offset,".$data['limit']; | 21 | $limit = " LIMIT $offset,".$data['limit']; |
| 22 | 22 | ||
| 23 | - //套餐信息 | ||
| 24 | - $rs = Db::query("SELECT | 23 | + $sql ="SELECT |
| 25 | s.* | 24 | s.* |
| 26 | FROM | 25 | FROM |
| 27 | `xt-member-two-LINE`.xt_dc_dz_seller_food_set AS s | 26 | `xt-member-two-LINE`.xt_dc_dz_seller_food_set AS s |
| 28 | LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.sid | 27 | LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.sid |
| 29 | - WHERE ".$where." order by s.sid".$limit); | 28 | + WHERE ".$where." group by s.id ".$limit; |
| 29 | + echo $sql;die; | ||
| 30 | + //套餐信息 | ||
| 31 | + $rs = Db::query(); | ||
| 32 | + | ||
| 30 | //格式化数据 | 33 | //格式化数据 |
| 31 | foreach ($rs as $key => $value) { | 34 | foreach ($rs as $key => $value) { |
| 32 | $rs[$key]['cdate'] = date("Y年m月d日",$value['cdate']); | 35 | $rs[$key]['cdate'] = date("Y年m月d日",$value['cdate']); |
-
Please register or login to post a comment