Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
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
viitto
mallapp
Commits
3f3b5599
Commit
3f3b5599
authored
Aug 07, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
4a592bc8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
23 deletions
+30
-23
billDetails.vue
pages/mySupplier/billDetails.vue
+6
-8
myProduct.vue
pages/mySupplier/myProduct.vue
+1
-1
mySupplierList.vue
pages/mySupplier/mySupplierList.vue
+3
-6
supplierOrder.vue
pages/mySupplier/supplierOrder.vue
+7
-7
order-submit.vue
pages/order-submit/order-submit.vue
+13
-1
No files found.
pages/mySupplier/billDetails.vue
View file @
3f3b5599
...
@@ -37,18 +37,14 @@
...
@@ -37,18 +37,14 @@
</view>
</view>
</view>
</view>
<view
class=
"OrderNoStyle"
>
<view
class=
"box_r_b"
>
<text>
订单号:
{{
item
.
OrderNo
}}
</text>
<text
style=
"font-size: 12px;color: #555555;"
></text>
<view
style=
"font-size: 12px;color: #111111;"
>
<view
style=
"padding: 5px 10px;background: #F8F6F5;font-size: 12px;color: #111111;"
>
<text>
已得佣金:
</text>
<text>
已得佣金:
</text>
<text
style=
"color: #FF4048;font-size: 12px;"
>
{{
item
.
Commission
}}
</text>
<text
style=
"color: #FF4048;font-size: 12px;"
>
{{
item
.
Commission
}}
</text>
<text>
元
</text>
<text>
元
</text>
</view>
</view>
</view>
</view>
<view
class=
"OrderNoStyle"
>
<text
style=
"margin-left: 15px;"
>
订单号:
{{
item
.
OrderNo
}}
</text>
</view>
</view>
</view>
</view>
</view>
...
@@ -211,9 +207,11 @@
...
@@ -211,9 +207,11 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
center
;
font-size
:
1
1
px
;
font-size
:
1
2
px
;
color
:
#888888
;
color
:
#888888
;
margin-top
:
15px
;
margin-top
:
15px
;
padding
:
0
15px
;
justify-content
:
space-between
;
}
}
</
style
>
</
style
>
pages/mySupplier/myProduct.vue
View file @
3f3b5599
...
@@ -226,7 +226,7 @@
...
@@ -226,7 +226,7 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
center
;
font-size
:
1
0
px
;
font-size
:
1
1
px
;
color
:
#888888
;
color
:
#888888
;
height
:
35px
;
height
:
35px
;
margin-left
:
2%
;
margin-left
:
2%
;
...
...
pages/mySupplier/mySupplierList.vue
View file @
3f3b5599
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<view
class=
"agreementbox"
v-if=
'isshowagreement==true'
></view>
<view
class=
"agreementbox"
v-if=
'isshowagreement==true'
></view>
<view
class=
"agreementbox_t"
v-if=
'isshowagreement==true'
>
<view
class=
"agreementbox_t"
v-if=
'isshowagreement==true'
>
<view
class=
"agreement_b"
>
<view
class=
"agreement_b"
>
<view
style=
"width: 100%;height: 45px;font-size: 14px;color: #000000;display: flex;flex-direction: row;border-bottom: 1px solid #E2E2E2
;margin-top: -60px;
"
>
<view
style=
"width: 100%;height: 45px;font-size: 14px;color: #000000;display: flex;flex-direction: row;border-bottom: 1px solid #E2E2E2"
>
<view
class=
"popupstyle"
>
<view
class=
"popupstyle"
>
<text>
毛利率
</text>
<text>
毛利率
</text>
</view>
</view>
...
@@ -65,10 +65,6 @@
...
@@ -65,10 +65,6 @@
</view>
</view>
<u-icon
name=
"close"
style=
'position: absolute;left: 50%;bottom: -60px;margin-left: -30rpx;'
color=
"#FFFFFF"
size=
"60"
@
click=
'read'
></u-icon>
<u-icon
name=
"close"
style=
'position: absolute;left: 50%;bottom: -60px;margin-left: -30rpx;'
color=
"#FFFFFF"
size=
"60"
@
click=
'read'
></u-icon>
<!--
<view
class=
"agreement_bottom"
:style=
"
{background:mainColor}" @click="read">
<Text
style=
'color: #fff;'
>
确定
</Text>
</view>
-->
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -260,8 +256,9 @@
...
@@ -260,8 +256,9 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
align-items
:
center
;
align-items
:
center
;
min-height
:
100px
;
position
:
relative
;
position
:
relative
;
margin-top
:
-60px
;
}
}
.mySupplierList
.agreementbox_t
.agreement_bottom
{
.mySupplierList
.agreementbox_t
.agreement_bottom
{
width
:
100%
;
width
:
100%
;
...
...
pages/mySupplier/supplierOrder.vue
View file @
3f3b5599
...
@@ -51,17 +51,15 @@
...
@@ -51,17 +51,15 @@
</view>
</view>
</view>
</view>
<view
class=
"box_r_b"
>
<text
style=
"font-size: 12px;color: #555555;"
></text>
<view
class=
"OrderNoStyle"
>
<view
style=
"padding: 5px 10px;background: #F8F6F5;font-size: 12px;color: #111111;"
>
<text
>
订单号:
{{
item
.
OrderNo
}}
</text>
<view
style=
"font-size: 12px;color: #111111;"
>
<text>
已得佣金:
</text>
<text>
已得佣金:
</text>
<text
style=
"color: #FF4048;font-size: 12px;"
>
{{
item
.
Commission
}}
</text>
<text
style=
"color: #FF4048;font-size: 12px;"
>
{{
item
.
Commission
}}
</text>
<text>
元
</text>
<text>
元
</text>
</view>
</view>
</view>
</view>
<view
class=
"OrderNoStyle"
>
<text
style=
"margin-left: 15px;"
>
订单号:
{{
item
.
OrderNo
}}
</text>
</view>
</view>
</view>
</view>
</view>
...
@@ -388,9 +386,11 @@
...
@@ -388,9 +386,11 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
center
;
font-size
:
11px
;
justify-content
:
space-between
;
font-size
:
12px
;
color
:
#888888
;
color
:
#888888
;
margin-top
:
15px
;
margin-top
:
15px
;
padding
:
0
15px
;
}
}
.supplierOrder
.popupbox
{
.supplierOrder
.popupbox
{
...
...
pages/order-submit/order-submit.vue
View file @
3f3b5599
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
size=
"80"
size=
"80"
:ripple=
"true"
:ripple=
"true"
shape=
"circle"
shape=
"circle"
@
click=
"
submitOrderHandler
"
@
click=
"
ds.promptNoSuperiorFY== false ? submitModel():submitOrderHandler()
"
:custom-style=
"{
:custom-style=
"{
backgroundColor: mc,
backgroundColor: mc,
height: '80rpx',
height: '80rpx',
...
@@ -173,6 +173,14 @@
...
@@ -173,6 +173,14 @@
</view>
</view>
</view>
</view>
</u-popup>
</u-popup>
<u-modal
v-model=
"showReviceModal"
content=
"您的上级不存在,当前订单不会返佣,是否继续?"
:show-cancel-button=
"true"
:show-title=
"false"
@
confirm=
"submitOrderHandler"
:border-radius=
"20"
></u-modal>
</view>
</view>
</template>
</template>
...
@@ -252,6 +260,7 @@ export default {
...
@@ -252,6 +260,7 @@ export default {
},
},
ShoppingCartIdList
:
[],
ShoppingCartIdList
:
[],
BuyerMessage
:
''
,
BuyerMessage
:
''
,
showReviceModal
:
false
,
};
};
},
},
onLoad
(
option
)
{
onLoad
(
option
)
{
...
@@ -307,6 +316,9 @@ export default {
...
@@ -307,6 +316,9 @@ export default {
this
.
goodData
=
this
.
mchs
[
i
].
goods_list
;
this
.
goodData
=
this
.
mchs
[
i
].
goods_list
;
this
.
showGoodList
=
true
;
this
.
showGoodList
=
true
;
},
},
submitModel
(){
this
.
showReviceModal
=
true
;
},
// 提交订单
// 提交订单
submitOrderHandler
()
{
submitOrderHandler
()
{
let
that
=
this
;
let
that
=
this
;
...
...
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