Merge branch 'feature/orderPaymentStatus' into 'master'

Feature/order payment status

See merge request !12

src/api/pay.api.js

@@ -8,7 +8,7 @@ const queryPayInfo = function(data) {
 };
 const prepay = async function(data) {
   const scDeviceId = await saDeviceId();
-  return request.post(`${talosHost}/open/checkout/prepay`, data, {
+  return request.post(`${talosHost}/open/checkout/v2/prepay`, data, {
     customHeader: {
       scDeviceId
     },
@@ -18,7 +18,7 @@ const prepay = async function(data) {
 
 const pay = async function(data) {
   const scDeviceId = await saDeviceId();
-  return request.post(`${talosHost}/open/checkout/pay`, data, {
+  return request.post(`${talosHost}/open/checkout/v2/pay`, data, {
     customHeader: {
       scDeviceId
     },
@@ -27,7 +27,7 @@ const pay = async function(data) {
 };
 
 const queryPayStatus = function(data) {
-  return request.post(`${talosHost}/open/checkout/pay_status/query`, data);
+  return request.post(`${talosHost}/open/checkout/v2/pay_status/query`, data);
 };
 
 const sendSms = function(data) {

src/views/pay/STATIC_DATA.js

@@ -48,6 +48,7 @@ const IS_CREDIT_PAY = method =>
 const PAYMENT_CODE_PAY = 1; // 支付密码
 const SMS_VERIFICATION_CODE_PAY = 2; //短信验证码
 const FACE_VERIFICATION_CODE_PAY = 4; //人脸验证
+const CENTER_CODE_PAY = 5; //支付中
 
 const PAY_SUCCESS = 3; // 支付成功
 const PAY_PAYING = 2; //支付中
@@ -173,5 +174,6 @@ export {
   ACCOUNT_APPLY_AUDIT_FAIL,
   SMS_VERIFICATION_CODE_PAY,
   FACE_VERIFICATION_CODE_PAY,
-  payTypeMap
+  payTypeMap,
+  CENTER_CODE_PAY
 };

src/views/pay/index.vue

@@ -124,7 +124,8 @@ import {
   creditPayStatusType,
   ACCOUNT_APPLY_SUCCESS,
   SMS_VERIFICATION_CODE_PAY, //短信验证码
-  FACE_VERIFICATION_CODE_PAY
+  FACE_VERIFICATION_CODE_PAY,
+  CENTER_CODE_PAY
 } from './STATIC_DATA';
 import {
   pay,
@@ -530,6 +531,8 @@ export default {
         });
         this.close();
         this.goOcr();
+      } else if (creditPayStatus === CENTER_CODE_PAY) {
+        this.payResult('Waiting');
       }
     },
     payResult(type, error) {