Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/After.php

@@ -276,6 +276,11 @@ class After extends \app\BaseController
                 return error_show(1005,"参数is_post不能为空");
             }
             $info['is_post']=$post;
+            $return_tag =isset($this->post['return_tag'])&&$this->post['return_tag']!==""? intval($this->post['return_tag']):"";
+            if($return_tag===""){
+                return error_show(1005,"参数return_tag不能为空");
+            }
+            $info['return_tag']=$return_tag;
         }
 //        $status = $info['order_status']==1&&$info['order_type']==1 && $status==1?4:$status;
         Db::startTrans();

app/admin/controller/Consult.php

@@ -1368,16 +1368,16 @@ class Consult extends Base
             $where[] = ['zxNo','in',$zxlist];
         }
 
-        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $apply_id =GetUserInfo($token);
-        if(empty($apply_id)||$apply_id['code']!=0){
-            return error_show(1002,"申请人数据不存在");
-        }
-        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
-        $where[]=['createrid',"=",$rm];
+//        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//        }
+//        $apply_id =GetUserInfo($token);
+//        if(empty($apply_id)||$apply_id['code']!=0){
+//            return error_show(1002,"申请人数据不存在");
+//        }
+//        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+//        $where[]=['createrid',"=",$rm];
         $count = Db::name('consult_bids')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;