浏览代码

添加企业介绍

chenxiqiang 6 年前
父节点
当前提交
77cc4be3bc

+ 20
- 16
manage-server/app/Http/Controllers/CommonController.php 查看文件

143
         //$user = session('wechat.oauth_user.default');
143
         //$user = session('wechat.oauth_user.default');
144
         //$wechat_id = $user->getId();
144
         //$wechat_id = $user->getId();
145
         $wechat_id = $request->input("openid");
145
         $wechat_id = $request->input("openid");
146
-        $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->get();
147
-        $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)->get();
148
-        $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
149
-        $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
150
-        $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
146
+        if($wechat_id) {
147
+            $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->get();
148
+            $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)->get();
149
+            $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
150
+            $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
151
+            $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
152
+            $orders = [];
153
+
154
+            return Response()->json([
155
+                "status" => 0,
156
+                "data" => [
157
+                    "houseApplianceCleanOrder" => $houseApplianceCleanOrder,
158
+                    "houseCleanOrder" => $houseCleanOrder,
159
+                    "housekeeperOrder" => $housekeeperOrder,
160
+                    "maternityMatronOrder" => $maternityMatronOrder,
161
+                    "productOrder" => $productOrder
162
+                ]
163
+            ]);
164
+        }
165
+
151
 
166
 
152
-        return Response()->json([
153
-            "status" => 0,
154
-            "data" => [
155
-                "houseApplianceCleanOrder" => $houseApplianceCleanOrder,
156
-                "houseCleanOrder" => $houseCleanOrder,
157
-                "housekeeperOrder" => $housekeeperOrder,
158
-                "maternityMatronOrder" => $maternityMatronOrder,
159
-                "productOrder" => $productOrder
160
-            ]
161
-        ]);
162
     }
167
     }
163
 
168
 
164
 
169
 
259
         }
264
         }
260
     }
265
     }
261
 
266
 
262
-
263
     /**
267
     /**
264
      * 根据type和id获取记录
268
      * 根据type和id获取记录
265
      * @param $type
269
      * @param $type

+ 5
- 1
manage-server/app/Models/HouseApplianceCleanOrder.php 查看文件

11
  */
11
  */
12
 class HouseApplianceCleanOrder extends Model
12
 class HouseApplianceCleanOrder extends Model
13
 {
13
 {
14
+    protected $classify1 = "家政";
15
+    protected $classify2 = "家电清洁";
16
+
14
     protected $fillable = [
17
     protected $fillable = [
15
         'wechat_id', // 微信号id(open_id)
18
         'wechat_id', // 微信号id(open_id)
16
 		'appliances', // 项目, 数组形式,多个数量则出现多次
19
 		'appliances', // 项目, 数组形式,多个数量则出现多次
18
     	'contact', // 联系人
21
     	'contact', // 联系人
19
     	'phone',	//联系电话
22
     	'phone',	//联系电话
20
     	'status', // 订单状态
23
     	'status', // 订单状态
21
-        'price' // 订单价格
24
+        'price', // 订单价格
25
+        'type' // 订单分类
22
     ];
26
     ];
23
 }
27
 }

+ 3
- 0
manage-server/app/Models/HouseCleanOrder.php 查看文件

11
  */
11
  */
12
 class HouseCleanOrder extends Model
12
 class HouseCleanOrder extends Model
13
 {
13
 {
14
+    protected $classify1 = "家政";
15
+    protected $classify2 = "家居清洁";
16
+
14
     protected $fillable = [
17
     protected $fillable = [
15
         'wechat_id', // 微信号id(open_id)
18
         'wechat_id', // 微信号id(open_id)
16
 		'type', // 清洁类型
19
 		'type', // 清洁类型

+ 4
- 0
manage-server/app/Models/HousekeeperOrder.php 查看文件

11
  */
11
  */
12
 class HousekeeperOrder extends Model
12
 class HousekeeperOrder extends Model
13
 {
13
 {
14
+
15
+    protected $classify1 = "家政";
16
+    protected $classify2 = "保姆";
17
+
14
     protected $fillable = [
18
     protected $fillable = [
15
         'wechat_id', // 微信号id(open_id)
19
         'wechat_id', // 微信号id(open_id)
16
 		'contents', // 服务内容, 数组形式,多个数量则出现多次
20
 		'contents', // 服务内容, 数组形式,多个数量则出现多次

+ 4
- 0
manage-server/app/Models/MaternityMatronOrder.php 查看文件

11
  */
11
  */
12
 class MaternityMatronOrder extends Model
12
 class MaternityMatronOrder extends Model
13
 {
13
 {
14
+
15
+    protected $classify1 = "家政";
16
+    protected $classify2 = "月嫂";
17
+
14
     protected $fillable = [
18
     protected $fillable = [
15
         'wechat_id', // 微信号id(open_id)
19
         'wechat_id', // 微信号id(open_id)
16
         'level', // 月嫂等级
20
         'level', // 月嫂等级

+ 4
- 0
manage-server/app/Models/ProductOrder.php 查看文件

11
  */
11
  */
12
 class ProductOrder extends Model
12
 class ProductOrder extends Model
13
 {
13
 {
14
+
15
+    protected $classify1 = "产品";
16
+    protected $classify2 = "产品";
17
+
14
     protected $fillable = [
18
     protected $fillable = [
15
         'wechat_id', // 微信号id(open_id)
19
         'wechat_id', // 微信号id(open_id)
16
     	'product_id', // 产品名称
20
     	'product_id', // 产品名称

Loading…
取消
保存