测试修改

user_ui/api/system/user.js

@@ -25,8 +25,8 @@ export function getUserProfile() {
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({
-    url: '/system/user/profile',
-    method: 'put',
+    url: '/system/user/profile/put',
+    method: 'post',
     data: data
   })
 }

user_ui/api/work/car.js

@@ -39,3 +39,25 @@ export function carDet(data) {
   })
 }
 
+// 违章停车登记-列表
+export function illegalParkingList(data) {
+  return request({
+    url: '/wuYe/illegalParking/list',
+    method: 'get',
+    'data': data
+  })
+}
+// 违章停车登记-详情
+export function illegalParkingDet(data) {
+  return request({
+    url: '/wuYe/illegalParking/'+data,
+    method: 'get',
+  })
+}
+// 违章停车登记-删除
+export function illegalParkingDel(data) {
+  return request({
+    url: '/wuYe/illegalParking/delete/'+data,
+    method: 'get',
+  })
+}

user_ui/api/work/news.js

@@ -132,7 +132,22 @@ export function deletepl(data) {
   })
 }
 
-
+// 获取未读互动数量wuYe:news:getCommentInteractionCount
+export function getCommentInteractionCount(data) {
+  return request({
+    url: '/wuYe/news/getCommentInteractionCount',
+    method: 'post',
+    'data': data
+  })
+}
+// 获取未读互动列表wuYe:news:getCommentInteraction
+export function getCommentInteraction(data) {
+  return request({
+    url: '/wuYe/news/getCommentInteraction',
+    method: 'post',
+    'data': data
+  })
+}
 
 
 

user_ui/components/loading/loading - 副本.vue

