From 1fa75fba6c4ee506afee692fad968ccf0c3c7431 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Thu, 24 Mar 2022 16:34:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E3=80=81=E8=B0=83=E7=94=A8=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E3=80=81?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=B8=B8=E8=A7=81=E9=97=AE=E9=A2=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/base.css                              |  11 +
 commons/flying-monkey.css                     |  19 +
 jsFile/public-api.js                          |   5 +
 jsFile/requst.js                              |   2 +-
 pages.json                                    |  13 +-
 pages/dataQuery/queryFunction.vue             | 386 ++++++------
 pages/login/login.vue                         |   9 +-
 pages/project/projectList.vue                 | 566 ++++++++----------
 pages/tabbar/pagehome/pagehome.vue            |  76 ++-
 pagesB/message-center/message-center.vue      |  46 ++
 .../personal-information.vue                  | 104 +++-
 pagesB/plan-fault-product-detail/detail.vue   |  36 +-
 pagesB/plan-fault/plan-fault.vue              |  59 +-
 pagesB/service-range/service-range.vue        |  20 +-
 pagesB/set-up/set-up.vue                      |  42 +-
 15 files changed, 821 insertions(+), 573 deletions(-)
 create mode 100644 jsFile/public-api.js
 create mode 100644 pagesB/message-center/message-center.vue

diff --git a/commons/base.css b/commons/base.css
index 525bf77..f660238 100644
--- a/commons/base.css
+++ b/commons/base.css
@@ -169,6 +169,17 @@ button:after{content: none!important;}
 /* 文字空两格 */
 .tindent{text-indent: 2em;}
 
+/* 元素缩小 */
+.scal13{transform: scale(1.3);}
+.scal12{transform: scale(1.2);}
+.scal11{transform: scale(1.1);}
+.scal10{transform: scale(1);}
+.scal09{transform: scale(.9);}
+.scal08{transform: scale(.8);}
+.scal07{transform: scale(.7);}
+.scal06{transform: scale(.6);}
+.scal05{transform: scale(.5);}
+
 /* 行间距 */
 .linh40{line-height: 40rpx;}
 .linh50{line-height: 50rpx;}
diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index 1ed5c5c..a6b2c2b 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -357,4 +357,23 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
 	border-radius: 6rpx;
 	padding: 6rpx 20rpx;
 	margin-top: 10rpx;
+}
+/* 消息中心 */
+.message-circle::before {
+	content: '';
+	display: flex;
+	width: 24rpx;
+	height: 24rpx;
+	background-color: #6f91ff;
+	border-radius: 100%;
+	margin-right: 20rpx;
+}
+.activity-message::before {
+	background-color: #6f91ff;
+}
+.audit-failed::before {
+	background-color: #f15d5d;
+}
+.system-notification::before {
+	background-color: #2cfc3b;
 }
\ No newline at end of file
diff --git a/jsFile/public-api.js b/jsFile/public-api.js
new file mode 100644
index 0000000..bc8d59e
--- /dev/null
+++ b/jsFile/public-api.js
@@ -0,0 +1,5 @@
+import request from './requst.js';
+export function uploadImg(data) {
+	console.log(data,3);
+  return request.upload("/universal/api.upload/upload", data);
+}
\ No newline at end of file
diff --git a/jsFile/requst.js b/jsFile/requst.js
index 1dfc909..5a3f313 100644
--- a/jsFile/requst.js
+++ b/jsFile/requst.js
@@ -105,7 +105,7 @@ const request = (method, url, options) => {
 // 上传文件 封装请求
 const uploadFile = (url, options) => {
     let tempData = options || {}
-
+	console.log(tempData,108);
     return new Promise((resolve, reject) => {
         uni.uploadFile({
             url: `${uni.getStorageSync('hostapi')}${url}`,
diff --git a/pages.json b/pages.json
index 8640ea7..b1f090d 100644
--- a/pages.json
+++ b/pages.json
@@ -230,7 +230,9 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
+				"navigationBarTextStyle": "white"
             }
             
         }
@@ -313,6 +315,15 @@
                     "enablePullDownRefresh": false
                 }
                 
+                }
+                ,{
+                    "path" : "message-center/message-center",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
                 }
             ]
         }
diff --git a/pages/dataQuery/queryFunction.vue b/pages/dataQuery/queryFunction.vue
index ebf1017..7f5dd01 100644
--- a/pages/dataQuery/queryFunction.vue
+++ b/pages/dataQuery/queryFunction.vue
@@ -1,193 +1,211 @@
 <template>
-    <view>
-        <view class="head">
-            <view class="text">
-                查询功能
-            </view>
-        </view>
-        
-        <view class="queryFunction-head-content">
-            <view class="queryFunction-head-nav">
-                <view class="li" @click="navIndex(index)" :class="[dataIndex==0?'li1':'',dataIndex==1?'li2':'',dataIndex==2?'li3':'' ]"
-               
-                 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>
-            
-            
-        
-          
-         
-        </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>
-            </view>
-        </view>
-    </view>
+	<view>
+		<view class="head">
+			<view class="text">查询功能</view>
+		</view>
+		<view class="queryFunction-head-content">
+			<view class="queryFunction-head-nav">
+				<view class="li" @click="navIndex(index)"
+					:class="[dataIndex==0?'li1':'',dataIndex==1?'li2':'',dataIndex==2?'li3':'' ]"
+					v-for="(item,index) in dataList" :key="index">
+						{{item.title}}
+						<view v-show="dataIndex==index" class="typeActive"></view>
+				</view>
+			</view>
+			<view class="queryFunction-head-Fun">
+				<input type="text" v-model="key_word" placeholder="请输入关键词进行查询" class="queryFunction-head-input" placeholder-style="font-size:28rpx;color:#959595;" />
+				<view class="button" @tap="checkEv">查询</view>
+			</view>
+		</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>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                dataIndex:0,
-                dataList:[
-                    {
-                        title:"客户查询",
-                    },
-                    {
-                        title:"项目查询",
-                    },
-                    {
-                        title:"备品查询",
-                    },
-                ]
-            }
-        },
-        methods: {
-            navIndex(index){
-                this.dataIndex=index
-            }
-        }
-    }
+	export default {
+		data() {
+			return {
+				dataIndex: 0,
+				dataList: [{
+						title: "客户查询",
+					},
+					{
+						title: "项目查询",
+					},
+					{
+						title: "备品查询",
+					},
+				],
+				key_word:'', // 关键词
+			}
+		},
+		onLoad(op) {
+			if(op.index!=undefined) this.dataIndex = op.index;
+		},
+		methods: {
+			// 查询类型切换
+			navIndex(index) {
+				this.dataIndex = index
+			},
+			// 查询事件
+			checkEv(){
+				console.log(this.key_word);
+			}
+		}
+	}
 </script>
 
 <style>
-.head{
-    width: 100%;
-    height: 344rpx;
-    padding: 0 35rpx;
-    padding-top: 107rpx;
-    background-color: #00A2E9;
-    box-sizing: border-box;
-    
-}
+	.head {
+		width: 100%;
+		height: 344rpx;
+		padding: 0 35rpx;
+		padding-top: 107rpx;
+		background-color: #00A2E9;
+		box-sizing: border-box;
 
-.head .text{
-    font-size: 41rpx;color: #FFFFFF;
-}
-.queryFunction-head-content{
-    width: 676rpx;
-    height: 400rpx;
-    background-color: #FFFFFF;
-    margin: auto;
-    border-radius: 15rpx;
-    margin-top: -130rpx;
-}
-.queryFunction-head-nav{
-    display: flex;
-      border-radius: 15rpx 15rpx 0 0;
-      overflow: hidden;
-}
-.queryFunction-head-nav .li{
-    width: 233rpx;
-    color: #505050;
-    height: 102rpx;
-  
-    background-color: #F5F5F5;
-    display: flex;
-    align-items: center;
-    font-size: 35rpx;
-    justify-content: center;
-}
-.queryFunction-head-nav .li1:nth-child(2){
-    border-radius: 15rpx 0rpx 0rpx 15rpx;
-}
-.queryFunction-head-nav .li1:nth-child(1){
-    background-color: #FFFFFF;
-}
-.queryFunction-head-nav .li2:nth-child(2){
-    background-color: #FFFFFF;
-}
-.queryFunction-head-nav .li2:nth-child(1){
-       border-radius: 0rpx 15rpx 15rpx 0rpx;
-}
-.queryFunction-head-nav .li2:nth-child(3){
-    border-radius: 15rpx 0rpx 0rpx 15rpx;
-}
-.queryFunction-head-nav .li3:nth-child(2){
-       border-radius: 0rpx 15rpx 15rpx 0rpx;
-}
-.queryFunction-head-nav .li3:nth-child(3){
-   background-color: #FFFFFF;
-}
-.queryFunction-head-input{
-    height: 116rpx;
-    width: 100%;
-    border-bottom: 2rpx solid #eeeeee;
-    
-}
-.queryFunction-head-Fun{
- padding: 0 32rpx;   
- 
-}
-    
-.queryFunction-head-Fun .button{
-    background-color: #00A2E9;border-radius: 15rpx;
-    height: 80rpx;
-    color: #FFFFFF;
-    text-align: center;
-    margin-top: 34rpx;
-    line-height: 80rpx;
-}
-    
-.recently-query-title {
-    color: #040b26;
-    font-weight: bold;
-     padding: 50rpx 34rpx 44rpx;   
-}
-.recently-query-content{
-    padding: 0 34rpx;
-    box-sizing: border-box;
-}
-.recently-query-content .li{
-    width: 100%;
-    height: 232rpx;
-    box-sizing: border-box;
-    background-color: #FFFFFF;border-radius: 15rpx;
-    padding-top: 30rpx;
-    padding-left: 40rpx;
-    margin-bottom: 37rpx;
-    display: flex;
-}
-.recently-query-content .li .icon{
-    width: 37rpx;
-    height: 37rpx;
-    margin-right: 40rpx;
-}
-.recently-query-content .li .text-content .title{
-    color: #30364c;
-    font-size: 33rpx;
-    margin-bottom: 25rpx;
-}
-.recently-query-content .li .text-content .text{
-    color: #b5b5b5;
-    font-size: 27rpx;
-     margin-bottom: 25rpx;
-}
+	}
+
+	.head .text {
+		font-size: 41rpx;
+		color: #FFFFFF;
+	}
+
+	.queryFunction-head-content {
+		width: 676rpx;
+		height: 400rpx;
+		background-color: #FFFFFF;
+		margin: auto;
+		border-radius: 15rpx;
+		margin-top: -130rpx;
+	}
+
+	.queryFunction-head-nav {
+		display: flex;
+		border-radius: 15rpx 15rpx 0 0;
+		overflow: hidden;
+	}
+
+	.queryFunction-head-nav .li {
+		position: relative;
+		width: 233rpx;
+		color: #505050;
+		height: 102rpx;
+		background-color: #F5F5F5;
+		display: flex;
+		align-items: center;
+		font-size: 35rpx;
+		justify-content: center;
+	}
+	.typeActive {
+		position: absolute;
+		width: 30%;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		height: 6rpx;
+		border-radius: 21%;
+		background-color: #00A2E9;
+	}
+	.queryFunction-head-nav .li1:nth-child(2) {
+		border-radius: 15rpx 0rpx 0rpx 15rpx;
+	}
+
+	.queryFunction-head-nav .li1:nth-child(1) {
+		background-color: #FFFFFF;
+	}
+
+	.queryFunction-head-nav .li2:nth-child(2) {
+		background-color: #FFFFFF;
+	}
+
+	.queryFunction-head-nav .li2:nth-child(1) {
+		border-radius: 0rpx 15rpx 15rpx 0rpx;
+	}
+
+	.queryFunction-head-nav .li2:nth-child(3) {
+		border-radius: 15rpx 0rpx 0rpx 15rpx;
+	}
+
+	.queryFunction-head-nav .li3:nth-child(2) {
+		border-radius: 0rpx 15rpx 15rpx 0rpx;
+	}
+
+	.queryFunction-head-nav .li3:nth-child(3) {
+		background-color: #FFFFFF;
+	}
+
+	.queryFunction-head-input {
+		margin-top: 20rpx;
+		height: 100rpx;
+		width: 100%;
+		border-bottom: 2rpx solid #eeeeee;
+
+	}
+
+	.queryFunction-head-Fun {
+		padding: 0 32rpx;
+
+	}
+
+	.queryFunction-head-Fun .button {
+		background-color: #00A2E9;
+		border-radius: 15rpx;
+		height: 80rpx;
+		color: #FFFFFF;
+		text-align: center;
+		margin-top: 34rpx;
+		line-height: 80rpx;
+	}
+
+	.recently-query-title {
+		color: #040b26;
+		font-weight: bold;
+		padding: 50rpx 34rpx 44rpx;
+	}
+
+	.recently-query-content {
+		padding: 0 34rpx;
+		box-sizing: border-box;
+	}
+
+	.recently-query-content .li {
+		width: 100%;
+		height: 232rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		border-radius: 15rpx;
+		padding-top: 30rpx;
+		padding-left: 40rpx;
+		margin-bottom: 37rpx;
+		display: flex;
+	}
+
+	.recently-query-content .li .icon {
+		width: 37rpx;
+		height: 37rpx;
+		margin-right: 40rpx;
+	}
+
+	.recently-query-content .li .text-content .title {
+		color: #30364c;
+		font-size: 33rpx;
+		margin-bottom: 25rpx;
+	}
+
+	.recently-query-content .li .text-content .text {
+		color: #b5b5b5;
+		font-size: 27rpx;
+		margin-bottom: 25rpx;
+	}
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index e6a7b2f..fbeaf3b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -8,7 +8,7 @@
 					<view style="width: 30rpx;">
 						<image style="width: 30rpx;height: 28rpx;" src="/static/public/icon-people.png" mode=""></image>
 					</view>
-					<input type="number" @blur="inputBlurEv(0)" @focus="inputFocusEv(0)" @input="inputFocusEv(0)" v-model="login_phone" maxlength="11" placeholder="请输入手机号" placeholder-class="col9" />
+					<input class="width100" type="number" @blur="inputBlurEv(0)" @focus="inputFocusEv(0)" @input="inputFocusEv(0)" v-model="login_phone" maxlength="11" placeholder="请输入手机号" placeholder-class="col9" />
 					<!-- 清除按钮 -->
 					<view class="clear-box" v-show="ifPhone" @tap="clearInput(0)" style="right: 20rpx;"><view class="clear-close"><span></span><span></span></view></view>
 				</view>
@@ -17,7 +17,7 @@
 					<view style="width: 30rpx;">
 						<image style="width: 22rpx;height: 26rpx;" src="/static/public/icon-password.png" mode=""></image>
 					</view>
-					<input type="number" v-model="login_code" maxlength="6" @blur="inputBlurEv(1)" @focus="inputFocusEv(1)" @input="inputFocusEv(1)" placeholder="请输入验证码" placeholder-class="col9" />
+					<input class="width100" type="number" v-model="login_code" maxlength="6" @blur="inputBlurEv(1)" @focus="inputFocusEv(1)" @input="inputFocusEv(1)" placeholder="请输入验证码" placeholder-class="col9" />
 					<view class="login-code-btn" @tap="getCode">{{codeText}}</view>
 					<!-- 清除按钮 -->
 					<view class="clear-box" v-show="ifCode" @tap="clearInput(1)" style="right: 260rpx;"><view class="clear-close"><span></span><span></span></view></view>
@@ -27,7 +27,7 @@
 					<view style="width: 30rpx;">
 						<image style="width: 22rpx;height: 26rpx;" src="/static/public/icon-password.png" mode=""></image>
 					</view>
