ad

app/admin/controller/Activity.php

@@ -115,7 +115,7 @@ class Activity extends Base
     {
         $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) : "1";
         $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) : "10";
-        $where = [["a.is_del", "=", 0]];
+        $where = [["a.is_del", "=", 0],["b.is_del", "=", 0]];
         $skuCode = isset($this->post['skuCode']) && $this->post['skuCode'] !== "" ? trim($this->post['skuCode']) : "";
         if ($skuCode !== "") {
             $where[] = ['a.skuCode', "like", "%$skuCode%"];
@@ -157,7 +157,7 @@ class Activity extends Base
             ->where($where)
             ->page($page,$size)
             ->order("a.addtime desc")
-            ->field("a.*,b.activity_name,c.platform_name,c.platform_code,b.company_id companyNo")
+            ->field("a.*,b.activity_name,c.platform_name,c.platform_code,b.company_id companyNo,b.status activity_status")
             ->select()
             ->toArray();
 

app/common.php

@@ -1529,7 +1529,6 @@ if (!function_exists('check_activity')) {
             ->field('ai.id,ai.activity_code,ai.activity_stock,ai.moq_num,ai.activity_price,ai.is_activity,ai.settle_price')
             ->join('good_activity ga', 'ga.activity_code=ai.activity_code')
             ->where([
-//                'ai.spuCode' => $spuCode,
                 'ai.skuCode' => $skuCode,
                 'ai.is_del' => 0,
                 'ai.status' => 1,

app/youzan/model/YzCat.php

@@ -8,7 +8,7 @@ use think\Model;
 class YzCat extends Model
 {
     protected $connection = 'mysql_yz';//切换连接参数
-    protected $table = 'yz_cat';
+    protected $table = 'yz_cat_v4';
     protected $pk = 'id';
     protected $autoWriteTimestamp = false;