From a99f060fd956ed2a3a5984db0f2ffdc4a4e31842 Mon Sep 17 00:00:00 2001 From: shilei <965026003@qq.com> Date: Wed, 13 Nov 2024 20:22:40 +0800 Subject: [PATCH] 11.13 --- App.vue | 4 +- .../search-destination/search-destination.vue | 13 +- pages.json | 9 +- pages/index/index.vue | 61 +-- .../order/chargorder/detailInf/detailInf.vue | 17 +- pages/userCenter/about/about.vue | 22 +- pages/userCenter/setting/setting.vue | 3 - pages/userCenter/userCenter.vue | 472 ++++++++---------- .../accountBalancePersonnelCar.vue | 4 - pagesCenter/pay/index.vue | 4 +- sheep/config/index.js | 2 +- sheep/request/index.js | 2 +- 12 files changed, 273 insertions(+), 340 deletions(-) diff --git a/App.vue b/App.vue index 207d5d3..19d3153 100644 --- a/App.vue +++ b/App.vue @@ -13,8 +13,8 @@ phone: null }, onLaunch: function() { - console.log('App Launch') - uni.hideTabBar() + // console.log('App Launch') + // uni.hideTabBar() // handle_loop() }, onShow: function() { diff --git a/components/search-destination/search-destination.vue b/components/search-destination/search-destination.vue index f61ffac..e2d5c1b 100644 --- a/components/search-destination/search-destination.vue +++ b/components/search-destination/search-destination.vue @@ -158,7 +158,7 @@ type: 'gcj02', geocode: true, success: (res) => { - console.log(res, 'res'); + // console.log(res, 'res'); address.value = res uni.setStorageSync('location', res) longitude.value = res.longitude @@ -359,11 +359,12 @@ icon: 'error' }); return; - } else if (uni.getStorageSync("realNameAuthFlag") != 1) { - // errornotify.value.show() - emit('handle_errornotify') - return - } else { + } + // else if (uni.getStorageSync("realNameAuthFlag") != 1) { + // emit('handle_errornotify') + // return + // } + else { if (searchNo.value) { let station = searchNo.value uni.navigateTo({ diff --git a/pages.json b/pages.json index 55e678d..e45f5b5 100644 --- a/pages.json +++ b/pages.json @@ -32,8 +32,9 @@ "path": "pages/userCenter/userCenter", "style": { "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#2cc06c", - "navigationBarTextStyle": "white" + "navigationStyle": "custom" + // "navigationBarBackgroundColor": "#2cc06c" + // "navigationBarTextStyle": "white" } }, { @@ -88,7 +89,7 @@ { "path": "pages/userCenter/about/about", "style": { - "navigationBarTitleText": "关于我们", + "navigationBarTitleText": "联系我们", "enablePullDownRefresh": false } @@ -302,7 +303,7 @@ "selectedIconPath": "static/tabbar/home_hl.png" }, { - "pagePath": "pages/userCenter/about/about", + "pagePath": "pages/userCenter/userCenter", "text": "个人中心", "iconPath": "static/tabbar/me.png", "selectedIconPath": "static/tabbar/me_hl.png" diff --git a/pages/index/index.vue b/pages/index/index.vue index c514a31..74983b6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -142,8 +142,6 @@ uni.setStorageSync("version", "车队版") check_version.value = "车队版" } - // realNameAuthFlag.value = uni.getStorageSync("realNameAuthFlag") - // console.log(uni.getStorageSync("version"), 'uni.getStorageSync') if (globalData.isLogin) { handle_user_info() } @@ -201,11 +199,11 @@ } const handle_loop = () => { - if (realNameAuthFlag.value != 1) { - clearInterval(timer.value) - timer.value = null - return - } + // if (realNameAuthFlag.value != 1) { + // clearInterval(timer.value) + // timer.value = null + // return + // } timer.value = setInterval(() => { let config_url = '' if (uni.getStorageSync("version") == '个人版') { @@ -280,15 +278,15 @@ if (res.data.code == 0) { // console.log(res, '赋值了realNameAuthFlag'); uni.setStorageSync("teamId", res.data.data.teamId); - uni.setStorageSync("realNameAuthFlag", res.data.data.realNameAuthFlag) - realNameAuthFlag.value = res.data.data.realNameAuthFlag + // uni.setStorageSync("realNameAuthFlag", res.data.data.realNameAuthFlag) + // realNameAuthFlag.value = res.data.data.realNameAuthFlag // console.log(realNameAuthFlag.value, 'realNameAuthFlag.value') avatar.value = res.data.data.avatar - if (realNameAuthFlag.value == 1) { - clearInterval(timer.value) - timer.value = null - handle_loop() - } + // if (realNameAuthFlag.value == 1) { + clearInterval(timer.value) + timer.value = null + handle_loop() + // } } }) } @@ -336,15 +334,15 @@ icon: 'error' }); return; - } else if (uni.getStorageSync("realNameAuthFlag") != 1) { - // errornotify.value.show() - handle_errornotify() - // return } else { uni.navigateTo({ url: '/pages/order/swaporder/order' }) } + // else if (uni.getStorageSync("realNameAuthFlag") != 1) { + // handle_errornotify() + // } + } const goRecharge = () => { @@ -355,15 +353,14 @@ icon: 'error' }); return; - } else if (uni.getStorageSync("realNameAuthFlag") != 1) { - // errornotify.value.show() - handle_errornotify() - // return } else { uni.navigateTo({ url: '/pages/order/chargorder/order' }) } + // else if (uni.getStorageSync("realNameAuthFlag") != 1) { + // handle_errornotify() + // } } const subscribe = () => { if (!uni.getStorageSync("userInfo")) { @@ -373,15 +370,15 @@ icon: 'error' }); return; - } else if (uni.getStorageSync("realNameAuthFlag") != 1) { - // errornotify.value.show() - handle_errornotify() - // return } else { uni.navigateTo({ url: '/pages/order/appointorder/order' }) } + // else if (uni.getStorageSync("realNameAuthFlag") != 1) { + // handle_errornotify() + // } + } const swap_pay_stationNo = ref('') const handle_scan = () => { @@ -394,10 +391,6 @@ icon: 'error' }); return; - } else if (uni.getStorageSync("realNameAuthFlag") != 1) { - // errornotify.value.show() - handle_errornotify() - // return } else { uni.scanCode({ scanType: ['qrCode'], @@ -426,6 +419,9 @@ } }) } + // else if (uni.getStorageSync("realNameAuthFlag") != 1) { + // handle_errornotify() + // } } const handle_charging_pay = async (res_result) => { @@ -601,11 +597,6 @@ // url: '/pages/order/chargorder/order' // }) } else { - // uni.showToast({ - // title: res.data.msg, - // duration: 2000, - // icon: 'error' - // }); uni.showModal({ content: res.data.msg, success: () => {} diff --git a/pages/order/chargorder/detailInf/detailInf.vue b/pages/order/chargorder/detailInf/detailInf.vue index d801fb0..7dada10 100644 --- a/pages/order/chargorder/detailInf/detailInf.vue +++ b/pages/order/chargorder/detailInf/detailInf.vue @@ -29,15 +29,15 @@ 充电电流(A) - {{(detail.list.currentElectrical).toFixed(2) || 0}} + {{detail.list.currentElectrical == null? 0: (detail.list.currentElectrical).toFixed(2)}} 充电电压(V) - {{detail.list.currentVoltage || 0}} + {{detail.list.currentVoltage == null? 0: (detail.list.currentVoltage).toFixed(2)}} - + 剩余时长(分) {{detail.list.remainingChargingTime || 0 }} @@ -47,6 +47,16 @@ {{detail.list.chargingTime || 0}} + + + 充电电量(kwh) + {{detail.list.chargingCapacity == null? 0: (detail.list.chargingCapacity).toFixed(2) }} + + + 总金额(元) + {{detail.list.totalFee / 100 || 0}} + + 更多详细信息 @@ -175,6 +185,7 @@ chargeTotalFee: null, currentElectrical: null, currentVoltage: null, + chargingCapacity: null } }) const timer = ref(null) diff --git a/pages/userCenter/about/about.vue b/pages/userCenter/about/about.vue index 6d8c127..968e5ef 100644 --- a/pages/userCenter/about/about.vue +++ b/pages/userCenter/about/about.vue @@ -5,32 +5,36 @@ - + - 客服电话：xxxx xxxx + 客服电话： + 137 7433 4540 + - + - 公司电话：xxxx xxxx + 公司邮箱： + service@marcellauto.com + - + @@ -51,8 +55,8 @@ width: 100%; height: 400rpx; } - .iconTop{ + + .iconTop { margin-top: 5rpx; } - \ No newline at end of file diff --git a/pages/userCenter/setting/setting.vue b/pages/userCenter/setting/setting.vue index fccc915..52349a8 100644 --- a/pages/userCenter/setting/setting.vue +++ b/pages/userCenter/setting/setting.vue @@ -97,13 +97,10 @@ uni.removeStorageSync("teamId"); uni.removeStorageSync("realNameAuthFlag"); uni.removeStorageSync("version"); - // outUser.encryptedData = null - // outUser.iv = null outLogin.isLogin = false uni.navigateBack({ delta: 2 }); - // console.log('out登录'); } const subscribeChange = () => { // console.log('change', e); diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue index de6bcf2..1cc0a0b 100644 --- a/pages/userCenter/userCenter.vue +++ b/pages/userCenter/userCenter.vue @@ -1,12 +1,26 @@ @@ -146,6 +149,7 @@ globalStore } from '../../stores/globalData.js'; const loginStore = globalStore() + const version_loading = ref(false) // 声明变量 // const dataCode = ref() const isLogin = ref(false) //判断是否登录 @@ -155,14 +159,10 @@ const no_avatar = ref( 'https://zzpower.net//admin-api/infra/file/4/get/6e642a15c0bad98793f342a5ca83317cfcd62ed8b84fa5fd4c5d6f4176bd3a14.png' ) + const balance = ref(0.00) const realNameAuthFlag = ref(0) - const columns = reactive([ - [ - '个人版', '车队版' - ] - ]) - const version_loading = ref(false) + const now_version = ref() onLoad(() => { @@ -173,62 +173,63 @@ now_version.value = uni.getStorageSync("version") if (isLogin.value == true) { // 展示头像与用户信息 - uni.$request({ - url: config.baseUrl + 'app-api/member/user/get', - }).then((res) => { - // console.log(res,'获取基本信息'); - if (res.data.code == 0) { - avatar.value = res.data.data.avatar - nickname.value = res.data.data.nickname - phone.value = res.data.data.mobile - realNameAuthFlag.value = res.data.data.realNameAuthFlag - uni.setStorageSync("realNameAuthFlag", res.data.data.realNameAuthFlag) - uni.setStorageSync("teamId", res.data.data.teamId) - uni.setStorageSync("mobile", res.data.data.mobile) - uni.setStorageSync("captainOrNot", res.data.data.captainOrNot) - - } - }) + handle_user_info() + if (now_version.value == '车队版') { + handle_wallet_team() + } else { + handle_wallet_personnel() + } } }) + const handle_wallet_team = async () => { + let data = { + bindType: 2 + } + let config_url = 'app-api/pay/wallet/get' + await uni.$request({ + url: config.baseUrl + config_url, + data + }).then(res => { + balance.value = res.data.data.balance / 100 + }) + } - const changepicker = ref(null) - const subscribeChange = () => { - changepicker.value.open() + const handle_wallet_personnel = async () => { + let data = { + bindType: 1 + } + await uni.$request({ + url: config.baseUrl + "app-api/pay/wallet/get", + data + }).then(res => { + balance.value = res.data.data.balance / 100 + }) } - const confirm_picker = (e) => { - let teamId = uni.getStorageSync("teamId") - let str = uni.getStorageSync("version") - if (teamId) { - if (e.value[0] != str) { - version_loading.value = true - uni.setStorageSync('version', e.value[0]) - setTimeout(() => { - version_loading.value = false - now_version.value = e.value[0] - }, 2000) - // ischarging_order.value = false - } else { - return - } - } else { - uni.showModal({ - title: '提示', - showCancel: false, - content: "未绑定车队的用户,不允许切换版本,请绑定后重试...", - success: function(res) { + const handle_user_info = async () => { + await uni.$request({ + url: config.baseUrl + 'app-api/member/user/get', + }).then((res) => { + if (res.data.code == 0) { + avatar.value = res.data.data.avatar + nickname.value = res.data.data.nickname + phone.value = res.data.data.mobile + // realNameAuthFlag.value = res.data.data.realNameAuthFlag + // uni.setStorageSync("realNameAuthFlag", res.data.data.realNameAuthFlag) + uni.setStorageSync("teamId", res.data.data.teamId) + uni.setStorageSync("mobile", res.data.data.mobile) + uni.setStorageSync("captainOrNot", res.data.data.captainOrNot) - } - }); - } + } + }) } const errornotify = ref(null) // 去设置页面 const goSetting = () => { uni.navigateTo({ - url: './setting/setting' + // url: './setting/setting' + url: '/pages/userCenter/about/about' }) } const gologin = () => { @@ -244,14 +245,16 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { uni.navigateTo({ url: './personalDetails/personalDetails' }) } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } @@ -264,14 +267,16 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { uni.navigateTo({ url: '../../pagesCenter/billingPage/billingPage' }) } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } const gobillingPage_my = () => { @@ -283,14 +288,16 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { uni.navigateTo({ url: '/pagesCenter/billingPage/billingMean/billingMean' }) } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } const vehicleCertification = () => { if (!uni.getStorageSync("userInfo")) { @@ -300,14 +307,16 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { uni.navigateTo({ url: './carIdentification/carIdentification' }) } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } const personnelCertification = () => { @@ -333,9 +342,6 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { let url_push = '' if (type == 1) { @@ -348,8 +354,12 @@ uni.navigateTo({ url: url_push }) - } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } const goAbout = () => { if (!uni.getStorageSync("userInfo")) { @@ -359,14 +369,16 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { uni.navigateTo({ url: './about/about' }) } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } const gomotorCade = () => { @@ -377,14 +389,16 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { uni.navigateTo({ url: '../../pagesCenter/motorCade/motorCade' }) } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } const gomotorCade_mycar = () => { @@ -395,14 +409,16 @@ icon: 'error' }); return; - } else if (realNameAuthFlag.value != 1) { - errornotify.value.show() - return } else { uni.navigateTo({ url: '../../pagesCenter/motorCadeMy/motorCadeMy' }) } + // else if (realNameAuthFlag.value != 1) { + // errornotify.value.show() + // return + // } + } const goShiftTurnover = () => { if (!uni.getStorageSync("userInfo")) { @@ -418,175 +434,33 @@ }) } } - const swap_pay_stationNo = ref('') - const startchargmodal = ref(null) - const startswapmodal = ref(null) - const handle_scan = () => { - uni.scanCode({ - scanType: ['qrCode'], - success: async function(res) { - let res_result = JSON.parse(res.result) - if (res_result.hasOwnProperty('stationNo')) { - uni.showToast({ - title: '验证成功', - duration: 1000, - icon: 'success' - }) - swap_pay_stationNo.value = res_result.stationNo - setTimeout(() => { - startswapmodal.value.open() - }, 2000) - } else { - handle_charging_pay(res_result) - } - - } - }) - } - const handle_swaping_pay = async () => { - // let stationNo = res_result.stationNo - await uni.request({ - url: config.baseUrl + - `app-api/cloud/swapOrder/sendSwap`, - method: 'POST', - header: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'Authorization': 'Bearer ' + uni.getStorageSync('token'), - 'tenant-id': 1 - }, - data: { - stationNo: swap_pay_stationNo.value - } - }).then(response => { - // console.log(response, '验证'); - if (response.data.code == 0) { - uni.showLoading({ - title: '充电机启动中...请稍后' - }); - setTimeout(() => { - uni.hideLoading() - }, 2000) - } else { - uni.showModal({ - title: '错误', - showCancel: false, - content: response.data.msg, - success: function(res) {} - }); - } - }).catch((err) => { - uni.showToast({ - title: '错误,验证失败', - duration: 2000, - icon: 'error' - }); - }) - } - const check_chargeEqm = ref('') - const check_gunNo = ref('') - const handle_charging_pay = async (res_result) => { - check_chargeEqm.value = res_result.chargeEqm - check_gunNo.value = res_result.gunNo - await uni.$request({ - url: config.baseUrl + - `app-api/cloud/outCharge/confirmGunCanCharging/${res_result.chargeEqm}/${res_result.gunNo}`, - method: 'GET' - }).then(response => { - if (response.data.code == 0) { - uni.showToast({ - title: '验证成功', - duration: 1000, - icon: 'success' - }) - setTimeout(() => { - startchargmodal.value.open() - }, 2000) - } else { - uni.showModal({ - title: '错误', - showCancel: false, - content: response.data.msg, - success: function(res) {} - }); - } + const logOut = () => { + uni.hideTabBar() + version_loading.value = true + uni.removeStorageSync("userInfo"); + uni.removeStorageSync("token"); + uni.removeStorageSync("refreshToken"); + uni.removeStorageSync("teamId"); + uni.removeStorageSync("realNameAuthFlag"); + uni.removeStorageSync("version"); + loginStore.isLogin = false + setTimeout(() => { + uni.showTabBar() + version_loading.value = false + uni.reLaunch({ + url: '/pages/index/index' + }) + }, 2000) - }).catch((err) => { - uni.showToast({ - title: '错误,验证失败', - duration: 2000, - icon: 'error' - }); - }) } - const startconfirm = async () => { - startchargmodal.value.close() - let config_url = '' - if (uni.getStorageSync("version") == '个人版') { - config_url = `app-api/cloud/personal/startCharge/${check_chargeEqm.value}/${check_gunNo.value}` - } else { - config_url = `app-api/cloud/team/startCharge/${check_chargeEqm.value}/${check_gunNo.value}` + const handle_recharge = () => { + if (now_version.value == '车队版') { + uni.setStorageSync("ispersonnel", 1); } - await uni.$request({ - url: config.baseUrl + config_url - }).then(res => { - if (res.data.code == 0) { - uni.showLoading({ - title: '充电机启动中...请稍后' - }); - setTimeout(() => { - uni.hideLoading() - }, 2000) - chargorder.value = res.data.data - setTimeout(() => { - handle_chargorder() - }, 6000) - } else { - uni.showToast({ - title: res.data.msg, - duration: 2000, - icon: 'error' - }); - } - // console.log(res, 'res开始充电'); - }).catch((err) => { - - }) - } - const handle_chargorder = async () => { - let config_url = '' - if (uni.getStorageSync("version") == '个人版') { - config_url = `app-api/cloud/personal/queryRealTimeOrder/${chargorder.value}` - } else { - config_url = `app-api/cloud/team/queryRealTimeOrder/${chargorder.value}` - } - - clearInterval(timer.value) - timer.value = null - await uni.$request({ - url: config.baseUrl + config_url - }).then(res => { - // console.log(res, '当前充电订单'); - if (res.data.code == 0) { - let str = res.data.data - uni.navigateTo({ - url: '/pages/order/chargorder/detailInf/detailInf?details=' + JSON.stringify( - str) - }) - } else { - uni.showToast({ - title: res.data.msg, - duration: 2000, - icon: 'error' - }); - } - }).catch((err) => { - uni.showToast({ - title: '加载失败', - duration: 2000, - icon: 'error' - }); + uni.navigateTo({ + url: '/pages/index/recharge/recharge' }) } @@ -601,7 +475,7 @@ width: 100%; height: 100vh; /* background: linear-gradient(180deg, #E4EFFF 0%, rgba(228, 239, 255, 0) 100%); */ - background: #fff; + background: #f3f7fa; position: relative; } @@ -639,12 +513,7 @@ width: 120rpx; height: 120rpx; border-radius: 50%; - /* background-image: url("https://picsum.photos/50/50"); */ background-size: 100% 100%; - position: absolute; - top: 140rpx; - left: 50%; - transform: translateX(-50%); box-shadow: 1px 1px 1px #ccc; } @@ -653,4 +522,65 @@ top: 20rpx; right: 20rpx; } + + .title_header { + display: flex; + align-items: start; + /* justify-content: space-between; */ + width: 100%; + height: 440rpx; + border-bottom-left-radius: 60rpx; + border-bottom-right-radius: 60rpx; + /* background: #2cc06c; */ + background-image: url('https://zzpower.net//admin-api/infra/file/4/get/99bd21413e53b2474f01e40a76d41b103a72db8aab106b2af6ffa59e3016ff80.jpg'); + /* background-image: url('https://zzpower.net//admin-api/infra/file/4/get/9e7cdfed4eb3775bf248cd0ac7496cedea7a2af21a9ab384d3819dc5944dd0a1.jpg'); */ + /* background-image: url('https://zzpower.net//admin-api/infra/file/4/get/dc0d69995b79fb13fe1baf61d6e2570fcabdd3e47cce7ae302d6d8e51f260834.jpg'); */ + background-repeat: no-repeat; + background-position: center; + background-size: 100% 100%; + padding: 200rpx 30rpx 0 30rpx; + box-sizing: border-box; + position: relative; + + >view:first-child { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + } + + .position_recharge { + width: calc(100% - 60rpx); + height: 130rpx; + background: #fff; + position: absolute; + bottom: -60rpx; + border-radius: 10rpx; + display: flex; + align-items: center; + justify-content: space-between; + padding: 20rpx; + box-sizing: border-box; + + >view:first-child { + color: #000; + } + + .btn_recharge { + padding: 10rpx 20rpx; + background: linear-gradient(to right, #72ef3f, #41ce2d); + color: #fff; + border-radius: 10rpx; + font-size: 14px; + } + } + } + + .outLoginBtn { + width: calc(100% - 60rpx); + position: absolute; + bottom: 50rpx; + left: 50%; + transform: translateX(-50%); + } \ No newline at end of file diff --git a/pagesCenter/accountBalancePersonnelCar/accountBalancePersonnelCar.vue b/pagesCenter/accountBalancePersonnelCar/accountBalancePersonnelCar.vue index 5be9c2c..772bb8e 100644 --- a/pagesCenter/accountBalancePersonnelCar/accountBalancePersonnelCar.vue +++ b/pagesCenter/accountBalancePersonnelCar/accountBalancePersonnelCar.vue @@ -96,10 +96,6 @@ bindType: 2 } let config_url = '' - // if (uni.getStorageSync("captainOrNot")) { - // config_url = 'app-api/pay/wallet/getTeam' - // } else { - // } config_url = 'app-api/pay/wallet/get' uni.$request({ url: config.baseUrl + config_url, diff --git a/pagesCenter/pay/index.vue b/pagesCenter/pay/index.vue index 2bee968..83e490a 100644 --- a/pagesCenter/pay/index.vue +++ b/pagesCenter/pay/index.vue @@ -173,7 +173,8 @@ content: '确定要支付吗?', success: function(res) { if (res.confirm) { - sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id); + // sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id); + return new Pay(state.payment, state.orderType, state.orderInfo.id); } }, }); @@ -254,6 +255,7 @@ // 设置支付订单信息 async function setOrder(id) { + console.log(id, 'id') // 获得支付订单信息 const { data, diff --git a/sheep/config/index.js b/sheep/config/index.js index 993992d..9a16b8e 100644 --- a/sheep/config/index.js +++ b/sheep/config/index.js @@ -8,7 +8,7 @@ if (process.env.NODE_ENV === 'development') { } version = import.meta.env.SHOPRO_VERSION; // console.log(`[芋道商城 ${version}] http://doc.iocoder.cn`); - +console.log(baseUrl,'baseUrl') export const apiPath = import.meta.env.SHOPRO_API_PATH; export const staticUrl = import.meta.env.SHOPRO_STATIC_URL; export const tenantId = import.meta.env.SHOPRO_TENANT_ID; diff --git a/sheep/request/index.js b/sheep/request/index.js index c10af13..b7a2984 100644 --- a/sheep/request/index.js +++ b/sheep/request/index.js @@ -75,7 +75,7 @@ http.interceptors.request.use( showAuthModal(); return Promise.reject(); } - + console.log(config,'config') // 自定义处理【loading 加载中】：如果需要显示 loading，则显示 loading if (config.custom.showLoading) { LoadingInstance.count++;