From dc49955c7207622ff87aded353cbe651b5ae8043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=83=E8=82=89=E7=9A=84=E9=A5=BA=E5=AD=90?=
 <2659004835@qq.com>
Date: Sun, 27 Mar 2022 20:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=93=BE=E6=8E=A5=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E3=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9C=8B=E6=9D=BF=E9=A1=B5=E9=9D=A2=EF=BC=9B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=8B=E4=BB=B6=E8=B7=B3=E5=88=B0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/dataQuery/client.vue         | 229 ++++++++++++++---------------
 pages/dataQuery/details.vue        |  12 +-
 pages/dataQuery/projectQuery.vue   |  34 +----
 pages/dataQuery/queryFunction.vue  |  49 ++----
 pages/tabbar/pagehome/pagehome.vue |   6 +-
 readme.md                          |   3 +-
 6 files changed, 143 insertions(+), 190 deletions(-)

diff --git a/pages/dataQuery/client.vue b/pages/dataQuery/client.vue
index fdfe7af..d5710f0 100644
--- a/pages/dataQuery/client.vue
+++ b/pages/dataQuery/client.vue
@@ -1,125 +1,120 @@
 <template>
-    <view class="content">
-     <statusNav navBarTitle="客户(查询结果列表)"></statusNav>
-     
-      <container-subgroup-two >
-     <view class="client-content" slot="content" style="margin: 0 -30rpx;">
-         <view class="li">
-          <view class="li-content">
-              <view class="">
-                  <view class="title">
-                      湖南争鸣光电科技有限公司
-                  </view>
-                  <view class="code">
-                      编号：KH20220304-002
-                  </view>
-                  <view class="label-content">
-                      <view class="label">
-                          弱电安防
-                      </view>
-                      <view class="label">
-                          弱电安防
-                      </view>
-                      <view class="label">
-                          弱电安防
-                      </view>
-                  </view>
-              </view>
-              <view class="icon">
-                  13
-              </view>
-          </view>   
-          <view class="address">
-             <image class="img" src="../../static/iocn/dizi.png" mode=""></image> 
-             <view class="text">
-                 湖南省长沙市高新开发区谷园路109号像素大厦1205
-             </view>
-          </view>
-         </view>
-     </view>
-           </container-subgroup-two >
-     
-     
-    </view>
+	<view class="content">
+		<statusNav navBarTitle="客户(查询结果列表)"></statusNav>
+		<container-subgroup-two>
+			<view class="client-content" slot="content" style="margin: 0 -30rpx;">
+				<view @tap="goDetail(index)" class="li" v-for="(item,index) in 10" :key="index">
+					<view class="li-content">
+						<view class="">
+							<view class="title">湖南争鸣光电科技有限公司</view>
+							<view class="code">编号：KH20220304-002</view>
+							<view class="label-content">
+								<view class="label">弱电安防</view>
+								<view class="label">弱电安防</view>
+								<view class="label">弱电安防</view>
+							</view>
+						</view>
+						<view class="icon">13</view>
+					</view>
+					<view class="address">
+						<image class="img" src="../../static/iocn/dizi.png" mode=""></image>
+						<view class="text">湖南省长沙市高新开发区谷园路109号像素大厦1205</view>
+					</view>
+				</view>
+			</view>
+		</container-subgroup-two>
+	</view>
 </template>
 
 <script>
-         import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
- import statusNav from '../../components/status-nav.vue';
- export default {
-     components: {
-         statusNav,
-         containerSubgroupTwo
-     },
-        data() {
-            return {
-                
-            }
-        },
-        methods: {
-            
-        }
-    }
+	import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+	import statusNav from '../../components/status-nav.vue';
+	export default {
+		components: {
+			statusNav,
+			containerSubgroupTwo
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			// 前往客户详情
+			goDetail(index){
+				uni.navigateTo({
+					url:'/pages/dataQuery/details'
+				})
+			}
+		}
+	}
 </script>
 
-    
+
 <style>
