From 7456b65bb4f553993b95f42744471c85a42c769b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=85=E4=BF=9D=E5=90=8C=E5=AD=A6?= <3228274159@qq.com> Date: Fri, 23 Aug 2024 22:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 4 +- stor/Coupons/coupons.js | 101 +++++++------- stor/getCard/getCard.js | 98 ++++++++------ stor/index.js | 124 +++++++++++++----- unpackage/dist/dev/mp-weixin/api/api.js | 4 +- .../dev/mp-weixin/stor/Coupons/coupons.js | 28 ++-- .../dev/mp-weixin/stor/getCard/getCard.js | 32 +++-- unpackage/dist/dev/mp-weixin/stor/index.js | 89 +++++++------ 8 files changed, 296 insertions(+), 184 deletions(-) diff --git a/api/api.js b/api/api.js index 393a583..f1aeac1 100644 --- a/api/api.js +++ b/api/api.js @@ -81,7 +81,9 @@ export const getRecharges=(data)=>requests(`mobile/recharge/list`,data,"GET") //获取次卡列表 export const getRechargesCard=(data)=>requests(`mobile/card/list`,data,"POST") //获取订单号 -export const getTimeStamps=(data)=>requests(`mobile/order/create`,data,"POST") +export const getTimeStamps=(data)=>requests(`mobile/order/getOrderId`,data,"GET") +//生成支付订单 +export const getTimeOrder = (data)=>requests(`mobile/order/create`,data,"POST") //获取套餐信息 export const getInfoa=(data)=>requests(`mobile/buy/${data}`,"GET") //获取次卡明细 diff --git a/stor/Coupons/coupons.js b/stor/Coupons/coupons.js index b1b8936..4fd7855 100644 --- a/stor/Coupons/coupons.js +++ b/stor/Coupons/coupons.js @@ -13,7 +13,8 @@ import { start, shop, getTincheCoupons, - getShopid + getShopid, + getTimeOrder } from '../../api/api.js' export const coupons = defineStore('coupons', () => { @@ -25,27 +26,27 @@ export const coupons = defineStore('coupons', () => { const isShowCoupons = ref() const isShow = ref() const que = ref(0) - const id = ref() + const id = ref() const getcouponsData = async () => { couponsData.value = await getCouponList({ phoneNumber: uni.getStorageSync('phoneNumber') }) couponsData.value = couponsData.value.data console.log(couponsData.value); - const add= couponsData.value.find(item=>item.status===0) - const ccc = couponsData.value.find(item=>item.status===1) - if(add&&add.status===0){ - isShowCoupons.value=1 - - }else{ - isShowCoupons.value=0 - } - if(ccc&&ccc.status===1){ - isShow.value=2 - }else{ - isShow.value=3 - } - + const add = couponsData.value.find(item => item.status === 0) + const ccc = couponsData.value.find(item => item.status === 1) + if (add && add.status === 0) { + isShowCoupons.value = 1 + + } else { + isShowCoupons.value = 0 + } + if (ccc && ccc.status === 1) { + isShow.value = 2 + } else { + isShow.value = 3 + } + } const getYouHuiApi = async (data) => { ups.value = await getyouHui({ @@ -105,10 +106,10 @@ export const coupons = defineStore('coupons', () => { console.log(res); console.log(res.data.networkId); id.value = res.data.networkId - que.value=1 - + que.value = 1 + }) - + // const mids = Number(mid) @@ -116,7 +117,7 @@ export const coupons = defineStore('coupons', () => { } const scanQrcode = (data) => { // //获取url - resDats.value=data + resDats.value = data uni.scanCode({ success: (res) => { scancode.value = res.result @@ -127,55 +128,67 @@ export const coupons = defineStore('coupons', () => { } }) } - const quexio = (data)=>{ - que.value=0 + const quexio = (data) => { + que.value = 0 } - const goStar = ()=>{ - que.value=0 - getTimeStamps({ - phoneNumber: uni.getStorageSync('phoneNumber'), - amount: 0, - goodsId: resDats.value.id, - goodsType: 3, //洗车订单 - networkId:id.value, - payType: 4, // - deviceId: uni.getStorageSync('mid') - }).then(res5=>{ + const goStar = () => { + que.value = 0 + // { + // phoneNumber: uni.getStorageSync('phoneNumber'), + // amount: 0, + // goodsId: resDats.value.id, + // goodsType: 3, //洗车订单 + // networkId:id.value, + // payType: 4, // + // deviceId: uni.getStorageSync('mid') + // } + getTimeStamps().then(res5 => { console.log(res5); if (res5 === "机器正在工作") { uni.showToast({ icon: "none", title: `${res5}` }) - - } else{ + + } else { start({ mid: uni.getStorageSync('mid'), price: 100, - time: 20*60, - description:'拉新券', + time: 20 * 60, + description: '拉新券', orderId: res5, phone: uni.getStorageSync('phoneNumber'), openId: uni.getStorageSync('openid') - }).then(res6=>{ + }).then(res6 => { if (res6.code == 200 || res6.code == 0) { uni.showToast({ icon: 'none', title: '启动设备成功', duration: 1000, - success: async(res) => { - + success: async (res) => { + uni.setStorageSync('orderid', res5) uni.setStorageSync('msg', '拉新券') + const orderRes = await getTimeOrder({ + phoneNumber: uni.getStorageSync('phoneNumber'), + amount: 0, + goodsId: resDats.value.id, + goodsType: 3, //洗车订单 + networkId: id.value, + payType: 4, // + deviceId: uni.getStorageSync('mid'), + orderId:orderid.value + }) uni.redirectTo({ url: '/pages/complete/complete' }) const qaq = await getTincheCoupons({ - phoneNumber: uni.getStorageSync('phoneNumber') + phoneNumber: uni.getStorageSync( + 'phoneNumber') }) uni.showToast({ - icon:"none", - title:`${qaq.msg}` + icon: "none", + title: `${qaq.msg}` }) } }) @@ -185,7 +198,7 @@ export const coupons = defineStore('coupons', () => { title: `${res6.data.statusText},请在我的页面联系客服解决`, duration: 1200, success: (res) => { - + uni.setStorageSync('orderid', orderid.value) uni.setStorageSync('msg', '拉新券') } diff --git a/stor/getCard/getCard.js b/stor/getCard/getCard.js index 85053d9..79c8f5e 100644 --- a/stor/getCard/getCard.js +++ b/stor/getCard/getCard.js @@ -5,30 +5,36 @@ import { ref } from 'vue' import { - getCis,getShopid,getTimeStamps,start,getTincheCoupons, + getCis, + getShopid, + getTimeStamps, + start, + getTincheCoupons, } from '../../api/api.js' export const getCard = defineStore('getCard', () => { const cardData = ref([]) const cardDataInvalidCards = ref([]) - const cardDataValidCards=ref([]) + const cardDataValidCards = ref([]) const que = ref(0) const resDats = ref([]) const scancode = ref([]) - const id = ref() - const getCards = async()=>{ - cardData.value= await getCis({phoneNumber:uni.getStorageSync('phoneNumber')}) - cardData.value=cardData.value.data + const id = ref() + const getCards = async () => { + cardData.value = await getCis({ + phoneNumber: uni.getStorageSync('phoneNumber') + }) + cardData.value = cardData.value.data // console.log(cardData.value); - cardDataInvalidCards.value=cardData.value.invalidCards - cardDataValidCards.value=cardData.value.validCards + cardDataInvalidCards.value = cardData.value.invalidCards + cardDataValidCards.value = cardData.value.validCards console.log(cardDataInvalidCards.value); console.log(cardDataValidCards.value); } - const quexio = (data)=>{ - que.value=0 + const quexio = (data) => { + que.value = 0 } //更改弹窗 - + const getQ = (data) => { q.value = data navUrl(data) @@ -36,7 +42,7 @@ export const getCard = defineStore('getCard', () => { //扫码 const scanQrcode = (data) => { // //获取url - resDats.value=data + resDats.value = data console.log(resDats.value); uni.scanCode({ success: (res) => { @@ -86,62 +92,74 @@ export const getCard = defineStore('getCard', () => { console.log(res); console.log(res.data.networkId); id.value = res.data.networkId - que.value=1 - + que.value = 1 + }) - - + + // const mids = Number(mid) - + } } //优惠券使用 - const goStar = ()=>{ - que.value=0 - getTimeStamps({ - phoneNumber: uni.getStorageSync('phoneNumber'), - amount: 0, - goodsId: resDats.value.id, - goodsType: 3, //洗车订单 - networkId:id.value, - payType: 3, // - deviceId: uni.getStorageSync('mid') - }).then(res5=>{ + const goStar = () => { + que.value = 0 + // { + // phoneNumber: uni.getStorageSync('phoneNumber'), + // amount: 0, + // goodsId: resDats.value.id, + // goodsType: 3, //洗车订单 + // networkId:id.value, + // payType: 3, // + // deviceId: uni.getStorageSync('mid') + // } + getTimeStamps().then(res5 => { console.log(res5); if (res5 === "机器正在工作") { uni.showToast({ icon: "none", title: `${res5}` }) - - } else{ + + } else { start({ mid: uni.getStorageSync('mid'), price: 100, - time: 20*60, - description:'次卡', + time: 20 * 60, + description: '次卡', orderId: res5, phone: uni.getStorageSync('phoneNumber'), openId: uni.getStorageSync('openid') - }).then(res6=>{ + }).then(res6 => { if (res6.code == 200 || res6.code == 0) { uni.showToast({ icon: 'none', title: '启动设备成功', duration: 1000, - success: async(res) => { - + success: async (res) => { + uni.setStorageSync('orderid', res5) uni.setStorageSync('msg', '次卡') + const orderRes = await getTimeOrder({ + phoneNumber: uni.getStorageSync('phoneNumber'), + amount: 0, + goodsId: resDats.value.id, + goodsType: 3, //洗车订单 + networkId: id.value, + payType: 3, // + deviceId: uni.getStorageSync('mid'), + orderId:orderid.value + }) uni.redirectTo({ url: '/pages/complete/complete' }) const qaq = await getTincheCoupons({ - phoneNumber: uni.getStorageSync('phoneNumber') + phoneNumber: uni.getStorageSync( + 'phoneNumber') }) uni.showToast({ - icon:"none", - title:`${qaq.msg}` + icon: "none", + title: `${qaq.msg}` }) } }) @@ -151,7 +169,7 @@ export const getCard = defineStore('getCard', () => { title: `${res6.data.statusText},请在我的页面联系客服解决`, duration: 1200, success: (res) => { - + uni.setStorageSync('orderid', orderid.value) uni.setStorageSync('msg', '拉新券') } @@ -161,7 +179,7 @@ export const getCard = defineStore('getCard', () => { } }) } - + return { cardDataInvalidCards, cardDataValidCards, diff --git a/stor/index.js b/stor/index.js index bfaf409..81c06aa 100644 --- a/stor/index.js +++ b/stor/index.js @@ -15,7 +15,8 @@ import { start, shop, getTincheCoupons, - getExcellent + getExcellent, + getTimeOrder } from '../api/api.js' import dayjs from 'dayjs' export const storindex = defineStore('storindex', () => { @@ -73,15 +74,16 @@ export const storindex = defineStore('storindex', () => { } p.value = 1 - const res = await getTimeStamps({ - phoneNumber: uni.getStorageSync('phoneNumber'), - amount: datas.amount, - goodsId: datas.id, - goodsType: 3, //洗车订单 - networkId: datas.networkId, - payType: 1, //微信支付, - deviceId: uni.getStorageSync('mid') - }) + const res = await getTimeStamps() + // { + // phoneNumber: uni.getStorageSync('phoneNumber'), + // amount: datas.amount, + // goodsId: datas.id, + // goodsType: 3, //洗车订单 + // networkId: datas.networkId, + // payType: 1, //微信支付, + // deviceId: uni.getStorageSync('mid') + // } orderid.value = res if (res === "机器正在工作") { uni.showToast({ @@ -143,6 +145,16 @@ 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' }) @@ -239,15 +251,25 @@ export const storindex = defineStore('storindex', () => { } }) } else { - const res = await getTimeStamps({ + const res = await getTimeStamps() + // { + // phoneNumber: uni.getStorageSync('phoneNumber'), + // amount: datas.amount, + // goodsId: datas.id, + // goodsType: 1, //充值套餐类型 + // networkId: datas.networkId, + // payType: 1 //微信支付 + // } + orderid.value = res + const orderRes = await getTimeOrder({ phoneNumber: uni.getStorageSync('phoneNumber'), amount: datas.amount, goodsId: datas.id, goodsType: 1, //充值套餐类型 networkId: datas.networkId, - payType: 1 //微信支付 + payType: 1 ,//微信支付 + orderId:orderid.value }) - orderid.value = res const res1 = await getWxPlay({ appId: appid, phone: uni.getStorageSync('phoneNumber'), @@ -324,15 +346,25 @@ export const storindex = defineStore('storindex', () => { }) } else { - const res = await getTimeStamps({ + const res = await getTimeStamps() + // { + // phoneNumber: uni.getStorageSync('phoneNumber'), + // amount: datas.amount, + // goodsId: datas.id, + // goodsType: 2, //次卡套餐 + // networkId: datas.networkId, + // payType: 1 //微信支付 + // } + orderid.value = res + const orderRes = await getTimeOrder({ phoneNumber: uni.getStorageSync('phoneNumber'), amount: datas.amount, goodsId: datas.id, goodsType: 2, //次卡套餐 networkId: datas.networkId, - payType: 1 //微信支付 + payType: 1 ,//微信支付 + orderId:orderid.value }) - orderid.value = res const res1 = await getWxPlay({ appId: appid, phone: uni.getStorageSync('phoneNumber'), @@ -389,15 +421,16 @@ export const storindex = defineStore('storindex', () => { } p.value = 1 - const res = await getTimeStamps({ - phoneNumber: uni.getStorageSync('phoneNumber'), - amount: datas.amount, - goodsId: datas.id, - goodsType: 3, //洗车订单 - networkId: datas.networkId, - payType: 2, //余额支付 - deviceId: uni.getStorageSync('mid') - }) + const res = await getTimeStamps() + // { + // phoneNumber: uni.getStorageSync('phoneNumber'), + // amount: datas.amount, + // goodsId: datas.id, + // goodsType: 3, //洗车订单 + // networkId: datas.networkId, + // payType: 2, //余额支付 + // deviceId: uni.getStorageSync('mid') + // } orderid.value = res if (res === "机器正在工作") { uni.showToast({ @@ -428,9 +461,21 @@ export const storindex = defineStore('storindex', () => { p.value = 0 uni.setStorageSync('orderid', orderid.value) uni.setStorageSync('msg', descriptions.value) + const orderRes = await getTimeOrder({ + phoneNumber: uni.getStorageSync('phoneNumber'), + amount: datas.amount, + goodsId: datas.id, + goodsType: 3, //洗车订单 + networkId: datas.networkId, + payType: 2, //余额支付 + deviceId: uni.getStorageSync('mid'), + orderId:orderid.value + }) uni.redirectTo({ url: '/pages/complete/complete' }) + + console.log(orderRes.value) const qaq = await getTincheCoupons({ phoneNumber: uni.getStorageSync('phoneNumber'), oderId: orderid.value @@ -477,15 +522,16 @@ export const storindex = defineStore('storindex', () => { return } p.value = 1 - const res = await getTimeStamps({ - phoneNumber: uni.getStorageSync('phoneNumber'), - amount: 0, - goodsId: datas.id, - goodsType: 3, //洗车订单 - networkId: uni.getStorageSync('netWordId'), - payType: 3, //次卡支付 - deviceId: uni.getStorageSync('mid') - }) + const res = await getTimeStamps() + // { + // phoneNumber: uni.getStorageSync('phoneNumber'), + // amount: 0, + // goodsId: datas.id, + // goodsType: 3, //洗车订单 + // networkId: uni.getStorageSync('netWordId'), + // payType: 3, //次卡支付 + // deviceId: uni.getStorageSync('mid') + // } orderid.value = res if (res === "机器正在工作") { uni.showToast({ @@ -514,6 +560,16 @@ export const storindex = defineStore('storindex', () => { p.value = 0 uni.setStorageSync('orderid', orderid.value) uni.setStorageSync('msg', '次卡') + const orderRes = await getTimeOrder({ + phoneNumber: uni.getStorageSync('phoneNumber'), + amount: 0, + goodsId: datas.id, + goodsType: 3, //洗车订单 + networkId: uni.getStorageSync('netWordId'), + payType: 3, //次卡支付 + deviceId: uni.getStorageSync('mid'), + orderId:orderid.value + }) uni.redirectTo({ url: '/pages/complete/complete' }) diff --git a/unpackage/dist/dev/mp-weixin/api/api.js b/unpackage/dist/dev/mp-weixin/api/api.js index 1d09fc5..8e8ff4b 100644 --- a/unpackage/dist/dev/mp-weixin/api/api.js +++ b/unpackage/dist/dev/mp-weixin/api/api.js @@ -25,7 +25,8 @@ const getBalanceaOrder = (data) => utils_request.requests(`mobile/order/getBalan const getBalanceaOrderUpdata = (data) => utils_request.requests(`mobile/order/balanceUpdate`, data, "GET"); const getRecharges = (data) => utils_request.requests(`mobile/recharge/list`, data, "GET"); const getRechargesCard = (data) => utils_request.requests(`mobile/card/list`, data, "POST"); -const getTimeStamps = (data) => utils_request.requests(`mobile/order/create`, data, "POST"); +const getTimeStamps = (data) => utils_request.requests(`mobile/order/getOrderId`, data, "GET"); +const getTimeOrder = (data) => utils_request.requests(`mobile/order/create`, data, "POST"); const getInfoa = (data) => utils_request.requests(`mobile/buy/${data}`, "GET"); const getCardLists = (data) => utils_request.requests(`mobile/order/getCardInfo`, data, "GET"); const getCardXi = (data) => utils_request.requests(`mobile/order/cardUpdateInfo`, data, "GET"); @@ -70,6 +71,7 @@ exports.getRefund = getRefund; exports.getShopGoOut = getShopGoOut; exports.getShopList = getShopList; exports.getShopid = getShopid; +exports.getTimeOrder = getTimeOrder; exports.getTimeStamps = getTimeStamps; exports.getTincheCoupons = getTincheCoupons; exports.getUserSex = getUserSex; diff --git a/unpackage/dist/dev/mp-weixin/stor/Coupons/coupons.js b/unpackage/dist/dev/mp-weixin/stor/Coupons/coupons.js index 32fd6a4..01b2d50 100644 --- a/unpackage/dist/dev/mp-weixin/stor/Coupons/coupons.js +++ b/unpackage/dist/dev/mp-weixin/stor/Coupons/coupons.js @@ -100,17 +100,7 @@ const coupons = common_vendor.defineStore("coupons", () => { }; const goStar = () => { que.value = 0; - api_api.getTimeStamps({ - phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), - amount: 0, - goodsId: resDats.value.id, - goodsType: 3, - //洗车订单 - networkId: id.value, - payType: 4, - // - deviceId: common_vendor.index.getStorageSync("mid") - }).then((res5) => { + api_api.getTimeStamps().then((res5) => { console.log(res5); if (res5 === "机器正在工作") { common_vendor.index.showToast({ @@ -135,11 +125,25 @@ const coupons = common_vendor.defineStore("coupons", () => { success: async (res) => { common_vendor.index.setStorageSync("orderid", res5); common_vendor.index.setStorageSync("msg", "拉新券"); + await api_api.getTimeOrder({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), + amount: 0, + goodsId: resDats.value.id, + goodsType: 3, + //洗车订单 + networkId: id.value, + payType: 4, + // + deviceId: common_vendor.index.getStorageSync("mid"), + orderId: orderid.value + }); common_vendor.index.redirectTo({ url: "/pages/complete/complete" }); const qaq = await api_api.getTincheCoupons({ - phoneNumber: common_vendor.index.getStorageSync("phoneNumber") + phoneNumber: common_vendor.index.getStorageSync( + "phoneNumber" + ) }); common_vendor.index.showToast({ icon: "none", diff --git a/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js b/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js index 445c8cf..fef15d8 100644 --- a/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js +++ b/unpackage/dist/dev/mp-weixin/stor/getCard/getCard.js @@ -10,7 +10,9 @@ const getCard = common_vendor.defineStore("getCard", () => { const scancode = common_vendor.ref([]); const id = common_vendor.ref(); const getCards = async () => { - cardData.value = await api_api.getCis({ phoneNumber: common_vendor.index.getStorageSync("phoneNumber") }); + cardData.value = await api_api.getCis({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber") + }); cardData.value = cardData.value.data; cardDataInvalidCards.value = cardData.value.invalidCards; cardDataValidCards.value = cardData.value.validCards; @@ -72,17 +74,7 @@ const getCard = common_vendor.defineStore("getCard", () => { }; const goStar = () => { que.value = 0; - api_api.getTimeStamps({ - phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), - amount: 0, - goodsId: resDats.value.id, - goodsType: 3, - //洗车订单 - networkId: id.value, - payType: 3, - // - deviceId: common_vendor.index.getStorageSync("mid") - }).then((res5) => { + api_api.getTimeStamps().then((res5) => { console.log(res5); if (res5 === "机器正在工作") { common_vendor.index.showToast({ @@ -107,11 +99,25 @@ const getCard = common_vendor.defineStore("getCard", () => { success: async (res) => { common_vendor.index.setStorageSync("orderid", res5); common_vendor.index.setStorageSync("msg", "次卡"); + await getTimeOrder({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), + amount: 0, + goodsId: resDats.value.id, + goodsType: 3, + //洗车订单 + networkId: id.value, + payType: 3, + // + deviceId: common_vendor.index.getStorageSync("mid"), + orderId: orderid.value + }); common_vendor.index.redirectTo({ url: "/pages/complete/complete" }); const qaq = await api_api.getTincheCoupons({ - phoneNumber: common_vendor.index.getStorageSync("phoneNumber") + phoneNumber: common_vendor.index.getStorageSync( + "phoneNumber" + ) }); common_vendor.index.showToast({ icon: "none", diff --git a/unpackage/dist/dev/mp-weixin/stor/index.js b/unpackage/dist/dev/mp-weixin/stor/index.js index 9d489b5..447012c 100644 --- a/unpackage/dist/dev/mp-weixin/stor/index.js +++ b/unpackage/dist/dev/mp-weixin/stor/index.js @@ -35,17 +35,7 @@ const storindex = common_vendor.defineStore("storindex", () => { return; } p.value = 1; - const res = await api_api.getTimeStamps({ - 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") - }); + const res = await api_api.getTimeStamps(); orderid.value = res; if (res === "机器正在工作") { common_vendor.index.showToast({ @@ -102,6 +92,18 @@ 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" }); @@ -188,17 +190,19 @@ const storindex = common_vendor.defineStore("storindex", () => { } }); } else { - const res = await api_api.getTimeStamps({ + const res = await api_api.getTimeStamps(); + orderid.value = res; + await api_api.getTimeOrder({ phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), amount: datas.amount, goodsId: datas.id, goodsType: 1, //充值套餐类型 networkId: datas.networkId, - payType: 1 + payType: 1, //微信支付 + orderId: orderid.value }); - orderid.value = res; const res1 = await api_api.getWxPlay({ appId: common_baseurl.appid, phone: common_vendor.index.getStorageSync("phoneNumber"), @@ -269,17 +273,19 @@ const storindex = common_vendor.defineStore("storindex", () => { } }); } else { - const res = await api_api.getTimeStamps({ + const res = await api_api.getTimeStamps(); + orderid.value = res; + await api_api.getTimeOrder({ phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), amount: datas.amount, goodsId: datas.id, goodsType: 2, //次卡套餐 networkId: datas.networkId, - payType: 1 + payType: 1, //微信支付 + orderId: orderid.value }); - orderid.value = res; const res1 = await api_api.getWxPlay({ appId: common_baseurl.appid, phone: common_vendor.index.getStorageSync("phoneNumber"), @@ -334,17 +340,7 @@ const storindex = common_vendor.defineStore("storindex", () => { return; } p.value = 1; - const res = await api_api.getTimeStamps({ - phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), - amount: datas.amount, - goodsId: datas.id, - goodsType: 3, - //洗车订单 - networkId: datas.networkId, - payType: 2, - //余额支付 - deviceId: common_vendor.index.getStorageSync("mid") - }); + const res = await api_api.getTimeStamps(); orderid.value = res; if (res === "机器正在工作") { common_vendor.index.showToast({ @@ -374,9 +370,22 @@ const storindex = common_vendor.defineStore("storindex", () => { p.value = 0; common_vendor.index.setStorageSync("orderid", orderid.value); common_vendor.index.setStorageSync("msg", descriptions.value); + const orderRes = await api_api.getTimeOrder({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), + amount: datas.amount, + goodsId: datas.id, + goodsType: 3, + //洗车订单 + networkId: datas.networkId, + payType: 2, + //余额支付 + deviceId: common_vendor.index.getStorageSync("mid"), + orderId: orderid.value + }); common_vendor.index.redirectTo({ url: "/pages/complete/complete" }); + console.log(orderRes.value); const qaq = await api_api.getTincheCoupons({ phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), oderId: orderid.value @@ -422,17 +431,7 @@ const storindex = common_vendor.defineStore("storindex", () => { return; } p.value = 1; - const res = await api_api.getTimeStamps({ - phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), - amount: 0, - goodsId: datas.id, - goodsType: 3, - //洗车订单 - networkId: common_vendor.index.getStorageSync("netWordId"), - payType: 3, - //次卡支付 - deviceId: common_vendor.index.getStorageSync("mid") - }); + const res = await api_api.getTimeStamps(); orderid.value = res; if (res === "机器正在工作") { common_vendor.index.showToast({ @@ -460,6 +459,18 @@ const storindex = common_vendor.defineStore("storindex", () => { p.value = 0; common_vendor.index.setStorageSync("orderid", orderid.value); common_vendor.index.setStorageSync("msg", "次卡"); + await api_api.getTimeOrder({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber"), + amount: 0, + goodsId: datas.id, + goodsType: 3, + //洗车订单 + networkId: common_vendor.index.getStorageSync("netWordId"), + payType: 3, + //次卡支付 + deviceId: common_vendor.index.getStorageSync("mid"), + orderId: orderid.value + }); common_vendor.index.redirectTo({ url: "/pages/complete/complete" });