Merge branch 'dev_1.1.7_by_nft' into dev_1.1.7_test

pages/payment/index.vue

@@ -650,7 +650,7 @@ export default {
                     msg = 'Invalid redemption code'
                     break;
                 default:
-                    msg = 'Invalid redemption code, please try again'
+                    msg = 'Payment failed, please try again'
                     break;
             }
             // Dialog