From 254f055d485935c8408942987f38f75b78e2136d Mon Sep 17 00:00:00 2001
From: Jacob <hlnie@tohours.com>
Date: 星期一, 12 十月 2026 17:32:33 +0800
Subject: [PATCH] Merge branch 'master' into sit

---
 components/productWindow/index.vue  |   13 ------
 pages/user/index.vue                |    8 ----
 pages/users/order_confirm/index.vue |   25 ------------
 pages/order_pay_status/index.vue    |   22 -----------
 pages/users/user_coupon/index.vue   |   22 -----------
 pages/zone/index.vue                |    8 +---
 6 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index 49cafab..233fd7f 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -186,19 +186,6 @@
 					path: url,
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
 				})
-					
-				// let params = {
-				// 	custAgentNo: that.$store.getters.belong?.agentNo || '',
-				// 	custAgentChnl: that.$store.getters.belong?.channel || '',
-				// 	custAgentCoy: that.$store.getters.belong?.companyCode || '',
-				// 	custAgentBranch: that.$store.getters.belong?.branchCode || '',
-				// 	custAgentOrgNo: that.$store.getters.belong?.subCode || ''
-				// };
-				// let webUrl = 'https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true' + (miniProgramInfo.envVersion == 'release' ? '' : '&isTrial=true') + '&params=' + encodeURIComponent(JSON.stringify(params)) + '&pageUrl=' + encodeURIComponent(url);
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr', 'https://sit.tohours.com/crmeb_web/qr/')
-				// }
-				// uni.navigateTo({ url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl) })
 			}
 			if (!that.$store.getters.isLogin) {
 				toLogin(that);
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index 4ba320f..035fe35 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -231,28 +231,6 @@
 					path: url,
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
 				})
-				
-				// let params = {};
-				// params['custAgentNo'] = ((this.$store.getters.belong && this.$store.getters.belong.agentNo) ? this.$store
-				// 	.getters.belong.agentNo : '');
-				// params['custAgentChnl'] = ((this.$store.getters.belong && this.$store.getters.belong.channel) ? this.$store
-				// 	.getters.belong.channel : '');
-				// params['custAgentCoy'] = ((this.$store.getters.belong && this.$store.getters.belong.companyCode) ? this
-				// 	.$store.getters.belong.companyCode : '');
-				// params['custAgentBranch'] = ((this.$store.getters.belong && this.$store.getters.belong.branchCode) ? this
-				// 	.$store.getters.belong.branchCode : '');
-				// params['custAgentOrgNo'] = ((this.$store.getters.belong && this.$store.getters.belong.subCode) ? this
-				// 	.$store.getters.belong.subCode : '');
-				// let webUrl = 'https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true' + (miniProgramInfo.envVersion ==
-				// 		'release' ? '' : '&isTrial=true') + '&params=' + encodeURIComponent(JSON.stringify(params)) +
-				// 	'&pageUrl=' + encodeURIComponent(url);
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr',
-				// 		'https://sit.tohours.com/crmeb_web/qr/')
-				// }
-				// uni.navigateTo({
-				// 	url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl)
-				// })
 			},
 			goToLink(item, type) {
 				let that = this;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index e48ac95..71b0be3 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -508,14 +508,6 @@
 					path: url,
 					envVersion: envVersion != 'release' ? 'trial' : 'release'
 				})
-
-				// let webUrl='https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true'+(envVersion == 'release' ? '' : '&isTrial=true')+'&params='+encodeURIComponent(JSON.stringify(params))+'&pageUrl='+encodeURIComponent(url);
-				// if(HTTP_REQUEST_URL.indexOf('tohours')>0){
-				// 	webUrl=webUrl.replace('https://ossacmall.bluedeer.com.cn/qr','https://sit.tohours.com/crmeb_web/qr/')
-				// }
-				// uni.navigateTo({
-				// 	url: '/pages/users/web_page/index?webUel='+encodeURIComponent(webUrl)
-				// })
 			}
 			if (!that.$store.getters.isLogin) {
 				toLogin(that);
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index caaa3c3..eaa47f2 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -579,31 +579,6 @@
 					path: url,
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
 				})
