Merge branch 'master' into sit

Jacob

2026-10-12 254f055d485935c8408942987f38f75b78e2136d

Merge branch 'master' into sit

# Conflicts:
#	pages/index/index.vue

 components/productWindow/index.vue
..
..
@@ -186,19 +186,6 @@
186
186
 					path: url,
187
187
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
188
188
 				})
189
-					
190
-				// let params = {
191
-				// 	custAgentNo: that.$store.getters.belong?.agentNo || '',
192
-				// 	custAgentChnl: that.$store.getters.belong?.channel || '',
193
-				// 	custAgentCoy: that.$store.getters.belong?.companyCode || '',
194
-				// 	custAgentBranch: that.$store.getters.belong?.branchCode || '',
195
-				// 	custAgentOrgNo: that.$store.getters.belong?.subCode || ''
196
-				// };
197
-				// 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);
198
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
199
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr', 'https://sit.tohours.com/crmeb_web/qr/')
200
-				// }
201
-				// uni.navigateTo({ url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl) })
202
189
 			}
203
190
 			if (!that.$store.getters.isLogin) {
204
191
 				toLogin(that);
 pages/order_pay_status/index.vue
..
..
@@ -231,28 +231,6 @@
231
231
 					path: url,
232
232
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
233
233
 				})
234
-				
235
-				// let params = {};
236
-				// params['custAgentNo'] = ((this.$store.getters.belong && this.$store.getters.belong.agentNo) ? this.$store
237
-				// 	.getters.belong.agentNo : '');
238
-				// params['custAgentChnl'] = ((this.$store.getters.belong && this.$store.getters.belong.channel) ? this.$store
239
-				// 	.getters.belong.channel : '');
240
-				// params['custAgentCoy'] = ((this.$store.getters.belong && this.$store.getters.belong.companyCode) ? this
241
-				// 	.$store.getters.belong.companyCode : '');
242
-				// params['custAgentBranch'] = ((this.$store.getters.belong && this.$store.getters.belong.branchCode) ? this
243
-				// 	.$store.getters.belong.branchCode : '');
244
-				// params['custAgentOrgNo'] = ((this.$store.getters.belong && this.$store.getters.belong.subCode) ? this
245
-				// 	.$store.getters.belong.subCode : '');
246
-				// let webUrl = 'https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true' + (miniProgramInfo.envVersion ==
247
-				// 		'release' ? '' : '&isTrial=true') + '&params=' + encodeURIComponent(JSON.stringify(params)) +
248
-				// 	'&pageUrl=' + encodeURIComponent(url);
249
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
250
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr',
251
-				// 		'https://sit.tohours.com/crmeb_web/qr/')
252
-				// }
253
-				// uni.navigateTo({
254
-				// 	url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl)
255
-				// })
256
234
 			},
257
235
 			goToLink(item, type) {
258
236
 				let that = this;
 pages/user/index.vue
..
..
@@ -508,14 +508,6 @@
508
508
 					path: url,
509
509
 					envVersion: envVersion != 'release' ? 'trial' : 'release'
510
510
 				})
511
-
512
-				// let webUrl='https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true'+(envVersion == 'release' ? '' : '&isTrial=true')+'&params='+encodeURIComponent(JSON.stringify(params))+'&pageUrl='+encodeURIComponent(url);
513
-				// if(HTTP_REQUEST_URL.indexOf('tohours')>0){
514
-				// 	webUrl=webUrl.replace('https://ossacmall.bluedeer.com.cn/qr','https://sit.tohours.com/crmeb_web/qr/')
515
-				// }
516
-				// uni.navigateTo({
517
-				// 	url: '/pages/users/web_page/index?webUel='+encodeURIComponent(webUrl)
518
-				// })
519
511
 			}
520
512
 			if (!that.$store.getters.isLogin) {
521
513
 				toLogin(that);
 pages/users/order_confirm/index.vue
..
..
@@ -579,31 +579,6 @@
579
579
 					path: url,
580
580
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
581
581
 				})
