From 553cc38b67d6e900bcaad11ae82900ff2ed41325 Mon Sep 17 00:00:00 2001 From: Wen Fangping Date: Wed, 19 Oct 2022 10:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E4=BB=98=E5=B9=BF?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 4 ++++ src/pages/home.vue | 7 ++++++- src/pages/pay/index.vue | 35 ++++++++++++++++++++++++++--------- src/util/index.js | 5 ++++- wap/index.html | 2 +- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index cf23aed..c8179c2 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -170,7 +170,11 @@ const hasLogin = () => service.get('/api/has-login'); // 查询 const getMeritTypes = () => service.get('/api/order/get-merit-types'); +// 支付广告 +const getPayAdv = () => service.get('/api/ad/ad-pay') + export { + getPayAdv, getMeritTypes, getDynamicDataByGoodsId, hasLogin, diff --git a/src/pages/home.vue b/src/pages/home.vue index 9005181..c6bd3ad 100644 --- a/src/pages/home.vue +++ b/src/pages/home.vue @@ -5,7 +5,7 @@
- +
@@ -83,6 +83,11 @@ export default { this.getTempleIndex(); }, methods: { + onLocationTo({url}){ + if(url){ + location.href = url; + } + }, mescrollInit(mescroll){ this.mescroll = mescroll; }, diff --git a/src/pages/pay/index.vue b/src/pages/pay/index.vue index c9eac04..d4e4c3f 100644 --- a/src/pages/pay/index.vue +++ b/src/pages/pay/index.vue @@ -3,6 +3,9 @@
+
+ +

￥{{query.amount}}

@@ -34,10 +37,10 @@
- +
- 确认支付 - 确认支付 + 确认支付到寺院对公账户 + 确认支付到寺院对公账户
@@ -50,7 +53,7 @@ import { createPay, createMeritBoxOrder, createCommonOrder, - createLightOrder + createLightOrder, getPayAdv } from "@/api"; import { requestPayment } from '@/common/wechat-web'; import { mapState } from "vuex"; @@ -61,7 +64,8 @@ export default { data(){ return { query: this.$route.query, - payType: '1' + payType: '1', + adv: null, } }, computed: { @@ -71,7 +75,11 @@ export default { this.wechatReady(() => { }) - + getPayAdv().then(res => { + if(res){ + this.adv = res; + } + }) }, methods: { onContinuePayOrder(){ @@ -90,7 +98,7 @@ export default { const request = { ...this.query } const order = await createBrickDayOrder(request) await this.onPayment(order) - return + return } // 创建功德箱订单 @@ -103,7 +111,7 @@ export default { } const order = await createMeritBoxOrder(request) this.onPayment(order) - return + return } // 创建通用商品订单 @@ -148,9 +156,17 @@ export default {