bug 修复

pages.json

@@ -192,22 +192,6 @@
 						"enablePullDownRefresh": true
 					}
 				},
-				{
-					"path": "home/moneyBill",
-					"style": {
-						"navigationBarTitleText": "资金账单",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "home/moneyBillDetail",
-					"style": {
-						"navigationBarTitleText": "账单详情",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				},
 				{
 					"path": "home/orderBillDetail",
 					"style": {

pagesHouse/Mine/Businesses/Businesses.vue

@@ -119,12 +119,12 @@
 		</view>
 		<view class="from-content" style="padding: 30rpx;">
 			<view class="tenant-image">
-				<view @click="idCardFront">
-					<image :src="list.idCardFront" mode=""></image>
-					<view>法人身份证国徽面</view>
-				</view>
 				<view @click="idCardReverse">
 					<image :src="list.idCardReverse" mode=""></image>
+					<view>法人身份证国徽面</view>
+				</view>
+				<view @click="idCardFront">
+					<image :src="list.idCardFront" mode=""></image>
 					<view>法人身份证人像面</view>
 				</view>
 				<view @click="licensePic">

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="page" :style="{'min-height':h+'px'}">
-
+	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="商户信息"></c-nav-bar>
 		<view class="from-content">
 			<view class="one-image" @click="upImage">
 				<view class="user">

pagesHouse/home/bill.vue

@@ -14,12 +14,12 @@
 			<view class="money">
 				<view>
 					<text>收入金额</text>
-					<text class="in">+{{merchantType==10?info.paymentAmount||0:info.orderAmount||0}}</text>
+					<text class="in">+￥{{merchantType==10?info.paymentAmount||0:info.orderAmount||0}}</text>
 					<text>{{merchantType==10?info.paymentCount:info.orders||0}}笔</text>
 				</view>
 				<view>
 					<text>退款金额</text>
-					<text>{{merchantType==10?info.refundAmount:info.refundOrderAmount||0}}</text>
+					<text>￥{{merchantType==10?info.refundAmount:info.refundOrderAmount||0}}</text>
 					<text>{{merchantType==10?info.refundCount:info.refundOrders||0}}笔</text>
 				</view>
 			</view>
@@ -27,10 +27,10 @@
 				<view class="li" v-for="(item,index) in info.pageData.list" :key="index" @click="detail(item)">
 					<view class="left">
 						<text>{{item.playDate}}
-							{{item.playTime}}出发/{{item.orderType==2?'包船':'拼船'}}/{{item.boatNo}}</text>
+							{{item.playTime}}出发/{{item.orderType==2?'包船':'拼船'}}/{{item.boatNo||''}}</text>
 						<text>{{item.payTime}}</text>
 					</view>
-					<view class="right">{{item.realPrice}}</text>
+					<view class="right">￥{{item.realPrice}}</text>
 					</view>
 				</view>
 			</template>

pagesHouse/home/moneyBill.vue

@@ -1,92 +0,0 @@
-<template>
-	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
-		<c-nav-bar title="资金账单"></c-nav-bar>
-		<view class="time">
-			<view>
-				<text>2024-02月</text>
-				<u-icon name="arrow-down" color="#999" size="25px"></u-icon>
-			</view>
-			<text>提现¥1000.00</text>
-		</view>
-		<view class="list">
-			<view class="li" v-for="(item,index) in data" :key="index" @click="detail()">
-				<view class="left">
-					<text>黄沙村渔家乐12客位</text>
-					<text>2024-02-23 09:12:34</text>
-				</view>
-				<view class="right">+12</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	export default {
-		data() {
-			return {
-				h: uni.getSystemInfoSync().windowHeight - 87,
-				mt: uni.getSystemInfoSync().statusBarHeight + 44,
-				data: [4, 5],
-			}
-		},
-		methods:{
-			detail(){
-				uni.navigateTo({
-					url:"/pagesHouse/home/moneyBillDetail"
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.time {
-		display: flex;
-		justify-content: space-between;
-		padding: 24rpx;
-		background-color: #F5F8FA;
-		&>view {
-			display: flex;
-			align-items: center;
-			text {
-				font-size: 30rpx;
-				color: #111;
-				margin-right: 10rpx;
-			}
-		}
-
-		&>text {
-			font-size: 26rpx;
-			color: #999;
-		}
-	}
-	.list{
-		padding: 0 24rpx;
-		.li {
-			display: flex;
-			justify-content: space-between;
-			padding: 30rpx 0;
-			border-bottom: 1rpx solid #EFEFEF;
-		
-			.left {
-				text {
-					&:first-child {
-						font-size: 28rpx;
-						color: #111;
-						margin-bottom: 15rpx;
-					}
-		
-					display: block;
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		
-			.right {
-				color: #111111;
-				font-size: 36rpx;
-				font-weight: bold;
-			}
-		}
-	}
-</style>

pagesHouse/home/moneyBillDetail.vue

@@ -1,84 +0,0 @@
-<template>
-	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
-		<c-nav-bar title="账单详情"></c-nav-bar>
-		<view class="box">
-			<image src="https://i.ringzle.com/file/20240224/d2b9acd9522747ac89239dcde0894c93.png"></image>
-			<text class="tit">黄沙村渔家乐12客位</text>
-			<text class="money">+<text>200.00</text></text>
-		</view>
-		<view class="info">
-			<view class="li">
-				<text>当前状态</text>
-				<text>交易成功</text>
-			</view>
-			<view class="li">
-				<text>创建时间</text>
-				<text>2024-02-16 11:39:24</text>
-			</view>
-			<view class="li">
-				<text>订单号</text>
-				<text>20987877676667888w</text>
-			</view>
-			<view class="li">
-				<text>交易类型</text>
-				<text>结算提现</text>
-			</view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-
-</script>
-
-<style scoped lang="scss">
-	.box {
-		width: calc(100% - 80rpx);
-		padding: 30rpx 0 60rpx;
-		color: #333;
-		border-bottom: 1rpx solid #EFEFEF;
-		text-align: center;
-
-		image {
-			width: 80rpx;
-			height: 80rpx;
-		}
-
-		text {
-			display: block;
-
-		}
-
-		.tit {
-			margin: 26rpx 0 14rpx;
-			font-size: 26rpx;
-		}
-
-		.money {
-			font-size: 28rpx;
-			text {
-				display: inline-block;
-				font-weight: bold;
-				font-size: 32rpx;
-			}
-		}
-	}
-
-	.info {
-		padding: 60rpx 40rpx 0;
-
-		.li {
-			margin-bottom: 32rpx;
-			text{
-				&:first-child{
-					display: inline-block;
-					width: 104rpx;
-					color: #999;
-				}
-				margin-right: 40rpx;
-				color: #111;
-			}
-		}
-	}
-</style>

pagesHouse/home/orderList.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
+	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
 		<c-nav-bar title="订单列表"></c-nav-bar>
 		<view class="query">
 			<u-icon @click="show=true" name="calendar" label="自定义查询" labelPos="right" labelColor="#666" color="#666"

pagesHouse/home/tj.vue

@@ -15,12 +15,12 @@
 			<view class="money">
 				<view>
 					<text>收入金额</text>
-					<text class="in">+{{info.allOrderAmount||0}}</text>
+					<text class="in">+￥{{info.allOrderAmount||0}}</text>
 					<text>{{info.allOrders||0}}笔</text>
 				</view>
 				<view>
 					<text>退款金额</text>
-					<text>{{info.allRefundOrderAmount||0}}</text>
+					<text>￥{{info.allRefundOrderAmount||0}}</text>
 					<text>{{info.allRefundOrders||0}}笔</text>
 				</view>
 			</view>
@@ -28,8 +28,8 @@
 		<view class="chart">
 			<view class="tit">累计曲线图</view>
 			<view class="total">
-				<view class="t1">总收入<text>{{total}}</text></view>
-				<view class="t2">总退款<text>{{total2}}</text></view>
+				<view class="t1">总收入<text>￥{{total}}</text></view>
+				<view class="t2">总退款<text>￥{{total2}}</text></view>
 			</view>
 			<view class="line_charts_two">
 				<qiun-data-charts type="line" canvas2d='true' style="z-index: 1;" :opts="gameOpts"