@@ -0,0 +1,235 @@
+<!-- <template>
+	<view>
+		
+		<view class="loading" v-if="is_loading">
+			
+			<image class="load_img" :src="waimai ? '../../../static/loading/loading2.gif' : '../../static/loading/loading2.gif'" mode=""></image>
+			
+		</view>
+		
+	</view>
+</template> -->
+
+<template>
+	<view class="" v-if="is_loading">
+		<view class="loader">
+				
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: ["waimai"],
+		data() {
+			return {
+				
+			}
+		},
+		methods:{
+			switch_loading(){
+				this.$store.commit("switch_loading")
+			}
+		},
+		//实测直接在标签属性里写  $store.state.XX  拿不到数据  所以这里通过 计算属性去监听一下
+		computed:{
+			is_loading(){
+				return this.$store.state.user.loading
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.loading{position: fixed;top: 0;left: 0;bottom: 0;right: 0;display: flex;align-items: center;justify-content: space-around;z-index: 1001;background: transparent;}
+	.load_img{width: 640rpx;height: 490rpx;}
+	
+	.loader,
+	.loader:before,
+	.loader:after {
+	  -webkit-animation: load1 1s infinite ease-in-out;
+	  animation: load1 1s infinite ease-in-out;
+	  width: 1em;
+	  height: 3em;
+	}
+	.loader {
+	  color: #FF8080;
+	  background: #FF8080;
+	  text-indent: -9999em;
+	  margin: 88px auto;
+	  position: fixed;
+	  font-size: 16upx;
+	  -webkit-transform: translateZ(0);
+	  -ms-transform: translateZ(0);
+	  transform: translateZ(0);
+	  -webkit-animation-delay: -0.16s;
+	  animation-delay: -0.16s;
+	  top: 30%;left: 0;bottom: 0;right: 0;
+	}
+	.loader:before,
+	.loader:after {
+	  position: absolute;
+	  top: 0;
+	  content: '';
+	}
+	.loader:before {
+	  left: -1.5em;
+	  -webkit-animation-delay: -0.32s;
+	  animation-delay: -0.32s;
+	  background: #FF9999;
+	  color: #FF9999;
+	}
+	.loader:after {
+	  left: 1.5em;
+	  background: #FE6666;
+	  color: #FE6666;
+	}
+	@-webkit-keyframes load1 {
+	  0%,
+	  80%,
+	  100% {
+		box-shadow: 0 0;
+		height: 2em;
+	  }
+	  40% {
+		box-shadow: 0 -2em;
+		height: 3em;
+	  }
+	}
+	@keyframes load1 {
+	  0%,
+	  80%,
+	  100% {
+		box-shadow: 0 0;
+		height: 2em;
+	  }
+	  40% {
+		box-shadow: 0 -2em;
+		height: 3em;
+	  }
+	}
+	
+	/* .loader,
+	.loader:before,
+	.loader:after {
+	  border-radius: 50%;
+	  width: 2.5em;
+	  height: 2.5em;
+	  -webkit-animation-fill-mode: both;
+	  animation-fill-mode: both;
+	  -webkit-animation: load7 1.8s infinite ease-in-out;
+	  animation: load7 1.8s infinite ease-in-out;
+	}
+	.loader {
+	  color: #000;
+	  font-size: 10px;
+	  margin: 80px auto;
+	  position: fixed;
+	  text-indent: -9999em;
+	  -webkit-transform: translateZ(0);
+	  -ms-transform: translateZ(0);
+	  transform: translateZ(0);
+	  -webkit-animation-delay: -0.16s;
+	  animation-delay: -0.16s;
+	  top: 30%;left: 0;bottom: 0;right: 0;
+	}
+	.loader:before,
+	.loader:after {
+	  content: '';
+	  position: absolute;
+	  top: 0;
+	}
+	.loader:before {
+	  left: -3.5em;
+	  -webkit-animation-delay: -0.32s;
+	  animation-delay: -0.32s;
+	}
+	.loader:after {
+	  left: 3.5em;
+	}
+	@-webkit-keyframes load7 {
+	  0%,
+	  80%,
+	  100% {
+		box-shadow: 0 2.5em 0 -1.3em;
+	  }
+	  40% {
+		box-shadow: 0 2.5em 0 0;
+	  }
+	}
+	@keyframes load7 {
+	  0%,
+	  80%,
+	  100% {
+		box-shadow: 0 2.5em 0 -1.3em;
+	  }
+	  40% {
+		box-shadow: 0 2.5em 0 0;
+	  }
+	} */
+	
+	/* .loader {
+	  font-size: 10px;
+	  margin: 50px auto;
+	  text-indent: -9999em;
+	  width: 8em;
+	  height: 8em;
+	  border-radius: 50%;
+	  background: transparent ;
+	  background: -moz-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
+	  background: -webkit-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
+	  background: -o-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
+	  background: -ms-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
+	  background: linear-gradient(to right, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
+	  position: fixed;
+	  top: 30%;left: 0;bottom: 0;right: 0;
+	  -webkit-animation: load3 1.4s infinite linear;
+	  animation: load3 1.4s infinite linear;
+	  -webkit-transform: translateZ(0);
+	  -ms-transform: translateZ(0);
+	  transform: translateZ(0);
+	}
+	.loader:before {
+	  width: 50%;
+	  height: 50%;
+	  background: transparent ;
+	  border-radius: 100% 0 0 0;
+	  position: absolute;
+	  top: 0;
+	  left: 0;
+	  content: '';
+	}
+	.loader:after {
+	  background: #FFFFFF ;
+	  width: 75%;
+	  height: 75%;
+	  border-radius: 50%;
+	  content: '';
+	  margin: auto;
+	  position: absolute;
+	  top: 0;
+	  left: 0;
+	  bottom: 0;
+	  right: 0;
+	}
+	@-webkit-keyframes load3 {
+	  0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	  }
+	  100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	  }
+	}
+	@keyframes load3 {
+	  0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	  }
+	  100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	  }
+	} */
+</style>

user_ui/components/loading/loading.vue

@@ -1,235 +1,96 @@
-<!-- <template>
-	<view>
-		
-		<view class="loading" v-if="is_loading">
-			
-			<image class="load_img" :src="waimai ? '../../../static/loading/loading2.gif' : '../../static/loading/loading2.gif'" mode=""></image>
-			
-		</view>
-		
-	</view>
-</template> -->
-
 <template>
-	<view class="" v-if="is_loading">
-		<view class="loader">
-				
-		</view>
-	</view>
+  <view class="animations" v-if="is_loading">
+    <view class="box">
+      <view class="dot dot1"></view>
+      <view class="dot dot2"></view>
+      <view class="dot dot3"></view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: ["waimai"],
-		data() {
-			return {
-				
-			}
-		},
-		methods:{
-			switch_loading(){
-				this.$store.commit("switch_loading")
-			}
-		},
-		//实测直接在标签属性里写  $store.state.XX  拿不到数据  所以这里通过 计算属性去监听一下
-		computed:{
-			is_loading(){
-				return this.$store.state.user.loading
-			}
-		}
-	}
+export default {
+  name: "loading-bounce",
+  data() {
+    return {};
+  },
+  methods:{
+  	switch_loading(){
+  		this.$store.commit("switch_loading")
+  	}
+  },
+  //实测直接在标签属性里写  $store.state.XX  拿不到数据  所以这里通过 计算属性去监听一下
+  computed:{
+  	is_loading(){
+  		return this.$store.state.user.loading
+  	}
+  }
+};
 </script>
 
-<style scoped>
-	.loading{position: fixed;top: 0;left: 0;bottom: 0;right: 0;display: flex;align-items: center;justify-content: space-around;z-index: 1001;background: transparent;}
-	.load_img{width: 640rpx;height: 490rpx;}
-	
-	.loader,
-	.loader:before,
-	.loader:after {
-	  -webkit-animation: load1 1s infinite ease-in-out;
-	  animation: load1 1s infinite ease-in-out;
-	  width: 1em;
-	  height: 3em;
-	}
-	.loader {
-	  color: #FF8080;
-	  background: #FF8080;
-	  text-indent: -9999em;
-	  margin: 88px auto;
-	  position: fixed;
-	  font-size: 16upx;
-	  -webkit-transform: translateZ(0);
-	  -ms-transform: translateZ(0);
-	  transform: translateZ(0);
-	  -webkit-animation-delay: -0.16s;
-	  animation-delay: -0.16s;
-	  top: 30%;left: 0;bottom: 0;right: 0;
-	}
-	.loader:before,
-	.loader:after {
-	  position: absolute;
-	  top: 0;
-	  content: '';
-	}
-	.loader:before {
-	  left: -1.5em;
-	  -webkit-animation-delay: -0.32s;
-	  animation-delay: -0.32s;
-	  background: #FF9999;
-	  color: #FF9999;
-	}
-	.loader:after {
-	  left: 1.5em;
-	  background: #FE6666;
-	  color: #FE6666;
-	}
-	@-webkit-keyframes load1 {
-	  0%,
-	  80%,
-	  100% {
-		box-shadow: 0 0;
-		height: 2em;
-	  }
-	  40% {
-		box-shadow: 0 -2em;
-		height: 3em;
-	  }
-	}
-	@keyframes load1 {
-	  0%,
-	  80%,
-	  100% {
-		box-shadow: 0 0;
-		height: 2em;
-	  }
-	  40% {
-		box-shadow: 0 -2em;
-		height: 3em;
-	  }
-	}
-	
-	/* .loader,
-	.loader:before,
-	.loader:after {
-	  border-radius: 50%;
-	  width: 2.5em;
-	  height: 2.5em;
-	  -webkit-animation-fill-mode: both;
-	  animation-fill-mode: both;
-	  -webkit-animation: load7 1.8s infinite ease-in-out;
-	  animation: load7 1.8s infinite ease-in-out;
-	}
-	.loader {
-	  color: #000;
-	  font-size: 10px;
-	  margin: 80px auto;
-	  position: fixed;
-	  text-indent: -9999em;
-	  -webkit-transform: translateZ(0);
-	  -ms-transform: translateZ(0);
-	  transform: translateZ(0);
-	  -webkit-animation-delay: -0.16s;
-	  animation-delay: -0.16s;
-	  top: 30%;left: 0;bottom: 0;right: 0;
-	}
-	.loader:before,
-	.loader:after {
-	  content: '';
-	  position: absolute;
-	  top: 0;
-	}
-	.loader:before {
-	  left: -3.5em;
-	  -webkit-animation-delay: -0.32s;
-	  animation-delay: -0.32s;
-	}
-	.loader:after {
-	  left: 3.5em;
-	}
-	@-webkit-keyframes load7 {
-	  0%,
-	  80%,
-	  100% {
-		box-shadow: 0 2.5em 0 -1.3em;
-	  }
-	  40% {
-		box-shadow: 0 2.5em 0 0;
-	  }
-	}
-	@keyframes load7 {
-	  0%,
-	  80%,
-	  100% {
-		box-shadow: 0 2.5em 0 -1.3em;
-	  }
-	  40% {
-		box-shadow: 0 2.5em 0 0;
-	  }
-	} */
-	
-	/* .loader {
-	  font-size: 10px;
-	  margin: 50px auto;
-	  text-indent: -9999em;
-	  width: 8em;
-	  height: 8em;
-	  border-radius: 50%;
-	  background: transparent ;
-	  background: -moz-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
-	  background: -webkit-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
-	  background: -o-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
-	  background: -ms-linear-gradient(left, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
-	  background: linear-gradient(to right, #CCCCCC 10%, rgba(255, 255, 255, 0) 42%);
-	  position: fixed;
-	  top: 30%;left: 0;bottom: 0;right: 0;
-	  -webkit-animation: load3 1.4s infinite linear;
-	  animation: load3 1.4s infinite linear;
-	  -webkit-transform: translateZ(0);
-	  -ms-transform: translateZ(0);
-	  transform: translateZ(0);
-	}
-	.loader:before {
-	  width: 50%;
-	  height: 50%;
-	  background: transparent ;
-	  border-radius: 100% 0 0 0;
-	  position: absolute;
-	  top: 0;
-	  left: 0;
-	  content: '';
-	}
-	.loader:after {
-	  background: #FFFFFF ;
-	  width: 75%;
-	  height: 75%;
-	  border-radius: 50%;
-	  content: '';
-	  margin: auto;
-	  position: absolute;
-	  top: 0;
-	  left: 0;
-	  bottom: 0;
-	  right: 0;
-	}
-	@-webkit-keyframes load3 {
-	  0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	  }
-	  100% {
-		-webkit-transform: rotate(360deg);
-		transform: rotate(360deg);
-	  }
-	}
-	@keyframes load3 {
-	  0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	  }
-	  100% {
-		-webkit-transform: rotate(360deg);
-		transform: rotate(360deg);
-	  }
-	} */
+<style lang="scss" scoped>
+	.animations{display: flex;align-items: center;justify-content: center;position: fixed;top: 40%;left: 0;right: 0;z-index: 3;}
+.box {
+  width: 100rpx;
+  height: 50rpx;
+  position: relative;
+}
+.dot {
+  width: 18rpx;
+  height: 18rpx;
+  background: #007aff;
+  border-radius: 50%;
+  position: absolute;
+  top: calc(50% - 5rpx);
+}
+
+.dot1 {
+  background: #1fa2ff;
+  left: 0rpx;
+  -webkit-animation: bounce 0.5s cubic-bezier(0.77, 0.47, 0.64, 0.28) alternate
+    infinite;
+  animation: bounce 0.5s cubic-bezier(0.77, 0.47, 0.64, 0.28) alternate infinite;
+}
+
+.dot2 {
+  background: #12d8fa;
+  left: 40rpx;
+  -webkit-animation: bounce 0.5s 0.2s cubic-bezier(0.77, 0.47, 0.64, 0.28)
+    alternate infinite;
+  animation: bounce 0.5s 0.2s cubic-bezier(0.77, 0.47, 0.64, 0.28) alternate
+    infinite;
+}
+
+.dot3 {
+  background: #29ffc6;
+  left: 80rpx;
+  -webkit-animation: bounce 0.5s 0.4s cubic-bezier(0.77, 0.47, 0.64, 0.28)
+    alternate infinite;
+  animation: bounce 0.5s 0.4s cubic-bezier(0.77, 0.47, 0.64, 0.28) alternate
+    infinite;
+}
+
+@-webkit-keyframes bounce {
+  0% {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+  }
+
+  100% {
+    -webkit-transform: translateY(-20rpx);
+    transform: translateY(-20rpx);
+  }
+}
+
+@keyframes bounce {
+  0% {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+  }
+
+  100% {
+    -webkit-transform: translateY(-20rpx);
+    transform: translateY(-20rpx);
+  }
+}
 </style>

user_ui/health/pages/health/add - 副本.vue

@@ -121,7 +121,7 @@
 				nvaHeight:44,
 				backgroundColor: "transparent",
 				datainfo: {
-					sex:0,
+					sex:1,
 					realName: '',
 					idCard: '',
 					address: '',
@@ -133,10 +133,10 @@
 				syqxidx:'',
 				sexs: [{
 					text: '男',
-					value: 0
+					value: 1
 				}, {
 					text: '女',
-					value: 1
+					value: 2
 				}],
 			}
 		},

