添加企业介绍

manage-server/app/Http/Controllers/CommonController.php

@@ -143,22 +143,27 @@ class CommonController extends Controller
         //$user = session('wechat.oauth_user.default');
         //$wechat_id = $user->getId();
         $wechat_id = $request->input("openid");
-        $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->get();
-        $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)->get();
-        $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
-        $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
-        $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
+        if($wechat_id) {
+            $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->get();
+            $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)->get();
+            $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
+            $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
+            $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
+            $orders = [];
+
+            return Response()->json([
+                "status" => 0,
+                "data" => [
+                    "houseApplianceCleanOrder" => $houseApplianceCleanOrder,
+                    "houseCleanOrder" => $houseCleanOrder,
+                    "housekeeperOrder" => $housekeeperOrder,
+                    "maternityMatronOrder" => $maternityMatronOrder,
+                    "productOrder" => $productOrder
+                ]
+            ]);
+        }
+
 
-        return Response()->json([
-            "status" => 0,
-            "data" => [
-                "houseApplianceCleanOrder" => $houseApplianceCleanOrder,
-                "houseCleanOrder" => $houseCleanOrder,
-                "housekeeperOrder" => $housekeeperOrder,
-                "maternityMatronOrder" => $maternityMatronOrder,
-                "productOrder" => $productOrder
-            ]
-        ]);
     }
 
 
@@ -259,7 +264,6 @@ class CommonController extends Controller
         }
     }
 
-
     /**
      * 根据type和id获取记录
      * @param $type

manage-server/app/Models/HouseApplianceCleanOrder.php

@@ -11,6 +11,9 @@ use Illuminate\Database\Eloquent\Model;
  */
 class HouseApplianceCleanOrder extends Model
 {
+    protected $classify1 = "家政";
+    protected $classify2 = "家电清洁";
+
     protected $fillable = [
         'wechat_id', // 微信号id(open_id)
 		'appliances', // 项目, 数组形式，多个数量则出现多次
@@ -18,6 +21,7 @@ class HouseApplianceCleanOrder extends Model
     	'contact', // 联系人
     	'phone',	//联系电话
     	'status', // 订单状态
-        'price' // 订单价格
+        'price', // 订单价格
+        'type' // 订单分类
     ];
 }

manage-server/app/Models/HouseCleanOrder.php

@@ -11,6 +11,9 @@ use Illuminate\Database\Eloquent\Model;
  */
 class HouseCleanOrder extends Model
 {
+    protected $classify1 = "家政";
+    protected $classify2 = "家居清洁";
+
     protected $fillable = [
         'wechat_id', // 微信号id(open_id)
 		'type', // 清洁类型

manage-server/app/Models/HousekeeperOrder.php

@@ -11,6 +11,10 @@ use Illuminate\Database\Eloquent\Model;
  */
 class HousekeeperOrder extends Model
 {
+
+    protected $classify1 = "家政";
+    protected $classify2 = "保姆";
+
     protected $fillable = [
         'wechat_id', // 微信号id(open_id)
 		'contents', // 服务内容, 数组形式，多个数量则出现多次

manage-server/app/Models/MaternityMatronOrder.php

@@ -11,6 +11,10 @@ use Illuminate\Database\Eloquent\Model;
  */
 class MaternityMatronOrder extends Model
 {
+
+    protected $classify1 = "家政";
+    protected $classify2 = "月嫂";
+
     protected $fillable = [
         'wechat_id', // 微信号id(open_id)
         'level', // 月嫂等级

manage-server/app/Models/ProductOrder.php

@@ -11,6 +11,10 @@ use Illuminate\Database\Eloquent\Model;
  */
 class ProductOrder extends Model
 {
+
+    protected $classify1 = "产品";
+    protected $classify2 = "产品";
+
     protected $fillable = [
         'wechat_id', // 微信号id(open_id)
     	'product_id', // 产品名称