From 2481e22a17149dd5ec56ff589d8f970495b0254e Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 7 Jul 2023 15:28:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E6=83=A0=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=20=E4=BA=91=E9=97=AA=E4=BB=98=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 16 ++++----
Utils/Api.js | 27 +++++++------
pages/welcome/welcome.vue | 83 +++++++++++++++++++++++++++++++--------
3 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/App.vue b/App.vue
index 033d8e8..ce3ed2f 100644
--- a/App.vue
+++ b/App.vue
@@ -15,15 +15,15 @@
snNo: '', // 设备sn号
platformType: '', //区分平台
//正式
- url: 'https://hsg.dctpay.com/user',
- graurl: 'https://pay.dctpay.com/crest',
- imgUrl: 'https://pay.dctpay.com/filesystem/',
- imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
- //测试
- // url: 'https://hsgcs.dctpay.com/user',
- // graurl:'https://gratia-pay.dctpay.com/crest',
- // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ // url: 'https://hsg.dctpay.com/user',
+ // graurl: 'https://pay.dctpay.com/crest',
+ // imgUrl: 'https://pay.dctpay.com/filesystem/',
// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ //测试
+ url: 'https://hsgcs.dctpay.com/user',
+ graurl:'https://gratia-pay.dctpay.com/crest',
+ imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
},
onLaunch: function() {
diff --git a/Utils/Api.js b/Utils/Api.js
index ee32f29..16eaa91 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -11,8 +11,8 @@ export const getQrCodeDetail = params => {
//银行卡识别
export const recognizeBankCard = params => {
return POST('GET', `${grabase}/ocr/recognizeBankCard`, params).then(res => res.data);
-}
-
+}
+
//创建 JSAPI 订单
export const createJSAPIOrder = params => {
return POST('POST', `${grabase}/tradeOrder/createJSAPIOrder`, params).then(res => res.data);
@@ -20,22 +20,22 @@ export const createJSAPIOrder = params => {
// 支付 JSAPI 订单
export const jsapiPay = params => {
return POST('POST', `${grabase}/pay/jsapiPay`, params).then(res => res.data);
-}
-
-//计算价格
+}
+
+//计算价格
export const calculation = params => {
return POST('GET', `${grabase}/tradeOrder/calculation`, params).then(res => res.data);
-}
-
+}
+
//H5 code 转化openid
export const getH5AccessToken = params => {
return POST('GET', `${base}/wechat/getH5AccessToken`, params).then(res => res.data);
}
-
-//支付宝获取openid
+
+//支付宝获取openid
export const getAlipayUserId = params => {
return POST('GET', `${grabase}/login/getAlipayUserId`, params).then(res => res.data);
-}
+}
//获取登录验证码
export const getLoginSMSCode = params => {
@@ -62,4 +62,9 @@ export const getUserDetail = params => {
//查询优惠券
export const queryUserDiscountList = params => {
return POST('GET', `${base}/discount/queryUserDiscountList`, params).then(res => res.data);
-}
+}
+
+// 获取拉卡拉银联用户id
+export const getLkLUnionUserId = params => {
+ return POST('POST', `${grabase}/tradeOrder/getLkLUnionUserId`, params).then(res => res.data);
+}
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 9d1c968..1f49b97 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -1,25 +1,35 @@
-