From 3c01f5630490a8d382c922c861cf4a0128d4ad5e Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sun, 21 Jan 2024 18:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=B5=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/newTask.js                                |    6 +-
 .../logistiCard/logistiBriefCard.vue          |  109 +-
 config/app.js                                 |   12 +-
 pages.json                                    |   18 +
 pages/logistics/deliveryDetil.vue             |   18 +-
 pages/oaHome/FirstOrderLog.vue                |   79 ++
 pages/oaHome/accountLog.vue                   |   73 ++
 pages/oaHome/homeTaskDetail.vue               |    8 -
 pages/oaHome/new_file.vue                     | 1001 +++++++++++++++++
 pages/oaHome/oaHome.vue                       |  353 +++---
 10 files changed, 1493 insertions(+), 184 deletions(-)
 create mode 100644 pages/oaHome/FirstOrderLog.vue
 create mode 100644 pages/oaHome/accountLog.vue
 create mode 100644 pages/oaHome/new_file.vue

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 @@
 <template>
-	<view class="card">
-		<view class="tit" @click.stop="goDetil(goodsInfo.id)">
-			<view v-if="goodsInfo.status==0">取货点:&nbsp;&nbsp;{{goodsInfo.shop_name}}</view>
+	<view class="card" @click.stop="goDetil(goodsInfo.id)">
+		<view class="title">
+			<!-- <view v-if="goodsInfo.status==0">取货点:&nbsp;&nbsp;{{goodsInfo.shop_name}}</view>
 			<view v-else>收货人:&nbsp;&nbsp;{{ fuzzyName(goodsInfo.receiver_name) }}</view>
 			<view style="float: right;">
 				<u-icon name="arrow-right" color="black" size="20"></u-icon>
+			</view> -->
+			<view>订单编号:&nbsp;&nbsp;{{goodsInfo.order_sn}}</view>
+			<view class='status' :style="{color:goodsInfo.status==0?'#2B63E3':'#FF8056'}">
+				{{goodsInfo.status==0?"待取货":"待配送"}}
 			</view>
 		</view>
-		<view class="content" @click.stop="goDetil(goodsInfo.id)">
+		<view class="content">
+			<view class="">
+				<text class="logo">取</text> <text class='shop-address'>{{goodsInfo.shop_name}}</text>
+			</view>
+			<view class="detail-address">
+				{{goodsInfo.shop_address}}
+			</view>
+			<view class="" style="margin-top: 20rpx;">
+				<text class="logo" style="background-color: #FF8056;">送</text> <text
+					class='shop-address'>{{ fuzzyName(goodsInfo.receiver_name) }} {{goodsInfo.receiver_phone}} </text>
+			</view>
+			<view class="detail-address">
+				{{goodsInfo.receiver_address}}
+			</view>
+		</view>
+		<view class="foot">
+			<!-- <text>商品数量: 共计 <text :style="{color:goodsInfo.status==0?'#FF8056':'#2B63E3'}">6</text>件</text> -->
+			<text></text>
+			<view class="detail-btn">
+				查看详情
+			</view>
+		</view>
+		<!--<view class="content" @click.stop="goDetil(goodsInfo.id)">
 			<view v-if="goodsInfo.status==0">
 				<view class="address">店主姓名:&nbsp;&nbsp;{{goodsInfo.shop_user}}</view>
 				<view @click.stop="callFn(goodsInfo.shop_phone)" class="address">
@@ -37,7 +63,7 @@
 			<u-button type="primary" style="background-color: #FF7C32; border: 0;"><u-icon v-if="!is_captain"
 					name="car-fill" color="white" size="25" style="margin-right: 10rpx;"></u-icon> <text
 					v-if="!is_captain">待配送/</text>点击查看</u-button>
-		</view>
+		</view> -->
 	</view>
 </template>
 <script>
