回复修改

user_ui/.hbuilderx/launch.json

@@ -1,20 +1,23 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

user_ui/components/swiper/notice.vue

@@ -7,11 +7,12 @@
 			<!--  -->
 			<swiper class="swiper" indicator-dots="true" :indicator-color="nactiveColor" :indicator-active-color="activeColor" circular :autoplay="autoplay" :interval="interval" :duration="duration" vertical='true'>
 				<swiper-item v-for="(ite,idx) in noticelist" :key="">
-					<view class="flexc swipers" @click="getDetail(ite.noticeId)">
-						<view class="tit over">{{ite.noticeTitle}}</view>
+					<view class="flexc swipers" @click="getDetail(ite.communityId)">
+						<!-- <view class="tit over">{{ite.noticeTitle}}</view> -->
+						<view class="tit over">{{ite.communityTitle}}</view>
 						<!-- <view class="num flexcc">{{ite.num}}</view> -->
 						<!-- <image :src="rimg" class="rimg"></image> -->
-						<view class="time">{{ite.num}}</view>
+						<view class="time">{{ite.publishTime}}</view>
 						<!-- <view class="time" v-if="ite.createTime">{{ite.createTime.substring(0,10)}}</view> -->
 					</view>
 				</swiper-item>

user_ui/health/pages/health/add.vue

@@ -1,9 +1,10 @@
 <template>
-	<view class="check" :style="'padding-top:'+nvaHeight+'px;'">
-		<view class="navbox">
+	<!-- :style="'padding-top:'+nvaHeight+'px;'" -->
+	<view class="check">
+		<!-- <view class="navbox">
 			<uni-nav-bar  color="#ffffff" left-icon="left" title="健康档案"  :background-color="backgroundColor" :border="false" statusBar='true' fixed="true" @clickLeft="getBackFn">
 			</uni-nav-bar>
-		</view>
+		</view> -->
 		<uni-forms ref="form" :model="datainfo" :rules="rules">
 			<view class="cbox">
 				<view class="chmain">

user_ui/manifest.json

