Merge remote-tracking branch 'origin/develop' into develop

@@ -133,12 +133,16 @@ export default {
                   orderCode,
                   orderCode,
                 },
                 },
               },
               },
+              reportType: 'buy',
             }),
             }),
           }).show();
           }).show();
           break;
           break;
         }
         }
 
 
         case orderActionsMap.PAY_DEPOSIT.name: {
         case orderActionsMap.PAY_DEPOSIT.name: {
+          // 是否是求购
+          const isAskForBuy = status === 7;
+
           this.$createOrderPayType({
           this.$createOrderPayType({
             orderCode,
             orderCode,
             price: parseFloat(bidDepositInfo.depositAmount).toFixed(2),
             price: parseFloat(bidDepositInfo.depositAmount).toFixed(2),
@@ -150,6 +154,7 @@ export default {
                   owner: 'buy',
                   owner: 'buy',
                 },
                 },
               },
               },
+              reportType: isAskForBuy ? 'qiugou_buy' : 'buy',
             }),
             }),
           }).show();
           }).show();
           break;
           break;
@@ -209,7 +214,11 @@ export default {
             orderCode,
             orderCode,
             onCloseAction() {},
             onCloseAction() {},
             onConfirmAction: async price => {
             onConfirmAction: async price => {
-              const { isOk, errMsg = '', bidData } = await that.confirmChangePrice({
+              const {
+                isOk,
+                errMsg = '',
+                bidData,
+              } = await that.confirmChangePrice({
                 price: price,
                 price: price,
                 orderCode,
                 orderCode,
               });
               });
@@ -225,17 +234,20 @@ export default {
                       name: isDetail ? 'buyOrderDetail' : 'OrderList',
                       name: isDetail ? 'buyOrderDetail' : 'OrderList',
                       params: this.$route.params,
                       params: this.$route.params,
                     },
                     },
+                    reportType: 'buy',
                   }),
                   }),
                 }).show();
                 }).show();
               } else {
               } else {
                 if (errMsg) {
                 if (errMsg) {
-                  that.$createToast({
-                    type: 'alert',
-                    txt: errMsg,
-                  }).show();
+                  that
+                    .$createToast({
+                      type: 'alert',
+                      txt: errMsg,
+                    })
+                    .show();
                 }
                 }
               }
               }
-            }
+            },
           }).show();
           }).show();
           break;
           break;
         }
         }

@@ -84,6 +84,7 @@ export default {
               forward: {
               forward: {
                 name: pageBackName,
                 name: pageBackName,
               },
               },
+              reportType: 'sell',
             }),
             }),
           }).show();
           }).show();
           break;
           break;