-   
-.client-content .li{
-    background-color: #FFFFFF;
-    margin-top: 20rpx;
-    padding: 30rpx 34rpx 30rpx 53rpx;
-}
-.client-content .li .title{
-    font-size: 28rpx;
-    color: #333333;
-    margin-bottom: 25rpx;
-}
-.client-content .li .code{
-    font-size: 24rpx;
-    margin-bottom: 25rpx;
-    color: #666666;
-}
-.client-content .li .label-content{
-    display: flex;
-    padding-bottom: 22rpx;
-}
-.client-content .li .label-content .label{
-    padding:  10rpx 21rpx;
-    background-color: #EDEDED;margin-right: 12rpx;
-    color: #999999;
-    font-size: 24rpx;
-    border-radius: 5rpx;
-}
-.client-content .li  .li-content{
-    display: flex;
-    align-items: center;
-    border-bottom: 2rpx solid #EDEDED;
-    justify-content: space-between;
-}
-.client-content .li  .li-content .icon{
-    width: 71rpx;
-    height: 66rpx;
-    background-color: #00A2E9;
-    box-shadow: -5rpx 5rpx 10rpx rgba(0,0,0,0.2);
-    font-size: 36rpx;
-    color: #FFFFFF;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: bold;
-}
-    
-.client-content .li  .address{
-    display: flex;
-    align-items: center;
-    padding-top: 20rpx;
-    color: #666666;
-    font-size: 24rpx
-}
-.client-content .li  .address .img{
-    width: 17rpx;
-    height: 24rpx;
-    margin-right: 10rpx;
-}
+	.client-content .li {
+		background-color: #FFFFFF;
+		margin-top: 20rpx;
+		padding: 30rpx 34rpx 30rpx 53rpx;
+	}
+
+	.client-content .li .title {
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 25rpx;
+	}
+
+	.client-content .li .code {
+		font-size: 24rpx;
+		margin-bottom: 25rpx;
+		color: #666666;
+	}
+
+	.client-content .li .label-content {
+		display: flex;
+		padding-bottom: 22rpx;
+	}
+
+	.client-content .li .label-content .label {
+		padding: 10rpx 21rpx;
+		background-color: #EDEDED;
+		margin-right: 12rpx;
+		color: #999999;
+		font-size: 24rpx;
+		border-radius: 5rpx;
+	}
+
+	.client-content .li .li-content {
+		display: flex;
+		align-items: center;
+		border-bottom: 2rpx solid #EDEDED;
+		justify-content: space-between;
+	}
+
+	.client-content .li .li-content .icon {
+		width: 71rpx;
+		height: 66rpx;
+		background-color: #00A2E9;
+		box-shadow: -5rpx 5rpx 10rpx rgba(0, 0, 0, 0.2);
+		font-size: 36rpx;
+		color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-weight: bold;
+	}
+
+	.client-content .li .address {
+		display: flex;
+		align-items: center;
+		padding-top: 20rpx;
+		color: #666666;
+		font-size: 24rpx
+	}
+
+	.client-content .li .address .img {
+		width: 17rpx;
+		height: 24rpx;
+		margin-right: 10rpx;
+	}
 </style>
diff --git a/pages/dataQuery/details.vue b/pages/dataQuery/details.vue
index b0fa847..7e2c3aa 100644
--- a/pages/dataQuery/details.vue
+++ b/pages/dataQuery/details.vue
@@ -6,21 +6,15 @@
             <view class="details-nav">
                 <view class="li">
                     <image class="icon" src="../../static/iocn/ty.png" mode=""></image>
-                    <view class="text">
-                        基本信息
-                    </view>
+                    <view class="text">基本信息</view>
                 </view>
                 <view class="li">
                     <image class="icon" src="../../static/iocn/kh.png" mode=""></image>
-                    <view class="text">
-                        联系人
-                    </view>
+                    <view class="text">联系人</view>
                 </view>
                 <view class="li">
                     <image class="icon" src="../../static/iocn/xs.png" mode=""></image>
-                    <view class="text">
-                        项目列表
-                    </view>
+                    <view class="text">项目列表</view>
                 </view>
             </view>
             <view class="details-content">
diff --git a/pages/dataQuery/projectQuery.vue b/pages/dataQuery/projectQuery.vue
index 31fa916..fbc5031 100644
--- a/pages/dataQuery/projectQuery.vue
+++ b/pages/dataQuery/projectQuery.vue
@@ -7,40 +7,22 @@
             <view class="li" @click="projectDetailsFun()">
                 <view class="message">
                     <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-
                     <view class="text">
-                        <view class="title">
-                            湖南工业大学化工学院会议室P2.5全彩LED显示屏
-                        </view>
-                        <view class="serial-number">
-                            项目编号：20220108-1001
-                        </view>
-                        <view class="specification">
-                            规格型号：DS-CK25FI/H
-                        </view>
-                        <view class="specification">
-                            产品尺寸：3.94ｍ*2.02ｍ
-                        </view>
-                        <view class="installation-site">
-                            安装位置：xxx综合楼2楼会议室
-                        </view>
+                        <view class="title">湖南工业大学化工学院会议室P2.5全彩LED显示屏</view>
+                        <view class="serial-number">项目编号：20220108-1001</view>
+                        <view class="specification">规格型号：DS-CK25FI/H</view>
+                        <view class="specification">产品尺寸：3.94ｍ*2.02ｍ</view>
+                        <view class="installation-site">安装位置：xxx综合楼2楼会议室</view>
                     </view>
                 </view>
