合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !49

@@ -44,6 +44,12 @@ class Vip extends Frontend
         if(!empty($store)){
         if(!empty($store)){
             $this->redirect('index/member/order');
             $this->redirect('index/member/order');
         }
         }
+        // 查询是否有已支付、待审核的订单
+        $viporder_model = new Viporder();
+        $viporder = $viporder_model->where(['user_id'=>$user_id,'status'=>2,'audit'=>['in',['1','2']]])->find();
+        if($viporder) {
+            return $this->fetch('pay_success');
+        }
         //个人店铺
         //个人店铺
         $minestoreModel = new Minestore();
         $minestoreModel = new Minestore();
         $minestore = $minestoreModel->findData(['user_id'=>$user_id]);
         $minestore = $minestoreModel->findData(['user_id'=>$user_id]);