Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c712b775 by 朱继来
Options

Merge branch 'zjl_self_express_20181030' into development

parents e61b3197 0104987e
Inline Side-by-side
Showing with 63 additions and 16 deletions
app/Http/Controllers/OrderController.php
...@@ -1494,7 +1494,13 @@ Class OrderController extends Controller ...@@ -1494,7 +1494,13 @@ Class OrderController extends Controller
public function changeShipping(Request $request, $id='') public function changeShipping(Request $request, $id='')
{ {
if($request->isMethod('post')){ if($request->isMethod('post')){
$data['map'] = $request->input(); $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['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi'); $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
......
public/css/detail.css
...@@ -80,10 +80,10 @@ li { ...@@ -80,10 +80,10 @@ li {
.shipping-info select { .shipping-info select {
width: 150px; width: 150px;
} }
.shipping-info textarea { /*.shipping-info textarea {
width: 300px; width: 300px;
height: 100px; height: 100px;
} }*/
.order-amount select, .order-invoice select, #inv_shipping_id{ .order-amount select, .order-invoice select, #inv_shipping_id{
height: 28px; height: 28px;
......
resources/views/changeShipping/content.blade.php
...@@ -19,30 +19,41 @@ ...@@ -19,30 +19,41 @@
<div class="tabs-box shipping-info"> <div class="tabs-box shipping-info">
<form action="{{URL('changeShipping')}}" method="POST"> <form action="{{URL('changeShipping')}}" method="POST">
<input type="hidden" name="order_id" value="{{$detail['order_id']}}"> <input type="hidden" name="order_id" value="{{$detail['order_id']}}">
<table class="table"> <table class="table table-hover table-bordered">
<caption><h3>订单物流信息</h3></caption> <caption><h3>订单物流信息</h3></caption>
<tr> <tr>
<td>收货人</td> <th width="10%">配送方式</th>
<td colspan="3">
<label class="radio-inline">
<input type="radio" name="shipping_type" class="shipping_type" value="1"> 快递配送
</label>
<label class="radio-inline">
<input type="radio" name="shipping_type" class="shipping_type" value="2"> 上门自提
</label>
</td>
</tr>
<tr>
<th width="10%">收货人</th>
<td><input type="text" name="consignee" value="{{$detail['consignee']}}"></td> <td><input type="text" name="consignee" value="{{$detail['consignee']}}"></td>
<td>联系电话</td> <th width="10%">联系电话</th>
<td><input type="text" name="mobile" value="{{$detail['mobile']}}"></td> <td><input type="text" name="mobile" value="{{$detail['mobile']}}"></td>
</tr> </tr>
<tr class="address-info"> <tr class="address-info">
<td>收货地址</td> <th width="10%">收货地址</th>
<td><select class="address s_province" name="province" default="{{$detail['province']}}"></select></td> <td colspan="3">
<td><select class="address s_city" name="city" default="{{$detail['city']}}"></select></td> <select class="address s_province" name="province" default="{{$detail['province']}}"></select>
<td><select class="address s_county" name="district" default="{{$detail['district']}}"></select></td> <select class="address s_city" name="city" default="{{$detail['city']}}"></select>
<select class="address s_county" name="district" default="{{$detail['district']}}"></select>
</td>
</tr> </tr>
<tr> <tr>
<td>详细地址</td> <th width="10%">详细地址</th>
<td colspan="3"><textarea name="address" placeholder="请输入详细地址">{{$detail['address']}}</textarea></td> <td colspan="3"><textarea class="form-control" name="address" placeholder="请输入详细地址">{{$detail['address']}}</textarea></td>
</tr> </tr>
<tr> <tr>
<td><input type="submit" value="保存" class="btn btn-success"></td> <td colspan="4"><input type="submit" value="保存" class="btn btn-success"></td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</table> </table>
</form> </form>
...@@ -52,6 +63,35 @@ ...@@ -52,6 +63,35 @@
<script> <script>
var tags = "{{isset($_REQUEST['tags']) ? $_REQUEST['tags'] : ''}}"; var tags = "{{isset($_REQUEST['tags']) ? $_REQUEST['tags'] : ''}}";
var shipping_type = "{{isset($order_info) ? $order_info['order_shipping_type'] : 1}}";
var goods_type = "{{isset($order_info) ? $order_info['order_goods_type'] : 1}}";
$('.shipping_type').each(function() {
if ($(this).val() == shipping_type) {
$(this).attr('checked', true);
}
})
// 自提时隐藏省市区
if (shipping_type == 2) {
$('.address-info').hide();
}
if (goods_type == 2) {
var self_addr = '深圳市光明新区新湖街道楼村社区荔都路32号A栋三楼';
} else {
var self_addr = '深圳市龙岗区坂田五和大道南2号万科星火online六栋三楼猎芯科技';
}
$('.shipping_type').change(function() {
if ($(this).val() == 2) {
$('.address-info').hide();
$('textarea[name=address]').val(self_addr);
} else {
$('.address-info').show();
$('textarea[name=address]').val('');
}
})
$.lie.order.details(); $.lie.order.details();
</script> </script>
\ No newline at end of file
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