Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

杨鑫
2 parents 57b010a3 06dc87e6
Showing 5 changed files with 93 additions and 11 deletions
lvdao-miniapp/pages/login/login.vue
lvdao-miniapp/pages/message/message.vue
lvdao-miniapp/pages/my/my.vue
lvdao-miniapp/pages/workbench/workbench.vue
lvdao-miniapp/pagesA/procedureList/procedureList.vue
@@ -115,9 +115,15 @@
 						uni.setStorageSync('token', res.data.data.token);
 						uni.setStorageSync('user', res.data.data);
 						// uni.setStorageSync('shopId', res.data.data.shopId);
-						uni.switchTab({
-							url: '/pages/home/home'
+						uni.showToast({
+							icon:'none',
+							title:'登录成功'
 						})
+						setTimeout(() => {
+							uni.switchTab({
+								url: '/pages/home/home'
+							})
+						}, 1000)
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -15,7 +15,7 @@
 		</view>
 		<view class="main">
 		<view class="message-list">
-			<view class="list" @click="toMsgList">
+<!-- 			<view class="list" @click="toMsgList">
 				<view class="icon-data">
 					<view class="icon">
 						<image :src="$imgUrl('/msg1.png')"  mode=""></image>
@@ -30,14 +30,13 @@
 								<view v-html="tableList[0].content"></view>
 							</view>
 							<view v-else >暂无</view>
-							<!-- <text>{{?tableList[0].content:''}}</text> -->
 						</view>
 					</view>
 				</view>
 				<view class="more" v-if="tableList.length>0">
 					<view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=通知消息')">
 				<view class="icon-data">
 					<view class="icon">
@@ -63,6 +62,56 @@
 					<view class="icon-more" v-if="tzlist.length>0">{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}</view>
 				</view>
 			</view>
+			<view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=物业缴费通知')">
+				<view class="icon-data">
+					<view class="icon">
+						<image :src="$imgUrl('/zjjf.png')"  mode=""></image>
+					</view>
+					<view class="data">
+						<view class="title">
+							<text>物业缴费通知</text>
+						</view>
+						
+						<view class="describe">
+							<view v-if="wylist.length>0" >
+								<view v-if="wylist[0].content.type == '2'">{{wylist[0].content.title}}【图片】</view>
+								<view v-else >{{wylist[0].content.title}}</view>
+							</view>
+							<view v-else >暂无</view>
+							<!-- <text>{{?tableList[0].content:''}}</text> -->
+						</view>
+					</view>
+				</view>
+				<view class="more">
+					<view class="more-num" v-if="wylist.length>0">{{wylist.length}}</view>
+					<view class="icon-more" v-if="wylist.length>0">{{formatDateTime(wylist[0]?wylist[0].createTime:'')}}</view>
+				</view>
+			</view>
+			<view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租金缴费通知')">
+				<view class="icon-data">
+					<view class="icon">
+						<image :src="$imgUrl('/wyjf.png')"  mode=""></image>
+					</view>
+					<view class="data">
+						<view class="title">
+							<text>租金缴费通知</text>
+						</view>
+						
+						<view class="describe">
+							<view v-if="zjlist.length>0" >
+								<view v-if="zjlist[0].content.type == '2'">{{zjlist[0].content.title}}【图片】</view>
+								<view v-else >{{zjlist[0].content.title}}</view>
+							</view>
+							<view v-else >暂无</view>
+							<!-- <text>{{?tableList[0].content:''}}</text> -->
+						</view>
+					</view>
+				</view>
+				<view class="more">
+					<view class="more-num" v-if="zjlist.length>0">{{zjlist.length}}</view>
+					<view class="icon-more" v-if="zjlist.length>0">{{formatDateTime(zjlist[0]?zjlist[0].createTime:'')}}</view>
+				</view>
+			</view>
 			<view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租赁提醒')">
 				<view class="icon-data">
 					<view class="icon">
@@ -113,7 +162,9 @@
 					receiverMerchant:''
 				},
 				zllist:[],
-				tzlist:[]
+				tzlist:[],
+				zjlist:[],
+				wylist:[]
 			}
 		},
@@ -152,6 +203,8 @@
 			getmsg() {
 				this.zllist = []
 				this.tzlist = []
+				this.zjlist = []
+				this.wylist = []
 				let info = {
 					// phone:uni.getStorageSync('user').phone,
 					phone:'18121815598',
@@ -179,6 +232,28 @@
 					this.tzlist.reverse()
 					console.error(this.tzlist)
 				})
+				this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租金缴费通知'},1).then(res => {
+					let obj = res.data.data
+					for(let prop in obj) {
+					    if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
+							obj[prop][0].content = JSON.parse(obj[prop][0].content)
+							this.zjlist.push(obj[prop][0])
+					    }
+					}
+					this.zjlist.reverse()
+					console.error(this.zjlist)
+				})
+				this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'物业缴费通知'},1).then(res => {
+					let obj = res.data.data
+					for(let prop in obj) {
+					    if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
+							obj[prop][0].content = JSON.parse(obj[prop][0].content)
+							this.wylist.push(obj[prop][0])
+					    }
+					}
+					this.wylist.reverse()
+					console.error(this.wylist)
+				})
 			},
 			formatDateTime(dateTimeString) {
 			  // 将输入的日期时间字符串转换为Date对象
@@ -58,8 +58,7 @@
 						</view> -->
 						<view class="service-list-list" @click="myativity">
 							<view class="thumb">
-								<text v-if="Islogin">0</text>
-								<text v-else>{{activityNum}}</text>
+								<text>{{activityNum || 0}}</text>
 							</view>
 							<view class="name" >
 								<text>我的活动</text>
@@ -310,6 +309,7 @@
 						} 
 					}
 				})
+				this.getALL()
 			}
 		},
@@ -320,7 +320,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		mounted() {
-			this.getALL()
+			
 		},
 		methods: {
 			out() {
@@ -251,12 +251,12 @@
 						// { name: '活动申请', img: '/wyjf.png', path: '/pages/mycreated/mycreated' },
 						{
 							name: '租金缴费',
-							img: '/zjjf.png',
+							img: '/wyjf.png',
 							path: '/pagesA/rentPay/rentPay'
 						},
 						{
 							name: '物业缴费',
-							img: '/wyjf.png',
+							img: '/zjjf.png',
 							path: '/pages/propertyPay/propertyPayList/propertyPayList'
 						},
 					]
 <template>
 	<view class="pages">
+		<view v-if="tableList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
 		<view class="contents">
 			<view class="box" v-for="(item,index) in tableList" @click="getDetail(item)">
 				<view style="width:70%">