Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 2a4c82a5 by 朱继来
Options

fix conflict

parents 14f9ef97 a27bbd7b
Inline Side-by-side
Showing with 20 additions and 7 deletions
public/css/detail.css
......@@ -152,7 +152,7 @@ li {
padding: 5px;
resize: none;
}
.preferential_price{ /* 优惠金额 */
.preferential_price, .extend_fee { /* 优惠金额、附加费 */
display: none;
}
......
public/js/add_order.js
......@@ -541,7 +541,7 @@
return false;
}
layer.msg(resp.errmsg);
layer.alert(resp.errmsg);
},
})
} else {
......@@ -669,6 +669,11 @@
$('.preferential_price_val').empty().text(data.preferential_price_format);
}
if (data.extend_fee) {
$('.extend_fee').show();
$('.extend_fee_val').empty().text(data.extend_fee_format); // 附加费
}
if (goods_type == 2) {
$('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
}
......
resources/views/addOnline/content.blade.php
......@@ -374,6 +374,11 @@
<p class="con-val preferential_price_val">0.00</p>
</div>
<div class="row extend_fee">
<p class="con-title"><span>附加费：</span></p>
<p class="con-val extend_fee_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>运费：</span></p>
<p class="con-val express_fee_val">0.00</p>
......
resources/views/addOrder/content.blade.php
......@@ -394,6 +394,11 @@
<p class="con-val preferential_price_val">0.00</p>
</div>
<div class="row extend_fee">
<p class="con-title"><span>附加费：</span></p>
<p class="con-val extend_fee_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>应付金额：</span></p>
<p class="con-val text-danger order_amount"></p>
......
resources/views/detail/content.blade.php
......@@ -202,7 +202,6 @@
@else
<th>收货地址</th>
@endif
<th>客户备注</th>
</tr>
<tr>
<td>
......@@ -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']}}
</td>
@endif
<td>{{$order_info['order_remark']}}</td>
</tr>
</table>
</div>
......
resources/views/selfOrder/content.blade.php
......@@ -18,6 +18,7 @@
<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="2">型号名称</li>
<li class="order_type_tab" data-val="3">发票抬头</li>
</ul>
</div>
</dd>
......@@ -47,7 +48,7 @@
</div>
</dd>
</dl>
<dl>
<!-- <dl>
<dt>客服：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
......@@ -59,7 +60,7 @@
</ul>
</div>
</dd>
</dl>
</dl> -->
<!-- 京东自营角色不显示订单来源 -->
@if ($role != 6)
<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