diff --git a/stor/index.js b/stor/index.js index 8d0646e..70d0198 100644 --- a/stor/index.js +++ b/stor/index.js @@ -105,7 +105,16 @@ export const storindex = defineStore('storindex', () => { machineId: datas.networkId }) console.log(res1); - + const orderRes = await getTimeOrder({ + phoneNumber: uni.getStorageSync('phoneNumber'), + amount: datas.amount, + goodsId: datas.id, + goodsType: 3, //洗车订单 + networkId: datas.networkId, + payType: 1, //微信支付, + deviceId: uni.getStorageSync('mid'), + orderId:orderid.value + }) uni.requestPayment({ provider: 'wxpay', @@ -145,16 +154,7 @@ export const storindex = defineStore('storindex', () => { 'msg', descriptions .value) - const orderRes = await getTimeOrder({ - phoneNumber: uni.getStorageSync('phoneNumber'), - amount: datas.amount, - goodsId: datas.id, - goodsType: 3, //洗车订单 - networkId: datas.networkId, - payType: 1, //微信支付, - deviceId: uni.getStorageSync('mid'), - orderId:orderid.value - }) + uni.redirectTo({ url: '/pages/complete/complete' }) diff --git a/unpackage/dist/dev/mp-weixin/stor/index.js b/unpackage/dist/dev/mp-weixin/stor/index.js index d412d38..de48733 100644 --- a/unpackage/dist/dev/mp-weixin/stor/index.js +++ b/unpackage/dist/dev/mp-weixin/stor/index.js @@ -57,6 +57,18 @@ const storindex = common_vendor.defineStore("storindex", () => { machineId: datas.networkId }); console.log(res1); + await api_api.getTimeOrder({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), + amount: datas.amount, + goodsId: datas.id, + goodsType: 3, + //洗车订单 + networkId: datas.networkId, + payType: 1, + //微信支付, + deviceId: common_vendor.index.getStorageSync("mid"), + orderId: orderid.value + }); common_vendor.index.requestPayment({ provider: "wxpay", timeStamp: res1.timeStamp, @@ -92,18 +104,6 @@ const storindex = common_vendor.defineStore("storindex", () => { "msg", descriptions.value ); - await api_api.getTimeOrder({ - phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), - amount: datas.amount, - goodsId: datas.id, - goodsType: 3, - //洗车订单 - networkId: datas.networkId, - payType: 1, - //微信支付, - deviceId: common_vendor.index.getStorageSync("mid"), - orderId: orderid.value - }); common_vendor.index.redirectTo({ url: "/pages/complete/complete" });