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
462c60fc
Commit
462c60fc
authored
Aug 06, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
422fce8d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
11 deletions
+17
-11
RecommendRebate.vue
src/components/UserMan/RecommendRebate.vue
+2
-2
baseSet.vue
src/components/UserMan/baseSet.vue
+6
-1
usersCoupon.vue
src/components/UserMan/usersCoupon.vue
+3
-1
usersList.vue
src/components/UserMan/usersList.vue
+1
-1
orderList.vue
src/components/orderMan/orderList.vue
+5
-6
No files found.
src/components/UserMan/RecommendRebate.vue
View file @
462c60fc
...
...
@@ -154,7 +154,7 @@
</div>
<div
class=
"goods-item"
style=
"width: 10%;"
>
<div
v-for=
"(list,index2) in item.DetailList"
:key=
"index2"
class=
"goods"
flex=
"main:center cross:center"
>
<div
v-for=
"(list,index2) in item.DetailList"
:key=
"index2"
class=
"goods"
flex=
"main:center cross:center"
v-if=
"list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 "
>
<div
v-if=
"list.OrderIntroduction.CommissionState==1"
>
待结算
</div>
<div
v-if=
"list.OrderIntroduction.CommissionState==2"
>
已结算
</div>
...
...
@@ -163,7 +163,7 @@
</div>
<div
class=
"goods-item"
style=
"width: 20%;"
>
<div
v-for=
"(list,index2) in item.DetailList"
:key=
"index2"
class=
"goods"
>
<div
v-for=
"(list,index2) in item.DetailList"
:key=
"index2"
class=
"goods"
v-if=
"list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 "
>
...
...
src/components/UserMan/baseSet.vue
View file @
462c60fc
...
...
@@ -44,6 +44,10 @@
<el-radio
v-model=
"addMsg.IsEnableFXGrade"
:label=
"1"
>
开启
</el-radio>
<el-radio
v-model=
"addMsg.IsEnableFXGrade"
:label=
"2"
>
不开启
</el-radio>
</el-form-item>
<el-form-item
label=
"无上级是否开启返佣"
>
<el-radio
v-model=
"addMsg.IsEnableNoSuperiorFY"
:label=
"1"
>
开启
</el-radio>
<el-radio
v-model=
"addMsg.IsEnableNoSuperiorFY"
:label=
"2"
>
不开启
</el-radio>
</el-form-item>
</div>
</el-card>
<el-card
class=
"box-card"
style=
"margin-top:10px"
>
...
...
@@ -247,7 +251,8 @@
IndexImage
:
''
,
IndexImagePath
:
''
,
IsCommissionResidue
:
1
,
IsEnableFXGrade
:
1
//1开启 2不开启
IsEnableFXGrade
:
1
,
//1开启 2不开启
IsEnableNoSuperiorFY
:
1
,
},
dialogVisible
:
false
,
...
...
src/components/UserMan/usersCoupon.vue
View file @
462c60fc
...
...
@@ -104,7 +104,9 @@
},
created
()
{
this
.
getList
();
if
(
this
.
$route
.
query
.
UserId
){
console
.
log
(
this
.
$route
.
query
.
UserId
)
}
},
mounted
()
{
},
...
...
src/components/UserMan/usersList.vue
View file @
462c60fc
...
...
@@ -71,7 +71,7 @@
</el-table-column>
<el-table-column
prop=
"name"
label=
"优惠券数量"
>
<
template
slot-scope=
"scope"
>
<span
@
click=
"CommonJump('usersCoupon')"
class=
"blue point"
>
{{
scope
.
row
.
CouponsNum
}}
</span>
<span
@
click=
"CommonJump('usersCoupon'
,
{UserId:scope.row.Id}
)" class="blue point">
{{
scope
.
row
.
CouponsNum
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"name"
label=
"卡券数量"
>
...
...
src/components/orderMan/orderList.vue
View file @
462c60fc
...
...
@@ -138,7 +138,7 @@
</div>
</div>
</div>
<div
style=
"margin-bottom:
24
px;"
>
<div
style=
"margin-bottom:
5
px;"
>
<span
style=
"margin-right: 10px;"
>
规格:
<el-tag
...
...
@@ -150,12 +150,11 @@
</el-tag>
</span>
</div>
<div
class=
"app-order-goods-price"
>
<span>
货号:
{{
list
.
ProductCode
}}
</span>
</div>
<div
class=
"app-order-goods-price"
v-if=
'list.FreeShippingRemarks!=null'
>
<span>
{{
list
.
FreeShippingRemarks
}}
</span>
<div
style=
" display: flex;flex-direction: row;align-items: center;"
>
<span>
货号:
{{
list
.
ProductCode
!=
null
&&
list
.
ProductCode
!=
''
?
list
.
ProductCode
:
'无'
}}
</span>
<span
style=
"margin-left:20px"
v-if=
'list.FreeShippingRemarks!=null'
>
{{
list
.
FreeShippingRemarks
}}
</span>
</div>
</div>
<div
flex=
"dir:left box:mean"
style=
"width: 300px;"
>
<div
flex=
"cross:center main:center"
style=
"display: flex;flex-direction: column;align-items: flex-start;"
>
...
...
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