1

user_ui/health/pages/health/add.vue

@@ -27,6 +27,15 @@
 							<view class="cardtip">如果识别错误，可尝试再次拍照。</view>
 						</view>
 					</view>
+					<picker range-key='dictLabel'  :value="rylxidx" :range="rylxList"   @change='bindDateChangee'>
+						<uni-forms-item label="人员类型" required name="residentType">
+							<view class="flexc mh35">
+								<view class="flex1 txr f13 co27" v-if="datainfo.residentType&&!rylx">{{statusFormats(datainfo.residentType,rylxList,'rylx')}}</view>
+								<view class="flex1 txr f13" v-else :class="rylx?'co27':'coa'">{{rylx||"请选择人员类型"}}</view>
+								<view class="rimg"><image :src="rimg"></image></view>
+							</view>
+						</uni-forms-item>
+					</picker>
 					<uni-forms-item label="身份证号" required name="residentIdCard">
 						<view class="flexc">
 							<uni-easyinput  disabled v-model="datainfo.residentIdCard"  :inputBorder='false' placeholder="自动识别" />
@@ -173,6 +182,7 @@
 				datainfo: {
 					// "residentId":"",//居住人员主键
 					"houseId":"",//关联房屋信息表的house_id
+					"residentType":1,//人员类型
 					// "userId":"",//关联sys_user表中user_id
 					"detailedAddress":"",//居住人员的门牌号
 					"residentName":"",//居住人员姓名
@@ -223,6 +233,9 @@
 				xbList:[],
 				phofile:[],
 				fwlist:[],
+				rylx:"",
+				rylxidx:0,
+				rylxList:[],
 				isdisabled:false,
 				ptype:'add',
 				filterable:true,
@@ -271,6 +284,8 @@
 					this.rymmidx=aite.key;
 				}else if(type=='dslx'){
 					this.dslxidx=aite.key;
+				}else if(type=='rylx'){
+					this.rylxidx=aite.key;
 				}
 				return aite.actions;
 			},
@@ -300,6 +315,17 @@
 						}
 					}
 				})
+				// 人员类型
+				getDictionaryFn('resident_Type').then(res=>{
+					if(res.code==200){
+						this.rylxList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 				// 是否
 				getDictionaryFn('sys_yes_no').then(res=>{
 					if(res.code==200){

user_ui/mine/components/box/list.vue

@@ -260,7 +260,7 @@
 				>
 					<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.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>
@@ -290,7 +290,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>

user_ui/mine/pages/info/authenadd.vue

@@ -517,9 +517,7 @@
 				this.datainfo.tenantId=e.dictValue;
 				this.houserinfo.communityName=e.dictLabel;
 				// 业主或租户
-				if(this.datainfo.residentType!=3){
-					this.listNoPageTenant(e.dictValue)
-				}
+				this.listNoPageTenant(e.dictValue)
 			},
 			getchange(e){
 				this.datainfo.houseId=e.dictValue;

user_ui/mine/pages/tlogin.vue

@@ -208,14 +208,11 @@
 			 // 	this.$toast("请同意用户协议")
 			 // 	return
 			 // }
-			 console.log(this.loginForm)
 			 this.pwdLogin()
 		 },
 		 // 密码登录
 		 async pwdLogin() {
 		 	var that=this;
-			console.log(this.loginForm)
-			// return
 		   this.$store.dispatch('Login', this.loginForm).then((res) => {
 			   // 判断是否记住密码
 			  if(that.jzflag){

user_ui/news/pages/news/detail.vue

@@ -407,8 +407,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) {

user_ui/news/pages/news/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) {

user_ui/news/pages/news/newsdj.vue

@@ -134,8 +134,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) {

user_ui/news/pages/news/newssq.vue

@@ -39,6 +39,7 @@
 				tabval:'',
 				wzlxList:[],
 				hdcount:0,
+				baseUrl:config.baseUrl,
 			}
 		},
 		onUnload() {
@@ -109,8 +110,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) {

user_ui/work/components/w-select/w-select.vue

@@ -34,12 +34,12 @@
 		<view
 		  @click.stop="refreshValue"
 		  class="close-icon"
-		  v-if="showClose && (multiple ? value.length > 0 : value)"
+		  v-if="showClose && (multiple ? valuea.length > 0 : valuea)"
 		>
 		  <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 "
 		/>
@@ -192,8 +192,8 @@
 	  },
 	  // 禁止输入
 	  isdisabled:{
-		 type: Boolean,
-		 default: false
+	  	type: Boolean,
+	  	default: false
 	  },
 	  // 绑定的内容
 	  keyName: {
@@ -298,9 +298,9 @@
 		}
 	  },
 	  changeShow () {
-		if(this.isdisabled){
-			return
-		}
+		  if(this.isdisabled){
+		  	return
+		  }
 		this.isShow = !this.isShow
 		if (this.isShow === false) {
 		  this.filterList = this.list
@@ -443,11 +443,10 @@
 		// position: absolute;
 		// top: 50%;
 		// right: 7px;
-		display: inline-block;
-		// margin-top: 50%;
 		z-index: 1000;
 		width: 15px;
 		height: 15px;
+		display: inline-block;
 		// transform: translateY(-50%);
 		image {
 		  width: 100%;