user_ui/mine/components/box/list.vue

@@ -171,13 +171,19 @@
 					<image :src="man" class="mhead flex0"></image>
 					<view class="flex1 overh">
 						<view class="flexc mb6">
-							<view class="name flex1 over">喜欢耶耶耶</view>
-							<view class="tit flex0 ml10">点赞了你的文章</view>
-							<view class="time flex0 ml10">02-26</view>
+							<view class="name flex1 over">{{ite.nickName}}</view>
+							<view class="tit flex0 ml10">
+								<block v-if="ite.targetType==1">评论</block>
+								<block v-if="ite.targetType==2">点赞</block>
+								<block v-if="ite.targetType==3">收藏</block>
+								<block v-if="ite.targetType==4">回复</block>
+								<block v-if="ite.targetType==5 ">点赞</block>
+								了你的文章</view>
+							<view class="time flex0 ml10">{{ite.createTime}}</view>
 						</view>
 						<view class="flexc overh mb4">
 							<view class="line bga"></view>
-							<view class="txt over flex1">物业服务费缴费公告</view>
+							<view class="txt over flex1">{{ite.targetTitle}}</view>
 							<image :src="rimg" class="rimg ml10"></image>
 						</view>
 					</view>
@@ -207,10 +213,10 @@
 							</view>
 						</view>
 						<view class="shbtns flexc pd12" >
