From b80c41bffe97f0d2605692fee95e5f93de44629c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 11 Oct 2022 17:43:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E4=B8=AD=E7=9F=B3=E6=B2=B9?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E8=B7=B3=E8=BD=AC=E2=80=9D=E5=A5=BD?=
=?UTF-8?q?=E5=AE=A2=E5=B0=8F=E7=A8=8B=E5=BA=8F=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 12 +-
Utils/Api.js | 23 +-
index.html | 2 +-
manifest.json | 190 ++++++++-------
pages/goods/coupon-details/coupon-details.vue | 222 ++++++++++++++----
.../coupons-info-details.vue | 34 ++-
pages/goods/goods.vue | 5 +-
pages/pay/success/success.vue | 200 +++++++++++++---
pages/user/agentCoupons/agentCoupons.vue | 5 +-
pages/welcome/welcome.vue | 2 +-
10 files changed, 501 insertions(+), 194 deletions(-)
diff --git a/App.vue b/App.vue
index 7f21450..325e724 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,19 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://hsg.dctpay.com/crest',
+ // url: 'https://hsg.dctpay.com/crest',
+ // v1url:'https://hsg.dctpay.com/v1',
// imgUrl: 'https://hsg.dctpay.com/filesystem/',
// brestUrl: 'https://hsg.dctpay.com/brest',
- // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
+ // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
+ // imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/',
//测试
- url: 'https://hsgcs.dctpay.com/crest',
+ url: 'https://hsgcs.dctpay.com/crest',
+ v1url:'https://hsgcs.dctpay.com/v1',
brestUrl: 'https://hsgcs.dctpay.com/brest',
imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
- imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/',
userInfo: "",
brestUserInfo: '',
bresthighAgent: '',
diff --git a/Utils/Api.js b/Utils/Api.js
index 43094d4..0359dd1 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -6,7 +6,19 @@ import {
} from "./bRequest.js";
let app = getApp();
let base = app.globalData.url;
-let brestBase = app.globalData.brestUrl;
+let v1base = app.globalData.v1url;
+let brestBase = app.globalData.brestUrl;
+//公众号获取跳小程序参数
+export const verifyWx = params => {
+ return POST('GET', `${v1base}/wxMsg/verifyWx`, params).then(res => res.data);
+}
+//公众号获取跳转小程序地址
+export const getScheme = params => {
+ return POST('GET', `${v1base}/wxMsg/getScheme`, params).then(res => res.data);
+}
+
+
+
//根据code获取openId
export const HandleCode = params => {
return POST('GET', `${base}/wechat/handleCode`, params).then(res => res.data);
@@ -437,6 +449,11 @@ export const getGatewayToken = params => {
export const cancelOrderByOrderNo = params => {
return POST('GET', `${base}/highOrder/cancelOrderByOrderNo`, params).then(res => res.data);
}
+
+//中石油生成二维码
+export const getVerifyQRCode = params => {
+ return POST('GET', `${base}/coupon/getVerifyQRCode`, params).then(res => res.data);
+}
/**
* H5 获取用户信息
@@ -498,7 +515,9 @@ export const getCodeListByAgentCoupon = params => {
// 生成二维码
export const generateCode = params => {
return POSTBREST('POST', `${brestBase}/highCouponAgent/generateCode`, params).then(res => res.data);
-}
+}
+
+
// 兑换码填写备注
export const highremark = params => {
return POSTBREST('POST', `${brestBase}/highCouponAgent/remark`, params).then(res => res.data);
diff --git a/index.html b/index.html
index 52c2318..9ae818a 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
-
+