From 755ce1c7993d411798bcb85d2939480bb042d8c1 Mon Sep 17 00:00:00 2001
From: 起风了 <1517943910@qq.com>
Date: Wed, 3 Jan 2024 00:25:16 +0800
Subject: [PATCH] 修改

---
 components/TabBar/TabBar.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
 pages/hcxx/hcxx.scss         |  9 ++++++++-
 pages/hcxx/hcxx.vue          | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 pages/my/my.vue              | 31 ++++++++++++++++++++++---------
 pages/slgxx/slgxx.scss       |  4 +++-
 pages/slgxx/slgxx.vue        | 33 ++++++++++++++++++++-------------
 6 files changed, 151 insertions(+), 72 deletions(-)

diff --git a/components/TabBar/TabBar.vue b/components/TabBar/TabBar.vue
index 4bca5eb..0bd7a8b 100644
--- a/components/TabBar/TabBar.vue
+++ b/components/TabBar/TabBar.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="page-total">
 		<view class="tab-list">
+			<!-- 普通用户 -->
 			<view class="list" v-for="(item,index) in TabBarList"  v-if="qxshow"
 			@click="onTabBar(item,item.index)"
 			:key="index">
@@ -8,8 +9,16 @@
 				<image :src="item.img" mode="widthFix" v-show="tabBarShow != item.index"></image>
 				<text :class="{'action':tabBarShow===item.index}">{{item.name}}</text>
 			</view>
-			
-			<view class="list" v-for="(item,index) in TabBarList1" v-if="!qxshow"
+			<!-- 司机收敛工 -->
+			<view class="list" v-for="(item,index) in TabBarList1" v-if="sjshow"
+			@click="onTabBar(item,item.index)"
+			:key="index">
+				<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === item.index"></image>
+				<image :src="item.img" mode="widthFix" v-show="tabBarShow != item.index"></image>
+				<text :class="{'action':tabBarShow===item.index}">{{item.name}}</text>
+			</view>
+			<!-- 登记底部 -->
+			<view class="list" v-for="(item,index) in TabBarList2" v-if="ddshow"
 			@click="onTabBar(item,item.index)"
 			:key="index">
 				<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === item.index"></image>
@@ -46,10 +55,26 @@
 						acImg: '/static/tabBar/tab_08.png'
 					}
 				],
+				TabBarList2:[
+					// {
+					// 	index: 3,
+					// 	name: '我的',
+					// 	img: '/static/tabBar/tab_07.png',
+					// 	acImg: '/static/tabBar/tab_08.png'
+					// },
+					{
+						index: 4,
+						name: '报丧登记',
+						img: '/static/tabBar/tab_07.png',
+						acImg: '/static/tabBar/tab_08.png'
+					}
+				],
 				codeheight: 0,
 				isOverall: 0,
 				phoneModel: '',
 				qxshow:true,
+				ddshow:false,
+				sjshow:false
 			};
 		},
 		props:{
@@ -61,11 +86,20 @@
 		mounted() {
 			try {
 				console.log("角色",uni.getStorageSync('userjs'));
-				if(uni.getStorageSync('userjs') != '普通用户'){
-					this.qxshow = false
+				if(uni.getStorageSync('userjs') != '普通用户' && uni.getStorageSync('userjs') != '调度员'){
+					this.sjshow = true
+				}else{
+					this.sjshow = false
 				}
 				if(uni.getStorageSync('userjs') == '普通用户'){
 					this.qxshow = true
+				}else{
+					this.qxshow = false
+				}
+				if(uni.getStorageSync('userjs') == '调度员'){
+					this.ddshow = true
+				}else{
+					this.ddshow = false
 				}
 			    const res = uni.getSystemInfoSync();
 					let that = this;
@@ -118,6 +152,14 @@
 							url:'/pages/my/my'
 						})
 						break;
+					case 4:
+						uni.navigateTo({
+							url:'/pages/funeralreport/funeralreport'
+						})
+						// wx.switchTab({
+						// 	url:'/pages/funeralreport/funeralreport'
+						// })
+						break;
 				}
 			}
 		}
