测试

user_ui/api/system/card.js

@@ -31,4 +31,3 @@ export function getvehicleLicense(data) {
 	'data':data
   })
 }
-

user_ui/api/work/index.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+//物业管家-列表wuYe:settings:list
+export function gesettingsList(data) {
+  return request({
+    'url': '/wuYe/settings/list',
+    'method': 'get',
+	'data':data
+  })
+}
+

user_ui/api/work/work.js

@@ -41,7 +41,16 @@ export function houseInfoDet(data) {
 // 房屋信息-列表不分页wuYe:houseInfo:listNoPage
 export function houseInfolistNoPage(data) {
   return request({
-    url: '/wuYe/houseInfo/listNoPage',
+    url: '/wuYe/houseInfo/list',
     method: 'get',
+	'data':data
   })
-}
+}
+// 房屋信息-列表不分页wuYe:houseInfo:listNoPage
+// export function houseInfolistNoPage(data) {
+//   return request({
+//     url: '/wuYe/houseInfo/listNoPage',
+//     method: 'get',
+// 	'data':data
+//   })
+// }

user_ui/components/box/popup.vue

@@ -7,25 +7,11 @@
 				<image :src="wytit" class="imga"></image>
 				<image :src="head" class="imgb"></image>
 			</view>
-			<view class="wylist flexc">
-				<image :src="phicoa"></image>
+			<view class="wylist flexc" v-for="(ite,idx) in phoneList" :key="idx">
+				<image :src="ite.title.indexOf('投诉')!=-1?phicob:phicoa"></image>
 				<view>
-					<view class="co6 mb4">管家电话</view>
-					<view class="co27">18756900034</view>
-				</view>
-			</view>
-			<view class="wylist flexc">
-				<image :src="phicoa"></image>
-				<view>
-					<view class="co6 mb4">物业电话</view>
-					<view class="co27">0551-5688168</view>
-				</view>
-			</view>
-			<view class="wylist flexc">
-				<image :src="phicob"></image>
-				<view>
-					<view class="co6 mb4">投诉电话</view>
-					<view class="co27">18308560681</view>
+					<view class="co6 mb4">{{ite.title}}</view>
+					<view class="co27">{{ite.content}}</view>
 				</view>
 			</view>
 			<image :src="closeimg" class="closeimg" @click="getClose"></image>
@@ -58,6 +44,12 @@
 				default () {
 					return ''
 				}
