From a670f7bd246641495e31ab6570f8d558ab0e83e2 Mon Sep 17 00:00:00 2001
From: Jacob <hlnie@tohours.com>
Date: 星期二, 13 十月 2026 16:48:59 +0800
Subject: [PATCH] Merge branch 'master' into sit
---
pages/users/order_confirm/index.vue | 27 +--------------------------
1 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 0c0834c..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') + '¶ms=' + 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);
@@ -1730,7 +1705,7 @@
box-sizing: border-box;
padding: 25rpx 25rpx 25rpx 55rpx;
border-radius: 14rpx;
- background: url("https://ossacmall.bluedeer.com.cn/app/static/images/icon_expressTips.png") 15rpx 25rpx/32rpx auto no-repeat;
+ background: url("https://ossacmall.bluedeer.com.cn/app/static/images/icon_expressTips.png") 15rpx 25rpx / 32rpx auto no-repeat;
background-color: #fef7ee;
color: #8e3b1f;
font-size: 27rpx;
--
Gitblit v1.4.0