-							<view class="btn bga" @click="getSh('4',ite.contentId)">不予展示</view>
+							<view class="btn bga" @click="getSh('4',ite)">不予展示</view>
 							<view class="flex1"></view>
-							<view class="btn bgb" @click="getSh('3',ite.contentId)">不通过</view>
-							<view class="btn bgc" @click="getSh('2',ite.contentId)">通过</view>
+							<view class="btn bgb" @click="getSh('3',ite)">不通过</view>
+							<view class="btn bgc" @click="getSh('2',ite)">通过</view>
 						</view>
 					</view>
 					<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view>
@@ -242,6 +248,41 @@
 				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view>
 			</view>
 		</block>
+		<!-- 车辆违规 -->
+		<block v-if="type=='carpark'">
+			<view class="carlist pr" v-for="(ite,idx) in datainfo" :key="ite.illegalParkingId" @click="getDetail(ite.illegalParkingId)"
+				:data-idx="idx"
+				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="checkPermi(['wuYe:illegalParking:remove'])?'right:'+ite.right+'px':''"
+			>
+				<view class="delleft">
+					<view class="ctop flexc">
+						<image :src="caraa" class="imgs" v-if="ite.carType==1"></image>
+						<image :src="carbb" class="imgs" v-if="ite.carType==2"></image>
+						<view class="tit">{{ite.plateNumber}}</view>
+						<view class="num coff" v-if="ite.isBlack=='Y'">(已登黑名单)</view>
+						<view class="flex1"></view>
+						<block v-if="ite.carType">
+							<view class="txt " :class="ite.carType==1?'ca':'cb'">{{kaType(ite.carType,carType)}}</view>
+						</block>
+						
+						<!-- <view class="txt cb" v-if="ite.type==2">外来车辆</view> -->
+					</view>
+					<view class="clists">
+						<block v-if="ite.carType==1">
+							<view class="clist"><view class="tit">关联房号</view>{{ite.visitPortal}}</view>
+							<view class="clist"><view class="tit">手机号码</view>{{ite.mobileNumber}}</view>
+						</block>
+						<view class="clist"><view class="tit">登记时间</view>{{ite.createTime}}</view>
+						<view class="clist"><view class="tit">违停拍照</view>
+							<view class="imgas" v-if="ite.illegalPhoto">
+								<image :src="baseUrl+aite" v-for="(aite,aidx) in kaPhoto(ite.illegalPhoto)" :key="aidx" @click.stop="getPreview(aidx,ite.illegalPhoto)"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:illegalParking:remove'])" @click.stop="getDelFn(ite.illegalParkingId)">删除</view>
+			</view>
+		</block>
 		<view class="shax" v-if="wtdt">{{wtdt}}</view>
 	</block>
 	<!-- 无数据 -->
@@ -290,7 +331,12 @@
 					return []
 				}
 			},
-				
+			carType:{
+				type: Array,
+				default () {
+					return []
+				}
+			},	
 			tabval:{
 				type:String,
 				default () {
@@ -308,6 +354,8 @@
 				upimg:require("@/mine/static/house/up.png"),
 				cara:require("@/mine/static/house/cara.png"),
 				carb:require("@/mine/static/house/carb.png"),
+				caraa:require("@/mine/static/house/caraa.png"),
+				carbb:require("@/mine/static/house/carbb.png"),
 				edit:require("@/mine/static/edit.png"),
 				cira:require('@/news/static/complaint/cira.png'),
 				cirb:require('@/news/static/complaint/cirb.png'),
@@ -326,6 +374,9 @@
 			kaType(data, list) {
 				return selectDictValue(list, data);
 			},
+			kaPhoto(data){
+				return data.split(',');
+			},
 			getDetail(e){
 				this.$emit('getDetail',e)
 			},
@@ -344,7 +395,7 @@
 					}
 				});
 			},
