From e1a371ba4a30a6f3c1d0ddfd614f032bd0827e45 Mon Sep 17 00:00:00 2001 From: "ZLW-PC\\Administrator" <374861669@qq.com> Date: Thu, 30 Nov 2017 17:33:43 +0800 Subject: [PATCH] goodstype --- app/Http/Controllers/Api/GoodsController.php | 2 +- .../Controllers/Api/GoodsTypeController.php | 40 +++++++++++++++++ app/Http/Controllers/Api/UserController.php | 4 +- .../Controllers/Weixin/GoodsController.php | 31 +++++++------ app/Http/Model/GoodsType.php | 18 +++++--- app/Http/Model/User.php | 1 + public/js/weixin/mobile.js | 3 ++ .../views/weixin/common/footer.blade.php | 4 +- .../views/weixin/common/headerNav.blade.php | 2 +- .../weixin/goods/categoryGoodsList.blade.php | 45 ++++++------------- resources/views/weixin/index/index.blade.php | 2 +- resources/views/weixin/user/index.blade.php | 8 ++-- routes/web.php | 2 +- 13 files changed, 101 insertions(+), 61 deletions(-) create mode 100644 app/Http/Controllers/Api/GoodsTypeController.php diff --git a/app/Http/Controllers/Api/GoodsController.php b/app/Http/Controllers/Api/GoodsController.php index 601deda..b3f53a3 100644 --- a/app/Http/Controllers/Api/GoodsController.php +++ b/app/Http/Controllers/Api/GoodsController.php @@ -34,7 +34,7 @@ class GoodsController extends CommonController //参数 $data['limit'] = $request->input('limit', 10); $data['offset'] = $request->input('offset', 0); - if($request->input('typeid', '') != ''){$data['typeid'] = $request->input('typeid');} + if($request->input('typeid', '') != '' && $request->input('typeid', '') != 0){$data['typeid'] = $request->input('typeid');} if($request->input('tuijian', '') != ''){$data['tuijian'] = $request->input('tuijian');} if($request->input('status', '') != ''){$data['status'] = $request->input('status');} if($request->input('keyword', '') != ''){$data['keyword'] = $request->input('keyword');} diff --git a/app/Http/Controllers/Api/GoodsTypeController.php b/app/Http/Controllers/Api/GoodsTypeController.php new file mode 100644 index 0000000..2a4e632 --- /dev/null +++ b/app/Http/Controllers/Api/GoodsTypeController.php @@ -0,0 +1,40 @@ +input('id',''); + if($data['id']==''){return ReturnData::create(ReturnData::PARAMS_ERROR);} + + $res = GoodsType::getOne($data); + + return ReturnData::create(ReturnData::SUCCESS,$res); + } + + public function goodsTypeList(Request $request) + { + //参数 + $data['limit'] = $request->input('limit', 10); + $data['offset'] = $request->input('offset', 0); + + $data['pid'] = $request->input('pid', 0); + + $res = GoodsType::getList($data); + + return ReturnData::create(ReturnData::SUCCESS,$res); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 6842058..dea75d2 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -205,13 +205,14 @@ class UserController extends CommonController //微信授权注册 public function wxOauthRegister(Request $request) { - $data['openid'] = $data['user_name'] = $request->input('openid',''); + $data['openid'] = $request->input('openid',''); $data['sex'] = $request->input('sex',''); $data['head_img'] = $request->input('head_img',''); $data['nickname'] = $request->input('nickname',''); $data['parent_id'] = $request->input('parent_id',''); $parent_mobile = $request->input('parent_mobile',''); $data['mobile'] = $request->input('mobile',''); + $data['user_name'] = date('YmdHis').dechex(rand(1000,9999)); if ($data['openid']=='') { @@ -453,5 +454,4 @@ class UserController extends CommonController return ReturnCode::create(ReturnCode::SUCCESS); } - } \ No newline at end of file diff --git a/app/Http/Controllers/Weixin/GoodsController.php b/app/Http/Controllers/Weixin/GoodsController.php index 25b26b2..4ad8f5a 100644 --- a/app/Http/Controllers/Weixin/GoodsController.php +++ b/app/Http/Controllers/Weixin/GoodsController.php @@ -56,8 +56,8 @@ class GoodsController extends CommonController 'offset' => 0 ); $url = env('APP_API_URL')."/goods_list"; - $goods_list = curl_request($url,$postdata,'GET'); - $data['goods_list'] = $goods_list['data']['list']; + $res = curl_request($url,$postdata,'GET'); + $data['goods_list'] = $res['data']['list']; return view('weixin.goods.goodsList', $data); } @@ -65,23 +65,28 @@ class GoodsController extends CommonController //商品列表 public function categoryGoodsList(Request $request) { + $data['typeid'] = 0; if($request->input('typeid', '') != ''){$data['typeid'] = $request->input('typeid');} - if($request->input('tuijian', '') != ''){$data['tuijian'] = $request->input('tuijian');} - if($request->input('keyword', '') != ''){$data['keyword'] = $request->input('keyword');} - if($request->input('status', '') != ''){$data['status'] = $request->input('status');} - if($request->input('is_promote', '') != ''){$data['is_promote'] = $request->input('is_promote');} - if($request->input('orderby', '') != ''){$data['orderby'] = $request->input('orderby');} - if($request->input('max_price', '') != ''){$data['max_price'] = $request->input('max_price');}else{$data['max_price'] = 99999;} - if($request->input('min_price', '') != ''){$data['min_price'] = $request->input('min_price');}else{$data['min_price'] = 0;} - //商品列表 + //商品分类列表 $postdata = array( - 'limit' => 10, + 'pid' => 0, + 'limit' => 100, + 'offset' => 0 + ); + $url = env('APP_API_URL')."/goodstype_list"; + $res = curl_request($url,$postdata,'GET'); + $data['goodstype_list'] = $res['data']['list']; + + //商品列表 + $postdata = array( + 'typeid' => $data['typeid'], + 'limit' => 100, 'offset' => 0 ); $url = env('APP_API_URL')."/goods_list"; - $goods_list = curl_request($url,$postdata,'GET'); - $data['goods_list'] = $goods_list['data']['list']; + $res = curl_request($url,$postdata,'GET'); + $data['goods_list'] = $res['data']['list']; return view('weixin.goods.categoryGoodsList', $data); } diff --git a/app/Http/Model/GoodsType.php b/app/Http/Model/GoodsType.php index 588b4a5..e58daad 100644 --- a/app/Http/Model/GoodsType.php +++ b/app/Http/Model/GoodsType.php @@ -14,7 +14,15 @@ class GoodsType extends BaseModel */ protected $table = 'goods_type'; public $timestamps = false; - + + /** + * 不能被批量赋值的属性 + * + * @var array + */ + protected $guarded = array(); + protected $hidden = array('content'); + /** * 获取分类对应的产品 */ @@ -33,7 +41,7 @@ class GoodsType extends BaseModel $limit = isset($limit) ? $limit : 10; $offset = isset($offset) ? $offset : 0; - $model = new GoodsType; + $model = new self; if(isset($pid)){$where['pid'] = $pid;} @@ -47,7 +55,7 @@ class GoodsType extends BaseModel if($res['count']>0) { - $res['list'] = $model->skip($offset)->take($limit)->orderBy('listorder','desc')->get()->toArray(); + $res['list'] = $model->skip($offset)->take($limit)->orderBy('listorder','desc')->get(); } else { @@ -57,9 +65,9 @@ class GoodsType extends BaseModel return $res; } - public static function getOne($id) + public static function getOne($where) { - return self::where('id', $id)->first()->toArray(); + return self::where($where)->first(); } public static function add(array $data) diff --git a/app/Http/Model/User.php b/app/Http/Model/User.php index c68b716..f5a47c4 100644 --- a/app/Http/Model/User.php +++ b/app/Http/Model/User.php @@ -17,6 +17,7 @@ class User extends BaseModel */ protected $guarded = array(); protected $hidden = array('password','pay_password'); + /** * 获取关联到用户的角色 */ diff --git a/public/js/weixin/mobile.js b/public/js/weixin/mobile.js index 50d8828..cf62aba 100644 --- a/public/js/weixin/mobile.js +++ b/public/js/weixin/mobile.js @@ -8,6 +8,9 @@ $(function(){ $('.classlist ul li').click(function(){ $(this).addClass('red').siblings().removeClass('red'); }); + + //设置图片长等于宽 + $(".imgzsy").height(function(){return $(this).width();}); }); //删除确认框 diff --git a/resources/views/weixin/common/footer.blade.php b/resources/views/weixin/common/footer.blade.php index 5d6ff61..b45b0e1 100644 --- a/resources/views/weixin/common/footer.blade.php +++ b/resources/views/weixin/common/footer.blade.php @@ -4,8 +4,8 @@ diff --git a/resources/views/weixin/common/headerNav.blade.php b/resources/views/weixin/common/headerNav.blade.php index 8adb4c4..0392a84 100644 --- a/resources/views/weixin/common/headerNav.blade.php +++ b/resources/views/weixin/common/headerNav.blade.php @@ -2,7 +2,7 @@
diff --git a/resources/views/weixin/goods/categoryGoodsList.blade.php b/resources/views/weixin/goods/categoryGoodsList.blade.php index d77e17c..4f4cbc7 100644 --- a/resources/views/weixin/goods/categoryGoodsList.blade.php +++ b/resources/views/weixin/goods/categoryGoodsList.blade.php @@ -15,43 +15,26 @@
+ + +
暂无记录
+
diff --git a/resources/views/weixin/index/index.blade.php b/resources/views/weixin/index/index.blade.php index 5ef0d95..1b97ae7 100644 --- a/resources/views/weixin/index/index.blade.php +++ b/resources/views/weixin/index/index.blade.php @@ -84,7 +84,7 @@ var swiper = new Swiper('.swiper-nav', {