@@ -8,6 +8,9 @@
     "app-plus" : {
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
+		"compatible" : {
+		    "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+		},
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,

user_ui/mine/pages/car/index.vue

@@ -41,7 +41,7 @@
 		},
 		onLoad: function() {
 			uni.$on('carlist',(res)=>{
-				this.getDataFn()
+				this.getrefreshData()
 			})
 			this.init()
 			this.getDataFn()
@@ -50,7 +50,7 @@
 		onReachBottom() {
 			if (this.reachflag) {
 				this.pageNum++
-				this.getDataFn()
+				this.getrefreshData()
 			}
 		},
 		methods:{
@@ -74,7 +74,7 @@
 					if(res.code==200){
 						this.$toast("删除成功");
 						setTimeout(function(){
-							that.getDataFn()
+							that.getrefreshData()
 						},1500)
 					}
 				})
@@ -88,6 +88,12 @@
 			getChargeFn(){
 				this.$tab.navigateTo("/mine/pages/car/charge")
 			},
+			getrefreshData(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
 			getDataFn(){
 				var params={
 					pageSize:this.pageSize,

user_ui/news/components/box/list.vue

@@ -65,16 +65,16 @@
 				<view class="flex1 overh">
 					<view class="flexat mb14 ">
 						<view class="plname flex1 over">{{ite.commentUser.nickName}}</view>
-						<view class="plrbtn flexc flex0" @click.stop="getDzFn(ite.id,'2',ite.content,idx)">
+						<view class="plrbtn flexc flex0" @click="getDzFn(ite.id,'2',ite.content,idx)">
 							<image :src="nicond" v-if="ite.isLike=='Y'"></image>
 							<image :src="niconb" class="imga" v-else></image>
 							<view>点赞</view>
 						</view>
-						<view class="plrbtn flexc flex0" @click.stop="getHfFn('yjhf',ite,ite.id)">
+						<view class="plrbtn flexc flex0" @touchend.prevent="getHfFn('yjhf',ite,ite.id)">
 							<image :src="nicone" class="imgb"></image>
 							<view>回复</view>
 						</view>
-						<view class="plrbtn flexc flex0" @click.stop="getDelFn(ite.id)" v-if="checkPermi(['wuYe:commentIndex:remove'])&&ite.isMyself=='Y'">
+						<view class="plrbtn flexc flex0" @click="getDelFn(ite.id)" v-if="checkPermi(['wuYe:commentIndex:remove'])&&ite.isMyself=='Y'">
 							<image :src="del" class="imgc"></image>
 							<view class="cof4">删除</view>
 						</view>
@@ -97,16 +97,16 @@
 									<!-- 判断是不是二级回复的回复 加字段-->
 									<!-- <block v-if="ite."></block> -->
 								</view>
-								<view class="plrbtn flexc flex0" @click.stop="getDzFn(aite.id,'2',aite.content,idx,aidx,'ejdz')">
+								<view class="plrbtn flexc flex0" @click="getDzFn(aite.id,'2',aite.content,idx,aidx,'ejdz')">
 									<image :src="nicond" v-if="aite.isLike=='Y'"></image>
 									<image :src="niconb" class="imga" v-else></image>
 									<view>点赞</view>
 								</view>
-								<view class="plrbtn flexc flex0" @click.stop="getHfFn('ejhf',aite,ite.id)">
+								<view class="plrbtn flexc flex0" @touchend.prevent="getHfFn('ejhf',aite,ite.id)">
 									<image :src="nicone" class="imgb"></image>
 									<view>回复</view>
 								</view>
-								<view class="plrbtn flexc flex0" @click.stop="getDelFn(aite.id)" v-if="checkPermi(['wuYe:commentIndex:remove'])&&aite.isMyself=='Y'">
+								<view class="plrbtn flexc flex0" @click="getDelFn(aite.id)" v-if="checkPermi(['wuYe:commentIndex:remove'])&&aite.isMyself=='Y'">
 									<image :src="del" class="imgc"></image>
 									<view class="cof4">删除</view>
 								</view>
@@ -117,12 +117,12 @@
 						</view>
 					</view>
 					<view class="flexc" v-if="ite.childrenListCount>0">
-						<view class="zhanbox flexc" v-if="ite.reachflag" @click.stop="getZhanFn(ite,idx)">
+						<view class="zhanbox flexc" v-if="ite.reachflag" @click="getZhanFn(ite,idx)">
 							<block v-if="ite.childrenList&&ite.childrenList.length">展开更多</block>
 							<block v-else>展开{{ite.childrenListCount}}条回复</block>
 							<image :src="upimg" class="zhan"></image>
 						</view>
-						<view v-if="ite.childrenList&&ite.childrenList.length" class="zhanbox flexc ml10" @click.stop="getShouFn(idx)">收起<image :src="upimg"></view>
+						<view v-if="ite.childrenList&&ite.childrenList.length" class="zhanbox flexc ml10" @click="getShouFn(idx)">收起<image :src="upimg"></view>
 					</view>
 					<!-- <view style="height: 16rpx;" v-else></view>	 -->
 				</view>

user_ui/news/pages/news/detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="ndetail ">
+	<view class="ndetail " @click="getComflag">
 		<image :src="nonews" v-if="datainfo.status==2" class="noimg"></image>
 		<block v-else>
 			<!-- 详情 -->
@@ -12,16 +12,16 @@
 					</view>
 				</view>
 				<view class="ndbfox flexc">
-					<view class="flexcc ndbflist" @click="getHfFn">
+					<view class="flexcc ndbflist" @touchend.prevent="getHfFna">
 						<image :src="nicona"></image>
 						<view>{{datainfo.userComment}}</view>
 					</view>
-					<view class="flexcc ndbflist" @click="getDzFn('1')">
+					<view class="flexcc ndbflist" @click.stop="getDzFn('1')">
 						<image :src="nicond" v-if="datainfo.isLike=='Y'"></image>
 						<image :src="niconb" v-else></image>
 						<view>{{datainfo.userLikes}}</view>
 					</view>
-					<view class="flexcc ndbflist" @click="getScFn('1')">
+					<view class="flexcc ndbflist" @click.stop="getScFn('1')">
 						<image :src="starb" v-if="datainfo.isStar=='Y'"></image>
 						<image :src="niconc" v-else></image>
 						<view>{{datainfo.userStars}}</view>
@@ -34,10 +34,10 @@
 				<box-list :datainfo="commentlist" type="comment" @getZhanFn="getZhanFn" @getShouFn="getShouFn" @getDzFn="getplDzFn" @getHfFn="getplHfFn" @getDelFn="getDelFn"></box-list>
 			</view>
 			<!-- 评论 -->
-			<view class="pjfbtn">
+			<view class="pjfbtn" @click.stop="btns" :style="{bottom: `${bottom}px`}">
 				<view class="flexc pjfbox">
-					<uni-easyinput :focus="isfocus" type="textarea" autoHeight v-model="text" :inputBorder='false' placeholder="发表我的评论…" />
-					<view class="btns" @click="getPinLunFn">发送</view>
+					<textarea :placeholder="placeholder"  :adjust-position="adjustpos" :focus="isfocus" v-model="text" :auto-height="autoHeight" :cursor-spacing='curspac' fixed="true" :show-confirm-bar="confirmBar" ></textarea>
+					<view class="btns" @click.stop="getPinLunFn">发送</view>
 				</view>
 			</view>
 		</block>	
@@ -66,6 +66,12 @@
 				upimg:require('@/mine/static/house/up.png'),
 				nonews:require('@/news/static/news/nonews.png'),
 				baseUrl:config.baseUrl,
+				autoHeight:true,
+				confirmBar:false,
+				adrfixed:true,
+				adjustpos:false,
+				curspac:0,//光标和键盘距离
+				placeholder:'发表我的评论',
 				datainfo:{
 					
 				},
@@ -82,12 +88,23 @@
 				isRoot:'1',//isRoot,根评论id 1:根评论 2：子评论
 				isfocus:false,
 				plinfo:'',//二级评论信息
+				bottom:0,
 			}
 		},
 		onLoad: function(e) {
 			this.id=e.id;
 			this.getDetailFn();
-			this.getRootComment()
+			this.getRootComment();
+			// #ifndef H5
+			uni.onKeyboardHeightChange(res=> { //监听键盘高度变化
+			    const res_keyboard = uni.getSystemInfoSync();
+			    // let key_height = res.height - (res_keyboard.screenHeight - res_keyboard.windowHeight)
+			     this.bottom = `${ res.height>0 ? res.height : 0}`;
+				  // if(this.bottom==0){
+				  // 	this.isfocus=false;
+				  // }
+			})
+			// #endif
 		},
 		// 上拉触底加载更多触发事件
 		onReachBottom() {
@@ -96,8 +113,22 @@
 				this.getDataFn()
 			}
 		},
+		onPageScroll(e) {
+			this.isfocus=false;
+		},
 		methods:{
 			checkPermi, checkRole,
+			//评论
+			 getComflag(){
+				 if(this.isfocus){
+					 this.isfocus=false;
+					 this.placeholder="发表我的评论"
+					 this.isRoot='1'
+				 }
+			 },
+			 btns(){
+				 
+			 },
 			getDetailFn(){
 				newsDet(this.id).then(res=>{
 					if(res.code==200){
@@ -217,7 +248,6 @@
 			},
 			getplDzFn(data){
 				var info=JSON.parse(JSON.stringify(data))
-				console.log(info,1)
 				this.getDzFn('2',info)
 			},
 			// 收藏
@@ -246,12 +276,17 @@
 				})
 			},
 			// 评论回复
-			getHfFn(data){
+			getHfFna(data){
+				var that=this;
 				this.isRoot='1';
+				this.placeholder='发表我的评论'
 				this.isfocus=true;
 			},
 			getplHfFn(data){
+				this.isfocus=false;
+				var that=this;
 				this.plinfo=JSON.parse(JSON.stringify(data))
+				this.placeholder='回复：'+data.toNickName
 				this.isRoot='2';
 				this.isfocus=true;
 			},
@@ -327,7 +362,6 @@
 						} else {
 							this.commentlist = this.list.concat(newArr)
 						}
-						console.log(this.commentlist)
 					}
 				})
 			},