@@ -82,25 +108,59 @@
 
 <style lang="scss" scoped>
 	.card {
-		width: 92vw;
-		height: AUTO;
+		width: 690rpx;
+		box-shadow: 0.5rpx 0.5rpx 200rpx 0.5rpx rgba(0, 0, 0, 0.1);
+		// height: AUTO;
+		// padding: 20rpx;
+		margin-top: 20rpx;
 		background-color: #fff;
 		overflow: hidden;
-		border-radius: 2vw;
+		border-radius: 20rpx;
 		box-sizing: border-box;
 		margin-bottom: 30rpx;
 
-		.tit {
-			border-bottom: 3px solid #F5F5F5;
+		.title {
+			border-bottom: 2rpx solid #F5F5F5;
 			font-size: 30rpx;
-			font-weight: bold;
-			padding: 20rpx 15rpx;
 			display: flex;
-			justify-content: space-between
+			justify-content: space-between;
+			font-size: 24rpx;
+			padding: 30rpx;
+
+			.status {
+				float: right;
+				font-size: 28rpx;
+				color: #2B63E3;
+				font-weight: 700;
+			}
 		}
 
 		.content {
-			padding: 20rpx 15rpx;
+			padding: 20rpx 30rpx;
+			border-bottom: 2rpx solid #F5F5F5;
+
+			.logo {
+				display: inline-block;
+				padding: 0 2rpx;
+				background-color: #2B63E3;
+				color: white;
+				border-radius: 10rpx;
+				font-size: 22rpx;
+
+			}
+
+			.shop-address {
+				display: inline-block;
+				margin-left: 20rpx;
+				font-weight: bold;
+				font-size: 26rpx;
+			}
+
+			.detail-address {
+				color: #7A7A7A;
+				font-size: 24rpx;
+				padding-left: 42rpx;
+			}
 
 			.address {
 				margin: 10rpx 0;
@@ -113,5 +173,26 @@
 			}
 		}
 
+		.foot {
+			border-bottom: 2rpx solid #F5F5F5;
+			font-size: 24rpx;
+			display: flex;
+			justify-content: space-between;
+			padding: 30rpx;
+			color: #1A1A1A;
+
+			.detail-btn {
+				color: #2B63E3;
+				font-size: 24rpx;
+				width: 144rpx;
+				height: 44rpx;
+				text-align: center;
+				line-height: 40rpx;
+				border: 1px solid #2B63E3;
+				border-radius: 22rpx 22rpx 22rpx 22rpx;
+
+			}
+		}
+
 	}
 </style>
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index b20792a..c0cc5d3 100644
--- a/config/app.js
+++ b/config/app.js
@@ -2,8 +2,8 @@ let httpApiThree;
 let httpApi; // 总域名
 let httpApiTwo; // 物流系统域名
 
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew';    // 预上线
 // const env = 'local'; // 本地
 
@@ -19,14 +19,14 @@ switch (env) {
 		httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
 		break;
 	case 'local':
-		httpApi = 'http://192.168.1.24:8083' //预上线
-		httpApiThree = 'http://192.168.1.24:8083' //预上线
-		httpApiTwo = 'http://192.168.1.24:8083' //预上线
+		httpApi = 'http://192.168.1.25:8083' //预上线
+		httpApiThree = 'http://192.168.1.25:8083' //预上线
+		httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
 		break;
 	default:
 		httpApi = 'https://ceshi-new-wokr.lihaink.cn/' //测试
 		httpApiThree = 'https://ceshi-new-wokr.lihaink.cn/' //测试
-		httpApiTwo = 'https://ceshi-new-wokr.lihaink.cn/' //测试环境
+		httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
 		//测试环境
 }
 
diff --git a/pages.json b/pages.json
index 1c96125..d98cf32 100644
--- a/pages.json
+++ b/pages.json
@@ -21,6 +21,24 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/oaHome/FirstOrderLog",
+			"style": {
+				"navigationBarTitleText": "首笔消费金额",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaHome/accountLog",
+			"style": {
+				"navigationBarTitleText": "收益明细",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path": "pages/oaLogin/oaLogin",
 			"style": {
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index e9b49a1..46093b7 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -177,12 +177,21 @@
 				let that = this
 				//#ifdef APP
 				uni.getLocation({
-					type: 'gcj02',
+					type: 'wgs84',
 					geocode: true,
 					isHighAccuracy: true,
 					success: function async (res) {
-						that.nowAddress = res.address.city + res.address.district + res.address.street + res
-							.address.streetNum + res.address.poiName
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						uni.request({
+							url: `https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=${res.longitude},${res.latitude}&key=976a447183ed0d384e1c5b6448b8a75d&radius=1000&extensions=all`, //仅为示例，并非真实接口地址。
+							success: (res) => {
+								// that.address = res.data.regeocode.formatted_address
+								that.nowAddress = res.data.regeocode.formatted_address
+								// console.log();
+							}
+						});
 
 						that.markers[1].latitude = res.latitude
 						that.markers[1].longitude = res.longitude
@@ -289,9 +298,7 @@
 			getDriverLine() {
 				const that = this;
 				const key = "997c9a3d88154fa78f4d28bebc1dd84f";
-
 				const origin = `${this.markers[1].longitude},${this.markers[1].latitude}`;
-
 				const destination = `${this.markers[0].longitude},${this.markers[0].latitude}`;
 				uni.request({
 					// url: `https://restapi.amap.com/v3/direction/walking?key=${key}&origin=105.43639400000002,28.908854&destination=105.439304,28.908447`,
@@ -340,7 +347,6 @@
 				// uni.navigateBack()
 				// return
 				let that = this
-				console.log(6666)
 				uni.scanCode({
 					onlyFromCamera: true,
 					success: function(res) {
diff --git a/pages/oaHome/FirstOrderLog.vue b/pages/oaHome/FirstOrderLog.vue
new file mode 100644
index 0000000..d737a38
--- /dev/null
+++ b/pages/oaHome/FirstOrderLog.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="card">
+
+		<view class="li" v-for="item,index in orderList.lists" :key='index'>
+			<view class="">
+				订单编号: {{item.order_no}}
+			</view>
+			<view class="">
+				订单金额: <text style="color: #FF4141;">{{item.order_money}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getFirstOrderLog,
+	} from "@/api/newTask.js"
+	export default {
+		data() {
+			return {
+				orderList: [],
+				flag: false,
+				status: "",
+				page_no: 0,
+				page_size: 20
+			}
+		},
+		methods: {
+			async getFirstOrderLogList() {
+				let res = await getFirstOrderLog()
+				console.log(res)
+				this.orderList = res.data
+
+			}
+		},
+		mounted() {
+			this.getFirstOrderLogList()
+		},
+		// onReachBottom() {
+		// 	if (this.flag) return
+		// 	let {
+		// 		page_no,
+		// 		page_size
+		// 	} = this
+		// 	let that = this
+		// 	this.status = "loading"
+		// 	page_no += 1
+		// 	this.flag = true
+		// 	getFirstOrderLog({
+		// 		page_no,
+		// 		page_size
+		// 	}).then(res => {
+		// 		that.orderList = that.orderList.concat(res.data)
+		// 		this.flag = false
+		// 		if (!res.data.data.length) {
+		// 			this.status = "nomore"
+		// 			this.flag = true
+		// 		}
+		// 	})
+		// },
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		width: 690rpx;
+		margin: 30rpx auto;
+		background-color: #fff;
+		padding: 20rpx;
+		border-radius: 29rpx;
+
+		.li {
+			margin: 20rpx;
+			font-size: 28rpx;
+
+		}
+	}
+</style>
\ 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 @@
+<template>
+	<view class="card">
+		<u-tag :text="item.remark" type="success" plain v-for="item,index in orderList" :key='index' class="li"></u-tag>
+		<u-loadmore :status="status" />
+	</view>
+</template>
+
+<script>
+	import {
+		account_log,
+	} from "@/api/newTask.js"
+	export default {
+		data() {
+			return {
+				orderList: [],
+				flag: false,
+				status: "loadmore",
+				page_no: 2,
+				page_size: 20,
+			}
+		},
+		methods: {
+			async getFirstOrderLogList() {
+				let res = await account_log({
+					page_no: 1,
+					page_size: 20
+				})
+				this.orderList = res.data.lists
+			}
+		},
+		mounted() {
+			this.getFirstOrderLogList()
+		},
+		onReachBottom() {
+			if (this.flag) return
+			let {
+				page_no,
+				page_size
+			} = this
+			let that = this
+			this.status = "loading"
+			this.page_no += 1
+			this.flag = true
+			account_log({
+				page_no,
+				page_size
+			}).then(res => {
+				that.orderList = that.orderList.concat(res.data.lists)
+				this.flag = false
+				if (!res.data.lists.length) {
+					this.status = "nomore"
+					this.flag = true
+				}
+			})
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		width: 690rpx;
+		margin: 30rpx auto;
+		background-color: #fff;
+		padding: 20rpx;
+		border-radius: 29rpx;
+
+		.li {
+			margin: 20rpx;
+			font-size: 28rpx;
+
+		}
+	}
+</style>
\ 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 @@
 		</view>
 		<view class="content">
 			{{taskDetail.content }}
-
-
 			<view class="time">
 				完成时间: {{taskDetail.end_time}}
 			</view>
 		</view>
-
-
-
-
-
-
 	</view>
 
 
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 @@
+<template>
+	<view class="oa_home" style="oaColor">
+		<!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
+		<!-- <u-navbar @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
+        leftIconColor=" #fff" :autoBack="false">
+    </u-navbar> -->
+		<view class="home_header" :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''">
+			<view style="
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          overflow: hidden;
+          border-radius: 0 0 30rpx 30rpx;
+        ">
+				<hx-lottie :options="options" ref="lottie" style="
+            width: 100vw;
+            height: 440rpx;
+            transform: scale(1.2);
+            background-color: #0122c7;
+          " />
+			</view>
+			<!-- #ifdef APP-PLUS||H5 -->
+			<view style="height: var(--status-bar-height)"></view>
+			<view v-if="uniMP" style="height: 44px">
+				<u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
+			</view>
+			<view v-else style="height: 30rpx"></view>
+			<!-- <view v-if="uniMP" style="height: 44px;"></view> -->
+			<!-- #endif -->
+			<view class="my_info">
+				<view v-if="!$store.state.app.token" @click="login" class="mesg_box">
+					<view class="name">
+						<text class="nickname">立即登录</text>
+					</view>
+					<view class="duty"> 登录后可查看更多 </view>
+				</view>
+				<view class="head_img">
+					<view class="img_box">
+						<u--image :showLoading="true" width="131.43rpx" height="131.43rpx" class="img_box_img"
+							:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
+					</view>
+
+					<text class="head_text">工作证: {{ myOaInfo.nickname }}</text>
+					<text class="head_text" style="flex-shrink: 0">身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }}</text>
+				</view>
+			</view>
+
+			<!-- 占位 -->
+			<view style="height: 150rpx"></view>
+
+			<view class="backlog" :class="!ApproveList.length > 0 ? 'backlog_no_data' : ''">
+				<view class="head_title flex_a_c_j_sb">
+					<view class="title">公告列表</view>
+					<view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')">更多
+						<view class="iconfont icon-you">
+							<uni-icons type="forward"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<block v-if="ApproveList.length > 0">
+					<view class="backlog_item flex_a_c_j_sb" v-for="(item, index) in ApproveList.slice(0, 2)"
+						:key="index" @click="clickNotice(item.id)">
+						<view class="text">
+							<text class="text_time">{{
+                item.create_time.substring(0, 10).replace(/-/g, ".")
+              }}</text>
+							{{ item.title }}
+						</view>
+
+						<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+					</view>
+				</block>
+				<view v-else class="backlog_no flex_a_c_j_sb">
+					<view class="text">暂无更多消息</view>
+					<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+				</view>
+			</view>
+		</view>
+		<!-- 片区经理聊天 -->
+		<view class="chat" @click="navTo('/subpkg/chatMang/index')" style="margin-top: 130rpx;">
+			<view class="chat-l">
+				<u--image shape="circle" :showLoading="true" :src="managerInfo.manager_avatar" width="91rpx"
+					height="91rpx"></u--image>
+				<view class="" style="margin-left: 40rpx;">
+					{{managerInfo.manager_name}}
+				</view>
+			</view>
+			<view class="" style="display: flex;">
+				<view class="brange" v-if="managerInfo.msg_num">
+					{{managerInfo.msg_num}}
+				</view>
+				<view class="iconfont icon-you">
+					<uni-icons type="forward"></uni-icons>
+				</view>
+			</view>
+
+		</view>
+
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title" @click="leftClick">工作管理</view>
+				<!-- <view class="flex_a_c"
+          >更多
+          <view class="iconfont icon-you">
+            <uni-icons type="forward"></uni-icons>
+          </view>
+        </view> -->
+			</view>
+		</view>
+
+		<view class="fast_track">
+			<block v-for="(item, index) in oaHomeData" :key="item.id">
+				<view class="track_item" @click="navTwo(item.paths, index)">
+					<image :src="item.icon" mode="aspectFit" style="width: 77rpx;height: 77rpx;">
+					</image>
+					<view class="title">{{ item.name }}</view>
+				</view>
+			</block>
+		</view>
+
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title">配送信息</view>
+				<view class="flex_a_c" @click="goOrderList">更多
+					<view class="iconfont icon-you">
+						<uni-icons type="forward"></uni-icons>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="orderList.length > 0">
+				<globalPopup ref="globalPopup"></globalPopup>
+				<logistiBriefCard v-for="(item, index) in orderList" :key="index" :goodsInfo="item">
+				</logistiBriefCard>
+				<u-loadmore :status="status" />
+			</view>
+
+			<view v-else class="no_task">
+				<view class="title">暂无配送信息</view>
+				<view class="tips" v-if="!$store.state.app.token">登录后查看配送信息详情</view>
+			</view>
+			<!-- <view class="head_title flex_a_c_j_sb">
+        <view class="">我的任务</view>
+        <view class="flex_a_c" @click="test">更多 <view class="iconfont icon-you"></view>
+        </view>
+      </view>
+      <block v-for="(item,index) in myTaskList" :key="index">
+        <view class="task_list" @click="naviTaskDetails(item.id)">
+          <view class="title flex_a_c_j_sb">
+            <view class="flex_a_c">
+              <view v-if="item.priority==4" class="tag">{{ item.priority_name }}</view>
+              <view v-else class="tag1">{{ item.priority_name }}</view>
+              <view class="text">{{ item.title }}</view>
+            </view>
+            <view v-if="item.flow_status==1" class="if_take take1">{{ item.flow_name }}</view>
+            <view v-else-if="item.flow_status==2" class="if_take take2">{{ item.flow_name }}</view>
+            <view v-else="item.flow_status==3" class="if_take take3">{{ item.flow_name }}</view>
+          </view>
+          <view class="describe">{{ item.content }}</view>
+          <view class="task_deta flex_a_c_j_sb">
+            <view class="">任务性质：{{ item.is_bug }}</view>
+            <view class="">计划完成日期：{{ item.end_time }}</view>
+          </view>
+        </view>
+      </block> -->
+		</view>
+
+		<view class="no_login" @click="login" v-if="!$store.state.app.token">
+			<view class="view">
+				<view class="text">登录里海OA,开启线上便捷办公</view>
+				<button class="btn">立即登录</button>
+			</view>
+		</view>
+		<!-- <tabbar></tabbar> -->
+	</view>
+</template>
+
+<script>
+	import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue";
+	import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue";
+	import {
+		getList
+	} from "@/api/logistics.js";
+	import {
+		Toast
+	} from "@/libs/uniApi.js";
+	import {
+		oaHomeData
+	} from "@/static/server/server.js";
+	import {
+		noticeList
+	} from "@/api/notice.js";
+	import {
+		getAreaManagerApi
+	} from "@/api/bussness.js"
+	// import tabbar from '../components/tabbar'
+	import {
+		getIndexListAPI,
+		getTaskListAPI,
+		getMyTaskListAPI,
+		getApproveListAPI,
+		getUserIndexAPI,
+	} from "@/api/oaApi.js";
+	import {
+		mapState
+	} from 'vuex';
+	import bj from "@/static/animation/home.json"
+	import {
+		userInfo
+	} from "@/api/oaUser.js"
+	//#ifdef APP-PLUS
+	var jpushModule = uni.requireNativePlugin("JG-JPush");
+	// #endif
+	export default {
+		components: {
+			// tabbar
+			logistiBriefCard,
+			globalPopup,
+		},
+		data() {
+			return {
+
+				brange: 0,
+				options: {
+					data: '',
+				},
+				status: "loadmore",
+				page_num: 1,
+				flag: false,
+				uniMP: false,
+				managerInfo: {},
+				id: "",
+				is_captain: 0,
+				notArr: [],
+				orderList: [],
+				oaHomeData: [],
+				src: "https://cdn.uviewui.com/uview/album/1.jpg",
+				assessData: [{
+						num: "0",
+						name: "任务",
+					},
+					{
+						num: "0",
+						name: "已完成",
+					},
+					{
+						num: "0",
+						name: "未完成",
+					},
+					{
+						num: "0%",
+						name: "完成率",
+					},
+				],
+				project: {},
+				task: {},
+				page: 1,
+				myTaskList: [],
+				flowState: "#47B347", // 任务状态
+				priority: "", // 任务紧急度
+				myOaInfo: {
+					avatar: "",
+					nickname: "",
+					mobile: "",
+					did_name: "",
+					label_name: "",
+				},
+				ApproveList: [],
+				showOaHomeData: false, //更新首页计算的值
+			};
+		},
+		async onLoad() {
+			// console.log('asdashg')
+			if (uni.getStorageSync('USER_INFO')) {
+				let userData = JSON.parse(uni.getStorageSync('USER_INFO'))
+
+				this.initUserInfo(userData);
+				// console.log(545)
+			}
+			console.log(7787878)
+			await this.$onLaunched;
+			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain
+			this.options.data = bj;
+
+			//#ifdef APP-PLUS
+			let that = this;
+			jpushModule.addNotificationListener(function(result) {
+				if (!that.notArr.includes(result.messageID)) {
+					// that.$refs.globalPopup.showPopu();
+					that.getOrderList();
+					console.log("idnex的");
+					that.notArr.push(result.messageID);
+				}
+			});
+			// #endif
+
+
+
+
+		},
+		onReachBottom() {
+			if (this.flag) return
+			let that = this
+			this.status = "loading"
+			this.page_num += 1
+			this.flag = true
+			getList({
+				status: this.curNow,
+				user_id: this.id,
+				keywords: this.keywords,
+				user_type: this.is_captain,
+				page_num: this.page_num
+			}).then(res => {
+				that.orderList = that.orderList.concat(res.data.data)
+				this.flag = false
+				if (!res.data.data.length) {
+					this.status = "nomore"
+					this.flag = true
+				}
+			})
+		},
+		async onShow() {
+			let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id
+			this.getOrderList();
+			console.log("show")
+			// getAreaManagerApi({
+			// 	user_id
+			// }).then(res => {
+			// 	// console.log(res.data)
+			// 	this.managerInfo = res.data
+			// })
+			await this.$onLaunched;
+			if (uni.getStorageSync('uniMP')) this.uniMP = true;
+			userInfo().then(({
+				data
+			}) => {
+				this.$store.commit('setUserInfo', data);
+				this.initUserInfo(data);
+				this.$store.dispatch('initConfig');
+				// console.log('更新信息', data);
+			});
+			this.getApproveList();
+			this.initUserInfo();
+			this.showToask();
+			// this.initOaHomeDada();
+			//#ifdef APP-PLUS
+			this.noticeFn();
+			// #endif
+			// console.log(this.oaHomeData, this.oaHomeData.length==0);
+			if (this.oaHomeData.length == 0) {
+				this.$nextTick(() => {
+					this.$store.dispatch('initConfig');
+				})
+			}
+		},
+		computed: {
+			// oaHomeData() {
+			//   const route = '/pages/oaHome/oaHome';
+			//   let arr = [];
+			//   this.$store.state.config?.config?.menu?.forEach((item) => {
+			//     if (item.paths.includes(route)) {
+			//       arr = item.children;
+			//     }
+			//   })
+			//   if (arr.length >= 8) {
+			//     arr = arr.slice(0, 7);
+			//     let obj = this.$store.state.config?.config?.menu?.find(item => item.paths.includes(
+			//       '/pages/moreFun/moreFun'));
+			//     arr.push(obj);
+			//   }
+			//   return arr;
+			// },
+		},
+		watch: {
+			'$store.state.app.token': {
+				handler: function(n, o) {
+					userInfo().then(({
+						data
+					}) => {
+						this.$store.commit('setUserInfo', data);
+						this.initUserInfo(data);
+						this.$store.dispatch('initConfig');
+					});
+				}
+			},
+			'$store.state.config.config.menu': {
+				immediate: true,
+				deep: true,
+				handler: function(n, o) {
+					const route = '/pages/oaHome/oaHome';
+					let arr = [];
+					n.forEach((item) => {
+
+						if (item.paths.includes(route)) {
+							arr = item.children;
+						}
+					})
+					if (arr.length >= 8) {
+						arr = arr.slice(0, 7);
+						let obj = n.find(item => item.paths.includes(
+							'/pages/moreFun/moreFun'));
+						arr.push(obj);
+					}
+					this.oaHomeData = arr;
+				}
+			}
+		},
+		methods: {
+			// 通知
+			noticeFn() {
+				jpushModule.addNotificationListener(res => {
+					const audioContext = uni.createInnerAudioContext()
+					if (res.content.includes('：')) {
+						audioContext.src = '/static/mp3/im.wav'
+						audioContext.play()
+						uni.vibrateLong();
+						console.log("im")
+						return
+					}
+					if (res.notificationEventType == 'notificationOpened') return
+					audioContext.src = '/static/mp3/order.mp3'
+					audioContext.play()
+					uni.vibrateLong();
+					this.getOrderList()
+					// this.$refs.globalPopup.showPopu();
+					console.log("index的监听")
+				})
+			},
+			leftClick(e) {
+				console.log("发送给宿主")
+				uni.sendHostEvent('closeApp', e, (ret) => {
+					//发送消息成功回调
+					console.log('关闭应用' + JSON.stringify(ret));
+				});
+			},
+			async getOrderList() {
+				this.id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
+				let res = await getList({
+					user_id: this.id,
+					user_type: this.is_captain
+					// courier_id: 167
+				});
+				this.orderList = res.data.data;
+				console.log("获取列表")
+			},
+			goOrderList() {
+				uni.navigateTo({
+					url: "/pages/logistics/index",
+				});
+			},
+			initUserInfo(data = null) {
+				if (data) return this.myOaInfo = data;
+				this.$store.state.app.userInfo ?
+					(this.myOaInfo = this.$store.state.app.userInfo) :
+					(this.myOaInfo.avatar = "");
+			},
+			initOaHomeDada() {
+				if (this.$store.state.app.userInfo.admin_id == 0) {
+					// 如果用户不是管理员
+					let arr = oaHomeData.filter((item) => !item.admin); //过滤掉管理员专属页面
+					this.oaHomeData = arr;
+				} else {
+					// this.oaHomeData = oaHomeData;
+					let arr = oaHomeData.filter((item) => !item.captain); //过滤掉普通用户专属页面
+					this.oaHomeData = arr;
+				}
+				if (
+					this.$store.state.app.userInfo?.company?.company_type_name == "平台公司"
+				) {
+					this.oaHomeData = this.oaHomeData.filter((item) => {
+						return item.text == "人员管理" ? false : true;
+					});
+				}
+				// 判断是否需要显示更多按钮
+				if (this.oaHomeData >= 8) {
+					this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
+				} else {
+					this.oaHomeData.splice(this.oaHomeData.length - 1, 1);
+				}
+			},
+			async getApproveList() {
+				const res = await noticeList({
+					keyword: "",
+					page_no: 1,
+					page_size: 2,
+				});
+				this.ApproveList = res.data.lists;
+			},
+			async getIndexList() {
+				const {
+					project,
+					task
+				} = await getIndexListAPI();
+				console.log(task, "222");
+				this.assessData[0].num = project.count;
+				this.assessData[1].num = project.count_ok;
+				this.assessData[2].num = project.count_no;
+				this.assessData[3].num = project.count_lv + "%";
+				this.assessData[4].num = task.count;
+				this.assessData[5].num = task.count_ok;
+				this.assessData[6].num = task.count_no;
+				this.assessData[7].num = task.count_lv + "%";
+				this.myTaskList = task.list;
+			},
+			async getMyTask() {
+				let data = {
+					page: this.page,
+					limit: 10,
+				};
+				const res = getMyTaskListAPI(data);
+			},
+			naviTaskDetails(id) {
+				uni.navigateTo({
+					url: `/pages/views/task_details?id=${id}`,
+				});
+			},
+			navTo(url) {
+				if (url) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					uni.navigateTo({
+						url: url,
+						success() {
+							uni.hideLoading()
+						},
+						fail() {
+							uni.switchTab({
+								url: url,
+								success() {
+									uni.hideLoading()
+								},
+								fail() {
+									uni.hideLoading()
+								}
+							});
+						},
+					})
+				} else Toast('暂未开放')
+			},
+			navTwo(url, key) {
+				// let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
+				// var arr = [3, 6];
+
+				// if (role_id && role_id[0] == 9) {
+				//   if (arr.indexOf(key) == -1) {
+				//     Toast("请先成立公司后开放");
+				//     return false;
+				//   }
+				// }
+				this.navTo(url);
+			},
+			// 点击公告
+			clickNotice(e) {
+				uni.navigateTo({
+					url: `/pages/oaNews/oaNews?id=${e}`,
+				});
+			},
+			// 判断当前是否登录,显示任务及完成率
+			showToask() {
+				if (!this.$store.state.app.token) {
+					this.assessData = this.assessData.map((item) => {
+						item.num = "*";
+						return item;
+					});
+				} else {
+					// 新增接口后要替换为接口
+					this.assessData = this.assessData.map((item) => {
+						item.num = "0";
+						return item;
+					});
+				}
+			},
+			login() {
+				uni.navigateTo({
+					url: "/pages/oaLogin/oaLogin",
+				});
+			},
+			async getUserIndex() {
+				const res = await getUserIndexAPI();
+				this.myOaInfo = res;
+			},
+		},
+		async onPullDownRefresh() {
+			uni.sendHostEvent('test', '测试', (ret) => {
+				// uni.showModal({
+				//   title:'内容',
+				//   content:JSON.stringify(ret)
+				// })
+			});
+			await this.getOrderList();
+			await this.$store.dispatch('initConfig');
+			await this.getApproveList();
+			// this.getIndexList()
+			uni.stopPullDownRefresh();
+		},
+	};
+</script>
+
+<style lang="scss">
+	.oa_home {
+		padding-bottom: 100rpx;
+	}
+
+	.header_bg {
+		position: absolute;
+		width: 100%;
+		// z-index: -1;
+	}
+
+	.home_header {
+		position: relative;
+		padding: 28rpx;
+		// height: 607.02rpx;
+		// height: 480.02rpx;
+		width: 100%;
+		// background-color: $theme-oa-color;
+		margin-bottom: 110rpx;
+		background-color: $theme-oa-color;
+		border-radius: 0 0 30rpx 30rpx;
+
+		.head_img {
+			position: relative;
+			background-color: #ff7c32;
+			width: 100%;
+			height: 105.14rpx;
+			line-height: 105.14rpx;
+			border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx;
+			display: flex;
+			justify-content: space-between;
+			padding-right: 28rpx;
+			color: white;
+			font-size: 34rpx;
+			padding-left: 150rpx;
+			box-sizing: border-box;
+
+			.img_box {
+				position: absolute;
+
+				left: -10rpx;
+				top: -15rpx;
+				width: 140rpx;
+				height: 140rpx;
+				background-color: white;
+				border-radius: 140rpx;
+
+				.img_box_img {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translate(-50%, -50%);
+				}
+			}
+
+			.head_text {
+				font-size: 33rpx;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+
+			// font-we
+		}
+
+		.my_info {
+			.mesg_box {
+				color: #fff;
+				margin-left: 31.58rpx;
+
+				.nickname {
+					font-size: 32rpx;
+					font-weight: 500;
+					margin-right: 30rpx;
+				}
+
+				.duty {
+					margin-top: 10.53rpx;
+				}
+			}
+		}
+
+		.task_panel {
+			color: #fff;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			align-content: space-between;
+			text-align: center;
+			padding-bottom: 110rpx;
+
+			.task_item {
+				margin-top: 42.11rpx;
+
+				.plan {
+					width: 173.68rpx;
+					font-size: 38.6rpx;
+					margin-bottom: 21.05rpx;
+				}
+			}
+		}
+
+		.backlog {
+			position: absolute;
+			left: 50%;
+			bottom: -101.75rpx;
+			transform: translate(-50%);
+			width: 694.74rpx;
+			background: #ffffff;
+			border-radius: 12px;
+			padding: 28.07rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			font-size: 25rpx;
+			font-weight: 400;
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+
+			&_item {
+				margin-top: 19.3rpx;
+				color: #666666;
+
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+
+					/* 设置元素宽度，根据需要进行调整 */
+					.text_time {
+						display: inline-block;
+						background-color: #ff7c32;
+						color: white;
+						padding: 5rpx 10rpx;
+						margin-right: 10rpx;
+						border-radius: 15rpx;
+					}
+
+					// &::before {
+					// 	content: "公告";
+					// 	display: inline-block;
+					// 	color: #ff8c1a;
+					// 	padding: 2px 8px;
+					// 	border-radius: 4px;
+					// 	border: 1px solid #ff8c1a;
+					// 	margin-right: 14.04rpx;
+					// }
+				}
+			}
+
+			&_no {
+				margin-top: 19.3rpx;
+				color: #666666;
+
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+					/* 设置元素宽度，根据需要进行调整 */
+
+					&::before {
+						content: none;
+					}
+				}
+			}
+		}
+
+		.backlog_no_data {
+			bottom: -70rpx;
+		}
+	}
+
+	.home_header_no_data {
+		margin-bottom: 93.33rpx;
+	}
+
+	.fast_track {
+		width: 694rpx;
+		// height: 331rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: left;
+		align-content: space-between;
+		margin: 0 auto;
+		padding: 15rpx 38.6rpx;
+		background-color: #fff;
+		border-radius: 12px;
+
+		.track_item {
+			width: 154.39rpx;
+			font-size: 24.56rpx;
+			margin: 25rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.title {
+				margin-top: 14.04rpx;
+			}
+		}
+	}
+
+	.my_task {
+		width: 694.74rpx;
+		margin: 0 auto;
+		// margin-top: 31.58rpx;
+		// background-color: #fff;
+		border-radius: 12px;
+		// padding: 28.07rpx;
+
+		.no_task {
+			width: 694rpx;
+			height: 140rpx;
+			padding: 28rpx;
+			background: #ffffff;
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
+
+			.title {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #000000cc;
+				line-height: 35rpx;
+			}
+
+			.tips {
+				font-size: 25rpx;
+				font-weight: 400;
+				color: #333333ff;
+				line-height: 35rpx;
+			}
+		}
+
+		.task_title {
+			font-size: 25rpx;
+			font-weight: 400;
+			padding: 28rpx;
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+		}
+
+		.task_list {
+			height: 196.49rpx;
+			border-bottom: 1px solid #cccccc;
+			padding: 21.05rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.title {
+				.tag {
+					color: #f24848;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #ffe4e4;
+					border-radius: 4px;
+				}
+
+				.tag1 {
+					color: #3274f9;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #e4edff;
+					border-radius: 4px;
+				}
+
+				.text {
+					font-size: 28.07rpx;
+					width: 403.51rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+
+				.if_take {
+					font-size: 28.07rpx;
+					text-align: center;
+					line-height: 49.12rpx;
+					width: 115.79rpx;
+					height: 49.12rpx;
+					border-radius: 100px;
+				}
+
+				.take1 {
+					color: #47b347;
+					background: #dffcdf;
+				}
+
+				.take2 {
+					color: #3274f9;
+					background: #e4edff;
+				}
+
+				.take3 {
+					color: #999999;
+					background: #f5f5f5;
+				}
+			}
+
+			.describe {
+				font-size: 24.56rpx;
+			}
+
+			.task_deta {
+				color: #999;
+				font-size: 24.56rpx;
+			}
+		}
+	}
+
+	.no_login {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100vw;
+		height: 112rpx;
+		/* #ifdef H5 */
+		height: 212rpx;
+		/* #endif */
+		background: rgba(#333333, 0.4);
+		border-radius: 14rpx 14rpx 0rpx 0rpx;
+		padding: 28rpx 28rpx;
+
+		.view {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.text {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+			}
+
+			.btn {
+				width: 158rpx;
+				height: 60rpx;
+				background: #3274f9;
+				border-radius: 30rpx 30rpx 30rpx 30rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+
+	.chat {
+		margin-top: 1000px;
+		// margin-top: 2000rpx;
+		width: 694.74rpx;
+		margin: 0 auto;
+		background-color: white;
+		border-radius: 12px;
+		padding: 20rpx;
+		// padding-top: 10rpx;
+		padding-right: 24rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.chat-l {
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.brange {
+		color: white;
+		background-color: red;
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 40rpx;
+		font-size: 12px;
+		text-align: center;
+		lighting-color: 40rpx;
+	}
+</style>
\ 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 @@
 <template>
 	<view class="box">
+		<!-- 		<view class=""
+			style="background-color: red;height: var(--status-bar-height);position: fixed;top: 0;z-index: 9999;" /> -->
 		<view class="" style="background-color: #2B63E3;height: var(--status-bar-height);" />
+
+
 		<view class="head">
 			<view class="" style="float: right;margin-top: 20rpx;">
 				<Myindex url='/pages/oaHome/oaHome' />
@@ -19,92 +23,41 @@
 
 			</view>
 		</view>
-		<view class="deposit">
-			<view class="deposit-l">
-				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/YJ.png'"
-					shape="circle"></u--image>
+		<view class="deposit" v-if="myOaInfo.group_id !=20">
+			<view class="deposit-l" v-for="(item,index) in depositLIst" :key='index' @click='item.event'>
+				<u--image :showLoading="true" width="81rpx" height="78rpx"
+					:src="`../../static/newWork/index/${item.icon}.png`"></u--image>
 				<view class="" style="margin-left:20rpx ;">
-					<view class="">
-						押金
+					<view class="" style="font-size: 28rpx;">
+						{{item.title}}
 					</view>
 					<view class="deposit-value">
-						{{myOaInfo.deposit}}
+						{{item.unit||''}}{{myOaInfo[item.value]}}
 					</view>
 				</view>
 			</view>
-			<view class="deposit-l">
-				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/GLHS.png'"
-					shape="circle"></u--image>
+		</view>
+		<view class="deposit" v-else>
+			<view class="deposit-l" v-for="(item,index) in depositCouriersLIst" :key='index' @click='item.event'>
+				<u--image :showLoading="true" width="81rpx" height="78rpx"
+					:src="`../../static/newWork/index/${item.icon}.png`"></u--image>
 				<view class="" style="margin-left:20rpx ;">
-					<view class="">
-						管理户数
+					<view class="" style="font-size: 28rpx;">
+						{{item.title}}
 					</view>
 					<view class="deposit-value">
-						{{myOaInfo.user_information_count}}户
-					</view>
-				</view>
-			</view>
-			<!-- 工程 -->
-			<!-- <view class="">
-				<uqrcode ref="uqrcode" canvas-id="qrcode" value="https://uqrcode.cn/doc" :options="{ margin: 10 }">
-				</uqrcode>
-			</view> -->
-			<!-- <view class="deposit-l">
-				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/ZCYHS.png'"
-					shape="circle"></u--image>
-				<view class="" style="margin-left:20rpx ;">
-					<view class="">
-						注册用户数
-					</view>
-					<view class="deposit-value">
-						{{myOaInfo.register_num}}
-					</view>
-				</view>
-			</view> -->
-			<!-- <view class="deposit-l">
-				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/RZSHS.png'"
-					shape="circle"></u--image>
-				<view class="" style="margin-left:20rpx ;">
-					<view class="">
-						入驻商户数
-					</view>
-					<view class="deposit-value">
-						{{myOaInfo.merchant_num }}
-					</view>
-				</view>
-			</view> -->
-			<!-- <view class="deposit-l">
-				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/JYJE.png'"
-					shape="circle"></u--image>
-				<view class="" style="margin-left:20rpx ;">
-					<view class="">
-						交易金额
-					</view>
-					<view class="deposit-value">
-						￥{{myOaInfo.trade_amount }}
-					</view>
-				</view>
-			</view> -->
-			<view class="deposit-l" @click="showCode=true">
-				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/YQM.png'"
-					shape="circle"></u--image>
-				<view class="" style="margin-left:20rpx ;">
-					<view class="">
-						邀请码
-					</view>
-					<view class="deposit-value">
-						{{myOaInfo.invite_code}}
+						{{item.unit||''}}{{myOaInfo[item.value]}}
 					</view>
 				</view>
 			</view>
 		</view>
 		<!--追加功能 -->
-		<view class="" v-if='taskList.length==0'>
+		<view class="" v-if='taskList.length==0&& myOaInfo.group_id!=20 '>
 			<u-empty icon="/static/newWork/index/empty.png" iconSize='200' width='300' height="300" marginTop='50'
 				textColor='#BFD7FF' text="等待任务下发"></u-empty>
 		</view>
 		<view class="task" v-else>
-			<view class="tit">
+			<view class="tit" style="margin-bottom: 20rpx;" v-if="myOaInfo.group_id!=20">
 				我的任务
 			</view>
 
@@ -126,7 +79,29 @@
 				</view>
 			</view>
 		</view>
+
+
+		<view class="logisti task" v-if="myOaInfo.group_id==20">
+			<view class="logisti-head">
+				<view class="tit">
+					配送信息
+				</view>
+				<view class="" style="display: flex;">
+					<u--input placeholder="搜索" class='serch' prefixIcon="search"
+						prefixIconStyle="font-size: 22px;color: #909399" @blur='serchWidth=170' @focus='serchWidth=400'
+						:style="`width:${serchWidth}rpx`" v-model='keywords'></u--input>
+					<u-button
+						style="width: 100rpx;height: 60rpx;background-color: #2B63E3;color: white;border-radius: 20rpx;"
+						text="搜索" @click="getOrderList"></u-button>
+				</view>
+			</view>
+			<logistiBriefCard v-for="(item, index) in orderList" :key="index" :goodsInfo="item">
+			</logistiBriefCard>
+			<u-loadmore :status="status" />
+		</view>
 		<u-overlay :show="showCode" @click="showCode=false" :opacity="0.1">
+
+
 			<view class="code" id='code'>
 				<view class="code-img">
 					<view class="" style="margin: 0 auto;width: 440rpx;">
@@ -244,9 +219,9 @@
 
 <script>
 	import Myindex from '@/components/return/index.vue';
-	// import {
-	// 	getList
-	// } from "@/api/logistics.js";
+	import {
+		getList
+	} from "@/api/logistics.js";
 	import {
 		Toast
 	} from "@/libs/uniApi.js";
@@ -263,7 +238,7 @@
 		taskListApi
 	} from "@/api/task.js"
 	import {
-		getTradeTaskInfo
+		getTradeTaskInfo,
 	} from "@/api/newTask.js"
 	// import tabbar from '../components/tabbar'
 	import {
@@ -277,6 +252,7 @@
 		mapState
 	} from 'vuex';
 	import bj from "@/static/animation/home.json"
+	import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue";
 	import {
 		userInfo
 	} from "@/api/oaUser.js"
@@ -285,17 +261,109 @@
 	// #endif
 	export default {
 		components: {
-			Myindex
+			Myindex,
+			logistiBriefCard
 		},
 		data() {
 			return {
+				depositLIst: [{
+						icon: "YJ",
+						title: "押金",
+						value: "deposit",
+						event: () => {
+							return
+						}
+					},
+					{
+						icon: "GLHS",
+						title: "管理户数",
+						value: "user_information_count"
+					},
+					{
+						icon: "ZCYHS",
+						title: "成功邀请人数",
+						value: "register_num"
+					},
+					// {
+					// 	icon: "RZSHS",
+					// 	title: "入驻商户数",
+					// 	value: "merchant_num"
+					// },
+					// {
+					// 	icon: "JYJE",
+					// 	title: "交易金额",
+					// 	value: "trade_amount",
+					// 	unit: "￥"
+					// },
+
+					// {
+					// 	icon: "RZSHS",
+					// 	title: "成功邀请人数",
+					// 	value: "merchant_num"
+					// },
+					{
+						icon: "RZSHS",
+						title: "总计首单金额",
+						value: "trade_amount",
+						unit: "￥",
+						event: () => {
+							uni.navigateTo({
+								url: '/pages/oaHome/FirstOrderLog'
+							})
+						}
+					},
+					{
+						icon: "RZSHS",
+						title: "收益",
+						value: "user_money",
+						unit: "￥",
+						event: () => {
+							uni.navigateTo({
+								url: '/pages/oaHome/accountLog'
+							})
+						}
+					},
+					{
+						icon: "YQM",
+						title: "邀请码",
+						value: "invite_code",
+						event: () => {
+							this.showCode = true
+						},
+
+					},
+
+				],
+
+				keywords: "",
+				depositCouriersLIst: [{
+						icon: "RZSHS",
+						title: "收益",
+						value: "user_money",
+						unit: "￥",
+						event: () => {
+							uni.navigateTo({
+								url: '/pages/oaHome/accountLog'
+							})
+						}
+					},
+					{
+						icon: "YQM",
+						title: "邀请码",
+						value: "invite_code",
+						event: () => {
+							this.showCode = true
+						},
+
+					},
+				],
 				showCode: false,
 				showCode1: false,
-				brange: 0,
+				serchWidth: 150,
+				status: "loadmore",
 				options: {
 					data: '',
 				},
-				status: "loadmore",
 				page_num: 1,
 				flag: false,
 				uniMP: false,
@@ -303,32 +371,13 @@
 				id: "",
 				is_captain: 0,
 				notArr: [],
-				orderList: [],
+				orderList: [1],
 				oaHomeData: [],
 				taskList: [],
-				src: "https://cdn.uviewui.com/uview/album/1.jpg",
-				assessData: [{
-						num: "0",
-						name: "任务",
-					},
-					{
-						num: "0",
-						name: "已完成",
-					},
-					{
-						num: "0",
-						name: "未完成",
-					},
-					{
-						num: "0%",
-						name: "完成率",
-					},
-				],
+				// src: "https://cdn.uviewui.com/uview/album/1.jpg",
 				project: {},
 				task: {},
 				page: 1,
-				myTaskList: [],
-				flowState: "#47B347", // 任务状态
 				priority: "", // 任务紧急度
 				myOaInfo: {
 					avatar: "",
@@ -338,34 +387,6 @@
 					label_name: "",
 				},
 				ApproveList: [],
-				showOaHomeData: false, //更新首页计算的值
-				chartData: {},
-				progress: 0,
-				//您可以通过修改 config-ucharts.js 文件中下标为 ['arcbar'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
-				opts: {
-
-					title: {
-
-						fontSize: 16,
-						color: "#2fc25b"
-					},
-					subtitle: {
-						name: "",
-						fontSize: 12,
-						color: "#666666"
-					},
-					extra: {
-						arcbar: {
-							type: "circle",
-							width: 12,
-							backgroundColor: "#E9E9E9",
-							startAngle: 1.5,
-							endAngle: 0.25,
-							gap: 2
-						}
-					}
-				}
-
 
 			};
 		},
@@ -373,14 +394,13 @@
 			// console.log('asdashg')
 			if (uni.getStorageSync('USER_INFO')) {
 				let userData = JSON.parse(uni.getStorageSync('USER_INFO'))
-
 				this.initUserInfo(userData);
 				// console.log(545)
 			}
 			await this.$onLaunched;
 			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain
 			this.options.data = bj;
-			// this.initTask()
+			this.getOrderList()
 		},
 		async onShow() {
 			this.initTask()
@@ -400,9 +420,6 @@
 				})
 			}
 		},
-
-
-
 		computed: {
 			// oaHomeData() {
 			//   const route = '/pages/oaHome/oaHome';
@@ -457,6 +474,12 @@
 			}
 		},
 		methods: {
+			serchOrder() {
+
+
+
+
+			},
 			copyCode() {
 				let that = this
 				uni.setClipboardData({
@@ -557,39 +580,56 @@
 				} else Toast('暂未开放')
 			},
 			navTwo(url, key) {
-				// let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
-				// var arr = [3, 6];
-
-				// if (role_id && role_id[0] == 9) {
-				//   if (arr.indexOf(key) == -1) {
-				//     Toast("请先成立公司后开放");
-				//     return false;
-				//   }
-				// }
 				this.navTo(url);
 			},
-			// 点击公告
-			clickNotice(e) {
-				uni.navigateTo({
-					url: `/pages/oaNews/oaNews?id=${e}`,
+			async getOrderList() {
+				console.log("getorder")
+				this.id = this.myOaInfo.id;
+				let res = await getList({
+					user_id: this.id,
+					user_type: this.is_captain,
+					keywords: this.keywords
 				});
+				this.orderList = res.data.data;
 			},
 
-
-
 			async getUserIndex() {
 				const res = await getUserIndexAPI();
-
-				console.log(res, "res")
 				this.myOaInfo = res;
 			},
+			goOrderList() {
+				uni.navigateTo({
+					url: "/pages/logistics/index",
+				});
+			},
 		},
+
 		async onPullDownRefresh() {
 			this.initTask()
-
 			await this.$store.dispatch('initConfig');
-
 			uni.stopPullDownRefresh();
+
+		},
+		onReachBottom() {
+			if (this.flag) return
+			let that = this
+			this.status = "loading"
+			this.page_num += 1
+			this.flag = true
+			getList({
+				status: this.curNow,
+				user_id: this.id,
+				keywords: this.keywords,
+				user_type: this.is_captain,
+				page_num: this.page_num
+			}).then(res => {
+				that.orderList = that.orderList.concat(res.data.data)
+				this.flag = false
+				if (!res.data.data.length) {
+					this.status = "nomore"
+					this.flag = true
+				}
+			})
 		},
 	};
 </script>
@@ -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;
 	// }