-					<input type="text" password v-model="login_password" @blur="inputBlurEv(3)" @focus="inputFocusEv(3)" @input="inputFocusEv(3)" placeholder="请输入密码" placeholder-class="col9" />
+					<input class="width100" type="text" password v-model="login_password" @blur="inputBlurEv(3)" @focus="inputFocusEv(3)" @input="inputFocusEv(3)" placeholder="请输入密码" placeholder-class="col9" />
 					<view class="clear-box" v-show="ifPassword" @tap="clearInput(3)" style="right: 20rpx;"><view class="clear-close"><span></span><span></span></view></view>
 				</view>
 				<!-- 单位名称 -->
@@ -35,7 +35,7 @@
 					<view style="width: 30rpx;">
 						<image style="width: 26rpx;height: 26rpx;" src="/static/public/icon-unit.png" mode=""></image>
 					</view>
-					<input type="text" v-model="login_unitName" @blur="inputBlurEv(2)" @focus="inputFocusEv(2)" @input="inputFocusEv(2)" placeholder="请输入单位名称" placeholder-class="col9" />
+					<input class="width100" type="text" v-model="login_unitName" @blur="inputBlurEv(2)" @focus="inputFocusEv(2)" @input="inputFocusEv(2)" placeholder="请输入单位名称" placeholder-class="col9" />
 					<!-- 清除按钮 -->
 					<view class="clear-box" v-show="ifunitName" @tap="clearInput(2)" style="right: 20rpx;"><view class="clear-close"><span></span><span></span></view></view>
 				</view>
@@ -96,6 +96,7 @@
 							this.$toolAll.tools.showToast('登录成功');
 							// 缓存token和角色类型
 							uni.setStorageSync('token',res.data.token);
