Commit c6c79448 by 朱继来

fix

parent bc69f462
......@@ -1494,12 +1494,18 @@ Class OrderController extends Controller
public function changeShipping(Request $request, $id='')
{
if($request->isMethod('post')){
$data['map'] = $request->input();
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$data['order_id'] = $request->input('order_id','');
$data['operator_id'] = $request->user->userId;
$data['shipping_type'] = $request->input('shipping_type', 1);
$data['consignee'] = $request->input('consignee', '');
$data['mobile'] = $request->input('mobile', '');
$data['province'] = $request->input('province', 0);
$data['city'] = $request->input('city', 0);
$data['district'] = $request->input('district', '');
$data['address'] = $request->input('address', '');
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$data['order_id'] = $request->input('order_id','');
$data['operator_id'] = $request->user->userId;
$update_url = Config('website.api_domain').'order/updateOrderAddress';
......
......@@ -80,10 +80,10 @@ li {
.shipping-info select {
width: 150px;
}
.shipping-info textarea {
/*.shipping-info textarea {
width: 300px;
height: 100px;
}
}*/
.order-amount select, .order-invoice select, #inv_shipping_id{
height: 28px;
......
......@@ -182,7 +182,7 @@
<a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
@endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
@if (in_array($order_info['status'], array(2, 4)) && in_array('self_order_update_address', $userPerms))
@if (in_array($order_info['status'], array(1, 2, 4)) && in_array('self_order_update_address', $userPerms))
<a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
@endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment