1

property_ui/api/work/manage.js

@@ -333,6 +333,15 @@ export function manualDet(data) {
     method: 'get',
   })
 }
+
+// 员工培训手册-修改个人进度wuYe:manual:putProgress
+export function putProgress(data) {
+  return request({
+    url: '/wuYe/manual/putProgress',
+    method: 'post',
+	'data':data
+  })
+}
 //获取已读人员名单wuYe:manual:getRead
 export function manualgetRead(data) {
   return request({

property_ui/car/pages/carcheck.vue

@@ -31,6 +31,7 @@
 
 <script>
 	import config from '@/config'
+	import {getlicensePlate} from "@/api/system/card.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {uploadIdentify} from '@/utils/common.js'
 	export default{
@@ -54,16 +55,6 @@
 			checkPermi, checkRole,
 			getaddImage(e){
 				let that = this;
-				// var rs=['D:\\idcard.png']
-				// if(rs&&rs.length>0){
-				// 	var obj={
-				// 		type:e,
-				// 		// url:baseUrl+rs.join(',')
-				// 		url:rs.join(',')
-				// 	}
-				// 	that.getOcrIdCard(obj)
-				// }
-				// return
 				let file =[],count=9
 				uni.chooseImage({
 					count: 1,
@@ -80,14 +71,8 @@
 							var fuwufile = [];
 							uploadIdentify('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
 								var resurl=rs[0];
-								if(e=='front'){
-									that.datainfo.front=resurl.fileName;
-								}else{
-									that.datainfo.back=resurl.fileName;
-								}
 								if(rs&&rs.length>0){
 									var obj={
-										type:e,
 										url:resurl.urlOnline
 									}
 									that.getOcrIdCard(obj)
@@ -102,15 +87,12 @@
 					image:obj.url,
 					idCardSide:obj.type
 				}
-				getOcrIdCard(params).then(res=>{
+				getlicensePlate(params).then(res=>{
 					if(res.code==200){
 						var datainfo=res.data;
-						if(obj.type=='front'){
-							this.datainfo.realName=datainfo.realName;
-							this.datainfo.idCard=datainfo.idCard;
-							this.datainfo.address=datainfo.address;
-						}else{
-							this.datainfo.expirationDate=datainfo.expirationDate
+						var code=res.msg;
+						if(code){
+							this.datainfo.plateNumber=code;
 						}
 					}
 				})

property_ui/car/pages/illegalcheck.vue

@@ -183,8 +183,9 @@
 								var resurl=rs[0];
 								if(rs&&rs.length>0){
 									var obj={
-										url:resurl.urlOnline
+										url:resurl.urlOnline,
 									}
+									that.phofile.push(resurl.fileName)
 									that.getOcrIdCard(obj)
 								}
 							})	
@@ -201,6 +202,7 @@
 						var code=res.msg;
 						if(code){
 							this.datainfo.plateNumber=code;
+							
 							this.getcarList(code)
 						}
 						// if(obj.type=='front'){

property_ui/car/pages/illegalrecord.vue

@@ -37,8 +37,7 @@
 				</view>
 			</view>
 		</view>
-		<block >
-			<!-- v-if="datainfo.isBlack=='Y'" -->
+		<block v-if="datainfo.isBlack=='Y'">
 			<view style="height: 100rpx;"></view>
 			<view class="rfbtn" @click="getDelFn" >解除黑名单</view>
 		</block>

property_ui/manage/components/car/list.vue

@@ -649,12 +649,10 @@
 				var id=e.currentTarget.dataset.id;
 				var pro=e.currentTarget.dataset.progress||0;
 				var putflag=e.currentTarget.dataset.putflag;
+				var info=JSON.parse(JSON.stringify(this.datainfo[idx]))
 				if(putflag){
-					var obj={
-						id:id,
-						progress:pro
-					}
-					this.$emit('getPause',obj)
+					info.progress=pro;
+					this.$emit('getPause',info)
 					this.datainfo[idx].putflag=false;
 				}
 			},

property_ui/manage/components/zb-table/zb-tables.vue

@@ -120,18 +120,14 @@
                     </template>
                   <template v-else-if="ite.type==='img'">
                     <view class="checkbox-item">
-						<block v-if="item[ite.name]" >
-							<!-- <image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
+						<image :src="downico" class="ewmcode" @click.stop="previewImagea(item)"></image>
+						<!-- <block v-if="item[ite.name]" >
+							<image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
 							    @click.stop="previewImage(getPhotoFn(item[ite.name]),pite,pidx)"
 							    :show-menu-by-longpress="false"
-							    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image> -->
-						</block>
-                      <!-- <image
-                    @click.stop="previewImage(item,item[ite.name],index)"
-                    v-if="item[ite.name]"
-                    :show-menu-by-longpress="false"
-                    :src="item[ite.name]" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image> -->
-                    <text v-else>{{ite.emptyString}}</text>
+							    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image>
+						</block> -->
+                    <!-- <text v-else>{{ite.emptyString}}</text> -->
                     </view>
                   </template>
 	                  <template  v-else>
@@ -360,12 +356,20 @@
                     </view>
                   </template>
                   <template v-else-if="ite.type==='img'">
+					  {{ite}}
 					<block v-if="item[ite.name]" >
 						<!-- <image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
 						    @click.stop="previewImage(getPhotoFn(item[ite.name]),pite,pidx)"
 						    :show-menu-by-longpress="false"
 						    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image> -->
 					</block>
+					<!-- <block v-if="item[ite.name]" >
+						<image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
+						    @click.stop="previewImage(getPhotoFn(item[ite.name]),pite,pidx)"
+						    :show-menu-by-longpress="false"
+						    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image>
+					</block>
+                    <text v-else>{{ite.emptyString}}</text> -->
                     <text v-else>{{ite.emptyString}}</text>
                   </template>
                   <template v-else-if="ite.type==='index'">
@@ -402,6 +406,7 @@ import TableSummary from "./components/table-summary.vue";
 import TableSideSummary from "./components/table-side-summary.vue";
 import TableH5Summary from './components/table-h5-summary'
 import ZbLoadMore from './components/zb-load-more'
+import QR from "@/utils/wxqrcode.js" // 二维码生成器 
 import config from '@/config'
 const baseUrl = config.baseUrl
 import {getScrollbarSize} from "./js/util";
@@ -628,6 +633,7 @@ export default {
   },
   data() {
     return {
+		downico:require('@/manage/static/community/code.png'),
       button:[],
 	    alipayScrollTop:0,
       alipayScrollOldTop:0,
@@ -739,6 +745,21 @@ getMove(){
 			newArr.push(s)
 		})
 		return newArr
+	},
+	previewImagea(ite){
+		var id=ite.communityAssetId;
+		var url=baseUrl+`/manage/pages/community/sqmoneydetail?id=${id}`
+		var img=QR.createQrCodeImg(url, {
+				size: parseInt(240),//二维码大小 
+				typeNumber:10
+		})
+		var newArr=[img];
+		uni.previewImage({
+			urls: newArr,
+			current:1,
+			success: function(data) {},
+			fail: function(err) {}
+		});
 	},
 	  previewImage(item,url,current){
 		  uni.previewImage({
@@ -996,6 +1017,8 @@ getMove(){
 }
 </script>
 <style lang="scss">
+/deep/ uni-button{padding: 0 10rpx;}
+.ewmcode{width: 60rpx;height: 60rpx;}
 .zb-table-fixed-left{
   /*去除左边滚动条 */
   scroll-view ::-webkit-scrollbar {

property_ui/manage/pages/community/djdetail.vue

@@ -113,8 +113,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/newsadd.vue

@@ -283,8 +283,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/newsadddj.vue

@@ -171,6 +171,8 @@
 				this.ptype='edit';
 				// this.isdisabled=true;
 				this.getDetailFn()
+			}else{
+				this.datainfo.publishTime=this.time()
 			}
 			if(e.tabval&&e.tabval!='yty'){
 				this.datainfo.partyType=e.tabval;
@@ -179,6 +181,20 @@
 		methods: {
 			checkPermi,
 			checkRole,
+			time(){
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				var h = date.getHours();
+				var min = date.getMinutes();
+				var s = date.getSeconds();
+				var yearStr = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d)
+				// var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min) + ':' + (s < 10 ? (
+				// 	'0' + s) : s);
+				// var kaTime = yearStr + ' ' + timeStr;
+				return yearStr
+			},
 			getEditFn(){
 				this.isdisabled=false;
 			},
@@ -306,8 +322,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/newsaddsq.vue

@@ -172,6 +172,8 @@
 				this.ptype='edit';
 				// this.isdisabled=true;
 				this.getDetailFn()
+			}else{
+				this.datainfo.publishTime=this.time()
 			}
 			if(e.tabval&&e.tabval!='yty'){
 				this.datainfo.communityType=e.tabval
@@ -180,6 +182,20 @@
 		methods: {
 			checkPermi,
 			checkRole,
+			time(){
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				var h = date.getHours();
+				var min = date.getMinutes();
+				var s = date.getSeconds();
+				var yearStr = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d)
+				// var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min) + ':' + (s < 10 ? (
+				// 	'0' + s) : s);
+				// var kaTime = yearStr + ' ' + timeStr;
+				return yearStr
+			},
 			getEditFn(){
 				this.isdisabled=false;
 			},
@@ -307,8 +323,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/newsaddvideo.vue

@@ -133,11 +133,27 @@
 				this.ptype='edit';
 				// this.isdisabled=true;
 				this.getDetailFn()
+			}else{
+				this.datainfo.publishTime=this.time()
 			}
 		},
 		methods: {
 			checkPermi,
 			checkRole,
+			time(){
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				var h = date.getHours();
+				var min = date.getMinutes();
+				var s = date.getSeconds();
+				var yearStr = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d)
+				// var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min) + ':' + (s < 10 ? (
+				// 	'0' + s) : s);
+				// var kaTime = yearStr + ' ' + timeStr;
+				return yearStr
+			},
 			bindDateChangeb(e){
 				var val=e.detail.value;
 				this.datainfo.publishTime=val;
@@ -176,7 +192,7 @@
 				var newobj={}
 				var responseText=JSON.parse(item.responseText)
 				if(responseText.code==200){
-					this.datainfo.videoUrl=responseText.fileName
+					this.datainfo.videoUrl=responseText.data.fileName
 					// newobj.name=responseText.newFileName;
 					// newobj.oldName=responseText.originalFilename;
 					// newobj.url=responseText.fileName;

property_ui/manage/pages/community/newsdj.vue

@@ -130,8 +130,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/newssq.vue

@@ -43,6 +43,7 @@
 				tablist:[],
 				wzlxList:[],
 				hdcount:0,
+				baseUrl:config.baseUrl
 			}
 		},
 		onUnload() {
@@ -144,8 +145,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/newssqdetail.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="ndbox mb12 plr15">
 				<view class="flext mb15">
-					<view class="pltit flex0">评论<text>({{datainfo.userComment}})</text></view>
+					<view class="pltit flex0">评论<text>({{commenttotal||0}})</text></view>
 					<view class="flex1"></view>
 					<view class="pltitnum"><text>{{datainfo.userLikes}}</text>赞<text class="line">|</text><text>{{datainfo.userShare}}</text> 分享</view>
 
@@ -39,7 +39,7 @@
 						</view>
 						<view class="flexcc ndbflist" @click.stop="getHfFna">
 							<image :src="nicona"></image>
-							<view>{{datainfo.userComment}}</view>
+							<view>{{commenttotal||0}}</view>
 						</view>
 						<view class="flexcc ndbflist" @click.stop="getDzFn('1')">
 							<image :src="nicond" v-if="datainfo.isLike=='Y'"></image>
@@ -404,8 +404,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/newsyg.vue

@@ -24,11 +24,10 @@
 
 <script>
 	import config from '@/config'
-	const baseUrl = config.baseUrl
 	import carList from "@/manage/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {getDictionaryFn} from "@/api/system/user.js"
-	import {manualList,manualDel,manualPut,staffTrainTime} from "@/api/work/manage.js"
+	import {manualList,manualDel,putProgress,staffTrainTime} from "@/api/work/manage.js"
 	export default{
 		components:{carList},
 		data(){
@@ -45,6 +44,7 @@
 				wzlxList:[{dictLabel:"已停用",dictValue:'yty'}],
 				stayDuration: 0,
 				pageLoadTime:0,
+				baseUrl:config.baseUrl,
 			}
 		},
 		onUnload() {
@@ -86,12 +86,13 @@
 				var time=Math.floor((currentTime - this.pageLoadTime) / 1000); // 转换为秒
 				// var staffTime=Math.ceil(time/60);//向上取整,转换成分钟
 				var staffTime=Math.round(time/60);//四舍五入转换成分钟
-				var params={
-					staffTime:staffTime,
+				if(staffTime>0){
+					var params={
+						staffTime:staffTime,
+					}
+					staffTrainTime(params).then(res=>{
+					})
 				}
-				staffTrainTime(params).then(res=>{
-				})
-				
 			},
 			init(){
 				// 发布类型
@@ -164,11 +165,7 @@
 			},
 			getPause(obj){
 				var data=JSON.parse(JSON.stringify(obj))
-				var params={
-					manualId:data.id,
-					progress:data.progress,
-				}
-				manualPut(params).then(res=>{
+				putProgress(data).then(res=>{
 					if(res.code==200){
 						
 					}
@@ -185,6 +182,22 @@
 					}
 				})
 			},
+			formatRichText(html) {
+					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
+						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						return match;
+					});
+					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {
+						match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
+						return match;
+					});
+					newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+					newContent = newContent.replace(/\<img src="/gi,
+						'<img style="max-width:100%;height:auto;display:block;margin:10rpx auto;" src="' +this.baseUrl);
+					return newContent;
+			},
 			getDataFn(){
 				var params={
 					pageSize:this.pageSize,
@@ -213,8 +226,10 @@
 							ite.duration=0;
 							ite.initialtime=0;//当前播放位置
 							ite.putflag=false;//是否修改
+							if(ite.manualContent&&this.tabval==1){
+								ite.manualContent=this.formatRichText(ite.manualContent)
+							}
 						})
-						// console.log(newArr,555)
 						if (this.pageNum == 1) {
 							this.list = newArr;
 						} else {

property_ui/manage/pages/community/newsygdetail.vue

@@ -20,7 +20,7 @@
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
-	import {manualDet,manualPut,staffTrainTime} from "@/api/work/manage.js"
+	import {manualDet,putProgress,staffTrainTime} from "@/api/work/manage.js"
 	export default{
 		components:{},
 		data(){
@@ -87,19 +87,23 @@
 				var time=Math.floor((currentTime - this.pageLoadTime) / 1000); // 转换为秒
 				// var staffTime=Math.ceil(time/60);//向上取整,转换成分钟
 				var staffTime=Math.round(time/60);//四舍五入,转换成分钟
-				var params={
-					staffTime:staffTime,
-				}
-				staffTrainTime(params).then(res=>{
-				})
-				var paramsput={
-					manualId:this.id,
-					progress:this.datainfo.progress,
+				if(staffTime>0){
+					var params={
+						staffTime:staffTime,
+					}
+					staffTrainTime(params).then(res=>{
+					})
 				}
-				manualPut(paramsput).then(res=>{
+				// 修改自己的阅读进度
+				// var paramsput={
+				// 	manualId:this.id,
+				// 	progress:this.datainfo.progress,
+				// }
+				var paramsput=JSON.parse(JSON.stringify(this.datainfo))
+				putProgress(paramsput).then(res=>{
 					if(res.code==200){
 						if(this.putflag){
-							uni.$emit('newsygList')
+							// uni.$emit('newsygList')
 						}
 					}
 				})
@@ -163,8 +167,8 @@
 			formatRichText(html) {
 					let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
 						match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '').replace(/style=""/gi, '');
-						match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-						match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+						// match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+						// match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
 						return match;
 					});
 					newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {

property_ui/manage/pages/community/sqmoney.vue

@@ -97,7 +97,7 @@
 					{ name: 'equipmentQrCode', label: '设备二维码',align:'center',type:'img', },
 					// { name: 'equipmentQrCode', label: '设备二维码',align:'center' },
 					{ name: 'equipmentStatus', label: '状态',align:'center',type:"format",key:"sbztList"},
-					{ name: 'operation', type:'operation',label: '操作',renders:[
+					{ name: 'operation', type:'operation',label: '操作',width:360,renders:[
 						{
 						    name:'查看',
 						    func:'edit' // func 代表子元素点击的事件 父元素接收的事件 父元素 @edit
@@ -232,8 +232,13 @@
 				var list=JSON.parse(JSON.stringify((this.assetTree)))
 				this.tabval=val;
 				var children=list[idx].children
-				this.tablist=children;
-				this.tabvala=children[0].id;
+				if(children&&children.length>0){
+					this.tablist=children;
+					this.tabvala=children[0].id;
+				}else{
+					this.tablist='';
+					this.tabvala=val;
+				}
 				this.getrefreshData()
 			},
 			getTabFna(val){

property_ui/manage/pages/community/sqmoneyadd.vue

@@ -20,7 +20,7 @@
 							<view class="rimg"><image :src="rimg"></image></view>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="资产编号" name="equipmentNumber">
+					<uni-forms-item label="资产编号" required name="equipmentNumber">
 						<view class="flexc">
 							<uni-easyinput type="textarea" :disabled="isdisabled" autoHeight v-model="datainfo.equipmentNumber" :inputBorder='false' />
 							<view class="rimg"><image :src="rimg"></image></view>
@@ -52,7 +52,7 @@
 							</view>
 						</picker>
 					</uni-forms-item>
-					<uni-forms-item label="资产状态" name="equipmentStatus">
+					<uni-forms-item label="资产状态" required name="equipmentStatus">
 						<picker range-key='dictLabel' :disabled="isdisabled" :value="sbztidx" :range="sbztList"   @change='bindDateChange'>
 							<view class="flexc">
 								<view class="flex1 txr f13 co27" v-if="datainfo.equipmentStatus&&!sbzt">{{statusFormats(datainfo.equipmentStatus,sbztList,'sbzt')}}</view>
@@ -253,8 +253,12 @@
 						this.$toast('请输入资产名称')
 						return
 					}
-					if(!params.equipmentNumber){
-						this.$toast('请输入资产编号')
+					// if(!params.equipmentNumber){
+					// 	this.$toast('请输入资产编号')
+					// 	return
+					// }
+					if(!params.equipmentStatus){
+						this.$toast('请选择设备状态')
 						return
 					}
 					if(this.ptype=='add'){

property_ui/manage/pages/community/sqmoneydetail.vue

@@ -218,7 +218,8 @@
 				assetsDet(this.id).then(res=>{
 					if(res.code==200){
 						this.datainfo=res.data;
-						this.yy_code = QR.createQrCodeImg(this.id, {
+						var url=this.baseUrl+`/manage/pages/community/sqmoneydetail?id=${this.id}`
+						this.yy_code = QR.createQrCodeImg(url, {
 								size: parseInt(240),//二维码大小 
 								typeNumber:10
 						})

property_ui/mine/components/box/list.vue

@@ -62,7 +62,7 @@
 			<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>
+						<image :src="ite.avatar&&ite.avatar.indexOf('/static/img/profile')==-1?baseUrl+ite.avatar:man" class="mhead flex0"></image>
 						<view class="flex1 overh">
 							<view class="flexc mb6">
 								<view class="name flex1 over">{{ite.nickName}}</view>

property_ui/pages/index/index.vue

@@ -452,7 +452,8 @@ const Clientid = config.Clientid
 			// this.$tab.navigateTo(`/car/pages/carku`) 
 		},
 		getCarCheckFn(){//外来车辆登记
-			this.$tab.navigateTo(`/car/pages/carcheck`) 
+			this.$toast("模块建设中~")
+			// this.$tab.navigateTo(`/car/pages/carcheck`) 
 		},
 		getillegalParkFn(){//违停管理
 			this.$tab.navigateTo(`/car/pages/illegalParking`) 

property_ui/pages/mine/index.vue

@@ -52,7 +52,7 @@
 					</view>
 					<view class="ctit">商品发布</view>	
 				</view>
-				<view class="contn" @click="handTsFn" v-if="checkPermi(['wuYe:suggestion:list'])">
+				<view class="contn" @click="handTsFn" v-if="checkPermi(['wuYe:suggestion:applist'])">
 					<view class="img">
 						<image :src="listimgd" class="imgc"></image>
 					</view>
@@ -67,7 +67,7 @@
 					<view class="tit flex1">认证信息</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getWarrantyFn" v-if="checkPermi(['wuYe:repair:list'])">
+				<view class="flexc mine_list" @click="getWarrantyFn" v-if="checkPermi(['wuYe:repair:applist'])">
 					<view class="limg">
 						<image :src="listimge" class="imga"></image>
 					</view>

property_ui/people/components/w-select/w-select.vue

@@ -39,7 +39,7 @@
 		  <image :src="refreshUrl" mode="" />
 		</view>
 		<view
-		  v-if="value.length <= 0 || !showClose"
+		  v-if="valuea.length <= 0 || !showClose"
 		  :class="isShow ? 'w-select-arrow-up' : ''"
 		  class="w-select-arrow "
 		/>

property_ui/people/pages/people/comegl.vue

@@ -17,7 +17,10 @@
 				</view>
 			</view>
 			<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>
+				<block v-for="(ite,idx) in tablist" :key="idx">
+					<view v-if="ite.limit&&checkPermi([ite.limit])||!ite.limit" class="tabt" :class="tabval==ite.val?'act':''"  @click="getTabFn(ite.val)">{{ite.tit}}</view>
+				</block>
+				
 			</view>
 		</view>
 		<!-- 列表 -->
@@ -53,8 +56,8 @@
 				pageNum: 1,
 				reachflag: true,
 				wtdt:'',
-				tabval:'1',
-				tablist:[{tit:'预约来访',val:1},{tit:'临时来访',val:2},],
+				tabval:'2',
+				tablist:[{tit:'临时来访',val:2},{tit:'预约来访',val:1,limit:'wuYe:reservRecord:list'},],
 				visitorType:[],//访客状态
 				sylist:[],
 			}

property_ui/service/pages/service/patrol.vue

@@ -10,17 +10,17 @@
 				</view>
 				<view class="patabs flexc">
 					<view class="patab cof7" @click="getTabFn(0)">
-						<view class="pattit">{{countinfo.checkPoint}}</view>
+						<view class="pattit">{{countinfo.checkPoint||0}}</view>
 						<view class="pattxt">巡更点</view>
 						<image :src="linea" class="line" v-if="tabval==0"></image>
 					</view>
 					<view class="patab co02" @click="getTabFn(2)">
-						<view class="pattit">{{countinfo.yCheckPoint}}</view>
+						<view class="pattit">{{countinfo.yCheckPoint||0}}</view>
 						<view class="pattxt">已巡更</view>
 						<image :src="lineb" class="line" v-if="tabval==2"></image>
 					</view>
 					<view class="patab cof6" @click="getTabFn(1)">
-						<view class="pattit">{{countinfo.wCheckPoint}}</view>
+						<view class="pattit">{{countinfo.wCheckPoint||0}}</view>
 						<view class="pattxt">未巡更</view>
 						<image :src="linec" class="line" v-if="tabval==1"></image>
 					</view>
@@ -163,9 +163,7 @@
 				// params.createTime=this.time()
 				xgdjlCount(params).then(res=>{
 					if(res.code==200){
-						var data=res.data;
-						this.countinfo=data.data;
-						console.log(this.countinfo)
+						this.countinfo=res.data;
 					}
 				})
 			},

property_ui/work/pages/manage/housedetail.vue

@@ -279,12 +279,13 @@
 						</block>
 				</block>
 				</uni-collapse>
-				<view class="hfbtns flexcj" v-if="datainfo.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
-					<view class="btn btn1" @click.stop="getShFn('3')">拒绝</view>
-					<view class="btn btn2" @click.stop="getShFn('2')">通过</view>
-				</view>
-				<view class="hfbtns flexcj" v-if="datainfo.examine==3&&checkPermi(['wuYe:residentInfo:editAuthentication'])">
-					<view class="btn btn2 flex1" @click.stop="getSubmit">修改提交</view>
+				<view class="hfbtns flexcj" >
+					<block v-if="datainfo.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
+						<view class="btn btn1" @click.stop="getShFn('3')">拒绝</view>
+						<view class="btn btn2" @click.stop="getShFn('2')">通过</view>
+					</block>
+					<!-- v-if="datainfo.examine==3&&checkPermi(['wuYe:residentInfo:editAuthentication'])" -->
+					<view class="btn btn2 flex1"  @click.stop="getSubmit">修改提交</view>
 				</view>
 			</view>
 		</uni-forms>