diff --git a/pages/hcxx/hcxx.scss b/pages/hcxx/hcxx.scss
index 935a4f0..2e70cfc 100644
--- a/pages/hcxx/hcxx.scss
+++ b/pages/hcxx/hcxx.scss
@@ -4,6 +4,7 @@
 }
 .content {
 	width: 100%;
+	position: relative;
 }
 /* 订单列表 */
 .order-list{
@@ -14,7 +15,11 @@
 		min-height: 400rpx;
 		background-color: #FFFFFF;
 		border-radius: 20rpx;
+		// border-top-left-radius: 20rpx;
+		// border-top-right-radius: 20rpx;
 		margin: 25rpx;
+		border: 1px solid #d4d5d8;
+		// padding-bottom: 10rpx;
 		.title-status{
 			display: flex;
 			align-items: center;
@@ -24,6 +29,8 @@
 			.title{
 				display: flex;
 				align-items: center;
+				width: 800rpx;
+				// border: 1px solid red;
 				text{
 					font-size: 26rpx;
 					color: #A7A7A7;
@@ -61,7 +68,7 @@
 						font-size: 26rpx;
 						color: #A7A7A7;
 						.goods-name-title {
-							font-size: 30rpx;
+							font-size: 27rpx;
 							color: #3d3d3d;
 							font-weight: bold;
 							margin-bottom: 40rpx;
diff --git a/pages/hcxx/hcxx.vue b/pages/hcxx/hcxx.vue
index 6e13b48..9bf6faf 100644
--- a/pages/hcxx/hcxx.vue
+++ b/pages/hcxx/hcxx.vue
@@ -1,56 +1,57 @@
 <template>
-	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+	<view class="page" style="position: relative;">
+		<!-- <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> -->
 		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
 		<view class="content">
-		<view class="order-tab">
-			<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
-				<text>接运中</text>
-				<text class="line"></text>
-			</view>
-			<view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)">
-				<text>已完成</text>
-				<text class="line"></text>
-			</view>
-		</view>
-		<!-- 订单列表 -->
-		<view class="order-list" style="margin-top: 110rpx;">
-			<view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index">
-				<view class="title-status">
-					<view class="title">
-						<text>逝者编号：{{item.funeralCallWebDeathInfoPo.orderNumber}}</text>
-						<image src="../../static/right1.png"></image>
-					</view>
+			<view class="order-tab">
+				<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
+					<text>接运中</text>
+					<text class="line"></text>
+				</view>
+				<view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)">
+					<text>已完成</text>
+					<text class="line"></text>
 				</view>
-				<view class="goods-list">
-					<view class="goods">
-						<view class="item">
-							<view class="goods-name">
-								<view class="goods-name-title">逝者姓名：{{item.funeralCallWebDeathInfoPo.deceasedName}}</view>
-								<view class="goods-name-title">联系电话：{{item.funeralCallWebDeathInfoPo.contactPhone}}</view>
-								<view class="goods-name-title">逝者地址：{{item.funeralCallWebDeathInfoPo.accessLocation}}</view>
-								<view>报丧时间：{{item.funeralCallWebDeathInfoPo.createdTime}}</view>
+			</view>
+			<!-- 订单列表 -->
+			<view class="order-list" style="margin-top: -50rpx;max-height: 59vh;overflow: scroll;">
+				<view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index">
+					<view class="title-status">
+						<view class="title">
+							<text>报丧编号：{{item.funeralCallWebDeathInfoPo.orderNumber}}</text>
+							<image src="../../static/right1.png"></image>
+						</view>
+						<view class="status-btn" v-if="OrderType == 1">
+							<view><text class="red"></text><text class="red big"></text></view>
+							<view class="btn">
+								<image src="../../static/btn.png" mode="widthFix"></image>
+								<text>已回车</text>
 							</view>
 						</view>
 					</view>
-				</view>
-				<view class="status-btn" v-if="OrderType == 0">
-					<view><text class="red"></text><text class="red big"></text></view>
-					<view class="btn" @click="tz(item)">
-						<image src="../../static/btn.png" mode="widthFix"></image>
-						<text>查看详情</text>
+					<view class="goods-list">
+						<view class="goods">
+							<view class="item">
+								<view class="goods-name">
+									<view class="goods-name-title">逝者姓名：{{item.funeralCallWebDeathInfoPo.deceasedName}}</view>
+									<view class="goods-name-title">联系电话：{{item.funeralCallWebDeathInfoPo.contactPhone}}</view>
+									<view class="goods-name-title">逝者地址：{{item.funeralCallWebDeathInfoPo.accessLocation}}</view>
+									<view>报丧时间：{{item.funeralCallWebDeathInfoPo.createdTime}}</view>
+								</view>
+							</view>
+						</view>
 					</view>
-				</view>
-				<view class="status-btn" v-if="OrderType == 1">
-					<view><text class="red"></text><text class="red big"></text></view>
-					<view class="btn">
-						<image src="../../static/btn.png" mode="widthFix"></image>
-						<text>已回车</text>
+					<view class="status-btn" v-if="OrderType == 0">
+						<view><text class="red"></text><text class="red big"></text></view>
+						<view class="btn" @click="tz(item)">
+							<image src="../../static/btn.png" mode="widthFix"></image>
+							<text>查看详情</text>
+						</view>
 					</view>
+					
 				</view>
 			</view>
-		</view>
-		</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -79,6 +80,10 @@
 			this.OrderType = 0;
 			this.carddxx();
 		},
+		mounted() {
+			this.OrderType = 0;
+			this.carddxx();
+		},
 		methods:{
 			// 获取调度信息
 			carddxx(){
@@ -155,16 +160,19 @@
 	/* 订单tab */
 	.order-tab{
 		position: fixed;
+		position: absolute;
 		left: 0;
-		top: 88rpx;
+		top: 0;
+		margin-top: -7vh;
 		/* #ifdef MP-WEIXIN */
-		top: calc(100rpx + var(--status-bar-height));
+		// top: calc(100rpx + var(--status-bar-height));
 		/* #endif */
 		z-index: 10;
 		display: flex;
 		align-items: center;
 		width: 100%;
 		height: 100rpx;
+		// border: 1px solid red;
 		background-color: #FFFFFF;
 		.tab{
 			position: relative;
diff --git a/pages/my/my.vue b/pages/my/my.vue
index e6741ab..59d1763 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -19,13 +19,20 @@
 						<view class="rank">
 							<image src="../../static/id.png"></image>
 							<text>{{user.userId}}</text>
-							<!-- <image class="rank-img" src="../../static/copy.png"></image> -->
 						</view>
 					</view>
 				</view>
 			</view>
 			<view class="message-list">
-				<view class="titleall-box">
+				<!-- 司机列表 -->
+				<view class="" v-if="sjshow">
+					<hcxx v-if="sjshow"></hcxx>
+				</view>
+				<!-- 收敛工列表 -->
+				<view class="" v-if="slgshow">
+					<slgxx v-if="slgshow"></slgxx>
+				</view>
+				<view class="titleall-box" v-if="!sjshow && !slgshow">
 					<view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view>
 				</view>
 				<view class="list" @click="mydeath" v-if="ptyhshow || ddyshow">
@@ -73,7 +80,7 @@
 						<text class="iconfont icon-more"></text>
 					</view>
 				</view>
-				<view class="list" @click="hcxx" v-if="sjshow">
+				<!-- <view class="list" @click="hcxx" v-if="sjshow">
 					<view class="icon-data">
 						<view class="icon">
 							<image src="/static/my-icon6.png" mode=""></image>
@@ -87,8 +94,9 @@
 					<view class="more">
 						<text class="iconfont icon-more"></text>
 					</view>
-				</view>
-				<view class="list" @click="slgxx" v-if="slgshow">
+				</view> -->
+				
+				<!-- <view class="list" @click="slgxx" v-if="slgshow">
 					<view class="icon-data">
 						<view class="icon">
 							<image src="/static/my-icon6.png" mode=""></image>
@@ -102,8 +110,8 @@
 					<view class="more">
 						<text class="iconfont icon-more"></text>
 					</view>
-				</view>
-				<view class="list" @click="dhbs" v-if="ddyshow">
+				</view> -->
+				<!-- <view class="list" @click="dhbs" v-if="ddyshow">
 					<view class="icon-data">
 						<view class="icon">
 							<image src="/static/my-icon6.png" mode=""></image>
@@ -117,7 +125,7 @@
 					<view class="more">
 						<text class="iconfont icon-more"></text>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		</view>
@@ -128,9 +136,14 @@
 
 <script>
 	import TabBar from '../../components/TabBar/TabBar.vue';
+	import hcxx from '../hcxx/hcxx.vue'
+	// url: '/pages/slgxx/slgxx'
+	import slgxx from '../slgxx/slgxx.vue'
 	export default {
 		components: {
-			TabBar
+			TabBar,
+			hcxx,
+			slgxx
 		},
 		data() {
 			return {
diff --git a/pages/slgxx/slgxx.scss b/pages/slgxx/slgxx.scss
index 935a4f0..c1da8f0 100644
--- a/pages/slgxx/slgxx.scss
+++ b/pages/slgxx/slgxx.scss
@@ -15,6 +15,7 @@
 		background-color: #FFFFFF;
 		border-radius: 20rpx;
 		margin: 25rpx;
+		border: 1px solid #d4d5d8;
 		.title-status{
 			display: flex;
 			align-items: center;
@@ -24,6 +25,7 @@
 			.title{
 				display: flex;
 				align-items: center;
+				width: 800rpx;
 				text{
 					font-size: 26rpx;
 					color: #A7A7A7;
@@ -61,7 +63,7 @@
 						font-size: 26rpx;
 						color: #A7A7A7;
 						.goods-name-title {
-							font-size: 30rpx;
+							font-size: 27rpx;
 							color: #3d3d3d;
 							font-weight: bold;
 							margin-bottom: 40rpx;
diff --git a/pages/slgxx/slgxx.vue b/pages/slgxx/slgxx.vue
index 0d1e7ec..cc6e387 100644
--- a/pages/slgxx/slgxx.vue
+++ b/pages/slgxx/slgxx.vue
@@ -1,26 +1,33 @@
 <template>
-	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+	<view class="page" style="position: relative;">
+		<!-- <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> -->
 		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
 		<view class="content">
 		<view class="order-tab">
 			<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
-				<text>派遣中</text>
+				<text>待确认</text>
 				<text class="line"></text>
 			</view>
 			<view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)">
-				<text>已完成</text>
+				<text>已确认</text>
 				<text class="line"></text>
 			</view>
 		</view>
 		<!-- 订单列表 -->
-		<view class="order-list" style="margin-top: 110rpx;">
+		<view class="order-list" style="margin-top: -50rpx;max-height: 59vh;overflow: scroll;">
 			<view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index">
 				<view class="title-status">
 					<view class="title">
 						<text>逝者编号：{{item.funeralCallWebDeathInfoPo.orderNumber}}</text>
 						<image src="../../static/right1.png"></image>
 					</view>
+					<view class="status-btn" v-if="OrderType == 1">
+						<view><text class="red"></text><text class="red big"></text></view>
+						<view class="btn">
+							<image src="../../static/btn.png" mode="widthFix"></image>
+							<text>已确认</text>
+						</view>
+					</view>
 				</view>
 				<view class="goods-list">
 					<view class="goods">
@@ -41,13 +48,7 @@
 						<text>查看详情</text>
 					</view>
 				</view>
-				<view class="status-btn" v-if="OrderType == 1">
-					<view><text class="red"></text><text class="red big"></text></view>
-					<view class="btn">
-						<image src="../../static/btn.png" mode="widthFix"></image>
-						<text>已确认</text>
-					</view>
-				</view>
+				
 			</view>
 		</view>
 		</view>
@@ -79,6 +80,10 @@
 			this.OrderType = 0;
 			this.pqslgdd();
 		},
+		mounted() {
+			this.OrderType = 0;
+			this.pqslgdd();
+		},
 		methods:{
 			// 获取调度信息
 			pqslgdd(){
@@ -155,8 +160,10 @@
 	/* 订单tab */
 	.order-tab{
 		position: fixed;
+		position: absolute;
 		left: 0;
-		top: 88rpx;
+		top: 0;
+		margin-top: -7vh;
 		/* #ifdef MP-WEIXIN */
 		top: calc(100rpx + var(--status-bar-height));
 		/* #endif */
--
libgit2 0.21.4