|
@@ -197,10 +197,14 @@ class CommonController extends Controller
|
197
|
197
|
$productOrder = ProductOrder::where("wechat_id", $wechat_id)
|
198
|
198
|
->orderBy('id', 'desc')->get();
|
199
|
199
|
|
|
200
|
+ $optionOrder = OptionOrder::where("wechat_id", $wechat_id)
|
|
201
|
+ ->orderBy('id', 'desc')->get();
|
|
202
|
+
|
200
|
203
|
array_push($os, $houseApplianceCleanOrder);
|
201
|
204
|
array_push($os, $houseCleanOrder);
|
202
|
205
|
array_push($os, $housekeeperOrder);
|
203
|
206
|
array_push($os, $maternityMatronOrder);
|
|
207
|
+ array_push($os, $optionOrder);
|
204
|
208
|
//array_push($os, $productOrder);
|
205
|
209
|
$orders = array();
|
206
|
210
|
for ($i = 0; $i < sizeof($os); $i++) {
|