Skip to content

semour / semour_admin

Go to a project
Commit abab193f by 孙龙
Options

Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

parents ff758472 985c6cd7
Inline Side-by-side
Showing with 29 additions and 21 deletions
public/assets/js/order/index.js
...@@ -17,17 +17,17 @@ layui.use(['form', 'table', 'laydate'], function () { ...@@ -17,17 +17,17 @@ layui.use(['form', 'table', 'laydate'], function () {
//列表 //列表
table.render({ table.render({
elem: '#list', elem: '#list',
url: '/api/orderList?lang='+lang_str, url: '/api/orderList?lang=' + lang_str,
toolbar: '#toolbar', toolbar: '#toolbar',
method: 'GET', method: 'GET',
where: { where: {
order_id: order_id order_id: order_id
}, },
cols: [[ cols: [[
{type: 'numbers', fixed: true, title: translation.numbers, width: 60}, {type: 'numbers', fixed: true, title: translation.numbers, width: lang == 2 ? 80 : 60},
{field: 'goods_id', title: translation.goods_id, width: 164}, {field: 'goods_id', title: translation.goods_id, width: 164},
{field: 'goods_name', title: translation.goods_name, width: 164}, {field: 'goods_name', title: translation.goods_name, width: 164},
{field: 'standard_brand_name', title: translation.standard_brand_name, width: 120}, {field: 'standard_brand_name', title: translation.standard_brand_name, width: 154},
{field: 'supplier_name', title: translation.supplier_name, width: 120}, {field: 'supplier_name', title: translation.supplier_name, width: 120},
{field: 'raw_goods_sn', title: translation.raw_goods_sn, width: 160}, {field: 'raw_goods_sn', title: translation.raw_goods_sn, width: 160},
{field: 'raw_brand_name', title: translation.raw_brand_name, width: 160}, {field: 'raw_brand_name', title: translation.raw_brand_name, width: 160},
...@@ -52,12 +52,12 @@ layui.use(['form', 'table', 'laydate'], function () { ...@@ -52,12 +52,12 @@ layui.use(['form', 'table', 'laydate'], function () {
return '<span class="total_amount">' + d.total_amount + '</span>' return '<span class="total_amount">' + d.total_amount + '</span>'
} }
}, },
{field: 'delivery_time', title: translation.delivery_time, width: 120}, {field: 'delivery_time', title: translation.delivery_time, width: 120},
{field: 'batch', title: translation.batch, width: 120}, {field: 'batch', title: translation.batch, width: 120},
{field: 'remarks', title: translation.remarks, width: 120}, {field: 'remarks', title: translation.remarks, width: 120},
{ {
field: 'type_cn', title: translation.type_cn, width: 120, templet(d) { field: 'type_cn', title: translation.type_cn, width: 120, templet(d) {
return '<span>' + d.type_cn + '</span><div class="hide-input"><select class="input-style return_type" lay-ignore=""><option>'+translation.all+'</option><option value="1">'+translation.refund_of_returned_goods+'</option><option value="2">'+translation.refund_only+'</option></select></div>' return '<span>' + d.type_cn + '</span><div class="hide-input"><select class="input-style return_type" lay-ignore=""><option>' + translation.all + '</option><option value="1">' + translation.refund_of_returned_goods + '</option><option value="2">' + translation.refund_only + '</option></select></div>'
} }
}, },
{ {
...@@ -132,11 +132,7 @@ layui.use(['form', 'table', 'laydate'], function () { ...@@ -132,11 +132,7 @@ layui.use(['form', 'table', 'laydate'], function () {
$("#editOrderItems").empty().text(translation.modify); $("#editOrderItems").empty().text(translation.modify);
$("#editOrderItems").next().hide(); $("#editOrderItems").next().hide();
$("#order_remark").hide().next().show();//订单备注 $("#order_remark").hide().next().show();//订单备注
table.reload('list', { window.location.reload();
page: {
curr: 1
}
});
}); });
} else { } else {
layer.msg(res.msg); layer.msg(res.msg);
......
resources/views/admin/pages/order-page.blade.php
...@@ -85,13 +85,21 @@ ...@@ -85,13 +85,21 @@
} }
@if($info["lang"] == 2) @if($info["lang"] == 2)
.en-form .layui-inline .layui-form-label { .user-row {
flex: 0 0 48%;
}
.en-form .layui-form-label {
width: 169px; width: 169px;
} }
.en-form .layui-inline .layui-input-block { .en-form .layui-input-block {
margin-left: 169px; margin-left: 169px;
} }
.en-form .layui-input {
width: 204px;
}
@endif @endif
</style> </style>
...@@ -134,7 +142,7 @@ ...@@ -134,7 +142,7 @@
</div> </div>
</div> </div>
<!--商品信息--> <!--商品信息-->
<div class="layui-card"> <div class="layui-card en-form">
<div class="layui-card-header">{{admin_trans("order.order_page.商品信息")}}</div> <div class="layui-card-header">{{admin_trans("order.order_page.商品信息")}}</div>
<div class="layui-card-body layui-form" style="padding-top: 0" lay-filter="orderListForn"> <div class="layui-card-body layui-form" style="padding-top: 0" lay-filter="orderListForn">
<div id="list"></div> <div id="list"></div>
...@@ -167,7 +175,7 @@ ...@@ -167,7 +175,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row bothSide"> <div class="row bothSide en-form">
<!--收货信息--> <!--收货信息-->
<div class="user-row"> <div class="user-row">
<div class="layui-card"> <div class="layui-card">
...@@ -233,7 +241,7 @@ ...@@ -233,7 +241,7 @@
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-form-mid mid-width">{{$info['receiveInfo']['country_name']}}</div> <div class="layui-form-mid mid-width">{{$info['receiveInfo']['country_name']}}</div>
<div class="show" style="display: none;width: 158px;"> <div class="show" style="display: none;width: 158px;">
<input type="hidden" name="country_name" value=""> <input type="hidden" name="country_name" value="{{$info['receiveInfo']['country_name']}}">
<select data="1" name="country" lay-filter="countryChange" style="height: 30px;border: 1px solid #eee;background: transparent;width: 100%;"> <select data="1" name="country" lay-filter="countryChange" style="height: 30px;border: 1px solid #eee;background: transparent;width: 100%;">
<option value="">{{admin_trans("order.order_page.请选择国家")}}</option> <option value="">{{admin_trans("order.order_page.请选择国家")}}</option>
@foreach(\App\Models\Country::getCountryMap() as $cid=>$cname) @foreach(\App\Models\Country::getCountryMap() as $cid=>$cname)
...@@ -342,7 +350,7 @@ ...@@ -342,7 +350,7 @@
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-form-mid mid-width">{{$info['billingInfo']['country_name']}}</div> <div class="layui-form-mid mid-width">{{$info['billingInfo']['country_name']}}</div>
<div class="show" style="display: none;width: 158px;"> <div class="show" style="display: none;width: 158px;">
<input type="hidden" name="country_name" value=""> <input type="hidden" name="country_name" value="{{$info['billingInfo']['country_name']}}">
<select data="2" name="country" lay-filter="countryChange" style="height: 30px;border: 1px solid #eee;background: transparent;width: 100%;"> <select data="2" name="country" lay-filter="countryChange" style="height: 30px;border: 1px solid #eee;background: transparent;width: 100%;">
<option value="">{{admin_trans("order.order_page.请选择国家")}}</option> <option value="">{{admin_trans("order.order_page.请选择国家")}}</option>
@foreach(\App\Models\Country::getCountryMap() as $cid=>$cname) @foreach(\App\Models\Country::getCountryMap() as $cid=>$cname)
...@@ -380,7 +388,11 @@ ...@@ -380,7 +388,11 @@
<label class="layui-form-label">{{admin_trans("order.order_page.地址")}}：</label> <label class="layui-form-label">{{admin_trans("order.order_page.地址")}}：</label>
<div class="layui-input-block row verCenter"> <div class="layui-input-block row verCenter">
<div class="layui-form-mid">{{$info['billingInfo']['detail_address']}}</div> <div class="layui-form-mid">{{$info['billingInfo']['detail_address']}}</div>
<input type="text" class="layui-input show" name="detail_address" placeholder="" value="{{$info['billingInfo']['detail_address']}}" style="display: none;width: 427px;"> @if($info["lang"] == 2)
<input type="text" class="layui-input show" name="detail_address" placeholder="" value="{{$info['billingInfo']['detail_address']}}" style="display: none;">
@else
<input type="text" class="layui-input show" name="detail_address" placeholder="" value="{{$info['billingInfo']['detail_address']}}" style="display: none;width: 427px;">
@endif
<div class="show row verCenter" style="display: none;margin-left: 15px;"> <div class="show row verCenter" style="display: none;margin-left: 15px;">
<input type="checkbox" name="open" lay-skin="switch" lay-filter="switchChange" lay-text="{{admin_trans("order.order_page.同收货地址")}}|{{admin_trans("order.order_page.同收货地址")}}"> <input type="checkbox" name="open" lay-skin="switch" lay-filter="switchChange" lay-text="{{admin_trans("order.order_page.同收货地址")}}|{{admin_trans("order.order_page.同收货地址")}}">
</div> </div>
...@@ -391,7 +403,7 @@ ...@@ -391,7 +403,7 @@
</div> </div>
</div> </div>
<!--结算信息--> <!--结算信息-->
<div class="layui-card"> <div class="layui-card en-form">
<div class="layui-card-header">{{admin_trans("order.order_page.结算信息")}}</div> <div class="layui-card-header">{{admin_trans("order.order_page.结算信息")}}</div>
<div class="layui-card-body layui-form" style="width: 50%;" lay-filter="settlementInfoForm"> <div class="layui-card-body layui-form" style="width: 50%;" lay-filter="settlementInfoForm">
<input type="hidden" name="order_id" value="{{$info['receiveInfo']['order_id']}}"> <input type="hidden" name="order_id" value="{{$info['receiveInfo']['order_id']}}">
...@@ -410,14 +422,14 @@ ...@@ -410,14 +422,14 @@
<label class="layui-form-label">{{admin_trans("order.order_page.运费")}}：</label> <label class="layui-form-label">{{admin_trans("order.order_page.运费")}}：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-form-mid">{{$info['settlementInfo']['order_freight_amount_format']}}</div> <div class="layui-form-mid">{{$info['settlementInfo']['order_freight_amount_format']}}</div>
<input type="text" class="layui-input show change-num" name="freight_charge" placeholder="" value="{{$info['settlementInfo']['order_freight_amount']}}" style="display: none;width: 50%;"> <input type="number" min="0" class="layui-input show change-num" name="freight_charge" placeholder="" value="{{$info['settlementInfo']['order_freight_amount']}}" style="display: none;width: 50%;">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">{{admin_trans("order.order_page.支付手续费")}}：</label> <label class="layui-form-label">{{admin_trans("order.order_page.支付手续费")}}：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-form-mid">{{$info['settlementInfo']['order_pay_commission_amount_format']}}</div> <div class="layui-form-mid">{{$info['settlementInfo']['order_pay_commission_amount_format']}}</div>
<input type="text" class="layui-input show change-num" name="pay_commission" placeholder="" value="{{$info['settlementInfo']['order_pay_commission_amount']}}" style="display: none;width: 50%;"> <input type="number" min="0" class="layui-input show change-num" name="pay_commission" placeholder="" value="{{$info['settlementInfo']['order_pay_commission_amount']}}" style="display: none;width: 50%;">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
......
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