11

components/tab-bar/myCenter.vue

@@ -52,7 +52,7 @@
 				uni.setStorageSync('shopIcon',item.shopIcon)
 				uni.setStorageSync('shopScore',item.shopScore)
 				uni.navigateTo({
-					url: '/package1/myCenter/merchantCenter'
+					url: '/package2/shop/merchantCenter'
 				})
 			},
 			navigatorTo(e){
@@ -68,7 +68,7 @@
 						uni.setStorageSync('shopName',this.schoolShop[0].shopName)
 						uni.setStorageSync('shopIcon',this.schoolShop[0].shopIcon)
 						uni.setStorageSync('shopScore',this.schoolShop[0].shopScore)
-						url = '/package1/myCenter/merchantCenter'
+						url = '/package2/shop/merchantCenter'
 					}else{
 						url = '/package1/myCenter/myMerchant'
 					}

package1/myCenter/shopSettlementDetail.vue

@@ -1,9 +0,0 @@
-<template>
-	<!-- 商家订单结算详情 -->
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

package1/myCenter/merchantCenter.vue → package2/shop/merchantCenter.vue

@@ -243,7 +243,7 @@
 						url = '/package1/myCenter/dataStatistics'
 						break;
 					case 'db':
-						url = '/package1/myCenter/shopOrderList?index=' + index
+						url = '/package1/shop/shopOrderList?index=' + index
 						break;
 					case 'sp':
 						url = '/package1/myCenter/goodsList'
@@ -252,10 +252,10 @@
 						url = ''
 						break;
 					case 'dd':
-						url = '/package1/myCenter/shopOrderList'
+						url = '/package1/shop/shopOrderList'
 						break;
 					case 'zd':
-						url = '/package1/myCenter/shopBill'
+						url = '/package2/shop/shopBill'
 						break;
 					case 'pj':
 						let item = {

package2/shop/orderDetail.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 商家订单详情 -->
 	<view class="page1">
 		<view class="title">
 			<view class="title-sreach">

package1/myCenter/shopBill.vue → package2/shop/shopBill.vue

@@ -16,7 +16,7 @@
 				<view class="content11">
 					2026
 				</view>
-				<view class="box1">
+				<view class="box1" @tap="goDetail">
 					<view class="content22">
 						<view class="">
 							10/25-10/25账单
@@ -106,6 +106,11 @@
 			
 		},
 		methods: {
+			goDetail(){
+				uni.navigateTo({
+					url:'/package2/shop/shopSettlementDetail'
+				})
+			},
 			back() {
 				uni.navigateBack()
 			},

package2/shop/shopSettlementDetail.vue

@@ -0,0 +1,157 @@
+<template>
+	<!-- 商家订单详情 -->
+	<view class="page1">
+		<view class="title">
+			<view class="title-sreach">
+				<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
+					<uni-icons type="left" size="28"></uni-icons>
+				</view>
+				<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
+					账单详情
+				</view>
+			</view>
+		</view>
+		<view class="content">
+			<view class="box1">
+				<view style="font-size: 14px;font-weight: 700;margin-bottom: 10px;">
+					2026-04-09
+				</view>
+				<view style="display: flex;font-weight: 700;">
+					<view style="flex: 1;">
+						结算金额：￥100.00
+					</view>
+					<view style="flex: 1;">
+						实际打款金额：￥100.00
+					</view>
+				</view>
+			</view>
+			<view class="box1">
+				<uni-table border stripe emptyText="暂无更多数据" >
+					<!-- 表头行 -->
+					<uni-tr>
+						<uni-th width="90" align="center">订单编号</uni-th>
+						<uni-th width="90" align="center">商品金额</uni-th>
+						<uni-th width="90" align="center">餐盒费</uni-th>
+						<uni-th width="90" align="center">平台抽佣</uni-th>
+						<uni-th width="90" align="center">结算金额</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr>
+						<uni-td align="center">5154564164654</uni-td>
+						<uni-td align="center">24</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">22</uni-td>
+					</uni-tr>
+					<uni-tr>
+						<uni-td align="center">5154564164654</uni-td>
+						<uni-td align="center">24</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">22</uni-td>
+					</uni-tr>
+					<uni-tr>
+						<uni-td align="center">5154564164654</uni-td>
+						<uni-td align="center">24</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">22</uni-td>
+					</uni-tr>
+					<uni-tr>
+						<uni-td align="center">5154564164654</uni-td>
+						<uni-td align="center">24</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">1</uni-td>
+						<uni-td align="center">22</uni-td>
+					</uni-tr>
+				</uni-table>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				menuButtonInfo: {},
+			}
+		},
+		filters:{
+			formatISOTime(isoString) {
+			  const date = new Date(isoString);
+			  const year = date.getFullYear();
+			  const month = (date.getMonth() + 1).toString().padStart(2, '0');
+			  const day = date.getDate().toString().padStart(2, '0');
+			  const hours = date.getHours().toString().padStart(2, '0');
+			  const minutes = date.getMinutes().toString().padStart(2, '0');
+			  const seconds = date.getSeconds().toString().padStart(2, '0');
+			  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			}
+		},
+		onShow() {
+			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+		},
+		onLoad() {
+		},
+		methods: {
+			back() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		width: 100%;
+		height: 100%;
+		font-size: 24rpx;
+		background: #F5F8F5;
+		color: #00231C;
+	}
+
+	.page1 {
+		width: 100%;
+		height: 100%;
+		font-size: 24rpx;
+		position: relative;
+	}
+
+	.title {
+		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
+		width: 100%;
+		height: 20%;
+	}
+
+	.title-sreach {
+		width: 100%;
+		display: flex;
+		height: 200rpx;
+		position: relative;
+	}
+
+	.back-btn {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+	}
+
+	.title-name {
+		padding-top: 110rpx;
+		font-size: 36rpx;
+		font-weight: 700;
+		flex: 1;
+		text-align: center;
+	}
+	.content{
+		margin: -140rpx auto;
+	}
+	.box1 {
+		width: 95%;
+		margin: 20rpx auto;
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	}
+</style>

pages.json

@@ -154,12 +154,6 @@
 				"navigationBarTitleText": "兼职注册",
 				"navigationStyle": "custom"
 			}
-		},{
-			"path": "myCenter/shopSettlementDetail",
-			"style": {
-				"navigationBarTitleText": "商家订单结算详情",
-				"navigationStyle": "custom"
-			}
 		},{
 			"path": "myCenter/partTimeJob",
 			"style": {
@@ -196,12 +190,6 @@
 				"navigationBarTitleText": "个人中心",
 				"navigationStyle": "custom"
 			}
-		},{
-			"path": "myCenter/merchantRegister",
-			"style": {
-				"navigationBarTitleText": "商家注册",
-				"enablePullDownRefresh": false
-			}
 		},{
 			"path": "myCenter/addGoods",
 			"style": {
@@ -214,30 +202,12 @@
 				"navigationBarTitleText": "新增分类",
 				"navigationStyle": "custom"
 			}
-		},{
-			"path": "myCenter/merchantCenter",
-			"style": {
-				"navigationBarTitleText": "商家中心",
-				"navigationStyle": "custom"
-			}
-		},{
-			"path": "myCenter/shopBill",
-			"style": {
-				"navigationBarTitleText": "商家账单",
-				"navigationStyle": "custom"
-			}
 		},{
 			"path": "myCenter/dataStatistics",
 			"style": {
 				"navigationBarTitleText": "数据统计",
 				"navigationStyle": "custom"
 			}
-		},{
-			"path": "myCenter/shopOrderList",
-			"style": {
-				"navigationBarTitleText": "商家订单",
-				"navigationStyle": "custom"
-			}
 		},{
 			"path": "myCenter/goodsList",
 			"style": {
@@ -269,6 +239,36 @@
 				"navigationBarTitleText": "商家订单详情",
 				"navigationStyle": "custom"
 			}
+		},{
+			"path": "shop/shopSettlementDetail",
+			"style": {
+				"navigationBarTitleText": "商家订单结算详情",
+				"navigationStyle": "custom"
+			}
+		},{
+			"path": "shop/merchantCenter",
+			"style": {
+				"navigationBarTitleText": "商家中心",
+				"navigationStyle": "custom"
+			}
+		},{
+			"path": "shop/shopBill",
+			"style": {
+				"navigationBarTitleText": "商家账单",
+				"navigationStyle": "custom"
+			}
+		},{
+			"path": "shop/merchantRegister",
+			"style": {
+				"navigationBarTitleText": "商家注册",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "shop/shopOrderList",
+			"style": {
+				"navigationBarTitleText": "商家订单",
+				"navigationStyle": "custom"
+			}
 		},{
 			"path": "partTimeJob/partTimeJobCenter",
 			"style": {

pages/index/index.vue

@@ -370,6 +370,9 @@
 		data() {
 			return {
 				pages:[{
+					name:'商家账单详情111',
+					url:'/package2/shop/shopSettlementDetail'
+				},{
 					name:'商家订单详情111',
 					url:'/package2/shop/orderDetail'
 				},{
@@ -455,7 +458,7 @@
 					url:'/package1/myCenter/myCenter'
 				},{
 					name:'商家注册',
-					url:'/package1/myCenter/merchantRegister'
+					url:'/package2/shop/merchantRegister'
 				},{
 					name:'发布',
 					url:'/package1/tabbar/release'