Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
cailing
9 years ago
Commit
b55650ed004f44bd86de2d55a4bc00e014c57588
1 parent
25da92e6
修改地址
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
yohobuy/www.yohobuy.com/application/models/Home/Order.php
yohobuy/www.yohobuy.com/application/modules/Home/controllers/Orders.php
yohobuy/www.yohobuy.com/application/models/Home/Order.php
View file @
b55650e
...
...
@@ -192,6 +192,13 @@ class OrderModel
$detail
[
'orderInfo'
][
'receiver'
]
=
$orderDetail
[
'user_name'
];
$detail
[
'orderInfo'
][
'address'
]
=
$orderDetail
[
'area'
]
.
$orderDetail
[
'address'
];
$detail
[
'orderInfo'
][
'phone'
]
=
substr_replace
(
$orderDetail
[
'mobile'
],
'****'
,
3
,
4
)
.
(
!
empty
(
$orderDetail
[
'phone'
])
?
','
.
substr_replace
(
$orderDetail
[
'phone'
],
'****'
,
3
,
5
)
:
''
);
$detail
[
'editInfo'
][
'userName'
]
=
$orderDetail
[
'user_name'
];
//收货人
$detail
[
'editInfo'
][
'address'
]
=
$orderDetail
[
'address'
];
//地址
$detail
[
'editInfo'
][
'areaCode'
]
=
$orderDetail
[
'area_code'
];
//地址编号
$detail
[
'editInfo'
][
'mobile'
]
=
$orderDetail
[
'mobile'
];
//手机号码
$phone
=
explode
(
'-'
,
strtr
(
$value
[
'phone'
],
array
(
'null'
=>
''
)));
//固定电话
$detail
[
'editInfo'
][
'phoneNum'
]
=
isset
(
$phone
[
1
])
?
$phone
[
0
]
:
''
;
//电话区号
$detail
[
'editInfo'
][
'phoneCode'
]
=
isset
(
$phone
[
1
])
?
$phone
[
1
]
:
''
;
//电话号码
}
//商品信息
if
(
$orderDetail
[
'order_goods'
])
{
...
...
@@ -225,7 +232,8 @@ class OrderModel
$detail
[
'operation'
]
=
self
::
getOrderDetailOp
(
$orderDetail
[
'order_code'
],
$orderDetail
[
'payment'
],
$orderDetail
[
'status'
],
$orderDetail
[
'is_cancel'
],
$orderDetail
[
'payment_status'
],
$orderDetail
[
'payment_type'
],
$orderDetail
[
'order_type'
],
$orderDetail
[
'attribute'
],
$orderDetail
[
'refund_status'
]);
//,$orderDetail['order_type_value']
$detail
[
'packages'
]
=
CartModel
::
getPackageInfo
(
$orderDetail
);
//判断是否可以修改地址
$detail
[
'changeable'
]
=
$orderDetail
[
'can_update_delivery_address'
]
==
'Y'
?
'true'
:
'false'
;
// $detail['changeable'] = $orderDetail['can_update_delivery_address'] == 'Y' ? 'true' : 'false';
$detail
[
'changeable'
]
=
'true'
;
}
return
$detail
;
}
...
...
yohobuy/www.yohobuy.com/application/modules/Home/controllers/Orders.php
View file @
b55650e
...
...
@@ -267,7 +267,7 @@ class OrdersController extends WebAction
$address
=
$this
->
get
(
'address'
,
''
);
//地址
$mobile
=
$this
->
get
(
'mobile'
,
''
);
//手机号码
$phoneNum
=
$this
->
get
(
'phoneNum'
,
''
);
//固定电话
$phoneCode
=
$this
->
get
(
'phoneCode'
,
''
);
//
固定电话
$phoneCode
=
$this
->
get
(
'phoneCode'
,
''
);
//
电话编号
if
(
!
empty
(
$phoneNum
)
&&
!
empty
(
$phoneCode
)){
$phone
=
$phoneCode
.
'-'
.
$phoneNum
;
}
...
...
Please
register
or
login
to post a comment