Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄成意
/
yunxin
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
950029e2
authored
Mar 13, 2019
by
PRY5YKGJ82EZEPX\Administrator
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
v1.0
parent
c537e8e5
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
277 additions
and
308 deletions
app/Http/Controllers/ApiController.php
app/Http/Controllers/WebController.php
app/Model/Server/ServerFinanceModel.php
app/Model/Server/ServerPurModel.php
public/pc/js/controller/CheckingList.js
public/pc/js/controller/OrderDetail.js
public/pc/js/controller/OrderList.js
public/pc/js/public.js
resources/views/pc.blade.php
resources/views/pc/CheckingList.blade.php
resources/views/pc/OrderDetail.blade.php
resources/views/pc/OrderList.blade.php
app/Http/Controllers/ApiController.php
View file @
950029e2
...
@@ -38,16 +38,24 @@ class ApiController extends Controller
...
@@ -38,16 +38,24 @@ class ApiController extends Controller
}
}
//订单列表导出
//订单列表导出
private
function
ApiOrderListExport
(
$request
,
$id
){
private
function
ApiOrderListExport
(
$request
,
$id
){
$res
=
(
new
ServerPurModel
(
$request
->
appid
,
$request
->
key
))
->
OrderList
(
$request
->
input
());
$input
=
$request
->
input
();
$input
[
'type'
]
=
2
;
//导出类型
$res
=
(
new
ServerPurModel
(
$request
->
appid
,
$request
->
key
))
->
OrderList
(
$input
,
2
);
if
(
!
count
(
$res
[
'data'
])
){
if
(
!
count
(
$res
[
'data'
])
){
exit
(
"没有数据"
);
exit
(
"没有数据"
);
}
}
if
(
count
(
$res
[
'data'
])
>
5000
){
$out
=
[];
exit
(
"导出条数不得大于5000"
);
foreach
(
$res
[
'data'
]
as
$k
=>
$v
){
array_push
(
$out
,[
'order_sn'
=>
$v
[
'order_sn'
],
'picking_amount'
=>
$v
[
'picking_amount'
],
'currency'
=>
$v
[
'currency'
],
'pay_type'
=>
$v
[
'pay_type'
],
'status'
=>
$v
[
'status'
],
'create_time'
=>
$v
[
'create_time'
],
]);
}
}
unset
(
$res
[
'data'
][
'id'
]);
export_csv
(
$out
,[
'订单号'
,
'订单金额'
,
'币种'
,
'结算方式'
,
'状态'
,
'创建时间'
],
'订单列表导出'
.
time
()
.
'.csv'
);
unset
(
$res
[
'data'
][
'putaway_time'
]);
export_csv
(
$res
[
'data'
],[
'订单号'
,
'订单金额'
,
'币种'
,
'结算方式'
,
'状态'
,
'创建时间'
],
'订单列表导出'
);
}
}
//订单列表
//订单列表
private
function
ApiOrderDetail
(
$request
,
$id
){
private
function
ApiOrderDetail
(
$request
,
$id
){
...
@@ -57,6 +65,29 @@ class ApiController extends Controller
...
@@ -57,6 +65,29 @@ class ApiController extends Controller
private
function
ApiAccountCheckingList
(
$request
,
$id
){
private
function
ApiAccountCheckingList
(
$request
,
$id
){
(
new
ServerFinanceModel
(
$request
->
appid
,
$request
->
key
))
->
accountCheckingList
(
$request
->
input
());
(
new
ServerFinanceModel
(
$request
->
appid
,
$request
->
key
))
->
accountCheckingList
(
$request
->
input
());
}
}
//对账单列表导出
private
function
ApiAccountCheckingListExport
(
$request
,
$id
){
$input
=
$request
->
input
();
$input
[
'type'
]
=
2
;
//导出类型
$res
=
(
new
ServerFinanceModel
(
$request
->
appid
,
$request
->
key
))
->
accountCheckingList
(
$input
,
2
);
if
(
$res
[
'errcode'
]
>
0
){
exit
(
"没有数据"
);
}
$out
=
[];
foreach
(
$res
[
'data'
]
as
$k
=>
$v
){
array_push
(
$out
,[
'checking_sn'
=>
$v
[
'checking_sn'
],
'amount'
=>
$v
[
'amount'
],
'currency'
=>
$v
[
'currency'
],
'day_num'
=>
$v
[
'day_num'
],
'finish_time'
=>
$v
[
'finish_time'
],
'create_time'
=>
$v
[
'create_time'
],
'checking_time'
=>
$v
[
'checking_time'
],
'status'
=>
$v
[
'status'
],
]);
}
export_csv
(
$out
,[
'对账单号'
,
'账单金额'
,
'结算币种'
,
'结算方式'
,
'结算时间'
,
'创建时间'
,
'对账时间'
,
'状态'
],
'对账列表导出'
.
time
()
.
'.csv'
);
}
//获取对账单列表明细
//获取对账单列表明细
private
function
ApiAccountCheckingDetail
(
$request
,
$id
){
private
function
ApiAccountCheckingDetail
(
$request
,
$id
){
(
new
ServerFinanceModel
(
$request
->
appid
,
$request
->
key
))
->
accountCheckingDetail
(
$request
->
input
());
(
new
ServerFinanceModel
(
$request
->
appid
,
$request
->
key
))
->
accountCheckingDetail
(
$request
->
input
());
...
...
app/Http/Controllers/WebController.php
View file @
950029e2
...
@@ -13,9 +13,8 @@ use RedisDB;
...
@@ -13,9 +13,8 @@ use RedisDB;
class
WebController
extends
Controller
class
WebController
extends
Controller
{
{
public
function
info
(
Request
$request
,
$id
=
''
){
public
function
info
(
Request
$request
,
$id
=
''
){
$data
=
[]
;
if
(
empty
(
$id
)){
if
(
empty
(
$id
)){
return
view
(
'pc.orderList'
);
return
redirect
(
'/web/OrderList'
);
}
}
$data
[
'id'
]
=
$id
;
$data
[
'id'
]
=
$id
;
$data
[
'URL_YUNXIN'
]
=
config
(
"website.URL_YUNXIN"
);
$data
[
'URL_YUNXIN'
]
=
config
(
"website.URL_YUNXIN"
);
...
@@ -45,31 +44,31 @@ class WebController extends Controller
...
@@ -45,31 +44,31 @@ class WebController extends Controller
}
}
//修改登录密码
//修改登录密码
private
function
ResetPassword
(
$request
,
$data
,
$id
){
private
function
ResetPassword
(
$request
,
$data
,
$id
){
$data
[
'title'
]
=
'
欢迎使用云芯系统
'
;
$data
[
'title'
]
=
'
修改登录密码
'
;
$data
[
'time'
]
=
time
();
$data
[
'time'
]
=
time
();
return
view
(
'pc'
,
$data
);
return
view
(
'pc'
,
$data
);
}
}
//找回密码
//找回密码
private
function
ForgetPassword
(
$request
,
$data
,
$id
){
private
function
ForgetPassword
(
$request
,
$data
,
$id
){
$data
[
'title'
]
=
'
欢迎使用云芯系统
'
;
$data
[
'title'
]
=
'
忘记密码
'
;
$data
[
'time'
]
=
time
();
$data
[
'time'
]
=
time
();
return
view
(
'pc.ForgetPassword'
,
$data
);
return
view
(
'pc.ForgetPassword'
,
$data
);
}
}
//商品列表
//商品列表
private
function
GoodsList
(
$request
,
$data
,
$id
){
private
function
GoodsList
(
$request
,
$data
,
$id
){
$data
[
'title'
]
=
'
欢迎使用云芯系统
'
;
$data
[
'title'
]
=
'
商品列表
'
;
$data
[
'time'
]
=
time
();
$data
[
'time'
]
=
time
();
return
view
(
'pc'
,
$data
);
return
view
(
'pc'
,
$data
);
}
}
//订单列表
//订单列表
private
function
OrderList
(
$request
,
$data
,
$id
){
private
function
OrderList
(
$request
,
$data
,
$id
){
$data
[
'title'
]
=
'
欢迎使用云芯系统
'
;
$data
[
'title'
]
=
'
订单列表
'
;
$data
[
'time'
]
=
time
();
$data
[
'time'
]
=
time
();
return
view
(
'pc'
,
$data
);
return
view
(
'pc'
,
$data
);
}
}
//订单详情
//订单详情
private
function
OrderDetail
(
$request
,
$data
,
$id
){
private
function
OrderDetail
(
$request
,
$data
,
$id
){
$data
[
'title'
]
=
'
欢迎使用云芯系统
'
;
$data
[
'title'
]
=
'
订单详情
'
;
$data
[
'time'
]
=
time
();
$data
[
'time'
]
=
time
();
return
view
(
'pc'
,
$data
);
return
view
(
'pc'
,
$data
);
}
}
...
...
app/Model/Server/ServerFinanceModel.php
View file @
950029e2
...
@@ -41,8 +41,8 @@ class ServerFinanceModel
...
@@ -41,8 +41,8 @@ class ServerFinanceModel
}
}
}
}
//获取对账单列表
//获取对账单列表
public
function
accountCheckingList
(
$input
){
public
function
accountCheckingList
(
$input
,
$type
=
1
){
return
$this
->
push
(
'/thrid/accountCheckingList'
,
$input
);
return
$this
->
push
(
'/thrid/accountCheckingList'
,
$input
,
$type
);
}
}
//获取对账单列表明细
//获取对账单列表明细
public
function
accountCheckingDetail
(
$input
){
public
function
accountCheckingDetail
(
$input
){
...
...
app/Model/Server/ServerPurModel.php
View file @
950029e2
...
@@ -45,8 +45,8 @@ class ServerPurModel
...
@@ -45,8 +45,8 @@ class ServerPurModel
return
$this
->
push
(
'/thridapi/StockChangeItems'
,
$data
);
return
$this
->
push
(
'/thridapi/StockChangeItems'
,
$data
);
}
}
//获取订单列表
//获取订单列表
public
function
OrderList
(
$data
){
public
function
OrderList
(
$data
,
$type
=
1
){
return
$this
->
push
(
'/thridapi/OrderList'
,
$data
);
return
$this
->
push
(
'/thridapi/OrderList'
,
$data
,
$type
);
}
}
//获取订单明细
//获取订单明细
public
function
OrderDetail
(
$data
){
public
function
OrderDetail
(
$data
){
...
...
public/pc/js/controller/CheckingList.js
View file @
950029e2
;
!
function
()
{
;
!
function
()
{
window
.
Login
=
{
window
.
app
=
{
'code'
:
"#code"
,
//验证码
'submit'
:
"#submit"
,
//提交按钮
'search'
:
"#search"
,
//搜索按钮
init
:
function
()
{
init
:
function
()
{
this
.
handleBind
(
this
);
app
.
tableList
(
1
);
//搜索
$
(
"#search"
).
click
(
function
()
{
app
.
tableList
(
1
);
})
//导出
$
(
"#export"
).
click
(
function
()
{
exportUrl
(
'/api/ApiAccountCheckingListExport'
,
'form1'
,
'确定导出数据?'
)
})
//下单时间选择
layui
.
laydate
.
render
({
elem
:
'.order-time-1'
,
theme
:
'#1080d0'
});
layui
.
laydate
.
render
({
elem
:
'.order-time-2'
,
theme
:
'#1080d0'
});
},
},
handleBind
:
function
(
opt
)
{
//列表数据查询
tableList
(
1
);
tableList
:
function
(
page
)
{
function
tableList
(
page
)
{
var
postData
=
{
var
res
=
ajax_push
(
URL_YUNXIN
+
'/api/ApiAccountCheckingList'
,{
'p'
:
page
})
'p'
:
page
,
'checking_sn'
:
$
(
"#checking_sn"
).
val
(),
'status'
:
$
(
"#status"
).
val
(),
'create_time1'
:
$
(
"#create_time1"
).
val
(),
'create_time2'
:
$
(
"#create_time2"
).
val
(),
}
var
res
=
ajax_push
(
URL_YUNXIN
+
'/api/ApiAccountCheckingList'
,
postData
)
if
(
res
.
errcode
==
0
)
{
if
(
res
.
errcode
==
0
)
{
var
html
;
var
html
=
""
;
if
(
res
.
data
.
length
>
0
)
{
for
(
i
=
0
;
i
<
res
.
data
.
length
;
i
++
)
{
for
(
i
=
0
;
i
<
res
.
data
.
length
;
i
++
)
{
var
s
=
res
.
data
[
i
];
var
s
=
res
.
data
[
i
];
html
+=
"<tr class=\"you\"> "
+
html
+=
"<tr class=\"you\"> "
+
...
@@ -26,6 +47,10 @@
...
@@ -26,6 +47,10 @@
"<td><a href=\"/web/CheckingDetail?id="
+
s
.
checking_id
+
"\" class=\"lineBlock va-m operation-1\"><i class=\"iconfont icon-mingxi-\"></i><em>明细</em></a></td></tr>"
"<td><a href=\"/web/CheckingDetail?id="
+
s
.
checking_id
+
"\" class=\"lineBlock va-m operation-1\"><i class=\"iconfont icon-mingxi-\"></i><em>明细</em></a></td></tr>"
;
;
}
}
}
else
{
html
=
"<tr class=\"you\"><td colspan='9' style='text-align: center;'><span class=\"t1\" style='color: #cccccc'>没有数据</span></td></tr>"
;
}
$
(
"#shopListContent"
).
html
(
html
)
$
(
"#shopListContent"
).
html
(
html
)
layui
.
laypage
.
render
({
layui
.
laypage
.
render
({
elem
:
'pagination'
,
elem
:
'pagination'
,
...
@@ -35,24 +60,16 @@
...
@@ -35,24 +60,16 @@
curr
:
page
,
curr
:
page
,
jump
:
function
(
obj
,
first
)
{
jump
:
function
(
obj
,
first
)
{
if
(
!
first
){
if
(
!
first
){
tableList
(
obj
.
curr
)
app
.
tableList
(
obj
.
curr
)
}
}
}
}
});
});
}
else
{
}
else
{
alert_err
(
res
.
errmsg
)
alert_err
(
res
.
errmsg
)
return
false
;
return
false
;
}
}
}
}
$
(
"#search"
).
click
(
function
()
{
tableList
(
1
)
})
return
this
;
}
},
$
(
function
()
{
},
$
(
function
()
{
Login
.
init
();
app
.
init
();
})
})
}();
}();
\ No newline at end of file
public/pc/js/controller/OrderDetail.js
0 → 100644
View file @
950029e2
;
!
function
()
{
window
.
app
=
{
init
:
function
()
{
this
.
tableList
(
1
);
//刷新搜索
$
(
"#search"
).
click
(
function
()
{
tableList
(
1
)
})
},
tableList
:
function
(
page
)
{
var
res
=
ajax_push
(
URL_YUNXIN
+
'/api/ApiOrderDetail'
,{
'p'
:
page
,
'order_id'
:
$
(
"#order_id"
).
val
()})
if
(
res
.
errcode
==
0
)
{
var
other
=
res
.
other
;
$
(
".order_sn"
).
html
(
other
.
order_sn
);
$
(
".putaway_time"
).
html
(
other
.
putaway_time
);
$
(
".day_num"
).
html
(
other
.
day_num
);
$
(
".status"
).
html
(
other
.
status
);
$
(
".settle"
).
html
(
other
.
settle
);
$
(
".currency"
).
html
(
other
.
currency
);
var
html
;
for
(
i
=
0
;
i
<
res
.
data
.
length
;
i
++
)
{
var
s
=
res
.
data
[
i
];
html
+=
"<tr class=\"you\"> "
+
"<td><span class=\"t1\">"
+
s
.
supplier_goods_id
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
goods_name
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
supplier_brand_name
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
encap
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
mpq
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
putaway_number
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
initial_price
+
"</span></td>"
+
"</tr>"
}
$
(
"#shopListContent"
).
html
(
html
)
layui
.
laypage
.
render
({
elem
:
'pagination'
,
theme
:
'#1080d0'
,
count
:
res
.
count
,
groups
:
10
,
curr
:
page
,
jump
:
function
(
obj
,
first
)
{
if
(
!
first
){
this
.
tableList
(
obj
.
curr
)
}
}
});
}
else
{
alert_err
(
res
.
errmsg
)
return
false
;
}
}
},
$
(
function
()
{
app
.
init
();
})
}();
\ No newline at end of file
public/pc/js/controller/OrderList.js
View file @
950029e2
!
function
()
{
;
!
function
()
{
window
.
pageController
=
{
window
.
app
=
{
init
:
function
()
{
init
:
function
()
{
this
.
handleBind
(
this
);
app
.
tableList
(
1
);
},
//搜索
handleBind
:
function
(
opt
)
{
$
(
"#search"
).
click
(
function
(
)
{
layui
.
use
([
'layer'
,
'laypage'
,
'laydate'
],
function
()
{
app
.
tableList
(
1
);
var
layer
=
layui
.
layer
;
})
var
laypage
=
layui
.
laypage
;
//导出
var
laydate
=
layui
.
laydate
;
$
(
"#export"
).
click
(
function
()
{
exportUrl
(
'/api/ApiOrderListExport'
,
'form1'
,
'确定导出数据?'
)
})
//下单时间选择
//下单时间选择
laydate
.
render
({
layui
.
laydate
.
render
({
elem
:
'.order-time-1'
,
elem
:
'.order-time-1'
,
theme
:
'#1080d0'
theme
:
'#1080d0'
});
});
layui
.
laydate
.
render
({
laydate
.
render
({
elem
:
'.order-time-2'
,
elem
:
'.order-time-2'
,
theme
:
'#1080d0'
theme
:
'#1080d0'
});
});
},
//列表数据查询
tableList
:
function
(
page
)
{
var
postData
=
{
'p'
:
page
,
'order_sn'
:
$
(
"input[name='order_sn']"
).
val
(),
'goods_name'
:
$
(
"input[name='goods_name']"
).
val
(),
'status'
:
$
(
"input[name='status']"
).
val
(),
'create_time1'
:
$
(
"input[name='create_time1']"
).
val
(),
'create_time2'
:
$
(
"input[name='create_time2']"
).
val
(),
}
var
res
=
ajax_push
(
URL_YUNXIN
+
'/api/ApiOrderList'
,
postData
)
if
(
res
.
errcode
==
0
)
{
var
html
=
""
;
if
(
res
.
data
.
length
>
0
)
{
for
(
i
=
0
;
i
<
res
.
data
.
length
;
i
++
)
{
var
s
=
res
.
data
[
i
];
html
+=
"<tr class=\"you\"> "
+
"<td><span class=\"t1\">"
+
s
.
order_sn
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
create_time
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
picking_amount
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
currency
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
pay_type
+
"</span></td>"
+
"<td><span class=\"t1\">"
+
s
.
status
+
"</span></td>"
+
"<td><a href=\"/web/OrderDetail?id="
+
s
.
order_id
+
"\" class=\"lineBlock va-m operation-1\"><i class=\"iconfont icon-mingxi-\"></i><em>明细</em></a></td></tr>"
}
}
else
{
html
=
"<tr class=\"you\"><td colspan='9' style='text-align: center;'><span class=\"t1\" style='color: #cccccc'>没有数据</span></td></tr>"
;
}
//分页组件
$
(
"#shopListContent"
).
html
(
html
)
laypage
.
render
({
layui
.
laypage
.
render
({
elem
:
'pagination'
,
elem
:
'pagination'
,
theme
:
'#1080d0'
,
theme
:
'#1080d0'
,
count
:
500
,
count
:
res
.
count
,
groups
:
10
groups
:
10
,
});
curr
:
page
,
jump
:
function
(
obj
,
first
)
{
//操作 价格变化明细
if
(
!
first
){
$
(
"#shopList"
).
find
(
'.operation-1'
).
unbind
(
'click'
).
on
(
'click'
,
function
()
{
app
.
tableList
(
obj
.
curr
)
layer
.
open
({
}
type
:
1
,
title
:
'库存变化明细'
,
area
:
[
'560px'
,
'560px'
],
shadeClose
:
true
,
move
:
false
,
content
:
$
(
"#layer-html"
).
html
(),
success
:
function
(
layero
,
index
)
{
laydate
.
render
({
elem
:
'.time-1'
,
theme
:
'#1080d0'
});
laydate
.
render
({
elem
:
'.time-2'
,
theme
:
'#1080d0'
});
laypage
.
render
({
elem
:
layero
.
find
(
'.pagination-with'
),
theme
:
'#1080d0'
,
count
:
500
,
groups
:
5
});
}
}
});
});
});
}
else
{
});
alert_err
(
res
.
errmsg
)
return
this
;
return
false
;
},
}
}
},
$
(
function
()
{
},
$
(
function
()
{
pageController
.
init
();
app
.
init
();
})
})
}();
}();
\ No newline at end of file
public/pc/js/public.js
View file @
950029e2
/*
/*
存放公共函数地方
存放公共函数地方
*/
*/
/*
/*
ajax 请求
ajax 请求
@param str url 请求地址
@param str url 请求地址
...
@@ -12,6 +11,7 @@ function ajax_push(url,data){
...
@@ -12,6 +11,7 @@ function ajax_push(url,data){
layer
.
msg
(
'加载中'
,
{
layer
.
msg
(
'加载中'
,
{
icon
:
16
icon
:
16
,
shade
:
0.01
,
shade
:
0.01
,
style
:
'background: rgba(216,100,125,0.9); color:#fff; border:none;'
,
});
});
var
result
=
false
;
var
result
=
false
;
$
.
ajax
({
$
.
ajax
({
...
@@ -33,7 +33,28 @@ function ajax_push(url,data){
...
@@ -33,7 +33,28 @@ function ajax_push(url,data){
layer
.
closeAll
();
layer
.
closeAll
();
return
result
;
return
result
;
}
}
/*
导出数据
@param str url 网址
@param str id 表单id
*/
function
exportUrl
(
url
,
id
,
msg
)
{
layer
.
confirm
(
msg
,
{
title
:
'导出数据'
,
btn
:
[
'确定'
,
'取消'
]
},
function
(){
var
forms
=
$
(
'#'
+
id
).
serializeArray
();
var
data
=
{};
url
+=
'?'
$
.
each
(
forms
,
function
(
i
,
v
)
{
url
+=
"&"
+
v
[
'name'
]
+
"="
+
v
[
'value'
];
});
layer
.
closeAll
(
'dialog'
);
// 确定时关闭弹框
window
.
location
.
href
=
url
;
},
function
(){
layer
.
close
();
});
}
//layer弹出子窗口关闭并且刷新父窗口页面
//layer弹出子窗口关闭并且刷新父窗口页面
function
closeparent
()
{
function
closeparent
()
{
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
//获取窗口索引
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
//获取窗口索引
...
...
resources/views/pc.blade.php
View file @
950029e2
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
<span
class=
"t1 lineBlock va-m"
>
我的信息
</span>
<span
class=
"t1 lineBlock va-m"
>
我的信息
</span>
<b
class=
"iconfont icon-xiala-"
></b>
<b
class=
"iconfont icon-xiala-"
></b>
</a>
</a>
<dl>
<dl
<?php
if
(
in_array
(
$id
,[
'ResetPassword'
])
!==
false
)
echo
"style='display: block;'"
?>
>
<dd
class=
"curr"
>
<dd
class=
"curr"
>
<i
class=
"line"
></i>
<i
class=
"line"
></i>
<a
href=
"/web/ResetPassword"
>
修改密码
</a>
<a
href=
"/web/ResetPassword"
>
修改密码
</a>
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
<span
class=
"t1 lineBlock va-m"
>
商品管理
</span>
<span
class=
"t1 lineBlock va-m"
>
商品管理
</span>
<b
class=
"iconfont icon-xiala-"
></b>
<b
class=
"iconfont icon-xiala-"
></b>
</a>
</a>
<dl>
<dl
<?php
if
(
in_array
(
$id
,[
'GoodsList'
,
'GoodsDetail'
])
!==
false
)
echo
"style='display: block;'"
?>
>
<dd
class=
"curr"
>
<dd
class=
"curr"
>
<i
class=
"line"
></i>
<i
class=
"line"
></i>
<a
href=
"/web/GoodsList"
>
商品列表
</a>
<a
href=
"/web/GoodsList"
>
商品列表
</a>
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
<span
class=
"t1 lineBlock va-m"
>
订单管理
</span>
<span
class=
"t1 lineBlock va-m"
>
订单管理
</span>
<b
class=
"iconfont icon-xiala-"
></b>
<b
class=
"iconfont icon-xiala-"
></b>
</a>
</a>
<dl>
<dl
<?php
if
(
in_array
(
$id
,[
'OrderList'
,
'OrderDetail'
])
!==
false
)
echo
"style='display: block;'"
?>
>
<dd
class=
"curr"
>
<dd
class=
"curr"
>
<i
class=
"line"
></i>
<i
class=
"line"
></i>
<a
href=
"/web/OrderList"
>
订单列表
</a>
<a
href=
"/web/OrderList"
>
订单列表
</a>
...
...
resources/views/pc/CheckingList.blade.php
View file @
950029e2
...
@@ -6,29 +6,27 @@
...
@@ -6,29 +6,27 @@
</div>
</div>
<div
class=
"con-section shop-list"
>
<div
class=
"con-section shop-list"
>
<p
class=
"text"
>
订单列表
</p>
<p
class=
"text"
>
订单列表
</p>
<form
action=
""
>
<form
action=
""
id=
"form1"
>
<div
class=
"search-bar"
>
<div
class=
"search-bar"
>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
对账单号:
</label>
<label
class=
"tag"
>
对账单号:
</label>
<input
type=
"text"
class=
"inp w180"
>
<input
type=
"text"
class=
"inp w180"
name=
"checking_sn"
id=
"checking_sn"
>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
创建时间:
</label>
<input
type=
"text"
class=
"inp w180"
>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
状态:
</label>
<label
class=
"tag"
>
状态:
</label>
<select
class=
"sel w180"
>
<select
class=
"sel w180"
name=
"status"
id=
"status"
>
<option
value=
""
>
状态1
</option>
<option
value=
""
></option>
<option
value=
""
>
状态2
</option>
<option
value=
"-1"
>
已取消
</option>
<option
value=
""
>
状态3
</option>
<option
value=
"1"
>
对账中
</option>
<option
value=
"2"
>
已对账
</option>
<option
value=
"3"
>
已付款
</option>
</select>
</select>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
下单时间:
</label>
<label
class=
"tag"
>
下单时间:
</label>
<input
type=
"text"
class=
"inp w120 order-time-1"
lay-key=
"1"
>
<input
type=
"text"
class=
"inp w120 order-time-1"
name=
"create_time1"
id=
"create_time1"
lay-key=
"1"
>
<span
class=
"lineBlock va-m line"
>
~
</span>
<span
class=
"lineBlock va-m line"
>
~
</span>
<input
type=
"text"
class=
"inp w120 order-time-2"
lay-key=
"2"
>
<input
type=
"text"
class=
"inp w120 order-time-2"
name=
"create_time2"
id=
"create_time2"
lay-key=
"2"
>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
id=
"search"
>
<div
class=
"lineBlock input-inline va-m"
id=
"search"
>
<a
href=
"javascript:;"
class=
"search-btn"
>
<a
href=
"javascript:;"
class=
"search-btn"
>
...
@@ -36,7 +34,7 @@
...
@@ -36,7 +34,7 @@
<span>
查询
</span>
<span>
查询
</span>
</a>
</a>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
id=
"export"
>
<a
href=
"javascript:;"
class=
"export-btn"
>
<a
href=
"javascript:;"
class=
"export-btn"
>
<i
class=
"iconfont icon-daochu-"
></i>
<i
class=
"iconfont icon-daochu-"
></i>
<span>
导出
</span>
<span>
导出
</span>
...
...
resources/views/pc/OrderDetail.blade.php
View file @
950029e2
...
@@ -4,145 +4,56 @@
...
@@ -4,145 +4,56 @@
<span>
>
</span>
<span>
>
</span>
<a
href=
""
>
订单列表
</a>
<a
href=
""
>
订单列表
</a>
<span>
>
</span>
<span>
>
</span>
<a
class=
"text"
href=
""
>
订单详情
</a>
<a
class=
"text"
href=
""
>
{{ $title }}
</a>
</div>
</div>
<div
class=
"con-section shop-list"
>
<div
class=
"con-section shop-list"
>
<p
class=
"text"
>
订单详情
</p>
<p
class=
"text"
>
{{ $title }}
</p>
<div
class=
"detail-list"
>
<div
class=
"detail-list"
>
<div
class=
"lineBlock va-m mr100"
>
<div
class=
"lineBlock va-m mr100"
>
<span
class=
"lineBlock t1"
>
入库
单号:
</span>
<span
class=
"lineBlock t1"
>
订
单号:
</span>
<span
class=
"lineBlock t2
"
>
T1100033333
</span>
<span
class=
"lineBlock t2
order_sn"
>
</span>
</div>
</div>
<div
class=
"lineBlock va-m mr126"
>
<div
class=
"lineBlock va-m mr126"
>
<span
class=
"lineBlock t1"
>
送货单号
:
</span>
<span
class=
"lineBlock t1"
>
最新收货时间
:
</span>
<span
class=
"lineBlock t2
"
>
T1100033333
</span>
<span
class=
"lineBlock t2
putaway_time"
>
</span>
</div>
</div>
<div
class=
"mt20"
>
<div
class=
"mt20"
>
<div
class=
"lineBlock va-m mr26"
>
<div
class=
"lineBlock va-m mr26"
>
<span
class=
"lineBlock t3"
>
结算方式:
</span>
<span
class=
"lineBlock t3"
>
结算方式:
</span>
<span
class=
"lineBlock t4
"
>
账期(发货后XX天结款)
</span>
<span
class=
"lineBlock t4
day_num"
>
</span>
</div>
</div>
<div
class=
"lineBlock va-m mr33"
>
<div
class=
"lineBlock va-m mr33"
>
<span
class=
"lineBlock t3"
>
付款状态:
</span>
<span
class=
"lineBlock t3"
>
付款状态:
</span>
<span
class=
"lineBlock t5"
><em
class=
"a
"
>
已付款
</em>
/
<em
class=
"b"
>
未付款
</em>
</span>
<span
class=
"lineBlock t5"
><em
class=
"a
status"
></em>
</span>
</div>
</div>
<div
class=
"lineBlock va-m mr40"
>
<div
class=
"lineBlock va-m mr40"
>
<span
class=
"lineBlock t3"
>
订单总金额:
</span>
<span
class=
"lineBlock t3"
>
订单总金额:
</span>
<span
class=
"lineBlock t4
"
>
¥1000.00
</span>
<span
class=
"lineBlock t4
settle"
>
</span>
</div>
</div>
<div
class=
"lineBlock va-m"
>
<div
class=
"lineBlock va-m"
>
<span
class=
"lineBlock t3"
>
结算币种:
</span>
<span
class=
"lineBlock t3"
>
结算币种:
</span>
<span
class=
"lineBlock t4
"
>
RMB
</span>
<span
class=
"lineBlock t4
currency"
>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"table-list"
id=
"shopList"
>
<div
class=
"table-list"
id=
"shopList"
>
<table>
<table>
<tbody>
<tr>
<tr>
<th>
商品编码
<b></b></th>
<th>
商
家商
品编码
<b></b></th>
<th>
商品
型号
<b></b></th>
<th>
型号
<b></b></th>
<th>
封装
<b></b></th>
<th>
品牌
<b></b></th>
<th>
包装方式
<b></b>
</th>
<th>
封装
</th>
<th>
标准包装量(MPQ)
<b></b>
</th>
<th>
包装方式
</th>
<th>
数量
</th>
<th>
入库
数量
</th>
<th>
单价
</th>
<th>
单价
</th>
</tr>
</tr>
<tr>
<tbody
id=
"shopListContent"
>
<td>
<span
class=
"t1"
>
11033
</span>
</td>
<td>
<span
class=
"t1 lineBlock va-m"
>
CC0402MRX5R5BB22555456565
</span>
</td>
<td>
<span
class=
"t1"
>
20180230
</span>
</td>
<td>
<span
class=
"t1"
>
编带
</span>
</td>
<td>
<span
class=
"t1"
>
1000
</span>
</td>
<td>
<span
class=
"t1"
>
15500
</span>
</td>
<td>
<span
class=
"t1"
>
13000
</span>
</td>
</tr>
<tr>
<td>
<span
class=
"t1"
>
11033
</span>
</td>
<td>
<span
class=
"t1 lineBlock va-m"
>
CC0402MRX
</span>
</td>
<td>
<span
class=
"t1"
>
20180230
</span>
</td>
<td>
<span
class=
"t1"
>
编带
</span>
</td>
<td>
<span
class=
"t1"
>
1000
</span>
</td>
<td>
<span
class=
"t1"
>
15500
</span>
</td>
<td>
<span
class=
"t1"
>
13000
</span>
</td>
</tr>
<tr>
<td>
<span
class=
"t1"
>
11033
</span>
</td>
<td>
<span
class=
"t1 lineBlock va-m"
>
CC0402MRX
</span>
</td>
<td>
<span
class=
"t1"
>
20180230
</span>
</td>
<td>
<span
class=
"t1"
>
编带
</span>
</td>
<td>
<span
class=
"t1"
>
1000
</span>
</td>
<td>
<span
class=
"t1"
>
15500
</span>
</td>
<td>
<span
class=
"t1"
>
13000
</span>
</td>
</tr>
<tr>
<td>
<span
class=
"t1"
>
11033
</span>
</td>
<td>
<span
class=
"t1 lineBlock va-m"
>
CC0402MRX
</span>
</td>
<td>
<span
class=
"t1"
>
20180230
</span>
</td>
<td>
<span
class=
"t1"
>
编带
</span>
</td>
<td>
<span
class=
"t1"
>
1000
</span>
</td>
<td>
<span
class=
"t1"
>
15500
</span>
</td>
<td>
<span
class=
"t1"
>
13000
</span>
</td>
</tr>
</tbody>
</tbody>
</table>
</table>
</div>
</div>
<div
class=
"pagination-with"
id=
"pagination"
><
div
class=
"layui-box layui-laypage layui-laypage-molv"
id=
"layui-laypage-1"
><a
href=
"javascript:;"
class=
"layui-laypage-prev layui-disabled"
data-page=
"0"
>
上一页
</a><span
class=
"layui-laypage-curr"
><em
class=
"layui-laypage-em"
style=
"background-color:#1080d0;"
></em><em>
1
</em></span><a
href=
"javascript:;"
data-page=
"2"
>
2
</a><a
href=
"javascript:;"
data-page=
"3"
>
3
</a><a
href=
"javascript:;"
data-page=
"4"
>
4
</a><a
href=
"javascript:;"
data-page=
"5"
>
5
</a><a
href=
"javascript:;"
data-page=
"6"
>
6
</a><a
href=
"javascript:;"
data-page=
"7"
>
7
</a><a
href=
"javascript:;"
data-page=
"8"
>
8
</a><a
href=
"javascript:;"
data-page=
"9"
>
9
</a><a
href=
"javascript:;"
data-page=
"10"
>
10
</a><span
class=
"layui-laypage-spr"
>
…
</span><a
href=
"javascript:;"
class=
"layui-laypage-last"
title=
"尾页"
data-page=
"50"
>
50
</a><a
href=
"javascript:;"
class=
"layui-laypage-next"
data-page=
"2"
>
下一页
</a></div><
/div>
<div
class=
"pagination-with"
id=
"pagination"
></div>
</div>
</div>
</div>
</div>
<!--隐藏域-->
<input
type=
"hidden"
value=
"{{ @$_GET['id'] }}"
id=
"order_id"
>
\ No newline at end of file
resources/views/pc/OrderList.blade.php
View file @
950029e2
...
@@ -10,33 +10,35 @@
...
@@ -10,33 +10,35 @@
<div
class=
"search-bar"
>
<div
class=
"search-bar"
>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
订单号:
</label>
<label
class=
"tag"
>
订单号:
</label>
<input
type=
"text"
class=
"inp w180"
>
<input
type=
"text"
class=
"inp w180"
name=
"order_sn"
>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
商品
型号:
</label>
<label
class=
"tag"
>
型号:
</label>
<input
type=
"text"
class=
"inp w180"
>
<input
type=
"text"
class=
"inp w180"
name=
"goods_name"
>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
状态:
</label>
<label
class=
"tag"
>
状态:
</label>
<select
class=
"sel w180"
>
<select
class=
"sel w180"
name=
"status"
>
<option
value=
""
>
状态1
</option>
<option
value=
""
></option>
<option
value=
""
>
状态2
</option>
<option
value=
"-10"
>
已取消
</option>
<option
value=
""
>
状态3
</option>
<option
value=
"-2"
>
处理中
</option>
<option
value=
"6"
>
部分收货
</option>
<option
value=
"10"
>
完全收货
</option>
</select>
</select>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
>
<label
class=
"tag"
>
下单时间:
</label>
<label
class=
"tag"
>
下单时间:
</label>
<input
type=
"text"
class=
"inp w120 order-time-1"
lay-key=
"1"
>
<input
type=
"text"
name=
"create_time1"
class=
"inp w120 order-time-1"
lay-key=
"1"
>
<span
class=
"lineBlock va-m line"
>
~
</span>
<span
class=
"lineBlock va-m line"
>
~
</span>
<input
type=
"text"
class=
"inp w120 order-time-2"
lay-key=
"2"
>
<input
type=
"text"
name=
"create_time2"
class=
"inp w120 order-time-2"
lay-key=
"2"
>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
id=
"search"
>
<a
href=
"javascript:;"
class=
"search-btn"
>
<a
href=
"javascript:;"
class=
"search-btn"
>
<i
class=
"iconfont icon-chaxun-"
></i>
<i
class=
"iconfont icon-chaxun-"
></i>
<span>
查询
</span>
<span>
查询
</span>
</a>
</a>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
>
<div
class=
"lineBlock input-inline va-m"
id=
"export"
>
<a
href=
"javascript:;"
class=
"export-btn"
>
<a
href=
"javascript:;"
class=
"export-btn"
>
<i
class=
"iconfont icon-daochu-"
></i>
<i
class=
"iconfont icon-daochu-"
></i>
<span>
导出
</span>
<span>
导出
</span>
...
@@ -46,97 +48,20 @@
...
@@ -46,97 +48,20 @@
</form>
</form>
<div
class=
"table-list"
id=
"shopList"
>
<div
class=
"table-list"
id=
"shopList"
>
<table>
<table>
<tbody>
<tr>
<tr>
<th>
订单号
<b></b></th>
<th>
订单号
<b></b></th>
<th>
下单
时间
<b></b></th>
<th>
创建
时间
<b></b></th>
<th>
订单金额
<b></b></th>
<th>
订单金额
<b></b></th>
<th>
结算币种
<b></b></th>
<th>
结算币种
<b></b></th>
<th>
结算方式
<b></b></th>
<th>
结算方式
<b></b></th>
<th>
付款状态
<b></b></th>
<th>
付款状态
<b></b></th>
<th>
操作
</th>
<th>
操作
</th>
</tr>
</tr>
<tr>
<tbody
id=
"shopListContent"
>
<td>
<span
class=
"t1"
>
110321213
</span>
</td>
<td>
<span
class=
"t1"
>
20180230
</span>
</td>
<td>
<span
class=
"t1"
>
13000
</span>
</td>
<td>
<span
class=
"t1"
>
RMB
</span>
</td>
<td>
<span
class=
"t1"
>
500
</span>
</td>
<td>
<span
class=
"t1"
>
待入库
</span>
</td>
<td>
<a
href=
"javascript:;"
class=
"lineBlock va-m operation-1"
>
<i
class=
"iconfont icon-mingxi-"
></i>
<em>
明细
</em>
</a>
</td>
</tr>
<tr>
<td>
<span
class=
"t1"
>
110321213
</span>
</td>
<td>
<span
class=
"t1"
>
20180230
</span>
</td>
<td>
<span
class=
"t1"
>
13000
</span>
</td>
<td>
<span
class=
"t1"
>
RMB
</span>
</td>
<td>
<span
class=
"t1"
>
500
</span>
</td>
<td>
<span
class=
"t1"
>
待入库
</span>
</td>
<td>
<a
href=
"javascript:;"
class=
"lineBlock va-m operation-1"
>
<i
class=
"iconfont icon-mingxi-"
></i>
<em>
明细
</em>
</a>
</td>
</tr>
<tr>
<td>
<span
class=
"t1"
>
110321213
</span>
</td>
<td>
<span
class=
"t1"
>
20180230
</span>
</td>
<td>
<span
class=
"t1"
>
13000
</span>
</td>
<td>
<span
class=
"t1"
>
RMB
</span>
</td>
<td>
<span
class=
"t1"
>
500
</span>
</td>
<td>
<span
class=
"t1"
>
待入库
</span>
</td>
<td>
<a
href=
"javascript:;"
class=
"lineBlock va-m operation-1"
>
<i
class=
"iconfont icon-mingxi-"
></i>
<em>
明细
</em>
</a>
</td>
</tr>
</tbody>
</tbody>
</table>
</table>
</div>
</div>
<div
class=
"pagination-with"
id=
"pagination"
><
div
class=
"layui-box layui-laypage layui-laypage-molv"
id=
"layui-laypage-1"
><a
href=
"javascript:;"
class=
"layui-laypage-prev layui-disabled"
data-page=
"0"
>
上一页
</a><span
class=
"layui-laypage-curr"
><em
class=
"layui-laypage-em"
style=
"background-color:#1080d0;"
></em><em>
1
</em></span><a
href=
"javascript:;"
data-page=
"2"
>
2
</a><a
href=
"javascript:;"
data-page=
"3"
>
3
</a><a
href=
"javascript:;"
data-page=
"4"
>
4
</a><a
href=
"javascript:;"
data-page=
"5"
>
5
</a><a
href=
"javascript:;"
data-page=
"6"
>
6
</a><a
href=
"javascript:;"
data-page=
"7"
>
7
</a><a
href=
"javascript:;"
data-page=
"8"
>
8
</a><a
href=
"javascript:;"
data-page=
"9"
>
9
</a><a
href=
"javascript:;"
data-page=
"10"
>
10
</a><span
class=
"layui-laypage-spr"
>
…
</span><a
href=
"javascript:;"
class=
"layui-laypage-last"
title=
"尾页"
data-page=
"50"
>
50
</a><a
href=
"javascript:;"
class=
"layui-laypage-next"
data-page=
"2"
>
下一页
</a></div><
/div>
<div
class=
"pagination-with"
id=
"pagination"
></div>
</div>
</div>
</div>
</div>
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