-			getSh(type,id){
+			getSh(type,ite){
 				var that=this;
 				var str="";
 				if(type=='2'){
@@ -363,7 +414,8 @@
 						if (res.confirm) {
 							var obj={
 								status:type,
-								contentId:id
+								contentId:ite.contentId,
+								commentId:ite.commentId,
 							}
 							that.$emit('getSh',obj)
 						} else if (res.cancel) {
@@ -414,7 +466,8 @@
 			 },
 			getPreview(idx,arr) {
 				var newArr=[];
-				arr.forEach(ite=>{
+				var list=arr.split(',')
+				list.forEach(ite=>{
 					var ds=this.baseUrl+ite
 					newArr.push(ds)
 				})
@@ -500,6 +553,39 @@ border-radius: 16rpx;border: 1px solid #45CB99;margin-left: 12rpx;}
 		.clflist{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 16rpx;}
 	}
 }
+.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.ctop{border-bottom: 2rpx solid #E5E5E5;padding:26rpx 24rpx;
+		.imgs{width: 40rpx;height: 42rpx;margin-right: 30rpx;}
+		.tit{font-size: 32rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size: 26rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+		}
+		.txta{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+		.num{font-size: 24rpx;color: #AAAAAA;}
+	}
+	.btn{height: 34rpx;border-radius: 18rpx;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;font-size: 22rpx;margin-right: 24rpx;
+		&.btna{border: 2rpx solid #06C770;color: #06C770;}
+		&.btnb{border: 2rpx solid #3565ED;color: #3565ED;}
+		&.btnc{border: 2rpx solid #FE5A0E;color: #FE5A0E;}
+		&.btnbga{border: 1px solid #0156FE;color: #3565ED;background: #DFEAFF;height: 36rpx;}
+		&.btnbgb{border: 1px solid #C1C1C1;color: #666666;background: #F1F1F1;height: 36rpx;}
+		&.btnbgc{border: 1px solid #FE5A0E;color:#FE5A0E;background:#FFEEE6;height: 36rpx;}
+	}
+	.clists{padding: 24rpx 24rpx 8rpx;
+		.clist{font-weight: 500;margin-bottom: 16rpx;
+font-size: 26rpx;color: #272727;display: flex;line-height: 34rpx;
+			.tit{font-size: 26rpx;color: #AAAAAA;flex: 0 0 auto;margin-right: 16rpx;min-width: 108rpx;text-align-last: justify;}
+			.imgas{display: flex;align-items: center;flex-wrap: wrap;
+				image{width: 142rpx;height: 142rpx;margin-right: 30rpx;margin-top: 8rpx;}
+			}	
+		}
+		.w50{
+			.clist{width: 50%;}
+		}
+	}
+}
 // 收货地址
 .adrlist{border-bottom: 2rpx solid  #E5E5E5;padding: 34rpx 0 34rpx 8rpx;
 	.tit{font-weight: 500;font-size: 22rpx;color: #666666;}

user_ui/mine/components/popup/popup.vue

@@ -95,10 +95,10 @@
 				},
 				sexs: [{
 					text: '男',
-					value: 0
+					value: 1
 				}, {
 					text: '女',
-					value: 1
+					value: 2
 				}],
 				peoval:0,
 				peolist:[{name:'王安安',val:"0",type:0},{name:'刘柠溪',val:"1",type:1},{name:'王合一',val:"2",type:0},]

user_ui/mine/pages/car/illegalParking.vue

@@ -0,0 +1,205 @@
+<template>
+	<view class="car">
+		<view class="cartop">
+			
+			<view class="tabtop flexc">
+				<view class="tabt" :class="tabval==ite.val?'act':''" v-for="(ite,idx) in tablist" :key="idx" @click="getTabFn(ite.val)">{{ite.tit}}</view>
+				<view class="topa flexc">
+					<image :src="reset" class="resetimg" @click="getReset"></image>
+					<picker mode="date"   @change='bindDateChangea'>
+						<view class="chekt flexc">
+							<view>{{wtrq|| "选择日期"}}</view>
+							<image :src="up"></image>
+						</view>
+					</picker>
+				</view>
+			</view>
+		</view>
+		<!-- 列表 -->
+		<view class="carlists">
+			<box-list :datainfo="list" :carType="carType" :wtdt="wtdt" type='carpark' @getDetail="getDetail" @getDelFn='getDelFn'></box-list>
+		</view>
+		<loading></loading>
+	</view>
+</template>
+
+<script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
+	import boxList from "@/mine/components/box/list.vue"
+	import {illegalParkingList,illegalParkingDel} from "@/api/work/car.js"
+	import {getDictionaryFn} from "@/api/system/user.js"
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	export default{
+		components:{boxList},
+		data(){
+			return{
+				reset:require('@/mine/static/reset.png'),
+				up:require('@/mine/static/up.png'),
+				wtrq:"",
+				text:'',
+				list:[],
+				pageSize: 10,
+				pageNum: 1,
+				reachflag: true,
+				wtdt:'暂无数据',
+				tabval:'1',
+				phonenumber:this.$store.state.user.phonenumber,
+				tablist:[{tit:'我的车辆',val:'1'},{tit:'访客车辆',val:'2'},],
+				carType:[],//车辆类型
+			}
+		},
+		onUnload() {
+			uni.$off('refCarPark')
+		},
+		onLoad: function() {
+			uni.$on('refCarPark',(res)=>{
+				this.getrefreshData()
+			})
+			this.init()
+			this.getDataFn()
+		},
+		// 上拉触底加载更多触发事件
+		onReachBottom() {
+			if (this.reachflag) {
+				this.pageNum++
+				this.getDataFn()
+			}
+		},
+		methods:{
+			checkPermi, checkRole,
+			init(){//car_type
+				// 车辆类型
+				getDictionaryFn('car_type').then(res=>{
+					if(res.code==200){
+						this.carType = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
+			},
+			getCheck(){
+				this.$tab.navigateTo("/mine/pages/illegalcheck")
+			},
+			getDetail(e){
+				this.$tab.navigateTo("/mine/pages/car/illegalrecord?id="+e)
+			},
+			getConfirm(){
+				this.getrefreshData()
+			},
+			getReset(){
+				this.wtrq='';
+				this.text='';
+				this.getrefreshData()
+			},
+			getrefreshData(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getTabFn(val){
+				this.tabval=val;
+				this.getrefreshData()
+			},
+			bindDateChangea(e){
+				var val=e.detail.value;
+				this.wtrq=val;
+				this.getrefreshData()
+			},
+			getDelFn(data){
+				var that=this;
+				illegalParkingDel(data).then(res=>{
+					if(res.code==200){
+						this.$toast("删除成功");
+						setTimeout(function(){
+							that.getrefreshData()
+						},1500)
+					}
+				})
+			},
+			getDataFn(){
+				var params={
+					pageSize:this.pageSize,
+					pageNum: this.pageNum,
+					mobileNumber:this.phonenumber,
+					carType:'1'
+				}
+				// if(this.tabval!='-1'){
+				// 	params.carType=this.tabval
+				// }
+				if(this.wtrq){
+					params['params[createTime]']=this.wtrq
+				}
+				illegalParkingList(params).then(res=>{
+					if(res.code==200){
+						if (res.rows.length < this.pageSize) {
+							this.reachflag = false
+							this.wtdt = '到底了~';
+						} else {
+							var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+							if (num < res.total) {
+								this.reachflag = true
+								this.wtdt = ''
+							} else {
+								this.reachflag = false
+								this.wtdt = '到底了~';
+							}
+						}
+						var newArr=JSON.parse(JSON.stringify(res.rows))
+						newArr.forEach(ite=>{
+							ite.right=0;
+						})
+						if (this.pageNum == 1) {
+							this.list = newArr;
+						} else {
+							this.list = this.list.concat(newArr)
+						}
+					}else{
+						this.$toast(res.msg)
+					}
+				})
+				
+			},
+		}
+	}
+</script>
+<style>
+	page{background: #F3F3F0;}
+</style>
+<style lang="scss" scoped>
+.car{padding: 130rpx 0 10rpx;}
+.cartop{position: fixed;left: 0;right: 0;top: 0;background-color: #ffffff;z-index: 2;
+	.topa{padding: 20rpx ;
+		.resetimg{width: 36rpx;height: 36rpx;margin-right: 24rpx;flex: 0 0 auto;}
+		.chekt{min-width: 180rpx;
+			view{font-weight: 500;font-size: 26rpx;color: #272727;flex: 1;}
+			image{width: 24rpx;height: 16rpx;margin-left: 18rpx;flex: 0 0 auto;}
+		}
+		.search{flex: 1;margin-left: 16rpx;height: 64rpx;background: #EEEEEE;border-radius: 32rpx;border: 2rpx solid #E6E6E6;padding-left: 24rpx;box-sizing: border-box;
+		image{width: 32rpx;height: 34rpx;margin-right: 22rpx;flex: 0 0 auto;}
+		input{flex: 1;font-size: 26rpx;color: #272727;}
+		.btn{width: 100rpx;height: 64rpx;background: #3565ED;border-radius: 32rpx;flex: 0 0 auto;font-weight: bold;text-align: center;line-height: 64rpx;
+font-size: 26rpx;
+color: #FFFFFF;}
+		}
+	}
+	.tabtop{padding-bottom: 30rpx;
+		.tabt{font-weight: 500;font-size: 32rpx;color: #666666;position: relative;line-height: 56rpx;padding: 0 40rpx;margin-right: 6rpx;
+			&.act{font-weight: bold;font-size: 32rpx;color: #272727;
+			&::after{content: '';width: 40rpx;height: 10rpx;background: #0156FE;border-radius: 6rpx;position: absolute;left: 50%;margin-left: -20rpx;bottom: -10rpx;}
+			}
+		}
+	}
+	.tablst{background: #F3F3F0;padding:30rpx 16rpx 30rpx 46rpx;overflow: auto;
+		.tabs{height: 48rpx;background: #DADADA;border-radius: 24rpx;margin-right: 30rpx;font-weight: 500;display: flex;align-items: center;justify-content: center;padding: 0 24rpx;
+font-size: 26rpx;box-sizing: border-box;flex: 0 0 auto;color: #666666;
+			&.act{border: 2rpx solid #0256FD;background: #FFFFFF;color: #0256FD;}
+		}
+	}
+}
+.carlists{padding: 0 18rpx;}
+</style>

user_ui/mine/pages/car/illegalrecord.vue

@@ -0,0 +1,193 @@
+<template>
+	<view class="irecord">
+		<view class="ctop flexc">
+			<image :src="carc" class="imgs" v-if="datainfo.carType==1"></image>
+			<image :src="card" class="imgs" v-if="datainfo.carType==2"></image>
+			<view class="tit">{{datainfo.plateNumber}}</view>
+			<view class="flex1"></view>
+			<block v-if="datainfo.carType">
+				<view class="txt" :class="datainfo.carType==1?'ca':'cb'">{{kaType(datainfo.carType,carType)}}</view>
+			</block>
+		</view>
+		<view class="pdlr12" v-if="datainfo.carType==1">
+			<view class="clists bgef">
+				<view class="clist"><view class="tit">关联房号：</view>{{datainfo.visitPortal}}</view>
+				<view class="clist"><view class="tit">手机号码：</view>{{datainfo.mobileNumber}}</view>
+			</view>
+		</view>
+		<view class="chtop flexc">
+			<view class="line"></view>
+			<view>违停记录</view>
+			<view class="flex1"></view>
+			<view class="num coff" v-if="datainfo.isBlack=='Y'">(已登黑名单)</view>
+		</view>
+		<!-- 步骤条 -->
+		<view class="steps" v-for="(ite,idx) in datainfo.children">
+			<image :src="icoa" v-if="idx==0" class="circle"></image>
+			<image :src="icob" v-else class="circle"></image>
+			<view class="step">
+				<view class="slist">
+					<view class="tit">登记时间：</view>{{ite.createTime}}
+				</view>
+				<view class="slist">
+					<view class="tit">违停拍照：</view>
+					<view class="imgas" v-if="ite.illegalPhoto">
+						<image :src="baseUrl+aite" v-for="(aite,aidx) in kaPhoto(ite.illegalPhoto)" :key="aidx" @click.stop="getPreview(aidx,ite.illegalPhoto)"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<block >
+			<!-- v-if="datainfo.isBlack=='Y'" -->
+			<view style="height: 100rpx;"></view>
+			<view class="rfbtn" @click="getDelFn" >解除黑名单</view>
+		</block>
+		
+		<loading></loading>
+	</view>
+</template>
+
+<script>
+	import config from '@/config'
+	import {selectDictValue} from "@/utils/common.js"
+	import {illegalParkingDet,illegalParkingDel,illegalParkingCancel} from "@/api/work/car.js"
+	import {getDictionaryFn} from "@/api/system/user.js"
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	export default{
+		components:{},
+		data(){
+			return{
+				// line:require('@/car/static/car/line.png'),
+				carc:require('@/mine/static/house/carcc.png'),
+				card:require('@/mine/static/house/carbb.png'),
+				icoa:require('@/mine/static/house/icoa.png'),
+				icob:require('@/mine/static/house/icob.png'),
+				baseUrl:config.baseUrl,
+				datainfo:{},
+				id:'',
+				carType:[],
+			}
+		},
+		onLoad: function(e) {
+			this.init()
+			if(e.id){
+				this.id=e.id;
+				this.getDataFn()
+			}
+		},
+		methods:{
+			checkPermi, checkRole,
+			kaType(data, list) {
+				return selectDictValue(list, data);
+			},
+			kaPhoto(data){
+				return data.split(',');
+			},
+			init(){
+				// 车辆类型
+				getDictionaryFn('car_type').then(res=>{
+					if(res.code==200){
+						this.carType = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
+			},
+			getDataFn(){
+				illegalParkingDet(this.id).then(res=>{
+					if(res.code==200){
+						this.datainfo=JSON.parse(JSON.stringify(res.data));
+					}
+				})
+			},
+			getPreview(idx,arr) {
+				var newArr=[];
+				var list=arr.split(',')
+				list.forEach(ite=>{
+					var ds=this.baseUrl+ite
+					newArr.push(ds)
+				})
+				uni.previewImage({
+					urls: newArr,
+					current:idx,
+					success: function(data) {},
+					fail: function(err) {}
+				});
+			},
+			getDelFn(){
+				var that=this;
+				uni.showModal({
+					title: '解除黑名单',
+					content: "是否确认解除",
+					cancelText: '取消',
+					confirmText: '确认',
+					success: function(res) {
+						if (res.confirm) {
+							that.getLiftFn()
+						} else if (res.cancel) {
+						}
+					}
+				});
+			},
+			getLiftFn(){
+				var that=this;
+				var info=JSON.parse(JSON.stringify(this.datainfo));
+				var params={};
+				params.plateNumber=info.plateNumber;
+				params.illegalParkingId=info.illegalParkingId;
+				params.isBlack="N"
+				// 车牌号，id,isblace
+				illegalParkingCancel(params).then(res=>{
+					if(res.code==200){
+						this.$toast("解除成功")
+						setTimeout(function(){
+							uni.$emit("refCarPark")
+							uni.navigateBack({
+								delta:1
+							})
+						},1500)
+					}
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.bgef{background: #EFF4FF;}
+.irecord{background: #FFFFFF;border-radius: 20rpx;flex: 1;padding-bottom: 10rpx;
+	.ctop{padding:20rpx 48rpx;margin-bottom:14rpx;
+		.imgs{width: 30rpx;height: 24rpx;margin-right: 12rpx;}
+		.tit{font-size: 32rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size: 24rpx;
+			&.ca{color: #0256FD;}
+			&.cb{color: #FE5A0E;}	
+		}
+	}
+	.clists{padding: 22rpx 40rpx 22rpx;border-radius: 20rpx;box-sizing: border-box;
+			.clist{font-size: 26rpx;color: #272727;display: flex;line-height: 52rpx;
+				.tit{font-size: 26rpx;color: #272727;flex: 0 0 auto;min-width: 108rpx;text-align-last: justify;font-weight: bold;}		
+			}
+		}
+	.chtop{padding-top: 36rpx;margin-bottom: 32rpx;padding-right: 48rpx;
+		image{width: 14rpx;height: 48rpx;margin-right: 20rpx;}
+		view{font-weight: bold;font-size: 32rpx;color: #272727;}
+		.num{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+	}
+	.steps{display: flex;padding: 0 32rpx 12rpx;position: relative;
+		&::after{content: '';background: #E6E6E6;width: 2rpx;position: absolute;top: 38rpx;bottom: -14rpx;left: 44rpx;}
+		.circle{width: 24rpx;height: 24rpx;margin-right: 24rpx;flex: 0 0 auto;margin-top: 14rpx;}
+		.step{
+			.slist{font-size: 26rpx;color: #272727;display: flex;line-height: 52rpx;margin-bottom: 6rpx;
+				.tit{font-weight: bold;text-align-last: justify;flex: 0 0 auto;min-width: 108rpx;}
+				.imgas{display: flex;align-items: center;flex-wrap: wrap;
+					image{width: 160rpx;height: 160rpx;margin-right: 30rpx;margin-bottom: 14rpx;}
+				}
+			}
+		}
+	}
+	
+}
+</style>

user_ui/mine/pages/news/index.vue

@@ -10,6 +10,7 @@
 	const baseUrl = config.baseUrl
 	import boxList from "@/mine/components/box/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import {getCommentInteraction} from "@/api/work/news.js"
 	export default{
 		components:{boxList},
 		data(){
@@ -23,7 +24,7 @@
 			}
 		},
 		onLoad: function() {
-		
+			this.getDataFn()
 		},
 		onPageScroll(e) {
 			var scrollTop = Number(e.scrollTop);
@@ -68,14 +69,14 @@
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
 				}
-				params.noticeType=this.tabidx
-				getNoticeList(params).then(res=>{
+				getCommentInteraction(params).then(res=>{
 					if(res.code==200){
-						if (res.rows.length < this.pageSize) {
+						var data=res.data.list;
+						if (data.length < this.pageSize) {
 							this.reachflag = false
 							this.wtdt = '到底了~';
 						} else {
-							var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+							var num = parseInt(data.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
 							if (num < res.total) {
 								this.reachflag = true
 								this.wtdt = ''
@@ -85,9 +86,9 @@
 							}
 						}
 						if (this.pageNum == 1) {
-							this.list = res.rows;
+							this.list = data;
 						} else {
-							this.list = this.list.concat(res.rows)
+							this.list = this.list.concat(data)
 						}
 					}else{
 						this.$toast(res.msg)

user_ui/news/components/popup/popup.vue

@@ -127,10 +127,10 @@
 				},
 				sexs: [{
 					text: '男',
-					value: 0
+					value: 1
 				}, {
 					text: '女',
-					value: 1
+					value: 2
 				}],
 				peoval:0,
 				peolist:[{name:'王安安',val:"0",type:0},{name:'刘柠溪',val:"1",type:1},{name:'王合一',val:"2",type:0},]

user_ui/news/pages/news/newsadd.vue

@@ -49,7 +49,7 @@
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				datainfo: {
-					sex:0,
+					sex:1,
 					realName: '',
 					idCard: '',
 					address: '',
@@ -61,10 +61,10 @@
 				syqxidx:'',
 				sexs: [{
 					text: '男',
-					value: 0
+					value: 1
 				}, {
 					text: '女',
-					value: 1
+					value: 2
 				}],
 			}
 		},

user_ui/news/pages/news/newssq.vue

@@ -3,8 +3,8 @@
 		<view class="cartop">
 			<view class="tabtop flexc">
 				<view class="tabt" :class="tabval==ite.dictValue?'act':''" v-for="(ite,idx) in wzlxList" :key="idx" @click="getTabFn(ite.dictValue)">{{ite.dictLabel}}</view>
-				<view class="numbox">
-					未读互动<text>27</text>
+				<view class="numbox" @click="getHdFn">
+					未读互动<text>{{hdcount}}</text>
 				</view>
 			</view>
 		</view>
@@ -23,6 +23,7 @@
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {newsList,newsDel} from "@/api/work/manage.js"
+	import {getCommentInteractionCount} from "@/api/work/news.js"
 	export default{
 		components:{boxList},
 		data(){
@@ -36,6 +37,7 @@
 				wtdt:'',
 				tabval:'',
 				wzlxList:[],
+				hdcount:0,
 			}
 		},
 		onUnload() {
@@ -46,6 +48,7 @@
 				this.getrefreshData()
 			})
 			this.init()
+			this.getCommentInteractionCount()
 		},
 		// 上拉触底加载更多触发事件
 		onReachBottom() {
@@ -73,7 +76,17 @@
 					}
 				})
 			},
-			
+			getCommentInteractionCount(){
+				var params={}
+				getCommentInteractionCount(params).then(res=>{
+					if(res.code==200){
+						this.hdcount=res.data
+					}
+				})
+			},
+			getHdFn(){
+				this.$tab.navigateTo("/mine/pages/news/index")
+			},
 			getDetail(id){
 				this.$tab.navigateTo("/news/pages/news/detail?id="+id)
 			},

user_ui/pages.json

@@ -366,6 +366,20 @@
 				"h5":{"titleNView":false}
 			  }
 			},
+			{
+			  "path": "pages/car/illegalParking",
+			  "style": {
+			    "navigationBarTitleText": "我的违停",
+				"h5":{"titleNView":false}
+			  }
+			},
+			{
+			  "path": "pages/car/illegalrecord",
+			  "style": {
+			    "navigationBarTitleText": "违停记录",
+				"h5":{"titleNView":false}
+			  }
+			},
 			{
 			  "path": "pages/delivery/index",
 			  "style": {

user_ui/pages/mine/index.vue

@@ -33,13 +33,13 @@
 				
 			</view>
 			<view class="conts flexc">
-				<view class="contn" v-if="checkPermi([''])" @click="handleToYy">
+				<view class="contn"  @click="handleToYy">
 					<view class="img">
 						<image :src="listimga" class="imga"></image>
 					</view>
 					<view class="ctit">我的报修</view>
 				</view>
-				<view class="contn" v-if="checkPermi([''])" @click="handleToYy">
+				<view class="contn"  @click="handleToYy">
 					<view class="img">
 						<image :src="listimgb" class="imgb"></image>
 					</view>
@@ -58,8 +58,9 @@
 					<view class="ctit">家政订单</view>	
 				</view>
 			</view>
+			<!-- v-if="checkPermi([''])" -->
 			<view class="mbgbox">
-				<view class="flexc mine_list" @click="getClockcontFn" v-if="checkPermi([''])">
+				<view class="flexc mine_list" @click="getClockcontFn">
 					<view class="limg">
 						<image :src="listimge" class="imga"></image>
 					</view>
@@ -73,28 +74,28 @@
 					<view class="tit flex1">优惠券</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getClockcontFn" v-if="checkPermi([''])">
+				<view class="flexc mine_list" @click="getClockcontFn" >
 					<view class="limg">
 						<image :src="listimgg" class="imgc"></image>
 					</view>
 					<view class="tit flex1">积分收支</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getYqMeetFn">
+				<view class="flexc mine_list" @click="getMyParkFn" v-if="checkPermi(['wuYe:illegalParking:list'])">
 					<view class="limg">
 						<image :src="listimgh" class="imgd"></image>
 					</view>
 					<view class="tit flex1">我的违停</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getMyHdFn" v-if="checkPermi([''])">
+				<view class="flexc mine_list" @click="getMyHdFn">
 					<view class="limg">
 						<image :src="listimgo" class="imgd"></image>
 					</view>
 					<view class="tit flex1">我的互动</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getWdHdFn" v-if="checkPermi([''])">
+				<view class="flexc mine_list" @click="getWdHdFn" >
 					<view class="limg">
 						<image :src="listimgq" class="imgd"></image>
 					</view>
@@ -108,7 +109,7 @@
 					<view class="tit flex1">评论审核</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getClockcontFn" v-if="checkPermi([''])">
+				<view class="flexc mine_list" @click="getClockcontFn" >
 					<view class="limg">
 						<image :src="listimgk" class="imgd"></image>
 					</view>
@@ -249,43 +250,6 @@
 		
 		methods: {
 			checkPermi,checkRole,
-			// 待我审批
-			handleToYy(){
-				this.$tab.navigateTo("/pages/order/list")
-			},
-			//访客预约
-			handleToAddYy(){
-				this.$tab.navigateTo("/pages/order/come")
-			},
-			//在线会议
-			getYqMeetFn(){
-				// var url='https://www.baidu.com'
-				this.$tab.navigateTo("/pages/common/webview/index?url="+webUrl)
-			},
-			//我的会议
-			handleToMyhy(){
-				this.$tab.navigateTo("/work/pages/yyorder/meetlist")
-			},
-			//我的就餐
-			handleToMyjc(){
-				this.$tab.navigateTo("/work/pages/yyorder/eatlist")
-			},
-			//我的申报
-			handleToMysb(){
-				// this.$tab.navigateTo("/work/pages/business/list?from=my&type=0")
-			},
-			// 考勤设置
-			handleToKq(){
-				this.$tab.navigateTo('/work/pages/clock/kaorules')
-			},
-			// 考勤记录
-			getClockjlFn(){
-				this.$tab.navigateTo("/work/pages/record/clockin")
-			},
-			// 考勤统计
-			getClockcontFn(){
-				this.$tab.navigateTo("/work/pages/clock/personnel")
-			},
 			// 设置
 			handleToSetting() {
 			  this.$tab.navigateTo('/pages/mine/setting/index')
@@ -305,6 +269,9 @@
 			getWdHdFn(){//我的点评赞
 				this.$tab.navigateTo('/mine/pages/news/myhd')
 			},
+			getMyParkFn(){//我的违停
+				this.$tab.navigateTo('/mine/pages/car/illegalParking')
+			},
 			// 账号信息
 			handleToInfo() {
 				this.$tab.navigateTo('/pages/mine/info/index')

user_ui/pages/mine/info/edit.vue

@@ -35,10 +35,10 @@
         },
         sexs: [{
           text: '男',
-          value: "0"
+          value: "1"
         }, {
           text: '女',
-          value: "1"
+          value: "2"
         }],
         rules: {
           nickName: {

user_ui/utils/request.js

@@ -32,7 +32,7 @@ const request = config => {
   // uni.showLoading({
   // 	title:"加载中"
   // })
-  // vues.$loading(true)
+  vues.$loading(true)
   return new Promise((resolve, reject) => {
     uni.request({
         method: config.method || 'get',