+			},
+			phoneList:{
+				type: Array,
+				default () {
+					return []
+				}
 			}
 		},
 		data(){

user_ui/health/pages/health/add.vue

@@ -227,7 +227,8 @@
 				ptype:'add',
 				filterable:true,
 				chooseValue:'',
-				map:{text:'dictLabel',value:'dictValue'}
+				map:{text:'dictLabel',value:'dictValue'},
+				userId:this.$store.state.user.userId,
 			}
 		},
 		onLoad: function(e) {
@@ -276,7 +277,12 @@
 				this.datainfo.detailedAddress=e.label;
 			},
 			init(){
-				houseInfolistNoPage().then(res=>{
+				var params={
+					userId:this.userId,
+					pageSize: 100,
+					pageNum: 1,
+				}
+				houseInfolistNoPage(params).then(res=>{
 					if(res.code==200){
 						this.fwlist= res.rows.map(v => {
 							return {

user_ui/mine/components/box/list.vue

@@ -225,11 +225,10 @@
 					<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view>
 				</view>
 		</block>
-		<!-- 我的点赞，收藏，评论 -->
+		<!-- 我的点赞，收藏，评论 :data-idx="idx"
+					@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"-->
 		<block v-if="type=='wdhd'">
-			<view class="mb12 pr"  v-for="(ite,idx) in datainfo" :key="idx"
-					:data-idx="idx"
-					@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'">
+			<view class="mb12 pr"  v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite)">
 				<view class="hdlist ">
 					<view class="pd12 flex">
 						<image :src="ite.avatar?baseUrl+ite.avatar:man" class="mhead flex0"></image>
@@ -248,7 +247,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view>
+				<!-- <view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view> -->
 			</view>
 		</block>
 		<!-- 车辆违规 -->
@@ -673,7 +672,7 @@ border-radius: 10rpx;}
 // 互动
 .pd12{padding: 24rpx;}
 .hdlist{background: #FFFFFF;border-radius: 20rpx;position: relative;z-index: 1;
-	.mhead{width: 56rpx;height: 56rpx;margin-right: 20rpx;}
+	.mhead{width: 56rpx;height: 56rpx;margin-right: 20rpx;border-radius: 50%}
 	.name{font-size: 28rpx;font-weight: bold;color: #272727;height: 56rpx;line-height: 56rpx;}
 	.tit{font-weight: 500;font-size: 22rpx;color: #666666;}
 	.time{font-weight: 500;font-size: 22rpx;color: #666666;}

user_ui/mine/components/popup/popup.vue

@@ -101,7 +101,7 @@
 					value: 2
 				}],
 				peoval:0,
-				peolist:[{name:'王安安',val:"0",type:0},{name:'刘柠溪',val:"1",type:1},{name:'王合一',val:"2",type:0},]
+				peolist:[]
 			}
 		},
 		mounted() {

user_ui/mine/pages/car/addcar.vue

@@ -218,7 +218,9 @@
 			init(){
 				// 自己的房屋
 				var params={
-					userId:this.userId
+					userId:this.userId,
+					pageSize: 100,
+					pageNum: 1,
 				}
 				houseInfolistNoPage(params).then(res=>{
 					if(res.code==200){

user_ui/mine/pages/delivery/detail.vue

@@ -26,7 +26,7 @@
 		data(){
 			return{
 				type:'kdstep',
-				list:[{tit:'123'}],
+				list:[],
 				cirimg:require("@/static/images/home/cir.png"),
 			}
 		},

user_ui/mine/pages/delivery/index.vue

@@ -27,7 +27,7 @@
 			return{
 				cxrq:"",
 				text:'',
-				list:[{tit:'皖A IC520',type:1,right:0},{tit:'晋E KD783',type:2,right:0},],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,

user_ui/mine/pages/house/addaddress.vue

@@ -72,7 +72,7 @@
 				rimg:require('@/static/images/rimg.png'),
 				check: require('@/mine/static/check.png'),
 				ncheck: require('@/mine/static/ncheck.png'),
-				list:[{tit:'123',isdefault:true},{tit:'212123',isdefault:false,isuser:true},],
+				list:[],
 				text:"",
 				datainfo:{},
 				mjlist:[{tit:'80m²以内',val:'0'},{tit:'80-90m²',val:'1'},{tit:'90-119m²',val:'2'},{tit:'120-139m²',val:'3'},{tit:'140-159m²',val:'4'},{tit:'160m²以上',val:'5'},],

user_ui/mine/pages/house/address.vue

@@ -22,7 +22,7 @@
 		data(){
 			return{
 				hrimg:require('@/static/logo.png'),
-				list:[{tit:'123',isdefault:true},{tit:'212123',isdefault:false,isuser:true},],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,

user_ui/mine/pages/news/index.vue

@@ -16,7 +16,7 @@
 		data(){
 			return{
 				hrimg:require('@/static/logo.png'),
-				list:[{tit:"11"}],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,

user_ui/mine/pages/news/myhd.vue

@@ -28,10 +28,17 @@
 				reachflag: true,
 				wtdt:'',
 				tabval:'mypl',
+				userId:this.$store.state.user.userId,
 				tablist:[{tit:"评论",val:'mypl'},{tit:"点赞",val:'mydz'},{tit:"收藏",val:'mysc'},]
 			}
 		},
+		onUnload() {
+			uni.$off('partyNewsList')
+		},
 		onLoad: function() {
+			uni.$on('partyNewsList',(res)=>{
+				this.getrefreshData()
+			})
 			this.getDataFn()
 		},
 		onPageScroll(e) {
@@ -55,6 +62,22 @@
 			// getNextFn(){
 			// 	this.$tab.navigateTo("/work/pages/business/add")
 			// },
+			getDetail(data){
+				var info=JSON.parse(JSON.stringify(data))
+				var type=this.tabval;
+				var targetType=info.targetType;//1：社区 2：党建 
+				if(type=='mypl'){
+					var id=info.commentId;
+					this.$tab.navigateTo("/news/pages/news/detail?id="+id)
+				}else{
+					var id=info.targetId;
+					if(targetType==1){
+						this.$tab.navigateTo("/news/pages/news/detail?id="+id)
+					}else if(targetType==2){
+						this.$tab.navigateTo("/news/pages/news/djdetail?id="+id)
+					}
+				}
+			},
 			getDelFn(id){
 				var that=this;
 				// reservDel(data).then(res=>{
@@ -92,6 +115,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
+					userId:this.userId
 				}
 				var tabval=this.tabval
 				if(tabval=='mypl'){

user_ui/mine/pages/news/sh.vue

@@ -16,7 +16,7 @@
 		data(){
 			return{
 				hrimg:require('@/static/logo.png'),
-				list:[{tit:"11"}],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,

user_ui/news/components/box/list.vue

@@ -7,9 +7,9 @@
 			<view class="walists" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.communityId)">
 				<view class="watop">
 					<view class="watit">
-						<view class="tit">{{ite.communityTitle}}<text class="cir"></text></view>
+						<view class="tit">{{ite.communityTitle}}<text class="cir" v-if="ite.isInteraction=='Y'"></text></view>
 					</view>
-					<view class="wacoma overtwo"><rich-text :nodes="ite.communityContent"></rich-text></view>
+					<view class="wacoma overtwo"><rich-text v-if="ite.communityContent" :nodes="ite.communityContent"></rich-text></view>
 					<view class="wacomb">{{ite.publishTime}}</view>
 				</view>
 				<view class="wabtn">
@@ -43,7 +43,7 @@
 			<view class="newlists" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.partyId)" 
 			>
 				<view class="tit">{{ite.partyTitle}}</view>
-				<view class="txt overtwo"><rich-text :nodes="ite.partyContent"></rich-text></view>
+				<view class="txt overtwo"><rich-text v-if="ite.partyContent" :nodes="ite.partyContent"></rich-text></view>
 				<view class="stabox flexc">
 					<view class="time flex1">{{ite.publishTime}}</view>
 					<view class="btns flexc" @click.stop="getScFn(ite,idx)">
@@ -80,7 +80,7 @@
 						</view>
 					</view>
 					<view class="infotxt">
-						<rich-text :nodes="analyzeEmoji(ite.content)"></rich-text>
+						<rich-text v-if="ite.content" :nodes="analyzeEmoji(ite.content)"></rich-text>
 					<view class="infotime">{{ite.createDate}}</view></view>
 				
 					<!-- 二级回复 -->
@@ -112,7 +112,7 @@
 								</view>
 							</view>
 							<view class="infotxt">
-								<rich-text :nodes="analyzeEmoji(aite.content)"></rich-text>
+								<rich-text v-if="aite.content" :nodes="analyzeEmoji(aite.content)"></rich-text>
 								<view class="infotime">{{aite.createDate}}</view></view>
 						</view>
 					</view>
@@ -337,19 +337,6 @@
 			getShouFn(idx){
 				this.$emit("getShouFn",idx)
 			},
-			// getPreview(idx,arr) {
-			// 	var newArr=[];
-			// 	arr.forEach(ite=>{
-			// 		var ds=this.baseUrl+ite
-			// 		newArr.push(ds)
-			// 	})
-			// 	uni.previewImage({
-			// 		urls: newArr,
-			// 		current:idx,
-			// 		success: function(data) {},
-			// 		fail: function(err) {}
-			// 	});
-			// },
 			getDelFn(id){
 				var that=this;
 				uni.showModal({

user_ui/news/components/popup/popup.vue

@@ -110,7 +110,7 @@
 				wxFiles: [],
 				// 是否打印日志
 				debug: false,
-				filelist:[{name:"123"}],
+				filelist:[],
 				filico:require('@/work/static/filico.png'),
 				fdelimg:require('@/work/static/fjdel.png'),
 				
@@ -133,7 +133,7 @@
 					value: 2
 				}],
 				peoval:0,
-				peolist:[{name:'王安安',val:"0",type:0},{name:'刘柠溪',val:"1",type:1},{name:'王合一',val:"2",type:0},]
+				peolist:[]
 			}
 		},
 		mounted() {

user_ui/news/pages/complaint/index.vue

@@ -34,7 +34,8 @@
 				wtdt:'',
 				tabval:'-1',
 				tablist:[{tit:'全部',val:-1}],
-				tsjyList:[]
+				tsjyList:[],
+				userId:this.$store.state.user.userId,
 			}
 		},
 		onUnload() {
@@ -118,7 +119,8 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
-					isPublic:'Y'
+					isPublic:'Y',
+					userId:this.userId
 				}
 				if(this.tabval!=-1){
 					params.status=this.tabval;

user_ui/news/pages/news/detail.vue

@@ -114,6 +114,7 @@
 				deletepl(info.id).then(res=>{
 					if(res.code==200){
 						this.$toast("删除成功");
+						uni.$emit('partyNewsList')
 						setTimeout(function(){
 							// 删除数据
 							that.getRootComment()
@@ -169,6 +170,7 @@
 				}
 				giveTheThumbs(params).then(res=>{
 					if(res.code==200){
+						uni.$emit('partyNewsList')
 						if(type==1){
 							if(this.datainfo.isLike=='Y'){
 								this.$toast("取消点赞成功");
@@ -177,7 +179,7 @@
 							}else{
 								this.$toast("点赞成功");
 								this.datainfo.isLike='Y';
-								this.datainfo.userLikes--;
+								this.datainfo.userLikes++;
 							}
 						}else{
 							var idx=info.idx;
@@ -226,6 +228,7 @@
 				params.targetTitle=this.datainfo.communityTitle;
 				getStars(params).then(res=>{
 					if(res.code==200){
+						uni.$emit('partyNewsList')
 						if(this.datainfo.isStar=='Y'){
 							this.$toast("取消收藏成功");
 							this.datainfo.isStar='N';

user_ui/news/pages/news/djdetail.vue

@@ -92,6 +92,7 @@
 				}
 				getStarsDj(params).then(res=>{
 					if(res.code==200){
+						uni.$emit('partyNewsList')
 						if(this.datainfo.isStars=='Y'){
 							this.$toast("取消收藏成功");
 							this.datainfo.isStars='N';
@@ -100,7 +101,7 @@
 							this.$toast("收藏成功");
 							this.datainfo.isStars='Y';
 							this.datainfo.starsCount++
-						}	
+						}
 					}
 				})
 			},

user_ui/news/pages/news/newssq.vue

@@ -10,7 +10,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<box-list :datainfo="list" :wzlxList="wzlxList" :topval="tabval" :wtdt="wtdt" type='newssq' @getDetail="getDetail"></box-list>
+			<box-list :datainfo="list"  :wtdt="wtdt" type='newssq' @getDetail="getDetail"></box-list>
 		</view>
 		<loading></loading>
 	</view>
@@ -142,12 +142,14 @@
 							}
 						}
 						var newArr=JSON.parse(JSON.stringify(res.rows))
-						newArr.forEach(ite=>{
-							if(ite.communityContent){
-								ite.communityContent=this.formatRichText(ite.communityContent)
-							}
-							ite.right=0;
-						})
+						if(newArr&&newArr.length){
+							newArr.forEach(ite=>{
+								if(ite.communityContent){
+									ite.communityContent=this.formatRichText(ite.communityContent)
+								}
+								ite.right=0;
+							})
+						}
 						if (this.pageNum == 1) {
 							this.list = newArr;
 						} else {

user_ui/pages/goods/index.vue

@@ -106,7 +106,7 @@ import popUp from "@/components/box/popup.vue"
 			activecolorh:'#A7A7A7',
 			indicatorDotsh: false,
 			city:'幸福大街',
-			list:[{tit:'123'},{tit:'123'},{tit:'123'}],
+			list:[],
 			tabval:0,
 			tablist:[{tit:'本地资讯',val:"0"},{tit:'供求资讯',val:"1"},{tit:'热门资讯',val:"2"}],
 			noticelist:[{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'},{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'}]

user_ui/pages/index/index.vue

@@ -146,7 +146,7 @@
 			</view>
 		</view>
 	<loading></loading>
-	<pop-up :type="type" @getClose="getClose"></pop-up>
+	<pop-up :type="type" @getClose="getClose" :phoneList="phoneList"></pop-up>
 	 <footers v-if="isfootflag"  :footerindex="footerindex"></footers>
   </view>
 </template>
@@ -157,6 +157,7 @@ import notice from '@/components/swiper/notice.vue'
 import boxList from "@/components/box/list.vue"
 import popUp from "@/components/box/popup.vue"
 import {houseInfoList} from "@/api/work/work.js"
+import {gesettingsList} from "@/api/work/index.js"
   export default {
 	components:{footers,notice,boxList,popUp},
 	data(){
@@ -200,11 +201,12 @@ import {houseInfoList} from "@/api/work/work.js"
 			indicatorDotsh: true,
 			city:'幸福大街',
 			list:[{tit:'123'},{tit:'123'},{tit:'123'}],
-			// userId:this.$store.state.user.userId,
+			userId:this.$store.state.user.userId,
 			nickName:this.$store.state.user.nickName,
 			// avatar:this.$store.state.user.avatar,
 			tabval:0,
 			houselist:[],
+			phoneList:[],
 			tablist:[{tit:'本地资讯',val:"0"},{tit:'供求资讯',val:"1"},{tit:'热门资讯',val:"2"}],
 			noticelist:[{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'},{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'}]
 		}
@@ -225,17 +227,15 @@ import {houseInfoList} from "@/api/work/work.js"
 		})
 		// 获取房子
 		this.getDataFn()
+		this.gesettingsList()
     },
 	methods:{
 		getDataFn(){
-			var params={}
+			var params={
+				userId:this.userId
+			}
 			houseInfoList(params).then(res=>{
 				if(res.code==200){
-					// var newArr=JSON.parse(JSON.stringify(res.rows))
-					
-					// newArr.forEach(ite=>{
-					// 	ite.right=0;
-					// })
 					this.houselist = JSON.parse(JSON.stringify(res.rows));
 				}else{
 					this.$toast(res.msg)
@@ -243,6 +243,13 @@ import {houseInfoList} from "@/api/work/work.js"
 			})
 			
 		},
+		gesettingsList(){
+			gesettingsList().then(res=>{
+				if(res.code==200){
+					this.phoneList=res.rows
+				}
+			})
+		},
 		getClose(){
 			this.type=''
 		},

user_ui/pages/mine/avatar/index.vue

@@ -257,7 +257,7 @@
 							uni.hideLoading()
 							let data = {name: 'avatarfile', filePath: res.tempFilePath}
 							uploadAvatar(data).then(response => {
-								store.commit('SET_AVATAR', baseUrl + response.imgUrl)
+								store.commit('SET_AVATAR', response.imgUrl)
 								uni.showToast({ title: "修改成功", icon: 'success' })
 								uni.navigateBack()
 							})

user_ui/pages/mine/index.vue

@@ -8,7 +8,7 @@
 		<image :src="bgimg" class="navbg"></image>
 		<view class="mbox">
 			<view class="infobox flexc" @click="handleToInfo">
-				<image  @click.stop="handleToAvatar" :src="avatarimg" class="limg" mode="aspectFill"></image>
+				<image  @click.stop="handleToAvatar" :src="avatar?avatar:avatarimg" class="limg" mode="aspectFill"></image>
 				<view class="cbox">
 					<view class="tit flexc">{{name?name:'登录账号'}}
 					
@@ -199,7 +199,7 @@
 				wyimg:require("@/static/images/mine/wy.png"),
 				border: false,
 				backgroundColor: 'transparent',
-
+				baseUrl:config.baseUrl,
 				name: this.$store.state.user.nickName,
 				deptName:this.$store.state.user.deptName,
 				// version: getApp().globalData.config.appInfo.version,
@@ -217,7 +217,7 @@
 		},
 		computed: {
 			avatar() {
-				return this.$store.state.user.avatar
+				return this.baseUrl+this.$store.state.user.avatar
 			},
 			windowHeight() {
 				return uni.getSystemInfoSync().windowHeight - 50

user_ui/store/modules/user.js

@@ -118,12 +118,12 @@ const user = {
       })
     },
 
-    // 获取用户信息
+    // 获取用户信息require("@/static/images/profile.jpg")
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/profile.jpg") : baseUrl + user.avatar
+          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? '' : user.avatar
           const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
           const nickName = (user == null || user.nickName == "" || user.nickName == null) ? "" : user.nickName
 		  const userId = (user == null || user.userId == "" || user.userId == null) ? "" : user.userId
@@ -134,6 +134,7 @@ const user = {
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
+		  console.log(avatar)
           commit('SET_NAME', username)
           commit('SET_NICKNAME', nickName)
           commit('SET_AVATAR', avatar)

user_ui/work/components/box/list.vue

@@ -4,7 +4,7 @@
 	<block v-if="datainfo.length>0">
 		<!-- 报修管理 -->
 		<block v-if="type=='warranty'">
-			<view class="walists" v-for="(ite,idx) in datainfo" :key="idx" @click="getPut(ite.repairId)"
+			<view class="walists" v-for="(ite,idx) in datainfo" :key="idx" @click="getPut(ite.repairId,ite.repairStatus)"
 				:data-idx="idx"
 				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"
 			>
@@ -17,7 +17,8 @@
 							<view class="txt coa" v-if="ite.type==3">已完成</view>
 							<view class="txt co28" v-if="ite.type==2">处理中</view> -->
 						</view>
-						<view class="walist"><view class="tit">小区名称</view>：{{ite.communityName}}</view>
+						<!-- <view class="walist"><view class="tit">小区名称</view>：{{ite.communityName}}</view> -->
+						<view class="walist"><view class="tit">项目</view>：{{kaType(ite.maintenanceCategory,bxlbList)}}</view>
 						<view class="walist"><view class="tit">报修门户</view>：{{ite.houseAddress}}</view>
 						<view class="walist"><view class="tit">报修时间</view>：{{ite.repairTime}}</view>
 						<view class="walist" v-if="ite.type==3"><view class="tit" >完成时间</view>：{{ite.completionTime}}</view>
@@ -27,7 +28,7 @@
 						<image :src="rimg"></image>
 					</view>
 				</view>
-				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:repair:remove'])" @click.stop="getDelFn(ite.repairId)">删除</view>
+				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:repair:remove'])&&ite.repairStatus<4" @click.stop="getDelFn(ite.repairId)">撤销</view>
 			</view>
 		</block>
 		<!-- 访客 -->
@@ -125,6 +126,12 @@
 					return []
 				}
 			},
+			bxlbList:{
+				type:Array,
+				default () {
+					return []
+				}
+			}
 		},
 		data(){
 			return{
@@ -145,8 +152,13 @@
 			getDetail(e){
 				this.$emit('getDetail',e)
 			},
-			getPut(e){
-				this.$emit('getPut',e)
+			getPut(e,type){
+				if(type>1){
+					this.$emit('getDetail',e)
+				}else{
+					this.$emit('getPut',e)
+				}
+				
 			},
 			getDelFn(id){
 				var that=this;

user_ui/work/components/popup/popup.vue

@@ -83,7 +83,7 @@
 				wxFiles: [],
 				// 是否打印日志
 				debug: false,
-				filelist:[{name:"123"}],
+				filelist:[],
 				// filico:require('@/work/static/filico.png'),
 				// fdelimg:require('@/work/static/fjdel.png'),
 				
@@ -101,7 +101,7 @@
 					value: 1
 				}],
 				peoval:0,
-				peolist:[{name:'王安安',val:"0",type:0},{name:'刘柠溪',val:"1",type:1},{name:'王合一',val:"2",type:0},]
+				peolist:[]
 			}
 		},
 		mounted() {

user_ui/work/pages/manage/moneybill.vue

@@ -42,7 +42,7 @@
 				// up:require('@/car/static/car/up.png'),
 				cxrq:"",
 				text:'',
-				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,

user_ui/work/pages/service/warranty.vue

@@ -21,7 +21,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<box-list :datainfo="list" :wtdt="wtdt" :bxztList="bxztList" type='warranty' @getDetail="getDetail" @getPut="getPut" @getDelFn="getDelFn"></box-list>
+			<box-list :datainfo="list" :bxlbList="bxlbList" :wtdt="wtdt" :bxztList="bxztList" type='warranty' @getDetail="getDetail" @getPut="getPut" @getDelFn="getDelFn"></box-list>
 		</view>
 		<view class="rfbtn" @click="getAddFn">我要报修</view>
 		<loading></loading>
@@ -52,6 +52,8 @@
 				tabval:'-1',
 				tablist:[{tit:'全部报修',val:-1}],
 				bxztList:[],
+				bxlbList:[],
+				phonenumber:this.$store.state.user.phonenumber,
 			}
 		},
 		onUnload() {
@@ -90,6 +92,17 @@
 						})
 					}
 				})
+				// 报修状态
+				getDictionaryFn('baoxiutype').then(res=>{
+					if(res.code==200){
+						this.bxlbList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getDelFn(data){
 				var that=this;
@@ -141,6 +154,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
+					phoneNumber:this.phonenumber
 				}
 				if(this.tabval!=-1){
 					params.repairStatus=this.tabval

user_ui/work/pages/service/warrantyadd.vue

@@ -119,6 +119,7 @@
 				fwlist:[],
 				chooseValue:'',
 				filterable:true,
+				userId:this.$store.state.user.userId,
 			}
 		},
 		onLoad: function(e) {
@@ -165,7 +166,12 @@
 					}
 				})
 				// 自己的房屋
-				houseInfolistNoPage().then(res=>{
+				var params={
+					userId:this.userId,
+					pageSize: 100,
+					pageNum: 1,
+				}
+				houseInfolistNoPage(params).then(res=>{
 					if(res.code==200){
 						this.fwlist= res.rows.map(v => {
 							return {
@@ -279,6 +285,10 @@
 						this.$toast('请输入标题')
 						return
 					}
+					if(!params.houseAddress){
+						this.$toast('请选择报修门户')
+						return
+					}
 					if(!params.phoneNumber){
 						this.$toast('请输入联系方式')
 						return

user_ui/work/pages/service/warrantydetail.vue

@@ -49,7 +49,8 @@
 					<view>基础信息</view>
 					<view class="flex1"></view>
 				</view>
-				<view class="walist watxt"><view class="wtit">小区名称</view><view class="wtxt">{{datainfo.communityName}}</view></view>
+				<!-- <view class="walist watxt"><view class="wtit">小区名称</view><view class="wtxt">{{datainfo.communityName}}</view></view> -->
+				<view class="walist watxt"><view class="wtit">项目</view><view class="wtxt">{{kaType(datainfo.maintenanceCategory,bxlbList)}}</view></view>
 				<view class="walist watxt"><view class="wtit">报修门户</view><view class="wtxt">{{datainfo.houseAddress}}</view></view>
 				<view class="walist watxt"><view class="wtit">报修时间</view><view class="wtxt">{{datainfo.repairTime}}</view></view>
 				<view class="walist watxt"><view class="wtit">联系方式</view><view class="wtxt">{{datainfo.phoneNumber}}</view></view>
@@ -85,6 +86,8 @@
 	import popUp from "@/work/components/popup/popup.vue"
 	import {repairDet,repairPut,repairAssign} from "@/api/work/service.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import {getDictionaryFn} from "@/api/system/user.js"
+	import {selectDictValue} from "@/utils/common.js"
 	export default{
 		components:{popUp},
 		data(){
@@ -100,6 +103,7 @@
 				finshtype:3,
 				datainfo:{},
 				phofile:[],
+				bxlbList:[],
 				repairStatus:'',
 			}
 		},
@@ -115,6 +119,7 @@
 				this.isdisabled=true;
 				this.getDetailFn()
 			}
+			this.init()
 		},
 		onPageScroll(e) {
 			var scrollTop = Number(e.scrollTop);
@@ -126,6 +131,22 @@
 		},
 		methods:{
 			checkPermi, checkRole,
+			kaType(data, list) {
+				return selectDictValue(list, data);
+			},
+			init(){
+				//报修类别
+				getDictionaryFn('baoxiutype').then(res=>{
+					if(res.code==200){
+						this.bxlbList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
+			},
 			getAssignFn(){
 				this.type='assign'
 			},

user_ui/work/pages/visitor/index.vue

@@ -40,7 +40,7 @@
 				// adrs:require('@/mine/static/house/adrs.png'),
 				backgroundColor: "transparent",
 				nvaHeight:44,
-				list:[{tit:'123'}],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,

user_ui/work/pages/visitor/vadd.vue

@@ -151,6 +151,7 @@
 				id:'',
 				isdisabled:false,
 				ptype:'add',
+				userId:this.$store.state.user.userId,
 			}
 		},
 		onLoad: function(e) {
@@ -173,7 +174,12 @@
 			},
 			init(){
 				// 自己的房屋
-				houseInfolistNoPage().then(res=>{
+				var params={
+					userId:this.userId,
+					pageSize: 100,
+					pageNum: 1,
+				}
+				houseInfolistNoPage(params).then(res=>{
 					if(res.code==200){
 						this.fwlist= res.rows.map(v => {
 							return {

user_ui/work/pages/visitor/vlist.vue

@@ -1,5 +1,11 @@
 <template>
 	<view class="car">
+		<!-- tab栏 -->
+		<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>
+		</view>
 		<!-- 列表 -->
 		<view class="carlists">
 			<box-list :datainfo="list" :fkztList="fkztList" :wtdt="wtdt" type='visitor' @getDetail="getDetail" @getDelFn="getDelFn"></box-list>
@@ -15,6 +21,7 @@
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {reservList,reservDel} from "@/api/work/people.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
+	import {houseInfolistNoPage} from "@/api/work/work.js"
 	export default{
 		components:{boxList},
 		data(){
@@ -30,13 +37,13 @@
 				reachflag: true,
 				wtdt:'',
 				fkztList:[],
-				portalId:'5'
+				tabval:"",
+				tablist:[],
+				userId:this.$store.state.user.userId,
 			}
 		},
 		onLoad: function(e) {
-			// this.portalId=e.houseId
 			this.init()
-			this.getDataFn()
 		},
 		// 上拉触底加载更多触发事件
 		onReachBottom() {
@@ -62,6 +69,27 @@
 						})
 					}
 				})
+				var params={
+					userId:this.userId,
+					pageSize: 100,
+					pageNum: 1,
+				}
+				houseInfolistNoPage(params).then(res=>{
+					if(res.code==200){
+						if(res.rows&&res.rows.length){
+							var data=res.rows[0];
+							this.tabval=data.houseId;
+							this.getDataFn()
+						}
+						
+						this.tablist= res.rows.map(v => {
+							return {
+								tit: v.detailedAddress,
+								val: v.houseId,
+							}
+						})
+					}
+				})
 			},
 			getConfirm(){
 				this.getrefreshData()
@@ -78,7 +106,8 @@
 				this.getDataFn()
 			},
 			getTabFn(val){
-				this.tabval=val
+				this.tabval=val;
+				this.getrefreshData();
 			},
 			bindDateChangea(e){
 				var val=e.detail.value;
@@ -99,7 +128,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
-					portalId:this.portalId
+					portalId:this.tabval
 				}
 				reservList(params).then(res=>{
 					if(res.code==200){
@@ -138,7 +167,7 @@
 	page{background: #F3F3F0;}
 </style>
 <style lang="scss" scoped>
-.car{padding: 24rpx 0 10rpx;}
+.car{padding: 146rpx 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;}