+							// 角色(1：业务员、2：客户、3：客服、4：工程师)  
 							uni.setStorageSync('type_id',res.data.type_id);
 							setTimeout(()=>{
 								uni.reLaunch({
diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue
index 41f5b75..2da386a 100644
--- a/pages/project/projectList.vue
+++ b/pages/project/projectList.vue
@@ -1,353 +1,289 @@
 <template>
-    <view class="content">
-      <statusNav navBarTitle="项目列表"></statusNav>
-        <view class="project-list-input">
-            <input type="text" class="int" value="" placeholder="请输入关键字" />
-            <image class="search" src="../../static/iocn/ss.png" mode=""></image>
-        </view>
+	<view class="content" :style="{paddingTop: statusHeight + 'px'}">
+		<statusNav navBarTitle="项目列表" :ifReturn="false"></statusNav>
+		<view class="project-list-input">
+			<input type="text" class="int" value="" placeholder="请输入关键字" />
+			<image class="search" src="../../static/iocn/ss.png" mode="aspectFill" lazy-load></image>
+		</view>
+		<view class="screen bbot mar-sx20">
+			<picker @change="bindPickerChange" :value="index" :range="array">
+				<view class="li">
+					<view class="text">产品类型</view>
+					<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
+				</view>
+			</picker>
+			<picker mode="date" :value="date" @change="bindDateChange">
+				<view class="li">
+					<view class="text">竣工日期</view>
+					<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
+				</view>
+			</picker>
+			<view class="li">
+				<view class="text">筛选</view>
+				<image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill" lazy-load></image>
+			</view>
+		</view>
+		<view class="project-list">
+			<view class="li" @click="projectDetailsFun()" v-for="(item,index) in 10" :key="index">
+				<view class="message">
+					<image class="img" src="../../static/del/项目图片.png" mode="aspectFill" lazy-load></image>
+					<view class="text disjb fc" style="height: 180rpx;">
+						<view class="clips1 fon24 bold">湖南工业大学化工学院会议室P2.5全彩LED显示屏</view>
+						<view class="disjb fc" style="margin-left: -20rpx;height: 80%;">
+							<view class="serial-number scal09">项目编号：20220108-1001</view>
+							<view class="specification scal09">规格型号：DS-CK25FI/H</view>
+							<view class="specification scal09">产品尺寸：3.94ｍ*2.02ｍ</view>
+							<view class="installation-site scal09">安装位置：xxx综合楼2楼会议室</view>
+						</view>
+					</view>
+				</view>
+				<view class="project-list-address col6 mar-s20 disjbac">
+					<view class="address">
+						<image class="img flexs" src="../../static/iocn/im.png" mode="scaleToFill" lazy-load></image>
+						<view class="text  scal09" style="margin-left: -26rpx;">湖南省长沙市高新开发区谷园路109号像素大厦1205</view>
+					</view>
+					<view class="date scal09">2022/01/08</view>
+				</view>
+				<view class="icon iconBer">质保到期</view>
+			</view>
+			<!-- <view class="li">
+				<view class="message">
+					<image class="img" src="../../static/del/项目图片.png" mode="aspectFill" lazy-load></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>
+				</view>
+				<view class="project-list-address">
+					<view class="address">
+						<image class="img" src="../../static/iocn/im.png" mode="aspectFill" lazy-load></image>
+						<view class="text">湖南省长沙市高新开发区谷园路109号像素大厦1205</view>
+					</view>
+					<view class="date">2022/01/08</view>
+				</view>
+				<view class="icon iconBera">质保中</view>
+			</view> -->
+		</view>
 
-
-        <view class="screen">
-                    <picker @change="bindPickerChange" :value="index" :range="array">
-            <view class="li">
-                <view class="text">
-                    产品类型
-                </view>
-                <image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image>
-
-            </view>
-    </picker>
-            <picker mode="date" :value="date"  @change="bindDateChange">
-                
-                <view class="li">
-                    <view class="text">
-                        竣工日期
-                    </view>
-                    <image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image>
-                </view>
-
-            </picker>
-
-            <view class="li">
-                <view class="text">
-                    筛选
-                </view>
-                <image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill"></image>
-            </view>
-        </view>
-
-        <view class="project-list">
-            <view class="li" @click="projectDetailsFun()">
-                <view class="message">
-                    <image class="img" src="../../static/del/项目图片.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>
-                </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>
-                </view>
-                <view class="icon iconBer">
-                    质保到期
-                </view>
-            </view>
-            <view class="li">
-                <view class="message">
-                    <image class="img" src="../../static/del/项目图片.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>
-                </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>
-                </view>
-                <view class="icon iconBera">
-                    质保中
-                </view>
-            </view>
-        </view>
-
-    	<footTabOne :current="1"></footTabOne>	
-    </view>
+		<footTabOne :current="1"></footTabOne>
+	</view>
 </template>
 
 <script>
-    import statusNav from '../../components/status-nav.vue';
-      import footTabOne from "../../components/foot-tabs/foot-tab-one.vue"
-    export default {
-        components:{
-            footTabOne,
-            statusNav
-        },
-        data() {
-            const currentDate = this.getDate({
-                format: true
-            })
-            return {
-                date: currentDate,
-                array: ['类型', '类型', '类型', '类型'],
-                   index: 0,
-            }
-        },
-        methods: {
-            projectDetailsFun(){
-                uni.navigateTo({
-                    url:"/pages/project/details"
-                })
-            },
-            bindPickerChange(data){
-                  console.log(data)
-            },
-            bindDateChange(date){
-                 console.log(date)
-            },
-            getDate(type) {
-                const date = new Date();
-                let year = date.getFullYear();
-                let month = date.getMonth() + 1;
-                let day = date.getDate();
+	import statusNav from '../../components/status-nav.vue';
+	import footTabOne from "../../components/foot-tabs/foot-tab-one.vue"
+	export default {
+		components: {
+			footTabOne,
+			statusNav
+		},
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
+			return {
+				date: currentDate,
+				array: ['类型', '类型', '类型', '类型'],
+				index: 0,
+				statusHeight: uni.getSystemInfoSync().statusBarHeight + 40
+			}
+		},
+		methods: {
+			projectDetailsFun() {
+				uni.navigateTo({
+					url: "/pages/project/details"
+				})
+			},
+			bindPickerChange(data) {
+				console.log(data)
+			},
+			bindDateChange(date) {
+				console.log(date)
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
 
-                if (type === 'start') {
-                    year = year - 60;
-                } else if (type === 'end') {
-                    year = year + 2;
-                }
-                month = month > 9 ? month : '0' + month;
-                day = day > 9 ? day : '0' + day;
-                console.log(year,month,day)
-                return `${year}-${month}-${day}`;
-            }
-        }
-    }
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				console.log(year, month, day)
+				return `${year}-${month}-${day}`;
+			}
+		}
+	}
 </script>
 
 <style scoped>
-    page {
-        background-color: #F7F7F7;
-    }
-     
- .content{
-     padding-top: 76rpx;
- }
-    .project-list-input {
-        width: 100%;
-        height: 114rpx;
-        position: relative;
-        padding: 20rpx 16rpx;
-        box-sizing: border-box;
-        background-color: #FFFFFF
-    }
+	page {
+		background-color: #F7F7F7;
+	}
 
-    .project-list-input .int {
-        width: 100%;
-        height: 100%;
-        background-color: #F7F7F7;
-        padding: 0 25rpx;
-        box-sizing: border-box;
-        border-radius: 36rpx;
-    }
+	.content {
+		/* padding-top: 76rpx; */
+		padding-bottom: 160rpx;
+	}
 
-    .project-list-input .search {
-        width: 28rpx;
-        height: 28rpx;
-        position: absolute;
-        right: 43rpx;
-        top: 50%;
-        margin-top: -14rpx;
-    }
+	.project-list-input {
+		width: 100%;
+		height: 114rpx;
+		position: relative;
+		padding: 20rpx 16rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF
+	}
 
-    .screen {
-        display: flex;
-        justify-content: space-around;
-        padding: 46rpx 20rpx;
-    }
+	.project-list-input .int {
+		width: 100%;
+		height: 100%;
+		background-color: #F7F7F7;
+		padding: 0 25rpx;
+		box-sizing: border-box;
+		border-radius: 36rpx;
+	}
 
-    .screen .li {
-        display: flex;
-        align-items: center;
+	.project-list-input .search {
+		width: 28rpx;
+		height: 28rpx;
+		position: absolute;
+		right: 43rpx;
+		top: 50%;
+		margin-top: -14rpx;
+	}
 
-    }
+	.screen {
+		display: flex;
+		justify-content: space-around;
+		padding: 26rpx 20rpx;
+		border-top: 1rpx solid #EEEEEE;
+	}
 
-    .screen .li .text {
-        font-size: 32rpx;
-        color: #333333;
-        margin-right: 10rpx;
-    }
+	.screen .li {
+		display: flex;
+		align-items: center;
 
-    .screen .li .img {
-        width: 14rpx;
-        height: 8rpx;
-    }
+	}
 
-    .screen .li .imgA {
-        width: 24rpx;
-        height: 23rpx;
-    }
+	.screen .li .text {
+		font-size: 26rpx;
+		color: #333333;
+		margin-right: 10rpx;
+	}
 
-    .project-list .li {
-        width: 710rpx;
-        box-sizing: border-box;
-        background-color: #FFFFFF;
-        position: relative;
+	.screen .li .img {
+		width: 14rpx;
+		height: 8rpx;
+	}
 
-        margin: auto;
-        margin-bottom: 20rpx;
-        padding: 33rpx 23rpx;
-    }
+	.screen .li .imgA {
+		width: 24rpx;
+		height: 23rpx;
+	}
 
-    .project-list .li .icon {
-        width: 135rpx;
-        height: 40rpx;
-        position: absolute;
-        font-size: 24rpx;
-        color: #FFFFFF;
-        right: 23rpx;
-        line-height: 40rpx;
-        text-align: center;
-        background-size: 100% 100%;
-        top: -10rpx;
+	.project-list .li {
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		position: relative;
+		margin: 0 20rpx;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+		padding: 40rpx 20rpx 20rpx 20rpx;
+	}
 
+	.project-list .li .icon {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 135rpx;
+		height: 40rpx;
+		position: absolute;
+		font-size: 22rpx;
+		color: #FFFFFF;
+		right: 23rpx;
+		text-align: center;
+		background-size: 100% 100%;
+		top: -10rpx;
+	}
 
-    }
+	.project-list .li .iconBer {
+		background-image: url(../../static/iocn/za.png);
+	}
 
-    .project-list .li .iconBer {
-        background-image: url(../../static/iocn/za.png);
-    }
+	.project-list .li .iconBera {
+		background-image: url(../../static/iocn/zaa.png);
+	}
 
-    .project-list .li .iconBera {
-        background-image: url(../../static/iocn/zaa.png);
-    }
+	.project-list .li .message {
+		display: flex;
 
-    .project-list .li .message {
-        display: flex;
+	}
 
-    }
+	.project-list .li .message .img {
+		width: 230rpx;
+		margin-right: 11rpx;
+		height: 180rpx;
 
-    .project-list .li .message .img {
-        width: 230rpx;
-        margin-right: 11rpx;
-        height: 180rpx;
+	}
 
-    }
+	.project-list .li .message .text {
+		flex: 1;
+	}
+	.project-list .li .message .serial-number {
+		color: #ff8800;
+		font-size: 22rpx;
+		/* margin-bottom: 15rpx; */
+	}
 
-    .project-list .li .message .text {
-        flex: 1;
-    }
+	.project-list .li .message .specification {
+		color: #00b1ff;
+		font-size: 22rpx;
+		/* margin-bottom: 15rpx; */
+	}
 
-    .project-list .li .message .text .title {
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 1;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        word-wrap: break-word;
-        word-break: break-all;
-        margin-bottom: 15rpx;
-        font-size: 28rpx;
-        line-height: 29rpx;
-        color: #333333;
-        font-weight: bold;
-    }
+	.project-list .li .message .installation-site {
+		color: #6b6a6a;
+		font-size: 22rpx;
+		/* margin-bottom: 15rpx; */
+	}
 
-    .project-list .li .message .serial-number {
-        color: #ff8800;
-        font-size: 24rpx;
-        margin-bottom: 15rpx;
-        line-height: 24rpx;
-    }
+	.project-list-address {
+		display: flex;
+		/* justify-content: space-between; */
+	}
 
-    .project-list .li .message .specification {
-        color: #00b1ff;
-        font-size: 24rpx;
-        margin-bottom: 15rpx;
-        line-height: 24rpx;
-    }
+	.project-list-address .text {
+		font-size: 22rpx;
+	}
 
-    .project-list .li .message .installation-site {
-        color: #6b6a6a;
-        font-size: 24rpx;
-        margin-bottom: 15rpx;
-        line-height: 24rpx;
-    }
+	.project-list-address .date {
+		font-size: 22rpx;
+		text-align: right;
+		/* margin-left: 20rpx; */
+	}
 
-    .project-list-address {
-        display: flex;
-        /* justify-content: space-between; */
-    }
+	.project-list-address .img {
+		width: 23rpx;
+		height: 28rpx;
+		margin-right: 10rpx;
+	}
 
-    .project-list-address .text {
-        font-size: 24rpx;
-    }
+	.project-list-address .address {
+		display: flex;
+		align-items: center;
 
-    .project-list-address .date {
-        font-size: 24rpx;
-        text-align: right;
-        margin-left: 20rpx;
-        margin-top: 12rpx;
-    }
+	}
 
-    .project-list-address .img {
-        width: 23rpx;
-        height: 28rpx;
-        margin-right: 10rpx;
-    }
-
-    .project-list-address .address {
-        display: flex;
-        align-items: center;
-
-    }
-
-    .pickerDate {
-        width: 300rpx;
-        height: 300rpx;
-    }
+	.pickerDate {
+		width: 300rpx;
+		height: 300rpx;
+	}
 </style>
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 654e22a..5d3dbbf 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pad-x160">
 		<status-nav-slot>
-			<view slot="leftContent" style="width: 70px;">
+			<view slot="leftContent" @tap="goMessage" style="width: 70px;">
 				<view class="home-message-box posir disac">
 					<image src="/static/public/icon-home-message.png" mode=""></image>
 					<view v-if="messageNumber!=0">{{messageNumber}}</view>
@@ -10,7 +10,7 @@
 			<view slot="centerContent" class="disjcac">
 				<image style="width: 156rpx;height: 38rpx;" src="/static/public/icom-home-logo.png" mode="widthFix"></image>
 			</view>
-			<view slot="rightContent" class="disac">
+			<view slot="rightContent" class="disac" @tap="callEv">
 				<image class="mar-y10" style="width: 26rpx;height: 26rpx;" src="/static/public/icon-home-phone.png" mode=""></image>
 				<view class="fon26 col3">拨打电话</view>
 			</view>
@@ -41,7 +41,7 @@
 				</view>
 			</view>
 			<!-- 客户可见 -->
-			<view v-if="role==0 || role==3">
+			<view v-if="role==2 || role==1">
 				<!-- 故障报修 -->
 				<view class="home-fun-box">
 					<view class="fun-title col3 fon28 disac bold">故障报修</view>
@@ -53,10 +53,10 @@
 					</view>
 				</view>
 				<!-- 数据查询 -->
-				<view class="home-fun-box" v-if="role==3">
+				<view class="home-fun-box" v-if="role==1">
 					<view class="fun-title col3 fon28 disac bold">数据查询</view>
 					<view class="disac mar-s30">
-						<view class="disjcac fc width25" v-for="(item,index) in dataQueryList" :key="index">
+						<view @tap="dataQueryEv(index)" class="disjcac fc width25" v-for="(item,index) in dataQueryList" :key="index">
 							<view class="posir">
 								<image :style="{width: [58,58,58][index]+'rpx',height:[46,56,50][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
 								<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@@ -77,9 +77,9 @@
 				</view>
 			</view>
 			<!-- 工程师可见 -->
-			<view v-if="role==1 || role==2">
+			<view v-if="role==4 || role==3">
 				<!-- 项目维修 -->
-				<view class="home-fun-box" v-if="role==1">
+				<view class="home-fun-box" v-if="role==4">
 					<view class="fun-title col3 fon28 disac bold">项目维修</view>
 					<view class="disac mar-s30">
 						<view class="disjcac fc width25" v-for="(item,index) in projectRepairList" :key="index">
@@ -91,7 +91,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-if="role==2">
+				<view v-if="role==3">
 					<!-- 待办工单 -->
 					<view class="home-fun-box">
 						<view class="fun-title col3 fon28 disac bold">待办工单</view>
@@ -133,10 +133,10 @@
 					</view>
 				</view>
 				<!-- 数据查询 -->
-				<view class="home-fun-box" v-if="role==2">
+				<view class="home-fun-box" v-if="role==3">
 					<view class="fun-title col3 fon28 disac bold">数据查询</view>
 					<view class="disac mar-s30">
-						<view class="disjcac fc width25" v-for="(item,index) in dataQueryList" :key="index">
+						<view @tap="dataQueryEv(index)" class="disjcac fc width25" v-for="(item,index) in dataQueryList" :key="index">
 							<view class="posir">
 								<image :style="{width: [58,58,58][index]+'rpx',height:[46,56,50][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
 								<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@@ -146,7 +146,7 @@
 					</view>
 				</view>
 				<!-- 结算情况 -->
-				<view class="home-fun-box" v-if="role==1">
+				<view class="home-fun-box" v-if="role==4">
 					<view class="fun-title col3 fon28 disac bold">结算情况</view>
 					<view class="disac mar-s30">
 						<view class="disjcac fc width25" v-for="(item,index) in settlementList" :key="index">
@@ -181,9 +181,9 @@
 			</view>
 			<view class="mar-s30">
 				<scroll-view scroll-x>
-					<view :class="solutionList.length <= 4 ? 'disjbac' : 'disac'">
-						<view @tap="goDetail(0)" class="posir flexs" v-for="(item,index) in solutionList" :key="index" style="width: 23%;" :style="{marginRight: solutionList.length > 4 ? '20rpx' : ''}">
-							<image style="width: 100%;" class="radius10 " :src="item.imgsrc" mode="widthFix"></image>
+					<view :class="solutionList.length == 4 ? 'disjbac' : 'disac'">
+						<view @tap="goDetail(0)" class="posir flexs" v-for="(item,index) in solutionList" :key="index" style="width: 23%;height: 214rpx;" :style="{marginRight: solutionList.length != 4 ? '20rpx' : ''}">
+							<image style="width: 100%;height: 214rpx;" class="radius10 " :src="item.imgsrc" mode="widthFix"></image>
 							<view class="posia solution-title clips1">{{item.title}}</view>
 						</view>
 					</view>
@@ -224,7 +224,7 @@
 		},
 		data() {
 			return {
-				role: 0, // 0:表示客户 1：表示工程师 2:表示客服 3：业务员
+				role: 3, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量
 				noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
@@ -318,11 +318,45 @@
 		onLoad(options) {
 			// 获取当前页面url
 			this.$toolAll.tools.obtainUrl();
+			// 调用解决方案类型事件
+			this.getPlanType();
+			// 调用增值服务类型
+			// this.getIncrementServiceType();
 		},
 		methods: {
 			goNoticeDetail(e){
 				console.log(e);
 			},
+			// 查询增值服务类型
+			getIncrementServiceType(){
+				this.$requst.post('/universal/api.vas/vas_type').then(res=>{
+					if(res.code) {
+						
+					}
+				})
+			},
+			// 数据查询事件
+			dataQueryEv(index){
+				uni.navigateTo({
+					url:`/pages/dataQuery/queryFunction?index=${index}`
+				})
+			},
+			// 查询解决方案类型
+			getPlanType(){
+				this.$requst.post('/universal/api.solution/solution_type').then(res=>{
+					if(res.code) {
+						res.data.forEach(item=>{
+							let obj = {
+								id:item.id,
+								title:item.name,
+								imgsrc: uni.getStorageSync('hostapi') + '/' + item.cover_img,
+							}
+							this.solutionList.push(obj);
+						})
+						console.log(this.solutionList,340);
+					}
+				})
+			},
 			// 故障报修分类下的点击事件
 			goFaultRepair(index){
 				if(index!=2) {
@@ -360,6 +394,18 @@
 					url:`/pagesB/plan-fault-product-detail/detail?index=${index}`
 				})
 			},
+			// 前往消息列表页面
+			goMessage(){
+				uni.navigateTo({
+					url:`/pagesB/message-center/message-center`
+				})
+			},
+			// 拨打电话事件
+			callEv(){
+				uni.makePhoneCall({
+					phoneNumber: '15616330510'
+				})
+			}
 		}
 	}
 </script>
diff --git a/pagesB/message-center/message-center.vue b/pagesB/message-center/message-center.vue
new file mode 100644
index 0000000..7c657fd
--- /dev/null
+++ b/pagesB/message-center/message-center.vue
@@ -0,0 +1,46 @@
+<template>
+	<view>
+		<status-nav navBarTitle="消息中心" returnColor="#c2c2c2"></status-nav>
+		<container-subgroup>
+			<view slot="content">
+				<view class="bacf mar-x10" v-for="(item,index) in 10" :key="index">
+					<view class="pad-sx30 pad-zy20 disjbac">
+						<view class="fon30 message-circle disac" :class="['activity-message','audit-failed','system-notification'][index]">活动消息</view>
+						<view class="fon26 col9">2020.06.17  18:30</view>
+					</view>
+					<view class="bbot"></view>
+					<view class="fon27 line-h46 pad-zy20 pad-sx30" style="color: #737373;">恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....</view>
+				</view>
+			</view>
+		</container-subgroup>
+	</view>
+</template>
+
+<script>
+	import rate from '@/components/rate.vue';
+	export default {
+	    components:{
+	        rate
+	    },
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			this.getMessageList();
+		},
+		methods: {
+			// 查询消息列表
+			getMessageList(){
+				this.$requst.post('/universal/api.message/message_list').then(res=>{
+					
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pagesB/personal-information/personal-information.vue b/pagesB/personal-information/personal-information.vue
index c1fe229..25b86e8 100644
--- a/pagesB/personal-information/personal-information.vue
+++ b/pagesB/personal-information/personal-information.vue
@@ -5,15 +5,19 @@
 			<view slot="content" style="margin: 0 -30rpx;">
 				<view class="fon28">
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30">我的昵称</view>
-						<view style="color: #8b8b8b;">156****0510</view>
+						<view class="bold width30 flexs">我的昵称</view>
+						<view class="width100" style="color: #8b8b8b;">
+							<input type="text" v-model="nickname" placeholder="请输入昵称" placeholder-style="font-size:28rpx;color:#8b8b8b;" />
+						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30">姓名</view>
-						<view style="color: #8b8b8b;">156****0510</view>
+						<view class="bold width30 flexs">姓名</view>
+						<view class="width100" style="color: #8b8b8b;">
+							<input type="text" v-model="full_name" placeholder="请输入姓名" placeholder-style="font-size:28rpx;color:#8b8b8b;" />
+						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30">性别</view>
+						<view class="bold width30 flexs">性别</view>
 						<view class="disac">
 							<view @tap="chooseGender(1)" class="disac gender-box" :class="genderNum==1 ? 'gender-active' : ''">
 								<view></view>
@@ -26,43 +30,49 @@
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30">联系电话</view>
-						<view style="color: #8b8b8b;">15616330510</view>
+						<view class="bold width30 flexs">联系电话</view>
+						<view class="width100" style="color: #8b8b8b;">
+							<input type="number" v-model="contact_number" placeholder="请输入联系电话" placeholder-style="font-size:28rpx;color:#8b8b8b;" />
+						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
-						<view class="bold width30">电子邮箱</view>
-						<view style="color: #8b8b8b;">7607640@qq.com</view>
+						<view class="bold width30 flexs">电子邮箱</view>
+						<view class="width100" style="color: #8b8b8b;">
+							<input type="text" v-model="e_mail" placeholder="请输入电子邮箱" placeholder-style="font-size:28rpx;color:#8b8b8b;" />
+						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot mar-s10">
-						<view class="bold width30">身份证号码</view>
-						<view style="color: #8b8b8b;">430225199708210800</view>
+						<view class="bold width30 flexs">身份证号码</view>
+						<view class="width100" style="color: #8b8b8b;">
+							<input type="text" v-model="id_card_no" placeholder="请输入身份证号码" placeholder-style="font-size:28rpx;color:#8b8b8b;" />
+						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
 						<view class="bold width30 flexs">身份证正反面</view>
 						<view style="color: #f26803;" class="width100 disjbac">
-							<text>查看</text>
-							<image src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
+							<text @tap="previewImageEv(0)">查看</text>
+							<image @tap="uploadImgEv(0)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
 						<view class="bold width30 flexs">意外险材料</view>
 						<view style="color: #f26803;" class="width100 disjbac">
-							<text>查看</text>
-							<image src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
+							<text @tap="previewImageEv(1)">查看</text>
+							<image @tap="uploadImgEv(1)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
 						<view class="bold flexs mar-y40">签署工程师合作协议</view>
 						<view style="color: #f26803;" class="width100 disjbac">
-							<text>查看</text>
-							<image src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
+							<text @tap="previewImageEv(2)">查看</text>
+							<image @tap="uploadImgEv(2)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
 					<view class="bacf pad-sx30 pad-zy40 disac bbot">
 						<view class="bold width30 flexs">技能证书</view>
 						<view style="color: #f26803;" class="width100 disjbac">
-							<text>查看</text>
-							<image src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
+							<text @tap="previewImageEv(3)">查看</text>
+							<image @tap="uploadImgEv(3)" src="/static/public/icon-personInfo-upload.png" mode="widthFix" lazy-load style="width: 128rpx;height: 50rpx;"></image>
 						</view>
 					</view>
 				</view>
@@ -74,19 +84,73 @@
 
 <script>
 	import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+	import { uploadImg } from '@/jsFile/public-api.js';
 	export default {
 		components:{
 			containerSubgroupTwo
 		},
 		data() {
 			return {
-				genderNum:1 // 1：男		2：女
+				nickname:'', // 我的昵称
+				full_name:'', // 姓名
+				genderNum:1 ,// 1：男		2：女
+				contact_number:'', // 联系电话
+				e_mail:'', // 电子邮箱
+				id_card_no:'', // 身份证号码
+				imgList:[],
 			}
 		},
 		methods: {
 			// 性别切换
 			chooseGender(index){
 				this.genderNum = index;
+			},
+			// 图片上传
+			uploadImgEv(index){
+				uni.chooseImage({
+					count:1,
+					sourceType:['album'],
+					success: (res) => {
+						let tempImg = res.tempFilePaths;
+						this.imgList[index] = tempImg[0];
+						let params = {
+							token: uni.getStorageSync('token'),
+							dir: 'images',
+							from:tempImg[0]
+						}
+						console.log(params,104);
+						// uploadImg(params).then(res=>{
+						// 	console.log(res);
+						// })
+							// this.$requst.upload('file/upload/image',{file:tempImg[i]}).then(res=>{
+							// 	if(this.imgArr.length!=9){
+							// 		this.imgArr.push(this.$http + res.data.src);
+							// 	}
+							// 	if(num==tempImg.length){
+							// 		this.$toolAll.tools.showToast('上传成功(*^▽^*)')
+							// 	} else {
+							// 		this.$toolAll.tools.showToast('上传中...')
+							// 	}
+							// },error=>{})
+					}
+				})
+			},
+			// 预览图片
+			previewImageEv(current){
+				let arr = [];
+				// 不能滑动看其他的图片
+				this.imgList.forEach((item,index)=>{
+					if(current==index) arr.push(item);
+				})
+				if(arr.length) {
+					uni.previewImage({
+						current:current,
+						urls: arr,
+						success() {}
+					})
+				} else {
+					this.$toolAll.tools.showToast('无内容...')
+				}
 			}
 		}
 	}
diff --git a/pagesB/plan-fault-product-detail/detail.vue b/pagesB/plan-fault-product-detail/detail.vue
index 798332b..11a8cc6 100644
--- a/pagesB/plan-fault-product-detail/detail.vue
+++ b/pagesB/plan-fault-product-detail/detail.vue
@@ -4,11 +4,15 @@
 		<container-subgroup>
 			<view slot="content" style="margin: 0 -30rpx;" class="fon28">
 				<view class="bacf pad-zy30 pad-sx20" style="margin-top: -10rpx;">
-					<view class="fon38 col0 tcenter">智能会议平板交互电子白板会议一体机 视频会议多媒体教学培训</view>
-					<view class="col6 fon28 tcenter mar-sx20">2022-01-05  12:59</view>
+					<!-- 标题 -->
+					<view class="fon38 col0 tcenter">{{dataObj.title}}</view>
+					<!-- 时间 -->
+					<view class="col6 fon28 tcenter mar-sx20">{{dataObj.create_time}}</view>
 					<view class="fon30 line-h60">
-						<image src="/static/del/QQ截图20220210213041.png" mode="widthFix" style="width: 100%;"></image>
-						<view class="tindent">霜降，是二十四节气中的第十八个节气，秋季的最后一个节气。斗指戌；太阳黄经为210°；于每年公历10月23—24日交</view>
+						<!-- 封面图 -->
+						<image :src="dataObj.cover_img" mode="widthFix" style="width: 100%;"></image>
+						<!-- 详情 -->
+						<rich-text :nodes="rich_text"></rich-text>
 					</view>
 				</view>
 			</view>
@@ -20,11 +24,16 @@
 	export default {
 		data() {
 			return {
-				detailTitle:''
+				detailTitle:'',
+				current:0,
+				dataObj:{},
+				rich_text:''//富文本
 			}
 		},
 		onLoad(op) {
 			this.detailTitle = `${['方案详情','详情概述','产品详情'][op.index*1]}`;
+			this.current = op.index*1;
+			this.getDetail(op.id);
 		},
 		methods: {
 			// 去新产品详情
@@ -32,6 +41,23 @@
 				uni.navigateTo({
 					url:'/pagesB/product-detail/product-detail'
 				})
+			},
+			// 查看详情
+			getDetail(id){
+				let urls = [
+					'/universal/api.solution/solution_info',
+					'/universal/api.question/question_info',
+				]
+				this.$requst.get(urls[this.current],{id}).then(res=>{
+					if(res.code==1) {
+						this.dataObj = res.data;
+						// 日期转换
+						this.dataObj.create_time = this.$toolAll.tools.timestampToTime(this.dataObj.create_time);
+						// 封面图
+						this.dataObj.cover_img = uni.getStorageSync('hostapi') + '/' + this.dataObj.cover_img,
+						this.rich_text = this.$toolAll.tools.escape2Html(this.dataObj.content);
+					}
+				})
 			}
 		}
 	}
diff --git a/pagesB/plan-fault/plan-fault.vue b/pagesB/plan-fault/plan-fault.vue
index f1dda3e..011ebb4 100644
--- a/pagesB/plan-fault/plan-fault.vue
+++ b/pagesB/plan-fault/plan-fault.vue
@@ -3,19 +3,19 @@
 		<status-nav :navBarTitle="ifPlanFault" returnColor="#c2c2c2"></status-nav>
 		<container-subgroup>
 			<view slot="content" style="margin: 0 -16rpx;" class="fon28">
-				<view @tap="goDetail(index)" class="bacf radius10 pad-s30 mar-x10 pad-x10" v-for="(item,index) in 20" :key="index">
+				<view @tap="goDetail(item.id)" class="bacf radius10 pad-s30 mar-x10 pad-x10" v-for="(item,index) in dataList" :key="index">
 					<view class=" pad-zy10 disjbac">
-						<image src="/static/del/QQ截图20220210213041.png" mode="aspectFill" lazy-load class="flexs mar-y20" style="width: 240rpx;height: 174rpx;border-radius: 6rpx;"></image>
+						<image :src="item.cover_img" mode="aspectFill" lazy-load class="flexs mar-y20" style="width: 240rpx;height: 174rpx;border-radius: 6rpx;"></image>
 						<view style="height: 174rpx;" class="width100 disjb fc fon24 posir">
 							<view>
-								<view class="clips1 fon28 bold col0 pad-y50">小型会议室解决方案小</view>
-								<view class="col9 clips2 line-h40">课程的内容课程的内容课程的内容课程的内容课程的内容课程的内容课程的内容课程....</view>
+								<view class="clips1 fon28 bold col0 pad-y50">{{item.title}}</view>
+								<view class="col9 clips2 line-h40">{{item.summary}}</view>
 							</view>
 							<view class="disjbac col9">
 								<view class="disac">
-									热度：<rate :size="32" :gutter="10" :readonly="true" v-model="rateNum"></rate>
+									热度：<rate :size="32" :gutter="10" :readonly="true" v-model="item.hot*1"></rate>
 								</view>
-								<view>344人已查阅</view>
+								<view>{{item.reading}}人已查阅</view>
 							</view>
 							<image src="/static/public/icon-plan-fire.png" mode="widthFix" style="width: 29rpx;height: 43rpx;position: absolute;right: 10rpx;top: -6rpx;"></image>
 						</view>
@@ -37,18 +37,59 @@
 			return {
 				rateNum:5,
 				ifPlanFault:'',
-				current:''
+				current:'',
+				size:10,
+				page:1,
+				total:0,
+				dataList:[]
 			}
 		},
 		onLoad(op) {
 			this.ifPlanFault = `${['解决方案','常见故障'][op.index*1]}`;
 			this.current = op.index*1;
+			this.getPlanFault();
 		},
 		methods: {
 			// 去新产品详情
-			goDetail(index){
+			goDetail(id){
 				uni.navigateTo({
-					url:`/pagesB/plan-fault-product-detail/detail?index=${this.current}`
+					url:`/pagesB/plan-fault-product-detail/detail?index=${this.current}&id=${id}`
+				})
+			},
+			// 查询常见故障、解决方案列表
+			getPlanFault(){
+				let url = [
+					'/universal/api.solution/solution_list',
+					'/universal/api.question/question_list'
+				];
+				let params = [
+					{
+						type_id:1,
+						list_rows:this.size,
+						page:this.page
+					},
+					{
+						list_rows:this.size,
+						page:this.page
+					}
+				]
+				// 常见故障
+				this.$requst.get(url[this.current],params[this.current]).then(res=>{
+					if(res.code==1) {
+						this.total = res.data.total;
+						res.data.data.forEach(item=>{
+							let obj = {
+								id:item.id,
+								cover_img: uni.getStorageSync('hostapi') + '/' + item.cover_img,
+								title:item.title,//标题
+								summary:item.summary,//描述
+								hot:item.hot,//热度
+								reading:item.reading//查阅
+							}
+							this.dataList.push(obj);
+						})
+						console.log(this.dataList);
+					}
 				})
 			}
 		}
diff --git a/pagesB/service-range/service-range.vue b/pagesB/service-range/service-range.vue
index e7828f1..8c8f241 100644
--- a/pagesB/service-range/service-range.vue
+++ b/pagesB/service-range/service-range.vue
@@ -17,7 +17,7 @@
 				</view>
 				<view class="bbot disac pad-sx30 pad-zy30">
 					<view class="mar-y30 flexs disjbac" :style="{width: eareWidth + 'px'}">地 <view>区<text style="color: red;">*</text></view></view>
-					<view class="disjbac width100">
+					<view class="disjbac width100" @tap="chooseRegion">
 						<view>湖南省株洲市芦淞区</view>
 						<i class="icon icon-next col9" style="font-size: 30rpx;"></i>
 					</view>
@@ -68,6 +68,24 @@
 			}).exec()
 		},
 		methods: {
+			// 选择地区
+			chooseRegion(){
+				uni.getLocation({
+					type: 'gcj02', //返回可以用于uni.openLocation的经纬度
+					success: function (res) {
+						const latitude = res.latitude;
+						const longitude = res.longitude;
+						console.log(latitude,longitude,78);
+						uni.openLocation({
+							latitude: latitude,
+							longitude: longitude,
+							success: function () {
+								console.log('success');
+							}
+						});
+					}
+				});
+			},
 			// 人员状态选择
 			chooseStatus(index,num){
 				switch (num){
diff --git a/pagesB/set-up/set-up.vue b/pagesB/set-up/set-up.vue
index 584c9c2..3cc78eb 100644
--- a/pagesB/set-up/set-up.vue
+++ b/pagesB/set-up/set-up.vue
@@ -3,22 +3,26 @@
 		<status-nav navBarTitle="设置" returnColor="#c2c2c2"></status-nav>
 		<container-subgroup>
 			<view slot="content" style="margin: 0 -30rpx;" class="fon28">
-				<view class="bacf pad30 disjbac bbot">
-					<view>开启语音提醒</view>
-					<view><evan-switch v-model="voiceStatus" @change="voiceEv" :size="18" inactive-color="#b3b3b3" active-color="#fd8956"></evan-switch></view>
-				</view>
-				<view class="bacf pad30 disjbac">
-					<view>接受新消息通知</view>
-					<view><evan-switch v-model="newsStatus" @change="newsEv" :size="18" inactive-color="#b3b3b3" active-color="#fd8956"></evan-switch></view>
-				</view>
-				<view @tap="updatePassword" class="bacf pad30 disjbac mar-s20 bbot">
+				<!-- #ifdef APP-PLUS -->
+					<view class="bacf pad30 disjbac bbot">
+						<view>开启语音提醒</view>
+						<view><evan-switch v-model="voiceStatus" @change="voiceEv" :size="18" inactive-color="#b3b3b3" active-color="#fd8956"></evan-switch></view>
+					</view>
+					<view class="bacf pad30 disjbac mar-x20">
+						<view>接受新消息通知</view>
+						<view><evan-switch v-model="newsStatus" @change="newsEv" :size="18" inactive-color="#b3b3b3" active-color="#fd8956"></evan-switch></view>
+					</view>
+				<!-- #endif -->
+				<view @tap="updatePassword" class="bacf pad30 disjbac bbot">
 					<view>修改登录密码</view>
 					<i class="icon icon-next col9" style="font-size: 26rpx;"></i>
 				</view>
-				<view @tap="cleanEv" class="bacf pad30 disjbac">
-					<view>清除缓存</view>
-					<view class="col9">{{cacheSize}}</view>
-				</view>
+				<!-- #ifdef APP-PLUS -->
+					<view @tap="cleanEv" class="bacf pad30 disjbac">
+						<view>清除缓存</view>
+						<view class="col9">{{cacheSize}}</view>
+					</view>
+				<!-- #endif -->
 				<view class="bacf pad30 disjbac mar-s20 bbot">
 					<view>上门服务条款</view>
 					<view class="disac col9">
@@ -49,10 +53,12 @@
 						V1.1<i class="icon icon-next col9 mar-z20" style="font-size: 26rpx;"></i>
 					</view>
 				</view>
-				<view @tap="checkEdition" class="bacf pad30 disjbac">
-					<view>版本更新</view>
-					<view class="col9">当前版本 5.1.4</view>
-				</view>
+				<!-- #ifdef APP-PLUS -->
+					<view @tap="checkEdition" class="bacf pad30 disjbac">
+						<view>版本更新</view>
+						<view class="col9">当前版本 5.1.4</view>
+					</view>
+				<!-- #endif -->
 			</view>
 		</container-subgroup>
 	</view>
@@ -68,7 +74,7 @@
 			return {
 				voiceStatus:false,//是否开启语音提醒
 				newsStatus:false,//是否开启接受新消息通知
-				cacheSize:'754.72',//缓存数据大小
+				cacheSize:'754.72 KB',//缓存数据大小
 			}
 		},
 		onLoad() {

From b8ee483e554fb10730ae1b1deda9edeae85ed82c Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Thu, 24 Mar 2022 16:59:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=A2=9E=E5=80=BC?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  2 -
 pages/appreciationServe/appreciationServe.vue | 53 ++++++-------------
 pages/tabbar/pagehome/pagehome.vue            | 10 +++-
 3 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/App.vue b/App.vue
index 3cd4cd1..933c09e 100644
--- a/App.vue
+++ b/App.vue
@@ -17,8 +17,6 @@
 			// #ifdef H5
 				uni.setStorageSync('hostapi','/web'); 
 			// #endif
-			// 设置主色调
-			// uni.setStorageSync('publicColor','#000000');
 		},
 		onShow: function() {
 			if(uni.getStorageSync('phone_active')){
diff --git a/pages/appreciationServe/appreciationServe.vue b/pages/appreciationServe/appreciationServe.vue
index b22d2e3..2ab5eff 100644
--- a/pages/appreciationServe/appreciationServe.vue
+++ b/pages/appreciationServe/appreciationServe.vue
@@ -2,9 +2,7 @@
     <view class="content">
         <statusNav navBarTitle="增值服务"></statusNav>
         <view class="select-type">
-            <view class="text">
-                选择类型
-            </view>
+            <view class="text">选择类型</view>
             <view class="type">
                 <view class="li" @click="typeIndexFun(index)" :class="index==typeIndex?'on':''"
                     v-for="(item,index) in typeData">
@@ -12,67 +10,45 @@
                 </view>
             </view>
         </view>
-
         <view class="appreciationServe-from">
             <view class="li">
-                <view class="title">
-                    *产品名称
-                </view>
+                <view class="title">*产品名称</view>
                 <input class="input" type="text" value="全彩LED显示屏" />
             </view>
             <view class="li">
-                <view class="title">
-                    *规格型号
-                </view>
+                <view class="title">*规格型号</view>
                 <input class="input" type="text" value="p2.5" />
             </view>
             <view class="li">
-                <view class="title">
-                    产品品牌
-                </view>
+                <view class="title">产品品牌</view>
                 <input class="input" type="text" value="" placeholder="请输入品牌" />
             </view>
             <view class="li">
-                <view class="title">
-                    *产品尺寸
-                </view>
+                <view class="title">*产品尺寸</view>
                 <input class="input" type="text" value="宽:38.5m x 高14.5m" />
             </view>
         </view>
-
-        <view class="supplementTitle">
-            补充信息
-        </view>
+        <view class="supplementTitle">补充信息</view>
         <view class="supplement-from">
             <view class="li">
-                <view class="title">
-                    *联系人
-                </view>
+                <view class="title">*联系人</view>
                 <input type="text" class="input" value="王富贵" />
             </view>
             <view class="li">
-                <view class="">
-                    *联系电话
-                </view>
+                <view class="">*联系电话</view>
                 <input type="text" class="input" value="18256666666" />
             </view>
             <view class="li">
-                <view class="">
-                    *预约时间
-                </view>
+                <view class="">*预约时间</view>
                 <input type="text" class="input" value="2022-02-16" />
             </view>
             <view class="li-textarea">
-                <view class="title">
-                    *详细地址
-                </view>
+                <view class="title">*详细地址</view>
                 <textarea class="textarea" value="湖南省株洲市荷塘区红旗中路456号五矿二十三冶综合楼" placeholder="" />
             </view>
             
             <view class="scene-img">
-                <view class="title">
-                    现场图片
-                </view>
+                <view class="title">现场图片</view>
                 <view class="img-content">
                   <image class="img" src="../../static/del/微信图片_20220113152400.png" mode=""></image> 
                       <image class="img" src="../../static/del/微信图片_20220113152400.png" mode=""></image>
@@ -80,11 +56,9 @@
                 <view class="iocn-content">
                     <image class="icon" src="../../static/iocn/jia.png" mode=""></image>
                 </view>
-                
             </view>
-            
         </view>
-            <button class="submit-button" type="default">确认提交</button>
+		<button class="submit-button" type="default">确认提交</button>
     </view>
 </template>
 
@@ -117,6 +91,9 @@
                 ]
             }
         },
+		onLoad(op) {
+			if(op.index!=undefined) this.typeIndex = op.index;
+		},
         methods: {
             typeIndexFun(index) {
                 this.typeIndex = index
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 5d3dbbf..391d2ef 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -69,7 +69,7 @@
 				<view class="home-fun-box">
 					<view class="fun-title col3 fon28 disac bold">增值服务</view>
 					<view class="disac mar-s30">
-						<view class="disjcac fc width25" v-for="(item,index) in incrementList" :key="index">
+						<view @tap="goIncrement(index)" class="disjcac fc width25" v-for="(item,index) in incrementList" :key="index">
 							<image :style="{width: [57,52,58,51][index]+'rpx',height:[56,56,50,56][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
 							<view class="fon24 col3 mar-s10">{{item.title}}</view>
 						</view>
@@ -224,7 +224,7 @@
 		},
 		data() {
 			return {
-				role: 3, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
+				role: 2, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量
 				noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
@@ -327,6 +327,12 @@
 			goNoticeDetail(e){
 				console.log(e);
 			},
+			// 前往增值服务页面
+			goIncrement(index) {
+				uni.navigateTo({
+					url:`/pages/appreciationServe/appreciationServe?index=${index}`
+				})
+			},
 			// 查询增值服务类型
 			getIncrementServiceType(){
 				this.$requst.post('/universal/api.vas/vas_type').then(res=>{