1

user_wxui/components/nodata/nodata.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="nodata" :style="'padding-top:'+padtop+'rpx'">
-		<image :src="noiconpimg"></image>
-		<view>{{notxt}}</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			notxt:{
-				type: String,
-				default () {
-					return '暂无数据'
-				}
-			},
-			padtop:{
-				type: Number,
-				default () {
-					return 100
-				}
-			}
-		},
-		data(){
-			return{
-				noiconpimg:require("@/static/images/noiconp.png"),
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-// 无数据
-.nodata{
-	display: flex;flex-direction: column;align-items: center;box-sizing: border-box;padding-bottom: 100rpx;
-	image{width: 456rpx;height: 178rpx;margin-bottom: 28rpx;}
-	view{font-size: 30rpx;color: #AAAAAA;font-weight: bold;}
-}	
-</style>

user_wxui/components/toptab/phonebtn.vue

@@ -5,7 +5,7 @@
 	  		<view class="box_top">
 	  			<view class="box_title">
 	  				<view>
-	  					智能校管家 申请使用
+	  					智慧园区 申请使用
 	  				</view>
 	  			</view>
 	  			<view class="box_nameq">你的手机号码</view>

user_wxui/config.js

@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'http://47.99.82.249:5010/prod-api',
+  baseUrl: 'http://47.99.82.249:5011/prod-api',
   // baseUrl: 'http://192.168.101.245:8065',
-  baseUrl: 'http://10.90.90.52:8065',
+  // baseUrl: 'http://10.90.90.52:8065',
   // baseUrl: 'http://192.168.101.168:8065',
   // baseUrlimg: 'http://114.99.127.243:2001',
   baseName:'智慧社区用户端',

user_wxui/manage/components/box/list.vue

@@ -0,0 +1,273 @@
+<template>
+<view>
+	<!-- 第一种样式  人员管理-->
+	<block v-if="datainfo.length>0">
+		<!-- 历史账单 -->
+		<block v-if="type=='moneybill'">
+			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx">
+				<view class="ctop flexc" style="padding: 26rpx 24rpx 24rpx;">
+					<image :src="time" class="imgs"></image>
+					<view class="tit">2024/01 -2024/12</view>
+					<view class="btn btnbgb" v-if="ite.type==1">已缴费</view>
+					<view class="btn btnbgc" v-else>未缴费</view>
+					<view class="flex1"></view>
+					<view class="txta">1号楼3单元1102</view>
+				</view>
+				<view class="clists flexc">
+					<view class="mlistl">
+						<view class="mltit">应缴总额 /元</view>
+						<view class="mltxt">4307.20</view>
+					</view>
+					<view class="mlistr">
+						<view class="clist"><view class="tit">物业费用：</view>3247.20元</view>
+						<view class="clist"><view class="tit">车位费用：</view>960.00元</view>
+						<view class="clist"><view class="tit">能耗费用：</view>100.00元</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<view class="shax" v-if="wtdt">{{wtdt}}</view>
+	</block>
+	<!-- 无数据 -->
+	<view class="nodata" v-else>
+		<image :src="noiconpimg"></image>
+		<view>
+			暂无数据
+		</view>
+	</view>
+</view>
+</template>
+
+<script>
+	import config from '@/config'
+	import {selectDictValue} from "@/utils/common.js"
+	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
+	export default{
+		props:{
+			datainfo: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			wtdt:{
+				type:String,
+				default () {
+					return ''
+				}
+			},
+			type:{
+				type:String,
+				default () {
+					return 0
+				}
+			},
+			bxztList:{
+				type:Array,
+				default () {
+					return []
+				}
+			},
+			fkztList:{
+				type:Array,
+				default () {
+					return []
+				}
+			},
+			bxlbList:{
+				type:Array,
+				default () {
+					return []
+				}
+			}
+		},
+		data(){
+			return{
+				noiconpimg:require("@/static/images/nodata.png"),
+				rimg:require('@/static/images/rimg.png'),
+				baseUrl:config.baseUrl,
+				delBtnWidth:66,//左滑默认宽度
+			}
+		},
+		mounted() {
+			
+		},
+		methods:{
+			checkPermi,checkRole,
+			kaType(data, list) {
+				return selectDictValue(list, data);
+			},
+			getDetail(e){
+				this.$emit('getDetail',e)
+			},
+			getPut(e,type){
+				if(type>1){
+					this.$emit('getDetail',e)
+				}else{
+					this.$emit('getPut',e)
+				}
+				
+			},
+			getDelFn(id){
+				var that=this;
+				uni.showModal({
+					title: '确认删除',
+					content: "是否确认删除",
+					cancelText: '取消',
+					confirmText: '确认',
+					success: function(res) {
+						if (res.confirm) {
+							that.$emit('getDelFn',id)
+						} else if (res.cancel) {
+						}
+					}
+				});
+			},
+			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) {}
+				});
+			},
+			//开始触摸滑动
+			drawStart(e) {
+				// console.log("开始触发");
+				var touch = e.touches[0];
+				this.startX = touch.clientX;
+			},
+			//触摸滑动
+			drawMove(e) {
+				// console.log("滑动");
+				for (var index in this.datainfo) {
+					// this.csListArrl[index].right=0
+					this.$set(this.datainfo[index],'right',0);
+				}
+				var idx=e.currentTarget.dataset.idx
+				var touch = e.touches[0];
+				var item = this.datainfo[idx];
+				var disX = this.startX - touch.clientX;
+				if (disX >= 20) {
+				        if (disX > this.delBtnWidth) {
+					    disX = this.delBtnWidth;
+				        }
+						// this.csListArrl[idx].right=disX
+				        this.$set(this.datainfo[idx],'right',disX);
+				} else {
+					// this.csListArrl[idx].right=0
+					this.$set(this.datainfo[idx],'right',0);
+				}
+			},
+			//触摸滑动结束
+			drawEnd(e) {
+				// console.log("滑动结束");
+				var idx=e.currentTarget.dataset.idx
+				var item = this.datainfo[idx];
+				if (item.right >= this.delBtnWidth / 2) {
+					// this.datainfo[idx].right=this.delBtnWidth
+					this.$set(this.datainfo[idx],'right',this.delBtnWidth);
+				} else {
+					this.datainfo[idx].right=0
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.flex{display: flex;}
+.flexc{display: flex;align-items: center;}
+.mb10{margin-bottom: 20rpx;}
+// 报修
+.walists{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;    position: relative;
+	.watop{
+		padding: 0 36rpx 8rpx 38rpx;
+		.watit{padding: 24rpx 0;margin-bottom: 4rpx;display: flex;
+			.tit{font-weight: bold;font-size: 28rpx;color: #272727;flex: 1;
+				.cir{width: 14rpx;margin-left: 8rpx;margin-bottom: 10rpx;height: 14rpx;display: inline-block;background: #FF6969;border-radius: 8rpx;}
+			}
+			.txt{font-weight: bold;font-size: 26rpx;flex: 0 0 auto;
+			}
+		}
+	}
+	.walist{display: flex;font-weight: 500;font-size: 24rpx;color: #666666;margin-bottom: 16rpx;
+		.tit{min-width: 100rpx;text-align-last: justify}
+	}
+	.wabtn{display: flex;align-items: center;justify-content: space-between;border-top: 2rpx solid #E5E5E5;height: 80rpx;padding: 0 38rpx;
+		view{font-weight: 500;font-size: 24rpx;color: #666666;}
+		image{width: 16rpx;height: 28rpx;}
+	}
+}
+.vislist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;padding: 26rpx 38rpx 12rpx;
+	.vistop{
+		.tit{font-size: 28rpx;color: #272727;font-weight: bold;}
+		.btns{min-width: 70rpx;font-weight: 500;
+font-size: 20rpx;padding: 0 8rpx;box-sizing: border-box;text-align: center;margin-left: 18rpx;color: #00B861;border-radius: 16rpx;border: 2rpx solid #0AC86E;}
+		.txt{font-weight: bold;font-size: 26rpx;margin-left: 18rpx;}
+	}
+	.vlist{
+		view{font-weight: 500;font-size: 24rpx;color: #666666;margin-bottom: 16rpx;flex: 0 1 auto;min-width: 50%;}
+	}
+}
+.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.carltop{min-height: 154rpx;border-bottom: 2rpx solid #E5E5E5;
+			.tit{font-weight: bold;font-size: 32rpx;}
+			.txt{font-weight: 500;font-size: 26rpx;color: #272727;}
+			.txtbtn{min-width: 82rpx;
+	height: 32rpx;font-weight: 500;font-size: 20rpx;color: #45CB99;
+	border-radius: 16rpx;border: 1px solid #45CB99;margin-left: 12rpx;}
+			.cara{flex: 0 0 auto;width: 232rpx;height: 74rpx;margin-right: 40rpx;}
+			.carb{flex: 0 0 auto;width: 278rpx;height: 130rpx;}
+		}
+		.carlf{padding:26rpx 0 10rpx;
+			.clflist{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 16rpx;}
+		}
+	.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%;}
+		}
+	}
+}
+// 物业费
+.mlistl{width: 40%;display: flex;flex-direction: column;align-items: center;flex: 0 0 auto;
+	.mltit{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 18rpx;}
+	.mltxt{font-weight: bold;font-size: 32rpx;color: #0156FE;}
+}
+// 无数据
+.nodata{display: flex;flex-direction: column;align-items: center;
+	image{width: 440rpx;height: 440rpx;}
+	view{font-size: 30rpx;color: #666666;font-weight: bold;}
+}
+</style>

user_wxui/work/pages/manage/index.vue → user_wxui/manage/pages/manage/index.vue

@@ -81,11 +81,11 @@
 		components:{},
 		data(){
 			return{
-				adr:require("@/work/static/manage/adr.png"),
-				bg:require("@/work/static/manage/bg.png"),
-				zd:require("@/work/static/manage/zd.png"),
-				chose:require("@/work/static/manage/chose.png"),
-				nchose:require("@/work/static/manage/nchose.png"),
+				adr:require("@/manage/static/manage/adr.png"),
+				bg:require("@/manage/static/manage/bg.png"),
+				zd:require("@/manage/static/manage/zd.png"),
+				chose:require("@/manage/static/manage/chose.png"),
+				nchose:require("@/manage/static/manage/nchose.png"),
 				
 				choseflag:true,
 				list:[],
@@ -118,10 +118,10 @@
 		methods:{
 			checkPermi, checkRole,
 			getLsFn(){
-				this.$tab.navigateTo("/work/pages/manage/moneybill")
+				this.$tab.navigateTo("/manage/pages/manage/moneybill")
 			},
 			getPayFn(){
-				this.$tab.navigateTo("/work/pages/manage/pay")
+				this.$tab.navigateTo("/manage/pages/manage/pay")
 			},
 			change(){
 				

user_wxui/work/pages/manage/moneybill.vue → user_wxui/manage/pages/manage/moneybill.vue

@@ -31,7 +31,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import boxList from "@/work/components/box/list.vue"
+	import boxList from "@/manage/components/box/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{boxList},
@@ -64,7 +64,7 @@
 		methods:{
 			checkPermi, checkRole,
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/manage/moneydetail")
+				this.$tab.navigateTo("/manage/pages/manage/moneydetail")
 			},
 			getAddFn(){
 				

user_wxui/work/pages/manage/moneydetail.vue → user_wxui/manage/pages/manage/moneydetail.vue

@@ -51,7 +51,7 @@
 		components:{},
 		data(){
 			return{
-				mbg:require('@/work/static/manage/mbg.png'),
+				mbg:require('@/manage/static/manage/mbg.png'),
 				rimg:require('@/static/images/rimg.png'),
 			}
 		},
@@ -61,7 +61,7 @@
 		methods:{
 			checkPermi, checkRole,
 			getBillFn(){
-				this.$tab.navigateTo("/work/pages/manage/moneybill")
+				this.$tab.navigateTo("/manage/pages/manage/moneybill")
 			},
 		}
 	}

user_wxui/work/pages/manage/pay.vue → user_wxui/manage/pages/manage/pay.vue

@@ -54,7 +54,7 @@
 				nchose:require("@/work/static/nchose.png"),
 				zfbimg:require("@/work/static/zfb.png"),
 				wximg:require("@/work/static/wx.png"),
-				ywico:require("@/work/static/manage/ywico.png"),
+				ywico:require("@/manage/static/manage/ywico.png"),
 				rimg:require("@/static/images/rimg.png"),
 				list:[],
 				pageSize: 10,
@@ -69,7 +69,7 @@
 		methods:{
 			checkPermi, checkRole,
 			getSubmit(){
-				this.$tab.navigateTo("/work/pages/manage/success")
+				this.$tab.navigateTo("/manage/pages/manage/success")
 			},
 			getDataFn(){
 				var params={

user_wxui/work/pages/manage/success.vue → user_wxui/manage/pages/manage/success.vue

@@ -21,7 +21,7 @@
   export default {
 	data(){
 		return{
-			sucimg:require("@/work/static/manage/success.png"),
+			sucimg:require("@/manage/static/manage/success.png"),
 			tokenflag:true,
 		}
 	},

user_wxui/mine/components/box/list.vue

@@ -2,158 +2,129 @@
 <view>
 	<!-- 第一种样式  人员管理-->
 	<block v-if="datainfo.length>0">
-		<block v-if="type=='mycar'">
-			<view class="carlist pr" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.carId)"
-				:data-idx="idx"
-				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"
-			>
-				<view class="delleft" style="padding: 0 24rpx;">
-					<view class="carltop flexc">
-						<view class="flex1">
-							<view class="tit mb6 flexc" :class="ite.vehicleEnergy=='新能源'?'co16':'co01'">{{ite.plateNumber}}
-								<text class="cir"></text>
-								<text v-if="ite.vehicleColour">{{ite.vehicleColour}}</text>
-							</view>
-							<view class="txt flexc">
-								{{ite.vehicleBrand}}
-								<view class="txtbtn flexcc" v-if="ite.vehicleEnergy=='新能源'">{{ite.vehicleEnergy}}</view>
-								<!-- <view class="txtbtn flexcc" v-if="ite.vehicleType==2">新能源</view> -->
-							</view>
-						</view>
-						<image :src="carb" class="carb" v-if="ite.vehicleEnergy=='新能源'"></image>
-						<image :src="cara" class="cara" v-else></image>
-					</view>
-					<view class="carlf">
-						<view class="clflist">发动机号码 ：{{ite.engineNumber}}</view>
-						<view class="clflist">车辆识别代号：{{ite.identificationNumber}}</view>
-						<view class="flexc">
-							<view class="clflist w50">注册日期：{{ite.registrationDate}}</view>
-							<view class="clflist w50">发证日期：{{ite.issueDate}}</view>
-						</view>
-					</view>
+		<!-- 快递 -->
+		<block v-if="type=='delivery'">
+			<view class="kdlists flex" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
+				<image :src="noiconpimg" class="kdll"></image>	
+				<view class="kdlr over flex1">
+					<view class="over tit">已发货</view>
+					<view class="over tits">包裹正在等待揽收</view>
+					<view class="over txt">淘宝 | 白色晚礼服平时可穿毕业洋装小白裙…</view>
 				</view>
-				
-				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:car:remove'])" @click.stop="getDelFn(ite.carId)">删除</view>
 			</view>
 		</block>
-		<!-- 地址 -->
-		<block v-if="type=='address'">
-			<view class="adrlist flexc" :class="ite.isdefault?'act':''" v-for="(ite,idx) in datainfo" :key="idx">
-				<view class="adrl flex1">
-					<view class="tit mb5">安徽省 合肥市 蜀山区 高新技术产业开发区</view>
-					<view class="txt mb5">幸福大街88号幸福小区12#1304</view>
-					<view class="txts flexc">袁玥  <text class="ml8">18305687768</text>
-						<text class="ml8 btns" v-if="ite.isdefault">默认</text>
-						<text class="ml8 btns" v-if="ite.isuser">最近使用</text>
+		<!-- 步骤条 -->
+		<block v-if="type=='kdstep'">
+			<view class="hfstep">
+				<view class="hfslist flex">
+					<view class="limg flexccc">
+						<image :src="cira" class="imga"></image>
+					</view>
+					<view class="flex1">
+						<view class="hfstit co01">运输中 11-25  12:24</view>
+						<view class="hfstxt co27">【合肥市】快件已到达 合肥蜀山新产业园</view>
 					</view>
 				</view>
-				<view class="adrr flexcc">
-					<image :src="edit"></image>
+				<view class="hfslist flex">
+					<view class="limg flexccc">
+						<image :src="cirb" class="imgb"></image>
+					</view>
+					<view class="flex1">
+						<view class="hfstit">11-25  07:23</view>
+						<view class="hfstxt">【合肥市】快件已发往 合肥蜀山新产业园</view>
+					</view>
+				</view>
+				<view class="hfslist flex">
+					<view class="limg flexccc">
+						<image :src="cirb" class="imgb"></image>
+					</view>
+					<view class="flex1">
+						<view class="hfstit">11-25  07:20</view>
+						<view class="hfstxt">【合肥市】快件已到达 合肥转运中心</view>
+					</view>
 				</view>
 			</view>
 		</block>
-		<!-- 人员管理 -->
-		<block v-if="type=='people'">
-			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx">
-				<view class="ctop flexc">
-					<image :src="house" class="imgs" v-if="ite.houseStatus==1"></image>
-					<image :src="housea" class="imgs" v-if="ite.houseStatus==4"></image>
-					<image :src="houseb" class="imgs" v-if="ite.houseStatus==2"></image>
-					<image :src="housec" class="imgs" v-if="ite.houseStatus==3"></image>
-					<view class="tit">{{ite.detailedAddress}}</view>
-					<view class="flex1"></view>
-					<view class="txt ca" v-if="ite.houseStatus==1">自住</view>
-					<view class="txt cb" v-if="ite.houseStatus==4">出租</view>
-					<view class="txt cc" v-if="ite.houseStatus==2">空闲</view>
-					<view class="txt co6" v-if="ite.houseStatus==3">代售</view>
-				</view>
-				<view class="plists">
-					<block v-for="(aite,aidx) in ite.residentInfoList">
-						<view class="flexc pr mb12"   :key="`peo${aidx}`" v-if="aidx==0" @click="getDetail(aite.residentId)"
-							:data-idx="idx" :data-aidx="aidx" data-type="peo"
-							@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+aite.right+'px'"
-						>
-							<view class="plist flexc">
-								<image :src="man" class="head" v-if="aite.residentGender==1"></image>
-								<image :src="woman" class="head" v-else></image>
-								<view class="flex1">
-									<view class="ptit">{{aite.residentName}}
-										<view class="btn btnc ml10" v-if="aite.isHouseholder=='Y'">户主</view>
-									</view>
-									<view class="ptxt">身份证号 | {{aite.residentIdCard}}</view>
-									<view class="flexc">
-										<view class="ptxt">性别 | {{aite.residentGender==1?'男':'女'}}</view>
-										<view class="ptxt">年龄 | {{getAgeFromID(aite.residentIdCard)}}岁</view>
-									</view>
-									<view class="flexc" v-if="aite.residentAppearance">
-										<view class="ptxt">人员面貌 | {{kaType(aite.residentAppearance,rymmList)}}</view>
-									</view>
+		<!-- 我的互动 -->
+		<block v-if="type=='myhd'">
+			<view class="mb12 pr" v-for="(ite,idx) in datainfo" :key="idx">
+				<view class="hdlist pd12 flex">
+					<image :src="man" class="mhead flex0"></image>
+					<view class="flex1 overh">
+						<view class="flexc mb6">
+							<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>
-							<view class="spdel" v-if="aite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(aite.residentId)">删除</view>
+							<view class="time flex0 ml10">{{ite.createTime}}</view>
 						</view>
-						<view class="flexc pr mb12"   :key="`peo${aidx}`" v-if="aidx>0&&ite.zhanflag" @click="getDetail(aite.residentId)"
-							:data-idx="idx"
-							:data-aidx="aidx" data-type="peo"
-							@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+aite.right+'px'"
-						>
-							<view class="plist flexc">
-								<image :src="man" class="head" v-if="aite.residentGender==1"></image>
-								<image :src="woman" class="head" v-else></image>
-								<view class="flex1">
-									<view class="ptit">{{aite.residentName}}
-										<view class="btn btnc ml10" v-if="aite.isHouseholder=='Y'">户主</view>
-									</view>
-									<view class="ptxt">身份证号 | {{aite.residentIdCard}}</view>
-									<view class="flexc">
-										<view class="ptxt">性别 | {{aite.residentGender==1?'男':'女'}}</view>
-										<view class="ptxt">年龄 | {{getAgeFromID(aite.residentIdCard)}}岁</view>
-									</view>
-									<view class="flexc" v-if="aite.residentAppearance">
-										<view class="ptxt">人员面貌 | {{kaType(aite.residentAppearance,rymmList)}}</view>
-									</view>
-								</view>
-							</view>
-							<view class="spdel" v-if="aite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(aite.residentId)">删除</view>
+						<view class="flexc overh mb4">
+							<view class="line bga"></view>
+							<view class="txt over flex1">{{ite.targetTitle}}</view>
+							<image :src="rimg" class="rimg ml10"></image>
 						</view>
-					</block>
-					<image :src="upimg" v-if="ite.residentInfoList.length>1" :class="ite.zhanflag?'act':''" class="upimg" @click="getZhan(idx)"></image>
+					</view>
 				</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> -->
+		<block v-if="type=='plsh'">
+				<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="hdlist ">
+						<view class="pd12 flex">
+							<image :src="ite.avatar?baseUrl+ite.avatar:man" class="mhead flex0"></image>
+							<view class="flex1 overh">
+								<view class="flexc mb6">
+									<view class="name flex1 over">{{ite.nickName}}</view>
+									<view class="time flex0 ml10">02-26</view>
+								</view>
+								<view class="txt mb8">{{ite.commentContent}}</view>
+								<view class="flexc overh mb2">
+									<view class="line bgd"></view>
+									<view class="txta over flex1">{{ite.communityTitle}}</view>
+									<image :src="rimg" class="rimg ml10"></image>
+								</view>
+							</view>
+						</view>
+						<view class="shbtns flexc pd12" >
+							<view class="btn bga" @click="getSh('4',ite)">不予展示</view>
+							<view class="flex1"></view>
+							<view class="btn bgb" @click="getSh('3',ite)">不通过</view>
+							<view class="btn bgc" @click="getSh('2',ite)">通过</view>
+						</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 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" @click="getDetail(ite)">
+				<view class="hdlist ">
+					<view class="pd12 flex">
+						<image :src="ite.avatar?baseUrl+ite.avatar:man" class="mhead flex0"></image>
+						<view class="flex1 overh">
+							<view class="flexc mb6">
+								<view class="name flex1 over">{{ite.nickName}}</view>
+								<view class="time flex0 ml10">{{ite.createTime}}</view>
+							</view>
+							<view class="txt mb8">{{ite.commentContent}}</view>
+							<view class="flexc overh mb2">
+								<view class="line bgd"></view>
+								<view class="txta over flex1" v-if="tabval=='mypl'">{{ite.communityTitle}}</view>
+								<view class="txta over flex1" v-else>{{ite.targetTitle}}</view>
+								<image :src="rimg" class="rimg ml10"></image>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:illegalParking:remove'])" @click.stop="getDelFn(ite.illegalParkingId)">删除</view>
+				<!-- <view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view> -->
 			</view>
 		</block>
 		<view class="shax" v-if="wtdt">{{wtdt}}</view>
@@ -192,24 +163,6 @@
 					return 0
 				}
 			},
-			clcxList:{
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			rymmList:{
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			carType:{
-				type: Array,
-				default () {
-					return []
-				}
-			},	
 			tabval:{
 				type:String,
 				default () {
@@ -219,19 +172,10 @@
 		},
 		data(){
 			return{
-				house:require("@/health/static/house.png"),
-				housea:require("@/health/static/housea.png"),
-				houseb:require("@/health/static/houseb.png"),
-				housec:require("@/health/static/housec.png"),
 				noiconpimg:require("@/static/images/nodata.png"),
-				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'),
+				upimg:require("@/my/static/house/up.png"),
+				cara:require("@/my/static/house/cara.png"),
+				
 				man:require("@/health/static/man.png"),
 				woman:require("@/health/static/woman.png"),
 				rimg:require("@/static/images/rimga.png"),
@@ -244,12 +188,6 @@
 		},
 		methods:{
 			checkPermi, checkRole,
-			kaType(data, list) {
-				return selectDictValue(list, data);
-			},
-			kaPhoto(data){
-				return data.split(',');
-			},
 			getDetail(e){
 				this.$emit('getDetail',e)
 			},
@@ -296,12 +234,6 @@
 					}
 				});
 			},
-			getZhan(idx){
-				// var obj=JSON.parse(JSON.stringify(this.datainfo))[idx]
-				// obj.zhanflag=!obj.zhanflag;
-				// this.datainfo.splice(idx,1,obj);
-				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
-			},
 			getDelFn(id){
 				var that=this;
 				uni.showModal({
@@ -317,40 +249,6 @@
 					}
 				});
 			},
-			getAgeFromID(idNumber) {
-				if(idNumber){
-					const birthDateStr = idNumber.substring(6, 14);
-					const birthYear = parseInt(birthDateStr.substring(0, 4));
-					const birthMonth = parseInt(birthDateStr.substring(4, 6));
-					const birthDay = parseInt(birthDateStr.substring(6, 8));
-								
-					const today = new Date();
-					const currentYear = today.getFullYear();
-					const currentMonth = today.getMonth() + 1;
-					const currentDay = today.getDate();
-								
-					let age = currentYear - birthYear;
-					if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
-					    age--;
-					}
-								
-					return age;
-				}         
-			 },
-			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) {}
-				});
-			},
 			//开始触摸滑动
 			drawStart(e) {
 				// console.log("开始触发");
@@ -412,25 +310,25 @@
 .flex{display: flex;}
 .flexc{display: flex;align-items: center;}
 .mb10{margin-bottom: 20rpx;}
-.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
-	.carltop{min-height: 154rpx;border-bottom: 2rpx solid #E5E5E5;
-		.cir{width: 8rpx;height: 8rpx;border-radius: 50%;margin: 0 8rpx;display: inline-block;}
-		.co16{
-			.cir{background: #16BE7F;}
-		}
-		.co01{
-			.cir{background: #0156FE;}
-		}
-		.tit{font-weight: bold;font-size: 32rpx;}
-		.txt{font-weight: 500;font-size: 26rpx;color: #272727;}
-		.txtbtn{min-width: 82rpx;
-height: 32rpx;font-weight: 500;font-size: 20rpx;color: #45CB99;
-border-radius: 16rpx;border: 1px solid #45CB99;margin-left: 12rpx;}
-		.cara{flex: 0 0 auto;width: 232rpx;height: 74rpx;margin-right: 40rpx;}
-		.carb{flex: 0 0 auto;width: 278rpx;height: 130rpx;}
+// 快递
+.kdlists{padding: 24rpx 26rpx;background-color: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.kdll{width: 140rpx;height: 140rpx;border-radius: 10rpx;margin-right: 32rpx;flex: 0 0 auto;}
+	.kdlr{
+		.tit{font-size: 30rpx;color: #272727;font-weight: bold;margin-bottom: 18rpx;margin-top: 4rpx;}
+		.tits{font-size: 24rpx;color: #272727;font-weight: 500;margin-bottom: 14rpx;}
+		.txt{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
 	}
-	.carlf{padding:26rpx 0 10rpx;
-		.clflist{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 16rpx;}
+}
+// 快递步骤条
+.hfstep{padding: 0 32rpx 44rpx 32rpx;
+	.hfslist{padding-bottom: 44rpx;position: relative;
+		&::before{content: '';position: absolute;left: 14rpx;top:14rpx;height: 100%;width: 2rpx;background: #E6E6E6;}
+		.limg{width: 30rpx;height: 30rpx;margin-right: 22rpx;flex: 0 0 auto;margin-top:3rpx;
+			.imga{width: 30rpx;height: 30rpx;}
+			.imgb{width: 18rpx;height: 18rpx;}
+		}
+		.hfstit{font-weight: bold;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 24rpx;}
+		.hfstxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;padding-left: 8rpx;}
 	}
 }
 .carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
@@ -453,55 +351,32 @@ border-radius: 16rpx;border: 1px solid #45CB99;margin-left: 12rpx;}
 		&.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;
+// 互动
+.pd12{padding: 24rpx;}
+.hdlist{background: #FFFFFF;border-radius: 20rpx;position: relative;z-index: 1;
+	.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;}
-	.txt{font-size: 28rpx;color: #272727;font-weight: bold;}
-	.txts{font-weight: 500;font-size: 26rpx;color: #272727;}
-	.btns{font-weight: 500;font-size: 22rpx;color: #0256FD;padding: 2rpx 14rpx;display:inline-block;background: #C9DBFF;
-border-radius: 10rpx;}
-	.adrr{width: 40rpx;height: 40rpx;flex: 0 0 auto;margin-left: 12rpx;
-		image{width: 22rpx;height: 22rpx;}
-	}
-	&.act{
-		.tit{color: #0256FD;}
-		.txt{color: #0256FD;}
-		.txts{color: #0256FD;}
+	.time{font-weight: 500;font-size: 22rpx;color: #666666;}
+	.line{width: 6rpx;height: 28rpx;border-radius: 4rpx;margin-right: 12rpx;
+		&.bga{background: #FACA7D;}
+		&.bgb{background: #86AFFF;}
+		&.bgc{background: #93E9C2;}
+		&.bgd{background: #DADADA;}
 	}
-}
-
-
-// 人员
-.peolist{
-	.ctop{padding: 24rpx 24rpx 22rpx;}
-	.imgs{margin-right: 16rpx !important;}
-	.tit{font-size: 28rpx !important;}
-	.plists{padding: 30rpx 24rpx 6rpx;
-		.plist{background: linear-gradient(-90deg, #F2F5FF 0%, #FBFDFF 100%);border-radius: 20rpx;border: 2rpx solid #E6E6E6;padding: 18rpx 26rpx 4rpx;width: 100%;z-index: 1;
-		.head{width: 96rpx;height: 98rpx;margin-right: 32rpx;flex: 0 0 auto;}
-		.ptit{font-weight: bold;font-size: 30rpx;color: #272727;display: flex;align-items: center;margin-bottom: 14rpx;}	
-		.ptxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 14rpx;min-width: 176rpx;}
+	.txt{font-weight: 500;font-size: 26rpx;color: #272727;line-height: 36rpx;}
+	.txta{font-weight: 500;font-size: 26rpx;color: #666666;}
+	.rimg{width: 12rpx;height: 22rpx;}
+	.shbtns{border-top: 2rpx solid #DADADA;
+		.btn{border-radius: 20rpx;min-width: 110rpx;box-sizing: border-box;padding: 0 16rpx;
+height: 52rpx;display: flex;align-items: center;justify-content: center;flex:0 0 auto;margin-left: 20rpx;
+			&.bga{border: 2rpx solid #06C770;background: #DAEFE6;color: #06C770;margin-left: 0;}
+			&.bgb{border: 2rpx solid #FF6969;;background: #FFE7E7;color: #FF6969;}
+			&.bgc{background: #0256FD;color: #FFFFFF;}
 		}
 	}
-	.upimg{width: 26rpx;height: 22rpx;display: block;transform: rotate(180deg);transition: all 0.3s;margin: 0 auto 18rpx;
-		&.act{transform: rotate(0deg);}
-	}
 }
-// 互动
-.pd12{padding: 24rpx;}
 // 无数据
 .nodata{display: flex;flex-direction: column;align-items: center;
 	image{width: 440rpx;height: 440rpx;}

user_wxui/pages/mine/avatar/index.vue → user_wxui/mine/pages/avatar/index.vue

@@ -68,7 +68,7 @@
 		 */
 		data() {
 			return {
-				imageSrc: store.getters.avatar?config.baseUrl+store.getters.avatar:require('@/static/images/profile.jpg'),
+				imageSrc: store.getters.avatar?config.baseUrl+store.getters.avatar:require('@/mine/static/images/profile.jpg'),
 				isShowImg: false,
 				// 初始化的宽高
 				cropperInitW: SCREEN_WIDTH,

user_wxui/my/pages/delivery/index.vue → user_wxui/mine/pages/delivery/index.vue

@@ -19,7 +19,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import boxList from "@/my/components/box/list.vue"
+	import boxList from "@/mine/components/box/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{boxList},
@@ -49,7 +49,7 @@
 		methods:{
 			checkPermi, checkRole,
 			getDetail(){
-				this.$tab.navigateTo("/my/pages/delivery/detail")
+				this.$tab.navigateTo("/mine/pages/delivery/detail")
 			},
 			getTabFn(val){
 				this.tabval=val

user_wxui/pages/mine/info.vue → user_wxui/mine/pages/info.vue

@@ -117,7 +117,7 @@
 				if(this.isdisabled){
 					return
 				}
-				this.$tab.navigateTo('/pages/mine/avatar/index')
+				this.$tab.navigateTo('/mine/pages/avatar/index')
 			},
 			statusFormats(data, list,type) {
 				var aite=selectValueKey(list, data);

user_wxui/pages/register.vue → user_wxui/mine/pages/register.vue

@@ -94,7 +94,7 @@
 	
 	methods:{
 		getlogin(){
-			this.$tab.redirectTo(`/pages/tlogin`)
+			this.$tab.redirectTo(`/mine/pages/tlogin`)
 		},
 		handlePrivacy(){
 			this.$tab.navigateTo(`/pages/agreement`)  

user_wxui/pages/tlogin.vue → user_wxui/mine/pages/tlogin.vue

@@ -156,7 +156,7 @@
 			this.$tab.navigateTo(`/mine/pages/mine/school?id=`+this.loginForm.school)
 		},
 		 getregister(){
-			 this.$tab.redirectTo(`/pages/register`)
+			 this.$tab.redirectTo(`/mine/pages/register`)
 			 // this.$tab.navigateTo(`/mine/pages/mine/applyregister`)
 			 // this.$tab.navigateTo(`/mine/pages/mine/auth`)
 		 },

user_wxui/my/components/box/list.vue

@@ -2,129 +2,158 @@
 <view>
 	<!-- 第一种样式  人员管理-->
 	<block v-if="datainfo.length>0">
-		<!-- 快递 -->
-		<block v-if="type=='delivery'">
-			<view class="kdlists flex" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
-				<image :src="noiconpimg" class="kdll"></image>	
-				<view class="kdlr over flex1">
-					<view class="over tit">已发货</view>
-					<view class="over tits">包裹正在等待揽收</view>
-					<view class="over txt">淘宝 | 白色晚礼服平时可穿毕业洋装小白裙…</view>
-				</view>
-			</view>
-		</block>
-		<!-- 步骤条 -->
-		<block v-if="type=='kdstep'">
-			<view class="hfstep">
-				<view class="hfslist flex">
-					<view class="limg flexccc">
-						<image :src="cira" class="imga"></image>
-					</view>
-					<view class="flex1">
-						<view class="hfstit co01">运输中 11-25  12:24</view>
-						<view class="hfstxt co27">【合肥市】快件已到达 合肥蜀山新产业园</view>
-					</view>
-				</view>
-				<view class="hfslist flex">
-					<view class="limg flexccc">
-						<image :src="cirb" class="imgb"></image>
-					</view>
-					<view class="flex1">
-						<view class="hfstit">11-25  07:23</view>
-						<view class="hfstxt">【合肥市】快件已发往 合肥蜀山新产业园</view>
-					</view>
-				</view>
-				<view class="hfslist flex">
-					<view class="limg flexccc">
-						<image :src="cirb" class="imgb"></image>
+		<block v-if="type=='mycar'">
+			<view class="carlist pr" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.carId)"
+				:data-idx="idx"
+				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"
+			>
+				<view class="delleft" style="padding: 0 24rpx;">
+					<view class="carltop flexc">
+						<view class="flex1">
+							<view class="tit mb6 flexc" :class="ite.vehicleEnergy=='新能源'?'co16':'co01'">{{ite.plateNumber}}
+								<text class="cir"></text>
+								<text v-if="ite.vehicleColour">{{ite.vehicleColour}}</text>
+							</view>
+							<view class="txt flexc">
+								{{ite.vehicleBrand}}
+								<view class="txtbtn flexcc" v-if="ite.vehicleEnergy=='新能源'">{{ite.vehicleEnergy}}</view>
+								<!-- <view class="txtbtn flexcc" v-if="ite.vehicleType==2">新能源</view> -->
+							</view>
+						</view>
+						<image :src="carb" class="carb" v-if="ite.vehicleEnergy=='新能源'"></image>
+						<image :src="cara" class="cara" v-else></image>
 					</view>
-					<view class="flex1">
-						<view class="hfstit">11-25  07:20</view>
-						<view class="hfstxt">【合肥市】快件已到达 合肥转运中心</view>
+					<view class="carlf">
+						<view class="clflist">发动机号码 ：{{ite.engineNumber}}</view>
+						<view class="clflist">车辆识别代号：{{ite.identificationNumber}}</view>
+						<view class="flexc">
+							<view class="clflist w50">注册日期：{{ite.registrationDate}}</view>
+							<view class="clflist w50">发证日期：{{ite.issueDate}}</view>
+						</view>
 					</view>
 				</view>
+				
+				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:car:remove'])" @click.stop="getDelFn(ite.carId)">删除</view>
 			</view>
 		</block>
-		<!-- 我的互动 -->
-		<block v-if="type=='myhd'">
-			<view class="mb12 pr" v-for="(ite,idx) in datainfo" :key="idx">
-				<view class="hdlist pd12 flex">
-					<image :src="man" class="mhead flex0"></image>
-					<view class="flex1 overh">
-						<view class="flexc mb6">
-							<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">{{ite.targetTitle}}</view>
-							<image :src="rimg" class="rimg ml10"></image>
-						</view>
+		<!-- 地址 -->
+		<block v-if="type=='address'">
+			<view class="adrlist flexc" :class="ite.isdefault?'act':''" v-for="(ite,idx) in datainfo" :key="idx">
+				<view class="adrl flex1">
+					<view class="tit mb5">安徽省 合肥市 蜀山区 高新技术产业开发区</view>
+					<view class="txt mb5">幸福大街88号幸福小区12#1304</view>
+					<view class="txts flexc">袁玥  <text class="ml8">18305687768</text>
+						<text class="ml8 btns" v-if="ite.isdefault">默认</text>
+						<text class="ml8 btns" v-if="ite.isuser">最近使用</text>
 					</view>
 				</view>
+				<view class="adrr flexcc">
+					<image :src="edit"></image>
+				</view>
 			</view>
 		</block>
-		<block v-if="type=='plsh'">
-				<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="hdlist ">
-						<view class="pd12 flex">
-							<image :src="ite.avatar?baseUrl+ite.avatar:man" class="mhead flex0"></image>
-							<view class="flex1 overh">
-								<view class="flexc mb6">
-									<view class="name flex1 over">{{ite.nickName}}</view>
-									<view class="time flex0 ml10">02-26</view>
-								</view>
-								<view class="txt mb8">{{ite.commentContent}}</view>
-								<view class="flexc overh mb2">
-									<view class="line bgd"></view>
-									<view class="txta over flex1">{{ite.communityTitle}}</view>
-									<image :src="rimg" class="rimg ml10"></image>
+		<!-- 人员管理 -->
+		<block v-if="type=='people'">
+			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx">
+				<view class="ctop flexc">
+					<image :src="house" class="imgs" v-if="ite.houseStatus==1"></image>
+					<image :src="housea" class="imgs" v-if="ite.houseStatus==4"></image>
+					<image :src="houseb" class="imgs" v-if="ite.houseStatus==2"></image>
+					<image :src="housec" class="imgs" v-if="ite.houseStatus==3"></image>
+					<view class="tit">{{ite.detailedAddress}}</view>
+					<view class="flex1"></view>
+					<view class="txt ca" v-if="ite.houseStatus==1">自住</view>
+					<view class="txt cb" v-if="ite.houseStatus==4">出租</view>
+					<view class="txt cc" v-if="ite.houseStatus==2">空闲</view>
+					<view class="txt co6" v-if="ite.houseStatus==3">代售</view>
+				</view>
+				<view class="plists">
+					<block v-for="(aite,aidx) in ite.residentInfoList">
+						<view class="flexc pr mb12"   :key="`peo${aidx}`" v-if="aidx==0" @click="getDetail(aite.residentId)"
+							:data-idx="idx" :data-aidx="aidx" data-type="peo"
+							@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+aite.right+'px'"
+						>
+							<view class="plist flexc">
+								<image :src="man" class="head" v-if="aite.residentGender==1"></image>
+								<image :src="woman" class="head" v-else></image>
+								<view class="flex1">
+									<view class="ptit">{{aite.residentName}}
+										<view class="btn btnc ml10" v-if="aite.isHouseholder=='Y'">户主</view>
+									</view>
+									<view class="ptxt">身份证号 | {{aite.residentIdCard}}</view>
+									<view class="flexc">
+										<view class="ptxt">性别 | {{aite.residentGender==1?'男':'女'}}</view>
+										<view class="ptxt">年龄 | {{getAgeFromID(aite.residentIdCard)}}岁</view>
+									</view>
+									<view class="flexc" v-if="aite.residentAppearance">
+										<view class="ptxt">人员面貌 | {{kaType(aite.residentAppearance,rymmList)}}</view>
+									</view>
 								</view>
 							</view>
+							<view class="spdel" v-if="aite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(aite.residentId)">删除</view>
 						</view>
-						<view class="shbtns flexc pd12" >
-							<view class="btn bga" @click="getSh('4',ite)">不予展示</view>
-							<view class="flex1"></view>
-							<view class="btn bgb" @click="getSh('3',ite)">不通过</view>
-							<view class="btn bgc" @click="getSh('2',ite)">通过</view>
+						<view class="flexc pr mb12"   :key="`peo${aidx}`" v-if="aidx>0&&ite.zhanflag" @click="getDetail(aite.residentId)"
+							:data-idx="idx"
+							:data-aidx="aidx" data-type="peo"
+							@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+aite.right+'px'"
+						>
+							<view class="plist flexc">
+								<image :src="man" class="head" v-if="aite.residentGender==1"></image>
+								<image :src="woman" class="head" v-else></image>
+								<view class="flex1">
+									<view class="ptit">{{aite.residentName}}
+										<view class="btn btnc ml10" v-if="aite.isHouseholder=='Y'">户主</view>
+									</view>
+									<view class="ptxt">身份证号 | {{aite.residentIdCard}}</view>
+									<view class="flexc">
+										<view class="ptxt">性别 | {{aite.residentGender==1?'男':'女'}}</view>
+										<view class="ptxt">年龄 | {{getAgeFromID(aite.residentIdCard)}}岁</view>
+									</view>
+									<view class="flexc" v-if="aite.residentAppearance">
+										<view class="ptxt">人员面貌 | {{kaType(aite.residentAppearance,rymmList)}}</view>
+									</view>
+								</view>
+							</view>
+							<view class="spdel" v-if="aite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(aite.residentId)">删除</view>
 						</view>
-					</view>
-					<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view>
+					</block>
+					<image :src="upimg" v-if="ite.residentInfoList.length>1" :class="ite.zhanflag?'act':''" class="upimg" @click="getZhan(idx)"></image>
 				</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" @click="getDetail(ite)">
-				<view class="hdlist ">
-					<view class="pd12 flex">
-						<image :src="ite.avatar?baseUrl+ite.avatar:man" class="mhead flex0"></image>
-						<view class="flex1 overh">
-							<view class="flexc mb6">
-								<view class="name flex1 over">{{ite.nickName}}</view>
-								<view class="time flex0 ml10">{{ite.createTime}}</view>
-							</view>
-							<view class="txt mb8">{{ite.commentContent}}</view>
-							<view class="flexc overh mb2">
-								<view class="line bgd"></view>
-								<view class="txta over flex1" v-if="tabval=='mypl'">{{ite.communityTitle}}</view>
-								<view class="txta over flex1" v-else>{{ite.targetTitle}}</view>
-								<image :src="rimg" class="rimg ml10"></image>
+		<!-- 车辆违规 -->
+		<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:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</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>
@@ -163,6 +192,24 @@
 					return 0
 				}
 			},
+			clcxList:{
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			rymmList:{
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			carType:{
+				type: Array,
+				default () {
+					return []
+				}
+			},	
 			tabval:{
 				type:String,
 				default () {
@@ -172,10 +219,19 @@
 		},
 		data(){
 			return{
+				house:require("@/health/static/house.png"),
+				housea:require("@/health/static/housea.png"),
+				houseb:require("@/health/static/houseb.png"),
+				housec:require("@/health/static/housec.png"),
 				noiconpimg:require("@/static/images/nodata.png"),
-				upimg:require("@/mine/static/house/up.png"),
-				cara:require("@/mine/static/house/cara.png"),
-				
+				upimg:require("@/my/static/house/up.png"),
+				cara:require("@/my/static/house/cara.png"),
+				carb:require("@/my/static/house/carb.png"),
+				caraa:require("@/my/static/house/caraa.png"),
+				carbb:require("@/my/static/house/carbb.png"),
+				edit:require("@/my/static/edit.png"),
+				cira:require('@/news/static/complaint/cira.png'),
+				cirb:require('@/news/static/complaint/cirb.png'),
 				man:require("@/health/static/man.png"),
 				woman:require("@/health/static/woman.png"),
 				rimg:require("@/static/images/rimga.png"),
@@ -188,6 +244,12 @@
 		},
 		methods:{
 			checkPermi, checkRole,
+			kaType(data, list) {
+				return selectDictValue(list, data);
+			},
+			kaPhoto(data){
+				return data.split(',');
+			},
 			getDetail(e){
 				this.$emit('getDetail',e)
 			},
@@ -234,6 +296,12 @@
 					}
 				});
 			},
+			getZhan(idx){
+				// var obj=JSON.parse(JSON.stringify(this.datainfo))[idx]
+				// obj.zhanflag=!obj.zhanflag;
+				// this.datainfo.splice(idx,1,obj);
+				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
+			},
 			getDelFn(id){
 				var that=this;
 				uni.showModal({
@@ -249,6 +317,40 @@
 					}
 				});
 			},
+			getAgeFromID(idNumber) {
+				if(idNumber){
+					const birthDateStr = idNumber.substring(6, 14);
+					const birthYear = parseInt(birthDateStr.substring(0, 4));
+					const birthMonth = parseInt(birthDateStr.substring(4, 6));
+					const birthDay = parseInt(birthDateStr.substring(6, 8));
+								
+					const today = new Date();
+					const currentYear = today.getFullYear();
+					const currentMonth = today.getMonth() + 1;
+					const currentDay = today.getDate();
+								
+					let age = currentYear - birthYear;
+					if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
+					    age--;
+					}
+								
+					return age;
+				}         
+			 },
+			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) {}
+				});
+			},
 			//开始触摸滑动
 			drawStart(e) {
 				// console.log("开始触发");
@@ -310,25 +412,25 @@
 .flex{display: flex;}
 .flexc{display: flex;align-items: center;}
 .mb10{margin-bottom: 20rpx;}
-// 快递
-.kdlists{padding: 24rpx 26rpx;background-color: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
-	.kdll{width: 140rpx;height: 140rpx;border-radius: 10rpx;margin-right: 32rpx;flex: 0 0 auto;}
-	.kdlr{
-		.tit{font-size: 30rpx;color: #272727;font-weight: bold;margin-bottom: 18rpx;margin-top: 4rpx;}
-		.tits{font-size: 24rpx;color: #272727;font-weight: 500;margin-bottom: 14rpx;}
-		.txt{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
-	}
-}
-// 快递步骤条
-.hfstep{padding: 0 32rpx 44rpx 32rpx;
-	.hfslist{padding-bottom: 44rpx;position: relative;
-		&::before{content: '';position: absolute;left: 14rpx;top:14rpx;height: 100%;width: 2rpx;background: #E6E6E6;}
-		.limg{width: 30rpx;height: 30rpx;margin-right: 22rpx;flex: 0 0 auto;margin-top:3rpx;
-			.imga{width: 30rpx;height: 30rpx;}
-			.imgb{width: 18rpx;height: 18rpx;}
+.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.carltop{min-height: 154rpx;border-bottom: 2rpx solid #E5E5E5;
+		.cir{width: 8rpx;height: 8rpx;border-radius: 50%;margin: 0 8rpx;display: inline-block;}
+		.co16{
+			.cir{background: #16BE7F;}
 		}
-		.hfstit{font-weight: bold;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 24rpx;}
-		.hfstxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;padding-left: 8rpx;}
+		.co01{
+			.cir{background: #0156FE;}
+		}
+		.tit{font-weight: bold;font-size: 32rpx;}
+		.txt{font-weight: 500;font-size: 26rpx;color: #272727;}
+		.txtbtn{min-width: 82rpx;
+height: 32rpx;font-weight: 500;font-size: 20rpx;color: #45CB99;
+border-radius: 16rpx;border: 1px solid #45CB99;margin-left: 12rpx;}
+		.cara{flex: 0 0 auto;width: 232rpx;height: 74rpx;margin-right: 40rpx;}
+		.carb{flex: 0 0 auto;width: 278rpx;height: 130rpx;}
+	}
+	.carlf{padding:26rpx 0 10rpx;
+		.clflist{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 16rpx;}
 	}
 }
 .carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
@@ -351,32 +453,55 @@
 		&.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%;}
+		}
+	}
 }
-// 互动
-.pd12{padding: 24rpx;}
-.hdlist{background: #FFFFFF;border-radius: 20rpx;position: relative;z-index: 1;
-	.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;}
+// 收货地址
+.adrlist{border-bottom: 2rpx solid  #E5E5E5;padding: 34rpx 0 34rpx 8rpx;
 	.tit{font-weight: 500;font-size: 22rpx;color: #666666;}
-	.time{font-weight: 500;font-size: 22rpx;color: #666666;}
-	.line{width: 6rpx;height: 28rpx;border-radius: 4rpx;margin-right: 12rpx;
-		&.bga{background: #FACA7D;}
-		&.bgb{background: #86AFFF;}
-		&.bgc{background: #93E9C2;}
-		&.bgd{background: #DADADA;}
+	.txt{font-size: 28rpx;color: #272727;font-weight: bold;}
+	.txts{font-weight: 500;font-size: 26rpx;color: #272727;}
+	.btns{font-weight: 500;font-size: 22rpx;color: #0256FD;padding: 2rpx 14rpx;display:inline-block;background: #C9DBFF;
+border-radius: 10rpx;}
+	.adrr{width: 40rpx;height: 40rpx;flex: 0 0 auto;margin-left: 12rpx;
+		image{width: 22rpx;height: 22rpx;}
+	}
+	&.act{
+		.tit{color: #0256FD;}
+		.txt{color: #0256FD;}
+		.txts{color: #0256FD;}
 	}
-	.txt{font-weight: 500;font-size: 26rpx;color: #272727;line-height: 36rpx;}
-	.txta{font-weight: 500;font-size: 26rpx;color: #666666;}
-	.rimg{width: 12rpx;height: 22rpx;}
-	.shbtns{border-top: 2rpx solid #DADADA;
-		.btn{border-radius: 20rpx;min-width: 110rpx;box-sizing: border-box;padding: 0 16rpx;
-height: 52rpx;display: flex;align-items: center;justify-content: center;flex:0 0 auto;margin-left: 20rpx;
-			&.bga{border: 2rpx solid #06C770;background: #DAEFE6;color: #06C770;margin-left: 0;}
-			&.bgb{border: 2rpx solid #FF6969;;background: #FFE7E7;color: #FF6969;}
-			&.bgc{background: #0256FD;color: #FFFFFF;}
+}
+
+
+// 人员
+.peolist{
+	.ctop{padding: 24rpx 24rpx 22rpx;}
+	.imgs{margin-right: 16rpx !important;}
+	.tit{font-size: 28rpx !important;}
+	.plists{padding: 30rpx 24rpx 6rpx;
+		.plist{background: linear-gradient(-90deg, #F2F5FF 0%, #FBFDFF 100%);border-radius: 20rpx;border: 2rpx solid #E6E6E6;padding: 18rpx 26rpx 4rpx;width: 100%;z-index: 1;
+		.head{width: 96rpx;height: 98rpx;margin-right: 32rpx;flex: 0 0 auto;}
+		.ptit{font-weight: bold;font-size: 30rpx;color: #272727;display: flex;align-items: center;margin-bottom: 14rpx;}	
+		.ptxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 14rpx;min-width: 176rpx;}
 		}
 	}
+	.upimg{width: 26rpx;height: 22rpx;display: block;transform: rotate(180deg);transition: all 0.3s;margin: 0 auto 18rpx;
+		&.act{transform: rotate(0deg);}
+	}
 }
+// 互动
+.pd12{padding: 24rpx;}
 // 无数据
 .nodata{display: flex;flex-direction: column;align-items: center;
 	image{width: 440rpx;height: 440rpx;}

user_wxui/mine/pages/car/addcar.vue → user_wxui/my/pages/car/addcar.vue

@@ -126,7 +126,7 @@
 	import {carPut,carAdd,carDet} from "@/api/work/car.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {getvehicleLicense} from "@/api/system/card.js"
-	import tkiFloatKeyboard from "@/mine/components/tki-float-keyboard/tki-float-keyboard.vue";
+	import tkiFloatKeyboard from "@/my/components/tki-float-keyboard/tki-float-keyboard.vue";
 	export default{
 		components:{wSelect,tkiFloatKeyboard},
 		data(){
@@ -144,10 +144,10 @@
 				],
 				keyType: 0,
 				isPower: false, // 新能源
-				rimg: require('@/mine/static/house/rimg.png'),
-				cmico:require('@/mine/static/house/cmico.png'),
-				upimg:require('@/mine/static/house/up.png'),
-				addnew:require('@/mine/static/house/add.png'),
+				rimg: require('@/my/static/house/rimg.png'),
+				cmico:require('@/my/static/house/cmico.png'),
+				upimg:require('@/my/static/house/up.png'),
+				addnew:require('@/my/static/house/add.png'),
 				baseUrl:config.baseUrl,
 				datainfo:{
 					// "carId":"",//业主车辆主键

user_wxui/mine/pages/car/charge.vue → user_wxui/my/pages/car/charge.vue

@@ -59,10 +59,10 @@
 		components:{},
 		data(){
 			return{
-				carc:require('@/mine/static/house/carc.png'),
-				chara:require('@/mine/static/house/chara.png'),
-				charb:require('@/mine/static/house/charb.png'),
-				rimg:require('@/mine/static/house/rimg.png'),
+				carc:require('@/my/static/house/carc.png'),
+				chara:require('@/my/static/house/chara.png'),
+				charb:require('@/my/static/house/charb.png'),
+				rimg:require('@/my/static/house/rimg.png'),
 				list:[],
 				pageSize: 10,
 				pageNum: 1,

user_wxui/mine/pages/car/illegalParking.vue → user_wxui/my/pages/car/illegalParking.vue

@@ -27,7 +27,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import boxList from "@/mine/components/box/list.vue"
+	import boxList from "@/my/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"; // 权限判断函数
@@ -35,8 +35,8 @@
 		components:{boxList},
 		data(){
 			return{
-				reset:require('@/mine/static/reset.png'),
-				up:require('@/mine/static/up.png'),
+				reset:require('@/my/static/reset.png'),
+				up:require('@/my/static/up.png'),
 				wtrq:"",
 				text:'',
 				list:[],
@@ -83,10 +83,10 @@
 				})
 			},
 			getCheck(){
-				this.$tab.navigateTo("/mine/pages/illegalcheck")
+				this.$tab.navigateTo("/my/pages/illegalcheck")
 			},
 			getDetail(e){
-				this.$tab.navigateTo("/mine/pages/car/illegalrecord?id="+e)
+				this.$tab.navigateTo("/my/pages/car/illegalrecord?id="+e)
 			},
 			getConfirm(){
 				this.getrefreshData()

user_wxui/mine/pages/car/illegalrecord.vue → user_wxui/my/pages/car/illegalrecord.vue

@@ -52,10 +52,10 @@
 		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'),
+				carc:require('@/my/static/house/carcc.png'),
+				card:require('@/my/static/house/carbb.png'),
+				icoa:require('@/my/static/house/icoa.png'),
+				icob:require('@/my/static/house/icob.png'),
 				baseUrl:config.baseUrl,
 				datainfo:{},
 				id:'',

user_wxui/mine/pages/car/index.vue → user_wxui/my/pages/car/index.vue

@@ -17,7 +17,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import boxList from "@/mine/components/box/list.vue"
+	import boxList from "@/my/components/box/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {carList,carDel} from "@/api/work/car.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
@@ -25,7 +25,7 @@
 		components:{boxList},
 		data(){
 			return{
-				rimg: require('@/mine/static/house/rimg.png'),
+				rimg: require('@/my/static/house/rimg.png'),
 				list:[],
 				pageSize: 10,
 				pageNum: 1,
@@ -80,13 +80,13 @@
 				})
 			},
 			getAddFn(){
-				this.$tab.navigateTo("/mine/pages/car/addcar")
+				this.$tab.navigateTo("/my/pages/car/addcar")
 			},
 			getDetail(id){
-				this.$tab.navigateTo("/mine/pages/car/addcar?id="+id)
+				this.$tab.navigateTo("/my/pages/car/addcar?id="+id)
 			},
 			getChargeFn(){
-				this.$tab.navigateTo("/mine/pages/car/charge")
+				this.$tab.navigateTo("/my/pages/car/charge")
 			},
 			getrefreshData(){
 				this.pageNum=1;

user_wxui/mine/pages/house/addaddress.vue → user_wxui/my/pages/house/addaddress.vue

@@ -70,8 +70,8 @@
 		data(){
 			return{
 				rimg:require('@/static/images/rimg.png'),
-				check: require('@/mine/static/check.png'),
-				ncheck: require('@/mine/static/ncheck.png'),
+				check: require('@/my/static/check.png'),
+				ncheck: require('@/my/static/ncheck.png'),
 				list:[],
 				text:"",
 				datainfo:{},
@@ -86,7 +86,7 @@
 		methods:{
 			checkPermi,checkRole,
 			getAddFn(){
-				// this.$tab.navigateTo("/mine/pages/house/addaddress")
+				// this.$tab.navigateTo("/my/pages/house/addaddress")
 			},
 			getTabFn(val){
 				this.tabval=val

user_wxui/mine/pages/house/addhouse.vue → user_wxui/my/pages/house/addhouse.vue

@@ -196,8 +196,8 @@
 		components:{},
 		data(){
 			return{
-				rimg: require('@/mine/static/house/rimg.png'),
-				cmico:require('@/mine/static/house/cmico.png'),
+				rimg: require('@/my/static/house/rimg.png'),
+				cmico:require('@/my/static/house/cmico.png'),
 				baseUrl:config.baseUrl,
 				datainfo:{
 					 // "houseId":"",//房屋信息主键

user_wxui/mine/pages/house/address.vue → user_wxui/my/pages/house/address.vue

@@ -15,7 +15,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import boxLit from "@/mine/components/box/list.vue"
+	import boxLit from "@/my/components/box/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{boxLit},
@@ -42,7 +42,7 @@
 		methods:{
 			checkPermi, checkRole,
 			getAddFn(){
-				this.$tab.navigateTo("/mine/pages/house/addaddress")
+				this.$tab.navigateTo("/my/pages/house/addaddress")
 			},
 			getDataFn(){
 				var params={

user_wxui/mine/pages/house/index.vue → user_wxui/my/pages/house/index.vue

@@ -97,10 +97,10 @@
 		components:{},
 		data(){
 			return{
-				housebg:require('@/mine/static/house/house.png'),
+				housebg:require('@/my/static/house/house.png'),
 				more:require("@/work/static/visitor/more.png"),
-				adrs:require('@/mine/static/house/adrs.png'),
-				edit:require('@/mine/static/house/edit.png'),
+				adrs:require('@/my/static/house/adrs.png'),
+				edit:require('@/my/static/house/edit.png'),
 				backgroundColor: "transparent",
 				nvaHeight:44,
 				list:[],
@@ -146,13 +146,13 @@
 		methods:{
 			checkPermi, checkRole,
 			getAddFn(){
-				this.$tab.navigateTo("/mine/pages/house/addhouse")
+				this.$tab.navigateTo("/my/pages/house/addhouse")
 			},
 			getListFn(){
-				this.$tab.navigateTo("/mine/pages/house/people")
+				this.$tab.navigateTo("/my/pages/house/people")
 			},
 			getEdit(id){
-				this.$tab.navigateTo("/mine/pages/house/addhouse?id="+id)
+				this.$tab.navigateTo("/my/pages/house/addhouse?id="+id)
 			},
 			getBackFn(){
 				uni.navigateBack({

user_wxui/mine/pages/house/people.vue → user_wxui/my/pages/house/people.vue

@@ -32,7 +32,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import boxList from "@/mine/components/box/list.vue"
+	import boxList from "@/my/components/box/list.vue"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {houseInfoList} from "@/api/work/work.js"
@@ -41,9 +41,9 @@
 		components:{boxList},
 		data(){
 			return{
-				reset:require('@/mine/static/reset.png'),
-				search:require('@/mine/static/search.png'),
-				up:require('@/mine/static/up.png'),
+				reset:require('@/my/static/reset.png'),
+				search:require('@/my/static/search.png'),
+				up:require('@/my/static/up.png'),
 				sfxx:"",
 				text:'',
 				rymm:'',

user_wxui/news/components/box/list.vue

@@ -185,7 +185,7 @@
 				nicone:require('@/news/static/news/nicone.png'),
 				del:require('@/news/static/news/delb.png'),
 				head:require('@/news/static/news/head.png'),
-				upimg:require('@/mine/static/house/up.png'),
+				upimg:require('@/my/static/house/up.png'),
 				baseUrl:config.baseUrl,
 				delBtnWidth:66,//左滑默认宽度
 				userId:this.$store.state.user.userId,

user_wxui/news/pages/complaint/add.vue

@@ -64,8 +64,8 @@
 		data(){
 			return{
 				rimg:require('@/static/images/rimg.png'),
-				check: require('@/mine/static/check.png'),
-				ncheck: require('@/mine/static/ncheck.png'),
+				check: require('@/my/static/check.png'),
+				ncheck: require('@/my/static/ncheck.png'),
 				voice: require('@/work/static/voice.png'),
 				photo:require("@/work/static/service/photo.png"),
 				del:require('@/work/static/service/rdel.png'),
@@ -90,7 +90,7 @@
 		methods:{
 			checkPermi,checkRole,
 			getAddFn(){
-				// this.$tab.navigateTo("/mine/pages/house/addaddress")
+				// this.$tab.navigateTo("/my/pages/house/addaddress")
 			},
 			getVoiceFn(){
 				this.voiceflag=true;

user_wxui/news/pages/news/detail.vue

@@ -63,7 +63,7 @@
 				nicone:require('@/news/static/news/nicone.png'),
 				starb:require('@/news/static/news/starb.png'),
 				head:require('@/news/static/news/head.png'),
-				upimg:require('@/mine/static/house/up.png'),
+				upimg:require('@/my/static/house/up.png'),
 				nonews:require('@/news/static/news/nonews.png'),
 				baseUrl:config.baseUrl,
 				autoHeight:true,

user_wxui/news/pages/news/newssq.vue

@@ -86,7 +86,7 @@
 				})
 			},
 			getHdFn(){
-				this.$tab.navigateTo("/my/pages/news/index");
+				this.$tab.navigateTo("/mine/pages/news/index");
 				this.hdcount=0;
 			},
 			getDetail(id){

user_wxui/pages.json

@@ -29,59 +29,20 @@
 	    }
 	  },
 	 
-  {
-    "path": "pages/tlogin",
-    "style": {
-      "navigationBarTitleText": "登录",
-  	  "navigationStyle": "custom"
-    }
-  }, 
-  {
-    "path": "pages/register",
-    "style": {
-      "navigationBarTitleText": "注册",
-	  "navigationStyle": "custom"
-    }
-  },  
+  
   {
     "path": "pages/agreement",
     "style": {
       "navigationBarTitleText": "用户协议及隐私条款"
     }
   },
-  {
-    "path": "pages/mine/info",
-    "style": {
-      "navigationBarTitleText": "个人信息",
-  	  "h5":{"titleNView":false}
-    }
-  },
+  
  {
     "path": "pages/mine/index",
     "style": {
       "navigationBarTitleText": "我的",
 	  "navigationStyle": "custom"
     }
-  }, {
-    "path": "pages/mine/avatar/index",
-    "style": {
-      "navigationBarTitleText": "修改头像"
-    }
-  }, {
-    "path": "pages/mine/pwd/index",
-    "style": {
-      "navigationBarTitleText": "修改密码"
-    }
-  },{
-    "path": "pages/common/webview/index",
-    "style": {
-      "navigationBarTitleText": "浏览网页"
-    }
-  }, {
-    "path": "pages/common/textview/index",
-    "style": {
-      "navigationBarTitleText": "浏览文本"
-    }
   }],
   "subPackages": [
 	  {"root": "health",
@@ -192,41 +153,6 @@
 				"navigationStyle": "custom",
 				"h5":{"titleNView":false}
 			  }
-			},
-			{
-			  "path": "pages/manage/index",
-			  "style": {
-			    "navigationBarTitleText": "物业费账单",
-				"h5":{"titleNView":false}
-			  }
-			},
-			{
-			  "path": "pages/manage/moneybill",
-			  "style": {
-			    "navigationBarTitleText": "历史账单",
-				"h5":{"titleNView":false}
-			  }
-			},
-			{
-			  "path": "pages/manage/moneydetail",
-			  "style": {
-			    "navigationBarTitleText": "账单详情",
-				"h5":{"titleNView":false}
-			  }
-			},
-			{
-			  "path": "pages/manage/pay",
-			  "style": {
-			    "navigationBarTitleText": "支付信息",
-				"h5":{"titleNView":false}
-			  }
-			},
-			{
-			  "path": "pages/manage/success",
-			  "style": {
-			    "navigationBarTitleText": "提交成功",
-				"h5":{"titleNView":false}
-			  }
 			}
 		]
   	},{
@@ -291,7 +217,7 @@
 		]
 	},
 	{
-		"root": "mine",
+		"root": "my",
 		"pages": [
 			{
 			  "path": "pages/house/index",
@@ -378,8 +304,96 @@
 			 }
 		]
 	},
-	{"root": "my",
+	{"root": "common",
 		"pages": [
+			{
+			  "path": "pages/webview/index",
+			  "style": {
+			    "navigationBarTitleText": "浏览网页"
+			  }
+			}, {
+			  "path": "pages/textview/index",
+			  "style": {
+			    "navigationBarTitleText": "浏览文本"
+			  }
+			}
+		]
+	},
+	{
+		"root": "manage",
+		"pages": [
+			{
+			  "path": "pages/manage/index",
+			  "style": {
+			    "navigationBarTitleText": "物业费账单",
+				"h5":{"titleNView":false}
+			  }
+			},
+			{
+			  "path": "pages/manage/moneybill",
+			  "style": {
+			    "navigationBarTitleText": "历史账单",
+				"h5":{"titleNView":false}
+			  }
+			},
+			{
+			  "path": "pages/manage/moneydetail",
+			  "style": {
+			    "navigationBarTitleText": "账单详情",
+				"h5":{"titleNView":false}
+			  }
+			},
+			{
+			  "path": "pages/manage/pay",
+			  "style": {
+			    "navigationBarTitleText": "支付信息",
+				"h5":{"titleNView":false}
+			  }
+			},
+			{
+			  "path": "pages/manage/success",
+			  "style": {
+			    "navigationBarTitleText": "提交成功",
+				"h5":{"titleNView":false}
+			  }
+			}
+		]
+	},
+	{
+		"root": "mine",
+		"pages": [
+			{
+			  "path": "pages/tlogin",
+			  "style": {
+			    "navigationBarTitleText": "登录",
+				  "navigationStyle": "custom"
+			  }
+			}, 
+			{
+			  "path": "pages/register",
+			  "style": {
+			    "navigationBarTitleText": "注册",
+				  "navigationStyle": "custom"
+			  }
+			}, 
+			{
+			  "path": "pages/avatar/index",
+			  "style": {
+			    "navigationBarTitleText": "修改头像"
+			  }
+			}, {
+			  "path": "pages/pwd/index",
+			  "style": {
+			    "navigationBarTitleText": "修改密码"
+			  }
+			},
+			{
+			  "path": "pages/info",
+			  "style": {
+			    "navigationBarTitleText": "个人信息",
+				  "h5":{"titleNView":false}
+			  }
+			},
 			{
 			  "path": "pages/news/index",
 			  "style": {
@@ -421,11 +435,19 @@
   "preloadRule":{
 	"pages/index/index": {
 		"network": "all",
-		"packages": ["work","mine","health","my"]
+		"packages": ["work","my","manage","mine","news"]
 	}, 
+	"pages/health/index": {
+		"network": "all",
+		"packages": ["health"]
+	}, 
+	"pages/mine/index": {
+		"network": "all",
+		"packages": ["common"]
+	},
 	"pages/login": {
 	 	"network": "all",
-	 	"packages": ["work","mine","health","my"]
+	 	"packages": ["work","mine","my","manage"]
 	}
   },
   "globalStyle": {

user_wxui/pages/index/index.vue

@@ -346,13 +346,13 @@ import store from "@/store"
 			this.$tab.navigateTo(`/work/pages/service/warranty`) 
 		},
 		getHouseFn(){//我的房屋
-			this.$tab.navigateTo(`/mine/pages/house/index`) 
+			this.$tab.navigateTo(`/my/pages/house/index`) 
 		},
 		getCarFn(){//我的车辆
-			this.$tab.navigateTo(`/mine/pages/car/index`) 
+			this.$tab.navigateTo(`/my/pages/car/index`) 
 		},
 		getMoneyFn(){//物业缴费
-			this.$tab.navigateTo(`/work/pages/manage/index`) 
+			this.$tab.navigateTo(`/manage/pages/manage/index`) 
 		},
 		getVisitorFn(){//访客邀请
 			this.$tab.navigateTo(`/work/pages/visitor/index`) 
@@ -367,7 +367,7 @@ import store from "@/store"
 			this.$tab.navigateTo(`/news/pages/complaint/index`) 
 		},
 		getKdFn(){//我的快递
-			this.$tab.navigateTo(`/my/pages/delivery/index`) 
+			this.$tab.navigateTo(`/mine/pages/delivery/index`) 
 		},
 		getWygjFn(){//物业管家
 			this.type='wygj'

user_wxui/pages/login.vue

@@ -5,10 +5,12 @@
 		<view class="wymain">
 			<image :src="headimg" class="headimg"></image>
 			<!-- 微信登录 -->
+			<!-- #ifdef MP-WEIXIN -->
 			<button type="primary" class="rbtn" open-type="getUserInfo" @getuserinfo="getuserinfo">
 				<image :src="vxtab" class="vxtab"></image>
 				<text class="btn-txt">微信一键登录</text>
 			</button>
+			<!-- #endif -->
 			<button type="primary" class=" rbtn" @click="getlogin">
 				<image :src="zhtab" class="zhtab"></image>
 				<text class="btn-txt">账号密码登录</text>
@@ -56,10 +58,10 @@
 				this.$tab.navigateTo(`/pages/agreement`)
 			},
 			getlogin(){
-				this.$tab.navigateTo(`/pages/tlogin`)
+				this.$tab.navigateTo(`/mine/pages/tlogin`)
 			},
 			getregister(){
-				this.$tab.navigateTo(`/pages/register`)
+				this.$tab.navigateTo(`/mine/pages/register`)
 			},
 			async getuserinfo(e) {
 				// if(!this.checkflag){

user_wxui/pages/mine/index.vue

@@ -252,34 +252,34 @@
 				this.$tab.navigateTo(`/work/pages/service/warranty`)  
 			},
 			getFeeFn(){//物业费
-				this.$tab.navigateTo(`/work/pages/manage/index`)  
+				this.$tab.navigateTo(`/manage/pages/manage/index`)  
 			},
 			
 			// 修改密码
 			handleUpassword(){
-				this.$tab.navigateTo(`/pages/mine/pwd/index`)  
+				this.$tab.navigateTo(`/mine/pages/pwd/index`)  
 			},
 			getPlShFn(){//评论审核
-				this.$tab.navigateTo('/my/pages/news/sh')
+				this.$tab.navigateTo('/mine/pages/news/sh')
 			},
 			getMyHdFn(){//我的互动
-				this.$tab.navigateTo('/my/pages/news/index')
+				this.$tab.navigateTo('/mine/pages/news/index')
 			},
 			getWdHdFn(){//我的点评赞
-				this.$tab.navigateTo('/my/pages/news/myhd')
+				this.$tab.navigateTo('/mine/pages/news/myhd')
 			},
 			getMyParkFn(){//我的违停
-				this.$tab.navigateTo('/mine/pages/car/illegalParking')
+				this.$tab.navigateTo('/my/pages/car/illegalParking')
 			},
 			// 账号信息
 			handleToInfo() {
-				this.$tab.navigateTo('/pages/mine/info')
+				this.$tab.navigateTo('/mine/pages/info')
 			},
 			handleToLogin() {
 				this.$tab.reLaunch('/pages/login')
 			},
 			handleToAvatar() {
-				this.$tab.navigateTo('/pages/mine/avatar/index')
+				this.$tab.navigateTo('/mine/pages/avatar/index')
 			},
 			handleLogout() {
 				this.$modal.confirm('确定注销并退出系统吗？').then(() => {

user_wxui/permission.js

@@ -5,7 +5,7 @@ const loginPage = "/pages/login"
   
 // 页面白名单
 const whiteList = ['/pages/index/index','/pages/agreement',
-  '/pages/login','/pages/tlogin', '/pages/register', '/pages/common/webview/index'
+  '/pages/login','/mine/pages/tlogin', '/mine/pages/register', '/common/pages/webview/index'
 ]
 
 // 检查地址白名单

user_wxui/store/modules/user.js

@@ -123,7 +123,7 @@ const user = {
       })
     },
 
-    // 获取用户信息require("@/static/images/profile.jpg")
+    // 获取用户信息require("@/mine/static/images/profile.jpg")
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {

user_wxui/work/components/box/list.vue

@@ -51,32 +51,7 @@
 					</view>
 				</view>
 				<view class="spdel" v-if="ite.right>0" @click.stop="getDelFn(ite.reservRecordId)">删除</view>
-			</view>
-			
-		</block>
-		<!-- 历史账单 -->
-		<block v-if="type=='moneybill'">
-			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx">
-				<view class="ctop flexc" style="padding: 26rpx 24rpx 24rpx;">
-					<image :src="time" class="imgs"></image>
-					<view class="tit">2024/01 -2024/12</view>
-					<view class="btn btnbgb" v-if="ite.type==1">已缴费</view>
-					<view class="btn btnbgc" v-else>未缴费</view>
-					<view class="flex1"></view>
-					<view class="txta">1号楼3单元1102</view>
-				</view>
-				<view class="clists flexc">
-					<view class="mlistl">
-						<view class="mltit">应缴总额 /元</view>
-						<view class="mltxt">4307.20</view>
-					</view>
-					<view class="mlistr">
-						<view class="clist"><view class="tit">物业费用：</view>3247.20元</view>
-						<view class="clist"><view class="tit">车位费用：</view>960.00元</view>
-						<view class="clist"><view class="tit">能耗费用：</view>100.00元</view>
-					</view>
-				</view>
-			</view>
+			</view>	
 		</block>
 		<view class="shax" v-if="wtdt">{{wtdt}}</view>
 	</block>

user_wxui/work/pages/clean/detail.vue

@@ -135,7 +135,7 @@
 				// this.$tab.navigateTo("/work/pages/clean/order")
 			},
 			getAddressFn(){
-				this.$tab.navigateTo("/mine/pages/house/address")
+				this.$tab.navigateTo("/my/pages/house/address")
 			},
 			getClose(){
 				this.type=''

user_wxui/work/pages/service/warrantyadd.vue

@@ -92,8 +92,8 @@
 		data(){
 			return{
 				rimg:require('@/static/images/rimg.png'),
-				check: require('@/mine/static/check.png'),
-				ncheck: require('@/mine/static/ncheck.png'),
+				check: require('@/my/static/check.png'),
+				ncheck: require('@/my/static/ncheck.png'),
 				voice: require('@/work/static/voice.png'),
 				photo:require("@/work/static/service/photo.png"),
 				del:require('@/work/static/service/rdel.png'),

user_wxui/work/pages/visitor/index.vue

@@ -37,7 +37,7 @@
 			return{
 				visbg:require('@/work/static/visitor/visbg.png'),
 				more:require("@/work/static/visitor/more.png"),
-				// adrs:require('@/mine/static/house/adrs.png'),
+				// adrs:require('@/my/static/house/adrs.png'),
 				backgroundColor: "transparent",
 				house:this.$store.state.user.house,
 				nvaHeight:44,

user_wxui/work/pages/visitor/vadd.vue

@@ -114,8 +114,8 @@
 			return {
 				rimg: require('@/static/images/rimg.png'),
 				aphoto: require('@/work/static/visitor/aphoto.png'),
-				check: require('@/mine/static/check.png'),
-				ncheck: require('@/mine/static/ncheck.png'),
+				check: require('@/my/static/check.png'),
+				ncheck: require('@/my/static/ncheck.png'),
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				datainfo: {

user_wxui/work/pages/visitor/vdetail.vue

@@ -100,8 +100,8 @@
 		components:{},
 		data(){
 			return{
-				check: require('@/mine/static/check.png'),
-				ncheck: require('@/mine/static/ncheck.png'),
+				check: require('@/my/static/check.png'),
+				ncheck: require('@/my/static/ncheck.png'),
 				mapimg: require("@/work/static/visitor/adr.png"),
 				nvaHeight:44,
 				checkflag:false,

user_wxui/work/pages/visitor/vshare.vue

@@ -61,8 +61,8 @@
 		components:{},
 		data(){
 			return{
-				check: require('@/mine/static/check.png'),
-				ncheck: require('@/mine/static/ncheck.png'),
+				check: require('@/my/static/check.png'),
+				ncheck: require('@/my/static/ncheck.png'),
 				nvaHeight:44,
 				checkflag:false,
 				backgroundColor: "transparent",