bug修复、样式调整

pagesHouse/Mine/index.vue

@@ -2,7 +2,8 @@
 	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
 		<image class="bg_img" src="https://i.ringzle.com/file/20240129/3931d06eaa3346c9955aa7e5e535a95b.png"
 			mode="widthFix"></image>
-		<view class="account" :style="{'margin-top':(mt-44)+'px'}">
+		<!-- <view class="account" :style="{'margin-top':(mt-44)+'px'}"> -->
+		<view class="account">
 			<view class="a_left">
 				<view class="al_avatar">
 					<image :src="dto.storeFrontPic"></image>
@@ -412,7 +413,7 @@
 				border-radius: 36rpx;
 				// line-height: 60rpx;
 				text-align: center;
-				font-size: 26rpx;
+				font-size: 26rpx; 
 				font-family: PingFang-SC, PingFang-SC;
 				font-weight: bold;
 				color: #FFFFFF;
@@ -420,7 +421,8 @@
 		}
 
 		.orders {
-			margin-top: 20rpx;
+			// margin-top: 20rpx;
+			margin-top: 40rpx;
 			padding: 40rpx 0;
 
 			.o_title {

pagesHouse/Mine/ordersList/details/details.vue

@@ -56,8 +56,8 @@
 				</view>
 				<view class="li" v-for="(item,inex) in infoMation.productsDetail" :key="index">
 					<text>{{item.name}}</text>
-					<text>{{item.number}}</text>
-					<text>￥{{item.price}}</text>
+					<text>{{item.number}}(份)</text> 
+					<text>￥{{item.price}}</text> 
 				</view>
 			</view>
 			<!-- 游客信息 -->

pagesHouse/Mine/ordersList/index.vue

@@ -59,7 +59,7 @@
 							</view>
 							<span class='info' style="display: flex; justify-content: space-between;">
 								<span>
-									<span style="margin-right: 15rpx;">{{item.activityStartTime||''}}{{item.activityEndTime}}</span>
+									<span style="margin-right: 15rpx;">{{item.activityStartTime||''}}至{{item.activityEndTime}}</span>
 								</span>
 								<span>x{{item.num}}</span>
 							</span>

pagesHouse/home/bill.vue

@@ -156,9 +156,9 @@
 					dateType: '1',
 					merchantId: uni.getStorageSync('merchantId')
 				}).then(res => {
-					console.log(res.data)
 					if (res.data.code === 0) {
-						this.info = res.data.data;
+						this.info = res.data.data;
+						this.merchantOrderDTOSList = this.info.merchantOrderDTOS;
 					} else {
 						this.info = {
 							orderAmount: 0,
@@ -166,7 +166,8 @@
 							refundOrderAmount: 0,
 							fishermanOrderDTOS: [],
 							refundOrders: 0,
-						}
+						}
+						this.merchantOrderDTOSList = [];
 					}
 				})
 			},

pagesHouse/home/orderBillDetail.vue

@@ -28,7 +28,7 @@
 			</view> -->
 			<view class="li">
 				<text>商品名称</text>
-				<text>{{merchantType==10?infoMation.goodsName:infoMation.thingName}}</text>
+				<text>{{merchantType==10?infoMation.goodsName:(infoMation.thingName||infoMation.productName)}}</text>
 			</view>
 		</view>
 	</view>