From 28760a4ca7e3ef11ac42a811f3b7c9141b43c547 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Thu, 16 Nov 2023 10:06:40 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=89=AB=E7=A0=81=E6=A0=B8=E9=94=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 39deace8a1ee584d5b0c9ee8b787d97552ac15a9.
---
 App.vue                                       |  3 ---
 Utils/groupBuying.js                          |  8 +------
 .../merchant-details/merchant-details.vue     |  2 +-
 pages/welcome/welcome.vue                     |  8 +------
 .../groupVerify/groupVerify.vue               | 21 +++----------------
 5 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/App.vue b/App.vue
index d2d596a..22be895 100644
--- a/App.vue
+++ b/App.vue
@@ -7,13 +7,10 @@
 			// 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 e4f5351..8bf9cea 100644
--- a/Utils/groupBuying.js
+++ b/Utils/groupBuying.js
@@ -3,8 +3,7 @@ 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 => {
@@ -106,9 +105,4 @@ 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 9939fa0..cbaa166 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -93,7 +93,7 @@
 					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button>
 					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button>
 					<button class="btns mart10 margle10" @click.stop="jumpService(item.id)">绑定设备</button>
-					<button class="btns mart10 margle10" @click.stop="jumpGroupService(item.id)">团购配置</button>
+					<!-- <button class="btns mart10 margle10" @click.stop="jumpGroupService(item.id)">团购配置</button> -->
 					<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> -->
 				</view>
 				<view class="lin10"></view>
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 4916917..b7faca9 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -16,14 +16,8 @@
 			}
 		},
 		onLoad(options) {
-			
-			uni.redirectTo({
-				url: '/subpackages/groupBuyingConfiguration/groupVerify/groupVerify?orderKey='+7725856862418052,
-			})
-			return
-			
 			// uni.reLaunch({
-			// 	url: '/pages/login/login'
+			// 	url: '../tabBar/home/home'
 			// })
 			// return
 			
diff --git a/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue b/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue
index 5c549f6..3201a0d 100644
--- a/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue
+++ b/subpackages/groupBuyingConfiguration/groupVerify/groupVerify.vue
@@ -1,33 +1,18 @@
 <template>
 	<view>
-		========={{groupCode}}========
+		========={{key}}========
 	</view>
 </template>
 
 <script>
-	import {getGroupContentByCode} from '@/Utils/groupBuying.js';
 	export default {
 		data(){
 			return{
-				groupCode:'',
+				key:'',
 			}
 		},
 		onLoad(option){
-			if(option.orderKey){
-				this.groupCode = option.orderKey;
-				this.getGroupContentByCode();
-			}
-			
-		},
-		methods:{
-			getGroupContentByCode(){
-				let params={
-					groupCode:this.groupCode
-				}
-				getGroupContentByCode(params).then(res=>{
-					
-				})
-			},
+			this.key = option.orderKey;
 		}
 	}
 </script>