Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄媛媛
ElectricitySheep
Commits
c7a6fe23
Commit
c7a6fe23
authored
Jun 29, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改样式
parent
eb73b50d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
13 deletions
+27
-13
goodsListEdit.vue
src/components/CommodityMan/goodsListEdit.vue
+20
-6
distributors.vue
src/components/UserMan/distributors.vue
+7
-7
No files found.
src/components/CommodityMan/goodsListEdit.vue
View file @
c7a6fe23
...
@@ -271,7 +271,7 @@
...
@@ -271,7 +271,7 @@
<div
class=
"box"
>
<div
class=
"box"
>
<!-- <el-checkbox v-model="val2">全选</el-checkbox> -->
<!-- <el-checkbox v-model="val2">全选</el-checkbox> -->
<el-form-item
label-width=
"90px"
style=
"display:inline-block"
label=
"批量设置"
>
<el-form-item
label-width=
"90px"
style=
"display:inline-block"
label=
"批量设置"
>
<el-input
style=
"width:
560px
"
size=
"small"
v-model=
"valpl"
placeholder=
"请输入内容"
<el-input
style=
"width:
100%
"
size=
"small"
v-model=
"valpl"
placeholder=
"请输入内容"
class=
"input-with-select"
>
class=
"input-with-select"
>
<el-select
style=
"width:120px"
v-model=
"ggpl"
slot=
"prepend"
placeholder=
"请选择"
>
<el-select
style=
"width:120px"
v-model=
"ggpl"
slot=
"prepend"
placeholder=
"请选择"
>
<el-option
label=
"价格"
:value=
"1"
></el-option>
<el-option
label=
"价格"
:value=
"1"
></el-option>
...
@@ -384,7 +384,7 @@
...
@@ -384,7 +384,7 @@
<el-form-item
label=
"限购数量"
>
<el-form-item
label=
"限购数量"
>
<el-form-item
label-width=
"60px"
label=
"商品"
>
<el-form-item
label-width=
"60px"
label=
"商品"
>
<el-input
:disabled=
"BuyGoodsNumState"
v-model=
"addMsg.LimitBuyGoodsNum"
<el-input
:disabled=
"BuyGoodsNumState"
v-model=
"addMsg.LimitBuyGoodsNum"
style=
"width:
420px
;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
style=
"width:
100%
;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
class=
"input-with-select"
>
<el-button
slot=
"append"
>
件
</el-button>
<el-button
slot=
"append"
>
件
</el-button>
</el-input>
</el-input>
...
@@ -394,7 +394,7 @@
...
@@ -394,7 +394,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label-width=
"60px"
label=
"订单"
>
<el-form-item
label-width=
"60px"
label=
"订单"
>
<el-input
:disabled=
"BuyOrderNumState"
v-model=
"addMsg.LimitBuyOrderNum"
<el-input
:disabled=
"BuyOrderNumState"
v-model=
"addMsg.LimitBuyOrderNum"
style=
"width:
420px
;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
style=
"width:
100%
;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
class=
"input-with-select"
>
<el-button
slot=
"append"
>
单
</el-button>
<el-button
slot=
"append"
>
单
</el-button>
</el-input>
</el-input>
...
@@ -468,7 +468,7 @@
...
@@ -468,7 +468,7 @@
</div>
</div>
<i
class=
"el-tooltip el-icon-info"
></i>
<i
class=
"el-tooltip el-icon-info"
></i>
</el-tooltip>
</el-tooltip>
<el-input
v-model=
"addMsg.IntegralPresent"
style=
"width:
670px
;margin-left:15px"
type=
"number"
<el-input
v-model=
"addMsg.IntegralPresent"
style=
"width:
100%
;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<el-button
slot=
"append"
>
<el-button
slot=
"append"
>
分
分
...
@@ -482,7 +482,7 @@
...
@@ -482,7 +482,7 @@
placement=
"top"
style=
"position: absolute;left: -10px;top:12px"
>
placement=
"top"
style=
"position: absolute;left: -10px;top:12px"
>
<i
class=
"el-tooltip el-icon-info"
></i>
<i
class=
"el-tooltip el-icon-info"
></i>
</el-tooltip>
</el-tooltip>
<el-input
v-model=
"addMsg.PointsDeduction"
style=
"width:
670px
;margin-left:15px"
type=
"number"
<el-input
v-model=
"addMsg.PointsDeduction"
style=
"width:
100%
;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<
template
slot=
"prepend"
>
最多抵扣
</
template
>
<
template
slot=
"prepend"
>
最多抵扣
</
template
>
<el-button
slot=
"append"
>
<el-button
slot=
"append"
>
...
@@ -2272,5 +2272,19 @@
...
@@ -2272,5 +2272,19 @@
margin
:
20px
0
;
margin
:
20px
0
;
font-size
:
12px
;
font-size
:
12px
;
}
}
@media
(
max-width
:
1920px
)
and
(
min-width
:
1300px
)
{
.goodsListEdit
.el-col-12
{
width
:
50%
;
}
}
@media
(
max-width
:
1910px
)
and
(
min-width
:
1200px
)
{
.goodsListEdit
.el-col-12
{
width
:
66.66667%
;
}
}
@media
(
max-width
:
1199px
)
and
(
min-width
:
200px
)
{
.goodsListEdit
.el-col-12
{
width
:
90%
;
}
}
</
style
>
</
style
>
\ No newline at end of file
src/components/UserMan/distributors.vue
View file @
c7a6fe23
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<span
@
click=
"getList"
class=
"el-icon-search"
<span
@
click=
"getList"
class=
"el-icon-search"
style=
"color:#979dad;font-size:14px;position:relative;top:1px"
></span>
style=
"color:#979dad;font-size:14px;position:relative;top:1px"
></span>
</div>
</div>
<el-button
@
click=
"plSet"
size=
"small"
type=
"primary"
>
批量设置
</el-button>
<el-button
@
click=
"plSet"
size=
"small"
type=
"primary"
style=
"margin-bottom:20px;"
>
批量设置
</el-button>
<el-button
@
click=
"addUserBtn"
style=
"float:right"
size=
"small"
type=
"primary"
>
添加分销商
</el-button>
<el-button
@
click=
"addUserBtn"
style=
"float:right"
size=
"small"
type=
"primary"
>
添加分销商
</el-button>
</div>
</div>
...
@@ -54,11 +54,11 @@
...
@@ -54,11 +54,11 @@
</div>
</div>
<el-table
class=
"table_samll"
:data=
"tableData"
v-loading=
"loading"
border
@
select-all=
"CheckAllTable"
<el-table
class=
"table_samll"
:data=
"tableData"
v-loading=
"loading"
border
@
select-all=
"CheckAllTable"
@
select=
"SingelCheck"
style=
"width: 100%;margin:0 0 20px 0"
>
@
select=
"SingelCheck"
style=
"width: 100%;margin:0 0 20px 0"
>
<el-table-column
type=
"selection"
>
<el-table-column
type=
"selection"
width=
"60"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"UserId"
label=
"用户ID"
width=
"80"
>
<el-table-column
prop=
"UserId"
label=
"用户ID"
width=
"80"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"address"
label=
"基本信息"
>
<el-table-column
prop=
"address"
label=
"基本信息"
width=
"200"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<div
class=
"app-image"
:style=
"
{backgroundImage:'url(' + scope.row.Photo + ')',backgroundSize:'cover'}">
<div
class=
"app-image"
:style=
"
{backgroundImage:'url(' + scope.row.Photo + ')',backgroundSize:'cover'}">
</div>
</div>
...
@@ -87,14 +87,14 @@
...
@@ -87,14 +87,14 @@
</el-table-column>
</el-table-column>
<el-table-column
prop=
"SuperiorName"
label=
"推荐人"
>
<el-table-column
prop=
"SuperiorName"
label=
"推荐人"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"name"
label=
"下级用户"
>
<el-table-column
prop=
"name"
label=
"下级用户"
width=
"200"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<p
@
click=
"getReferrals(1,scope.row)"
class=
"blue point"
>
一级:
{{
scope
.
row
.
OneNum
}}
</p>
<p
@
click=
"getReferrals(1,scope.row)"
class=
"blue point"
>
一级:
{{
scope
.
row
.
OneNum
}}
</p>
<p
@
click=
"getReferrals(2,scope.row)"
class=
"blue point"
>
二级:
{{
scope
.
row
.
TwoNum
}}
</p>
<p
@
click=
"getReferrals(2,scope.row)"
class=
"blue point"
>
二级:
{{
scope
.
row
.
TwoNum
}}
</p>
<p
@
click=
"getReferrals(3,scope.row)"
class=
"blue point"
>
三级:
{{
scope
.
row
.
ThreeNum
}}
</p>
<p
@
click=
"getReferrals(3,scope.row)"
class=
"blue point"
>
三级:
{{
scope
.
row
.
ThreeNum
}}
</p>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
v-if=
"hpEnabled==2"
prop=
"name"
label=
"分销商等级"
>
<el-table-column
v-if=
"hpEnabled==2"
prop=
"name"
label=
"分销商等级"
width=
"120"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-tag
v-if=
"scope.row.GradeName=='默认等级'"
type=
"info"
>
{{
scope
.
row
.
GradeName
}}
</el-tag>
<el-tag
v-if=
"scope.row.GradeName=='默认等级'"
type=
"info"
>
{{
scope
.
row
.
GradeName
}}
</el-tag>
<el-tag
v-if=
"scope.row.GradeName!='默认等级' && scope.row.GradeName!=''"
>
{{
scope
.
row
.
GradeName
}}
</el-tag>
<el-tag
v-if=
"scope.row.GradeName!='默认等级' && scope.row.GradeName!=''"
>
{{
scope
.
row
.
GradeName
}}
</el-tag>
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
<el-tag
v-else
>
{{
scope
.
row
.
AuditStatusName
}}
</el-tag>
<el-tag
v-else
>
{{
scope
.
row
.
AuditStatusName
}}
</el-tag>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"name"
label=
"时间"
>
<el-table-column
prop=
"name"
label=
"时间"
width=
"200"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<p>
申请时间:
</p>
<p>
申请时间:
</p>
<span>
{{
scope
.
row
.
CreateDate
}}
</span>
<span>
{{
scope
.
row
.
CreateDate
}}
</span>
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
</el-table-column>
</el-table-column>
<el-table-column
prop=
"Remark"
label=
"备注信息"
>
<el-table-column
prop=
"Remark"
label=
"备注信息"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"address"
width=
"
2
00"
label=
"操作"
>
<el-table-column
prop=
"address"
width=
"
3
00"
label=
"操作"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看订单"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看订单"
placement=
"top-start"
>
<img
v-if=
"scope.row.AuditStatus==2"
@
click=
"CommonJump('distributionOrder')"
style=
"width:32px;height:32px"
<img
v-if=
"scope.row.AuditStatus==2"
@
click=
"CommonJump('distributionOrder')"
style=
"width:32px;height:32px"
...
...
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