|
@@ -84,7 +84,8 @@ class IntegralOrder extends Controller
|
|
|
}
|
|
|
if ($this->request->isGet() && $this->request->action() == 'deliver') {
|
|
|
if (isset($data['address_id'])){
|
|
|
- $this->address_info = Db::table('delivery_address')->field('id,mer_name,detail,phone,name')->find($data['address_id']);
|
|
|
+ $this->address_info = json_decode($data['send_info'],true);
|
|
|
+ //$this->address_info = Db::table('delivery_address')->field('id,mer_name,detail,phone,name')->find($data['address_id']);
|
|
|
}
|
|
|
}
|
|
|
}
|