msb-mca
/
shop-app
2.1k
3
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev1.0.0' into develop

Browse Source 
# Conflicts:
#	unpackage/dist/build/h5/index.html
#	unpackage/dist/build/h5/static/js/index.608c63dc.js
#	unpackage/dist/build/h5/static/js/index.9528b404.js
#	unpackage/dist/build/h5/static/js/index.d753a032.js
msb_beta
ch 3 years ago
parent 26972adc85 764c2eab8f
commit 279ce26f05
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File

6
pages/order/payResult.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-28 15:01:41 * @Date: 2022-04-28 15:01:41
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-05 19:18:30 * @LastEditTime: 2022-05-05 20:05:00
* @Description: file content * @Description: file content
--> -->
@ -58,7 +58,7 @@ export default {
uin.$u.toast(error.message); uin.$u.toast(error.message);
return false return false
} }
if(!result.isSuccess && this.reuqestNum < 10){ if(!result.isSuccess && this.reuqestNum < 5){
setTimeout(()=>{ setTimeout(()=>{
this.getOrderInfo(); this.getOrderInfo();
}, 1000) }, 1000)
@ -69,7 +69,7 @@ export default {
}, },
back(){ back(){
const payType = this.$Route.query.payType; const payType = this.$Route.query.payType;
if(payType === 'wxh5'){ if(payType !== 'wxjsapi'){
this.$Router.back(2); this.$Router.back(2);
}else{ }else{
this.$Router.back(); this.$Router.back();

9
unpackage/dist/build/h5/index.html vendored
Unescape View File

@ -1,2 +1,9 @@
<!--
* @Author: ch
* @Date: 2022-05-05 20:07:21
* @LastEditors: ch
* @LastEditTime: 2022-05-05 20:07:47
* @Description: file content
-->
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.9528b404.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.608c63dc.js></script></body></html>

BIN
unpackage/dist/build/h5/static/.DS_Store vendored
View File

Binary file not shown.

1
unpackage/dist/build/h5/static/js/index.608c63dc.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/h5/static/js/index.9528b404.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-payResult.117e1af4.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save