解决充值成功页延长时间的问题 和供货商列表页点击不正确的问题

hdApp/src/admin/recharge/rechargeSuccess.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { rechargeRenewPay } from '@/api/recharge'
+import { getMerchantDetail } from '@/api/merchant/index'
 export default {
   name: "AppResult",
   data () {
@@ -25,13 +25,19 @@ export default {
       deadline: ''
     }
   },
+  mounted() {
+    this.getData()
+  },
   methods: {
     goClose () {
-
+      this.$util.pageTo({
+        url: '/admin/home/workbench',
+        type: 4
+      })
     },
     getData () {
-      rechargeRenewPay().then(res => {
-        console.log(res)
+      getMerchantDetail().then(res => {
+        console.log('res', res)
         this.deadline = res.data.deadline
       }).catch(err => { console.log(err) })
     }

hdApp/src/pagesPurchase/order.vue

@@ -31,6 +31,7 @@
               <view
                 class="btn_entrance btn_forbid"
                 v-else
+                @click.stop=""
               >
                 结账
               </view>