@@ -376,6 +410,7 @@
 
 .pjfbtn{background: #FFFFFF;position: fixed;bottom: 0;left: 0;right: 0;padding:20rpx 48rpx;box-shadow: 0px 0px 18rpx 0px rgba(159,159,159,0.47);
 	.pjfbox{background: #E6E6E6;border-radius: 10rpx;
+		textarea{flex: 1;font-size: 26rpx;color: #222327;min-height: 40rpx;font-size: 26rpx;margin: 0;background: #E6E6E6;box-sizing: border-box;padding: 10rpx 0 10rpx 36rpx;border-radius:10rpx 0 0 10rpx;}
 		.btns{nt-weight: bold;padding: 0 34rpx;height: 60rpx;line-height: 60rpx;flex: 0 0 auto;
 		font-size: 26rpx;
 	}
@@ -383,6 +418,6 @@
 color: #314081;}
 }
 
-.pjfbtn /deep/ .uni-easyinput{flex: 1;font-size: 26rpx;color: #222327;}
-.pjfbtn /deep/ .uni-easyinput__content-textarea{min-height: 40rpx;font-size: 26rpx;margin: 0;background: #E6E6E6;box-sizing: border-box;padding: 10rpx 0 10rpx 36rpx;border-radius:10rpx 0 0 10rpx;}
+// .pjfbtn /deep/ .uni-easyinput{flex: 1;font-size: 26rpx;color: #222327;}
+// .pjfbtn /deep/ .uni-textarea-textarea{min-height: 40rpx;font-size: 26rpx;margin: 0;background: #E6E6E6;box-sizing: border-box;padding: 10rpx 0 10rpx 36rpx;border-radius:10rpx 0 0 10rpx;}
 </style>

user_ui/news/pages/news/newsdj.vue

@@ -99,6 +99,7 @@
 					avatar:this.avatar,
 					targetTitle:info.partyTitle,
 					targetId:info.partyId,
+					status:'1',
 					targetType:'2',//目标类型（1：社区 2：党建 ）
 				}
 				getStarsDj(params).then(res=>{

user_ui/news/pages/news/newssq.vue

@@ -126,6 +126,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
+					status:'1',
 					communityType:this.tabval
 				}
 				newsList(params).then(res=>{

user_ui/pages.json

@@ -116,8 +116,10 @@
 		  "path": "pages/health/add",
 		  "style": {
 		    "navigationBarTitleText": "添加档案",
-			"navigationStyle": "custom",
-			"h5":{"titleNView":false}
+			"navigationBarTextStyle": "white",
+			"navigationBarBackgroundColor": "#48CC9A"
+			// "navigationStyle": "custom",
+			// "h5":{"titleNView":false}
 		  }
 		}
 		

user_ui/pages/index/index.vue

@@ -93,7 +93,7 @@
 			</swiper>
 			<!-- 消息 -->
 			<view class="mb12">
-				<notice :noticelist='noticelist' :activeColor="activeColor" :nactiveColor="nactiveColor"></notice>
+				<notice :noticelist='noticelist' :activeColor="activeColor" :nactiveColor="nactiveColor" @getNoticeDet="getNoticeDet"></notice>
 			</view>
 			<view class="mb18 flexc">
 				<view class="cbgs mr12">
@@ -158,6 +158,7 @@ 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"
+import {newsList} from "@/api/work/manage.js"
 import self from '@/utils/location.js';
   export default {
 	components:{footers,notice,boxList,popUp},
@@ -209,7 +210,7 @@ import self from '@/utils/location.js';
 			houselist:[],
 			phoneList:[],
 			tablist:[{tit:'本地资讯',val:"0"},{tit:'供求资讯',val:"1"},{tit:'热门资讯',val:"2"}],
-			noticelist:[{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'},{noticeTitle:"您有1条报修信息，请及时查看处理！",num:'11-14'}]
+			noticelist:[]
 		}
 	},
 	onPageScroll(e) {
@@ -230,6 +231,7 @@ import self from '@/utils/location.js';
 		// 获取房子
 		this.getDataFn()
 		this.gesettingsList()
+		this.newsList();
 		// #ifndef H5
 		self.getLocation(function(res){
 			if(res==-1){
@@ -243,7 +245,9 @@ import self from '@/utils/location.js';
 	methods:{
 		getDataFn(){
 			var params={
-				userId:this.userId
+				userId:this.userId,
+				pageSize:5,
+				pageNum: 1,
 			}
 			houseInfoList(params).then(res=>{
 				if(res.code==200){
@@ -251,8 +255,21 @@ import self from '@/utils/location.js';
 				}else{
 					this.$toast(res.msg)
 				}
+			})	
+		},
+		newsList(){
+			var params={
+				pageSize:10,
+				pageNum: 1,
+				status:1,
+			}
+			newsList(params).then(res=>{
+				if(res.code==200){
+					this.noticelist = res.rows;
+				}else{
+					this.$toast(res.msg)
+				}
 			})
-			
 		},
 		getBusListFn(){
 			
@@ -267,8 +284,8 @@ import self from '@/utils/location.js';
 		getClose(){
 			this.type=''
 		},
-		getNoticeDet(){
-			
+		getNoticeDet(id){
+			this.$tab.navigateTo(`/news/pages/news/detail?id=`+id) 
 		},
 		getZhanFn(){
 			this.zhanflag=!this.zhanflag

user_ui/pages/mine/index.vue

@@ -33,7 +33,7 @@
 				
 			</view>
 			<view class="conts flexc">
-				<view class="contn"  @click="handleToYy">
+				<view class="contn"  @click="handleRepair" v-if="checkPermi(['wuYe:repair:list'])">
 					<view class="img">
 						<image :src="listimga" class="imga"></image>
 					</view>
@@ -60,7 +60,7 @@
 			</view>
 			<!-- v-if="checkPermi([''])" -->
 			<view class="mbgbox">
-				<view class="flexc mine_list" @click="getClockcontFn">
+				<view class="flexc mine_list" @click="getFeeFn" v-if="checkPermi(['wuYe:fee:list'])">
 					<view class="limg">
 						<image :src="listimge" class="imga"></image>
 					</view>
@@ -88,21 +88,21 @@
 					<view class="tit flex1">我的违停</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getMyHdFn">
+				<view class="flexc mine_list" @click="getMyHdFn" v-if="checkPermi(['wuYe:news:getCommentInteraction'])">
 					<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" >
+				<view class="flexc mine_list" @click="getWdHdFn" v-if="checkPermi(['wuYe:commentIndex:list'])">
 					<view class="limg">
 						<image :src="listimgq" class="imgd"></image>
 					</view>
 					<view class="tit flex1">我的点评赞</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getPlShFn">
+				<view class="flexc mine_list" @click="getPlShFn" v-if="checkPermi(['wuYe:commentIndex:commentSh'])">
 					<view class="limg">
 						<image :src="listimgp" class="imgg"></image>
 					</view>
@@ -254,7 +254,12 @@
 			handleToSetting() {
 			  this.$tab.navigateTo('/pages/mine/setting/index')
 			},
-			
+			handleRepair(){//我的报修
+				this.$tab.navigateTo(`/work/pages/service/warranty`)  
+			},
+			getFeeFn(){//物业费
+				this.$tab.navigateTo(`/work/pages/manage/index`)  
+			},
 			
 			// 修改密码
 			handleUpassword(){

user_ui/work/pages/service/warranty.vue

@@ -53,7 +53,8 @@
 				tablist:[{tit:'全部报修',val:-1}],
 				bxztList:[],
 				bxlbList:[],
-				phonenumber:this.$store.state.user.phonenumber,
+				userId:this.$store.state.user.userId,
+				// phonenumber:this.$store.state.user.phonenumber,
 			}
 		},
 		onUnload() {
@@ -154,7 +155,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
-					phoneNumber:this.phonenumber
+					userId:this.userId
 				}
 				if(this.tabval!=-1){
 					params.repairStatus=this.tabval

user_ui/work/pages/service/warrantyadd.vue

@@ -294,6 +294,7 @@
 						return
 					}
 					if(this.ptype=='add'){
+						params.userId=this.userId;
 						params.repairTime=this.time();
 						repairAdd(params).then(res=>{
 							if(res.code==200){

user_ui/work/pages/visitor/vdetail.vue

@@ -67,7 +67,7 @@
 				</view>
 			</view>
 			<!-- #ifdef APP-PLUS -->
-			<view class="rhbtn mt30" @click="getShareFn">分享</view>
+			<!-- <view class="rhbtn mt30" @click="getShareFn">分享</view> -->
 			<!-- #endif -->
 			<view class="rhbtn mt30" @click="getShareFn">分享</view>
 <!-- 			<view class="rhbtn mt30" @click="getPutFn">修改</view> -->