-				
-				// let params = {};
-				// params['custAgentNo'] = ((that.$store.getters.belong && that.$store.getters.belong.agentNo) ? that
-				// 	.$store
-				// 	.getters.belong.agentNo : '');
-				// params['custAgentChnl'] = ((that.$store.getters.belong && that.$store.getters.belong.channel) ? that
-				// 	.$store
-				// 	.getters.belong.channel : '');
-				// params['custAgentCoy'] = ((that.$store.getters.belong && that.$store.getters.belong.companyCode) ? that
-				// 	.$store.getters.belong.companyCode : '');
-				// params['custAgentBranch'] = ((that.$store.getters.belong && that.$store.getters.belong.branchCode) ?
-				// 	that
-				// 		.$store.getters.belong.branchCode : '');
-				// params['custAgentOrgNo'] = ((that.$store.getters.belong && that.$store.getters.belong.subCode) ? that
-				// 	.$store.getters.belong.subCode : '');
-				// let webUrl = 'https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true' + (miniProgramInfo.envVersion == 'release' ?
-				// 	'' : '&isTrial=true') + '&params=' + encodeURIComponent(JSON.stringify(params)) + '&pageUrl=' +
-				// 	encodeURIComponent(url);
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr',
-				// 		'https://sit.tohours.com/crmeb_web/qr/')
-				// }
-				// uni.navigateTo({
-				// 	url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl)
-				// })
 			}
 			if (!that.$store.getters.isLogin) {
 				toLogin(that);
diff --git a/pages/users/user_coupon/index.vue b/pages/users/user_coupon/index.vue
index f431e20..917269f 100644
--- a/pages/users/user_coupon/index.vue
+++ b/pages/users/user_coupon/index.vue
@@ -289,28 +289,6 @@
 					path: url,
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
 				})
-				
-				// let params = {};
-				// params['custAgentNo'] = ((this.$store.getters.belong && this.$store.getters.belong.agentNo) ? this.$store
-				// 	.getters.belong.agentNo : '');
-				// params['custAgentChnl'] = ((this.$store.getters.belong && this.$store.getters.belong.channel) ? this.$store
-				// 	.getters.belong.channel : '');
-				// params['custAgentCoy'] = ((this.$store.getters.belong && this.$store.getters.belong.companyCode) ? this
-				// 	.$store.getters.belong.companyCode : '');
-				// params['custAgentBranch'] = ((this.$store.getters.belong && this.$store.getters.belong.branchCode) ? this
-				// 	.$store.getters.belong.branchCode : '');
-				// params['custAgentOrgNo'] = ((this.$store.getters.belong && this.$store.getters.belong.subCode) ? this
-				// 	.$store.getters.belong.subCode : '');
-				// let webUrl = 'https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true' + (miniProgramInfo.envVersion ==
-				// 		'release' ? '' : '&isTrial=true') + '&params=' + encodeURIComponent(JSON.stringify(params)) +
-				// 	'&pageUrl=' + encodeURIComponent(url);
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr',
-				// 		'https://sit.tohours.com/crmeb_web/qr/')
-				// }
-				// uni.navigateTo({
-				// 	url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl)
-				// })
 			},
 			isTabLink(link) {
 				let isTab = false;
diff --git a/pages/zone/index.vue b/pages/zone/index.vue
index 72f1ebf..08f9ea7 100644
--- a/pages/zone/index.vue
+++ b/pages/zone/index.vue
@@ -513,7 +513,7 @@
 
 <script>
 import {
-	HTTP_REQUEST_URL
+	WEB_ACTIVITY_BASE
 } from '@/config/app';
 import {
 	mapGetters
@@ -1237,11 +1237,7 @@
 			this.addTrack('yy_marketPageClick', data);
 
 			function go() {
-				let webUrl = 'https://ossacmall.bluedeer.com.cn/acmall_lottery/index.html'
-				if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
-					webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn',
-						'https://sit.tohours.com/crmeb_web')
-				}
+				let webUrl = `${WEB_ACTIVITY_BASE}/acmall_lottery/index.html`
 				webUrl += '?token=' +
 					that.$store.getters.token + '&unionId=' + that.$store.getters.unionId + '&mdayId=' + that.info
 						.mdayId

--
Gitblit v1.4.0