Merge branch 'dev' into sit

Jacob

1 天以前 433c5ab2fd2a6fd48fb931b5070b742503a99a6b

 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);
..
..
@@ -1730,7 +1705,7 @@
1730
1705
 	box-sizing: border-box;
1731
1706
 	padding: 25rpx 25rpx 25rpx 55rpx;
1732
1707
 	border-radius: 14rpx;
1733
-	background: url("https://ossacmall.bluedeer.com.cn/app/static/images/icon_expressTips.png") 15rpx 25rpx/32rpx auto no-repeat;
1708
+	background: url("https://ossacmall.bluedeer.com.cn/app/static/images/icon_expressTips.png") 15rpx 25rpx / 32rpx auto no-repeat;
1734
1709
 	background-color: #fef7ee;
1735
1710
 	color: #8e3b1f;
1736
1711
 	font-size: 27rpx;