From 4a061ce40e588a135819c5914d676d0a2ca9f2ae Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 21 Nov 2024 19:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/navbar.vue        | 15 +++++++++------
 components/base/tabbar.vue        | 20 ++++++++++++++------
 components/work/WorkOrderitem.vue | 25 +++++++++----------------
 pages/index/index.vue             | 28 ++++++++++++----------------
 uni.scss                          |  6 +++++-
 5 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index 5bc527a..49636c4 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -2,33 +2,33 @@
 <!-- 	<view class="navbar"
 	:style="{backgroundColor : bgColor}"> -->
 		<view class="title"
-		:style="{backgroundColor : bgColor}">
+		:style="{backgroundColor : bgColor,color}">
 			<view class="left">
 				
 				<uv-icon name="home"
 				v-if="leftClick && length == 1"
 				@click="toHome"
-				color="#333" size="46rpx"></uv-icon>
+				:color="color"  size="46rpx"></uv-icon>
 				
 				<uv-icon name="arrow-left"
 				v-else-if="leftClick"
 				@click="$emit('leftClick')"
-				color="#333" size="46rpx"></uv-icon>
+				:color="color"  size="46rpx"></uv-icon>
 			</view>
 			<view>{{ title }}</view>
 			<view class="icon">
 				
 				<uv-icon name="search"
 				v-if="isSearch"
-				color="#333" size="58rpx"></uv-icon>
+				:color="color"  size="58rpx"></uv-icon>
 				
-				<uv-icon name="plus-circle" color="#333" 
+				<uv-icon name="plus-circle" :color="color"  
 				v-if="isPlus"
 				@click="plusCircleShow = true"
 				size="46rpx" style="margin-left: 30rpx;"></uv-icon>
 				
 				<view v-if="moreClick" style="margin-left: 30rpx;">
-					<uv-icon name="more-dot-fill" color="#333"
+					<uv-icon name="more-dot-fill" :color="color" 
 					v-if="!moreText"
 					@click="moreClick()"
 					size="46rpx"></uv-icon>
@@ -70,6 +70,9 @@
 			},
 			bgColor : {
 				default : '#fff'
+			},
+			color : {
+				default : '#333'
 			}
 		},
 		created() {
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 4cd0e46..a31db75 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -6,12 +6,16 @@
 			 :class="{item : true, active : select == index}"
 			 v-for="(item, index) in list"
 			 :key="index"
-			 v-if="!item.isNotShop || !userShop"
 			 @click="toPath(item, index)">
 				<view class="icon">
-					<image :src="select == index ? 
+					<!-- <image :src="select == index ? 
 					item.selectedIconPath : 
-					item.iconPath" class="icon-image" mode=""></image>
+					item.iconPath" class="icon-image" mode=""></image> -->
+					
+					<uv-icon
+					size="50rpx"
+					:color="select == index ? '#169bd5' : '#BCBCBC'"
+					:name="item.icon"></uv-icon>
 				</view>
 				<view class="title">
 					{{ item.title }}
@@ -27,7 +31,6 @@
 		name:"tabbar",
 		props : ['select'],
 		computed : {
-			...mapGetters(['userShop']),
 		},
 		data() {
 			return {
@@ -36,13 +39,15 @@
 						"selectedIconPath": "/static/image/tabbar/home-a.png",
 						"iconPath": "/static/image/tabbar/home.png",
 						"pagePath": "/pages/index/index",
-						"title": "首页"
+						"title": "首页",
+						icon : 'home',
 					},
 					{
 						"selectedIconPath": "/static/image/tabbar/center-a.png",
 						"iconPath": "/static/image/tabbar/center.png",
 						"pagePath": "/pages/index/center",
-						"title": "我的"
+						"title": "我的",
+						icon : 'account',
 					}
 				]
 			};
