diff --git a/api/newTask.js b/api/newTask.js
index 2864f64..a24ca8a 100644
--- a/api/newTask.js
+++ b/api/newTask.js
@@ -3,4 +3,8 @@ import oahttp from "@/utils/oahttp.js";
/**
* 公告列表
*/
-export const getTradeTaskInfo = (data) => oahttp.get('/user/getTradeTaskInfo', data)
\ No newline at end of file
+export const getTradeTaskInfo = (data) => oahttp.get('/user/getTradeTaskInfo', data)
+// 收单消费金额详情
+export const getFirstOrderLog = (data) => oahttp.get('/user/getFirstOrderLog', data)
+// 收益明细
+export const account_log = (data) => oahttp.get('/account_log/lists', data)
\ No newline at end of file
diff --git a/components/logistiComptent/logistiCard/logistiBriefCard.vue b/components/logistiComptent/logistiCard/logistiBriefCard.vue
index 61cd236..227c265 100644
--- a/components/logistiComptent/logistiCard/logistiBriefCard.vue
+++ b/components/logistiComptent/logistiCard/logistiBriefCard.vue
@@ -1,13 +1,39 @@
-
-
- 取货点: {{goodsInfo.shop_name}}
+
+
+
+ 订单编号: {{goodsInfo.order_sn}}
+
+ {{goodsInfo.status==0?"待取货":"待配送"}}
-
+
+
+ 取 {{goodsInfo.shop_name}}
+
+
+ {{goodsInfo.shop_address}}
+
+
+ 送 {{ fuzzyName(goodsInfo.receiver_name) }} {{goodsInfo.receiver_phone}}
+
+
+ {{goodsInfo.receiver_address}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/oaHome/accountLog.vue b/pages/oaHome/accountLog.vue
new file mode 100644
index 0000000..f2a7fe8
--- /dev/null
+++ b/pages/oaHome/accountLog.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/oaHome/homeTaskDetail.vue b/pages/oaHome/homeTaskDetail.vue
index 7020374..f7aef88 100644
--- a/pages/oaHome/homeTaskDetail.vue
+++ b/pages/oaHome/homeTaskDetail.vue
@@ -10,18 +10,10 @@
{{taskDetail.content }}
-
-
完成时间: {{taskDetail.end_time}}
-
-
-
-
-
-
diff --git a/pages/oaHome/new_file.vue b/pages/oaHome/new_file.vue
new file mode 100644
index 0000000..661adab
--- /dev/null
+++ b/pages/oaHome/new_file.vue
@@ -0,0 +1,1001 @@
+
+
+
+
+
+
+
+
+
+
+ {{managerInfo.manager_name}}
+
+
+
+
+ {{managerInfo.msg_num}}
+
+
+
+
+
+
+
+
+
+
+ 工作管理
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 配送信息
+ 更多
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无配送信息
+ 登录后查看配送信息详情
+
+
+
+
+
+
+ 登录里海OA,开启线上便捷办公
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 19b5bbf..d3b55c5 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,6 +1,10 @@
+
+
+
@@ -19,92 +23,41 @@
-
-
-
+
+
+
-
- 押金
+
+ {{item.title}}
- {{myOaInfo.deposit}}
+ {{item.unit||''}}{{myOaInfo[item.value]}}
-
-
+
+
+
+
-
- 管理户数
+
+ {{item.title}}
- {{myOaInfo.user_information_count}}户
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
- {{myOaInfo.invite_code}}
+ {{item.unit||''}}{{myOaInfo[item.value]}}
-
+
-
+
我的任务
@@ -126,7 +79,29 @@
+
+
+
+
+
+ 配送信息
+
+
+
+
+
+
+
+
+
+
+
+
@@ -244,9 +219,9 @@
@@ -688,7 +728,7 @@
position: relative;
padding-left: 20rpx;
font-size: 30rpx;
- margin-bottom: 20rpx;
+ // margin-bottom: 20rpx;
color: #1A1A1A;
}
@@ -808,6 +848,21 @@
}
}
+ .logisti {
+ .logisti-head {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .serch {
+ background-color: #EDF0F6;
+ height: 60rpx;
+ border-radius: 29rpx 29rpx 29rpx 29rpx;
+ transition: 500ms;
+ }
+ }
+ }
+
// .oa_home {
// padding-bottom: 100rpx;
// }