增加产品详情、公告多语言

application/api/controller/Announcement.php

@@ -9,6 +9,13 @@ class Announcement extends Api
 {
 
     protected array $noNeedLogin = ['list','show'];
+    protected string $lan = '';
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->lan = $this->request->getLan();
+    }
 
     public function list()
     {
@@ -16,7 +23,7 @@ class Announcement extends Api
             ->where('type', 1)
             ->where('status', 1)
             ->order('id DESC,weigh desc')
-            ->field('id,title,img_url,createtime')
+            ->field('id,img_url,createtime,' . $this->lan.'_title as title')
             ->paginate($this->pageSize);
         $this->success('', $this->buildResp($paginator->total(), $paginator->currentPage(), $paginator->items()));
     }
@@ -26,7 +33,7 @@ class Announcement extends Api
         $info = (new AnnouncementModel)
             ->where('id', $id)
             ->where('status', 1)
-            ->field('id,title,img_url,body,createtime')
+            ->field('id,img_url,body,createtime,' . $this->lan.'_title as title')
             ->find();
         if(empty($info)){
             $this->error('公告信息不存');

application/api/controller/Home.php

@@ -112,7 +112,7 @@ class Home extends Api
             $order = array();
             $info = $productPopular->alias('a')
                 ->join("product_list b", "a.product_id = b.id", "left")
-                ->field('a.id,a.product_id,'.'b.'.$this->lan.'_name as name,b.images as img_url,price,cost_price,stock,num,start_time,end_time')
+                ->field('a.id,a.product_id,'.'b.'.$this->lan.'_name as name,b.images as img_url,price,cost_price,stock,num,start_time,end_time,b.details')
                 ->where('a.id', $ids)
                 ->order('a.weigh desc')
                 ->find();
@@ -149,7 +149,7 @@ class Home extends Api
   
             $info = $productTransfer->alias('a')
                 ->join("product_list b", "a.product_id = b.id", "left")
-                ->field('a.id,a.product_id,a.area_id,'.'b.'.$this->lan.'_name as name,b.images as img_url,price,fees')
+                ->field('a.id,a.product_id,a.area_id,'.'b.'.$this->lan.'_name as name,b.images as img_url,price,fees,b.details')
                 ->where('a.id', $ids)
                 ->find();
          

application/api/controller/Product.php

@@ -24,7 +24,7 @@ class Product extends Api
      */
     public function getPopularList(ProductsModel $productsModel, ProductPopular $productPopular)
     {
-        $list = $productsModel->column('id,'.$this->lan.'_title as title');
+        $list = $productsModel->where('status', 1)->column('id,'.$this->lan.'_title as title');
         $resp = array();
         foreach ($list as $kk =>$val) {
             $pro = $productPopular->alias('a')