From b1eddaaa653dabda899cfa8f530d9d9430e4aa0c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 8 May 2023 15:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC=205?=
 =?UTF-8?q?=E6=9C=888=E5=8F=B7=20=E4=B8=8A=E7=BA=BF=E5=AE=9E=E7=89=A9=20?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=95=86=E6=88=B7=E5=9C=B0=E5=9B=BE=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/category/category.vue     | 8 ++++++--
 pages/welcome/welcome.vue              | 2 +-
 subPages/shareCounpon/shareCounpon.vue | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index f885f6d..b12b9d6 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -338,7 +338,10 @@
 				})
 			},
 			//查询商户
-			getMapStore() {
+			getMapStore() {
+				uni.showLoading({
+					title: '加载中...'
+				})
 				let childId = '';
 				if (this.selectFirst == 99999999) {
 					childId = '';
@@ -353,7 +356,8 @@
 					longitude: this.longitude,
 					latitude: this.latitude
 				}
-				getMapStore(datas).then(res => {
+				getMapStore(datas).then(res => {
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.marker = res.return_data
 					} else {
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 034c42d..44f6fca 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -203,7 +203,7 @@
 			},
 			jumpcdx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
 			},
 		}
 	}
diff --git a/subPages/shareCounpon/shareCounpon.vue b/subPages/shareCounpon/shareCounpon.vue
index edaf61d..ee0d0ff 100644
--- a/subPages/shareCounpon/shareCounpon.vue
+++ b/subPages/shareCounpon/shareCounpon.vue
@@ -209,9 +209,9 @@
 			doShare() {
 				let that = this;
 				if (app.globalData.accountType == '0000012&key') {
-					that.shareLink = 'https://hsgcs.dctpay.com/hsgH5?accountId=0000013&key=&code=' + that.orderNo;
+					that.shareLink = 'https://hsg.dctpay.com/hsgH5?accountId=0000013&key=&code=' + that.orderNo;
 				} else {
-					that.shareLink = 'https://hsgcs.dctpay.com/hsgH5?accountId=0000014&key=&code=' + that.qrCodeSn;
+					that.shareLink = 'https://hsg.dctpay.com/hsgH5?accountId=0000014&key=&code=' + that.qrCodeSn;
 				}
 				let theUrl = window.location.href.split('#')[0];
 				let datas = {
@@ -234,7 +234,7 @@
 							// 	title: '分享好友，立获大额优惠券', // 分享标题
 							// 	desc: '分享好友，立获大额优惠券', // 分享描述
 							// 	link: that.shareLink, // 分享链接
-							// 	imgUrl: 'https://hsgcs.dctpay.com/filesystem/wxApplets/logo.png', // 分享图标
+							// 	imgUrl: 'https://hsg.dctpay.com/filesystem/wxApplets/logo.png', // 分享图标
 							// 	success: function(res) {
 							// 		// 支付成功后的回调函数
 							// 		uni.showToast({
@@ -256,7 +256,7 @@
 								title: '分享朋友圈，立获大额优惠券', // 分享标题
 								desc: '分享朋友圈，立获大额优惠券', // 分享描述
 								link: that.shareLink, // 分享链接
-								imgUrl: 'https://hsgcs.dctpay.com/filesystem/wxApplets/logo.png', // 分享图标
+								imgUrl: 'https://hsg.dctpay.com/filesystem/wxApplets/logo.png', // 分享图标
 								success: function(res) {
 									// 支付成功后的回调函数
 									uni.showToast({