修改

assets/css/app.css

@@ -17,10 +17,10 @@
 	padding-bottom: 10rpx;
 }
 
-.base-line{
-	font-weight: 800;
-	color: #5064eb;
-	border: 1rpx solid #5064eb;
+
+
+.base-line::after {
+	border-color: #5064eb;
 }
 
 .line-btn{color: #2f7ff5;}

assets/http/api.js

@@ -64,6 +64,7 @@ const authentication = p => http.post('/community-app-service/app/member/authent
 //编辑家
 const editFamily = p => http.post('/community-app-service/app/houseuser/editUser', p)
 const modifyFace = p => http.post('/community-app-service/app/houseuser/modifyFace', p)
+const hasMember = p => http.post('/community-app-service/app/houseuser/hasMember?memberId='+p)
 //绑定家人
 const bindRoom = (p,q) => http.post('/community-app-service/app/houseuser/bindRoom?memberId='+p, q)
 
@@ -124,6 +125,9 @@ const pratiqueList = p => http.post("/community-app-service/app/pratique/getList
 //获取我家的设备
 const iotDeviceList = p => http.post("/community-app-service/app/iotdevice/list", p)
 
+
+const accessRecords = p => http.post("/community-app-service/app/accessRecords/list", p)
+
 export const api = {
 	//文件上传
 	uploadFile,
@@ -212,5 +216,7 @@ export const api = {
 	feedback,
 	getResidentialListByMember,
 	getAuditListByMemberId,
-	modifyFace
+	modifyFace,
+	accessRecords,
+	hasMember
 }

assets/http/service.js

@@ -41,7 +41,6 @@ let isRefreshing = false
 // 重试队列，每一项将是一个待执行的函数形式
 let requests = []
 http.interceptors.response.use(async (response) => {
-	console.log(response,"response");
 	/* 请求之后拦截器。可以使用async await 做异步操作  */
 	let data = response.data
 	if (data.code && data.code != 200) {

comps/auth.vue

@@ -0,0 +1,83 @@
+<template>
+	<view style="background-color: #fff;min-height: 100vh;">
+		<view class="default">
+			<image src="/static/common/empty.png"></image>
+			<view style="font-size: 26rpx;">
+				<text style="color: #909090;">{{msg}}</text>
+			</view>
+			<navigator :url="url" class="cu-btn sm  margin-top-50"
+				style="padding: 35rpx 65rpx;margin-left: 8rpx;background-color: #FFFFFF;border: 1rpx solid #d0d0d0;color: #606266;font-size: 26rpx;">
+				{{btnName}}
+			</navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				msg: "您还未完成注册认证",
+				btnName: "去注册认证",
+				url: "../register/register"
+			}
+		},
+		props: ['type'],
+		created() {
+			if (this.type == '2') {
+				this.getHouseUser()
+				this.initData()
+			}
+		},
+		methods: {
+			initData() {
+				//导航栏标题
+				uni.setNavigationBarTitle({
+					title: "房屋认证"
+				})
+				//去认证
+				this.msg = "您还未完成房屋认证"
+				this.btnName = "去认证"
+			},
+			async getHouseUser() {
+				let member = getApp().globalData.member
+				if (this.$isEmpty(member)) {
+					this.url = "../auth/auth"
+					return
+				}
+				let params = {
+					name: member.name,
+					phone: member.tel
+				}
+				let res = await this.$http.getHouseUserCondition(params)
+				let list = res.data.data
+				if (this.$isEmpty(list)) {
+					this.url = "../auth/auth"
+					return
+				}
+				uni.setStorageSync('houseList', list)
+				this.url = "../bindRoom/bindRoom"
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.default {
+		text-align: center;
+		position: fixed;
+		left: 50%;
+		top: 40%;
+		transform: translate(-50%, -70%);
+	}
+
+	.default text {
+		color: #AAAAAA;
+	}
+
+	.default image {
+		height: 180rpx;
+		width: 180rpx;
+		display: inline-block;
+	}
+</style>

comps/clear-user.vue

@@ -0,0 +1,119 @@
+<template>
+	<view class="">
+		<u-popup v-model="show" mode="center" width="80%" :border-radius="10" @close="close" negativeTop="200">
+			<view style="padding:30rpx 0rpx;display: flex;flex-direction: column;justify-content: space-between;">
+				<view class="center text-center padding-bottom-30">
+					<text>注销账户</text>
+				</view>
+				<view class="flex-sub" style="margin: 50rpx 30rpx;">
+					<text class=" text-red"
+						style="font-size: 28rpx;line-height: 56rpx;">您的个人信息，账户信息，认证信息将被清空/删除，确定进行此操作？</text>
+						<view class="margin-top " v-if="hasMember">
+							<text class="cuIcon-title "></text>
+							<text class="text-sm ">业主角色请到【家人管理】处移除房间下的成员</text>
+						</view>
+				</view>
+
+				<view class="text-sm" style="display: flex;padding: 5rpx 32rpx 38rpx">
+					<u-checkbox v-model="checked" size="26" name="checked" >
+						<text style="font-size: 28rpx;">确定注销账户</text>
+					</u-checkbox>
+				</view>
+
+				<view style="display: flex;justify-content: center">
+					<u-button v-if="type==1" :customStyle="createStyle" @click="createRoom">创建新房间</u-button>
+					<u-button v-else :customStyle="cancelStyle" @click="show=false">暂不注销</u-button>
+					<u-button :disabled="time>0" type="primary" :customStyle="confirmStyle" @click="confirm">
+						<text v-if="time>0">{{time}}s</text>
+						<text v-else>确定注销</text>
+					</u-button>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: '',
+		data() {
+			return {
+				hasMember:false,
+				time: 5,
+				interval:null,
+				checked: false,
+				show: false,
+				roomList: [],
+				iconStyle: {
+					'color': '#2f7ff5'
+				},
+				createStyle: {
+					backgroundColor: '#ff9900',
+					height: '70rpx',
+					lineHeight: '70rpx',
+					width: '210rpx',
+					fontSize: '28rpx',
+					color: '#FFFFFF',
+					marginLeft: '15rpx',
+					borderRadius: '0'
+				},
+				cancelStyle: {
+					height: '70rpx',
+					lineHeight: '70rpx',
+					width: '210rpx',
+					fontSize: '28rpx',
+					border: '1rpx solid #afb0b3',
+					marginRight: '15rpx',
+					borderRadius: '0'
+				},
+				confirmStyle: {
+					height: '70rpx',
+					lineHeight: '70rpx',
+					width: '210rpx',
+					fontSize: '28rpx',
+					marginLeft: '15rpx',
+					borderRadius: '0'
+				}
+			};
+		},
+		created() {
+			this.countdown()
+		},
+		beforeDestroy() {
+			if (this.interval) {
+				clearInterval(this.interval)
+			}
+		},
+		methods: {
+			async showModal() {
+				let res=await this.$http.hasMember(this.vuex_member.id)
+				this.hasMember=res.data.data
+				this.show = true
+			},
+			confirm() {
+				if (!this.checked) {
+					this.$u.toast('请先勾选确定注销账户操作')
+					this.show=true
+					return
+				}
+				
+				uni.clearStorage()
+				uni.reLaunch({
+					url: "/pages/index/index"
+					
+				})
+			},
+			countdown() {
+				this.interval = setInterval(() => {
+					if (this.time > 0) {
+						this.time -= 1
+					}
+				}, 1000)
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

comps/login.vue

@@ -1,13 +1,12 @@
 <template>
 	<view class="">
-		<u-modal v-model="loginshow" width="566" :show-cancel-button="true"
+		<u-modal v-model="loginshow" width="576" :show-cancel-button="true"
 			:title-style="{color: 'black',fontWeight:800,fontSize:'32rpx'}">
 			<view class="slot-content">
 				<view class="content">
-					<view class="userinfo-avatar">
-						<open-data type="userAvatarUrl"></open-data>
+					<view class="center">
+						<image src="../static/common/login.png" style="height: 300rpx;width: 300rpx;" mode=""></image>
 					</view>
-					<open-data type="userNickName"></open-data>
 					<text class="subtitle">申请获取您的公开信息（昵称,头像）</text>
 				</view>
 			</view>
@@ -43,7 +42,7 @@
 
 <style lang="scss" scoped>
 	.slot-content {
-		padding: 30rpx 0rpx;
+		padding: 10rpx 0rpx;
 	}
 
 	.content {
@@ -51,8 +50,7 @@
 		justify-content: center;
 		align-items: center;
 		flex-direction: column;
-		padding-top: 30rpx;
-		padding-bottom: 100rpx;
+		padding: 35rpx 0;
 
 		.userinfo-avatar {
 			overflow: hidden;

comps/mescroll-body/components/mescroll-empty.vue

@@ -7,7 +7,7 @@ import MescrollEmpty from '@/components/mescroll-uni/components/mescroll-empty.v
 -->
 <template>
 	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }" :style="{ 'z-index': option.zIndex, top: option.top }">
-		<view> <image v-if="icon" class="empty-icon" style="width:180rpx;height:160rpx" :src="icon" mode="" /> </view>
+		<view> <image v-if="icon" class="empty-icon" style="width:180rpx;height:180rpx" :src="icon" mode="" /> </view>
 		<view v-if="tip" class="empty-tip">{{ tip }}</view>
 		<view v-if="option.btnText" class="empty-btn" @click="emptyClick">{{ option.btnText }}</view>
 	</view>

pages.json

@@ -1,1023 +1,924 @@
 {
-	"easycom": {
-		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [
-		
-		{
-			"path": "pages/index/index",
-			"style" :
-			{
-			    "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-			}
-		},
-		{
-			"path" : "pages/guide/guide",
-			"style":                                                                                   
-			{
-				"navigationStyle":"custom",
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		}
-	    ,{
+    "easycom" : {
+        "^u-(.*)" : "@/uview-ui/components/u-$1/u-$1.vue"
+    },
+    "pages" : [
+        {
+            "path" : "pages/index/index",
+            "style" : {
+                "enablePullDownRefresh" : false,
+                "navigationStyle" : "custom"
+            }
+        },
+        {
+            "path" : "pages/guide/guide",
+            "style" : {
+                "navigationStyle" : "custom",
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
+            }
+        },
+        {
             "path" : "pages/myhome/myhome",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我家",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "我家",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/life/life",
-            "style" :                                                                                    
-            {
-				"navigationStyle":"custom",
-                "navigationBarTitleText": "周边",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationStyle" : "custom",
+                "navigationBarTitleText" : "周边",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/poster/poster",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-			"path": "pages/authorize_record/authorize_record",
-			"style": {
-				"navigationBarTitleText": "授权记录"
-			}
-		},
-		{
-			"path": "pages/authorize_record/openPass/openPass",
-			"style": {
-				"navigationBarTitleText": "访客授权"
-			}
-		}
-        ,{
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
+            }
+        },
+        {
+            "path" : "pages/authorize_record/authorize_record",
+            "style" : {
+                "navigationBarTitleText" : "授权记录"
+            }
+        },
+        {
+            "path" : "pages/authorize_record/openPass/openPass",
+            "style" : {
+                "navigationBarTitleText" : "访客授权"
+            }
+        },
+        {
             "path" : "pages/webview/webview",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/register/register",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/wode/direction/direction",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "使用帮助",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "使用帮助",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/wode/myInfo/myInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "认证信息",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "认证信息",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/wode/news/news",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的消息",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "我的消息",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/wode/password/password",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-			"path": "pages/myFamily/myFamily",
-			"style": {
-				"navigationBarTitleText": "家人管理"
-			}
-		},
-		{
-			"path": "pages/myFamily/addFamily/addFamily",
-			"style": {
-				"navigationBarTitleText": "添加家人"
-			}
-		},
-		{
-			"path": "pages/myFamily/editFamily/editFamily",
-			"style": {
-				"navigationBarTitleText": "编辑家人"
-			}
-		},
-		{
-			"path": "pages/myFamily/editApplyFamily/editApplyFamily",
-			"style": {
-				"navigationBarTitleText": "编辑申请"
-			}
-		},
-		{
-			"path": "pages/myFamily/activateFace/activateFace",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/bluetooth/bluetooth",
-			"style": {
-				"navigationBarTitleText": "蓝牙开门"
-			}
-		},
-		{
-			"path": "pages/choosePlot/choosePlot",
-			"style": {
-				"navigationBarTitleText": "选择小区"
-			}
-		},
-		{
-			"path": "pages/choosePlot/chooseUnit/chooseUnit",
-			"style": {
-				"navigationBarTitleText": "选择楼栋"
-			}
-		},
-		{
-			"path": "pages/choosePlot/chooseRoom/chooseRoom",
-			"style": {
-				"navigationBarTitleText": "选择房间"
-			}
-		},
-		{
-			"path": "pages/choosePlot/householdCert/householdCert",
-			"style": {
-				"navigationBarTitleText": "用户认证"
-			}
-		},
-		{
-			"path": "pages/myPassword/myPassword",
-			"style": {
-				"navigationBarTitleText": "访客密码"
-			}
-		},{
-			"path": "pages/oneButton/oneButton",
-			"style": {
-				"navigationBarTitleText": "一键开门"
-			}
-		},{
-			"path": "pages/record/record",
-			"style": {
-				"navigationBarTitleText": "访客记录"
-			}
-		},{
-			"path": "pages/switchcity/switchcity",
-			"style": {
-				"navigationBarTitleText": "选择城市"
-			}
-		},
-		{
-			"path": "pages/uploadFace/uploadFace",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		}
-        ,{
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
+            }
+        },
+        {
+            "path" : "pages/myFamily/myFamily",
+            "style" : {
+                "navigationBarTitleText" : "家人管理"
+            }
+        },
+        {
+            "path" : "pages/myFamily/addFamily/addFamily",
+            "style" : {
+                "navigationBarTitleText" : "添加家人"
+            }
+        },
+        {
+            "path" : "pages/myFamily/editFamily/editFamily",
+            "style" : {
+                "navigationBarTitleText" : "编辑家人"
+            }
+        },
+        {
+            "path" : "pages/myFamily/editApplyFamily/editApplyFamily",
+            "style" : {
+                "navigationBarTitleText" : "编辑申请"
+            }
+        },
+        {
+            "path" : "pages/myFamily/activateFace/activateFace",
+            "style" : {
+                "navigationBarTitleText" : ""
+            }
+        },
+        {
+            "path" : "pages/bluetooth/bluetooth",
+            "style" : {
+                "navigationBarTitleText" : "蓝牙开门"
+            }
+        },
+        {
+            "path" : "pages/choosePlot/choosePlot",
+            "style" : {
+                "navigationBarTitleText" : "选择小区"
+            }
+        },
+        {
+            "path" : "pages/choosePlot/chooseUnit/chooseUnit",
+            "style" : {
+                "navigationBarTitleText" : "选择楼栋"
+            }
+        },
+        {
+            "path" : "pages/choosePlot/chooseRoom/chooseRoom",
+            "style" : {
+                "navigationBarTitleText" : "选择房间"
+            }
+        },
+        {
+            "path" : "pages/choosePlot/householdCert/householdCert",
+            "style" : {
+                "navigationBarTitleText" : "用户认证"
+            }
+        },
+        {
+            "path" : "pages/myPassword/myPassword",
+            "style" : {
+                "navigationBarTitleText" : "访客密码"
+            }
+        },
+        {
+            "path" : "pages/oneButton/oneButton",
+            "style" : {
+                "navigationBarTitleText" : "一键开门"
+            }
+        },
+        {
+            "path" : "pages/record/record",
+            "style" : {
+                "navigationBarTitleText" : "访客记录"
+            }
+        },
+        {
+            "path" : "pages/switchcity/switchcity",
+            "style" : {
+                "navigationBarTitleText" : "选择城市"
+            }
+        },
+        {
+            "path" : "pages/uploadFace/uploadFace",
+            "style" : {
+                "navigationBarTitleText" : ""
+            }
+        },
+        {
             "path" : "pages/demo/myfamily",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/demo/demo1",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "添加家人",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "添加家人",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/myhome/familyList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的家人",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "我的家人",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/demo/demo2",
-            "style" :                                                                                    
-            {
-				"navigationStyle":"custom",
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationStyle" : "custom",
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/auth/auth",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "房屋认证",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "房屋认证",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/device/device",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我家",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "我家",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/wode/wode",
-            "style" :                                                                                    
-            {
-				"navigationStyle":"custom",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationStyle" : "custom",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/empty/empty",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "用户注册",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "用户注册",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/empty/goauth",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "审核状态",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "审核状态",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/myFamily/add/add",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "添加家人",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "添加家人",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/my-camera/my-camera",
-            "style" :                                                                                    
-            {
-				// "navigationBarTextStyle": "white",
-				// "navigationBarBackgroundColor": "#000",
-				"navigationBarTitleText": "相片拍摄"
+            "style" : {
+                // "navigationBarTextStyle": "white",
+                // "navigationBarBackgroundColor": "#000",
+                "navigationBarTitleText" : "相片拍摄"
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/demo/demo4",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/demand/list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "需求大厅",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "需求大厅",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/demand/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "需求详情",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "需求详情",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/demand/publish",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的需求信息",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "我的需求信息",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/delivery/delivery",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "代领快递",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "代领快递",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/community/community",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "社区",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "社区",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-		,{
-		    "path" : "pages/wode/feedback/feedback",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "用户反馈",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
+        },
+        {
+            "path" : "pages/wode/feedback/feedback",
+            "style" : {
+                "navigationBarTitleText" : "用户反馈",
+                "enablePullDownRefresh" : false
+            }
+        },
+        {
             "path" : "pages/notice/notice",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "通知公告"
+            "style" : {
+                "navigationBarTitleText" : "通知公告"
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/notice/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "公告详情",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "公告详情",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-  
-        ,{
+        },
+        {
             "path" : "pages/tool-list/epidemic-pass/epidemic-pass",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "防疫通行",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "防疫通行",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/tool-list/epidemic-pass/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "出入通行证",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "出入通行证",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/tool-list/tool-list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "功能列表",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "功能列表",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/demo/demo5",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "访客开门",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "访客开门",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/property/property",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "物业报修",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "物业报修",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/property/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "物业报修",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "物业报修",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/property/list/list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的报修",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "我的报修",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/guide/guide_old",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/services/property/comment",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "物业评价",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "物业评价",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/guest/guest",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "访客授权",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "访客授权",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/guest/open_door",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "访客开门",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "访客开门",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/demo/demo6",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "会员登陆",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "会员登陆",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/guest/guest_form",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "来访登记",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "来访登记",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/community/detail/elderlyDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "老人抓拍详情",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "老人抓拍详情",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/community/detail/carDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "车辆抓拍详情",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "车辆抓拍详情",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/develop/develop",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "即将开放",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "即将开放",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/choosePlot/chooseBuilding/chooseBuilding",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择楼栋",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "选择楼栋",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/tool-list/epidemic-pass/list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "登记记录",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "登记记录",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/healthCode/healthCode",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "防疫健康码",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "防疫健康码",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/myFamily/audit-detail/audit-detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "住户审核",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "住户审核",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/wode/travelRecord/travelRecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "出入记录",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "出入记录",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/myCar/myCar",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的车辆",
-				"enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "我的车辆",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/myCar/add",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "添加车辆",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "添加车辆",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/device/records",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备告警记录",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "设备告警记录",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/test4/test4",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
             }
-            
-        }
-        ,{
+        },
+        {
             "path" : "pages/bindRoom/bindRoom",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "绑定房间",
-                "enablePullDownRefresh": false
+            "style" : {
+                "navigationBarTitleText" : "绑定房间",
+                "enablePullDownRefresh" : false
             }
-            
         }
     ],
-	 "subPackages": [{
-	 	"root": "pagesM/",
-	 	"pages": [
-				{
-				    "path" : "pages/goods_des",
-				    "style" : {
-				        "navigationBarTitleText" : "商品详情",
-				        "backgroundColor" : "#F2F2F2"
-				    }
-				},
-				{
-					"path" : "pages/search",
-					"style" : {
-						"navigationBarTitleText" : "搜索商品",
-						"backgroundColor" : "#F2F2F2"
-					}
-				},
-				
-				{
-				    "path" : "pages/category",
-				    "style" : {
-				        "navigationBarTitleText" : "分类",
-				        "navigationBarTextStyle" : "#FFFFFF",
-				        "navigationBarBackgroundColor" : "#E42F2F"
-				    }
-				},
-				{
-				    "path" : "pages/shop_car",
-				    "style" : {
-				        "navigationBarTitleText" : "购物车"
-				    }
-				},
-				{
-				    "path" : "pages/mine",
-				    "style" : {
-				        // "navigationBarTitleText": "我的",
-				        // "navigationBarTextStyle": "white",
-				        // "navigationBarBackgroundColor": "#E42F2F",
-				        // "backgroundColorTop":"#E42F2F",
-				        "enablePullDownRefresh" : true,
-				        "navigationStyle" : "custom"
-				    }
-				},
-				{
-				    "path" : "pages/mine_income",
-				    "style" : {
-				        "navigationBarTitleText" : "团长收益"
-				    }
-				},
-				{
-				    "path" : "pages/applyToPromotion",
-				    "style" : {
-				        "navigationBarTitleText" : "团长申请"
-				    }
-				},
-				{
-				    "path" : "pages/mine_collection",
-				    "style" : {
-				        "navigationBarTitleText" : "我的收藏"
-				    }
-				},
-				{
-				    "path" : "pages/address_list",
-				    "style" : {
-				        "navigationBarTitleText" : "我的地址"
-				    }
-				},
-				{
-				    "path" : "pages/address_edit",
-				    "style" : {
-				        "navigationBarTitleText" : "编辑地址"
-				    }
-				},
-				{
-				    "path" : "pages/coupon_list",
-				    "style" : {
-				        "navigationBarTitleText" : "我的优惠券"
-				    }
-				},
-				{
-				    "path" : "pages/coupon_select",
-				    "style" : {
-				        "navigationBarTitleText" : "选择优惠券"
-				    }
-				},
-				{
-				    "path" : "pages/coupon_center",
-				    "style" : {
-				        "navigationBarTitleText" : "领券中心"
-				    }
-				},
-				{
-				    "path" : "pages/integral",
-				    "style" : {
-				        "navigationBarTitleText" : "我的积分"
-				    }
-				},
-				{
-				    "path" : "pages/integral_list",
-				    "style" : {
-				        "navigationBarTitleText" : "积分明细"
-				    }
-				},
-				{
-				    "path" : "pages/integral_exchange",
-				    "style" : {
-				        "navigationBarTitleText" : "兑换详情"
-				    }
-				},
-				{
-				    "path" : "pages/mine_setting",
-				    "style" : {
-				        "navigationBarTitleText" : "系统设置"
-				    }
-				},
-				{
-				    "path" : "pages/mine_protocal",
-				    "style" : {
-				        "navigationBarTitleText" : "用户协议"
-				    }
-				},
-				{
-				    "path" : "pages/mine_info",
-				    "style" : {
-				        "navigationBarTitleText" : "个人信息"
-				    }
-				},
-				{
-				    "path" : "pages/mine_interest",
-				    "style" : {
-				        "navigationBarTitleText" : "会员权益"
-				    }
-				},
-				{
-				    "path" : "pages/mine_order_list",
-				    "style" : {
-				        "navigationBarTitleText" : "我的订单",
-				        "enablePullDownRefresh" : true
-				    }
-				},
-				{
-				    "path" : "pages/mine_sale_list",
-				    "style" : {
-				        "navigationBarTitleText" : "我的售后"
-				    }
-				},
-				{
-				    "path" : "pages/after_sale_choose",
-				    "style" : {
-				        "navigationBarTitleText" : "选择申请售后货物"
-				    }
-				},
-				{
-				    "path" : "pages/after_sale_apply",
-				    "style" : {
-				        "navigationBarTitleText" : "申请售后"
-				    }
-				},
-				{
-				    "path" : "pages/after_sale_submit",
-				    "style" : {
-				        "navigationBarTitleText" : "申请售后"
-				    }
-				},
-				{
-				    "path" : "pages/goods_manual",
-				    "style" : {
-				        "navigationBarTitleText" : "说明书",
-				        "backgroundColor" : "#F2F2F2"
-				    }
-				},
-				{
-				    "path" : "pages/goods_comment_list",
-				    "style" : {
-				        "navigationBarTitleText" : "全部评价",
-				        "backgroundColor" : "#F2F2F2"
-				    }
-				},
-				{
-				    "path" : "pages/goods_list",
-				    "style" : {
-				        "navigationBarTitleText" : "商品列表",
-				        "navigationBarBackgroundColor" : "#FFFFFF",
-						"navigationStyle" : "custom"
-				    }
-				},
-				{
-				    "path" : "pages/order_confirm",
-				    "style" : {
-				        "navigationBarTitleText" : "确认下单",
-				        "backgroundColor" : "#F2F2F2"
-				    }
-				},
-				{
-				    "path" : "pages/order_pay",
-				    "style" : {
-				        "navigationBarTitleText" : "在线支付",
-				        "backgroundColor" : "#F2F2F2"
-				    }
-				},
-				{
-				    "path" : "pages/pay_success",
-				    "style" : {
-				        "navigationBarTitleText" : "支付成功",
-				        "backgroundColor" : "#F2F2F2"
-				    }
-				},
-				{
-				    "path" : "pages/mention_store_list",
-				    "style" : {
-				        "navigationBarTitleText" : "选择提货门店",
-				        "backgroundColor" : "#F2F2F2"
-				    }
-				},
-				{
-				    "path" : "pages/order_appraise",
-				    "style" : {
-				        "navigationBarTitleText" : "填写评价"
-				    }
-				},
-				{
-				    "path" : "pages/order_detail",
-				    "style" : {
-				        "navigationBarTitleText" : "订单详情",
-				        "navigationBarTextStyle" : "white",
-				        "navigationBarBackgroundColor" : "#2f7ff5"
-				    }
-				},
-				{
-				    "path" : "pages/order_sale_detail",
-				    "style" : {
-				        "navigationBarTitleText" : "售后详情",
-				        "navigationBarTextStyle" : "white",
-				        "navigationBarBackgroundColor" : "#E42F2F"
-				    }
-				},
-				{
-				    "path" : "pages/common/webview",
-				    "style" : {}
-				},
-				{
-				    "path" : "pages/my_integral",
-				    "style" : {
-				        "navigationBarTitleText" : "我的积分"
-				    }
-				},
-				{
-				    "path" : "pages/share_team",
-				    "style" : {
-				        "navigationBarTitleText" : "我的分享团队"
-				    }
-				},
-				{
-				    "path" : "pages/my_earnings",
-				    "style" : {
-				        "navigationBarTitleText" : "我的分享团队"
-				    }
-				},
-				{
-				    "path" : "pages/share_team_goods",
-				    "style" : {
-				        "navigationBarTitleText" : "我的分享团队"
-				    }
-				},
-				{
-				    "path" : "pages/earn_records",
-				    "style" : {
-				        "navigationBarTitleText" : "收益记录"
-				    }
-				},
-				{
-				    "path" : "pages/earn_details",
-				    "style" : {
-				        "navigationBarTitleText" : "收益详情"
-				    }
-				},
-				{
-				    "path" : "pages/balance_records",
-				    "style" : {
-				        "navigationBarTitleText" : "结算记录"
-				    }
-				},
-				{
-				    "path" : "pages/my_invite",
-				    "style" : {
-				        "navigationBarTitleText" : "我邀请的人"
-				    }
-				},
-				{
-				    "path" : "pages/user_invite",
-				    "style" : {
-				        "navigationBarTitleText" : ""
-				    }
-				},
-				{
-				    "path" : "pages/discounts_goods",
-				    "style" : {
-				        "navigationBarTitleText" : "分销商品"
-				    }
-				},
-				{
-				    "path" : "pages/common/ad_textView",
-				    "style" : {}
-				},
-				{
-				    "path" : "comps/tki_qrcode",
-				    "style" : {}
-				},
-				{
-				    "path" : "pages/nearby_team",
-				    "style" : {
-				        "navigationBarTitleText" : "附近团长"
-				    }
-				},
-				{
-				    "path" : "comps/promotion_detail",
-				    "style" : {}
-				},
-				{
-				    "path" : "pages/claim_goods",
-				    "style" : {
-				        "navigationBarTitleText" : "快速取货"
-				    }
-				},
-				{
-				    "path" : "pages/nearby_team_map",
-				    "style" : {
-				        "navigationBarTitleText" : "附近团长"
-				    }
-				},
-				{
-				    "path" : "pages/about_us",
-				    "style" : {
-				        "navigationBarTitleText" : "关于新邻"
-				    }
-				},
-				{
-				    "path" : "pages/ad_apply_organ",
-				    "style" : {
-				        "navigationBarTitleText" : "申请团长"
-				    }
-				},
-				{
-				    "path" : "pages/browse_records",
-				    "style" : {
-				        "navigationBarTitleText" : "浏览记录"
-				    }
-				},
-				{
-				    "path" : "comps/dt_goods_list_home",
-				    "style" : {}
-				}
-				,{
-				    "path" : "comps/dt_special",
-				    "style" : {}
-				}
+    "subPackages" : [
+        {
+            "root" : "pagesM/",
+            "pages" : [
+                {
+                    "path" : "pages/goods_des",
+                    "style" : {
+                        "navigationBarTitleText" : "商品详情",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/search",
+                    "style" : {
+                        "navigationBarTitleText" : "搜索商品",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/category",
+                    "style" : {
+                        "navigationBarTitleText" : "分类",
+                        "navigationBarTextStyle" : "#FFFFFF",
+                        "navigationBarBackgroundColor" : "#E42F2F"
+                    }
+                },
+                {
+                    "path" : "pages/shop_car",
+                    "style" : {
+                        "navigationBarTitleText" : "购物车"
+                    }
+                },
+                {
+                    "path" : "pages/mine",
+                    "style" : {
+                        // "navigationBarTitleText": "我的",
+                        // "navigationBarTextStyle": "white",
+                        // "navigationBarBackgroundColor": "#E42F2F",
+                        // "backgroundColorTop":"#E42F2F",
+                        "enablePullDownRefresh" : true,
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "pages/mine_income",
+                    "style" : {
+                        "navigationBarTitleText" : "团长收益"
+                    }
+                },
+                {
+                    "path" : "pages/applyToPromotion",
+                    "style" : {
+                        "navigationBarTitleText" : "团长申请"
+                    }
+                },
+                {
+                    "path" : "pages/mine_collection",
+                    "style" : {
+                        "navigationBarTitleText" : "我的收藏"
+                    }
+                },
+                {
+                    "path" : "pages/address_list",
+                    "style" : {
+                        "navigationBarTitleText" : "我的地址"
+                    }
+                },
+                {
+                    "path" : "pages/address_edit",
+                    "style" : {
+                        "navigationBarTitleText" : "编辑地址"
+                    }
+                },
+                {
+                    "path" : "pages/coupon_list",
+                    "style" : {
+                        "navigationBarTitleText" : "我的优惠券"
+                    }
+                },
+                {
+                    "path" : "pages/coupon_select",
+                    "style" : {
+                        "navigationBarTitleText" : "选择优惠券"
+                    }
+                },
+                {
+                    "path" : "pages/coupon_center",
+                    "style" : {
+                        "navigationBarTitleText" : "领券中心"
+                    }
+                },
+                {
+                    "path" : "pages/integral",
+                    "style" : {
+                        "navigationBarTitleText" : "我的积分"
+                    }
+                },
+                {
+                    "path" : "pages/integral_list",
+                    "style" : {
+                        "navigationBarTitleText" : "积分明细"
+                    }
+                },
+                {
+                    "path" : "pages/integral_exchange",
+                    "style" : {
+                        "navigationBarTitleText" : "兑换详情"
+                    }
+                },
+                {
+                    "path" : "pages/mine_setting",
+                    "style" : {
+                        "navigationBarTitleText" : "系统设置"
+                    }
+                },
+                {
+                    "path" : "pages/mine_protocal",
+                    "style" : {
+                        "navigationBarTitleText" : "用户协议"
+                    }
+                },
+                {
+                    "path" : "pages/mine_info",
+                    "style" : {
+                        "navigationBarTitleText" : "个人信息"
+                    }
+                },
+                {
+                    "path" : "pages/mine_interest",
+                    "style" : {
+                        "navigationBarTitleText" : "会员权益"
+                    }
+                },
+                {
+                    "path" : "pages/mine_order_list",
+                    "style" : {
+                        "navigationBarTitleText" : "我的订单",
+                        "enablePullDownRefresh" : true
+                    }
+                },
+                {
+                    "path" : "pages/mine_sale_list",
+                    "style" : {
+                        "navigationBarTitleText" : "我的售后"
+                    }
+                },
+                {
+                    "path" : "pages/after_sale_choose",
+                    "style" : {
+                        "navigationBarTitleText" : "选择申请售后货物"
+                    }
+                },
+                {
+                    "path" : "pages/after_sale_apply",
+                    "style" : {
+                        "navigationBarTitleText" : "申请售后"
+                    }
+                },
+                {
+                    "path" : "pages/after_sale_submit",
+                    "style" : {
+                        "navigationBarTitleText" : "申请售后"
+                    }
+                },
+                {
+                    "path" : "pages/goods_manual",
+                    "style" : {
+                        "navigationBarTitleText" : "说明书",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/goods_comment_list",
+                    "style" : {
+                        "navigationBarTitleText" : "全部评价",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/goods_list",
+                    "style" : {
+                        "navigationBarTitleText" : "商品列表",
+                        "navigationBarBackgroundColor" : "#FFFFFF",
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "pages/order_confirm",
+                    "style" : {
+                        "navigationBarTitleText" : "确认下单",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/order_pay",
+                    "style" : {
+                        "navigationBarTitleText" : "在线支付",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/pay_success",
+                    "style" : {
+                        "navigationBarTitleText" : "支付成功",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/mention_store_list",
+                    "style" : {
+                        "navigationBarTitleText" : "选择提货门店",
+                        "backgroundColor" : "#F2F2F2"
+                    }
+                },
+                {
+                    "path" : "pages/order_appraise",
+                    "style" : {
+                        "navigationBarTitleText" : "填写评价"
+                    }
+                },
+                {
+                    "path" : "pages/order_detail",
+                    "style" : {
+                        "navigationBarTitleText" : "订单详情",
+                        "navigationBarTextStyle" : "white",
+                        "navigationBarBackgroundColor" : "#2f7ff5"
+                    }
+                },
+                {
+                    "path" : "pages/order_sale_detail",
+                    "style" : {
+                        "navigationBarTitleText" : "售后详情",
+                        "navigationBarTextStyle" : "white",
+                        "navigationBarBackgroundColor" : "#E42F2F"
+                    }
+                },
+                {
+                    "path" : "pages/common/webview",
+                    "style" : {}
+                },
+                {
+                    "path" : "pages/my_integral",
+                    "style" : {
+                        "navigationBarTitleText" : "我的积分"
+                    }
+                },
+                {
+                    "path" : "pages/share_team",
+                    "style" : {
+                        "navigationBarTitleText" : "我的分享团队"
+                    }
+                },
+                {
+                    "path" : "pages/my_earnings",
+                    "style" : {
+                        "navigationBarTitleText" : "我的分享团队"
+                    }
+                },
+                {
+                    "path" : "pages/share_team_goods",
+                    "style" : {
+                        "navigationBarTitleText" : "我的分享团队"
+                    }
+                },
+                {
+                    "path" : "pages/earn_records",
+                    "style" : {
+                        "navigationBarTitleText" : "收益记录"
+                    }
+                },
+                {
+                    "path" : "pages/earn_details",
+                    "style" : {
+                        "navigationBarTitleText" : "收益详情"
+                    }
+                },
+                {
+                    "path" : "pages/balance_records",
+                    "style" : {
+                        "navigationBarTitleText" : "结算记录"
+                    }
+                },
+                {
+                    "path" : "pages/my_invite",
+                    "style" : {
+                        "navigationBarTitleText" : "我邀请的人"
+                    }
+                },
+                {
+                    "path" : "pages/user_invite",
+                    "style" : {
+                        "navigationBarTitleText" : ""
+                    }
+                },
+                {
+                    "path" : "pages/discounts_goods",
+                    "style" : {
+                        "navigationBarTitleText" : "分销商品"
+                    }
+                },
+                {
+                    "path" : "pages/common/ad_textView",
+                    "style" : {}
+                },
+                {
+                    "path" : "comps/tki_qrcode",
+                    "style" : {}
+                },
+                {
+                    "path" : "pages/nearby_team",
+                    "style" : {
+                        "navigationBarTitleText" : "附近团长"
+                    }
+                },
+                {
+                    "path" : "comps/promotion_detail",
+                    "style" : {}
+                },
+                {
+                    "path" : "pages/claim_goods",
+                    "style" : {
+                        "navigationBarTitleText" : "快速取货"
+                    }
+                },
+                {
+                    "path" : "pages/nearby_team_map",
+                    "style" : {
+                        "navigationBarTitleText" : "附近团长"
+                    }
+                },
+                {
+                    "path" : "pages/about_us",
+                    "style" : {
+                        "navigationBarTitleText" : "关于新邻"
+                    }
+                },
+                {
+                    "path" : "pages/ad_apply_organ",
+                    "style" : {
+                        "navigationBarTitleText" : "申请团长"
+                    }
+                },
+                {
+                    "path" : "pages/browse_records",
+                    "style" : {
+                        "navigationBarTitleText" : "浏览记录"
+                    }
+                },
+                {
+                    "path" : "comps/dt_goods_list_home",
+                    "style" : {}
+                },
+                {
+                    "path" : "comps/dt_special",
+                    "style" : {}
+                }
             ]
-	  }],
-	  "preloadRule":{
-		  "pages/life/life": {
-		    "network": "all",
-		    "packages": ["pagesM"]
-		  },
-		  "pages/index/index": {
-		    "network": "all",
-		    "packages": ["pagesM"]
-		  }
-	  },
-	 "tabBar": {
-		  "color":"#8a8a8a",
-		  "backgroundColor":"#FFFFFF",
-		  "borderStyle":"white",
-		  "selectedColor":"#59a5f0",
-		  "list": [
-			{
-			  "pagePath": "pages/index/index",
-			  "text": "小区",
-			  "selectedIconPath":"static/tarbar/home.png",
-			  "iconPath":"static/tarbar/home0.png"
-			},
-			{
-			  "pagePath": "pages/device/device",
-			  "text": "我家",
-			  "selectedIconPath":"static/tarbar/zhijia.png",
-			  "iconPath":"static/tarbar/zhijia0.png"
-			},
-			{
-			  "pagePath": "pages/wode/wode",
-			  "text": "我的",
-			  "selectedIconPath":"static/tarbar/my.png",
-			  "iconPath":"static/tarbar/my0.png"
-			}
-		  ]
-	  },
-	"globalStyle": {
-		"navigationBarTitleText": "新邻社区",
-		"backgroundColor": "#FFFFFF",
-		"navigationBarBackgroundColor":"#FFFFFF",
-		"navigationBarTextStyle":"black"
-	},
-	"navigateToMiniProgramAppIdList" : [ "wx90680ffd54c3b96c" ]
+        }
+    ],
+    "preloadRule" : {
+        "pages/life/life" : {
+            "network" : "all",
+            "packages" : [ "pagesM" ]
+        },
+        "pages/index/index" : {
+            "network" : "all",
+            "packages" : [ "pagesM" ]
+        }
+    },
+    "tabBar" : {
+        "color" : "#8a8a8a",
+        "backgroundColor" : "#FFFFFF",
+        "borderStyle" : "white",
+        "selectedColor" : "#59a5f0",
+        "list" : [
+            {
+                "pagePath" : "pages/index/index",
+                "text" : "小区",
+                "selectedIconPath" : "static/tarbar/home.png",
+                "iconPath" : "static/tarbar/home0.png"
+            },
+            {
+                "pagePath" : "pages/device/device",
+                "text" : "我家",
+                "selectedIconPath" : "static/tarbar/zhijia.png",
+                "iconPath" : "static/tarbar/zhijia0.png"
+            },
+            {
+                "pagePath" : "pages/wode/wode",
+                "text" : "我的",
+                "selectedIconPath" : "static/tarbar/my.png",
+                "iconPath" : "static/tarbar/my0.png"
+            }
+        ]
+    },
+    "globalStyle" : {
+        "navigationBarTitleText" : "新邻社区",
+        "backgroundColor" : "#FFFFFF",
+        "navigationBarBackgroundColor" : "#FFFFFF",
+        "navigationBarTextStyle" : "black"
+    },
+    "condition" : {
+        //模式配置，仅开发期间生效
+        "current" : 0, //当前激活的模式(list 的索引项)
+        "list" : [
+            {
+                "name" : "", //模式名称
+                "path" : "", //启动页面，必选
+                "query" : "" //启动参数，在页面的onLoad函数里面得到
+            }
+        ]
+    },
+    "navigateToMiniProgramAppIdList" : [ "wx90680ffd54c3b96c" ]
 }

pages/device/device.vue

@@ -1,9 +1,10 @@
 <template>
 	<view :class="$isEmpty(deviceList) ? 'bg-white':''">
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
-			<device-card  :list="deviceList" ></device-card>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+			:up="upOption">
+			<device-card :list="deviceList"></device-card>
 		</mescroll-body>
-		<view class="footer-fixed">
+		<view class="footer-fixed" v-if="$isNotEmpty(deviceList)">
 			<view class="margin">
 				<u-button type="primary" shape="circle" @click="subscribeMessage">订阅设备告警通知</u-button>
 			</view>
@@ -18,16 +19,17 @@
 	import DtEmpty from '@/comps/dt_empty.vue';
 	export default {
 		mixins: [MescrollMixin], // 使用mixin
-		components:{
-			DeviceCard,DtEmpty
+		components: {
+			DeviceCard,
+			DtEmpty
 		},
 		data() {
 			return {
-				deviceList:[],
+				deviceList: [],
 			}
 		},
 		onLoad() {
-			
+
 		},
 		methods: {
 			//订阅消息通知
@@ -37,28 +39,30 @@
 			downCallback(mescroll) {
 				setTimeout(() => {
 					this.mescroll.resetUpScroll()
-				},1500)
+				}, 200)
 			},
 			upCallback(mescroll) {
+				let residentialId=uni.getStorageSync("residentialId")
+				if (this.$isEmpty(this.vuex_member)||this.$isEmpty(residentialId)) {
+					this.mescroll.endErr()
+					return
+				}
 				let that = this;
 				let params = {
-					memberId: app.globalData.member.id,
-					residentialId: uni.getStorageSync("residentialId")
-				};
-				// let operation = 'device/list';
+					memberId: this.vuex_member.id,
+					residentialId
+				}
 				try {
-					that.$http.iotDeviceList(params).then(res=>{
+					that.$http.iotDeviceList(params).then(res => {
 						let data = res.data.iotDevices;
-							// let total = res.data.carPage.total;
-							// mescroll.endBySize(data.length, total);
-							mescroll.endSuccess(data.length);
-							if (mescroll.num == 1) {
-								that.deviceList = []; //如果是第一页需手动制空列表
-							}
-							that.deviceList = that.deviceList.concat(data); //追加新数据
-						});
-						
-				} catch(e) {
+						mescroll.endSuccess(data.length);
+						if (mescroll.num == 1) {
+							that.deviceList = []; //如果是第一页需手动制空列表
+						}
+						that.deviceList = that.deviceList.concat(data); //追加新数据
+					});
+
+				} catch (e) {
 					this.mescroll.endErr()
 				}
 			}

pages/empty/empty.vue

@@ -1,82 +1,26 @@
 <template>
-	<view style="background-color: #fff;min-height: 100vh;">
-		<view class="default">
-			<image src="/static/common/empty.png"></image>
-			<view style="font-size: 26rpx;">
-		 	<text style="color: #909090;">{{msg}}</text>
-			</view>
-			<navigator :url="url" class="cu-btn sm  margin-top-50"
-				style="padding: 35rpx 65rpx;margin-left: 8rpx;background-color: #FFFFFF;border: 1rpx solid #d0d0d0;color: #606266;font-size: 26rpx;">
-				{{btnName}}
-			</navigator>
-		</view>
+	<view class="">
+		<auth :type="type"></auth>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				msg: "您还未完成注册认证",
-				btnName: "去注册认证",
-				url: "../register/register"
-			}
-		},
-		onLoad(options) {
-			if (options.type == '2') {
-				this.getHouseUser()
-				this.initData()
-			}
-		},
-		methods: {
-			initData() {
-				//导航栏标题
-				uni.setNavigationBarTitle({
-					title: "房屋认证"
-				})
-				//去认证
-				this.msg = "您还未完成房屋认证"
-				this.btnName = "去认证"
-			},
-			async getHouseUser() {
-				let member = getApp().globalData.member
-				if (this.$isEmpty(member)) {
-					this.url = "../auth/auth"
-					return
-				}
-				let params = {
-					name: member.name,
-					phone: member.tel
-				}
-				let res = await this.$http.getHouseUserCondition(params)
-				let list = res.data.data
-				if (this.$isEmpty(list)) {
-					this.url = "../auth/auth"
-					return
-				}
-				uni.setStorageSync('houseList', list)
-				this.url = "../bindRoom/bindRoom"
-			}
-		}
+import auth from "@/comps/auth.vue"
+export default {
+	components:{
+		auth
+	},
+	data() {
+		return {
+			type:null
+		};
+	},
+	onLoad(options) {
+		this.type=options.type
 	}
+};
 </script>
 
-<style lang="scss">
-	.default {
-		text-align: center;
-		position: fixed;
-		left: 50%;
-		top: 40%;
-		transform: translate(-50%, -70%);
-	}
-
-	.default text {
-		color: #AAAAAA;
-	}
-
-	.default image {
-		height: 180rpx;
-		width: 180rpx;
-		display: inline-block;
-	}
-</style>
+<style lang="scss" scoped>
+	
+</style>

pages/index/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content bg-white" style="min-height: 100vh;">
 		<view class="">
 			<loading isFullScreen color="#2f7ff5" :active="isloading" text="开门中..."></loading>
 			<u-navbar :is-back="false" title=" ">
@@ -824,7 +824,7 @@
 					if (res.data.result_code == 1) {
 						let member = res.data.member; //待审核
 						if (member.state == 1 && !res.data.anyHousePass) {
-							app.globalData.oneFailHint('亲，你的信息正在审核，请耐心等待');
+							app.globalData.oneFailHint('你的信息正在审核，请耐心等待');
 						} else if (member.state == 2) {
 							app.globalData.oneFailHint('亲，你的信息已审核通过');
 							that.getResidentialListByMember()

pages/life/life.vue

@@ -372,7 +372,6 @@ export default {
   methods: {
 	  // 跳转搜索
 	  jumpSearch(item) {
-		  console.log(item)
 	    if (!item) {
 	      uni.navigateTo({
 	        url: "/pagesM/pages/search"
@@ -487,7 +486,6 @@ export default {
     },
     // 登录成功响应事件
     onSignIn(resp) {
-      // console.log(143, resp)
       this.$util.refreshPage(['pages/home', 'pages/shop_car'])
       this.onPullDownRefreshPage()
     },

pages/myCar/add.vue

@@ -10,13 +10,13 @@
 					<u-form-item :required="true"  :label-width="labelWidth"   label="车牌号码" >
 						<u-input  type="text"  v-model="model.number" disabled @click="openKeyBoard"  placeholder="请填写车牌号码" ></u-input>
 					</u-form-item>
-					<u-form-item :required="true"  :label-width="labelWidth"   label="车辆类型" >
+					<u-form-item   :label-width="labelWidth"   label="车辆类型" >
 						<u-input  type="select" :select-open="carTypeShow" v-model="carTypeLabel"  placeholder="请选择车辆类型" @click="carTypeShow=true"></u-input>
 					</u-form-item>
-					<u-form-item :required="true"  :label-width="labelWidth"   label="车辆性质" >
+					<u-form-item   :label-width="labelWidth"   label="车辆性质" >
 						<u-input  type="select" :select-open="carPropertiesShow" v-model="carPropertiesLabel" placeholder="请选择车辆性质" @click="carPropertiesShow=true"></u-input>
 					</u-form-item>
-					<u-form-item :required="true"  :label-width="labelWidth"   label="燃油类别" >
+					<u-form-item   :label-width="labelWidth"   label="燃油类别" >
 						<u-input  type="select" :select-open="fuelCategoryShow" v-model="fuelCategoryLabel" placeholder="请选择燃油类别" @click="fuelCategoryShow=true"></u-input>
 					</u-form-item>
 				</u-form>
@@ -26,6 +26,7 @@
 			<view class="flex">
 				<image style="width: 35rpx;height: 35rpx;display: block;padding-top: 6rpx;padding-right: 10rpx;" src="/static/myCar/tag1.png" mode=""></image>
 				<text class="text-lg text-bold">请上传车辆照片</text>
+				<text class="text-sm text-gray margin-top-10">(必填)</text>
 			</view>
 			<view class="card">
 				<view style="padding: 20rpx 0;" @click="chooseImage(1)"  class="flex justify-center ">
@@ -50,6 +51,7 @@
 			<view class="flex">
 				<image style="width: 35rpx;height: 35rpx;display: block;padding-top: 6rpx;padding-right: 10rpx;" src="/static/myCar/tag1.png" mode=""></image>
 				<text class="text-lg text-bold">请上传行驶证正面</text>
+				<text class="text-sm text-gray margin-top-10">(选填)</text>
 			</view>
 			<view class="card">
 				<view style="padding: 20rpx 0;" @click="chooseImage(2)"  class="flex justify-center ">
@@ -74,6 +76,7 @@
 			<view class="flex">
 				<image style="width: 35rpx;height: 35rpx;display: block;padding-top: 6rpx;padding-right: 10rpx;" src="/static/myCar/tag1.png" mode=""></image>
 				<text class="text-lg text-bold">请上传行驶证反面</text>
+				<text class="text-sm text-gray margin-top-10">(选填)</text>
 			</view>
 			<view class="card">
 				<view style="padding: 20rpx 0;" @click="chooseImage(3)"  class="flex justify-center ">
@@ -100,7 +103,7 @@
 			<view class="" @click="submit" style="width: 90%;margin: 0 auto ;margin-bottom: 10%;">
 				<view  class="cu-btn round base-bg-color" style="padding: 40rpx;width: 100%;" >
 					<text class="cuIcon-add"></text>
-					<text v-text="model.id?'重新审核':'确认添加'"></text>
+					<text >确认添加</text>
 				</view>
 			</view>
 		</view>
@@ -154,6 +157,7 @@
 					vehicleDrivingLicense2:'',//行驶证反面
 					personId:'',
 					residentialId:'',
+					tenantType:0
 				},
 			}
 		},
@@ -206,36 +210,16 @@
 					this.$u.toast('请填写车牌号')
 					return
 				}
-				if (this.$isEmpty(this.model.type)) {
-					this.$u.toast('请选择车辆类型')
-					return
-				}
-				if (this.$isEmpty(this.model.properties)) {
-					this.$u.toast('请选择车辆性质')
-					return
-				}
-				if (this.$isEmpty(this.model.fuelCategory)) {
-					this.$u.toast('请选择燃油类型')
-					return
-				}
 				if (this.$isEmpty(this.model.carImg)) {
 					this.$u.toast('请上传车辆照片')
 					return
 				}
-				if (this.$isEmpty(this.model.vehicleDrivingLicense1)) {
-					this.$u.toast('请上传行驶证正面')
-					return
-				}
-				if (this.$isEmpty(this.model.vehicleDrivingLicense2)) {
-					this.$u.toast('请上传行驶证反面')
-					return
-				}
 				let that = this;
 				this.model.residentialId = uni.getStorageSync('residentialId')
-				console.log(this.model,1111)
-				// let operation = 'car/saveOrUpdate';
+				this.model.personId=this.vuex_member.id
+				this.model.personName=this.vuex_member.name
+				this.model.personPhone=this.vuex_member.phone
 				that.$http.saveOrUpdateCar(this.model).then (res=>{
-					console.log(res);
 					if (res.data.result) {
 						that.$util.showModal('操作成功！',false).then(res=>{
 							that.$util.isReloadAndBack()

pages/myCar/myCar.vue

@@ -2,7 +2,7 @@
 	<view :class="$isEmpty(list) ? 'bg-white':''">
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
 			<!-- <myCarCard @delItem="delItem" :list="list"></myCarCard> -->
-			<u-popup v-model="detailShow" mode="center" width="670" :closeable="true" border-radius="10">
+			<u-popup v-model="detailShow" mode="center" width="670" :closeable="true" border-radius="10" negative-top="300">
 				<view style="padding: 60rpx 5rpx 40rpx;">
 					<u-cell-group >
 						<u-cell-item :icon-style="iconStyle"  :border-top="false" :arrow="false"  icon="eye-fill"  title="车牌号码:" :value="detailData.number"></u-cell-item>
@@ -11,16 +11,6 @@
 						<u-cell-item value-style="{'color':'#5064eb'}" :key="index" v-for="(item,index) in fuelCategoryList"  v-if="item.value==detailData.fuelCategory"  :value="item.label" :icon-style="iconStyle"  :border-bottom="false" :arrow="false"  icon="grid-fill"  title="燃油类别:" ></u-cell-item>
 						<u-cell-item v-if="detailData.opinion" :icon-style="iconStyle"  :border-top="false" :arrow="false"  icon="more-circle-fill"  title="审核意见:" :value="detailData.opinion"></u-cell-item>
 					</u-cell-group>
-					<view class="detail-img">
-						<view @click.stop="$util.preview(detailData.vehicleDrivingLicense1)">
-							<text>行驶证【正面】</text>
-							<image style="width: 100%;height: 300rpx" :src="detailData.vehicleDrivingLicense1" mode=""></image>
-						</view>
-						<view @click.stop="$util.preview(detailData.vehicleDrivingLicense2)">
-							<text>行驶证【反面】</text>
-							<image style="width: 100%;height: 300rpx" :src="detailData.vehicleDrivingLicense2" mode=""></image>
-						</view>
-					</view>
 				</view>
 			</u-popup>
 					
@@ -185,7 +175,6 @@
 				//车辆性质
 				// operation = "permissions/dict/getByCode?code=car_properties"
 				that.$http.getDictByCode("car_properties").then(res=>{
-					console.log("car_properties"+JSON.stringify(res))
 					if (res.data.code != 200) {
 						app.globalData.oneFailHint(res.data.msg, function () {
 					    uni.switchTab({
@@ -235,12 +224,12 @@
 				let params = {
 					page: {
 						current: mescroll.num,
-						size: 20,
+						size: 10,
 					},
 					// selectType: 3,//员工，我的车辆
-					personPhone:uni.getStorageSync("myPhone")
+					residentialId:uni.getStorageSync("residentialId"),
+					personId:this.vuex_member.id
 				}
-				// let operation = 'car/page';
 				try {
 					that.$http.carPage(params).then (res=>{
 						let data = res.data.carPage.records

pages/tool-list/epidemic-pass/detail.vue

@@ -10,7 +10,7 @@
 					<text v-text="userInfo.nickName"></text>
 				</view>
 				<view class="text-center text-blue padding-top-50 " style="font-size: 26rpx;">
-					请出示该通行证截图，由保安核检
+					请出示该通行证截图，由安保人员核检
 				</view>
 			</view>
 			<view class="bottom">

pages/wode/travelRecord/travelRecord.vue

@@ -1,103 +1,99 @@
 <template>
-	<view>
-		<block v-if="list.length > 0">
-			<view class="title-bar">
+	<view class="page">
+
+		<u-sticky>
+			<view class="title-bar bg-white">
 				<view style="width: 66upx;">进/出</view>
-				<view style="width: 190upx;text-align: center;">出入时间</view>
-				<view style="width: 168upx;">小区名称</view>
-				<view style="width: 168upx;">单元名称</view>
+				<view style="width: 140upx;text-align: center;">开门时间</view>
+				<view style="width: 240upx;text-align: center;">小区名称</view>
+				<view style="width: 118upx;text-align: center;">操作者</view>
 				<view style="width: 70upx;">体温</view>
 			</view>
+		</u-sticky>
+
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+			:up="upOption">
 			<block v-for="(item, index) in list" :key="index">
 				<view class="record" :class="index % 2 == 0 ? 'bg-gray':''">
-					<view style="width: 28upx;">
-						<block v-if="item.isOut == 1">进</block>
-						<block v-else>出</block>
+					<view class="text-center" style="width: 30upx;">
+						<text v-if="item.isOut == 1">进</text>
+						<text v-else>出</text>
 					</view>
-					<view style="width: 190upx;">{{cutTime(item.accessDate)}}</view>
+					<view style="width: 190upx;">{{formatTime(item.createTime)}}</view>
 					<view style="width: 200upx;">{{item.residentialName}}</view>
-					<view style="width: 168upx;">{{item.unitName}}</view>
+					<view style="width: 168upx;">{{item.userName}}</view>
 					<view style="width: 70upx;">
 						<block v-if="$isEmpty(item.temperature)">-</block>
 						<block v-else>{{item.temperature}}</block>
 					</view>
 				</view>
 			</block>
-			<view style="height: 80rpx;" v-if="status">
-				<u-divider bgColor="#f1f1f1;"  height="80">到底了</u-divider>
-			</view>
-		</block>
-		<block v-else>
-			<DtEmpty type="1" wrapBgColor="#fff"></DtEmpty>
-		</block>
+		</mescroll-body>
 	</view>
 </template>
 
 <script>
-	var app = getApp();
-	import DtEmpty from '@/comps/dt_empty.vue';
+	import MescrollMixin from "@/comps/mescroll-body/mescroll-mixins.js";
 	export default {
-		components: {
-			DtEmpty
-		},
+		mixins: [MescrollMixin], // 使用mixin
+		name: '',
 		data() {
 			return {
-				list: [], //出入记录
-				page: {
-					current: 1,
-					size:30,
-				},
-				status: false,
-			}
-		},
-		onLoad() {
-			this.getTravelRecord();
+				list: []
+			};
 		},
-		onReachBottom() {
-			if (this.list.length < this.page.current * this.page.size) {
-				this.status = true;
-			} else {
-				this.page.current += 1;
-				this.getTravelRecord();
+		computed: {
+			formatTime() {
+				return time => {
+					let date = typeof(time) == 'string' ? time.replace(/\-/g, '/') : time
+					return this.$u.timeFormat(new Date(date).getTime(), 'mm/dd hh-MM')
+				}
 			}
 		},
 		methods: {
-			getTravelRecord() {
-				let _this = this;
-				let data = {};
-				data.page = this.page;
-				data.memberId = app.globalData.member.id;
-				let operation = 'accessRecords/getAccessRecordPage';
-				app.globalData.postRequest(data, operation, function (res) {
-				  if (res.data.code != 200) {
-				    app.globalData.oneFailHint(res.data.msg, function () {
-				      uni.switchTab({
-				      	url:"../wode"
-				      })
-				    });
-				  }
-					_this.list = [..._this.list,...res.data.data.records];
-				});
-			},
-			cutTime(str) {
-				return str.substring(5, str.length);
+			downCallback(mescroll) {
+				setTimeout(() => {
+					this.mescroll.resetUpScroll()
+				}, 200)
 			},
+			upCallback(mescroll) {
+				try {
+					let params = {
+						userId:this.vuex_member.id,
+						query: {
+							current: mescroll.num,
+							size: 20
+						}
+					}
+					this.$http.accessRecords(params).then(res => {
+						let data = res.data.data.records
+						let length = data.length
+						this.total = res.data.data.total
+						mescroll.endBySize(length, this.total);
+						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(data); //追加新数据
+					})
+				} catch (e) {
+					console.log(e);
+					this.mescroll.endErr()
+				}
+			}
 		}
-	}
+	};
 </script>
-<style>
-	page {
-		background-color: #fff;
-	}
-</style>
+
 <style lang="scss" scoped>
+	.page {
+		background-color: #FFFFFF;
+	}
+
 	.title-bar {
 		display: flex;
 		line-height: 80upx;
 		border-top: #CCC 1upx solid;
 		justify-content: space-around;
-
 	}
+
 	.record {
 		display: flex;
 		justify-content: space-around;

pages/wode/wode.vue

@@ -7,8 +7,8 @@
 					<view class="userinfo-avatar">
 						<open-data type="userAvatarUrl"></open-data>
 					</view>
-					<view class="center text-white margin-left-10" style="font-size: 36rpx	;">
-						<text>{{username}}</text>
+					<view class="center text-white margin-left-10" style="font-size: 34			rpx	;">
+						<text >{{username || '微信用户'}}</text>
 					</view>
 				</view>
 

pagesM/comps/dt_menu_list.vue

@@ -22,7 +22,7 @@
           <text>{{ item.value }}</text>
           <image
             v-if="!item.hideArrow"
-            src="http://139.9.103.171:1888/img/image/arrow.png"
+            src="https://szsq.nxzhsq.cn/community/miniofile/image/arrow.png"
           ></image>
         </view>
         <!-- 微信客服 -->

pagesM/pages/mine_setting.vue

@@ -1,115 +1,110 @@
 <template>
-  <view class="dt-page">
-    <DtMenuList
-      :menuStyle="menuStyle"
-      :itemData="moduleList"
-      @tapitem="onTapItem"/>
-    <template v-if="isLogin">
-      <button @tap="exitAction" class="btn-submit" hover-class="button-hover-scale">退出系统</button>
-    </template>
-  </view>
+	<view class="dt-page">
+		<DtMenuList :menuStyle="menuStyle" :itemData="moduleList" @tapitem="onTapItem" />
+		<template v-if="$isNotEmpty(vuex_member)">
+			<button @tap="exitAction" class="btn-submit" hover-class="button-hover-scale">退出系统</button>
+		</template>
+		
+		<clearUser ref="clearUser"></clearUser>
+	</view>
 </template>
 
 <script>
-import DtMenuList from '../comps/dt_menu_list.vue'
-export default {
-  components:{
-    DtMenuList
-  },
-  data() {
-    return {
-      menuStyle: {
-        spaceColor: '#f2f2f2',
-        spaceHeight: 20
-      },
-      moduleList: [],
-      isLogin: true
-    }
-  },
-  
-  methods: {
-    onTapItem(item){
-      switch(item.id){
-        case 0:
-		let url='https://community.58fo.com/appfile/protocal.htm'
-          uni.navigateTo({
-          	url:"/pages/webview/webview?url="+url+"&title=隐私协议"
-          })
-          break;
-        case 1:break;
-        default:break;
-      }
-    },
-    //退出登录
-    logout() {
-      this.$auth.logout()
-	  this.touristLogin()
-	  uni.switchTab({
-	  	url:"/pages/wode/wode"
-	  })
-    },
-    //退出操作
-    exitAction() {
-      this.$dialog.confirm({
-        content:"是否退出本次账号",
-        success: res => {
-          if (res.confirm) {
-            this.logout()
-          }
-        }
-      })
-    },
-	/**
-	 * 游客登陆
-	 */
-	async touristLogin() {
-	  // 检查是否登录
-	  if (!this.$auth.isAuth) { // 就算是游客，也重新登录
-	    let resp = await this.$api.touristLogin()
-		console.log("Resp",resp);
-	    let userType = this.$global.userType.tourist
-	    this.$auth.login(userType, resp.sessionId, resp.userId, resp)
-	    console.log('游客登录成功!', resp)
-	  } 
-	},
-    onLoadPage() {
-	  wx.hideShareMenu();
-      // this.memberInfo = this.$auth.getMemberInfo()
-      this.isLogin = this.$auth.isAuth
-      this.moduleList = [
-        {
-          id: 0,
-          title: '隐私协议',
-          value: '',
-          hideArrow: false,
-          isMarginTop:true
-        },
-        {
-          id: 1,
-          title: '技术支持',
-          value: '宁夏新邻科技有限公司',
-          hideArrow: true,
-          isMarginTop:true
-        }
-      ]
-    }
-  }
-}
+	import DtMenuList from '../comps/dt_menu_list.vue'
+	import clearUser from "@/comps/clear-user.vue"
+	export default {
+		components: {
+			DtMenuList,
+			clearUser
+		},
+		data() {
+			return {
+				menuStyle: {
+					spaceColor: '#f2f2f2',
+					spaceHeight: 20
+				},
+				moduleList: [],
+				isLogin: true
+			}
+		},
+
+		methods: {
+			onTapItem(item) {
+				switch (item.id) {
+					case 0:
+						let url = 'https://community.58fo.com/appfile/protocal.htm'
+						uni.navigateTo({
+							url: "/pages/webview/webview?url=" + url + "&title=隐私协议"
+						})
+						break;
+					case 1:
+						break;
+					default:
+						break;
+				}
+			},
+			//退出登录
+			logout() {
+				this.$auth.logout()
+				this.touristLogin()
+				uni.switchTab({
+					url: "/pages/wode/wode"
+				})
+			},
+			//退出操作
+			//退出操作
+			exitAction() {
+				this.$refs.clearUser.showModal()
+			},
+			/**
+			 * 游客登陆
+			 */
+			async touristLogin() {
+				// 检查是否登录
+				if (!this.$auth.isAuth) { // 就算是游客，也重新登录
+					let resp = await this.$api.touristLogin()
+					console.log("Resp", resp);
+					let userType = this.$global.userType.tourist
+					this.$auth.login(userType, resp.sessionId, resp.userId, resp)
+					console.log('游客登录成功!', resp)
+				}
+			},
+			onLoadPage() {
+				wx.hideShareMenu();
+				// this.memberInfo = this.$auth.getMemberInfo()
+				this.isLogin = this.$auth.isAuth
+				this.moduleList = [{
+						id: 0,
+						title: '隐私协议',
+						value: '',
+						hideArrow: false,
+						isMarginTop: true
+					},
+					{
+						id: 1,
+						title: '技术支持',
+						value: '宁夏新邻科技有限公司',
+						hideArrow: true,
+						isMarginTop: true
+					}
+				]
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.dt-page{
-  background-color:#f2f2f2;
-  min-height:100vh;
-
-  .btn-submit {
-    margin:60upx auto;
-    width:690upx;
-    height: 90upx;
-    line-height: 90upx;
-    border-radius:10upx;
-    background-color:#e54d42;
-  }
-}
+	.dt-page {
+		background-color: #f2f2f2;
+		min-height: 100vh;
 
-</style>
+		.btn-submit {
+			margin: 60upx auto;
+			width: 690upx;
+			height: 90upx;
+			line-height: 90upx;
+			border-radius: 10upx;
+			background-color: #e54d42;
+		}
+	}
+</style>

store/index.js

@@ -12,7 +12,7 @@ try{
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['vuex_isAuth'];
+let saveStateKeys = ['vuex_isAuth','vuex_member'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value){