huangmp 4 anos atrás
pai
commit
e241682237

+ 16 - 7
assets/http/api.js

@@ -27,7 +27,8 @@ const getAuthDeviceByMemberId = p => http.post("/community-app-service/app/membe
 //远程开门
 const openDoor = p => http.post("/community-app-service/app/member/openDoor", p)
 
-const getResidentialListByMember = p => http.post('/community-app-service/app/residential/getResidentialListByMember', p)
+const getResidentialListByMember = p => http.post('/community-app-service/app/residential/getResidentialListByMember',
+	p)
 
 
 
@@ -41,7 +42,9 @@ const getLocation = p => http.post('/community-app-service/app/miniprogram/ws/ge
 const getDistrictChildren = p => http.post('/community-app-service/app/miniprogram/ws/district/v1/getchildren', p)
 
 //获取审核列表
-const getAuditListByMemberId = p => http.get('/community-app-service/app/applyuser/getAuditListByMemberId', {params:p})
+const getAuditListByMemberId = p => http.get('/community-app-service/app/applyuser/getAuditListByMemberId', {
+	params: p
+})
 
 //通过区code查询小区列表
 const getResidentialByRegionArea = p => http.post('/community-app-service/app/residential/getByRegionArea', p)
@@ -59,14 +62,16 @@ const getSmsCode = p => http.post('/community-app-service/app/member/getSmsCode'
 
 //会员注册接口
 const memberRegister = p => http.post('/community-app-service/app/member/memberRegister', p)
+
+const logout = p => http.post('/community-app-service/app/member/logout?memberId='+p)
 //会员注册用户/添加家人
 const authentication = p => http.post('/community-app-service/app/member/authentication', p)
 //编辑家
 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 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)
+const bindRoom = (p, q) => http.post('/community-app-service/app/houseuser/bindRoom?memberId=' + p, q)
 
 //删除家人
 const deleteUserById = p => http.post('/community-app-service/app/houseuser/deleteUserById', p)
@@ -77,14 +82,18 @@ const getFamilyByRoomIds = p => http.post('/community-app-service/app/houseuser/
 //getHouseUser列表
 const getHouseUser = p => http.post('/community-app-service/app/houseuser/getHouseUserListByMemberAndResidential', p)
 //getHouseUser列表
-const getHouseUserCondition = p => http.get('/community-app-service/app/houseuser/list', {params:p})
+const getHouseUserCondition = p => http.get('/community-app-service/app/houseuser/list', {
+	params: p
+})
 //banner列表
 const adList = p => http.post('/community-app-service/app/adPushApp/getList', p)
 
 
 
 //获取住户审核记录
-const getAllApplyUserByMemberId = p => http.get('/community-app-service/app/applyuser/list', {params:p})
+const getAllApplyUserByMemberId = p => http.get('/community-app-service/app/applyuser/list', {
+	params: p
+})
 
 //获取字典接口
 const getDictByCode = code => http.get('/blade-system/dict-biz/dictionary?code=' + code);
@@ -165,7 +174,7 @@ export const api = {
 	getFamilyByRoomIds,
 
 	getOpenid,
-
+	logout,
 	//会员获取验证码
 	getSmsCode,
 	//会员注册接口

+ 18 - 9
comps/clear-user.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<u-popup v-model="show" mode="center" width="80%" :border-radius="10" @close="close" negativeTop="200">
+		<u-popup v-model="show" mode="center" width="80%" :border-radius="10"  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>
@@ -8,8 +8,8 @@
 				<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>
+						<view class="margin-top " >
+							<text class="cuIcon-title text-red"></text>
 							<text class="text-sm ">业主角色请到【家人管理】处移除房间下的成员</text>
 						</view>
 				</view>
@@ -39,7 +39,7 @@
 		data() {
 			return {
 				hasMember:false,
-				time: 5,
+				time: 8,
 				interval:null,
 				checked: false,
 				show: false,
@@ -96,11 +96,20 @@
 					this.show=true
 					return
 				}
-				
-				uni.clearStorage()
-				uni.reLaunch({
-					url: "/pages/index/index"
-					
+				if (this.hasMember) {
+					this.$u.toast('请先移除相关成员')
+					return
+				}
+				this.$http.logout(this.vuex_member.id)
+				this.show=false
+				this.$dialog.showModal("注销成功,请退出小程序",false).then(res=>{
+					this.$store.commit('clear')
+					getApp().globalData.anyHousePass=false
+					getApp().globalData.member=null
+					uni.clearStorage()
+					uni.reLaunch({
+						url: "/pages/index/index"
+					})
 				})
 			},
 			countdown() {

+ 1 - 1
pages/choosePlot/householdCert/householdCert.vue

@@ -380,7 +380,7 @@
 				uni.chooseImage({
 					count: 1,
 					//最多可以选择的图片张数,默认9
-					sourceType: ['album', 'camera'],
+					sourceType: ['album'],
 					sizeType: ['compressed'],
 					//可选择原图或压缩后的图片
 					success: res => {

+ 1 - 1
pages/myFamily/add/add.vue

@@ -291,7 +291,7 @@
 				uni.chooseImage({
 					count: 1,
 					//最多可以选择的图片张数,默认9
-					sourceType: ['album', 'camera'],
+					sourceType: ['album'],
 					sizeType: ['compressed'],
 					//可选择原图或压缩后的图片
 					success: res => {

+ 1 - 1
pages/myFamily/addFamily/addFamily.vue

@@ -334,7 +334,7 @@ export default {
       uni.chooseImage({
         count: 1,
         //最多可以选择的图片张数,默认9
-        sourceType: ['album', 'camera'],
+        sourceType: ['album'],
         sizeType: ['compressed'],
         //可选择原图或压缩后的图片
         success: res => {

+ 1 - 1
pages/myFamily/editApplyFamily/editApplyFamily - 副本.vue

@@ -387,7 +387,7 @@ export default {
 	  uni.chooseImage({
 	    count: 1,
 	    //最多可以选择的图片张数,默认9
-	    sourceType: ['album', 'camera'],
+	    sourceType: ['album'],
 	    sizeType: ['compressed'],
 	    //可选择原图或压缩后的图片
 	    success: res => {

+ 1 - 1
pages/myFamily/editApplyFamily/editApplyFamily.vue

@@ -389,7 +389,7 @@
 				uni.chooseImage({
 					count: 1,
 					//最多可以选择的图片张数,默认9
-					sourceType: ['album', 'camera'],
+					sourceType: ['album'],
 					sizeType: ['compressed'],
 					//可选择原图或压缩后的图片
 					success: res => {

+ 1 - 1
pages/myFamily/editFamily/editFamily.vue

@@ -374,7 +374,7 @@
 				uni.chooseImage({
 					count: 1,
 					//最多可以选择的图片张数,默认9
-					sourceType: ['album', 'camera'],
+					sourceType: ['album'],
 					sizeType: ['compressed'],
 					//可选择原图或压缩后的图片
 					success: res => {

+ 1 - 1
pages/uploadFace/uploadFace.vue

@@ -210,7 +210,7 @@
 				uni.chooseImage({
 					count: 1,
 					//最多可以选择的图片张数,默认9
-					sourceType: ['album', 'camera'],
+					sourceType: ['album'],
 					sizeType: ['compressed'],
 					//可选择原图或压缩后的图片
 					success: res => {

+ 1 - 1
pagesM/pages/mine_setting.vue

@@ -2,7 +2,7 @@
 	<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>
+			<button @tap="exitAction" class="btn-submit" hover-class="button-hover-scale">注销账户</button>
 		</template>
 		
 		<clearUser ref="clearUser"></clearUser>

+ 5 - 0
store/index.js

@@ -48,6 +48,11 @@ const store = new Vuex.Store({
 		vuex_isAuth: lifeData.vuex_isAuth ? lifeData.vuex_isAuth : false,
 	},
 	mutations: {
+		clear(state,payload){
+			for (let prop in state) {
+				state[prop]=null
+			}
+		},
 		$uStore(state, payload) {
 			// 判断是否多层级调用,state中为对象存在的情况,诸如user.info.score = 1
 			let nameArr = payload.name.split('.');