From 71aa569c95a32be32f29fda008b23b6d992d5950 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 22 Aug 2023 16:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/task.js | 6 +
components/task/taskItem.vue | 5 +-
pages.json | 2 +-
pages/oaHome/oaHome.vue | 11 +-
static/server/server.js | 30 ++---
subpkg/blockTransaction/blockTransaction.vue | 135 +++++++++++++++----
subpkg/finance/finance.vue | 9 +-
7 files changed, 139 insertions(+), 59 deletions(-)
diff --git a/api/task.js b/api/task.js
index 6ca0a7b..f163838 100644
--- a/api/task.js
+++ b/api/task.js
@@ -9,3 +9,9 @@ export const taskLists = (data) => oahttp.get('/task/lists', data)
* 任务:更新档案列表
*/
export const taskInformationgist = (data) => oahttp.get('/task/informationg_list', data)
+
+
+/**
+ * 任务:片区交易
+ */
+export const taskOrderDetail = (data) => oahttp.get('/task/order_detail', data)
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 8c7c754..dcf2e98 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -132,7 +132,10 @@
} else if (this.$props.datas.type == 32) {
// this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
this.navTo(`/subpkg/vehicle/vehicle?task_id=${this.$props.datas?.id}`)
- } else this.navTo('');
+ } else if(this.$props.datas.type == 33){
+ this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}`)
+ }
+ else this.navTo('');
}
}
}
diff --git a/pages.json b/pages.json
index d8fea38..209c365 100644
--- a/pages.json
+++ b/pages.json
@@ -462,7 +462,7 @@
"path": "blockTransaction/blockTransaction",
"style": {
"navigationBarTitleText": "任务:片区交易",
- "enablePullDownRefresh": false,
+ "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#0122C7",
"navigationBarTextStyle": "white"
}
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index a0b6d33..bbcc9c1 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -95,7 +95,7 @@
-
{{ item.text }}
@@ -196,15 +196,6 @@
data() {
return {
is_captain: 0,
- iconList: [
- "../../static/img/home/GSXX.png",
- "../../static/img/home/RYGL.png",
- "../../static/img/home/HTGL.png",
- "../../static/img/home/RWGL.png",
- "../../static/img/home/DAGL.png",
- "../../static/img/home/GRCW.png",
-
- ],
notArr: [],
orderList: [],
oaHomeData: [],
diff --git a/static/server/server.js b/static/server/server.js
index e41f7c6..da01325 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -194,59 +194,59 @@ export const quickLink = [
export const oaHomeData = [
{
text: '公司信息',
- icon: prefix + 'oa/qjsq@2x.png',
+ icon: '../../static/img/home/GSXX.png',
url: '/subpkg/companyInfo/companyInfo',
admin: true
},
{
text: '人员管理',
- icon: prefix + 'oa/ccsq@2x.png',
+ icon: '../../static/img/home/RYGL.png',
url: '/subpkg/personnel/personnel',
admin: true
},
- // {
- // text: '固定资产',
- // icon: prefix + 'oa/wcsq@2x.png',
- // url: '/subpkg/fixedAssets/fixedAssets',
- // admin: true
- // },
+ {
+ text: '固定资产',
+ icon: '../../static/img/home/GDZC.png',
+ url: '/subpkg/fixedAssets/fixedAssets',
+ admin: true
+ },
{
text: '合同管理',
- icon: prefix + 'oa/cgsq@2x.png',
+ icon: '../../static/img/home/HTGL.png',
url: '/subpkg/contract/contract'
},
// {
// text: '公司管理',
- // icon: prefix + 'oa/bxsq@2x.png',
+ // icon: '../../static/img/home/GSXX.png',
// url: '/subpkg/companyAdmin/companyAdmin',
// admin: true
// },
{
text: '任务管理',
- icon: prefix + 'oa/bxsq@2x.png',
+ icon: '../../static/img/home/RWGL.png',
url: '/subpkg/taskAdmin/taskAdmin',
},
{
text: '档案管理',
- icon: prefix + 'oa/bxsq@2x.png',
+ icon: '../../static/img/home/DAGL.png',
url: '/subpkg/captain/captain',
admin: true
},
{
text: '档案管理',
- icon: prefix + 'oa/bxsq@2x.png',
+ icon: '../../static/img/home/DAGL.png',
url: '/subpkg/archives/archives',
captain: true
},
// {
// text: '片区经理',
- // icon: prefix + 'oa/yzsq@2x.png',
+ // icon: '../../static/img/home/GRCW.png',
// url: '/pages/oaManager/oaManager',
// admin: true
// },
{
text: '个人财务',
- icon: prefix + 'oa/gengduo@2x.png',
+ icon: '../../static/img/home/GRCW.png',
url: '/subpkg/finance/finance'
},
// {
diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue
index 1c9969f..0e774e6 100644
--- a/subpkg/blockTransaction/blockTransaction.vue
+++ b/subpkg/blockTransaction/blockTransaction.vue
@@ -2,28 +2,32 @@
- 片区当日交易额(元)
+ 当日完成金额(元)
- 0.00
+ {{card.total_price.toFixed(2)}}
- 片区目标交易额(元)
+ 目标完成金额(元)
- 0.00
+ {{card.day_money.toFixed(2)}}
-
+
+
+
+ 日账单
+ 月账单
历史账单
-
+ -->
+
+
-
+
+
+
+ 账单日期：{{item.create_time}}
+
+
+ 订单编号：{{item.order_sn}}
+ 交易额: {{item.total_price}}
+
-
+
@@ -87,7 +147,7 @@
margin: 28rpx auto;
width: 694rpx;
height: 158rpx;
- background: #3175F9;
+ background: #0122c7;
border-radius: 18rpx 18rpx 18rpx 18rpx;
opacity: 1;
padding: 28rpx;
@@ -134,7 +194,7 @@
border-radius: 10rpx;
margin-right: 10rpx;
display: inline-block;
- background-color: #3175F9;
+ background-color: #0122c7;
}
}
@@ -146,11 +206,11 @@
}
.active {
- color: #3175F9;
+ color: #0122c7;
}
}
}
-
+
.list {
.item {
margin: 0 auto;
@@ -161,50 +221,54 @@
border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1;
padding: 28rpx;
-
+
.top {
margin-bottom: 28rpx;
font-size: 25rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
-
+
&:before {
display: inline-block;
- content: '交易信息';
+ content: '交易明细';
width: 137rpx;
height: 49rpx;
line-height: 49rpx;
text-align: center;
- background: #3274F9;
+ background: #FF7C32;
border-radius: 26rpx 26rpx 26rpx 26rpx;
color: #fff;
margin-right: 28rpx;
}
}
-
+
.bottom {
display: flex;
justify-content: space-between;
-
+
.text {
font-size: 25rpx;
font-weight: 400;
color: #999999;
line-height: 39rpx;
- .t_item{
+
+ .t_item {
display: flex;
- &:nth-child(1){
+
+ &:nth-child(1) {
margin-bottom: 16rpx;
}
- .tips{
+
+ .tips {
font-size: 28rpx;
font-weight: 400;
color: #333333;
}
}
}
- .price{
+
+ .price {
display: flex;
align-items: center;
font-size: 32rpx;
@@ -212,6 +276,21 @@
color: #F02828;
}
}
+
+ .t_bottom {
+ font-size: 25rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ display: flex;
+ justify-content: space-between;
+ flex-wrap: wrap;
+
+ .price {
+ color: #FF7C32;
+ flex-shrink: 0;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 73a4d34..0b23047 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -299,12 +299,13 @@
// background-color: red;
display: flex;
justify-content: space-between;
+ width: auto;
line-height: 44px;
- .name{
- margin-left: 20rpx;
- }
- }
+ .name {
+ margin-left: 20rpx;
+ }
+ }
.left {
display: flex;