-
                 <view class="project-list-address">
                     <view class="address">
                         <image class="img" src="../../static/iocn/im.png" mode="aspectFill"></image>
-                        <view class="text">
-                            湖南省长沙市高新开发区谷园路109号像素大厦1205
-                        </view>
-                    </view>
-                    <view class="date">
-                        2022/01/08
+                        <view class="text">湖南省长沙市高新开发区谷园路109号像素大厦1205</view>
                     </view>
+                    <view class="date">2022/01/08</view>
                 </view>
-                <view class="icon iconBer">
-                    质保到期
-                </view>
+                <view class="icon iconBer">质保到期</view>
             </view>
             <view class="li">
                 <view class="message">
diff --git a/pages/dataQuery/queryFunction.vue b/pages/dataQuery/queryFunction.vue
index 81c216d..c3f960c 100644
--- a/pages/dataQuery/queryFunction.vue
+++ b/pages/dataQuery/queryFunction.vue
@@ -1,14 +1,8 @@
 <template>
-
     <view>
-        
-        
         <view class="head">
-            <view class="text">
-                查询功能
-            </view>
+            <view class="text">查询功能</view>
         </view>
-
         <view class="queryFunction-head-content">
             <view class="queryFunction-head-nav">
                 <view class="li" @click="navIndex(index)"
@@ -16,47 +10,27 @@
                     v-for="(item,index) in dataList">
                     {{item.title}}
                 </view>
-
             </view>
             <view class="queryFunction-head-Fun">
                 <input type="text" placeholder="请输入关键词进行查询" class="queryFunction-head-input" value="" />
-                <view class="button">
-                    查询
-                </view>
+                <view @tap="checkEv(dataIndex)" class="button">查询</view>
             </view>
-
-
-
-
         </view>
-
-        <view class="recently-query-title">
-            最近查询
-        </view>
-
+        <view class="recently-query-title">最近查询</view>
         <view class="recently-query-content">
             <view class="li">
                 <image class="icon" src="../../static/iocn/jfd.png" mode=""></image>
                 <view class="text-content">
-                    <view class="title">
-                        湖南争鸣光电科技有限公司
-                    </view>
-                    <view class="text">
-                        编号：FRID23123141123321124
-                    </view>
-                    <view class="text">
-                        2121-1-8 12:23
-                    </view>
+                    <view class="title">湖南争鸣光电科技有限公司</view>
+                    <view class="text">编号：FRID23123141123321124</view>
+                    <view class="text">2121-1-8 12:23</view>
                 </view>
             </view>
         </view>
-
         <view class="imgJCon">
             <image class="imgJ" src="../../static/iocn/jh.png" mode=""></image>
         </view>
-
     </view>
-
 </template>
 
 <script>
@@ -86,8 +60,15 @@
                 this.dataIndex = index
             },
             // 查询事件
-            checkEv() {
-                console.log(this.key_word);
+            checkEv(index) {
+				let urls = [
+					'/pages/dataQuery/client',
+					'/pages/dataQuery/projectQuery',
+					'/pages/dataQuery/dataQuery'
+				]
+				uni.navigateTo({
+					url: `${urls[index]}?key_word=${this.key_word}`
+				})
             }
         }
     }
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 83546b6..328a7c6 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -226,7 +226,7 @@
 		},
 		data() {
 			return {
-				role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
+				role: 3, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量
 				noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
@@ -382,8 +382,8 @@
 			// 其他分类下的点击事件
 			otherEv(index) {
 				let otherUrls = [
-					'',
-					'',
+					'/pages/faultStatistics/faultStatistics',
+					'/pages/faultStatistics/projectOverview',
 					'/pagesB/new-product/new-product',
 				];
 				uni.navigateTo({
diff --git a/readme.md b/readme.md
index 6e041e2..b3ab5cd 100644
--- a/readme.md
+++ b/readme.md
@@ -15,4 +15,5 @@
 	:ifCenter="true"
 	:paddingStr="'20rpx'"></pitera>
 	
--->
\ No newline at end of file
+-->
+