Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
semour
/
semour_admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
82d8f8f7
authored
Nov 28, 2022
by
孙龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
中英文翻译 -》 订单
parent
3f220f11
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
242 additions
and
112 deletions
app/Admin/Controllers/OrderController.php
app/Admin/Service/OrderService.php
public/assets/js/order/index.js
resources/lang/en/order.php
resources/lang/zh_CN/order.php
resources/views/admin/pages/order-page.blade.php
app/Admin/Controllers/OrderController.php
View file @
82d8f8f7
...
@@ -310,8 +310,7 @@ JS
...
@@ -310,8 +310,7 @@ JS
$info
[
"settlementInfo"
][
"order_user_pay_type_cn"
]
=
Arr
::
get
(
array_flip
(
Order
::
$ORDER_USER_PAY_TYPE
),
$orderInfo
[
"order_user_pay_type"
],
""
);
$info
[
"settlementInfo"
][
"order_user_pay_type_cn"
]
=
Arr
::
get
(
array_flip
(
Order
::
$ORDER_USER_PAY_TYPE
),
$orderInfo
[
"order_user_pay_type"
],
""
);
$info
[
"translation"
]
=
admin_trans
(
"order.order_page_list"
);
//dump($info);
//dump($info);
...
...
app/Admin/Service/OrderService.php
View file @
82d8f8f7
...
@@ -132,6 +132,8 @@ class OrderService extends BaseService
...
@@ -132,6 +132,8 @@ class OrderService extends BaseService
// "return_amount"=> decimal_number_format($orderItem["return_goods_number"] * $orderItem["return_goods_price"]),
// "return_amount"=> decimal_number_format($orderItem["return_goods_number"] * $orderItem["return_goods_price"]),
];
];
// dump($insertReturnItemData);
$createOrEdit
=
false
;
$createOrEdit
=
false
;
if
(
!
empty
(
$returnItems
)){
if
(
!
empty
(
$returnItems
)){
...
@@ -154,7 +156,11 @@ class OrderService extends BaseService
...
@@ -154,7 +156,11 @@ class OrderService extends BaseService
}
}
}
}
}
else
{
$createOrEdit
=
true
;
}
}
if
(
$createOrEdit
){
if
(
$createOrEdit
){
$insertReturnItemData
[
"return_amount"
]
=
decimal_number_format
(
$orderItem
[
"return_goods_number"
]
*
$orderItem
[
"return_goods_price"
]);
$insertReturnItemData
[
"return_amount"
]
=
decimal_number_format
(
$orderItem
[
"return_goods_number"
]
*
$orderItem
[
"return_goods_price"
]);
}
}
...
...
public/assets/js/order/index.js
View file @
82d8f8f7
...
@@ -24,54 +24,54 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -24,54 +24,54 @@ layui.use(['form', 'table', 'laydate'], function () {
order_id
:
order_id
order_id
:
order_id
},
},
cols
:
[[
cols
:
[[
{
type
:
'numbers'
,
fixed
:
true
,
title
:
'序号'
,
width
:
60
},
{
type
:
'numbers'
,
fixed
:
true
,
title
:
translation
.
numbers
,
width
:
60
},
{
field
:
'goods_id'
,
title
:
'SKUID'
,
width
:
164
},
{
field
:
'goods_id'
,
title
:
translation
.
goods_id
,
width
:
164
},
{
field
:
'goods_name'
,
title
:
'商品型号'
,
width
:
164
},
{
field
:
'goods_name'
,
title
:
translation
.
goods_name
,
width
:
164
},
{
field
:
'standard_brand_name'
,
title
:
'标准品牌'
,
width
:
120
},
{
field
:
'standard_brand_name'
,
title
:
translation
.
standard_brand_name
,
width
:
120
},
{
field
:
'supplier_name'
,
title
:
'供应商'
,
width
:
120
},
{
field
:
'supplier_name'
,
title
:
translation
.
supplier_name
,
width
:
120
},
{
field
:
'raw_goods_sn'
,
title
:
'供应商物料唯一编码'
,
width
:
160
},
{
field
:
'raw_goods_sn'
,
title
:
translation
.
raw_goods_sn
,
width
:
160
},
{
field
:
'raw_brand_name'
,
title
:
'供应商物料品牌'
,
width
:
160
},
{
field
:
'raw_brand_name'
,
title
:
translation
.
raw_brand_name
,
width
:
160
},
{
field
:
'purchase_name'
,
title
:
'采购员'
,
width
:
120
},
{
field
:
'purchase_name'
,
title
:
translation
.
purchase_name
,
width
:
120
},
{
{
field
:
''
,
title
:
'币种'
,
width
:
80
,
templet
(
d
)
{
field
:
''
,
title
:
translation
.
currncy
,
width
:
80
,
templet
(
d
)
{
return
'美元'
return
'美元'
}
}
},
},
{
{
field
:
'goods_price'
,
title
:
'单价'
,
width
:
120
,
templet
(
d
)
{
field
:
'goods_price'
,
title
:
translation
.
goods_price
,
width
:
120
,
templet
(
d
)
{
return
'<span>'
+
d
.
goods_price
+
'</span><input data-order-items-id="'
+
d
.
rec_id
+
'" class="hide-input input-style goods_price" value="'
+
d
.
goods_price
+
'"/>'
return
'<span>'
+
d
.
goods_price
+
'</span><input data-order-items-id="'
+
d
.
rec_id
+
'" class="hide-input input-style goods_price" value="'
+
d
.
goods_price
+
'"/>'
}
}
},
},
{
{
field
:
'goods_number'
,
title
:
'数量'
,
width
:
120
,
templet
(
d
)
{
field
:
'goods_number'
,
title
:
translation
.
goods_number
,
width
:
120
,
templet
(
d
)
{
return
'<span>'
+
d
.
goods_number
+
'</span><input class="hide-input input-style goods_number" value="'
+
d
.
goods_number
+
'"/>'
return
'<span>'
+
d
.
goods_number
+
'</span><input class="hide-input input-style goods_number" value="'
+
d
.
goods_number
+
'"/>'
}
}
},
},
{
{
field
:
'total_amount'
,
title
:
'小计'
,
width
:
120
,
templet
(
d
)
{
field
:
'total_amount'
,
title
:
translation
.
total_amount
,
width
:
120
,
templet
(
d
)
{
return
'<span class="total_amount">'
+
d
.
total_amount
+
'</span>'
return
'<span class="total_amount">'
+
d
.
total_amount
+
'</span>'
}
}
},
},
{
field
:
'delivery_time'
,
title
:
'货期'
,
width
:
120
},
{
field
:
'delivery_time'
,
title
:
translation
.
delivery_time
,
width
:
120
},
{
field
:
'batch'
,
title
:
'批次'
,
width
:
120
},
{
field
:
'batch'
,
title
:
translation
.
batch
,
width
:
120
},
{
field
:
'remarks'
,
title
:
'客户备注'
,
width
:
120
},
{
field
:
'remarks'
,
title
:
translation
.
remarks
,
width
:
120
},
{
{
field
:
'type_cn'
,
title
:
'售后类型'
,
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>
全部</option><option value="1">退货退款</option><option value="2">仅退款
</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>'
}
}
},
},
{
{
field
:
'return_num'
,
title
:
'售后数量'
,
width
:
120
,
templet
(
d
)
{
field
:
'return_num'
,
title
:
translation
.
return_num
,
width
:
120
,
templet
(
d
)
{
return
'<span>'
+
d
.
return_num
+
'</span><input class="hide-input input-style return_goods_number" value="'
+
d
.
return_num
+
'"/>'
return
'<span>'
+
d
.
return_num
+
'</span><input class="hide-input input-style return_goods_number" value="'
+
d
.
return_num
+
'"/>'
}
}
},
},
{
{
field
:
'return_price'
,
title
:
'售后单价'
,
width
:
120
,
templet
(
d
)
{
field
:
'return_price'
,
title
:
translation
.
return_price
,
width
:
120
,
templet
(
d
)
{
return
'<span>'
+
d
.
return_price
+
'</span><input class="hide-input input-style return_goods_price" value="'
+
d
.
return_price
+
'"/>'
return
'<span>'
+
d
.
return_price
+
'</span><input class="hide-input input-style return_goods_price" value="'
+
d
.
return_price
+
'"/>'
}
}
},
},
{
{
field
:
'return_amount'
,
title
:
'售后金额'
,
width
:
120
,
templet
(
d
)
{
field
:
'return_amount'
,
title
:
translation
.
return_amount
,
width
:
120
,
templet
(
d
)
{
return
'<span>'
+
d
.
return_amount
+
'</span><input class="hide-input input-style return_amount" value="'
+
d
.
return_amount
+
'"/>'
return
'<span>'
+
d
.
return_amount
+
'</span><input class="hide-input input-style return_amount" value="'
+
d
.
return_amount
+
'"/>'
}
}
}
}
...
@@ -108,7 +108,7 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -108,7 +108,7 @@ layui.use(['form', 'table', 'laydate'], function () {
//修改
//修改
case
'editOrderItems'
:
case
'editOrderItems'
:
var
text
=
$
(
"#editOrderItems"
).
text
();
var
text
=
$
(
"#editOrderItems"
).
text
();
if
(
text
==
'保存'
)
{
if
(
text
==
translation
.
save
)
{
var
order_items
=
[];
var
order_items
=
[];
$
(
".layui-table-main tr"
).
each
(
function
(
index
,
element
)
{
$
(
".layui-table-main tr"
).
each
(
function
(
index
,
element
)
{
order_items
.
push
({
order_items
.
push
({
...
@@ -128,8 +128,8 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -128,8 +128,8 @@ layui.use(['form', 'table', 'laydate'], function () {
}
}
Request
(
'/api/order/editOrderItems'
,
'POST'
,
params
,
function
(
res
)
{
Request
(
'/api/order/editOrderItems'
,
'POST'
,
params
,
function
(
res
)
{
if
(
res
.
code
===
0
)
{
if
(
res
.
code
===
0
)
{
layer
.
msg
(
'修改成功'
,
{
shift
:
0
,
time
:
2000
},
function
()
{
layer
.
msg
(
translation
.
modified_success
,
{
shift
:
0
,
time
:
2000
},
function
()
{
$
(
"#editOrderItems"
).
empty
().
text
(
'修改'
);
$
(
"#editOrderItems"
).
empty
().
text
(
translation
.
modify
);
$
(
"#editOrderItems"
).
next
().
hide
();
$
(
"#editOrderItems"
).
next
().
hide
();
$
(
"#order_remark"
).
hide
().
next
().
show
();
//订单备注
$
(
"#order_remark"
).
hide
().
next
().
show
();
//订单备注
table
.
reload
(
'list'
,
{
table
.
reload
(
'list'
,
{
...
@@ -144,7 +144,7 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -144,7 +144,7 @@ layui.use(['form', 'table', 'laydate'], function () {
});
});
return
false
;
return
false
;
}
}
$
(
"#editOrderItems"
).
empty
().
text
(
'保存'
);
$
(
"#editOrderItems"
).
empty
().
text
(
translation
.
save
);
$
(
"#editOrderItems"
).
next
().
show
();
$
(
"#editOrderItems"
).
next
().
show
();
$
(
"#order_remark"
).
show
().
next
().
hide
();
//订单备注
$
(
"#order_remark"
).
show
().
next
().
hide
();
//订单备注
$
(
".layui-table-main tr"
).
each
(
function
(
index
,
element
)
{
$
(
".layui-table-main tr"
).
each
(
function
(
index
,
element
)
{
...
@@ -153,7 +153,7 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -153,7 +153,7 @@ layui.use(['form', 'table', 'laydate'], function () {
break
;
break
;
//取消
//取消
case
'canel'
:
case
'canel'
:
$
(
"#editOrderItems"
).
empty
().
text
(
'修改'
);
$
(
"#editOrderItems"
).
empty
().
text
(
translation
.
modify
);
$
(
"#editOrderItems"
).
next
().
hide
();
$
(
"#editOrderItems"
).
next
().
hide
();
$
(
"#order_remark"
).
hide
().
next
().
show
();
//订单备注
$
(
"#order_remark"
).
hide
().
next
().
show
();
//订单备注
table
.
reloadData
(
'list'
,
{
table
.
reloadData
(
'list'
,
{
...
@@ -192,8 +192,8 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -192,8 +192,8 @@ layui.use(['form', 'table', 'laydate'], function () {
//收货信息
//收货信息
layui
.
form
.
on
(
'submit(receiveInfoSubmit)'
,
function
(
data
)
{
layui
.
form
.
on
(
'submit(receiveInfoSubmit)'
,
function
(
data
)
{
var
text
=
$
(
data
.
elem
).
text
();
var
text
=
$
(
data
.
elem
).
text
();
if
(
text
==
'修改'
)
{
if
(
text
==
translation
.
modify
)
{
$
(
data
.
elem
).
text
(
'保存'
);
$
(
data
.
elem
).
text
(
translation
.
save
);
$
(
data
.
elem
).
next
().
show
();
$
(
data
.
elem
).
next
().
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
hide
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
hide
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
show
();
...
@@ -201,7 +201,7 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -201,7 +201,7 @@ layui.use(['form', 'table', 'laydate'], function () {
}
else
{
}
else
{
Request
(
'/api/order/editOrderAdress'
,
'POST'
,
data
.
field
,
function
(
res
)
{
Request
(
'/api/order/editOrderAdress'
,
'POST'
,
data
.
field
,
function
(
res
)
{
if
(
res
.
code
==
0
)
{
if
(
res
.
code
==
0
)
{
layer
.
msg
(
'操作成功'
,
{
shift
:
0
,
time
:
2000
},
function
()
{
layer
.
msg
(
translation
.
operation_success
,
{
shift
:
0
,
time
:
2000
},
function
()
{
layer
.
closeAll
();
layer
.
closeAll
();
window
.
location
.
reload
();
window
.
location
.
reload
();
});
});
...
@@ -216,8 +216,8 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -216,8 +216,8 @@ layui.use(['form', 'table', 'laydate'], function () {
//账单邮寄信息
//账单邮寄信息
layui
.
form
.
on
(
'submit(billingInfoSubmit)'
,
function
(
data
)
{
layui
.
form
.
on
(
'submit(billingInfoSubmit)'
,
function
(
data
)
{
var
text
=
$
(
data
.
elem
).
text
();
var
text
=
$
(
data
.
elem
).
text
();
if
(
text
==
'修改'
)
{
if
(
text
==
translation
.
modify
)
{
$
(
data
.
elem
).
text
(
'保存'
);
$
(
data
.
elem
).
text
(
translation
.
save
);
$
(
data
.
elem
).
next
().
show
();
$
(
data
.
elem
).
next
().
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
hide
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
hide
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
show
();
...
@@ -225,7 +225,7 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -225,7 +225,7 @@ layui.use(['form', 'table', 'laydate'], function () {
}
else
{
}
else
{
Request
(
'/api/order/editOrderAdress'
,
'POST'
,
data
.
field
,
function
(
res
)
{
Request
(
'/api/order/editOrderAdress'
,
'POST'
,
data
.
field
,
function
(
res
)
{
if
(
res
.
code
==
0
)
{
if
(
res
.
code
==
0
)
{
layer
.
msg
(
'操作成功'
,
{
shift
:
0
,
time
:
2000
},
function
()
{
layer
.
msg
(
translation
.
operation_success
,
{
shift
:
0
,
time
:
2000
},
function
()
{
layer
.
closeAll
();
layer
.
closeAll
();
window
.
location
.
reload
();
window
.
location
.
reload
();
});
});
...
@@ -240,8 +240,9 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -240,8 +240,9 @@ layui.use(['form', 'table', 'laydate'], function () {
//结算信息
//结算信息
layui
.
form
.
on
(
'submit(settlementInfoSubmit)'
,
function
(
data
)
{
layui
.
form
.
on
(
'submit(settlementInfoSubmit)'
,
function
(
data
)
{
var
text
=
$
(
data
.
elem
).
text
();
var
text
=
$
(
data
.
elem
).
text
();
if
(
text
==
'修改'
)
{
$
(
data
.
elem
).
text
(
'保存'
);
if
(
text
==
translation
.
modify
)
{
$
(
data
.
elem
).
text
(
translation
.
save
);
$
(
data
.
elem
).
next
().
show
();
$
(
data
.
elem
).
next
().
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
hide
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
hide
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
show
();
...
@@ -249,7 +250,7 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -249,7 +250,7 @@ layui.use(['form', 'table', 'laydate'], function () {
}
else
{
}
else
{
Request
(
'/api/order/editOrderSettlement'
,
'POST'
,
data
.
field
,
function
(
res
)
{
Request
(
'/api/order/editOrderSettlement'
,
'POST'
,
data
.
field
,
function
(
res
)
{
if
(
res
.
code
==
0
)
{
if
(
res
.
code
==
0
)
{
layer
.
msg
(
'操作成功'
,
{
shift
:
0
,
time
:
2000
},
function
()
{
layer
.
msg
(
translation
.
operation_success
,
{
shift
:
0
,
time
:
2000
},
function
()
{
layer
.
closeAll
();
layer
.
closeAll
();
window
.
location
.
reload
();
window
.
location
.
reload
();
});
});
...
@@ -264,7 +265,7 @@ layui.use(['form', 'table', 'laydate'], function () {
...
@@ -264,7 +265,7 @@ layui.use(['form', 'table', 'laydate'], function () {
//取消
//取消
layui
.
form
.
on
(
'submit(canelSubmit)'
,
function
(
data
)
{
layui
.
form
.
on
(
'submit(canelSubmit)'
,
function
(
data
)
{
$
(
data
.
elem
).
hide
();
$
(
data
.
elem
).
hide
();
$
(
data
.
elem
).
prev
().
empty
().
text
(
'修改'
);
$
(
data
.
elem
).
prev
().
empty
().
text
(
translation
.
modify
);
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
prev
().
show
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
hide
();
$
(
data
.
elem
).
parent
().
parent
().
find
(
'.show'
).
hide
();
});
});
...
...
resources/lang/en/order.php
View file @
82d8f8f7
...
@@ -28,8 +28,6 @@ return [
...
@@ -28,8 +28,6 @@ return [
"50001"
=>
"只能修改不是待审核的订单状态"
,
"50001"
=>
"只能修改不是待审核的订单状态"
,
"50002"
=>
"取消订单失败"
,
"50002"
=>
"取消订单失败"
,
"50003"
=>
"修改订单失败"
,
"50003"
=>
"修改订单失败"
,
"50004"
=>
"修改结算信息失败"
,
"50005"
=>
"没找到订单相关数据"
,
],
],
"validator"
=>
[
"validator"
=>
[
'order_id_required'
=>
'订单id必填'
,
'order_id_required'
=>
'订单id必填'
,
...
@@ -76,4 +74,65 @@ return [
...
@@ -76,4 +74,65 @@ return [
"-1"
=>
"已取消"
,
"-1"
=>
"已取消"
,
],
],
],
],
"order_page"
=>
[
"基本信息"
=>
"Basic Information"
,
"订单编号"
=>
"Order No."
,
"订单状态"
=>
"Order status"
,
"公司名称"
=>
"Name of Company"
,
"客户编码"
=>
"Customer code"
,
"联系人"
=>
"Contact Person"
,
"商品信息"
=>
"Product Information"
,
"订单备注"
=>
"Remarks"
,
"商品总金额"
=>
"Total amount"
,
"退款总金额"
=>
"Total refund Amount"
,
"收货信息"
=>
"Receiving information"
,
"修改"
=>
"modify"
,
"取消"
=>
"cancel"
,
"快递公司"
=>
"Express delivery company"
,
"快递单号"
=>
"Express tracking number"
,
"邮箱"
=>
"email"
,
"电话"
=>
"phone"
,
"国家地区"
=>
"Country/region"
,
"请选择国家"
=>
"Please select country"
,
"省州"
=>
"Province/State"
,
"城市"
=>
"city"
,
"邮编"
=>
"Zip code"
,
"地址"
=>
"address"
,
"账单邮寄信息"
=>
"Bill mailing Information"
,
"同收货地址"
=>
"Same as the delivery address"
,
"结算信息"
=>
"Information of settlement"
,
"运费"
=>
"The freight"
,
"支付手续费"
=>
"Pay service fee"
,
"支付方式"
=>
"Pay service fee"
,
"订单总金额"
=>
"Total order amount"
,
],
"order_page_list"
=>
[
"numbers"
=>
"numbers"
,
"goods_id"
=>
"SKUID"
,
"goods_name"
=>
"goods_name"
,
"standard_brand_name"
=>
"standard_brand_name"
,
"supplier_name"
=>
"supplier_name"
,
"raw_goods_sn"
=>
"raw_goods_sn"
,
"raw_brand_name"
=>
"raw_brand_name"
,
"purchase_name"
=>
"purchase_name"
,
"currncy"
=>
"currency"
,
"goods_price"
=>
"goods_price"
,
"goods_number"
=>
"goods_number"
,
"total_amount"
=>
"total_amount"
,
"delivery_time"
=>
"delivery_time"
,
"batch"
=>
"batch"
,
"remarks"
=>
"remarks"
,
"type_cn"
=>
"type_cn"
,
"return_num"
=>
"return_num"
,
"return_amount"
=>
"return_amount"
,
"return_price"
=>
"return_price"
,
"all"
=>
"all"
,
"refund_of_returned_goods"
=>
"refund_of_returned_goods"
,
"refund_only"
=>
"refund_only"
,
"modified_success"
=>
"modified_success"
,
"modify"
=>
"modify"
,
"save"
=>
"save"
,
"operation_success"
=>
"operation_success"
,
]
];
];
resources/lang/zh_CN/order.php
View file @
82d8f8f7
...
@@ -74,4 +74,65 @@ return [
...
@@ -74,4 +74,65 @@ return [
"-1"
=>
"已取消"
,
"-1"
=>
"已取消"
,
],
],
],
],
"order_page"
=>
[
"基本信息"
=>
"基本信息"
,
"订单编号"
=>
"订单编号"
,
"订单状态"
=>
"订单状态"
,
"公司名称"
=>
"公司名称"
,
"客户编码"
=>
"客户编码"
,
"联系人"
=>
"联系人"
,
"商品信息"
=>
"商品信息"
,
"订单备注"
=>
"订单备注"
,
"商品总金额"
=>
"商品总金额"
,
"退款总金额"
=>
"退款总金额"
,
"收货信息"
=>
"收货信息"
,
"修改"
=>
"修改"
,
"取消"
=>
"取消"
,
"快递公司"
=>
"快递公司"
,
"快递单号"
=>
"快递单号"
,
"邮箱"
=>
"邮箱"
,
"电话"
=>
"电话"
,
"国家地区"
=>
"国家/地区"
,
"请选择国家"
=>
"请选择国家"
,
"省州"
=>
"省/州"
,
"城市"
=>
"城市"
,
"邮编"
=>
"邮编"
,
"地址"
=>
"地址"
,
"账单邮寄信息"
=>
"账单邮寄信息"
,
"同收货地址"
=>
"同收货地址"
,
"结算信息"
=>
"结算信息"
,
"运费"
=>
"运费"
,
"支付手续费"
=>
"支付手续费"
,
"支付方式"
=>
"支付方式"
,
"订单总金额"
=>
"订单总金额"
,
],
"order_page_list"
=>
[
"numbers"
=>
"序号"
,
"goods_id"
=>
"SKUID"
,
"goods_name"
=>
"商品型号"
,
"standard_brand_name"
=>
"标准品牌"
,
"supplier_name"
=>
"供应商"
,
"raw_goods_sn"
=>
"供应商物料唯一编码"
,
"raw_brand_name"
=>
"供应商物料品牌"
,
"purchase_name"
=>
"采购员"
,
"currncy"
=>
"币种"
,
"goods_price"
=>
"单价"
,
"goods_number"
=>
"数量"
,
"total_amount"
=>
"小计"
,
"delivery_time"
=>
"货期"
,
"batch"
=>
"批次"
,
"remarks"
=>
"客户备注"
,
"type_cn"
=>
"售后类型"
,
"return_num"
=>
"售后数量"
,
"return_amount"
=>
"售后金额"
,
"return_price"
=>
"售后单价"
,
"all"
=>
"全部"
,
"refund_of_returned_goods"
=>
"退货退款"
,
"refund_only"
=>
"仅退款"
,
"modified_success"
=>
"修改成功"
,
"modify"
=>
"修改"
,
"save"
=>
"保存"
,
"operation_success"
=>
"操作成功"
,
]
];
];
resources/views/admin/pages/order-page.blade.php
View file @
82d8f8f7
...
@@ -89,34 +89,34 @@
...
@@ -89,34 +89,34 @@
<input type="
hidden
" id="
order_id
" value="
{{
$info
[
'receiveInfo'
][
'order_id'
]}}
">
<input type="
hidden
" id="
order_id
" value="
{{
$info
[
'receiveInfo'
][
'order_id'
]}}
">
<!--基本信息-->
<!--基本信息-->
<div class="
layui
-
card
">
<div class="
layui
-
card
">
<div class="
layui
-
card
-
header
">
基本信息
</div>
<div class="
layui
-
card
-
header
">
{
{admin_trans("order.order_page.基本信息")}
}
</div>
<div class="
layui
-
card
-
body
layui
-
form
">
<div class="
layui
-
card
-
body
layui
-
form
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
订单编号
:</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['baseInfo']['order_sn']}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info['baseInfo']['order_sn']}
}
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
订单状态
:</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['baseInfo']['status_cn']}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info['baseInfo']['status_cn']}
}
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
公司名称
:</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['baseInfo']['company_name']}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info['baseInfo']['company_name']}
}
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
客户编码
:</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['baseInfo']['user_sn']}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info['baseInfo']['user_sn']}
}
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
联系人
:</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['baseInfo']['name']}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info['baseInfo']['name']}
}
</div>
</div>
</div>
...
@@ -125,13 +125,13 @@
...
@@ -125,13 +125,13 @@
</div>
</div>
<!--商品信息-->
<!--商品信息-->
<div class="
layui
-
card
">
<div class="
layui
-
card
">
<div class="
layui
-
card
-
header
">
商品信息
</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>
<div class="
row
bothSide
verCenter
">
<div class="
row
bothSide
verCenter
">
<div class="
user
-
row
">
<div class="
user
-
row
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<label class="
layui
-
form
-
label
">
订单备注
:</label>
<label class="
layui
-
form
-
label
">
{
{admin_trans("order.order_page.订单备注")}
}
:</label>
<div class="
layui
-
input
-
block
">
<div class="
layui
-
input
-
block
">
<input type="
text
" class="
layui
-
input
" placeholder="
请输入备注
" id="
order_remark
" style="
display
:
none
;
" name="
order_remark
"/>
<input type="
text
" class="
layui
-
input
" placeholder="
请输入备注
" id="
order_remark
" style="
display
:
none
;
" name="
order_remark
"/>
<div class="
layui
-
form
-
mid
mid
-
width
">客户选择TT支付,这是备注........</div>
<div class="
layui
-
form
-
mid
mid
-
width
">客户选择TT支付,这是备注........</div>
...
@@ -141,13 +141,13 @@
...
@@ -141,13 +141,13 @@
<div class="
user
-
row
">
<div class="
user
-
row
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
商品总金额
:</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
mid
-
width
" id="
order_amount
">--</div>
<div class="
layui
-
form
-
mid
mid
-
width
" id="
order_amount
">--</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
退款总金额
:</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
mid
-
width
" id="
return_order_amount
">--</div>
<div class="
layui
-
form
-
mid
mid
-
width
" id="
return_order_amount
">--</div>
</div>
</div>
...
@@ -161,71 +161,71 @@
...
@@ -161,71 +161,71 @@
<!--收货信息-->
<!--收货信息-->
<div class="
user
-
row
">
<div class="
user
-
row
">
<div class="
layui
-
card
">
<div class="
layui
-
card
">
<div class="
layui
-
card
-
header
">
收货信息
</div>
<div class="
layui
-
card
-
header
">
{
{admin_trans("order.order_page.收货信息")}
}
</div>
<div class="
layui
-
card
-
body
layui
-
form
" lay-filter="
receiveInfo
">
<div class="
layui
-
card
-
body
layui
-
form
" lay-filter="
receiveInfo
">
<input type="
hidden
" name="
order_id
" value="
{{
$info
[
'receiveInfo'
][
'order_id'
]}}
">
<input type="
hidden
" name="
order_id
" value="
{{
$info
[
'receiveInfo'
][
'order_id'
]}}
">
<input type="
hidden
" name="
order_address_type
" value="
1
">
<input type="
hidden
" name="
order_address_type
" value="
1
">
<div class="
btn
-
box
">
<div class="
btn
-
box
">
<button class="
layui
-
btn
layui
-
btn
-
sm
" lay-submit="" lay-filter="
receiveInfoSubmit
">
修改
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
" lay-submit="" lay-filter="
receiveInfoSubmit
">
{
{admin_trans("order.order_page.修改")}
}
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
canel
" lay-submit="" lay-filter="
canelSubmit
" style="
margin
-
left
:
0
;
margin
-
top
:
10
px
;
">
取消
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
canel
" lay-submit="" lay-filter="
canelSubmit
" style="
margin
-
left
:
0
;
margin
-
top
:
10
px
;
">
{
{admin_trans("order.order_page.取消")}
}
</button>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
快递公司
:</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
mid
-
width
">
{
{$info['receiveInfo']['shipping_name']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['shipping_name']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
shipping_name
" placeholder="
请输入快递公司
" value="
{{
$info
[
'receiveInfo'
][
'shipping_name'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
shipping_name
" placeholder="
{{
admin_trans
(
"order.order_page.快递公司"
)}}
" value="
{{
$info
[
'receiveInfo'
][
'shipping_name'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
快递单号
:</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
mid
-
width
">
{
{$info['receiveInfo']['shipping_sn']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['shipping_sn']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
shipping_sn
" placeholder="
请输入快递单号
" value="
{{
$info
[
'receiveInfo'
][
'shipping_sn'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
shipping_sn
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'shipping_sn'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
联系人
:</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
mid
-
width
">
{
{$info['receiveInfo']['consignee']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['consignee']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
consignee
" placeholder="
请输入联系人
" value="
{{
$info
[
'receiveInfo'
][
'consignee'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
consignee
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'consignee'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
公司名称
:</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
mid
-
width
">
{
{$info['receiveInfo']['company_name']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['company_name']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
company_name
" placeholder="
请输入公司名称
" value="
{{
$info
[
'receiveInfo'
][
'company_name'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
company_name
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'company_name'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
邮箱
:</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
mid
-
width
">
{
{$info['receiveInfo']['email']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['email']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
email
" placeholder="
请输入邮箱
" value="
{{
$info
[
'receiveInfo'
][
'email'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
email
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'email'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
电话
:</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
mid
-
width
">
{
{$info['receiveInfo']['phone']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['phone']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
phone
" placeholder="
请输入电话
" value="
{{
$info
[
'receiveInfo'
][
'phone'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
phone
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'phone'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
国家/地区
:</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
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
:
158
px
;
">
<div class="
show
" style="
display
:
none
;
width
:
158
px
;
">
<input type="
hidden
" name="
country_name
" value="">
<input type="
hidden
" name="
country_name
" value="">
<select data="
1
" name="
country
" lay-filter="
countryChange
" style="
height
:
30
px
;
border
:
1
px
solid
#eee;background: transparent;width: 100%;">
<select data="
1
" name="
country
" lay-filter="
countryChange
" style="
height
:
30
px
;
border
:
1
px
solid
#eee;background: transparent;width: 100%;">
<
option
value
=
""
>
请选择国家
</
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
)
<
option
@
if
(
$info
[
'receiveInfo'
][
'country'
]
==
$cid
)
selected
@
endif
data
=
"
{
{$cname}
}
"
value
=
"
{
{$cid}}">{{$cname}
}
</option>
<
option
@
if
(
$info
[
'receiveInfo'
][
'country'
]
==
$cid
)
selected
@
endif
data
=
"
{
{$cname}
}
"
value
=
"
{
{$cid}}">{{$cname}
}
</option>
@endforeach
@endforeach
...
@@ -234,34 +234,34 @@
...
@@ -234,34 +234,34 @@
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
省/州
:</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
mid
-
width
">
{
{$info['receiveInfo']['province']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['province']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
province
" placeholder="
请输入省
/
州
" value="
{{
$info
[
'receiveInfo'
][
'province'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
province
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'province'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
城市
:</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
mid
-
width
">
{
{$info['receiveInfo']['city']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['city']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
city
" placeholder="
请输入城市
" value="
{{
$info
[
'receiveInfo'
][
'city'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
city
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'city'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
邮编
:</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
mid
-
width
">
{
{$info['receiveInfo']['post_code']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['receiveInfo']['post_code']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
post_code
" placeholder="
请输入邮编
" value="
{{
$info
[
'receiveInfo'
][
'post_code'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
post_code
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'post_code'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<label class="
layui
-
form
-
label
">
地址
:</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['receiveInfo']['detail_address']}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info['receiveInfo']['detail_address']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
detail_address
" placeholder="
请输入地址
" value="
{{
$info
[
'receiveInfo'
][
'detail_address'
]}}
" style="
display
:
none
;
width
:
427
px
;
">
<input type="
text
" class="
layui
-
input
show
" name="
detail_address
" placeholder="" value="
{{
$info
[
'receiveInfo'
][
'detail_address'
]}}
" style="
display
:
none
;
width
:
427
px
;
">
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -270,71 +270,71 @@
...
@@ -270,71 +270,71 @@
<!--账单邮寄信息-->
<!--账单邮寄信息-->
<div class="
user
-
row
">
<div class="
user
-
row
">
<div class="
layui
-
card
">
<div class="
layui
-
card
">
<div class="
layui
-
card
-
header
">
账单邮寄信息
</div>
<div class="
layui
-
card
-
header
">
{
{admin_trans("order.order_page.账单邮寄信息")}
}
</div>
<div class="
layui
-
card
-
body
layui
-
form
" lay-filter="
billingInfo
">
<div class="
layui
-
card
-
body
layui
-
form
" lay-filter="
billingInfo
">
<input type="
hidden
" name="
order_id
" value="
{{
$info
[
'receiveInfo'
][
'order_id'
]}}
">
<input type="
hidden
" name="
order_id
" value="
{{
$info
[
'receiveInfo'
][
'order_id'
]}}
">
<input type="
hidden
" name="
order_address_type
" value="
2
">
<input type="
hidden
" name="
order_address_type
" value="
2
">
<div class="
btn
-
box
">
<div class="
btn
-
box
">
<button class="
layui
-
btn
layui
-
btn
-
sm
" lay-submit="" lay-filter="
billingInfoSubmit
">
修改
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
" lay-submit="" lay-filter="
billingInfoSubmit
">
{
{admin_trans("order.order_page.修改")}
}
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
canel
" lay-submit="" lay-filter="
canelSubmit
" style="
margin
-
left
:
0
;
margin
-
top
:
10
px
;
">
取消
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
canel
" lay-submit="" lay-filter="
canelSubmit
" style="
margin
-
left
:
0
;
margin
-
top
:
10
px
;
">
{
{admin_trans("order.order_page.取消")}
}
</button>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
快递公司
:</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
mid
-
width
">
{
{$info['billingInfo']['shipping_name']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['shipping_name']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
shipping_name
" placeholder="
请输入快递公司
" value="
{{
$info
[
'billingInfo'
][
'shipping_name'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
shipping_name
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'shipping_name'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
快递单号
:</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
mid
-
width
">
{
{$info['billingInfo']['shipping_sn']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['shipping_sn']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
shipping_sn
" placeholder="
请输入快递单号
" value="
{{
$info
[
'billingInfo'
][
'shipping_sn'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
shipping_sn
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'shipping_sn'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
联系人
:</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
mid
-
width
">
{
{$info['billingInfo']['consignee']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['consignee']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
consignee
" placeholder="
请输入联系人
" value="
{{
$info
[
'billingInfo'
][
'consignee'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
consignee
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'consignee'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
公司名称
:</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
mid
-
width
">
{
{$info['billingInfo']['company_name']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['company_name']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
company_name
" placeholder="
请输入公司名称
" value="
{{
$info
[
'billingInfo'
][
'company_name'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
company_name
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'company_name'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
邮箱
:</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
mid
-
width
">
{
{$info['billingInfo']['email']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['email']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
email
" placeholder="
请输入邮箱
" value="
{{
$info
[
'billingInfo'
][
'email'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
email
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'email'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
电话
:</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
mid
-
width
">
{
{$info['billingInfo']['phone']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['phone']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
phone
" placeholder="
请输入电话
" value="
{{
$info
[
'billingInfo'
][
'phone'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
phone
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'phone'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
国家/地区
:</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
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
:
158
px
;
">
<div class="
show
" style="
display
:
none
;
width
:
158
px
;
">
<input type="
hidden
" name="
country_name
" value="">
<input type="
hidden
" name="
country_name
" value="">
<select data="
2
" name="
country
" lay-filter="
countryChange
" style="
height
:
30
px
;
border
:
1
px
solid
#eee;background: transparent;width: 100%;">
<select data="
2
" name="
country
" lay-filter="
countryChange
" style="
height
:
30
px
;
border
:
1
px
solid
#eee;background: transparent;width: 100%;">
<
option
value
=
""
>
请选择国家
</
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
)
<
option
@
if
(
$info
[
'billingInfo'
][
'country'
]
==
$cid
)
selected
@
endif
data
=
"
{
{$cname}
}
"
value
=
"
{
{$cid}}">{{$cname}
}
</option>
<
option
@
if
(
$info
[
'billingInfo'
][
'country'
]
==
$cid
)
selected
@
endif
data
=
"
{
{$cname}
}
"
value
=
"
{
{$cid}}">{{$cname}
}
</option>
@endforeach
@endforeach
...
@@ -343,36 +343,36 @@
...
@@ -343,36 +343,36 @@
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
省/州
:</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
mid
-
width
">
{
{$info['billingInfo']['province']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['province']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
province
" placeholder="
请输入省
/
州
" value="
{{
$info
[
'billingInfo'
][
'province'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
province
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'province'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
城市
:</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
mid
-
width
">
{
{$info['billingInfo']['city']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['city']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
city
" placeholder="
请输入城市
" value="
{{
$info
[
'billingInfo'
][
'city'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
city
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'city'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
<div class="
layui
-
inline
">
<div class="
layui
-
inline
">
<label class="
layui
-
form
-
label
">
邮编
:</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
mid
-
width
">
{
{$info['billingInfo']['post_code']}
}
</div>
<div class="
layui
-
form
-
mid
mid
-
width
">
{
{$info['billingInfo']['post_code']}
}
</div>
<input type="
text
" class="
layui
-
input
show
" name="
post_code
" placeholder="
请输入邮编
" value="
{{
$info
[
'billingInfo'
][
'post_code'
]}}
" style="
display
:
none
;
">
<input type="
text
" class="
layui
-
input
show
" name="
post_code
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'post_code'
]}}
" style="
display
:
none
;
">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
mb0
">
<div class="
layui
-
form
-
item
mb0
">
<label class="
layui
-
form
-
label
">
地址
:</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
:
427
px
;
">
<input type="
text
" class="
layui
-
input
show
" name="
detail_address
" placeholder="" value="
{{
$info
[
'billingInfo'
][
'detail_address'
]}}
" style="
display
:
none
;
width
:
427
px
;
">
<div class="
show
row
verCenter
" style="
display
:
none
;
margin
-
left
:
15
px
;
">
<div class="
show
row
verCenter
" style="
display
:
none
;
margin
-
left
:
15
px
;
">
<input type="
checkbox
" name="
open
" lay-skin="
switch
" lay-filter="
switchChange
" lay-text="
同收货地址
|
同收货地址
">
<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>
</div>
</div>
</div>
</div>
...
@@ -382,36 +382,36 @@
...
@@ -382,36 +382,36 @@
</div>
</div>
<!--结算信息-->
<!--结算信息-->
<div class="
layui
-
card
">
<div class="
layui
-
card
">
<div class="
layui
-
card
-
header
">
结算信息
</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'
]}}
">
<input type="
hidden
" name="
order_amount
" value="
{{
$info
[
'settlementInfo'
][
'order_amount'
]}}
">
<input type="
hidden
" name="
order_amount
" value="
{{
$info
[
'settlementInfo'
][
'order_amount'
]}}
">
<div class="
btn
-
box
">
<div class="
btn
-
box
">
<button class="
layui
-
btn
layui
-
btn
-
sm
" lay-submit="" lay-filter="
settlementInfoSubmit
">
修改
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
" lay-submit="" lay-filter="
settlementInfoSubmit
">
{
{admin_trans("order.order_page.修改")}
}
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
canel
" lay-submit="" lay-filter="
canelSubmit
" style="
margin
-
left
:
0
;
margin
-
top
:
10
px
;
">
取消
</button>
<button class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
canel
" lay-submit="" lay-filter="
canelSubmit
" style="
margin
-
left
:
0
;
margin
-
top
:
10
px
;
">
{
{admin_trans("order.order_page.取消")}
}
</button>
</div>
</div>
<div class="
layui
-
form
-
item
">
<div class="
layui
-
form
-
item
">
<label class="
layui
-
form
-
label
">
商品总金额
:</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_amount_format']}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info['settlementInfo']['order_amount_format']}
}
</div>
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
">
<div class="
layui
-
form
-
item
">
<label class="
layui
-
form
-
label
">
运费
:</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="
text
" 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
">
支付手续费
:</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="
text
" 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
">
<label class="
layui
-
form
-
label
">
支付方式
:</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_user_pay_type_cn"]}
}
</div>
<div class="
layui
-
form
-
mid
">
{
{$info["settlementInfo"]["order_user_pay_type_cn"]}
}
</div>
<div class="
show
" style="
display
:
none
">
<div class="
show
" style="
display
:
none
">
...
@@ -421,7 +421,7 @@
...
@@ -421,7 +421,7 @@
</div>
</div>
</div>
</div>
<div class="
layui
-
form
-
item
">
<div class="
layui
-
form
-
item
">
<label class="
layui
-
form
-
label
">
订单总金额
:</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
" style="
color
:
red
!
important
;
" id="
order_total_amount
">
{
{$info['settlementInfo']['order_total_amount_format']}
}
</div>
<div class="
layui
-
form
-
mid
" style="
color
:
red
!
important
;
" id="
order_total_amount
">
{
{$info['settlementInfo']['order_total_amount_format']}
}
</div>
</div>
</div>
...
@@ -434,9 +434,13 @@
...
@@ -434,9 +434,13 @@
@include('js')
@include('js')
<script type="
text
/
html
" id="
toolbar
">
<script type="
text
/
html
" id="
toolbar
">
<div class="
layui
-
btn
-
container
">
<div class="
layui
-
btn
-
container
">
<a class="
layui
-
btn
layui
-
btn
-
sm
" lay-event="
editOrderItems
" id="
editOrderItems
">
修改
</a>
<a class="
layui
-
btn
layui
-
btn
-
sm
" lay-event="
editOrderItems
" id="
editOrderItems
">
{
{admin_trans("order.order_page.修改")}
}
</a>
<a class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
" lay-event="
canel
" style="
display
:
none
;
">
取消
</a>
<a class="
layui
-
btn
layui
-
btn
-
sm
layui
-
btn
-
primary
" lay-event="
canel
" style="
display
:
none
;
">
{
{admin_trans("order.order_page.取消")}
}
</a>
</div>
</div>
</script>
</script>
<script>
var translation= <?php echo json_encode(
$info["translation"]
); ?>;
</script>
<script type="
text
/
javascript
" src="
/
assets
/
js
/
order
/
index
.
js
?
v
=
{{
time
()}}
"></script>
<script type="
text
/
javascript
" src="
/
assets
/
js
/
order
/
index
.
js
?
v
=
{{
time
()}}
"></script>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment