修复bug

property-uniapp-project/pageSubPack/api/useImageUpload.js

@@ -1,6 +1,6 @@
 // 服务器地址（与 request.js 保持一致）
-// const baseUrl = 'https://wuyeapi.ckdzkj.com';
+const baseUrl = 'https://wuyeapi.ckdzkj.com';
-const baseUrl = "http://192.168.1.222:8080"
+// const baseUrl = "http://192.168.1.222:8080"
 
 /**
  * 图片上传 Hook

property-uniapp-project/pageSubPack/my/addCar.vue

@@ -76,6 +76,11 @@
 	} from '/pageSubPack/api/useImageUpload.js'
 
 	const statusBarHeight = ref(20)
+
+	const goBack = () => {
+		uni.navigateBack()
+	}
+
 	const id = ref(undefined)
 	const type = ref('')
 	const formData = ref({
@@ -253,7 +258,14 @@
 						icon: 'success'
 					})
 					setTimeout(() => {
-						goBack()
+							uni.removeStorageSync("carNum")
+							uni.removeStorageSync("carBrand")
+							uni.removeStorageSync("carModel")
+							uni.removeStorageSync("carColor")
+							uni.removeStorageSync("carImageUrl")
+							uni.removeStorageSync("carBrandId")
+							uni.removeStorageSync("checkType")
+							uni.redirectTo({ url: "/pageSubPack/my/myCarIndex" })
 					}, 1500)
 				} else {
 					uni.showToast({
@@ -271,7 +283,14 @@
 						icon: 'success'
 					})
 					setTimeout(() => {
-						goBack()
+							uni.removeStorageSync("carNum")
+							uni.removeStorageSync("carBrand")
+							uni.removeStorageSync("carModel")
+							uni.removeStorageSync("carColor")
+							uni.removeStorageSync("carImageUrl")
+							uni.removeStorageSync("carBrandId")
+							uni.removeStorageSync("checkType")
+							uni.redirectTo({ url: "/pageSubPack/my/myCarIndex" })
 					}, 1500)
 				} else {
 					uni.showToast({
@@ -293,16 +312,6 @@
 		}
 	}
 
-	const goBack = () => {
-		uni.removeStorageSync("carNum")
-		uni.removeStorageSync("carBrand")
-		uni.removeStorageSync("carModel")
-		uni.removeStorageSync("carColor")
-		uni.removeStorageSync("carImageUrl")
-		uni.removeStorageSync("carBrandId")
-		uni.removeStorageSync("checkType")
-		uni.navigateBack()
-	}
 </script>
 
 <style lang="scss">

property-uniapp-project/pageSubPack/my/addHouse.vue

@@ -882,6 +882,11 @@
 	});
 
 	const goBack = () => {
+		// 第二步返回第一步
+		if (currentStep.value === 1) {
+			currentStep.value = 0
+			return
+		}
 		uni.removeStorageSync("communityId");
 		uni.removeStorageSync("communityName");
 		uni.removeStorageSync("buildingId");
@@ -896,6 +901,10 @@
 		uni.removeStorageSync("houseIsDefault")
 		uni.removeStorageSync("updateHouseId")
 		uni.navigateBack()
+		// uni.redirectTo({
+		// 	url: '/pageSubPack/my/myHouseIndex',
+				
+		// 	});
 	}
 </script>
 <style lang="scss">

property-uniapp-project/pageSubPack/my/addParkingSpace.vue

@@ -93,6 +93,11 @@
 	} from '@/pageSubPack/api/apiSub.js'
 
 	const statusBarHeight = ref(20)
+
+	const goBack = () => {
+		uni.navigateBack()
+	}
+
 	const id = ref(undefined)
 	const type = ref('')
 	const formData = ref({
@@ -200,7 +205,19 @@
 								icon: 'success'
 							})
 							setTimeout(() => {
-								goBack()
+									uni.removeStorageSync("communityId")
+									uni.removeStorageSync("communityName")
+									uni.removeStorageSync("checkType")
+									uni.removeStorageSync("parkingLotId")
+									uni.removeStorageSync("parkingLotName")
+									uni.removeStorageSync("parkingSpaceId")
+									uni.removeStorageSync("parkingStatus")
+									uni.removeStorageSync("parkingSpaceName")
+									uni.removeStorageSync("bindCarId")
+									uni.removeStorageSync("bindCarName")
+									uni.removeStorageSync("ownerId")
+									uni.removeStorageSync("ownerName")
+									uni.redirectTo({ url: "/pageSubPack/my/myParkingSpaceIndex" })
 							}, 1500)
 						} else {
 							uni.showToast({
@@ -323,21 +340,6 @@
 		}
 	}
 
-	const goBack = () => {
-		uni.removeStorageSync("communityId")
-		uni.removeStorageSync("communityName")
-		uni.removeStorageSync("checkType")
-		uni.removeStorageSync("parkingLotId")
-		uni.removeStorageSync("parkingLotName")
-		uni.removeStorageSync("parkingSpaceId")
-		uni.removeStorageSync("parkingStatus")
-		uni.removeStorageSync("parkingSpaceName")
-		uni.removeStorageSync("bindCarId")
-		uni.removeStorageSync("bindCarName")
-		uni.removeStorageSync("ownerId")
-		uni.removeStorageSync("ownerName")
-		uni.navigateBack()
-	}
 </script>
 
 <style lang="scss">

property-uniapp-project/pageSubPack/my/carDetail.vue

@@ -57,6 +57,10 @@
 		deleteCar
 	} from '@/pageSubPack/api/apiSub.js'
 
+	const goBack = () => {
+		uni.navigateBack()
+	}
+
 	const statusBarHeight = ref(20)
 	const currentStatus = ref('')
 	const id = ref(undefined)
@@ -125,7 +129,7 @@
 								icon: 'success'
 							})
 							setTimeout(() => {
-								goBack()
+									uni.redirectTo({ url: "/pageSubPack/my/myCarIndex" })
 							}, 1500)
 						} else {
 							uni.showToast({
@@ -139,9 +143,6 @@
 		})
 	}
 
-	const goBack = () => {
-		uni.navigateBack()
-	}
 </script>
 
 <style lang="scss">

property-uniapp-project/pageSubPack/my/houseDetail.vue

@@ -132,6 +132,10 @@
 	} from '/pageSubPack/api/apiSub.js'
 
 	// 响应式数据
+	const goBack = () => {
+		uni.navigateBack()
+	}
+
 	const statusBarHeight = ref(20)
 	const id = ref()
 	const currentStatus = ref('')
@@ -227,7 +231,7 @@
 								icon: 'success'
 							})
 							setTimeout(() => {
-								goBack()
+									uni.redirectTo({ url: "/pageSubPack/my/myHouseIndex" })
 							}, 1000)
 						} else {
 							uni.showToast({
@@ -248,9 +252,6 @@
 		})
 	}
 
-	const goBack = () => {
-		uni.navigateBack()
-	}
 </script>
 
 <style lang="scss">

property-uniapp-project/pageSubPack/my/myCarIndex.vue

@@ -129,7 +129,7 @@
 	}
 
 	const goBack = () => {
-		uni.navigateBack()
+		uni.switchTab({ url: '/pages/myIndex/myIndex' })
 	}
 </script>
 

property-uniapp-project/pageSubPack/my/myHouseIndex.vue

@@ -26,7 +26,7 @@
 								class="house-name">{{ item.villageName+"-"+item.buildingName+"-"+item.unitNo }}</text>
 						</view>
 						<text class="status-tag"
-							:class="item.certificationStatus=='0'?'pending':item.certificationStatus=='1'?'success':item.certificationStatus=='2'?'fail':''">{{ item.certificationStatus=='0'?'未认证':item.certificationStatus=='1'?'认证成功':item.certificationStatus=='2'?'认证失败':'' }}</text>
+							:class="item.certificationStatus=='0'?'pending':item.certificationStatus=='1'?'success':item.certificationStatus=='2'?'fail':''">{{ item.certificationStatus=='0'?'认证中':item.certificationStatus=='1'?'认证成功':item.certificationStatus=='2'?'认证失败':'' }}</text>
 					</view>
 
 					<!-- 房屋信息 -->
@@ -46,7 +46,7 @@
 							<text
 								class="value">{{ item.houseStatus==0?'自住':item.houseStatus==1?'闲置':item.houseStatus==2?'租赁':item.houseStatus==3?'其他':''}}</text>
 						</view>
-						<view class="defaultBox" >
+						<view class="defaultBox" v-if="item.certificationStatus=='1'">
 							<text class="set-default">设为默认</text>
 							<switch class="no-cross-switch" :checked="item.isDefault==1" color="#1677ff"
 								@change="onSwitchChange($event,item)" @click.stop />
@@ -198,7 +198,7 @@
 	}
 
 	const goBack = () => {
-		uni.navigateBack()
+		uni.switchTab({ url: '/pages/myIndex/myIndex' })
 	}
 </script>
 

property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue

@@ -16,7 +16,7 @@
 							<text class="parkingSpace-name">{{ item.villageName }}</text>
 						</view>
 						<text class="status-tag"
-							:class="item.checkStatus=='0'?'pending':item.checkStatus=='1'?'success':item.checkStatus=='2'?'fail':''">{{ item.checkStatus=='0'?'未认证':item.checkStatus=='1'?'认证成功':item.checkStatus=='2'?'认证失败':'' }}</text>
+							:class="item.checkStatus=='0'?'pending':item.checkStatus=='1'?'success':item.checkStatus=='2'?'fail':''">{{ item.checkStatus=='0'?'认证中':item.checkStatus=='1'?'认证成功':item.checkStatus=='2'?'认证失败':'' }}</text>
 					</view>
 					<view class="card-body">
 						<view class="left">
@@ -164,7 +164,7 @@
 	}
 
 	const goBack = () => {
-		uni.navigateBack()
+		uni.switchTab({ url: '/pages/myIndex/myIndex' })
 	}
 </script>
 

property-uniapp-project/pageSubPack/my/parkingSpaceDetail.vue

@@ -202,7 +202,7 @@
 								icon: 'success'
 							})
 							setTimeout(() => {
-								goBack()
+									uni.redirectTo({ url: "/pageSubPack/my/myParkingSpaceIndex" })
 							}, 1500)
 						} else {
 							uni.showToast({
@@ -223,6 +223,10 @@
 		})
 	}
 
+	const goBack = () => {
+		uni.navigateBack()
+	}
+
 	const onDelete = () => {
 		uni.showModal({
 			title: "确认删除",
@@ -243,7 +247,7 @@
 								icon: 'success'
 							})
 							setTimeout(() => {
-								goBack()
+									uni.redirectTo({ url: "/pageSubPack/my/myParkingSpaceIndex" })
 							}, 1500)
 						} else {
 							uni.showToast({
@@ -257,9 +261,6 @@
 		})
 	}
 
-	const goBack = () => {
-		uni.navigateBack()
-	}
 </script>
 
 <style lang="scss">

property-uniapp-project/pages/index/index.vue

@@ -350,7 +350,7 @@
 
 	onShow(() => {
 		const currentUserId = uni.getStorageSync('userId') || ''
-		const userIdChanged = lastUserId.value && lastUserId.value !== currentUserId
+		const userIdChanged = lastUserId.value !== currentUserId
 		refreshing.value = false
 		if (userIdChanged) {
 			resetPageData()