Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 030f9b9c by 朱继来
Options

Merge branch 'zjl_adjust_20181026' into development

parents b47b410b 54aa24ca
Inline Side-by-side
Showing with 3 additions and 5 deletions
resources/views/detail/content.blade.php
...@@ -202,7 +202,6 @@ ...@@ -202,7 +202,6 @@
@else @else
<th>收货地址</th> <th>收货地址</th>
@endif @endif
<th>客户备注</th>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -230,8 +229,6 @@ ...@@ -230,8 +229,6 @@
{{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}} {{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}}
</td> </td>
@endif @endif
<td>{{$order_info['order_remark']}}</td>
</tr> </tr>
</table> </table>
</div> </div>
......
resources/views/selfOrder/content.blade.php
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<li class="order_type_tab active" data-val="">会员账号</li> <li class="order_type_tab active" data-val="">会员账号</li>
<li class="order_type_tab" data-val="1">订单编号</li> <li class="order_type_tab" data-val="1">订单编号</li>
<li class="order_type_tab" data-val="2">型号名称</li> <li class="order_type_tab" data-val="2">型号名称</li>
<li class="order_type_tab" data-val="3">发票抬头</li>
</ul> </ul>
</div> </div>
</dd> </dd>
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
</div> </div>
</dd> </dd>
</dl> </dl>
<dl> <!-- <dl>
<dt>客服：</dt> <dt>客服：</dt>
<dd style="width: 115px;"> <dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" > <div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
</ul> </ul>
</div> </div>
</dd> </dd>
</dl> </dl> -->
<!-- 京东自营角色不显示订单来源 --> <!-- 京东自营角色不显示订单来源 -->
@if ($role != 6) @if ($role != 6)
<dl> <dl>
......
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