合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !244

@@ -214,7 +214,7 @@ class Store extends Api
         $where = [
             'where' => $where_s
         ];
-        $store = $this->store_model->findOrFail($where,false,'*','createtime');
+        $store = $this->store_model->where($where['where'])->order('createtime','DESC')->find();
         if($store) {
             if($store['status'] == 1) {
                 $param['id'] = $store['id'];
@@ -232,7 +232,7 @@ class Store extends Api
         $event = 'test';
         $ret = Smslib::check($mobile, $captcha, $event);
         if (!$ret) {
-            $this->error(__('验证码不正确'));
+            $this->error(__('验证码不正确'),$ret);
         }
         unset($param['code']);
         $order_sn = $param['order_sn'] = get_order_sn();