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 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- ¥{{ fen2yuan(item.price) }}
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
- {{ props.data[activeMenu].name }}
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
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 @@