diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 1ad1691..5b1a5ec 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -10,20 +10,25 @@
-
-
- 任务进度:
- 30%
-
- ¥30.00元
-
-
-
- 任务进度:
- 2023.08.05
-
-
- 进入任务
+
+
+
+
+
+ 任务进度:
+ 30%
+
+ ¥30.00元
+
+
+
+ 完成时间:
+ 2023.08.05
+
+
+ 进入任务
+
+
@@ -81,15 +86,28 @@
}
}
+.bottom{
+ padding: 28rpx;
+ display: flex;
+ .b_left{
+ width: 103.39rpx;
+ height: 94.63rpx;
+ margin-right: 18rpx;
+ }
+ .b_right{
+ flex: 1;
+ display: flex;
+ justify-content: space-around;
+ flex-direction: column;
.item {
display: flex;
justify-content: space-between;
- margin: 18rpx 28rpx 0 28rpx;
-
- &:last-child {
- padding-bottom: 18rpx;
- }
-
+ // margin: 18rpx 28rpx 0 28rpx;
+
+ // &:last-child {
+ // padding-bottom: 18rpx;
+ // }
+
.left {
display: flex;
}
@@ -105,4 +123,7 @@
}
}
}
+}
+
+ }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9f89830..61c61a9 100644
--- a/pages.json
+++ b/pages.json
@@ -410,6 +410,15 @@
"navigationBarTextStyle": "white"
}
+ }, {
+ "path": "blockTransaction/blockTransaction",
+ "style": {
+ "navigationBarTitleText": "片区交易金额",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#3175f9",
+ "navigationBarTextStyle": "white"
+ }
+
}]
}],
"globalStyle": {
diff --git a/static/img/task/car.png b/static/img/task/car.png
index b53ae4f..2993b1c 100644
Binary files a/static/img/task/car.png and b/static/img/task/car.png differ
diff --git a/static/img/task/task.png b/static/img/task/task.png
new file mode 100644
index 0000000..1ab768c
Binary files /dev/null and b/static/img/task/task.png differ
diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue
new file mode 100644
index 0000000..8ec5122
--- /dev/null
+++ b/subpkg/blockTransaction/blockTransaction.vue
@@ -0,0 +1,217 @@
+
+
+
+
+ 片区当日交易额(元)
+
+ 0.00
+
+
+ 片区目标交易额(元)
+
+ 0.00
+
+
+
+ 账单流水
+
+
+ 历史账单
+
+
+
+
+
+ 交易时间:2023-06-16 18:07:59
+
+
+
+
+ 购买用户:
+ **某
+
+
+ 交易商户:
+ 通滩镇日杂百货里海云仓
+
+
+ 交易金额:
+ 40.00(元)
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpkg/dispatching/dispatching.vue b/subpkg/dispatching/dispatching.vue
index 9251583..84a568b 100644
--- a/subpkg/dispatching/dispatching.vue
+++ b/subpkg/dispatching/dispatching.vue
@@ -2,6 +2,10 @@
+
+ 在线
+ 离线
+
@@ -9,7 +13,8 @@
-
+
+
@@ -48,14 +53,46 @@