Merge branch 'wugg' of wugg/phpstock into version1.5

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

@@ -1448,14 +1448,7 @@ class Consult extends Base
         if($token==''){
             return error_show(102,"参数token不能为空");
         }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(105,"用户数据不存在");
-//        }
 
-//        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-//        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-//        $where[] = ["createrid","=",$createrid];
         $list =Db::name('consult_bids')->where($where)->select();
         $data=[];
         foreach ($list as $value){