diff --git a/App.vue b/App.vue
index 22be895..d2d596a 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,13 @@
// url: 'https://pay.dctpay.com/crest',
// imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
// redirectUrl:'https://pay.dctpay.com/cweb',
+ // hsgUrl:'https://hsg.dctpay.com',
//测试
url: 'https://gratia-pay.dctpay.com/crest',
imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
redirectUrl:'https://gratia-pay.dctpay.com/cweb',
+ hsgUrl:'https://hsgcs.dctpay.com',
+
userInfo: "",
openId: '',
h5code: '',
diff --git a/Utils/groupBuying.js b/Utils/groupBuying.js
index 8bf9cea..e4f5351 100644
--- a/Utils/groupBuying.js
+++ b/Utils/groupBuying.js
@@ -3,7 +3,8 @@ import {
} from './Request.js';
let app = getApp();
let base = app.globalData.url;
-
+let hsgCrest = app.globalData.hsgUrl+'/crest';
+let hsgOrder = app.globalData.hsgUrl+'/order';
//新增门店图片
export const insertStoreImg = params => {
@@ -105,4 +106,9 @@ export const editStoreExtMsg = params => {
//查询门店扩展信息
export const findStoreExtMsgByStoreId = params => {
return POST('POST', `${base}/storeGroup/findStoreExtMsgByStoreId`, params).then(res => res.data);
+}
+
+//查询获取团购内容code
+export const getGroupContentByCode = params => {
+ return POST('GET', `${hsgOrder}/group/getGroupContentByCode`, params).then(res => res.data);
}
\ No newline at end of file
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index cbaa166..9939fa0 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -93,7 +93,7 @@
-
+
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index d142eb2..a1a9f40 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -16,8 +16,14 @@
}
},
onLoad(options) {
+
+ uni.redirectTo({
+ url: '/subpackages/groupBuyingConfiguration/groupVerify/groupVerify?orderKey='+7725856862418052,
+ })
+ return
+
// uni.reLaunch({
- // url: '../tabBar/home/home'
+ // url: '/pages/login/login'
// })
// return
diff --git a/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue b/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue
index 3201a0d..5c549f6 100644
--- a/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue
+++ b/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue
@@ -1,18 +1,33 @@
- ========={{key}}========
+ ========={{groupCode}}========