1

.idea/workspace.xml

@@ -3,7 +3,14 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Demand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Demand.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Trolley.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Trolley.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -198,7 +205,7 @@
       <workItem from="1669952538953" duration="9708000" />
       <workItem from="1670201125142" duration="9015000" />
       <workItem from="1670287594399" duration="11535000" />
-      <workItem from="1670461023846" duration="21763000" />
+      <workItem from="1670461023846" duration="22012000" />
     </task>
     <servers />
   </component>
@@ -297,10 +304,10 @@
     </state>
     <state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
     <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1670461034563" />
-    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670480930722">
+    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670486493063">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670480930722" />
+    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670486493063" />
     <state x="1291" y="317" key="run.anything.popup" timestamp="1668056889671">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Article.php

@@ -423,7 +423,7 @@ class Article extends Base
             $val['can_delete']  = $val['user_id'] == $this->user_id ? 1 :0;
         });
         $total_num  = ArticleComment::where($where)->alias('c')->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
     
     

application/api/controller/Demand.php

@@ -285,7 +285,7 @@ class Demand extends Base
             $val['parent']  = $parent ? $parent->toArray() : null;
         });
         $total_num  = DemandComment::where($where)->alias('c')->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
     /**

application/api/controller/Forum.php

@@ -331,7 +331,7 @@ class Forum extends Base
             $val['children'] = $children ? $children : null;
             $val['children_num'] = numTransform(count($children));
         });
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
 
@@ -598,7 +598,7 @@ class Forum extends Base
             $v['like_num'] = PlatformLike::getPraiseNum($v['forum_id'],3);
         });
         $total_num = ForumReply::where($where)->alias('r')->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
     /**
@@ -670,7 +670,7 @@ class Forum extends Base
             $v['is_normal'] = CheckPower::checkModulesPower($v['forum_id'],0,$this->request->controller());
         });
         $total_num = ForumReply::where($where)->alias('r')->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
     /**

application/api/controller/Mall.php

@@ -182,7 +182,7 @@ class Mall extends Base
             $v['total_num'] =  empty($v['item_list']) ? 0 :array_sum(array_column($v['item_list'],'base_stock'));
         }
         $total_num =  StoreGoods::where($sel_where)->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
 
     }
 

application/api/controller/Press.php

@@ -220,7 +220,7 @@ class Press extends Base
             $val['parent']  = $parent ? $parent->toArray() : null;
         });
         $total_num  = PressComment::where($where)->alias('c')->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
 

application/api/controller/Supplier.php

@@ -152,7 +152,7 @@ class Supplier extends Base
             $v['business_arr'] = $v['business'] ? explode(',',trim($v['business'],',')) : null;
         }
         $total_num  =\app\common\model\Supplier::where($sel_where)->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
     /**
@@ -291,7 +291,7 @@ class Supplier extends Base
             $v['supplier_logo'] =$supplier_info['logo'];
         }
         $total_num = SupplierGoods::where($sel_where)->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
     /**
@@ -417,7 +417,7 @@ class Supplier extends Base
         $total_num = SupplierGoods::where($sel_where)->alias('g')->leftJoin('Supplier s','g.supplier_id = s.id')->when($search_name,function ($query)use($search_name){
             if($search_name) $query->where('g.name|g.label','like','%'.$search_name.'%');
         })->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
 

application/api/controller/Trolley.php

@@ -47,7 +47,7 @@ class Trolley extends Base
         $where['user_id'] = $this->user_id;
         if($goods_id = input('get.goods_id',0)) $where['goods_id'] = $goods_id;
         $total_num = ShoppingTrolley::where($where)->sum('num');
-        $this->success('ok',['total_num'=>$total_num]);
+        $this->success('ok',['total_num'=>numTransform($total_num)]);
     }
 
     /**

application/api/controller/Video.php

@@ -243,7 +243,7 @@ class Video extends Base
             $v['app_logo']  = $app_logo;
         });
 
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
     /**
@@ -764,7 +764,7 @@ class Video extends Base
         });
 
         $total_num  = VideoComment::where($where)->alias('c')->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
     }
 
     /**