From 18fea32751366467e41fad2a3251d65dd615ad66 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 19 Oct 2024 16:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                             | 10 ++++++++
 common.scss                            |  4 ++++
 pages/index/keepAccounts.vue           | 44 +++++++++++++++++++++++++---------
 pages_order/kepp/AnnualExpenditure.vue | 16 +++++++++++--
 4 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/api/api.js b/api/api.js
index 9456982..715dedf 100644
--- a/api/api.js
+++ b/api/api.js
@@ -137,6 +137,16 @@ const config = {
 		url: '/api/common/queryBills',
 		method: 'GET',
 	},
+	//个人记工-在建项目
+	commonQueryStrartJobList: {
+		url: '/api/common/queryStrartJobList',
+		method: 'GET',
+	},
+	//个人记工-在建项目
+	commonQueryStrartJobLists: {
+		url: '/api/common/queryStrartJobLists',
+		method: 'GET',
+	},
 	
 	
 	/**
diff --git a/common.scss b/common.scss
index 405c309..3297d79 100644
--- a/common.scss
+++ b/common.scss
@@ -50,4 +50,8 @@
 	background-color: #EFF2F1;
 	font-size: 24rpx;
 	border-radius: 10rpx;
+}
+
+.uv-tags__text{
+	font-size: 24rpx !important;
 }
\ No newline at end of file
diff --git a/pages/index/keepAccounts.vue b/pages/index/keepAccounts.vue
index d53d00c..3904cbe 100644
--- a/pages/index/keepAccounts.vue
+++ b/pages/index/keepAccounts.vue
@@ -2,7 +2,10 @@
 	<view class="page">
 		<navbar title="记工记账" />
 		<view class="page-tag">
-			<uv-tabs :list="list" lineWidth="55" lineHeight="8" :activeStyle="{
+			<uv-tabs :list="tabs" 
+			@click="clickTabs"
+			lineWidth="55" 
+			lineHeight="8" :activeStyle="{
 				color: '#3796F8',
 			}" :inactiveStyle="{
 				color: '#999999',
@@ -18,7 +21,8 @@
 					</view>
 				</view>
 			</view>
-			<view class="page-picture-img" @click="$utils.navigateTo('/pages_order/kepp/AnnualExpenditure')">
+			<view class="page-picture-img" 
+			@click="$utils.navigateTo('/pages_order/kepp/AnnualExpenditure')">
 				<view class="page-picture-group">
 					<image src="../../static/image/keepAccounts/wallet.png" mode="aspectFit" />
 					<view>全年收支</view>
@@ -34,7 +38,7 @@
 			</view>
 		</view>
 		<view style="font-weight: 500; margin-top: 20rpx;">
-			<uv-tabs :list="list" lineWidth="0" lineHeight="0" :activeStyle="{
+			<uv-tabs :list="tabsSatus" lineWidth="0" lineHeight="0" :activeStyle="{
 				color: '#3796F8',
 			}"></uv-tabs>
 		</view>
@@ -76,19 +80,33 @@
 
 <script>
 	import tabber from '@/components/base/tabbar.vue'
-
+	import mixinList from '@/mixins/list.js'
 	export default {
+		mixins : [mixinList],
 		components: {
 			tabber,
 		},
 		data() {
 			return {
-				list: [{
-					name: '个人记工',
-				}, {
-					name: '班组记工',
-				}],
-				show: false
+				tabs: [
+					{
+						name: '个人记工',
+					}, 
+					{
+						name: '班组记工',
+					},
+				],
+				tabsSatus : [
+					{
+						name: '在建项目',
+					}, 
+					{
+						name: '结束项目',
+					},
+				],
+				show: false,
+				mixinsListApi : 'commonQueryStrartJobLists',
+				apiType : '',
 			}
 		},
 		computed: {
@@ -100,7 +118,11 @@
 		methods: {
 			isShohw(){
 				this.show = false
-			}
+			},
+			clickTabs({index}){
+				this.apiType = index ? 's' : ''
+				this.getData()
+			},
 		}
 	}
 </script>
diff --git a/pages_order/kepp/AnnualExpenditure.vue b/pages_order/kepp/AnnualExpenditure.vue
index 0451c83..34d12f2 100644
--- a/pages_order/kepp/AnnualExpenditure.vue
+++ b/pages_order/kepp/AnnualExpenditure.vue
@@ -34,7 +34,10 @@
 				</view>
 			</view>
 			<view class="cell" style="margin-top: 40rpx;">
-				<uv-cell v-for="(item,index) in 10" label="2024-01-23 11：30：22" title="佣金收入" value="+199.00"></uv-cell>
+				<uv-cell v-for="(item,index) in list" 
+				:label="item.billDate" 
+				title="佣金收入" 
+				:value="item.amount"></uv-cell>
 			</view>
 		</view>
 
@@ -42,9 +45,18 @@
 </template>
 
 <script>
+	import mixinList from '@/mixins/list.js'
 	export default {
+		mixins : [mixinList],
 		data() {
-			return {}
+			return {
+				mixinsListApi : 'commonQueryBill',
+				apiType : '',
+			}
+		},
+		onLoad({apiType}) {
+			this.apiType = apiType
+			this.mixinsListApi += apiType || ''
 		},
 		onShow() {},
 		methods: {