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
7a0c7cbf
authored
Apr 08, 2019
by
梁建民
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
css优化
parent
cb6a89f3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
75 additions
and
51 deletions
public/pc/css/base.scss
public/pc/css/style.min.css
public/pc/css/style.min.css.map
public/pc/css/style.scss
public/pc/js/select2/css/select2.css
resources/views/pc/AbnormalList.blade.php
resources/views/pc/GoodsList.blade.php
resources/views/pc/OrderList.blade.php
public/pc/css/base.scss
View file @
7a0c7cbf
...
@@ -137,10 +137,14 @@ body {
...
@@ -137,10 +137,14 @@ body {
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
.mr0
{
.mr0
{
margin-right
:
0
!
important
;
margin-right
:
0
!
important
;
}
}
.btn-xs
{
background
:
none
!
important
;
}
.layui-laypage
.layui-laypage-curr
.layui-laypage-em
{
background
:
#1080d0
;
}
\ No newline at end of file
public/pc/css/style.min.css
View file @
7a0c7cbf
This diff is collapsed.
Click to expand it.
public/pc/css/style.min.css.map
View file @
7a0c7cbf
This diff is collapsed.
Click to expand it.
public/pc/css/style.scss
View file @
7a0c7cbf
...
@@ -63,6 +63,7 @@
...
@@ -63,6 +63,7 @@
.no-login
,
.login
{
.no-login
,
.login
{
padding
:
24px
0
0
69px
;
padding
:
24px
0
0
69px
;
display
:
block
;
display
:
block
;
white-space
:
nowrap
;
.ico-1
{
.ico-1
{
background-position
:
-118px
-2px
;
background-position
:
-118px
-2px
;
width
:
40px
;
width
:
40px
;
...
@@ -74,7 +75,7 @@
...
@@ -74,7 +75,7 @@
height
:
7px
;
height
:
7px
;
}
}
span
{
span
{
margin
:
0
10px
0
9
px
;
margin
:
0
10px
0
0
px
;
font-size
:
14px
;
font-size
:
14px
;
color
:
#ffffff
;
color
:
#ffffff
;
}
}
...
@@ -327,8 +328,8 @@
...
@@ -327,8 +328,8 @@
}
}
}
}
}
}
&
.curr
{
&
.curr
{
dl
{
dl
{
display
:
block
;
display
:
block
;
}
}
}
}
...
...
public/pc/js/select2/css/select2.css
View file @
7a0c7cbf
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
box-sizing
:
border-box
;
box-sizing
:
border-box
;
cursor
:
pointer
;
cursor
:
pointer
;
display
:
block
;
display
:
block
;
height
:
2
8px
;
height
:
3
8px
;
user-select
:
none
;
user-select
:
none
;
-webkit-user-select
:
none
;
}
-webkit-user-select
:
none
;
}
.select2-container
.select2-selection--single
.select2-selection__rendered
{
.select2-container
.select2-selection--single
.select2-selection__rendered
{
...
@@ -129,11 +129,11 @@
...
@@ -129,11 +129,11 @@
.select2-container--default
.select2-selection--single
{
.select2-container--default
.select2-selection--single
{
background-color
:
#fff
;
background-color
:
#fff
;
border
:
1px
solid
#
aaa
;
border
:
1px
solid
#
e5e5e5
;
border-radius
:
4px
;
}
border-radius
:
4px
;
}
.select2-container--default
.select2-selection--single
.select2-selection__rendered
{
.select2-container--default
.select2-selection--single
.select2-selection__rendered
{
color
:
#444
;
color
:
#444
;
line-height
:
2
8px
;
}
line-height
:
3
8px
;
}
.select2-container--default
.select2-selection--single
.select2-selection__clear
{
.select2-container--default
.select2-selection--single
.select2-selection__clear
{
cursor
:
pointer
;
cursor
:
pointer
;
float
:
right
;
float
:
right
;
...
@@ -152,8 +152,8 @@
...
@@ -152,8 +152,8 @@
border-width
:
5px
4px
0
4px
;
border-width
:
5px
4px
0
4px
;
height
:
0
;
height
:
0
;
left
:
50%
;
left
:
50%
;
margin-left
:
-
4
px
;
margin-left
:
-
6
px
;
margin-top
:
-2
px
;
margin-top
:
4
px
;
position
:
absolute
;
position
:
absolute
;
top
:
50%
;
top
:
50%
;
width
:
0
;
}
width
:
0
;
}
...
...
resources/views/pc/AbnormalList.blade.php
View file @
7a0c7cbf
...
@@ -10,25 +10,24 @@
...
@@ -10,25 +10,24 @@
<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"
name=
"abnormal_sn"
>
<input
type=
"text"
class=
"inp w180"
name=
"abnormal_sn"
placeholder=
"输入退货单号"
>
</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"
name=
"goods_name"
>
<input
type=
"text"
class=
"inp w180"
name=
"goods_name"
placeholder=
"输入型号"
>
</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"
name=
"status"
>
<select
class=
"sel w180"
name=
"status"
>
<option
value=
""
></option>
<option
value=
"-10"
>
已取消
</option>
<option
value=
"-10"
>
已取消
</option>
<option
value=
"4"
>
已完成
</option>
<option
value=
"4"
selected
>
已完成
</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"
name=
"create_time1"
class=
"inp w120 order-time-1"
lay-key=
"1"
>
<input
type=
"text"
name=
"create_time1"
class=
"inp w120 order-time-1"
lay-key=
"1"
placeholder=
"开始时间"
>
<span
class=
"lineBlock va-m line"
>
~
</span>
<span
class=
"lineBlock va-m line"
>
~
</span>
<input
type=
"text"
name=
"create_time2"
class=
"inp w120 order-time-2"
lay-key=
"2"
>
<input
type=
"text"
name=
"create_time2"
class=
"inp w120 order-time-2"
lay-key=
"2"
placeholder=
"结束时间"
>
</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"
>
...
@@ -54,3 +53,8 @@
...
@@ -54,3 +53,8 @@
</script>
</script>
</div>
</div>
<style>
.lx-content
.lx-content-wrap
.lx-content-r
.con-section
.table-list
table
tr
th
{
border-top
:
none
!important
;
}
</style>
\ No newline at end of file
resources/views/pc/GoodsList.blade.php
View file @
7a0c7cbf
...
@@ -10,47 +10,49 @@
...
@@ -10,47 +10,49 @@
<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"
name=
"supplier_goods_id"
>
<input
type=
"text"
class=
"inp w180"
name=
"supplier_goods_id"
placeholder=
"输入商品编码"
>
</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"
name=
"goods_name"
>
<input
type=
"text"
class=
"inp w180"
name=
"goods_name"
placeholder=
"输入型号"
>
</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=
"hidden"
id=
"brand_id"
name=
"brand_id"
>
<input
type=
"hidden"
id=
"brand_id"
name=
"brand_id"
placeholder=
"输入品牌"
>
<select
id=
"brand_name"
style=
"width: 200px;"
>
<select
id=
"brand_name"
style=
"width: 200px;"
>
</select>
</select>
</div>
</div>
<div
class=
"lineBlock input-inline va-m"
id=
"search"
>
<div
style=
"margin-top: 10px"
>
<a
href=
"javascript:;"
class=
"search-btn"
>
<div
class=
"lineBlock input-inline va-m"
id=
"search"
>
<i
class=
"iconfont icon-chaxun-"
></i>
<a
href=
"javascript:;"
class=
"search-btn"
>
<span>
查询
</span>
<i
class=
"iconfont icon-chaxun-"
></i>
</a>
<span>
查询
</span>
</div>
</a>
{{--
<div
class=
"lineBlock input-inline va-m"
id=
"BatchAdd"
>
--}}
</div>
{{--
<div
class=
"lineBlock input-inline va-m"
id=
"BatchAdd"
>
--}}
{{--
<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"
id=
"exmine_no"
>
--}}
{{--
<div
class=
"lineBlock input-inline va-m"
id=
"exmine_no"
>
--}}
{{--
<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"
id=
"export"
>
<div
class=
"lineBlock input-inline va-m"
id=
"export"
>
<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"
id=
"reset"
>
<div
class=
"lineBlock input-inline va-m"
id=
"reset"
>
<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>
</div>
</div>
</form>
</form>
...
@@ -68,3 +70,8 @@
...
@@ -68,3 +70,8 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"/pc/js/select2/css/select2.css"
>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"/pc/js/select2/css/select2.css"
>
<script
type=
"text/javascript"
src=
"/pc/js/select2/js/select2.js"
></script>
<script
type=
"text/javascript"
src=
"/pc/js/select2/js/select2.js"
></script>
<script
type=
"text/javascript"
src=
"/pc/js/select2/js/i18n/zh-CN.js"
></script>
<script
type=
"text/javascript"
src=
"/pc/js/select2/js/i18n/zh-CN.js"
></script>
<style>
.lx-content
.lx-content-wrap
.lx-content-r
.con-section
.table-list
table
tr
th
{
border-top
:
none
!important
;
}
</style>
resources/views/pc/OrderList.blade.php
View file @
7a0c7cbf
...
@@ -10,27 +10,26 @@
...
@@ -10,27 +10,26 @@
<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"
name=
"order_sn"
>
<input
type=
"text"
class=
"inp w180"
name=
"order_sn"
placeholder=
"输入订单号"
>
</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"
name=
"goods_name"
>
<input
type=
"text"
class=
"inp w180"
name=
"goods_name"
placeholder=
"输入型号"
>
</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"
name=
"status"
>
<select
class=
"sel w180"
name=
"status"
>
<option
value=
""
></option>
<option
value=
"-10"
>
已取消
</option>
<option
value=
"-10"
>
已取消
</option>
<option
value=
"-2"
>
处理中
</option>
<option
value=
"-2"
>
处理中
</option>
<option
value=
"6"
>
部分收货
</option>
<option
value=
"6"
>
部分收货
</option>
<option
value=
"10"
>
完全收货
</option>
<option
value=
"10"
selected=
""
>
完全收货
</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"
name=
"create_time1"
class=
"inp w120 order-time-1"
lay-key=
"1"
>
<input
type=
"text"
name=
"create_time1"
class=
"inp w120 order-time-1"
lay-key=
"1"
placeholder=
"开始时间"
>
<span
class=
"lineBlock va-m line"
>
~
</span>
<span
class=
"lineBlock va-m line"
>
~
</span>
<input
type=
"text"
name=
"create_time2"
class=
"inp w120 order-time-2"
lay-key=
"2"
>
<input
type=
"text"
name=
"create_time2"
class=
"inp w120 order-time-2"
lay-key=
"2"
placeholder=
"结束时间"
>
</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"
>
...
@@ -62,3 +61,9 @@
...
@@ -62,3 +61,9 @@
</div>
</div>
</div>
</div>
<style>
.lx-content
.lx-content-wrap
.lx-content-r
.con-section
.table-list
table
tr
th
{
border-top
:
none
!important
;
}
</style>
\ No newline at end of file
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