diff --git a/pages.json b/pages.json index 8d46285..7c8cfd2 100644 --- a/pages.json +++ b/pages.json @@ -59,16 +59,58 @@ } }, { - "path": "orderRecord", + "path": "order/orderRecord", "style": { "navigationBarTitleText": "接单记录" } }, { - "path": "recordList", + "path": "order/recordList", "style": { "navigationBarTitleText": "订单记录" } + }, + { + "path": "salary/salaryManage", + "style": { + "navigationBarTitleText": "薪资管理" + } + }, + { + "path": "salary/salaryList", + "style": { + "navigationBarTitleText": "薪资明细" + } + }, + { + "path": "account/index", + "style": { + "navigationBarTitleText": "我的账户" + } + }, + { + "path": "healthCertificate/index", + "style": { + "navigationBarTitleText": "健康证" + } + }, + { + "path": "contact/index", + "style": { + "navigationBarTitleText": "紧急联系人" + } + }, + { + "path": "privacyManage/index", + "style": { + "navigationBarTitleText": "隐私管理" + } + }, + { + "path": "AuthorizaManage/index", + "style": { + "navigationBarTitleText": "权限管理" + } } ] }, diff --git a/pages/index/components/first-one.vue b/pages/index/components/first-one.vue deleted file mode 100644 index 2decc86..0000000 --- a/pages/index/components/first-one.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/pages/index/components/first-two.vue b/pages/index/components/first-two.vue deleted file mode 100644 index 801cb8d..0000000 --- a/pages/index/components/first-two.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - diff --git a/pages/index/components/order-code-popup.vue b/pages/index/components/order-code-popup.vue new file mode 100644 index 0000000..85fb0f8 --- /dev/null +++ b/pages/index/components/order-code-popup.vue @@ -0,0 +1,354 @@ + + + + + \ No newline at end of file diff --git a/pages/index/components/second-one.vue b/pages/index/components/second-one.vue deleted file mode 100644 index 5b6b9f3..0000000 --- a/pages/index/components/second-one.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - diff --git a/pages/index/index.vue b/pages/index/index.vue index 086ca7b..f1d6bea 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -6,7 +6,8 @@ - + {{ driverInfo.isOnline ? '在线中' : '离线' }} @@ -25,6 +26,9 @@ + + + @@ -89,6 +93,7 @@ import { ref, computed, onMounted } from 'vue'; import sheep from '@/sheep'; import { onShow } from '@dcloudio/uni-app'; +import OrderCodePopup from './components/order-code-popup.vue'; // 驿站/骑手信息(从 store 获取或 mock) const driverInfo = ref({ @@ -211,10 +216,18 @@ function scanQr() { }); } +const orderPopupShow = ref(false); + function openManualInput() { - uni.navigateTo({ - url: '/pages/index/user' // 示例跳转,按需替换为真实手动输入页面 - }); + // 打开手动输入弹窗(使用 uView Plus 的 up-popup) + orderPopupShow.value = true; +} + +function onConfirmCode(payload) { + // payload 包含 code, result, remark, images + // 这里简单展示提示,实际应调用后端或触发下一步逻辑 + console.log('confirmed code:', payload); + sheep.$helper && sheep.$helper.toast && sheep.$helper.toast('交接已确认'); } const headerStyle = ref({}); diff --git a/pages/index/user.vue b/pages/index/user.vue index fe8859b..fc77405 100644 --- a/pages/index/user.vue +++ b/pages/index/user.vue @@ -4,7 +4,7 @@ - + {{ userInfo.nickname + `(${userInfo.mobile})` }} @@ -23,14 +23,15 @@ 今日预计收入(元) {{ formatMoney(todayIncome) }} - + + 我的账户 今日完成单量(单) {{ todayOrders }} - + 订单统计 @@ -43,11 +44,11 @@ 考勤排班 - + 薪资助手 - + @@ -214,7 +215,6 @@ onPageScroll(() => {}); - // 跳转/交互方法(保留路由调用位置,用户可按需实现) function goBack() { uni.navigateBack(); } @@ -224,31 +224,13 @@ url: '/pages/public/webview?type=account' }); } - - function openOrders() { - uni.navigateTo({ - url: '/pages/index/order-list' - }); - } - + function openAttendance() { uni.navigateTo({ url: '/pages/public/faq' }); } - function openSalary() { - uni.navigateTo({ - url: '/pages/public/richtext' - }); - } - - function openSetting() { - uni.navigateTo({ - url: '/pages/public/setting' - }); - } - function login() { showAuthModal(); } diff --git a/pages/public/setting.vue b/pages/public/setting.vue index 5b2b3c6..01d4747 100644 --- a/pages/public/setting.vue +++ b/pages/public/setting.vue @@ -11,23 +11,47 @@ + + + + + + - - - - - - 《隐私协议》 - - - - - - @@ -208,6 +222,20 @@ ]; const userInfo = computed(() => sheep.$store('user').userInfo); + + // 身份证显示(对中间数字做掩码显示) + const displayIdNumber = computed(() => { + const id = + state.model?.idNumber || + state.model?.id_card || + state.model?.idNo || + state.model?.id; + if (!id) return ''; + if (typeof id === 'string' && id.length >= 8) { + return id.replace(/(\d{3})\d+(\d{4})/, '$1********$2'); + } + return id; + }); // 选择性别 function onChangeGender(e) { @@ -219,6 +247,16 @@ showAuthModal('changeMobile'); }; + // 点击健康证(跳转到健康证或证件页) + function onTapHealthCert() { + uni.navigateTo({ url: '/pages/registered/accountInfo' }); + } + + // 联系站长(跳转到我的账户或站点详情页) + function onTapContactStation() { + uni.navigateTo({ url: '/pages/user/account/index' }); + } + // 选择微信的头像,进行上传 function onChooseAvatar(e) { const tempUrl = e.detail.avatarUrl || ''; diff --git a/pages/user/orderRecord.vue b/pages/user/order/orderRecord.vue similarity index 99% rename from pages/user/orderRecord.vue rename to pages/user/order/orderRecord.vue index 71cc612..30eaffe 100644 --- a/pages/user/orderRecord.vue +++ b/pages/user/order/orderRecord.vue @@ -94,7 +94,7 @@ function onConfirm(e) { function toList() { uni.navigateTo({ - url: '/pages/user/recordList' + url: '/pages/user/order/recordList' }) } diff --git a/pages/user/recordList.vue b/pages/user/order/recordList.vue similarity index 100% rename from pages/user/recordList.vue rename to pages/user/order/recordList.vue diff --git a/pages/user/privacyManage/index.vue b/pages/user/privacyManage/index.vue new file mode 100644 index 0000000..17b2359 --- /dev/null +++ b/pages/user/privacyManage/index.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/pages/user/salary/salaryList.vue b/pages/user/salary/salaryList.vue new file mode 100644 index 0000000..010e01a --- /dev/null +++ b/pages/user/salary/salaryList.vue @@ -0,0 +1,184 @@ + + + + + \ No newline at end of file diff --git a/pages/user/salary/salaryManage.vue b/pages/user/salary/salaryManage.vue new file mode 100644 index 0000000..cb65fa6 --- /dev/null +++ b/pages/user/salary/salaryManage.vue @@ -0,0 +1,252 @@ + + + + + \ No newline at end of file diff --git a/sheep/components/s-auth-modal/components/change-mobile.vue b/sheep/components/s-auth-modal/components/change-mobile.vue index f4dd5f1..ae3a78f 100644 --- a/sheep/components/s-auth-modal/components/change-mobile.vue +++ b/sheep/components/s-auth-modal/components/change-mobile.vue @@ -2,7 +2,7 @@