Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
xianyu-ufo-app-web
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
TaoHuang
5 years ago
Commit
9c68d11f254d5eb04a8c4f26e2455d1b20d38907
1 parent
02356a50
fix
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
12 deletions
apps/components/order-pay-type/pay-type.vue
apps/pages/order/buyer-confirm.vue
apps/pages/order/components/confirm/agree.vue
apps/pages/order/components/confirm/buyer-order-footer.vue
apps/pages/order/pay.vue
apps/store/order/order-confirm.js
apps/components/order-pay-type/pay-type.vue
View file @
9c68d11
...
...
@@ -37,11 +37,6 @@ import { createNamespacedHelpers } from 'vuex';
const { mapActions: mapOrderAction } = createNamespacedHelpers('order/orderConfirm');
// 支付方式
const PAYMENTS = {
ALIPAY: 18,
};
export default {
name: 'OrderPayType',
props: {
...
...
@@ -174,7 +169,7 @@ export default {
}
.check {
font-size:
4
0px;
font-size:
5
0px;
}
.alipay {
...
...
@@ -209,7 +204,7 @@ export default {
.price-info {
margin-top: 40px;
margin-bottom:
6
0px;
margin-bottom:
4
0px;
}
.price {
...
...
apps/pages/order/buyer-confirm.vue
View file @
9c68d11
...
...
@@ -213,7 +213,7 @@ export default {
.body {
height: 100%;
margin: 0 40px;
padding-bottom: 1
0
0px;
padding-bottom: 1
8
0px;
overflow-y: auto;
}
...
...
apps/pages/order/components/confirm/agree.vue
View file @
9c68d11
...
...
@@ -19,6 +19,10 @@ export default {
desc: {
type: String,
default: ''
},
url: {
type: String,
default: ''
}
},
components: {
...
...
@@ -41,7 +45,9 @@ export default {
this.$emit('input', this.val);
},
onLinkClick() {
if (this.url) {
}
}
}
};
...
...
apps/pages/order/components/confirm/buyer-order-footer.vue
View file @
9c68d11
<template>
<div class="agree-wrapper">
<Agree></Agree>
<Agree
:desc="desc" :value="buyAgree" @input="changeAgree"
></Agree>
<div class="order-footer-wrapper">
<div class="btn1">
<div>实付金额:<span class="red">¥{{amount}}</span></div>
<div class="desc">本次交易由闲鱼x有货提供服务</div>
</div>
<YohoButton class="btn2" txt="去支付" @click="onClick"></YohoButton>
<YohoButton class="btn2" txt="去支付" @click="onClick"
:disable="!buyAgree"
></YohoButton>
</div>
</div>
</template>
...
...
@@ -14,6 +14,10 @@
<script>
import Agree from './agree';
import { createNamespacedHelpers } from 'vuex';
import { Types } from 'store/order/order-confirm';
const { mapState: mapOrderState, mapMutations: mapOrderMutations } = createNamespacedHelpers('order/orderConfirm');
export default {
name: 'BuyerOrderFooter',
...
...
@@ -21,9 +25,21 @@ export default {
components: {
Agree
},
data() {
return {
desc: '有货买家协议'
};
},
computed: {
...mapOrderState(['buyAgree'])
},
methods: {
...mapOrderMutations([Types.CHANGE_BUY_AGREE]),
onClick() {
this.$emit('click');
},
changeAgree(val) {
this[Types.CHANGE_BUY_AGREE](val);
}
}
};
...
...
apps/pages/order/pay.vue
View file @
9c68d11
...
...
@@ -11,7 +11,7 @@ const ALIPAY_DOMAIN = 'https://openapi.alipay.com/gateway.do';
export default {
name: 'PayPage',
props: ['orderCode', 'payParams'],
props: ['orderCode', 'payParams'
, 'type'
],
mounted() {
if (this.payParams) {
const url = ALIPAY_DOMAIN + '?' + this.payParams;
...
...
apps/store/order/order-confirm.js
View file @
9c68d11
...
...
@@ -11,7 +11,8 @@ export const Types = {
CHANGE_SELECT_COUPON_LIST
:
'CHANGE_SELECT_COUPON_LIST'
,
CHANGE_SELECT_PROMOTION
:
'CHANGE_SELECT_PROMOTION'
,
COMPUTE_ORDER
:
'COMPUTE_ORDER'
,
UPDATE_ORDER
:
'UPDATE_ORDER'
UPDATE_ORDER
:
'UPDATE_ORDER'
,
CHANGE_BUY_AGREE
:
'CHANGE_BUY_AGREE'
};
export
const
UserType
=
{
...
...
@@ -40,6 +41,7 @@ export default function() {
userStatus
:
false
,
price
:
''
,
agree
:
false
,
buyAgree
:
false
,
orderDetail
:
{},
selectedCouponList
:
[],
...
...
@@ -59,6 +61,9 @@ export default function() {
[
Types
.
CHANGE_AGREE
](
state
,
data
)
{
state
.
agree
=
data
;
},
[
Types
.
CHANGE_BUY_AGREE
](
state
,
data
)
{
state
.
buyAgree
=
data
;
},
[
Types
.
FETCH_ORDER_BUY_ORDER
](
state
,
data
)
{
state
.
orderDetail
=
data
;
},
...
...
Please
register
or
login
to post a comment