Merge branch 'feature/reyun' into feature/activity

# Conflicts:
#	src/views/pay/payResult.vue

src/views/pay/STATIC_DATA.js

@@ -133,6 +133,16 @@ function filterAllPayList(type, data) {
   }
   return data;
 }
+
+const payTypeMap = {
+  '1': '信用支付',
+  '2': '微信支付',
+  '3': '支付宝支付',
+  '4': '信用支付_微信支付',
+  '5': '信用支付_支付宝支付',
+  '6': '虚拟支付0元付'
+};
+
 export {
   status,
   codeArr,
@@ -161,5 +171,6 @@ export {
   ACCOUNT_APPLY_AUDITING,
   ACCOUNT_APPLY_AUDIT_FAIL,
   SMS_VERIFICATION_CODE_PAY,
-  FACE_VERIFICATION_CODE_PAY
+  FACE_VERIFICATION_CODE_PAY,
+  payTypeMap
 };

src/views/pay/index.vue

@@ -519,7 +519,8 @@ export default {
         name: `pay${type}`,
         query: {
           reason: error,
-          orderNo: this.orderNo
+          orderNo: this.orderNo,
+          payType: this.payType
         }
       });
     },

src/views/pay/payResult.vue

@@ -55,7 +55,9 @@
 import RecoGoods from '@/components/RecoGoods.vue';
 import cookies from '@/service/cookieStorage.service';
 import localStorage from '@/service/localStorage.service';
+import { isApp } from '@/service/validation.service';
 import { goUrlExtends } from './extends';
+import { payTypeMap } from './STATIC_DATA';
 export default {
   components: { RecoGoods },
   extends: goUrlExtends,
@@ -72,7 +74,7 @@ export default {
   },
   created() {
     this.getQuery();
-    const { orderNo, reason } = this.$route.query;
+    const { orderNo, reason, payType } = this.$route.query;
     const { success } = this.$route.meta;
     const amount = cookies.get('amount') || {};
     this.money = amount.finalAmt;
@@ -84,6 +86,17 @@ export default {
     this.$track.registeredEvents('h5_RechargeResultPageExposure', {
       pay_status: this.payStatus
     });
+    this.isSuccess &&
+      isApp &&
+      this.util.run({
+        event: 'reyunAnalytics',
+        data: {
+          method: 'PaySuccess', //string submitOrder  OR  PaySuccess
+          orderId: orderNo, //string 订单号
+          amount: amount.finalAmt, //float 金额
+          payType: payTypeMap[payType] //string 支付类型
+        }
+      });
   },
   methods: {
     getQuery() {