Commit 6052dfa2 authored by youjie's avatar youjie

no message

parent 46500507
...@@ -25,8 +25,8 @@ Vue.prototype.domainManager = function() { ...@@ -25,8 +25,8 @@ Vue.prototype.domainManager = function() {
if (domainNameUrl.indexOf('testerp.oytour') !== -1) { if (domainNameUrl.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com"; domainUrl = "http://testapi.oytour.com";
} else if (domainNameUrl.indexOf('oytour') !== -1) { } else if (domainNameUrl.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; // domainUrl = "http://reborn.oytour.com";
//domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' ' domainUrl = 'http://192.168.10.226:8015' //'http://192.168.10.226:8015' ''http://192.168.10.9:8083' '
} }
var obj = { var obj = {
//主地址 //主地址
...@@ -121,7 +121,11 @@ Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) { ...@@ -121,7 +121,11 @@ Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) {
} }
}) })
.then(res => { .then(res => {
if(res.resultCode==10000){
this.CommonJump('/login', {});
}
successCall(res); successCall(res);
}, faildCall) }, faildCall)
} }
......
...@@ -70,9 +70,10 @@ ...@@ -70,9 +70,10 @@
style="width: 100px" style="width: 100px"
/> />
</div> </div>
<!-- <div class="rounded-borders q-pa-sm bg-grey-2 cursor-pointer"> <div class="rounded-borders q-pa-sm bg-grey-2 cursor-pointer" @click="showPayFormHandler('alipay')">
<q-img src="../assets/img/pay/alipay.png" spinner-color="white" style="height:25px;max-width: 150px;min-width: 30px" /> <!-- height:25px;max-width: 150px;min-width: 30px -->
</div> --> <q-img src="../../assets/img/pay/alipay.png" spinner-color="white" style="width: 80px;" />
</div>
</div> </div>
<div class="q-mt-md" v-if="showPay != ''"> <div class="q-mt-md" v-if="showPay != ''">
<wechatpay @cancel="cancelPayHandler" v-if="showPay == 'wechat'" :order-no="orderNo"></wechatpay> <wechatpay @cancel="cancelPayHandler" v-if="showPay == 'wechat'" :order-no="orderNo"></wechatpay>
...@@ -133,6 +134,30 @@ export default { ...@@ -133,6 +134,30 @@ export default {
methods: { methods: {
showPayFormHandler(payStr) { showPayFormHandler(payStr) {
this.showPay = payStr; this.showPay = payStr;
// 支付宝支付
if(this.showPay&&this.showPay=='alipay'){
this.checkPaySatausHandler()
}
},
checkPaySatausHandler(){
this.apipost("GetAliPayByOrderNo_post",{OrderNo:this.orderNo},r=>{
if(r.data.resultCode==1){
if(r.data.data.OrderStatus==2||r.data.data.OrderStatus==3){
this.CommonJump("/paysuccess/" + this.orderNo, {});
}else{
let url = r.data.data.QrCode
if(url){
this.OpenNewUrl(url)
}else{
this.$message.error("當前訂單未支付,請您繼續完成訂單支付")
}
}
}else{
location.reload()
}
},e=>{
})
}, },
checkParamsHandler() { checkParamsHandler() {
if (this.$route.params && this.$route.params.id) { if (this.$route.params && this.$route.params.id) {
......
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