流程测试调整

apis/utils/request.js

@@ -14,7 +14,7 @@ const request = (options) => {
 	 }
 	 var openId=jphelp.getOpenId()
 	 
-	var  urlindex="/wechat/findUserInfo"
+	var  urlindex="/youdian/findUserInfo"
 	var k=options.url.indexOf(urlindex)==-1;
 	
 	 if(!openId&&k){

apis/weixin.js

@@ -33,7 +33,7 @@ export function alpay(data) {
 //根据code换取openid
 export function getDataByCode(code) {
 	return request({
-		url: '/wechat/findUserInfo/' + code,
+		url: '/youdian/findUserInfo/' + code,
 		params: {},
 		method: 'get',
 	})
@@ -51,7 +51,7 @@ export function getDataByCode(code) {
 //获得配置
 export function getConfig() {
 	return requestWhite({
-		url: '/wechat/getConfig',
+		url: '/youdian/getConfig',
 		data: {
 			url: window.location.href.split('#')[0]
 		},

config/.env.dev.js

@@ -15,12 +15,13 @@ const UNI_APP = {
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 
 
-	openId:"oRGjz7GpSbld27nUK9Q6V6jvXMJo",
-	openId:"oRGjz7DZM-rK3MpkjV6_VnoUhLI0",
+	
 	openId:"123456",
+	openId:"oSruR6YkhP7QDroLnZGxWis43Kn0",
 	
 	//appid
-	VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",
+	//VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 	VUE_APP_ALIAPPID:"2021003131641247",
 	
 }  

config/.env.prod.js

@@ -10,12 +10,13 @@ const UNI_APP = {
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
 	//openId:"123456",
 	//appid
-	VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",
+	//VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",
 
 	BACK_URL:"https://yjwg.hbjp.com.cn/index/#/master/",
 	
 
-	VUE_APP_ALIAPPID:"2021003131641247",
+	 
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 }  
 
 module.exports = UNI_APP;

config/.env.test.js

@@ -9,8 +9,9 @@ const UNI_APP = {
 	BACK_URL:"https://xpgj.hbjp.com.cn/prod/jp-property-platform-test/index/#/master/",
 	
 	//appid
-	VUE_APP_WXAPPID:"wx0b3c41a903053808",
+//	VUE_APP_WXAPPID:"wx0b3c41a903053808",
 	VUE_APP_ALIAPPID:"2021003131641247",
+		VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 	
 	
 }  

pages/index/index.vue

@@ -146,7 +146,7 @@
 		</view>
 		<view class="main_list1 ">
 			
-			<view class="top-main" style="    border-bottom: 2rpx solid #e8e8e8;" >
+			<view class="top-main" >
 			<u-tabs :list="tabslist"
 			
 			 :current="current" @change="change"></u-tabs>
@@ -186,8 +186,8 @@
 							
 							</view>
 							<view class="value">
-								{{item.errorReportTime}}<span style="color: red;" v-if="isToday(item.errorReportTime)">(今日)</span>
-
+								<span style="color: red;" v-if="isToday(item.errorReportTime)">(今日)</span>
+								{{item.errorReportTime}}
 							</view>
 							
 						</view>
@@ -201,10 +201,7 @@
 				 :isnone="dataerrRecordsTotal==0" nonetext="暂无数据"
 				 v-if="dataerrRecordsTotal>5&&current==0"
 				 @click="gotoUrl('/pages/task/listTask?status='+tabslist[current].code)"  >故障记录{{dataerrRecordsTotal}}条，点击查看更多</u-divider>
-				 <u-divider color="#CFD2D5"  v-else
-				 
-				 :isnone="dataerrRecordsTotal==0" nonetext="暂无数据"
-				  @click="gotoUrl('/pages/task/listTask?status='+tabslist[current].code)"  >查看详情</u-divider>
+				
 				  
 				
 			</view>
@@ -640,6 +637,7 @@ import {
 	}
 
 	.main_list1 {
+		background-color: #fff;
 		margin-top: 24rpx;
 		padding: 24rpx;
 		padding-bottom: 36rpx;
@@ -648,6 +646,7 @@ import {
 			.item {
 				border-bottom: 2rpx solid rgba(232, 232, 232, 1);
 			}
+			
 			.title {
 				display: flex;
 				    justify-content: space-between;
@@ -681,14 +680,17 @@ import {
 				}
 			}
 		}
-		
+		.item:not(:first-child) {
+			//background-color: red;
+			border-top: 0rpx solid rgba(232, 232, 232, 1);
+		}
 		
 		.list {
 			//padding: 24rpx 0;
-
+			
 			.item {
 				display: flex;
-				border-bottom: 2rpx solid rgba(232, 232, 232, 1);
+				border-top: 2rpx solid rgba(232, 232, 232, 1);
 				padding: 12rpx 0;
 				margin: 12rpx 0;
 

pages/inspection/info.vue

@@ -19,11 +19,11 @@
 			</view>
 			<view class="item ">
 				<view class="name">
-					巡检人
+					巡检人员
 			
 				</view>
 				<view class="value">
-					 {{record.lastInspectionTime}}
+					 {{record.inspectionUserName}}
 			
 				</view>
 				
@@ -61,7 +61,14 @@
 							<span v-if="item.result==0" style="margin: 0 8rpx;">, </span>
 							{{item.content}}
 						</view>
-						<view class="u-order-time"></view>
+						<view class="u-order-time" >
+							
+							<img  class="viewImg" v-for="(item,i) in repairImageList(item.image)"
+							  @click="previewImage(i,item.image)"
+							 :key="i"
+							 :src="item" mode=""></img>
+							
+						</view>
 					</view>
 				</template>
 				</u-time-line-item>
@@ -94,7 +101,22 @@
 
 
 		},
-		methods: {
+		methods: {
+			previewImage(i, name) {
+				let imgs = name.split(',');
+				//imgs.push(img);
+				uni.previewImage({
+					urls: imgs,
+					current: i
+				})
+			},
+			repairImageList(img){
+				if(img){
+					return img.split(',')
+				}else{
+					return []
+				}
+			},
 			errDetails() {
 				uni.showLoading({
 					title: "加载中",
@@ -282,5 +304,9 @@
 			margin: 10rpx 0;
 		}
 	}
-	
+	
+	.viewImg {
+		width: 160rpx;
+		height: 160rpx;
+	}
 </style>

pages/inspection/list.vue

@@ -5,7 +5,7 @@
 		<view class="top">
 			<view class="search">
 				<view class="searchBox">
-					<u-search shape="square" placeholder="使用停车场名称/地锁编号搜索" maxlength="12" v-model="testName" :show-action="false"
+					<u-search shape="square" placeholder="使用站点名称/编号搜索" maxlength="12" v-model="testName" :show-action="false"
 						:animation="true"></u-search>
 					<u-button type="primary" size="mini" @click="testBtn">搜素</u-button>
 				</view>
@@ -43,7 +43,7 @@
 						</view>
 					</view>
 					
-					<view class="line2">
+					<view class="line2" v-if="item.status==0"  >
 						<view class="value">
 							上次巡检 {{item.lastInspectionTime}}
 		
@@ -55,6 +55,18 @@
 						
 						
 					</view>
+					<view class="line2" v-if="item.status==1"  >
+						<view class="value">
+							本次巡检 {{item.inspectionTime}}
+							
+						</view>
+						
+						<view class="value">
+							巡检人员 {{item.inspectionUserName}}
+							
+						</view>
+						
+					</view>
 					
 					
 		

pages/myTab/index.vue

@@ -12,14 +12,14 @@
 		
 				<view class="name">
 					<view class="photo">
-						<img class="img" :src="userInfo.headImg" v-if="userInfo.headImg" alt="">
+						<img class="img" :src="userInfo.image" v-if="userInfo.image" alt="">
 						<img class="img" src="@/assets/img/默认头像.png" v-else alt="">
 						
 						
 					</view>
 					<view class="text">
-						<view class="text1">{{userInfo.realName}}</view>
-						<view class="text2">{{userInfo.userName}}</view>
+						<view class="text1">{{userInfo.name}}</view>
+						<view class="text2">{{userInfo.phone}}</view>
 					</view>
 				</view>
 				<view class="value">

pages/station/stationInfo.vue

@@ -82,7 +82,7 @@
 			<view class="body">
 				<view class="line" v-for="(item,index) in errList"
 				 @click="gotoUrl('/pages/task/maintenanceTaks?id='+item.id)"
-				 :key="i">
+				 :key="index">
 					<view class="p1">
 						<view class="name">
 							{{item.errorCodeText}}
@@ -105,6 +105,9 @@
 						
 					</view>
 				</view>
+				<u-divider :isnone="errList.length==0"
+				 nonetext="没有找到相关内容" border-color="#CFD2D5">{{errListTotal>5?'最多显示5条':'已经到底了'}}</u-divider>
+				
 				 
 			</view>
 		</view>
@@ -125,7 +128,7 @@
 			<view class="body">
 				<view class="line"  v-for="(item,index) in recordList" 
 				@click="gotoUrl('/pages/inspection/info?id='+item.id)"
-				:key="i" >
+				:key="index" >
 					<view class="p1">
 						巡检
 						
@@ -142,6 +145,9 @@
 					<u-icon name="arrow-right" color="#D4D4D4" ></u-icon>
 					
 				</view>
+				<u-divider :isnone="recordList.length==0" 
+				 nonetext="没有找到相关内容" border-color="#CFD2D5">{{recordListTotal>5?'最多显示5条':'已经到底了'}}</u-divider>
+				
 				
 			</view>
 			
@@ -197,6 +203,9 @@
 					<u-icon name="arrow-right" color="#D4D4D4" ></u-icon>
 					
 				</view>
+				<u-divider :isnone="gunList.length==0"
+				 nonetext="没有找到相关内容" border-color="#CFD2D5">{{'已经到底了'}}</u-divider>
+				
 				
 			</view>
 			
@@ -453,6 +462,8 @@
 	.main3_panel{
 		.body{
 			.line{
+				//border-bottom:2rpx solid rgba(232,232,232,1);
+				
 				padding: 12rpx 0;
 				    display: flex;
 				    justify-content: space-between;
@@ -473,11 +484,12 @@
 					
 				}
 			}
-			
-			.line:not(:last-child) {
-			  border-bottom:2rpx solid rgba(232,232,232,1);
+			.line:not(:first-child){
+				//background-color: red;
+			  border-top:1px solid rgba(232,232,232,1);
 			}
 			
+			
 			.tag{
 				background-color: rgba(255,255,255,1);
 				color: rgba(255,61,0,1);
@@ -502,7 +514,7 @@
 	.main4_panel,.main5_panel{
 		.body{
 			.line{
-				padding: 12rpx 0;
+				padding: 18rpx 0;
 				    display: flex;
 				    justify-content: space-between;
 				}
@@ -517,8 +529,8 @@
 					   text-overflow: ellipsis;
 					   white-space: nowrap; 
 				}
-				.line:not(:last-child) {
-				  border-bottom:2rpx solid rgba(232,232,232,1);
+				.line:not(:first-child) {
+				  border-top:2rpx solid rgba(232,232,232,1);
 				}
 		}
 	}

pages/station/stationList.vue

@@ -5,7 +5,7 @@
 			<view class="top">
 				<view class="search">
 					<view class="searchBox">
-						<u-search shape="square" placeholder="使用停车场名称/地锁编号搜索" maxlength="12" v-model="testName"
+						<u-search shape="square" placeholder="使用站点名称/编号搜索" maxlength="12" v-model="testName"
 							:show-action="false" :animation="true"></u-search>
 						<u-button type="primary" size="mini" @click="testBtn">搜素</u-button>
 					</view>

pages/task/listTask.vue

@@ -5,7 +5,7 @@
 		<view class="top">
 			<view class="search">
 				<view class="searchBox">
-					<u-search shape="square" placeholder="使用停车场名称/地锁编号搜索" maxlength="12" v-model="testName" :show-action="false"
+					<u-search shape="square" placeholder="使用站点名称/编号搜索" maxlength="12" v-model="testName" :show-action="false"
 						:animation="true"></u-search>
 					<u-button type="primary" size="mini" @click="testBtn">搜素</u-button>
 				</view>
@@ -70,7 +70,13 @@
 		
 						</view>
 						<view class="value">
-							创建时间 {{item.createTime}} 
+							上报时间 {{item.errorReportTime}} 
+						</view>
+						<view class="value" v-if="item.status==1">
+							处理时间 {{item.repairTime}} 
+						</view>
+						<view class="value"  v-if="item.status==1">
+							处理人员 {{item.repairNames}} 
 						</view>
 						
 					</view>

pages/task/maintenanceTaks.vue

@@ -314,7 +314,8 @@
 				//(res)
 			})
 		},
-		methods: {
+		methods: {
+			
 			memberListchange(e) {
 				console.log(e)
 				this.$forceUpdate()

pages/team/stationAdd.vue

@@ -43,10 +43,10 @@
 				></u-icon>
 			</view>
 			
+			<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
 			
 			
 		</view>
-		<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
 
 		<view class="floating-button">
 			

uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue

@@ -50,7 +50,7 @@
 			<view v-if="midButton" class="u-tabbar__content__circle__border" :class="{
 				'u-border': borderTop,
 			}" :style="{
-				backgroundColor: bgColor,
+				
 				left: midButtonLeft
 			}">
 			</view>