582
-				
583
-				// let params = {};
584
-				// params['custAgentNo'] = ((that.$store.getters.belong && that.$store.getters.belong.agentNo) ? that
585
-				// 	.$store
586
-				// 	.getters.belong.agentNo : '');
587
-				// params['custAgentChnl'] = ((that.$store.getters.belong && that.$store.getters.belong.channel) ? that
588
-				// 	.$store
589
-				// 	.getters.belong.channel : '');
590
-				// params['custAgentCoy'] = ((that.$store.getters.belong && that.$store.getters.belong.companyCode) ? that
591
-				// 	.$store.getters.belong.companyCode : '');
592
-				// params['custAgentBranch'] = ((that.$store.getters.belong && that.$store.getters.belong.branchCode) ?
593
-				// 	that
594
-				// 		.$store.getters.belong.branchCode : '');
595
-				// params['custAgentOrgNo'] = ((that.$store.getters.belong && that.$store.getters.belong.subCode) ? that
596
-				// 	.$store.getters.belong.subCode : '');
597
-				// let webUrl = 'https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true' + (miniProgramInfo.envVersion == 'release' ?
598
-				// 	'' : '&isTrial=true') + '&params=' + encodeURIComponent(JSON.stringify(params)) + '&pageUrl=' +
599
-				// 	encodeURIComponent(url);
600
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
601
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr',
602
-				// 		'https://sit.tohours.com/crmeb_web/qr/')
603
-				// }
604
-				// uni.navigateTo({
605
-				// 	url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl)
606
-				// })
607
582
 			}
608
583
 			if (!that.$store.getters.isLogin) {
609
584
 				toLogin(that);
 pages/users/user_coupon/index.vue
..
..
@@ -289,28 +289,6 @@
289
289
 					path: url,
290
290
 					envVersion: miniProgramInfo.envVersion == 'release' ? 'release' : 'trial',
291
291
 				})
292
-				
293
-				// let params = {};
294
-				// params['custAgentNo'] = ((this.$store.getters.belong && this.$store.getters.belong.agentNo) ? this.$store
295
-				// 	.getters.belong.agentNo : '');
296
-				// params['custAgentChnl'] = ((this.$store.getters.belong && this.$store.getters.belong.channel) ? this.$store
297
-				// 	.getters.belong.channel : '');
298
-				// params['custAgentCoy'] = ((this.$store.getters.belong && this.$store.getters.belong.companyCode) ? this
299
-				// 	.$store.getters.belong.companyCode : '');
300
-				// params['custAgentBranch'] = ((this.$store.getters.belong && this.$store.getters.belong.branchCode) ? this
301
-				// 	.$store.getters.belong.branchCode : '');
302
-				// params['custAgentOrgNo'] = ((this.$store.getters.belong && this.$store.getters.belong.subCode) ? this
303
-				// 	.$store.getters.belong.subCode : '');
304
-				// let webUrl = 'https://ossacmall.bluedeer.com.cn/qr/index.html?isMall=true' + (miniProgramInfo.envVersion ==
305
-				// 		'release' ? '' : '&isTrial=true') + '&params=' + encodeURIComponent(JSON.stringify(params)) +
306
-				// 	'&pageUrl=' + encodeURIComponent(url);
307
-				// if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
308
-				// 	webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn/qr',
309
-				// 		'https://sit.tohours.com/crmeb_web/qr/')
310
-				// }
311
-				// uni.navigateTo({
312
-				// 	url: '/pages/users/web_page/index?webUel=' + encodeURIComponent(webUrl)
313
-				// })
314
292
 			},
315
293
 			isTabLink(link) {
316
294
 				let isTab = false;
 pages/zone/index.vue
..
..
@@ -513,7 +513,7 @@
513
513
 
514
514
 <script>
515
515
 import {
516
-	HTTP_REQUEST_URL
516
+	WEB_ACTIVITY_BASE
517
517
 } from '@/config/app';
518
518
 import {
519
519
 	mapGetters
..
..
@@ -1237,11 +1237,7 @@
1237
1237
 			this.addTrack('yy_marketPageClick', data);
1238
1238
 
1239
1239
 			function go() {
1240
-				let webUrl = 'https://ossacmall.bluedeer.com.cn/acmall_lottery/index.html'
1241
-				if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
1242
-					webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn',
1243
-						'https://sit.tohours.com/crmeb_web')
1244
-				}
1240
+				let webUrl = `${WEB_ACTIVITY_BASE}/acmall_lottery/index.html`
1245
1241
 				webUrl += '?token=' +
1246
1242
 					that.$store.getters.token + '&unionId=' + that.$store.getters.unionId + '&mdayId=' + that.info
1247
1243
 						.mdayId