diff --git a/bitcopay后台-开发环境.zip b/bitcopay后台-开发环境.zip
new file mode 100644
index 0000000..4e85279
Binary files /dev/null and b/bitcopay后台-开发环境.zip differ
diff --git a/src/views/otc/otcStoreRechargeOrder/index.vue b/src/views/otc/otcStoreRechargeOrder/index.vue
index 0108a6e..64a7ee9 100644
--- a/src/views/otc/otcStoreRechargeOrder/index.vue
+++ b/src/views/otc/otcStoreRechargeOrder/index.vue
@@ -296,8 +296,16 @@ export default {
                 if (valid) {
                     if (t == 'test') {
                         payRecordRecharge.recharge(this.form).then((response) => {
-                            this.openTest = false;
                             this.msgSuccess("操作成功");
+                            this.$confirm('去支付？', '提示', {
+                                confirmButtonText: '确定',
+                                cancelButtonText: '取消',
+                                type: 'warning'
+                            }).then(({ value }) => {
+                                window.open(response.data.payUrl);
+                            }).catch(() => {
+                            });
+                            this.openTest = false;
                             this.getList();
                         }).catch(() => {
                         })
diff --git a/vue.config.js b/vue.config.js
index 71fdedf..bb8f2f6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,11 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-<<<<<<< HEAD
         target: `http://bitcopay-admin.weirui0755.com/stage-api`,
-=======
-        target: `http://localhost:5500`,
->>>>>>> 8c89d7617c21beef7f943a9673ba2bbd3d1cf7a9
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''