ad

app/admin/controller/Consult.php

@@ -2053,7 +2053,13 @@ class Consult extends Base
         if ($goodName !== "") {
             $where[] = ['a.good_name','like','%'.$goodName.'%'];
         }
-
+        $is_combind = isset($this->post['is_combind'])&& $this->post['is_combind']!=="" ? intval($this->post['is_combind']):"";
+        if($is_combind!=="") $where[]=["a.is_combind","=",$is_combind];
+        $platform_id = isset($this->post['platform_id'])&& $this->post['platform_id']!=='' ? intval($this->post['platform_id']):'';
+        if($platform_id!=="") $where[]=['b.platform_code','=',$platform_id];
+        $skuOrName = isset($this->post['skuOrName'])&& $this->post['skuOrName']!=='' ? trim($this->post['skuOrName']):'';
+        if($skuOrName!=="") $where[]=['a.good_name|a.spuCode','like','%'.$skuOrName.'%'];
+        
         $count = Db::name('consult_bids')->alias("a")
         ->leftJoin('consult_info c','a.infoNo=c.infoNo')
         ->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)->count();

app/txx/controller/Act.php

@@ -37,7 +37,7 @@ class Act extends Base
         "start"=>'',
         "end"=>'',
         "status"=>'',
-        "version"=>"1.0",
+        "version"=>"0",
         'act_status'=>'',
       	],"post",'trim');
       $condition=[["is_del","=",0]];

app/txx/listener/WxPush.php

@@ -3,23 +3,10 @@ declare (strict_types = 1);
 
 namespace app\txx\listener;
 
-use app\txx\model\Act;use think\facade\Cache;
+use app\txx\model\Act;
+use think\facade\Cache;
 class WxPush
 {
-    protected $appid;
-    protected $appsecret;
-    protected $wechat;
-    /**
-     * 事件监听处理
-     *
-     * @return mixed
-     */
-//    public function __construct()
-//    {
-//         $this->appid = env('WECHAT.APPID');
-//        $this->appsecret = env('WECHAT.APPSECRET');
-//        $this->wechat = new \Wechat(['appid' => $this->appid, 'appsecret' => $this->appsecret]);
-//    }
     public function handle($event)
     {
         if($event==null)return;

app/txx/middleware/CheckAuth.php

@@ -51,8 +51,8 @@ class CheckAuth
 
 	}
 	/**数据接口签名验证
-	* @param $data
-	* @param $param
+	 * @param $data
+	 * @param $param
 	 * @return array
 	 */
     private  function check($data,$param){