diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index 7a5faed..7e28172 100644
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@@ -2,13 +2,13 @@
-
-
+
+
首页
- 首页
+ 首页
-
+
@@ -18,40 +18,43 @@
通知
- 通知
+ 通知
-
-
+
+
我的
- 我的
+ 我的
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index fda17f6..681a126 100644
--- a/pages.json
+++ b/pages.json
@@ -1,543 +1,551 @@
{
- "pages": [
- //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
- {
- "path": "pages/Login/launcherPage",
- "style": {
- "navigationBarTitleText": "启动页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "商家端首页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/informationManage",
- "style": {
- "navigationBarTitleText": "设备管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/informationAdd",
- "style": {
- "navigationBarTitleText": "设备管理新增编辑页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/deviceManage",
- "style": {
- "navigationBarTitleText": "资料管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/NewdeviceManage",
- "style": {
- "navigationBarTitleText": "设备管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/authority",
- "style": {
- "navigationBarTitleText": "官方端",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/announcement",
- "style": {
- "navigationBarTitleText": "行业公告",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/details",
- "style": {
- "navigationBarTitleText": "详情页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/statistics",
- "style": {
- "navigationBarTitleText": "数据展示",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/Detection",
- "style": {
- "navigationBarTitleText": "汽车检测",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/newadd",
- "style": {
- "navigationBarTitleText": "新增文章",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/editlist",
- "style": {
- "navigationBarTitleText": "编辑文章列表",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/manage",
- "style": {
- "navigationBarTitleText": "h-管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/internalManagement",
- "style": {
- "navigationBarTitleText": "内部管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/deviceAdd",
- "style": {
- "navigationBarTitleText": "新增文件",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/authority/editDete",
- "style": {
- "navigationBarTitleText": "编辑文章",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/synthesis",
- "style": {
- "navigationBarTitleText": "新首页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/newindex",
- "style": {
- "navigationBarTitleText": "新首页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/orderStatistics",
- "style": {
- "navigationBarTitleText": "当日订单统计",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/countEmployees",
- "style": {
- "navigationBarTitleText": "员工",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/neworderStatistic",
- "style": {
- "navigationBarTitleText": "订单统计",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/addStaff",
- "style": {
- "navigationBarTitleText": "添加员工",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/xiaoxi/xiaoxi",
- "style": {
- "navigationBarTitleText": "消息",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/xiaoxi/notice",
- "style": {
- "navigationBarTitleText": "消息",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/xiaoxi/details",
- "style": {
- "navigationBarTitleText": "消息详情",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/coupon/coupon",
- "style": {
- "navigationBarTitleText": "优惠券",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/coupon/couponadd",
- "style": {
- "navigationBarTitleText": "新增优惠券",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/statistics/statistics",
- "style": {
- "navigationBarTitleText": "业务统计",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/statistics/statislist",
- "style": {
- "navigationBarTitleText": "业务统计二级页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/statistics/business",
- "style": {
- "navigationBarTitleText": "业务统计二级页",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/staff/staff",
- "style": {
- "navigationBarTitleText": "员工端",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/staff/golist",
- "style": {
- "navigationBarTitleText": "员工端上门取车",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/staff/orderdetails",
- "style": {
- "navigationBarTitleText": "员工端-订单详情",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/staff/staff-my",
- "style": {
- "navigationBarTitleText": "员工端个人信息",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/Staffmanagement",
- "style": {
- "navigationBarTitleText": "员工列表",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/NewstaffManagement",
- "style": {
- "navigationBarTitleText": "新员工列表",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/homecar",
- "style": {
- "navigationBarTitleText": "上门取车",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/order-home",
- "style": {
- "navigationBarTitleText": "指派上门人员",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/ordermanage",
- "style": {
- "navigationBarTitleText": "订单管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/orderdetails",
- "style": {
- "navigationBarTitleText": "订单详情",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/Neworder",
- "style": {
- "navigationBarTitleText": "新增线下订单",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/order/order",
- "style": {
- "navigationBarTitleText": "商品管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/order/reservationlist",
- "style": {
- "navigationBarTitleText": "预约列表",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/order/editorder",
- "style": {
- "navigationBarTitleText": "商品编辑",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/Tollannouncement/Tollannouncement",
- "style": {
- "navigationBarTitleText": "发布",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/release/release",
- "style": {
- "navigationBarTitleText": "新增商品",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/my",
- "style": {
- "navigationBarTitleText": "我的",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/safety/safety",
- "style": {
- "navigationBarTitleText": "我的-安全",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/my-wallet",
- "style": {
- "navigationBarTitleText": "钱包",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/rwm",
- "style": {
- "navigationBarTitleText": "二维码",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/rwmlist",
- "style": {
- "navigationBarTitleText": "核销记录",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/my-order",
- "style": {
- "navigationBarTitleText": "我的订单",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/ordermanage",
- "style": {
- "navigationBarTitleText": "订单管理",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/shoporder",
- "style": {
- "navigationBarTitleText": "我的店铺",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/Login/login",
- "style": {
- "navigationBarTitleText": "登录",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/Login/modify",
- "style": {
- "navigationBarTitleText": "修改密码",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/order/editPrice",
- "style": {
- "navigationBarTitleText": "价格编辑",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/selectProject",
- "style": {
- "navigationBarTitleText": "选择项目",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/staff/goRoyalty",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/editUserInfo/editUserInfo",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/modifyPassword/modifyPassword",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/index/oldOrder",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/oldOrderProject",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/TodayTable",
- "style": {
- "navigationBarTitleText": "当日订单",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/UserInfo",
- "style": {
- "navigationBarTitleText": "个人信息",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/staff/StaffInfo",
- "style": {
- "navigationBarTitleText": "员工信息",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/workReport/workReport",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/workReport/reportList",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/workReport/reportDetals",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/manage/workReport/workReportAdd",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
- }
- ],
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#F8F8F8",
- "backgroundColor": "#F8F8F8"
- },
-// "tabBar": {
-// "custom": true,
-// "color": "#929292",
-// "selectedColor": "#327DFB",
-// "borderStyle": "black",
-// "backgroundColor": "#F7F7F7",
-// "list": [
-// {
-// "pagePath": "pages/index/newindex",
-// "text": "首页",
-// "iconPath": "/static/tabBar/home.png",
-// "selectedIconPath": "/static/tabBar/homex.png"
-// },
-// {
-// "pagePath": "pages/notice/notice",
-// "text": "通知",
-// "iconPath": "/static/tabBar/notice.png",
-// "selectedIconPath": "/static/tabBar/noticex.png"
-// },
-// {
-// "pagePath": "pages/my/my",
-// "text": "我的",
-// "iconPath": "/static/tabBar/my.png",
-// "selectedIconPath": "/static/tabBar/myx.png"
-// }
-//
-// ]
-// },
- "uniIdRouter": {}
-}
+ "pages": [
+ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+ {
+ "path": "pages/Login/launcherPage",
+ "style": {
+ "navigationBarTitleText": "启动页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "商家端首页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/informationManage",
+ "style": {
+ "navigationBarTitleText": "设备管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/informationAdd",
+ "style": {
+ "navigationBarTitleText": "设备管理新增编辑页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/deviceManage",
+ "style": {
+ "navigationBarTitleText": "资料管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/NewdeviceManage",
+ "style": {
+ "navigationBarTitleText": "设备管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/authority",
+ "style": {
+ "navigationBarTitleText": "官方端",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/announcement",
+ "style": {
+ "navigationBarTitleText": "行业公告",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/details",
+ "style": {
+ "navigationBarTitleText": "详情页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/statistics",
+ "style": {
+ "navigationBarTitleText": "数据展示",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/Detection",
+ "style": {
+ "navigationBarTitleText": "汽车检测",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/newadd",
+ "style": {
+ "navigationBarTitleText": "新增文章",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/editlist",
+ "style": {
+ "navigationBarTitleText": "编辑文章列表",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/manage",
+ "style": {
+ "navigationBarTitleText": "h-管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/internalManagement",
+ "style": {
+ "navigationBarTitleText": "内部管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/deviceAdd",
+ "style": {
+ "navigationBarTitleText": "新增文件",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/authority/editDete",
+ "style": {
+ "navigationBarTitleText": "编辑文章",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/synthesis",
+ "style": {
+ "navigationBarTitleText": "新首页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/newindex",
+ "style": {
+ "navigationBarTitleText": "新首页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/orderStatistics",
+ "style": {
+ "navigationBarTitleText": "当日订单统计",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/countEmployees",
+ "style": {
+ "navigationBarTitleText": "员工",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/neworderStatistic",
+ "style": {
+ "navigationBarTitleText": "订单统计",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/addStaff",
+ "style": {
+ "navigationBarTitleText": "添加员工",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/xiaoxi/xiaoxi",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/xiaoxi/notice",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/xiaoxi/details",
+ "style": {
+ "navigationBarTitleText": "消息详情",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/coupon/coupon",
+ "style": {
+ "navigationBarTitleText": "优惠券",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/coupon/couponadd",
+ "style": {
+ "navigationBarTitleText": "新增优惠券",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/statistics/statistics",
+ "style": {
+ "navigationBarTitleText": "业务统计",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/statistics/statislist",
+ "style": {
+ "navigationBarTitleText": "业务统计二级页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/statistics/business",
+ "style": {
+ "navigationBarTitleText": "业务统计二级页",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/staff/staff",
+ "style": {
+ "navigationBarTitleText": "员工端",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/staff/golist",
+ "style": {
+ "navigationBarTitleText": "员工端上门取车",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/staff/orderdetails",
+ "style": {
+ "navigationBarTitleText": "员工端-订单详情",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/staff/staff-my",
+ "style": {
+ "navigationBarTitleText": "员工端个人信息",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/Staffmanagement",
+ "style": {
+ "navigationBarTitleText": "员工列表",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/NewstaffManagement",
+ "style": {
+ "navigationBarTitleText": "新员工列表",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/homecar",
+ "style": {
+ "navigationBarTitleText": "上门取车",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/order-home",
+ "style": {
+ "navigationBarTitleText": "指派上门人员",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/ordermanage",
+ "style": {
+ "navigationBarTitleText": "订单管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/orderdetails",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/Neworder",
+ "style": {
+ "navigationBarTitleText": "新增线下订单",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/order/order",
+ "style": {
+ "navigationBarTitleText": "商品管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/order/reservationlist",
+ "style": {
+ "navigationBarTitleText": "预约列表",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/order/editorder",
+ "style": {
+ "navigationBarTitleText": "商品编辑",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/Tollannouncement/Tollannouncement",
+ "style": {
+ "navigationBarTitleText": "发布",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/release/release",
+ "style": {
+ "navigationBarTitleText": "新增商品",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/my",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/safety/safety",
+ "style": {
+ "navigationBarTitleText": "我的-安全",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/my-wallet",
+ "style": {
+ "navigationBarTitleText": "钱包",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/rwm",
+ "style": {
+ "navigationBarTitleText": "二维码",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/rwmlist",
+ "style": {
+ "navigationBarTitleText": "核销记录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/my-order",
+ "style": {
+ "navigationBarTitleText": "我的订单",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/ordermanage",
+ "style": {
+ "navigationBarTitleText": "订单管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/shoporder",
+ "style": {
+ "navigationBarTitleText": "我的店铺",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/Login/login",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/Login/modify",
+ "style": {
+ "navigationBarTitleText": "修改密码",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/order/editPrice",
+ "style": {
+ "navigationBarTitleText": "价格编辑",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/selectProject",
+ "style": {
+ "navigationBarTitleText": "选择项目",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/staff/goRoyalty",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/editUserInfo/editUserInfo",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/modifyPassword/modifyPassword",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/index/oldOrder",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/oldOrderProject",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/TodayTable",
+ "style": {
+ "navigationBarTitleText": "当日订单",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/UserInfo",
+ "style": {
+ "navigationBarTitleText": "个人信息",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/staff/StaffInfo",
+ "style": {
+ "navigationBarTitleText": "员工信息",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/workReport/workReport",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/workReport/reportList",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/workReport/reportDetals",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/manage/workReport/workReportAdd",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/meetCarOrder",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ }
+ ],
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "uni-app",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "backgroundColor": "#F8F8F8"
+ },
+ // "tabBar": {
+ // "custom": true,
+ // "color": "#929292",
+ // "selectedColor": "#327DFB",
+ // "borderStyle": "black",
+ // "backgroundColor": "#F7F7F7",
+ // "list": [
+ // {
+ // "pagePath": "pages/index/newindex",
+ // "text": "首页",
+ // "iconPath": "/static/tabBar/home.png",
+ // "selectedIconPath": "/static/tabBar/homex.png"
+ // },
+ // {
+ // "pagePath": "pages/notice/notice",
+ // "text": "通知",
+ // "iconPath": "/static/tabBar/notice.png",
+ // "selectedIconPath": "/static/tabBar/noticex.png"
+ // },
+ // {
+ // "pagePath": "pages/my/my",
+ // "text": "我的",
+ // "iconPath": "/static/tabBar/my.png",
+ // "selectedIconPath": "/static/tabBar/myx.png"
+ // }
+ //
+ // ]
+ // },
+ "uniIdRouter": {}
+}
\ No newline at end of file
diff --git a/pages/index/Neworder.vue b/pages/index/Neworder.vue
index 12a41b5..4d6d0ba 100644
--- a/pages/index/Neworder.vue
+++ b/pages/index/Neworder.vue
@@ -1,1269 +1,1312 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- 行驶证扫描
-
-
+
+
+
+
+
+ 行驶证扫描
+
+
-
+
-
- 行驶证照片
-
-
-
-
+
+ 行驶证照片
+
+
+
+
-
+
-
+
-
-
- 客户姓名
-
-
-
-
-
- 住址
-
-
-
-
-
-
- *
- 车牌号
-
-
-
-
-
-
- 使用性质
- 点击选择
-
-
-
-
-
-
- 品牌型号
-
-
-
-
-
- 车辆识别代号
-
-
-
-
-
-
- *
- 车辆注册日期
- 点击选择
-
-
-
-
-
-
-
- *
- 客户来源
- 点击选择
-
-
-
-
-
-
- 代办人手机号
-
-
-
-
-
-
- *
- 商品选择
- 点击选择
-
-
- {{ goodstext }}
-
-
-
+
+
+ 客户姓名
+
+
+
+
+
+ 住址
+
+
+
+
+
+
+ *
+ 车牌号
+
+
+
+
+
+
+ 使用性质
+ 点击选择
+
+
+
+
+
+
+ 品牌型号
+
+
+
+
+
+ 车辆识别代号
+
+
+
+
+
+
+ *
+ 车辆注册日期
+ 点击选择
+
+
+
+
+
+
+
+ *
+ 客户来源
+ 点击选择
+
+
+
+
+
+
+ 代办人手机号
+
+
+
+
+
+
+ *
+ 商品选择
+ 点击选择
+
+
+ {{ goodstext }}
+
+
+
-
- 新旧车
- 点击选择
-
-
-
-
-
-
- 联系方式
-
-
-
-
-
- 单位
-
-
-
-
-
-
- *
- 引车员
- 点击选择
-
-
-
-
-
-
-
- *
- 接车员
- 点击选择
-
-
-
-
-
+
+ 新旧车
+ 点击选择
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+ 单位
+
+
+
+
+
+
+ *
+ 引车员
+ 点击选择
+
+
+
+
+
+
+
+ *
+ 接车员
+ 点击选择
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
- 检测流程
-
+
+ 检测流程
+
-
-
-
-
+
+
+
+
-
- 开始检测
-
-
- 确认修改
-
-
+
+ 开始检测
+
+
+ 确认修改
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+ .xixi {
+ font-size: 12px;
+ color: #0D2E8D;
+ margin-left: 10px;
+ }
+
\ No newline at end of file
diff --git a/pages/index/meetCarOrder.vue b/pages/index/meetCarOrder.vue
index 46e5a82..cdd419f 100644
--- a/pages/index/meetCarOrder.vue
+++ b/pages/index/meetCarOrder.vue
@@ -1,16 +1,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -34,7 +24,6 @@
-
@@ -97,23 +86,10 @@
-
-
- *
- 接车员
- 点击选择
-
-
-
-
-
-
+
接车
-
- 确认修改
-
@@ -234,27 +210,6 @@
async onLoad(options) {
this.isLoading = true
await this.getinitialize()
- await this.getLeadeMan()
- await this.getMeetMan()
- uni.$on('selectProject', (data) => {
- this.inspectionWorkNodes = data
- for (var i = 0; i < this.inspectionWorkNodes.length; i++) {
- this.inspectionWorkNodeStr = this.inspectionWorkNodeStr + this.inspectionWorkNodes[i]
- .projectName + " "
- this.inspectionWorkNodes[i].orderNum = i + 1
- }
- });
- if (options.inspectionInfoId) {
- this.isInsert = false
- this.inspectionId = options.inspectionInfoId
- this.title = '修改线下订单'
- await this.getInspectionInfo()
- }
- //判断是否是预约记录进来的
- if (options.appointmentId) {
- this.appointmentId = options.appointmentId
- await this.getAppointmentDetail()
- }
this.isLoading = false
},
onShow() {
@@ -379,53 +334,6 @@
cancelRecord() {
this.showRecord = false
},
- /*获取预约记录详情*/
- async getAppointmentDetail() {
- let res = await request({
- url: `/inspection/appointment/${this.appointmentId}`,
- method: 'get'
- })
- if (res.data) {
- //客户姓名
- this.buyName = res.data.buyName
- this.buyPhone = res.data.buyPhoneNum
- //车牌
- this.carNum = res.data.carNo
- //车辆性质
- this.carNature = res.data.carNature
- //车辆品牌
- this.carModel = res.data.carModel
- //车辆识别代码
- this.carIdNo = res.data.carIdNo
- //skuid
- this.skuId = res.data.skuId
- //行驶证照片
- this.driverLicenesImg = res.data.driverLicenesImg == null ? undefined : [this.baseImageUrl + '/' +
- res.data.driverLicenesImg
- ]
- console.log('照片', this.driverLicenesImg)
- //goodsId
- this.goodsId = res.data.goodsId
- this.goodstext = this.findItemById(this.columnData, this.skuId).label
- //车辆注册日期
- this.carRegisterDate = res.data.carRegisterDate
- this.carRegisterDateStr = formatDate(res.data.carRegisterDate)
- //地址
- this.userAddress = res.data.address
- //触发change变化的方法
- // 模拟change事件
- const mockEvent = {
- columnIndex: 0, // 假设是第一列发生变化
- index: this.findGroupById(this.columnData, this.skuId).index, // 选择的索引
- picker: this.$refs.uPicker // 选择器实例
- };
- this.changeHandler(mockEvent);
- //根据goodsId找出对应的索引位置
- this.goodsDefaultIndex = [this.goodsone[0].findIndex(item => item.value === this.goodsId), this
- .$refs.uPicker.getColumnValues(1).findIndex(item => item.value == this.skuId)
- ]
- }
- },
findItemById(data, id) {
for (const group of data) {
for (const item of group) {
@@ -450,30 +358,6 @@
}
return null; // 如果没有找到,返回 null
},
- /*获取引车员信息*/
- getLeadeMan() {
- request({
- url: '/system/role/getUsersByRoleCode',
- method: 'get',
- params: {
- code: "jcycy"
- }
- }).then(res => {
- this.leadManList.push(res.data)
- })
- },
- /*获取接车员信息*/
- getMeetMan() {
- request({
- url: '/system/role/getUsersByRoleCode',
- method: 'get',
- params: {
- code: "jcjchc"
- }
- }).then(res => {
- this.meetManList.push(res.data)
- })
- },
confirmsnature(e) {
this.naturetext = e.value[0].label
@@ -526,26 +410,13 @@
})
},
async getgoodes() {
- if (this.carNum == '' || this.customerSource == "" || this.skuId == '' || this.leadManId ==
- undefined || this.carRegisterDate == '' || this.meetManId == undefined || this.meetManId ==
- undefined) {
+ if (this.carNum == '' || this.carRegisterDate == '') {
uni.showToast({
- title: '车牌号 客户来源 商品 引车员 车辆注册日期 接车人 必填!',
+ title: '车牌号 车辆注册日期 必填!',
icon: 'none'
})
return
}
- if (this.inspectionWorkNodes.length == 0) {
- uni.showToast({
- title: '请选择检测流程!',
- icon: 'none'
- })
- return
- }
-
- this.inspectionWorkNodes.map(item => {
- item.id = undefined
- })
let data = {
partnerId: uni.getStorageSync('partnerId'),
buyName: this.buyName,
@@ -569,16 +440,17 @@
}
let res = await request({
- url: '/system/info/add',
+ url: '/inspection-meet-car-order/add',
method: 'post',
data: data
})
if (res.code == 200) {
uni.showToast({
- title: "检测已开始"
+ title: "可以接车了"
})
}
setTimeout(() => {
+ uni.$emit('refresh')
uni.navigateBack()
}, 2000);
},
diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue
index 4d74ce6..09e0c8a 100644
--- a/pages/index/newindex.vue
+++ b/pages/index/newindex.vue
@@ -1,6 +1,5 @@
-
@@ -112,7 +111,10 @@
- 预约记录
+
+ 预约记录
+ 筛选
+
@@ -170,6 +172,18 @@
+
+
+ 选择日期
+
+
+
+
+
+
+
+
@@ -200,7 +214,9 @@
titlemodeal: '通知',
phoneNum: '',
isWorking: false,
+ showScreen: false,
user: {},
+ range: '',
baseUrl: '',
animate: false,
partnerId: '',
@@ -282,39 +298,6 @@
// this.getappointment()
},
- // onPullDownRefresh() {
- // console.log("刷新");
- // uni.stopPullDownRefresh()
- // },
- // onReachBottom() {
- // if (this.pageNum >= this.totalPages) {
- // uni.showToast({
- // title: '没有下一页数据',
- // icon: 'none'
- // })
- // } else {
- // this.pageNum++
- // this.getappointment()
- // clearInterval(this.timer);
- // this.timer = null;
- // }
- // },// onPullDownRefresh() {
- // console.log("刷新");
- // uni.stopPullDownRefresh()
- // },
- // onReachBottom() {
- // if (this.pageNum >= this.totalPages) {
- // uni.showToast({
- // title: '没有下一页数据',
- // icon: 'none'
- // })
- // } else {
- // this.pageNum++
- // this.getappointment()
- // clearInterval(this.timer);
- // this.timer = null;
- // }
- // },
onReady() {
// 动态计算滚动区域高度
this.calculateScrollHeight();
@@ -322,6 +305,10 @@
methods: {
formatDateChinese,
+ closeScreen() {
+ this.showScreen = false
+ },
+ openScreen() {},
calculateScrollHeight() {
// 获取屏幕高度
const screenHeight = uni.getSystemInfoSync().windowHeight;
@@ -331,10 +318,24 @@
this.scrollHeight = screenHeight - topHeight;
},
clearTime() {
- console.log('只能够了');
clearInterval(this.timer);
this.timer = null;
},
+ // 筛选日期
+ screenTime() {
+ console.log(this.range);
+ if (this.range) {
+ this.startTime = this.range[0]
+ this.endTime = this.range[1]
+ } else {
+ this.startTime = null
+ this.endTime = null
+ }
+ this.pageNum = 1
+ this.goodsList = []
+ this.getappointment()
+ this.showScreen = false
+ },
/**
* 上滑加载数据
*/
@@ -624,7 +625,9 @@
partnerId: this.partnerId,
phoneNum: this.phoneNum,
pageSize: this.pageSize,
- pageNum: this.pageNum
+ pageNum: this.pageNum,
+ startTime: this.startTime,
+ endTime: this.endTime
}
let res = await request({
diff --git a/pages/index/neworderStatistic.vue b/pages/index/neworderStatistic.vue
index ee4766a..3b81298 100644
--- a/pages/index/neworderStatistic.vue
+++ b/pages/index/neworderStatistic.vue
@@ -1,659 +1,602 @@
-
-
-
-
-
- 全部订单
-
-
-
- 清除时间
-
-
-
+
+
+
+
+
+ 全部订单
+
+
+
+ 清除时间
+
+
+
-
-
- {{ formatDateChinese(date) }}
-
-
-
-
-
- {{ index + 1 }}
- {{ item.carNum }}
- {{ item.carModel }}
-
-
-
- 业务来源:
- {{ item.customerSource }}
-
-
- 检测状态:
- {{ item.status }}
-
-
- 支付方式:
- {{ item.pay == '未支付' ? item.pay : getPayType(item.payType) }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 客户来源
+
+
+ {{ queryParams.customerSource || '请选择客户来源' }}
+
+
+
+
+
+
+
+ 车型
+
+
+ {{ goodsName || '请选择车型' }}
+
+
+
+
+
+
+
+
+ 车龄选择
+
+
+
+
+ 支付方式
+
+
+ {{ item.label }}
+
+
+
+
+
+ 检测状态
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+ .top_ {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ //position: fixed;
+ //background: coral;
+ width: 100%;
+ //margin-bottom: 1rpx;
+ }
+
\ No newline at end of file
diff --git a/pages/index/oldOrder.vue b/pages/index/oldOrder.vue
index 1ed0b44..76569de 100644
--- a/pages/index/oldOrder.vue
+++ b/pages/index/oldOrder.vue
@@ -1,1094 +1,1118 @@
-
-
-
-
-
-
-
- {{ title }}
-
-
-
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
-
-
-
-
-
- 行驶证扫描
-
-
+
+
+
+
+
+ 行驶证扫描
+
+
-
+
-
-
- 客户姓名
-
-
-
-
-
- 住址
-
-
-
-
-
-
- *
- 车牌号
-
-
-
-
-
-
- 使用性质
- 点击选择
-
-
-
-
-
-
- 品牌型号
-
-
-
-
-
- 车辆识别代号
-
-
-
-
-
-
- *
- 客户来源
- 点击选择
-
-
-
-
+
+
+ 客户姓名
+
+
+
+
+
+ 住址
+
+
+
+
+
+
+ *
+ 车牌号
+
+
+
+
+
+
+ 使用性质
+ 点击选择
+
+
+
+
+
+
+ 品牌型号
+
+
+
+
+
+ 车辆识别代号
+
+
+
+
+
+
+ *
+ 车辆注册日期
+ 点击选择
+
+
+
+
+
+
+
+ *
+ 客户来源
+ 点击选择
+
+
+
+
-
-
-
- *
- 商品选择
- 点击选择
-
-
- {{ goodstext }}
-
-
-
+
+
+
+ *
+ 商品选择
+ 点击选择
+
+
+ {{ goodstext }}
+
+
+
-
- 新旧车
- 点击选择
-
-
-
-
-
-
- 联系方式
-
-
-
-
-
- 单位
-
-
-
-
-
-
- *
- 引车员
- 点击选择
-
-
-
-
+
+ 新旧车
+ 点击选择
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+ 单位
+
+
+
+
+
+
+ *
+ 引车员
+ 点击选择
+
+
+
+
-
-
-
- *
- 选择补录时间
- 点击选择
-
-
-
-
+
+
+
+ *
+ 选择补录时间
+ 点击选择
+
+
+
+
-
+
-
- 检测流程
-
+
+ 检测流程
+
-
-
-
-
+
+
+
+
-
- 开始补录
-
-
- 确认修改
-
-
+
+ 开始补录
+
+
+ 确认修改
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
+ .xixi {
+ font-size: 12px;
+ color: #0D2E8D;
+ margin-left: 10px;
+ }
+
\ No newline at end of file
diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue
index 52949df..fcb42ab 100644
--- a/pages/staff/staff.vue
+++ b/pages/staff/staff.vue
@@ -20,7 +20,7 @@
-
+
{{ item.text }}{{ countMap.length !== 0 ? ('(' + countMap.get(getValueByText(item.text)) + ')') : '' }}
@@ -34,7 +34,6 @@
-
@@ -54,19 +53,22 @@
-
- {{ item.goodsName }}
- 车型:{{ item.goodsTitle }}
-
+
+ {{ item.goodsName }}
+ 车型:{{ item.goodsTitle }}
+
检测类型:{{ item.skuName }}
+
+ 待接车
+
-
+
客户:
@@ -77,11 +79,11 @@
电话:
{{ item.buyPhone }}
-
+
代办人电话:
@@ -95,10 +97,10 @@
- 检测内容:
+ 检测内容:
需重审项目:
{{ item.nodeNames }}
+ :style="belowStandardShow.includes(tapValue) ? 'color:red' : ''">{{ item.nodeNames }}
@@ -118,9 +120,12 @@
@click="getMeetMan();meetCarPhoto(item);showMeetMan = true" size="10">
更换人员
- 重审项目
- 查看详情
+ 查看详情
+ 创建订单
@@ -160,8 +165,8 @@
-
- 接车创建
+
+ 接车
@@ -202,6 +207,9 @@
} from "../../uni_modules/uni-forms/components/uni-forms/utils";
import upload from "@/utils/upload";
import USearch from "@/uni_modules/uview-ui/components/u-search/u-search.vue";
+ import {
+ setStorageWithExpiry
+ } from '../../utils/auth';
export default {
data() {
@@ -213,7 +221,7 @@
infoDatas: {},
openMeetCar: false,
isTriggered: false,
- selectedInfoId: undefined,
+ selectedInfo: undefined,
partnerId: uni.getStorageSync("partnerId"),
goodsTitle: '',
tapindex: 0,
@@ -259,6 +267,10 @@
text: "待检测",
value: "1"
},
+ {
+ text: "接车转订单",
+ value: "8",
+ },
{
text: "待接车",
value: "6",
@@ -294,6 +306,9 @@
beginButtonShow: ['1', '3', '4'],
cancelButtonShow: ['2'],
meetCarButtonShow: ['6'],
+ adminCanShow: ['7', '8'],
+ detailButtonNoShow: ['6', '8'],
+ belowStandardShow: ['7', '4'],
countMap: [],
csId: [],
cstb: [{
@@ -362,22 +377,32 @@
this.scrollHeight = screenHeight - topHeight;
},
//查询重审可以选择的项目
- getProject(id) {
- this.inspectionInfoId = id
+ getProject(data) {
+ this.inspectionInfoId = data.id
request({
url: '/system/info/getWeorkNodesById',
method: 'get',
params: {
- inspectionId: id
+ inspectionId: data.id
}
}).then(res => {
this.selectProject = res.data
+ // 默认勾选上不合格的项目
+ this.csId = data.nodeIds
+ console.log('this.csId', this.csId);
})
},
closehge() {
this.hge = false
this.csId = []
},
+ goMeetOrderCreate(data) {
+ //将data设置缓存
+ setStorageWithExpiry('meetCarOrderData', data, 120)
+ uni.navigateTo({
+ url: `/pages/index/Neworder?meetCarId=${data.id}`
+ })
+ },
Nnimamadewen(value, index) {
this.geindex = index
this.type = value
@@ -396,6 +421,7 @@
// 如果不存在,则添加到数组中
this.csId.push(data.id);
}
+ console.log('this.csId', this.csId);
},
/**
* 上滑加载数据
@@ -501,14 +527,15 @@
},
/** 接车拍照提交*/
- submit() {
+ submit(item) {
console.log('文件', this.fileList1)
- console.log('infoid', this.selectedInfoId)
+ console.log('infoid', this.selectedInfo)
request({
url: '/system/info/meetCarPhoto',
data: {
- inspectionInfoId: this.selectedInfoId,
+ meetCarId: this.selectedInfo.id,
remark: this.remark,
+ sourceType: this.selectedInfo.sourceType,
dealImages: this.fileList1.map(item => item.url).join(',')
},
method: 'post'
@@ -574,14 +601,14 @@
},
confirmsMeetMan(e) {
const selectedUserId = e.value[0].id
- console.log('选择的工单id', this.selectedInfoId)
+ console.log('选择的工单id', this.selectedInfo)
console.log('selectedUserId', e)
//修改接车人
request({
url: '/system/info/updateLeadMan',
method: 'post',
data: {
- id: this.selectedInfoId,
+ id: this.selectedInfo.id,
meetManId: selectedUserId
}
}).then(res => {
@@ -691,31 +718,50 @@
}
console.log('此时的tapindex', this.tapindex);
const ids = this.infoDatas.filter(item => !item.nodeNames).map(item => item.id)
- if (this.tapValue != '7') {
- if (ids && ids.length > 0) {
- const response = await request({
- url: "/partnerOwn/partner/getProjectByIds?ids=" + ids,
- method: 'get'
- })
- if (response.data) {
- const data = response.data
- this.infoDatas.forEach(item => {
- this.$set(item, 'nodeNames', data[item.id])
+ if (this.tapValue != '6') {
+ if (!this.belowStandardShow.includes(this.tapValue)) {
+ if (ids && ids.length > 0) {
+ const response = await request({
+ url: "/partnerOwn/partner/getProjectByIds?ids=" + ids,
+ method: 'get'
})
+ if (response.data) {
+ const data = response.data
+ this.infoDatas.forEach(item => {
+ this.$set(item, 'nodeNames', data[item.id])
+ })
+ }
}
- }
- } else {
- // 查询不合格的项目
- if (ids && ids.length > 0) {
- const response = await request({
- url: "/partnerOwn/partner/getProjectBelowStandardByIds?ids=" + ids,
- method: 'get'
- })
- if (response.data) {
- const data = response.data
- this.infoDatas.forEach(item => {
- this.$set(item, 'nodeNames', data[item.id])
+ } else {
+ // 查询不合格的项目
+ if (ids && ids.length > 0) {
+ const response = await request({
+ url: `/partnerOwn/partner/getProjectBelowStandardByIds`,
+ method: 'get',
+ params: {
+ ids: ids.join(','),
+ status: this.tapValue == '4' ? '3' : '',
+ type: this.tapValue == '7' ? '0' : ''
+ }
})
+ if (response.data) {
+ const data = response.data
+ this.infoDatas.forEach(item => {
+ let nodeNamesArr = []
+ let nodeIds = []
+ if (data[item.id]) {
+ data[item.id].forEach(data => {
+ nodeNamesArr.push(data.name)
+ nodeIds.push(data.id)
+ })
+ const nodeNames = nodeNamesArr.join('、')
+ this.$set(item, 'nodeNames', nodeNames)
+ this.$set(item, 'nodeIds', nodeIds)
+ console.log('数据', item);
+ }
+ })
+
+ }
}
}
}
@@ -778,7 +824,7 @@
},
/**接车拍照 */
meetCarPhoto(data) {
- this.selectedInfoId = data.id
+ this.selectedInfo = data
},
gogogo() {
uni.navigateTo({
@@ -790,6 +836,11 @@
url: '/pages/index/oldOrder'
})
},
+ gogogoMeetCarOrder() {
+ uni.navigateTo({
+ url: '/pages/index/meetCarOrder'
+ })
+ },
tapqh(index) {
//如果是待接车
if (this.tapList[index].value == '6') {
@@ -1125,8 +1176,8 @@
.bottomx {
margin: 0 auto;
- width: 225px;
- height: 46px;
+ width: 425rpx;
+ height: 76rpx;
border-radius: 6px 6px 6px 6px;
opacity: 1;
border: 1px solid #0174F6;