@@ -88,6 +93,9 @@
 		.icon{
 			width: 54rpx;
 			height: 54rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
 			.icon-image{
 				width: 54rpx;
 				height: 54rpx;
diff --git a/components/work/WorkOrderitem.vue b/components/work/WorkOrderitem.vue
index 51a393e..abd0a91 100644
--- a/components/work/WorkOrderitem.vue
+++ b/components/work/WorkOrderitem.vue
@@ -34,22 +34,15 @@
 </script>
 
 <style scoped lang="scss">
-	.Urgent-Work-Order{
-		padding: 20rpx;
-		.Urgent-Work{
-			
-		}
-		.Urgent-Work-List{
-			margin-top: 20rpx;
-			border: 6rpx solid rgb(99 ,187 ,211);
-			border-radius: 25rpx;
-			padding: 15rpx;
-			.Work-List{
-				margin: 15rpx 0rpx;
-				letter-spacing: 2px
-			}
+	.Urgent-Work-List{
+		margin-top: 20rpx;
+		border: 6rpx solid $uni-color;
+		border-radius: 25rpx;
+		padding: 15rpx;
+		background-color: #fff;
+		.Work-List{
+			margin: 15rpx 0rpx;
+			letter-spacing: 2px
 		}
 	}
-	
-
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1ad2662..1f869ba 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="page">
 
-		<navbar />
+		<navbar bgColor="#169bd5"/>
+		
 		<view class="Carousel-image">
 			<view class="imgs">
 				<uv-swiper 
@@ -25,7 +26,7 @@
 		<view class="festival">
 			<view class="indus">
 				<view class="horn">
-					<uv-icon name="volume" size=""></uv-icon>
+					<uv-icon name="volume" size="34rpx"></uv-icon>
 				</view>
 				<view class="words">
 					中秋节放假及工作安排通知
@@ -36,9 +37,6 @@
 			</view>
 		</view>
 
-
-		<uv-divider text="" textColor="#2979ff" lineColor="grey" textSize="1"></uv-divider>
-
 		<view class="task">
 			<view class="backimg" @click="$utils.navigateTo('/pages_order/order/WorkOrderListitem')" >
 				<view class="Work-Order">
@@ -47,8 +45,6 @@
 			</view>
 		</view>
 
-		<uv-divider text="" textColor="#2979ff" lineColor="grey" textSize="1"></uv-divider>
-
 		<view class="Urgent-Work-Order">
 			<view class="Urgent-Work">
 				紧急工单
@@ -57,32 +53,29 @@
 			<WorkOrderitem
 			v-for="(item,index) in list"
 			:obj="item"
+			:key="index"
 			/>
 			
-			
 		</view>
-			<PrivacyAgreementPoup/>
-				
-				<tabber select="0"/>
+		
+		<PrivacyAgreementPoup/>
+			
+		<tabber select="0"/>
 	</view>
 </template>
 
 <script>
 	import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue'
-	import Position from '@/utils/position.js'
 	import tabber from '@/components/base/tabbar.vue'
-	import productList from '@/components/user/productList.vue'
 	import WorkOrderitem from '@/components/work/WorkOrderitem.vue'
 	import mixinsList from '@/mixins/list.js'
 	import {
 		mapGetters
 	} from 'vuex'
-	// import selectArea from '../../components/selectArea.vue';
 	export default {
 		mixins: [mixinsList],
 		components: {
 			tabber,
-			productList,
 			PrivacyAgreementPoup,
 			WorkOrderitem,
 		},
@@ -101,7 +94,6 @@
 			queryBannerList(){
 				this.$api('queryBannerList', res =>{
 					if(res.code == 200){
-						console.log(res.result.records[0].image);
 						this.bannerList = res.result.records
 					}
 				})
@@ -145,6 +137,10 @@
 			}
 		}
 	}
+	
+	.Urgent-Work-Order{
+		padding: 20rpx;
+	}
 
 	.festival {
 		margin-top: 20rpx;
diff --git a/uni.scss b/uni.scss
index 6e2d4c6..af07040 100644
--- a/uni.scss
+++ b/uni.scss
@@ -12,7 +12,7 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 /* 颜色变量 */
-$uni-color: #FD5100;
+$uni-color: #169bd5;
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
@@ -74,3 +74,7 @@ $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:26px;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
+
+:root{
+	--uni-color: $uni-color;
+}
\ No newline at end of file