diff --git a/app/admin/controller/StoreProduct.php b/app/admin/controller/StoreProduct.php index 4ea5431..a554687 100644 --- a/app/admin/controller/StoreProduct.php +++ b/app/admin/controller/StoreProduct.php @@ -40,6 +40,11 @@ class StoreProduct extends BaseController if (isset($param['keywords']) && !empty($param['keywords'])){ $where[]=['store_name','like','%'.$param['keywords'].'%']; } + + if (isset($param['store_cate']) && !empty($param['store_cate'])){ + $where[]=['cate_id','=',$param['store_cate']]; + } + $list = $this->model->getStoreProductList($where,$param); foreach ($list as $k=>$v){ $www['brand_id'] = $v['brand_id']; @@ -419,8 +424,8 @@ class StoreProduct extends BaseController add_log('buy', $id, $param); $app = $this->payment(); -// $total_fee = env('APP_DEBUG') ? 1 : $post_price; - $total_fee = $post_price; + $total_fee = env('APP_DEBUG') ? 1 : $post_price; +// $total_fee = $post_price; // 用 easywechat 封装的方法请求微信的统一下单接口 $result = $app->order->unify([ 'trade_type' => 'NATIVE', // 原生支付即扫码支付,商户根据微信支付协议格式生成的二维码,用户通过微信“扫一扫”扫描二维码后即进入付款确认界面,输入密码即完成支付。 diff --git a/app/admin/view/store_product/datalist.html b/app/admin/view/store_product/datalist.html index a8ccb3d..e01bd58 100644 --- a/app/admin/view/store_product/datalist.html +++ b/app/admin/view/store_product/datalist.html @@ -1,9 +1,45 @@ {extend name="common/base"/} {block name="body"} - +