Commit ac394c99 authored by FE-安焕焕's avatar FE-安焕焕 👣

tob不支持组合支付

parent 651895d6
...@@ -1133,9 +1133,9 @@ ...@@ -1133,9 +1133,9 @@
"integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
}, },
"@qg/cherry-ui": { "@qg/cherry-ui": {
"version": "2.21.5", "version": "2.21.6",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.5.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.6.tgz",
"integrity": "sha512-R1pgB0Dt3ZnahA9Qd7RIeafaPh5qyHR0JotRmGtqk4q1K0tc2flluL6inREaVsi/tYCdYT/u/OgJ+FO1t01M6A==", "integrity": "sha512-0FozrHsJneBnknKwlLvGdBn1uJq2eyWYP2Nm9WbzDdJzi/BdSMbSC5f/XmV2gwT++VWQvxOYzGHRaCMUD3ImGg==",
"requires": { "requires": {
"@popperjs/core": "^2.5.4", "@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3", "vue-lazyload": "^1.3.3",
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
}, },
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.0.0-beta.6", "@better-scroll/core": "^2.0.0-beta.6",
"@qg/cherry-ui": "^2.21.5", "@qg/cherry-ui": "^2.21.6",
"@qg/js-bridge": "^1.1.9", "@qg/js-bridge": "^1.1.9",
"@qg/qg-scroll": "^1.4.2", "@qg/qg-scroll": "^1.4.2",
"@qg/ui-request": "0.0.20", "@qg/ui-request": "0.0.20",
......
...@@ -12,7 +12,7 @@ const localStorageParams = [ ...@@ -12,7 +12,7 @@ const localStorageParams = [
'sonVccChannel', 'sonVccChannel',
'formXcxPage' 'formXcxPage'
]; ];
const cookiesParams = ['h', 'returnUrl']; const cookiesParams = ['h', 'returnUrl', 'source'];
const sessionStorageParams = []; const sessionStorageParams = [];
export default { export default {
......
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
.pay { .pay {
// width: 100%; // width: 100%;
padding: @padding-xs; padding: @padding-xs;
.cr-coupon-list__item{
.cr-coupon-list__icon{
position:absolute !important;
}
}
} }
.price-box { .price-box {
background-color: @white; background-color: @white;
......
...@@ -236,7 +236,10 @@ export default { ...@@ -236,7 +236,10 @@ export default {
methods: { methods: {
/* 查询支付信息 */ /* 查询支付信息 */
async queryPayInfo() { async queryPayInfo() {
const [data, error] = await queryPayInfo({ orderNo: this.orderNo }); const [data, error] = await queryPayInfo({
orderNo: this.orderNo,
isUsedMergePayMethod: cookies.get('source') !== 'tob'
});
if (error && codeArr.indexOf(error?.response?.businessCode) < 0) { if (error && codeArr.indexOf(error?.response?.businessCode) < 0) {
this.payResult('Fail'); this.payResult('Fail');
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment