diff --git a/ebike-user/components/bike-pay/bike-pay.vue b/ebike-user/components/bike-pay/bike-pay.vue index 6f4b9a5..0a2da59 100644 --- a/ebike-user/components/bike-pay/bike-pay.vue +++ b/ebike-user/components/bike-pay/bike-pay.vue @@ -34,6 +34,7 @@ 支付 + 退款 @@ -93,6 +94,8 @@ showModelMessage("支付失败") } }) + }else{ + showModelMessage("支付失败") } }) } @@ -117,6 +120,12 @@ url: "/pages/user/home/home" }) } + + const gotoRefundRequest=()=>{ + uni.navigateTo({ + url: "/pages/user/views/PaymentFeedback?orderId="+props.orderId + }) + } \ No newline at end of file diff --git a/ebike-user/pages/user/login/wx_login.vue b/ebike-user/pages/user/login/wx_login.vue index 8be78ce..be19e28 100644 --- a/ebike-user/pages/user/login/wx_login.vue +++ b/ebike-user/pages/user/login/wx_login.vue @@ -51,7 +51,9 @@ import * as api from '@/utils/api.js'; import config from '@/utils/config'; import { - showModelMessage,jkcBaseEncode,jkcBaseDecode + showModelMessage, + jkcBaseEncode, + jkcBaseDecode } from '@/utils/tools.js'; const imgPath = config.imgPath; const isAgreed = ref([]); // 用来控制复选框的选中状态 @@ -91,10 +93,11 @@ .then((info) => { isloading.value = false; if (info.code == 200) { - uni.setStorageSync('wechat_user', jkcBaseEncode(JSON.stringify(info.data))); + uni.setStorageSync('wechat_user', jkcBaseEncode(JSON + .stringify(info.data))); phone.value = info.data.mobile; if (!info.data.nickname) { - updateUserProfile(); + // updateUserProfile(); } } else { let params = { @@ -103,11 +106,12 @@ } api.callOrdereApi("ebikeUser/save", params).then( re => { - if (re.code == 200) { + if (re.code == 200) { params.userId = re.data; uni.setStorageSync('wechat_user', - jkcBaseEncode(JSON.stringify(params))); - updateUserProfile(); + jkcBaseEncode(JSON.stringify( + params))); + // updateUserProfile(); } }); } @@ -206,7 +210,7 @@ // 判断账号是否已经注销 const isAccountDeactivated = () => { - let wechat_user =JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user"))); + let wechat_user = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user"))); if (wechat_user && wechat_user.status == -1) { return false; } @@ -219,12 +223,24 @@ showModelMessage("您的账户已经注销,请联系管理员!"); } else { // 调用 wx.login 获取登录凭证 code + + //如果头像为空 弹出设置头像页面 login(); - setTimeout(() => { - uni.navigateTo({ - url: "/pages/user/home/home" - }) - }, 500); + let wechat_user = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user"))); + if (!wechat_user.avatar) { + setTimeout(() => { + uni.navigateTo({ + url: "/pages/user/login/userphtoinfo" + }) + }, 500); + } else { + + setTimeout(() => { + uni.navigateTo({ + url: "/pages/user/home/home" + }) + }, 500); + } } diff --git a/ebike-user/pages/user/mine/MePage.vue b/ebike-user/pages/user/mine/MePage.vue index c73808e..a7717c0 100644 --- a/ebike-user/pages/user/mine/MePage.vue +++ b/ebike-user/pages/user/mine/MePage.vue @@ -3,11 +3,11 @@ - + - 昵称 - 182****7183 + {{wechat_user.nickname}} + {{ hidePhoneNumber(wechat_user.mobile) }} @@ -34,8 +34,33 @@ ref } from 'vue'; import config from '@/utils/config'; + import { + onLoad + } from '@dcloudio/uni-app'; + import { + showModelMessage, + jkcBaseEncode, + jkcBaseDecode + } from '@/utils/tools.js'; const imgPath = config.imgPath; + const wechat_user = ref({ + url: `${imgPath}static/userui/wxtouxiang.png`, + nickname: "", + mobile: "" + }); + onLoad((options) => { + wechat_user.value = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user"))); + }) + // 隐藏电话号码中间部分 + const hidePhoneNumber = (phoneNumber) => { + if (!phoneNumber || phoneNumber.length !== 11) { + return phoneNumber; // 如果不是有效的手机号,直接返回原始手机号 + } + const firstPart = phoneNumber.substring(0, 3); // 前三位 + const lastPart = phoneNumber.substring(7); // 后四位 + return `${firstPart}****${lastPart}`; // 拼接隐藏的手机号 + } const menuItems = ref([{ diff --git a/ebike-user/pages/user/views/PaymentFeedback.vue b/ebike-user/pages/user/views/PaymentFeedback.vue index fbee4da..3d40397 100644 --- a/ebike-user/pages/user/views/PaymentFeedback.vue +++ b/ebike-user/pages/user/views/PaymentFeedback.vue @@ -3,10 +3,10 @@ - 单车费用 + 订单编号 - 2025-04-14 19:26:15 + {{orderId}} @@ -14,7 +14,7 @@ 骑行费用 - 1.5元 + {{data.totalAmount}}元 @@ -28,8 +28,8 @@ 骑行费问题 - - 调度费申诉 + + 申请退款 已关锁仍计费 @@ -42,7 +42,38 @@ - \ No newline at end of file diff --git a/ebike-user/utils/api.js b/ebike-user/utils/api.js index 65837ee..e1adc08 100644 --- a/ebike-user/utils/api.js +++ b/ebike-user/utils/api.js @@ -31,3 +31,7 @@ export const callEbikeInfo = (url, parmas = {}, method = 'post') => { export const fileUploadUser = (file) => { return HttpFileUpload(baseUrl + "order/ebikeOrdersSystem/fileUpload", file); } + +export const fileUploadUserPicture = (file) => { + return HttpFileUpload(baseUrl + "order/ebikeOrdersSystem/fileUploadUserPicture", file); +}