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

@@ -200,18 +200,31 @@ export default {
                 if (!this.changePrice) {
                   return;
                 }
-                const { isOk, errMsg = '' } = await this.confirmChangePrice({
+                const { isOk, errMsg = '', bidData} = await this.confirmChangePrice({
                   price: this.changePrice,
                   orderCode,
                 });
 
                 if (isOk) {
-                  if (isDetail) {
-                    this.fetchOrderDetail(this.$route.params);
-                  } else {
-                    this.resetData();
-                    this.fetchData(this.$route.params);
-                  }
+                  // 重新支付保证金
+                  this.$createOrderPayType({
+                    orderCode: bidData.orderCode,
+                    price: parseFloat(bidData.depositAmount),
+                    desc: '支付定金',
+                    extra: JSON.stringify({
+                      forward: {
+                        name: isDetail ? 'buyOrderDetail' : 'OrderList',
+                        params: this.$route.params,
+                      },
+                    }),
+                  }).show();
+
+                  // if (isDetail) {
+                  //   this.fetchOrderDetail(this.$route.params);
+                  // } else {
+                  //   this.resetData();
+                  //   this.fetchData(this.$route.params);
+                  // }
                 } else {
                   if (errMsg) {
                     this.$createToast({

@@ -185,7 +185,7 @@ export default {
   // footer高度120px
   padding: 0 40px;
   -webkit-box-orient: vertical;
-  height: calc(100vh - 210px);
+  height: calc(100vh - 120px);
   overflow-x: hidden;
   overflow-y: auto;
   font-size: 24px;

@@ -181,7 +181,7 @@ export default function() {
         });
 
         if (res.code === 200) {
-          return { errMsg: '', isOk: true };
+          return { errMsg: '', isOk: true , bidData: res.data};
         } else {
           return { errMsg: res.message, isOk: false };
         }

 {
   "name": "xianyu-ufo-app-web",
-  "version": "0.0.2-beta-25",
+  "version": "0.0.2-beta-26",
   "private": true,
   "description": "Xianyu Project With Express",
   "repository": {