Merge branch 'master' of http://114.215.101.231:8099/guosheng/store into Branch_liuzhen

guosheng
application/index/controller/Enter.php
application/index/controller/Goods.php
application/index/controller/Vip.php
application/index/controller/WechatPay.php
application/index/model/Goodstype.php
application/index/model/Store.php
application/index/model/User.php
application/index/view/goods/goods_list.html
application/index/view/index/index.html
application/index/view/public/js.html
application/index/view/public/nav.html
--- a/application/index/controller/Enter.php
查看文件 @dc7c659
+++ b/application/index/controller/Enter.php
查看文件 @dc7c659
@@ -12,6 +12,8 @@ namespace app\index\controller;
 use app\common\controller\Frontend;
 use app\index\model\Firmstores;
 use app\index\model\Minestore;
+use app\index\model\Store;
+use app\index\model\Viporder;
 use think\Db;
 class Enter extends Frontend
@@ -35,13 +37,13 @@ class Enter extends Frontend
      */
     public function index(){
         $user_id = $this->auth->id;
-        $minestore = Db::name('minestore')->where('user_id',$this->auth->id)->find();
-        if($minestore) {
-            $url = url('vip/index');
-        } else {
-            $url = url('enter/index');
+        $viporderModel = new Viporder();
+        $vip_order = $viporderModel->where(['user_id'=>$user_id])->order("createtime desc")->find();
+        if(!empty($vip_order)){
+            if(in_array($vip_order['audit'],[1,2])){
+                $this->redirect('index/vip/index');
+            }
         }
-        $this->redirect($url);
         $userModel = new \app\index\model\User();
         $user = $userModel->findData(['id'=>$user_id]);
         if(empty($user)){
@@ -63,6 +65,13 @@ class Enter extends Frontend
      */
     public function apply_personage(){
         $user_id = $this->auth->id;
+        $viporderModel = new Viporder();
+        $vip_order = $viporderModel->where(['user_id'=>$user_id])->order("createtime desc")->find();
+        if(!empty($vip_order)){
+            if(in_array($vip_order['audit'],[1,2])){
+                $this->redirect('index/vip/index');
+            }
+        }
         $userModel = new \app\index\model\User();
         $user = $userModel->findData(['id'=>$user_id]);
         if(empty($user)){
@@ -84,6 +93,13 @@ class Enter extends Frontend
      */
     public function apply_company(){
         $user_id = $this->auth->id;
+        $viporderModel = new Viporder();
+        $vip_order = $viporderModel->where(['user_id'=>$user_id])->order("createtime desc")->find();
+        if(!empty($vip_order)){
+            if(in_array($vip_order['audit'],[1,2])){
+                $this->redirect('index/vip/index');
+            }
+        }
         $userModel = new \app\index\model\User();
         $user = $userModel->findData(['id'=>$user_id]);
         if(empty($user)){
--- a/application/index/controller/Goods.php
查看文件 @dc7c659
+++ b/application/index/controller/Goods.php
查看文件 @dc7c659
@@ -119,8 +119,15 @@ class Goods extends Frontend
      * @return mixed
      */
     public function goods_list(){
-        //获取分类
+        $category_id = $this->request->param('category_id',0,'intval');
+        $category = [];
+        $where = [];
         $goodstypeModel = new Goodstype();
+        if(!empty($category_id)){
+            $category = $goodstypeModel->findData(['id'=>$category_id]);
+            $where['goodstype_id'] = ['eq',$category_id];
+        }
+        //获取分类
         $goodstype_one = $goodstypeModel->selectData(['pid'=>0]);//一级
         foreach($goodstype_one as $key => $g_o){
             $goodstype_two = $goodstypeModel->selectData(['pid'=>$g_o['id']]);//二级
@@ -131,6 +138,7 @@ class Goods extends Frontend
         $slide = $picModel->selectData([]);
         $this->assign('goodstype_one',$goodstype_one);
         $this->assign('slide',$slide);
+        $this->assign('category',$category);
         $this->assign('title','产品热卖');
         return $this->fetch();
     }
@@ -173,6 +181,9 @@ class Goods extends Frontend
         if(!empty($param['keyword'])){
             $where['t.name|s.name|g.goodsname|g.brand'] = ['like',"%$param[keyword]%"];
         }
+        if(!empty($param['category_id'])){
+            $where['g.goodstype_id'] = ['eq',$param['category_id']];
+        }
         $order = 'g.weigh desc';
         if(!empty($param['sort'])){
             if($param['sort'] == 1){
--- a/application/index/controller/Vip.php
查看文件 @dc7c659
+++ b/application/index/controller/Vip.php
查看文件 @dc7c659
@@ -15,6 +15,7 @@ use app\index\model\Firmstores;
 use app\index\model\Minestore;
 use app\index\model\Price;
 use app\index\model\Province;
+use app\index\model\Store;
 use app\index\model\Viporder;
 class Vip extends Frontend
@@ -38,6 +39,11 @@ class Vip extends Frontend
      */
     public function index(){
         $user_id = $this->auth->id;
+        $storeModel = new Store();
+        $store = $storeModel->findData(['user_id'=>$user_id]);
+        if(!empty($store)){
+            $this->redirect('index/member/order');
+        }
         //个人店铺
         $minestoreModel = new Minestore();
         $minestore = $minestoreModel->findData(['user_id'=>$user_id]);
@@ -88,6 +94,11 @@ class Vip extends Frontend
         }else{
             $money = $price['svipprice'];
         }
+        $storeModel = new Store();
+        $store = $storeModel->findData(['user_id'=>$user_id]);
+        if(!empty($store)){
+            $this->error('请前往续费~','index/member/order');
+        }
         //个人店铺
         $minestoreModel = new Minestore();
         $minestore = $minestoreModel->findData(['user_id'=>$user_id]);
--- a/application/index/controller/WechatPay.php
查看文件 @dc7c659
+++ b/application/index/controller/WechatPay.php
查看文件 @dc7c659
@@ -88,6 +88,7 @@ class WechatPay extends HomeBase
             $out_trade_no=$notify->out_trade_no;
             $vipOrderModel = new Viporder();
             $data = $vipOrderModel->findData(['num'=>$out_trade_no]);
+            cache('a',$data['vip_type']."&");
             if (empty($data)) { // 如果订单不存在
                 return 'Order not exist.'; // 告诉微信，我已经处理完了，订单没找到，别再通知我了
             }
@@ -98,6 +99,7 @@ class WechatPay extends HomeBase
             }
             $userModel = new \app\index\model\User();
             $user = $userModel->findData(['id'=>$data['user_id']]);
+            cache('b',$user['is_vip']."&".$user['id']."&".$user['vip_passttime']);
             // 用户是否支付成功
             if($successful){
                 if($data['vip_type'] == '1'){
@@ -107,7 +109,9 @@ class WechatPay extends HomeBase
                     }else{
                         $vip_passtime = time() + 365*24*60*60;
                     }
-                    $userModel->updateData(['vip_passtime'=>$vip_passtime,'province_ids'=>$data['province_ids']]);
+                    cache('h',$vip_passtime);
+                    $userModel->updateData(['id'=>$user['id']],['vip_passtime'=>$vip_passtime,'province_ids'=>",".$data['province_ids'].","]);
+                    cache('c',"QQQQ");
                 }else if($data['vip_type'] == '2'){
                     //超级会员
                     if($user['is_svip'] == '1'){
@@ -115,20 +119,33 @@ class WechatPay extends HomeBase
                     }else{
                         $svip_passtime = time() + 365*24*60*60;
                     }
-                    $userModel->updateData(['svip_passtime'=>$svip_passtime]);
+                    cache('g',$svip_passtime);
+                    cache('d',$userModel->updateData(['id'=>$user['id']],['svip_passtime'=>$svip_passtime]));
                 }
                 $arr['status'] = "2";
                 $arr['paytime'] = time();
             }else{
                 $arr['status'] = "1";
             }
-            $vipOrderModel->updateData(['id'=>$data['id']],$arr);
+            cache('f',"FFFF");
+            cache('e',$vipOrderModel->updateData(['id'=>$data['id']],$arr));
             return true; // 返回处理完成
         });
         $response->send();
     }
+    public function demo(){
+        dump(cache('a'));
+        dump(cache('b'));
+        dump(cache('c'));
+        dump(cache('d'));
+        dump(cache('e'));
+        dump(cache('f'));
+        dump(cache('g'));
+        dump(cache('h'));
+    }
+
     /**
      * 支付回调（购买商品）
      * @throws \EasyWeChat\Core\Exceptions\FaultException
--- a/application/index/model/Goodstype.php
查看文件 @dc7c659
+++ b/application/index/model/Goodstype.php
查看文件 @dc7c659
@@ -18,4 +18,8 @@ class Goodstype extends Model
         $data = $this->where($where)->order('weigh desc')->select();
         return $data;
     }
+    public function findData($where){
+        $data = $this->where($where)->find();
+        return $data;
+    }
 }
--- a/application/index/model/Store.php
查看文件 @dc7c659
+++ b/application/index/model/Store.php
查看文件 @dc7c659
@@ -54,29 +54,31 @@ class Store extends Model
     }
     public function findData($where){
         $data = $this->where($where)->find();
-        //判断会员是否过期
-        $is_vip = '2';
-        if(!empty($data['vip_passtime'])){
-            if($data['vip_passtime'] > time()){
-                $is_vip = "1";
+        if(!empty($data)){
+            //判断会员是否过期
+            $is_vip = '2';
+            if(!empty($data['vip_passtime'])){
+                if($data['vip_passtime'] > time()){
+                    $is_vip = "1";
+                }
             }
-        }
-        $is_svip = '2';
-        if(!empty($data['svip_passtime'])){
-            if($data['svip_passtime'] > time()){
-                $is_svip = "1";
+            $is_svip = '2';
+            if(!empty($data['svip_passtime'])){
+                if($data['svip_passtime'] > time()){
+                    $is_svip = "1";
+                }
             }
+            $data['is_vip'] = $is_vip;
+            $data['is_svip'] = $is_svip;
+            //获取省市区
+            $areaModel = new Area();
+            $province_name = $areaModel->where(['id'=>$data['province_id']])->value('name');
+            $city_name = $areaModel->where(['id'=>$data['city_id']])->value('name');
+            $county_name = $areaModel->where(['id'=>$data['county_id']])->value('name');
+            $data['province_name'] = $province_name;
+            $data['city_name'] = $city_name;
+            $data['county_name'] = $county_name;
         }
-        $data['is_vip'] = $is_vip;
-        $data['is_svip'] = $is_svip;
-        //获取省市区
-        $areaModel = new Area();
-        $province_name = $areaModel->where(['id'=>$data['province_id']])->value('name');
-        $city_name = $areaModel->where(['id'=>$data['city_id']])->value('name');
-        $county_name = $areaModel->where(['id'=>$data['county_id']])->value('name');
-        $data['province_name'] = $province_name;
-        $data['city_name'] = $city_name;
-        $data['county_name'] = $county_name;
         return $data;
     }
 }
--- a/application/index/model/User.php
查看文件 @dc7c659
+++ b/application/index/model/User.php
查看文件 @dc7c659
@@ -13,21 +13,23 @@ class User extends Model
 {
     public function findData($where){
         $data = $this->where($where)->find();
-        //判断是否为会员
-        $is_vip = '2';
-        if(!empty($data['vip_passtime'])){
-            if($data['vip_passtime'] > time()){
-                $is_vip = "1";
+        if(!empty($data)){
+            //判断是否为会员
+            $is_vip = '2';
+            if(!empty($data['vip_passtime'])){
+                if($data['vip_passtime'] > time()){
+                    $is_vip = "1";
+                }
             }
-        }
-        $is_svip = '2';
-        if(!empty($data['svip_passtime'])){
-            if($data['svip_passtime'] > time()){
-                $is_svip = "1";
+            $is_svip = '2';
+            if(!empty($data['svip_passtime'])){
+                if($data['svip_passtime'] > time()){
+                    $is_svip = "1";
+                }
             }
+            $data['is_vip'] = $is_vip;
+            $data['is_svip'] = $is_svip;
         }
-        $data['is_vip'] = $is_vip;
-        $data['is_svip'] = $is_svip;
         return $data;
     }
     public function updateData($where,$data){
--- a/application/index/view/goods/goods_list.html
查看文件 @dc7c659
+++ b/application/index/view/goods/goods_list.html
查看文件 @dc7c659
@@ -348,7 +348,7 @@
                     </div>
                     <div class="typeDetailBox">
                         {foreach name="$g_o.goodstype_two" item="g_t"}
-                        <p><a href="">{$g_t.name}</a></p>
+                        <p><a href="{:url('index/goods/goods_list',array('category_id'=>$g_t.id))}">{$g_t.name}</a></p>
                         {/foreach}
                     </div>
                 </li>
@@ -372,7 +372,7 @@
         <div class="bestSellersMain">
             <div class="titleBox">
                 <span></span>
-                <span>采购中心 > 产品热卖</span>
+                <span>采购中心 {notempty name="$category"}> {$category.name}{/notempty}</span>
             </div>
             <div class="bestSellersList goods_dom">
                 <!--<div class="commodityBox">
@@ -402,6 +402,7 @@
 {include file="public/footer"/}
 {include file="public/js"/}
 <script>
+    var category_id = {notempty name="$category"}{$category.id}{/notempty};
     $(function () {
         initBanner();//初始化轮播图
         initLocation();//获取定位信息
@@ -459,7 +460,7 @@
         $.ajax({
             url:"{:url('index/goods/get_all')}",
             type:"POST",
-            data:{"province_id":province_id,"page":page,"pageNum":pageNum,'paginate':1},
+            data:{"province_id":province_id,"page":page,"pageNum":pageNum,'paginate':1,'category_id':category_id},
             success:function(res){
                 console.log(res);
                 var goods_html = "";
--- a/application/index/view/index/index.html
查看文件 @dc7c659
+++ b/application/index/view/index/index.html
查看文件 @dc7c659
@@ -162,7 +162,12 @@
         }else{
             searchKey = val;
         }
-        window.location.href = 'search.html?searchKey='+searchKey;
+        if(searchKey == ''){
+            toast('请输入关键字');
+            return false;
+        }
+        var str = "{:url('index/goods/search',array('keyword'=>'KEYWORD'))}";
+        window.location.href = str.replace('KEYWORD',searchKey);
     }
 </script>
 </body>
--- a/application/index/view/public/js.html
查看文件 @dc7c659
+++ b/application/index/view/public/js.html
查看文件 @dc7c659
@@ -75,4 +75,13 @@
         var pos=$.inArray(src,idCardImgFileArr);
         idCardImgFileArr.splice(pos,1);*/
     });
+    function search2(){
+        var keyword = $('#searchVal').val();
+        if(keyword == ''){
+            toast('请输入关键字');
+            return false;
+        }
+        var str = "{:url('index/goods/search',array('keyword'=>'KEYWORD'))}";
+        window.location.href = str.replace('KEYWORD',keyword);
+    }
 </script>
--- a/application/index/view/public/nav.html
查看文件 @dc7c659
+++ b/application/index/view/public/nav.html
查看文件 @dc7c659
@@ -11,7 +11,7 @@
             <div class="searchBox">
                 <input id="searchVal" type="text" class="search" placeholder="请输入型号、参数查找元器件" />
                 <span class="input-group-btn">
-                    <button class="btn" onclick="search()">
+                    <button class="btn" onclick="search2()">
                        <img src="__CDN__/assets/store/images/search_icon_top.png" alt="user">
                        搜索
                     </button>