Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -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: 40px;
+  font-size: 50px;
 }
 
 .alipay {
@@ -209,7 +204,7 @@ export default {
 
 .price-info {
   margin-top: 40px;
-  margin-bottom: 60px;
+  margin-bottom: 40px;
 }
 
 .price {

@@ -213,7 +213,7 @@ export default {
 .body {
   height: 100%;
   margin: 0 40px;
-  padding-bottom: 100px;
+  padding-bottom: 180px;
   overflow-y: auto;
 }
 

@@ -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) {
 
+      }
     }
   }
 };

 <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);
     }
   }
 };

@@ -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;

@@ -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;
       },