Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cauchy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
cauchy-ui
Commits
cb35ba27
Commit
cb35ba27
authored
Jun 19, 2022
by
guozhiwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: H5收银台判断享花卡额度
parent
5fa885c3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
50 deletions
+17
-50
package-lock.json
package-lock.json
+6
-48
env.config.js
src/config/env.config.js
+1
-1
index.vue
src/views/pay/index.vue
+10
-1
No files found.
package-lock.json
View file @
cb35ba27
...
...
@@ -1167,11 +1167,7 @@
"@qg/js-bridge"
:
{
"version"
:
"1.2.0-beta2"
,
"resolved"
:
"http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.2.0-beta2.tgz"
,
"integrity"
:
"sha512-NtCU4D3kqeQhgbL5OpWqp/jEUXPh31PUkF38hoqdUXg7Zsqr+H4g5e6vJikFtr1zo1s0tBOX0b6FOiuC2yIFJA=="
,
"requires"
:
{
"qs"
:
"^6.10.1"
,
"weixin-js-sdk"
:
"^1.6.0"
}
"integrity"
:
"sha512-NtCU4D3kqeQhgbL5OpWqp/jEUXPh31PUkF38hoqdUXg7Zsqr+H4g5e6vJikFtr1zo1s0tBOX0b6FOiuC2yIFJA=="
},
"qs"
:
{
"version"
:
"6.10.1"
,
...
...
@@ -3004,15 +3000,6 @@
}
}
},
"call-bind"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"http://npmprivate.quantgroups.com/call-bind/-/call-bind-1.0.2.tgz"
,
"integrity"
:
"sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
,
"requires"
:
{
"function-bind"
:
"^1.1.1"
,
"get-intrinsic"
:
"^1.0.2"
}
},
"call-me-maybe"
:
{
"version"
:
"1.0.1"
,
"resolved"
:
"http://npmprivate.quantgroups.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz"
,
...
...
@@ -5856,7 +5843,8 @@
"function-bind"
:
{
"version"
:
"1.1.1"
,
"resolved"
:
"http://npmprivate.quantgroups.com/function-bind/-/function-bind-1.1.1.tgz"
,
"integrity"
:
"sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
"integrity"
:
"sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
,
"dev"
:
true
},
"functional-red-black-tree"
:
{
"version"
:
"1.0.1"
,
...
...
@@ -5876,16 +5864,6 @@
"integrity"
:
"sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
,
"dev"
:
true
},
"get-intrinsic"
:
{
"version"
:
"1.1.1"
,
"resolved"
:
"http://npmprivate.quantgroups.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"
,
"integrity"
:
"sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="
,
"requires"
:
{
"function-bind"
:
"^1.1.1"
,
"has"
:
"^1.0.3"
,
"has-symbols"
:
"^1.0.1"
}
},
"get-own-enumerable-property-symbols"
:
{
"version"
:
"3.0.2"
,
"resolved"
:
"http://npmprivate.quantgroups.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"
,
...
...
@@ -6039,6 +6017,7 @@
"version"
:
"1.0.3"
,
"resolved"
:
"http://npmprivate.quantgroups.com/has/-/has-1.0.3.tgz"
,
"integrity"
:
"sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
,
"dev"
:
true
,
"requires"
:
{
"function-bind"
:
"^1.1.1"
}
...
...
@@ -6069,7 +6048,8 @@
"has-symbols"
:
{
"version"
:
"1.0.1"
,
"resolved"
:
"http://npmprivate.quantgroups.com/has-symbols/-/has-symbols-1.0.1.tgz"
,
"integrity"
:
"sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
"integrity"
:
"sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
,
"dev"
:
true
},
"has-value"
:
{
"version"
:
"1.0.0"
,
...
...
@@ -11027,23 +11007,6 @@
"integrity"
:
"sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
,
"dev"
:
true
},
"side-channel"
:
{
"version"
:
"1.0.4"
,
"resolved"
:
"http://npmprivate.quantgroups.com/side-channel/-/side-channel-1.0.4.tgz"
,
"integrity"
:
"sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
,
"requires"
:
{
"call-bind"
:
"^1.0.0"
,
"get-intrinsic"
:
"^1.0.2"
,
"object-inspect"
:
"^1.9.0"
},
"dependencies"
:
{
"object-inspect"
:
{
"version"
:
"1.11.0"
,
"resolved"
:
"http://npmprivate.quantgroups.com/object-inspect/-/object-inspect-1.11.0.tgz"
,
"integrity"
:
"sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
}
}
},
"signal-exit"
:
{
"version"
:
"3.0.3"
,
"resolved"
:
"http://npmprivate.quantgroups.com/signal-exit/-/signal-exit-3.0.3.tgz"
,
...
...
@@ -14535,11 +14498,6 @@
"resolved"
:
"http://npmprivate.quantgroups.com/webwackify/-/webwackify-0.1.6.tgz"
,
"integrity"
:
"sha512-pGcw1T3HpNnM/UTRQqqRkkkzythSLts05mB+7Gr00B+0VbL0m39dFL5g20rSIEUt9Wrpw+/8k+snxRlUFHhcqA=="
},
"weixin-js-sdk"
:
{
"version"
:
"1.6.0"
,
"resolved"
:
"http://npmprivate.quantgroups.com/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz"
,
"integrity"
:
"sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
},
"which"
:
{
"version"
:
"1.3.1"
,
"resolved"
:
"http://npmprivate.quantgroups.com/which/-/which-1.3.1.tgz"
,
...
...
src/config/env.config.js
View file @
cb35ba27
...
...
@@ -2,7 +2,7 @@ let protocol = window.location.protocol;
let
payHost
=
protocol
+
'
//mapi-qa.liangkebang.net/pay
'
;
let
shenceHost
=
'
https://bn.xyqb.com/sa?project=default
'
;
// 测试地址
let
talosHost
=
'
http://talos-
test1
.liangkebang.net
'
;
// 电商分期测试环境服务地址
let
talosHost
=
'
http://talos-
qa
.liangkebang.net
'
;
// 电商分期测试环境服务地址
let
operatorHost
=
'
https://operator.liangkebang.com
'
;
const
toBHost
=
'
https://tob.liangkebang.net
'
;
export
default
{
talosHost
,
operatorHost
,
payHost
,
shenceHost
,
test
:
true
,
toBHost
};
src/views/pay/index.vue
View file @
cb35ba27
...
...
@@ -9,7 +9,6 @@
</p>
<p
v-else
>
支付超时,订单关闭
</p>
</div>
<!-- 推荐信用支付 -->
<cr-pay-card
v-if=
"getObjectKey(creditPayList.payList).length"
...
...
@@ -340,6 +339,16 @@ export default {
if
(
creditQuotaInfo
?.
isFreezeCreditInOtherOrder
&&
!
this
.
payInfo
?.
payType
)
{
havePayingOrder
.
call
(
this
);
}
if
(
this
.
payType
===
CREDIT_PAY
&&
+
displayInfo
.
creditPayInfo
.
canAmt
<
+
displayInfo
.
orderAmt
)
{
this
.
payType
=
null
;
const
currentPayMethodInfo
=
payMethods
.
find
(
it
=>
it
.
method
!==
CREDIT_PAY
);
if
(
currentPayMethodInfo
)
{
this
.
changePayType
(
currentPayMethodInfo
.
method
,
this
.
payInfo
.
mergePayPretreatmentInfo
);
}
}
},
isRiskLimit
()
{
const
{
accountStatus
,
riskManagementAmt
}
=
this
.
creditPayInfo
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment