diff --git a/config/api.js b/config/api.js index ff00800..9308538 100644 --- a/config/api.js +++ b/config/api.js @@ -4,16 +4,16 @@ */ // 开发环境 const dev = { - // common: "http://192.168.0.100:8890", - // buyer: "http://192.168.0.100:8888", - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", - // common: 'http://192.168.0.109:8890', - // buyer: 'http://192.168.0.109:8888', + common: "http://192.168.0.100:8890", + buyer: "http://192.168.0.100:8888", + // common: "https://common-api.pickmall.cn", + // buyer: "https://buyer-api.pickmall.cn", + // common: 'http://192.168.0.109:8890', + // buyer: 'http://192.168.0.109:8888', }; // 生产环境 -const prod = { - // common: 'http://192.168.0.109:8890', +const prod = { + // common: 'http://192.168.0.109:8890', // buyer: 'http://192.168.0.109:8888', common: "https://common-api.pickmall.cn", buyer: "https://buyer-api.pickmall.cn", diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index cbfa209..3b2a629 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -147,9 +147,9 @@ awaitPay(payment){ - - this.pay(payment) - + this.$u.throttle(()=>{ + this.pay(payment) + }, 2000) }, //订单支付 @@ -179,10 +179,10 @@ //如果支付异常 if (!signXml.data.success) { - uni.showModal({ - content: signXml.data.message, - showCancel: false, - }) + uni.showToast({ + title: signXml.data.message, + duration: 2000 + }); return; } @@ -226,15 +226,16 @@ (res) => { let response = res.data; //如果非支付宝支付才需要进行判定,因为支付宝h5支付是直接输出的,没有返回所谓的消息状态 - if(paymentMethod !== "ALIPAY"){ - //如果支付异常 - if (!response.success) { - uni.showModal({ - content: response.message, - showCancel: false, - }) - return; - } + if(paymentMethod !== "ALIPAY"){ + //如果支付异常 + if (!response.success) { + uni.showToast({ + title: response.message, + duration: 2000, + icon:"none" + }); + return; + } } if (paymentMethod === "ALIPAY") { document.write(response); diff --git a/pages/cart/payment/success.vue b/pages/cart/payment/success.vue index 72c695e..ccd4afc 100644 --- a/pages/cart/payment/success.vue +++ b/pages/cart/payment/success.vue @@ -51,7 +51,6 @@ -