|
@@ -136,6 +136,8 @@ class Shop extends BaseController
|
|
|
} else {
|
|
} else {
|
|
|
$item['address'] = [];
|
|
$item['address'] = [];
|
|
|
}
|
|
}
|
|
|
|
|
+ $item['address_info'] = Db::name('user_address')->where('id', $item['address_id'])->find();
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$pageCount = Db::name('store_order')
|
|
$pageCount = Db::name('store_order')
|
|
@@ -221,6 +223,7 @@ class Shop extends BaseController
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
$data['cart_info'] = $cartInfo;
|
|
$data['cart_info'] = $cartInfo;
|
|
|
|
|
+ $data['address_info'] = Db::name('user_address')->where('id', $data['address_id'])->find();
|
|
|
|
|
|
|
|
return app('json')->success($data);
|
|
return app('json')->success($data);
|
|
|
}
|
|
}
|