feat: 订单bug

components/Tabbar/index.vue

@@ -1,12 +1,14 @@
 <template>
-	<view>
+	<view class="page">
 		<u-tabbar :value="tabbarValue" @change="name => tabbarValue = name" :fixed="true" :placeholder="true"
-			:safeAreaInsetBottom="true" :border="false">
-			<u-tabbar-item :text="item.text" v-for="(item,index) in list" :key="index" @click="changeTabbar">
+			:safeAreaInsetBottom="true" :border="false" style="z-index: 99999 !important;">
+			<u-tabbar-item style="z-index: 99999 !important;" :text="item.text" v-for="(item,index) in list"
+				:key="index" @click="changeTabbar">
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="item.activeImg"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="item.inactiveImg"></image>
 			</u-tabbar-item>
 		</u-tabbar>
+
 	</view>
 </template>
 
@@ -53,7 +55,7 @@
 				this.tabbarValue = e;
 				uni.reLaunch({
 					url: this.list[e].path
-				}) 
+				})
 			}
 		}
 	}
@@ -65,4 +67,18 @@
 		height: 40rpx;
 		margin: 8rpx 0 4rpx;
 	}
+</style>
+<style lang="scss">
+	.page {
+		position: relative;
+		z-index: 99999;
+	}
+
+	.u-tabbar__content {
+		z-index: 99999 !important;
+	}
+
+	.u-tabbar__content__item-wrapper {
+		z-index: 99999 !important;
+	}
 </style>

pages/my/houseList.vue

@@ -41,8 +41,8 @@
 					<!-- 图片 -->
 					<u-upload :fileList="fileList" multiple :maxCount="1" :maxSize="1 * 1024 * 1024"
 						@afterRead="afterRead" @oversize="overSize" width="120" height="120">
-
 					</u-upload>
+
 				</view>
 
 			</view>
@@ -125,7 +125,7 @@
 					</view>
 				</view>
 
-				<view class="priceBoxWeek" v-if="weekedChecked"> 
+				<view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周五</text>
@@ -193,20 +193,24 @@
 				<u-icon name="plus-circle" color=" #1372FF"></u-icon>
 				<text style="color: #1372FF; font-size: 30rpx;">添加房间</text>
 			</view>
-			<!-- 确定添加按钮 -->
-			<view class="addSubmit" @click="addNewRoom">
-				<text style="line-height: 96rpx; margin-left:310rpx; font-size: 32rpx; color: #fff;">确定</text>
+			<!-- 新增按钮 -->
+			<view class="btn-btn" @click="addNewRoom()">
+				<view class="btn">
+					确定
+				</view>
 			</view>
 		</view>
-		<!-- 确定添加按钮 -->
-		<view class="addSubmit" @click="addNewRoom">
-
-			<text style="line-height: 96rpx; margin-left:310rpx; font-size: 32rpx; color: #fff;">确定</text>
-		</view>
+		<!-- 新增按钮 -->
+		<view class="btn-btn" @click="addNewRoom()">
+			<view class="btn">
+				确定
+			</view>
 		</view>
 
 	</view>
 
+	</view>
+
 </template>
 
 <script>
@@ -219,7 +223,7 @@
 				fileList: [],
 
 				form: {
-					price:'',
+					price: '',
 					homestayId: '',
 					mondayPrice: '',
 					tuesdayPrice: '',
@@ -230,7 +234,7 @@
 					sundayPrice: '',
 					name: '',
 					shortName: '',
-					isPutaway:'',
+					isPutaway: '',
 					roomFloor: [{
 						floor: '',
 						roomNumber: ''
@@ -242,14 +246,17 @@
 			}
 
 		},
-		onLoad({id,houseBaseId}){
-				this.form.homestayId=id
-				// console.log(houseBaseId)
-				this.id=houseBaseId
-				// console.log(this.id)
-				this.getTypeInfo()
-				
-			},
+		onLoad({
+			id,
+			houseBaseId
+		}) {
+			this.form.homestayId = id
+			// console.log(houseBaseId)
+			this.id = houseBaseId
+			// console.log(this.id)
+			this.getTypeInfo()
+
+		},
 		methods: {
 			// 删除图片
 			deletePic(event) {
@@ -288,81 +295,123 @@
 				})
 			},
 			// 添加&编辑房屋
-						addNewRoom(){
-							
-								// console.log(this.form)
-							if(!this.id){
-								if(this.checked===true){
-									this.form.isPutaway=1
-								}else{
-									this.form.isPutaway=0
-								}
-								this.$api.post('/merchant/hotel/mine/addHouseBase',this.form).then(res=>{
-									// console.log(res)
-									if(res.data.code===0){
-										this.$showToast('添加成功');
-										setTimeout(()=>{
-											uni.reLaunch({
-												url:'/pages/my/roomType'
-											})
-										},1500)
-									}
+			addNewRoom() {
+
+				// console.log(this.form)
+				if (!this.id) {
+					if (this.checked === true) {
+						this.form.isPutaway = 1
+					} else {
+						this.form.isPutaway = 0
+					}
+					this.$api.post('/merchant/hotel/mine/addHouseBase', this.form).then(res => {
+						// console.log(res)
+						if (res.data.code === 0) {
+							this.$showToast('添加成功');
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '/pages/my/roomType'
 								})
-								console.log('这是')
-							}else{
-								// console.log('这是修改')
-								// if(this.)
-								if(this.checked===true){
-									this.form.isPutaway=1
-								}else{
-									this.form.isPutaway=0
-								}
-								this.$api.put('/merchant/hotel/mine/updHouseBase',this.form).then(res=>{
-									// console.log('修改成功')
-									if(res.data.code===0){
-										this.$showToast('添加成功')
-										setTimeout(()=>{
-											uni.reLaunch({
-												url:'/pages/my/roomType'
-											})
-										},1500)
-									}
+							}, 1500)
+						}
+					})
+					console.log('这是')
+				} else {
+					// console.log('这是修改')
+					// if(this.)
+					if (this.checked === true) {
+						this.form.isPutaway = 1
+					} else {
+						this.form.isPutaway = 0
+					}
+					this.$api.put('/merchant/hotel/mine/updHouseBase', this.form).then(res => {
+						// console.log('修改成功')
+						if (res.data.code === 0) {
+							this.$showToast('添加成功')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '/pages/my/roomType'
 								})
-								
-							}
-						
-							
-						},
-						// 添加房间
-						addRoom(){
-							const newRoom = {floor:'',roomNumber:''}
-							this.form.roomFloor.push(newRoom)
-						},
-						// 删除房间
-						delRoom(index){
-							this.form.roomFloor.splice(index,1)
-						},
-					
-						// 获取当前房型信息
-						getTypeInfo(){
-							if(this.id){
-							this.$api.get(`/merchant/hotel/mine/getHouseBaseInfo/${this.id}`).then((res)=>{
-								// console.log(res)
-								if(res.data.code===0){
-									this.form=res.data.data				
-								}
+							}, 1500)
+						}
+					})
+
+				}
+
+
+			},
+			// 添加房间
+			addRoom() {
+				const newRoom = {
+					floor: '',
+					roomNumber: ''
+				}
+				this.form.roomFloor.push(newRoom)
+			},
+			// 删除房间
+			delRoom(index) {
+				this.form.roomFloor.splice(index, 1)
+			},
+
+			// 获取当前房型信息
+			getTypeInfo() {
+				if (this.id) {
+					this.$api.get(`/merchant/hotel/mine/getHouseBaseInfo/${this.id}`).then((res) => {
+						// console.log(res)
+						if (res.data.code === 0) {
+							this.form = res.data.data
+							this.fileList.push({
+								url: res.data.data.cover
 							})
-								
-							}else{
-								return
+							if (this.form.isPutaway == 1) {
+								this.checked = true
+							} else {
+								this.checked = false
 							}
 						}
+					})
+
+				} else {
+					return
+				}
+			}
 		}
 
 	}
 </script>
 
 <style lang="scss">
+	.btn-btn {
+		width: 100%;
+		height: 136rpx;
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		padding: 30rpx 0 0;
+		// margin: 0 auto;
+		z-index: 999999;
+		// margin-top: 30rpx;
+		// margin-left: 30rpx;
+	}
+
+	.btn {
+		margin: 0 auto;
+		width: 690rpx;
+		height: 96rpx;
+		background-color: #1372FF;
+		color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 34rpx;
+		border-radius: 48rpx;
+	}
+
+	.uicon-close {
+		font-size: 30rpx !important;
+		top: 8rpx !important;
+	}
+
 	.page {
 		background: #F3F4F4;
 		padding-bottom: 260rpx;
@@ -534,14 +583,16 @@
 		align-items: center;
 	}
 
+
 	.addSubmit {
+		width: 100%;
 		position: fixed;
 		/* 固定定位 */
 		bottom: 20rpx;
 		/* 底部对齐 */
 		left: 0;
 		/* 可选：左对齐 */
-		width: 690rpx;
+		// width: 690rpx;
 		/* 可选：宽度为 100% */
 		height: 96rpx;
 		margin-left: 30rpx;

pages/my/roomType.vue

@@ -1,68 +1,71 @@
 <template>
 	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
-			<c-nav-bar title="房型列表" :showIcon="false" :titleStyle="titleStyle"></c-nav-bar>
-			<!-- 房型数量 -->
-			<view class="typeNum">
-					<text style="font-size: 24rpx; color: #777;">共{{roomType.length}}个房型</text>
+		<c-nav-bar title="房型列表" :showIcon="true" :titleStyle="titleStyle"></c-nav-bar>
+
+		<!-- 房型数量 -->
+		<view class="typeNum">
+			<text style="font-size: 24rpx; color: #777;">共{{roomType.length}}个房型</text>
+		</view>
+		<!-- 房型选择 -->
+		<view class="type" v-for="item in roomType" :key="item.houseBaseId" @click="goEditTypeInfo(item.houseBaseId)">
+			<view class="top">
+				<text style="font-size: 30rpx; color: #333;">{{item.name}}</text>
+				<u-icon name="arrow-right"></u-icon>
 			</view>
-			<!-- 房型选择 -->
-			<view class="type" v-for="item in roomType" :key="item.houseBaseId" @click="goEditTypeInfo(item.houseBaseId)">
-				<view class="top">
-					<text style="font-size: 30rpx; color: #333;" >{{item.name}}</text>
-					<u-icon name="arrow-right"></u-icon>
-				</view>
-				<view class="under">
-					<text style="font-size: 24rpx; color: #777;">大床房</text>
-					<text style="font-size: 24rpx; color: #777;">{{item.roomCount}}间</text>
-				</view>
-				
+			<view class="under">
+				<text style="font-size: 24rpx; color: #777;">{{item.shortName}}</text>
+				<text style="font-size: 24rpx; color: #777;">{{item.roomCount}}间</text>
 			</view>
-		
-			<!-- 新增按钮 -->
-			<view class="btn" @click="addType(id)">
-				新增			
+
+		</view>
+
+		<!-- 新增按钮 -->
+		<view class="btn-btn" @click="addType(id)">
+			<view class="btn">
+				新增
 			</view>
 		</view>
+	</view>
 </template>
 
 <script>
 	export default {
-		data(){
+		data() {
 			return {
-				homestayId:uni.getStorageSync('homestayId')||0,
-				roomType:[]
+				homestayId: uni.getStorageSync('homestayId') || 0,
+				roomType: []
 			}
 		},
-		onLoad(){
+		onLoad() {
 			// console.log(this.homestayId)
 			this.getHomestayId()
 		},
-		methods:{
+		methods: {
 			// 获取房型列表信息
-			getHomestayId(){
-			
-				
-				this.$api.get(`/merchant/hotel/mine/getHouseBaseList/${this.homestayId}`,{
-					homestayId:this.homestayId
-				}).then((res)=>{
+			getHomestayId() {
+
+
+				this.$api.get(`/merchant/hotel/mine/getHouseBaseList/${this.homestayId}`, {
+					homestayId: this.homestayId
+				}).then((res) => {
 					// console.log(res)
-					this.roomType=res.data.data
-					
+					this.roomType = res.data.data
+
 					// let roomSymbleName=this.roomType.name
 					// console.log(roomSymbleName)
 					// console.log(this.roomType)
 				})
 			},
 			// 新增房型
-			addType(id){
+			addType(id) {
 				uni.navigateTo({
-					url:`/pages/my/houseList?id=${this.homestayId}`
+					url: `/pages/my/houseList?id=${this.homestayId}`
 				})
 			},
 			// 修改房型信息
-			goEditTypeInfo(houseBaseId){
+			goEditTypeInfo(houseBaseId) {
 				uni.navigateTo({
-					url:`/pages/my/houseList?houseBaseId=${houseBaseId}`
+					url: `/pages/my/houseList?houseBaseId=${houseBaseId}`
 				})
 				console.log(houseBaseId)
 			}
@@ -78,14 +81,16 @@
 		overflow-y: auto;
 		overflow-x: auto;
 	}
-	.typeNum{
+
+	.typeNum {
 		width: 100%;
 		height: 73rpx;
 		display: flex;
 		justify-content: center;
 		align-items: center;
 	}
-	.type{
+
+	.type {
 		margin: 0 auto;
 		border-radius: 10rpx 10rpx 10rpx 10rpx;
 		width: 86%;
@@ -94,16 +99,33 @@
 		padding: 30rpx;
 		margin-bottom: 20rpx;
 	}
-	.top{
+
+	.top {
 		display: flex;
 		justify-content: space-between;
 	}
-	.under{
+
+	.under {
 		margin-top: 40rpx;
 		display: flex;
 		justify-content: space-between;
 	}
-	.btn{
+
+	.btn-btn {
+		width: 100%;
+		height: 136rpx;
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		padding: 30rpx 0 0;
+		// margin: 0 auto;
+		z-index: 999999;
+		// margin-top: 30rpx;
+		// margin-left: 30rpx;
+	}
+
+	.btn {
+		margin: 0 auto;
 		width: 690rpx;
 		height: 96rpx;
 		background-color: #1372FF;
@@ -112,10 +134,6 @@
 		justify-content: center;
 		align-items: center;
 		font-size: 34rpx;
-		position: fixed;
-		bottom: 40rpx;
-		margin-top: 30rpx;
-		margin-left: 30rpx;
 		border-radius: 48rpx;
 	}
 </style>

pages/statistics/index.vue

@@ -76,7 +76,10 @@
 				单位：元
 			</view>
 			<view class="line_charts_one">
-				<qiun-data-charts :ontouch="true" type="line" :opts="revenueOptsone" :chartData="revenueChartDataOne" />
+				<cover-view class="line_charts_one">
+					<qiun-data-charts :canvas2d='true' :ontouch="true" type="line" :opts="revenueOptsone"
+						:chartData="revenueChartDataOne" />
+				</cover-view>
 			</view>
 		</view>
 		<view class="echarts-three">
@@ -90,7 +93,10 @@
 				</view>
 			</view>
 			<view class="line_charts_two">
-				<qiun-data-charts type="line" :ontouch="true" :opts="revenueOptstwo" :chartData="revenueChartDataTwo" />
+				<cover-view class="line_charts_two">
+					<qiun-data-charts type="line" :canvas2d='true' :ontouch="true" :opts="revenueOptstwo"
+						:chartData="revenueChartDataTwo" />
+				</cover-view>
 			</view>
 		</view>
 		<Tabbar :tabbarIndex="2"></Tabbar>

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -106,9 +106,9 @@
 							this.dto.shopSign =
 								'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
 						}
-						this.shopImgs = res.data.data.split(',');
+						// this.shopImgs = res.data.data.split(',');
 
-						console.log(this.shopImgs)
+						// console.log(this.shopImgs)
 					}
 				})
 			},

pagesHouse/home/tj.vue

@@ -32,13 +32,13 @@
 				<view class="t2">总退款<text>{{total2}}</text></view>
 			</view>
 			<view class="line_charts_two">
-				<qiun-data-charts type="line" :opts="gameOpts" :chartData="gameChartData" :ontouch="true" />
+				<qiun-data-charts type="line" :canvas2d='true' style="z-index: 1;" :opts="gameOpts"
+					:chartData="gameChartData" :ontouch="true" />
 			</view>
 		</view>
-		
+
 		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
-		visibleItemCount="6"
-			mode="year-month"></u-datetime-picker>
+			visibleItemCount="6" mode="year-month"></u-datetime-picker>
 	</view>
 </template>
 
@@ -202,10 +202,20 @@
 	}
 </script>
 
+<style lang="scss">
+	.u-popup__content {
+		z-index: 99999999 !important;
+	}
+
+	.u-transition {
+		z-index: 99999998 !important;
+	}
+</style>
 <style scoped lang="less">
-	/deep/.visibleItemCount{
+	/deep/.visibleItemCount {
 		z-index: 99999999999;
 	}
+
 	.tt {
 		/deep/.u-picker__view__column {
 			width: 100%;
@@ -221,8 +231,9 @@
 	.page {
 		background: #F5F8FA;
 		box-sizing: border-box;
-		width:100%;
-		overflow-x:hidden;
+		width: 100%;
+		overflow-x: hidden;
+
 		.total {
 			margin: 36rpx;
 			display: flex;

pagesMy/stayInfo/roomPosition.vue

@@ -7,7 +7,8 @@
 						<text style="margin-left: 30rpx;" v-if="str.name==undefined||str.name==''">请选择所属城市</text>
 						<text style="margin-left: 30rpx;" v-else>{{str.name}}</text>
 					</text>
-					<text>></text>
+					<u-icon name="arrow-right" size="24"></u-icon>
+
 				</view>
 			</view>
 			<view class="card">
@@ -27,7 +28,7 @@
 					</span>
 				</view>
 			</view>
-			<view class="card">
+			<view class="card" style="padding-bottom: 140rpx;">
 				<view class="card1">
 					<text>地图位置</text>
 				</view>
@@ -66,7 +67,7 @@
 	export default {
 		data() {
 			return {
-				
+
 				selectIndex: undefined,
 				selectAddr: {},
 				searchWords: "",
@@ -113,8 +114,8 @@
 				console.log(this.formData, 'this.formData');
 				this.latitude = this.formData.lat
 				this.longitude = this.formData.lon
-				this.markers[0].latitude=this.formData.lat
-				this.markers[0].longitude=this.formData.lon
+				this.markers[0].latitude = this.formData.lat
+				this.markers[0].longitude = this.formData.lon
 			}
 
 			// var self = this;
@@ -151,8 +152,8 @@
 			// });
 		},
 		methods: {
-			changeBegin(){
-				this.visible=true
+			changeBegin() {
+				this.visible = true
 			},
 			myPosition() {
 				var myAmapFun = new amapFile.AMapWX({
@@ -222,12 +223,13 @@
 	}
 
 	.pages {
-		height: 100vh;
+		box-sizing: border-box;
+		height: 100%;
 		background: #F9FAFC;
 
 		.content {
 			padding: 20rpx;
-			height: 100vh;
+			height: 100%;
 
 			.card {
 				background: #fff;
@@ -282,7 +284,7 @@
 		}
 
 		.bottom {
-			position: absolute;
+			position: fixed;
 			bottom: 0;
 			height: 9%;
 			background: #fff;

pagesMy/stayInfo/stayInfo.vue

@@ -4,7 +4,7 @@
 			<view class="card">
 				<view class="card1" @click="goToPosition()">
 					<text>位置定位</text>
-					<text>></text>
+					<u-icon name="arrow-right" size="24"></u-icon>
 				</view>
 			</view>
 			<view class="card">
@@ -20,7 +20,11 @@
 				<view style="margin-top: 20rpx;">
 					<span>
 						<u--textarea border='none' :maxlength='300' count v-model="stayInfo.introduction"
-							placeholder="请输入酒店简介" height='250'></u--textarea>
+							placeholder="请输入酒店简介" height='250'>
+						</u--textarea>
+
+						<!-- <u-parse :content="stayInfo.introduction"></u-parse> -->
+
 					</span>
 				</view>
 			</view>
@@ -52,7 +56,7 @@
 								</u-upload>
 							</view>
 						</u-collapse-item>
-						<!-- <u-collapse-item title="环境照片" name="Docs guide">
+						<u-collapse-item title="环境照片(0/10)" name="Docs guide">
 							<text class="collapseTitle">至少上传1张，建议上传5-10张，需展示完整环境</text>
 							<view class="upload" v-if="fileList1.length==0">
 								<u-upload :fileList="fileList1" multiple :maxCount="10" :maxSize="10 * 1024 * 1024"
@@ -75,7 +79,7 @@
 									</view>
 								</u-upload>
 							</view>
-						</u-collapse-item> -->
+						</u-collapse-item>
 					</u-collapse>
 				</view>
 			</view>
@@ -100,17 +104,34 @@
 				imgUrlList: [],
 				fileList2: [],
 				stayInfo: {
-					picList: []
-				}
+					// picList: []
+				},
+				picList: []
 			}
 		},
 		onLoad() {
 			this.getStayInfo()
 		},
+		filters: {
+			// 去除富文本标签样式
+			removeHtmlStyle(html) {
+				const relStyle = /style\s*?=\s*?(['"])[\s\S]*?\1/g
+				const relTag = /<.+?>/g
+				const relClass = /class\s*?=\s*?(['"])[\s\S]*?\1/g
+				let newHtml = ''
+				if (html) {
+					newHtml = html.replace(relStyle, '')
+					newHtml = newHtml.replace(relTag, '')
+					newHtml = newHtml.replace(relClass, '')
+				}
+				return newHtml
+			}
+		},
 		methods: {
+
 			goToPosition() {
-				const qwe=JSON.stringify(this.stayInfo)
-				console.log(qwe,'qweqweqweqwe');
+				const qwe = JSON.stringify(this.stayInfo)
+				console.log(qwe, 'qweqweqweqwe');
 				uni.navigateTo({
 					url: '/pagesMy/stayInfo/roomPosition?item=' + JSON.stringify(this.stayInfo)
 				})
@@ -119,10 +140,12 @@
 				this.$api.get('/merchant/hotel/mine/getMerchantHomestayInfo/' + '1711268640588517378').then(res => {
 					if (res.data.code == 0) {
 						this.stayInfo = res.data.data
+						// this.stayInfo.introduction.forEach(item => {
+						// 	this.substrings1 = item.content.split('\n');
+						// })
 					} else {
 						uni.showToast({
 							title: res.data.msg,
-
 						})
 						setTimeout(() => {
 							uni.navigateBack()
@@ -143,16 +166,16 @@
 			// 删除图片
 			deletePic(event) {
 				console.log('jinlaile1');
-				this[`stayInfo.picList{event.name}`].splice(event.index, 1)
+				this[`picList{event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
 			async afterRead(event) {
 				console.log('jinlaile2', event);
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
-				let fileListLen = this.stayInfo.picList.length
+				let fileListLen = this.picList.length
 				lists.map((item) => {
-					this.stayInfo.picList.push({
+					this.picList.push({
 						...item,
 						status: 'uploading',
 						message: '上传中'
@@ -160,8 +183,8 @@
 				})
 				for (let i = 0; i < lists.length; i++) {
 					const result = await this.uploadFilePromise(lists[i].url)
-					let item = this.stayInfo.picList[fileListLen]
-					this.stayInfo.picList.splice(fileListLen, 1, Object.assign(item, {
+					let item = this.picList[fileListLen]
+					this.picList.splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
 						url: result
@@ -173,7 +196,8 @@
 				console.log('jinlaile3');
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
+						// url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
+						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
 						filePath: url,
 						name: 'file',
 						formData: {

uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue

@@ -1,43 +1,20 @@
 <template>
-	<view
-	    class="u-tabbar-item"
-	    :style="[$u.addStyle(customStyle)]"
-	    @tap="clickHandler"
-	>
+	<view class="u-tabbar-item" :style="[$u.addStyle(customStyle)]" @tap="clickHandler">
 		<view class="u-tabbar-item__icon">
-			<u-icon
-			    v-if="icon"
-			    :name="icon"
-			    :color="isActive? parentData.activeColor : parentData.inactiveColor"
-			    :size="20"
-			></u-icon>
+			<u-icon v-if="icon" :name="icon" :color="isActive? parentData.activeColor : parentData.inactiveColor"
+				:size="20"></u-icon>
 			<template v-else>
-				<slot
-				    v-if="isActive"
-				    name="active-icon"
-				/>
-				<slot
-				    v-else
-				    name="inactive-icon"
-				/>
+				<slot v-if="isActive" name="active-icon" />
+				<slot v-else name="inactive-icon" />
 			</template>
-			<u-badge
-				absolute
-				:offset="[0, dot ? '34rpx' : badge > 9 ? '14rpx' : '20rpx']"
-			    :customStyle="badgeStyle"
-			    :isDot="dot"
-			    :value="badge || (dot ? 1 : null)"
-			    :show="dot || badge > 0"
-			></u-badge>
+			<u-badge absolute :offset="[0, dot ? '34rpx' : badge > 9 ? '14rpx' : '20rpx']" :customStyle="badgeStyle"
+				:isDot="dot" :value="badge || (dot ? 1 : null)" :show="dot || badge > 0"></u-badge>
 		</view>
-		
+
 		<slot name="text">
-			<text
-			    class="u-tabbar-item__text"
-			    :style="{
+			<text class="u-tabbar-item__text" :style="{
 					color: isActive? parentData.activeColor : parentData.inactiveColor
-				}"
-			>{{ text }}</text>
+				}">{{ text }}</text>
 		</slot>
 	</view>
 </template>
@@ -60,7 +37,7 @@
 	 */
 	export default {
 		name: 'u-tabbar-item',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
 		data() {
 			return {
 				isActive: false, // 是否处于激活状态
@@ -118,7 +95,8 @@
 		align-items: center;
 		justify-content: center;
 		flex: 1;
-		
+		z-index: 99999;
+
 		&__icon {
 			@include flex;
 			position: relative;
@@ -138,5 +116,6 @@
 	:host {
 		flex: 1
 	}
+
 	/* #endif */
-</style>
+</style>

uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue

@@ -1,24 +1,15 @@
 <template>
 	<view class="u-tabbar">
-		<view
-		    class="u-tabbar__content"
-		    ref="u-tabbar__content"
-		    @touchmove.stop.prevent="noop"
-		    :class="[border && 'u-border-top', fixed && 'u-tabbar--fixed']"
-		    :style="[tabbarStyle]"
-		>
+		<view class="u-tabbar__content" ref="u-tabbar__content" @touchmove.stop.prevent="noop"
+			:class="[border && 'u-border-top', fixed && 'u-tabbar--fixed']" :style="[tabbarStyle]">
 			<view class="u-tabbar__content__item-wrapper">
 				<slot />
 			</view>
 			<u-safe-bottom v-if="safeAreaInsetBottom"></u-safe-bottom>
 		</view>
-		<view
-		    class="u-tabbar__placeholder"
-			v-if="placeholder"
-		    :style="{
+		<view class="u-tabbar__placeholder" v-if="placeholder" :style="{
 				height: placeholderHeight + 'px',
-			}"
-		></view>
+			}"></view>
 	</view>
 </template>
 
@@ -45,7 +36,7 @@
 	 */
 	export default {
 		name: 'u-tabbar',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
 		data() {
 			return {
 				placeholderHeight: 0
@@ -54,7 +45,7 @@
 		computed: {
 			tabbarStyle() {
 				const style = {
-					zIndex: this.zIndex
+					zIndex: '99999999'
 				}
 				// 合并来自父组件的customStyle样式
 				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
@@ -94,7 +85,9 @@
 				// 延时一定时间
 				await uni.$u.sleep(20)
 				// #ifndef APP-NVUE
-				this.$uGetRect('.u-tabbar__content').then(({height = 50}) => {
+				this.$uGetRect('.u-tabbar__content').then(({
+					height = 50
+				}) => {
 					// 修复IOS safearea bottom 未填充高度
 					this.placeholderHeight = height
 				})
@@ -120,11 +113,11 @@
 		@include flex(column);
 		flex: 1;
 		justify-content: center;
-		
+
 		&__content {
 			@include flex(column);
 			background-color: #fff;
-			
+
 			&__item-wrapper {
 				height: 50px;
 				@include flex(row);
@@ -138,4 +131,4 @@
 			right: 0;
 		}
 	}
-</style>
+</style>

uni_modules/uview-ui/libs/css/components.scss

@@ -11,5 +11,6 @@ view, scroll-view, swiper-item {
 	flex-basis: auto;
 	align-items: stretch;
 	align-content: flex-start;
+	z-index: 99999;
 }
 /* #endif */

uni_modules/uview-ui/libs/css/mixin.scss

@@ -5,4 +5,5 @@
 	display: flex;
 	/* #endif */
 	flex-direction: $direction;
+	z-index: 99999;
 }