diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 04a4895..361388f 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -48,7 +48,7 @@
 				if(index == this.select){
 					return
 				}
-				uni.redirectTo({
+				uni.reLaunch({
 					url: item.pagePath
 				})
 			},
@@ -72,7 +72,7 @@
 	height: 120rpx;
 	// padding-bottom: env(safe-area-inset-bottom);
 	padding: 10rpx 0rpx;
-	z-index: 999999;
+	z-index: 9999;
 	bottom: 0;
 	left: 0;
 	color: #BCBCBC;
diff --git a/pages.json b/pages.json
index 415aabb..1daa75d 100644
--- a/pages.json
+++ b/pages.json
@@ -1,15 +1,6 @@
 {
-	"pages": [{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		}, {
-			"path": "pages/login/wxUserInfo",
-			"style": {
-				"navigationBarTitleText": "用户信息"
-			}
-		}, {
+	"pages": [
+		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "打卡"
@@ -20,6 +11,7 @@
 			"style": {
 				"navigationBarTitleText": "我的"
 			}
+<<<<<<< HEAD
 		},
 		{
 			"path": "pages/record/record",
@@ -40,21 +32,46 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+=======
+>>>>>>> 260f70e59eebfa09281d5d57173337efd210e7dc
 		}
 	],
-	// "preloadRule": {
-	// 	"pages/index/index": {
-	// 		"network": "all",
-	// 		"packages": ["pages_order"]
-	// 	}
-	// },
-	// "subPackages": [{
-	// 	"root": "pages_order",
-	// 	"pages": [{
-	// 			"path": "order/orderDetail"
-	// 		}
-	// 	]
-	// }],
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": ["pages_order"]
+		}
+	},
+	"subPackages": [{
+		"root": "pages_order",
+		"pages": [
+			{
+				"path": "auth/login",
+				"style": {
+					"navigationBarTitleText": "登录"
+				}
+			}, 
+			{
+				"path": "auth/wxUserInfo",
+				"style": {
+					"navigationBarTitleText": "用户信息"
+				}
+			},
+			{
+				"path": "record/record",
+				"style": {
+					"navigationBarTitleText": "打卡记录"
+				}
+			},
+			{
+				"path" : "autonym/autonym",
+				"style" : 
+				{
+					"navigationBarTitleText" : ""
+				}
+			}
+		]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "酒店桌布",
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
deleted file mode 100644
index 4c9a7c2..0000000
--- a/pages/index/cart.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<template>
-	<view class="page">
-		<navbar/>
-
-		<view class="user">
-			<uv-checkbox-group 
-			shape="circle"
-			v-model="checkboxValue">
-				
-				<uv-swipe-action>
-					<view
-					v-for="(item, index) in list"
-					:key="index">
-						<view style="margin-top: 20rpx;"></view>
-						<uv-swipe-action-item 
-						:options="options">
-							<view class="item">
-								<view class="checkbox">
-									<uv-checkbox
-										:name="item.id"
-										activeColor="#FA5A0A"
-										size="40rpx"
-										icon-size="35rpx"
-									></uv-checkbox>
-								</view>
-								
-								<image 
-								class="image"
-								src="https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg" 
-								mode=""></image>
-								
-								<view class="info">
-									<view class="title">
-										<view class="">
-											{{ item.title }}
-										</view>
-										<view class="">
-											<uv-number-box v-model="item.num" 
-											@change="valChange"></uv-number-box>
-										</view>
-									</view>
-									<view class="unit">
-										规格：{{ item.unit }}
-										<uv-icon name="arrow-down"></uv-icon>
-									</view>
-									<view class="price">
-										￥<text>{{ item.price }}</text>元
-									</view>
-								</view>
-							</view>
-						</uv-swipe-action-item>
-					</view>
-				</uv-swipe-action>
-			</uv-checkbox-group>
-			
-			<view class="action">
-				<view class="icon">
-					<image src="/static/image/cart/1.png" mode=""></image>
-					<view class="num">
-						{{ checkboxValue.length }}
-					</view>
-				</view>
-				<view class="price">
-					<view class="count">
-						合计
-						<view class="">
-							￥<text>{{ totalPrice }}</text>
-						</view>
-					</view>
-					<view class="text">
-						共{{ checkboxValue.length }}件，已享受更低优惠
-					</view>
-				</view>
-				<view class="btn">
-					去结算
-				</view>
-			</view>
-		</view>
-
-		<tabber select="3" />
-	</view>
-</template>
-
-<script>
-	import tabber from '@/components/base/tabbar.vue'
-	export default {
-		components: {
-			tabber,
-		},
-		data() {
-			return {
-				value : 0,
-				checkboxValue : [],
-				options: [
-					{
-						text: '删除',
-						style: {
-							backgroundColor: '#FA5A0A'
-						}
-					}, 
-				],
-				list : [
-					{
-						id : 1,
-						title : '桌布租赁',
-						num : 1,
-						price : 299,
-						unit : '120*40*75【桌子尺寸】',
-					},
-					{
-						id : 2,
-						title : '桌布租赁',
-						num : 1,
-						price : 299,
-						unit : '120*40*75【桌子尺寸】',
-					},
-				],
-			}
-		},
-		computed: {
-			totalPrice(){
-				if (!this.checkboxValue.length) {
-					return 0
-				}
-				let price = 0
-				this.list.forEach(n => {
-					if(this.checkboxValue.includes(n.id)){
-						price += n.price * n.num
-					}
-				})
-				return price
-			},
-		},
-		methods: {
-			valChange(){
-				
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.page {
-		padding-bottom: 200rpx;
-		/deep/ .uv-swipe-action{
-			width: 100%;
-		}
-	}
-
-	.user {
-		.item{
-			background-color: #fff;
-			display: flex;
-			padding: 30rpx;
-			.checkbox{
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-			.image{
-				width: 200rpx;
-				height: 200rpx;
-				border-radius: 20rpx;
-			}
-			.info{
-				flex: 1;
-				.title{
-					display: flex;
-					padding: 10rpx 20rpx;
-					justify-content: space-between;
-					
-				}
-				.unit{
-					font-size: 24rpx;
-					padding: 10rpx 20rpx;
-					color: #717171;
-					display: flex;
-					align-items: center;
-				}
-				.price{
-					color: $uni-color;
-					font-size: 28rpx;
-					padding: 10rpx 20rpx;
-					text{
-						font-size: 36rpx;
-						font-weight: 900;
-					}
-				}
-			}
-		}
-		.action{
-			width: 700rpx;
-			position: fixed;
-			bottom: 220rpx;
-			left: 25rpx;
-			background-color: #fff;
-			height: 100rpx;
-			border-radius: 50rpx;
-			box-shadow: 0 0 6rpx 6rpx #00000010;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			overflow: hidden;
-			.icon{
-				position: relative;
-				width: 80rpx;
-				height: 80rpx;
-				margin: 0 20rpx;
-				image{
-					width: 80rpx;
-					height: 80rpx;
-				}
-				.num{
-					position: absolute;
-					right: 10rpx;
-					top: 0rpx;
-					background-color: $uni-color;
-					color: #fff;
-					font-size: 18rpx;
-					border-radius: 50%;
-					height: 30rpx;
-					width: 30rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-				}
-			}
-			.price{
-				.count{
-					display: flex;
-					font-size: 26rpx;
-					align-items: center;
-					view{
-						color: $uni-color;
-						margin-left: 10rpx;
-						text{
-							font-size: 32rpx;
-							font-weight: 900;
-						}
-					}
-				}
-				.text{
-					font-size: 20rpx;
-					color: #717171;
-				}
-			}
-			.btn{
-				margin-left: auto;
-				background-color: $uni-color;
-				height: 100%;
-				padding: 0 50rpx;
-				color: #fff;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 802bca3..4a5296d 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -55,11 +55,11 @@
 			clickMenu(index){
 				if(index == 1){
 					uni.navigateTo({
-						url: "/pages/record/record"
+						url: "/pages_order/record/record"
 					})
 				}else if(index == 2){
 					uni.navigateTo({
-						url: "/pages/autonym/autonym"
+						url: "/pages_order/autonym/autonym"
 					})
 				}
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c511c5e..7c4f7cd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -42,7 +42,7 @@
 		</div>
 
 		<!-- tab栏 -->
-		<tabbar v-if="!broadsideShow" :select="0"></tabbar>
+		<tabbar :select="0"></tabbar>
 
 		<!-- 侧边栏 -->
 		<broadside ref="broadside"></broadside>
@@ -50,8 +50,8 @@
 </template>
 
 <script>
-	import tabbar from '../../components/base/tabbar.vue'
-	import broadside from '../../components/broadside/broadside.vue'
+	import tabbar from '@/components/base/tabbar.vue'
+	import broadside from '@/components/broadside/broadside.vue'
 
 	export default {
 		name: "Home",
@@ -61,7 +61,6 @@
 		},
 		data() {
 			return {
-				broadsideShow: false, //是否显示遮罩层
 				latitude: 39.909,
 				longitude: 116.39742,
 				covers: []
@@ -81,7 +80,6 @@
 			//打开侧边栏
 			openBroadside() {
 				this.$refs.broadside.open()
-				this.broadsideShow = true;
 			},
 
 			//获取用户位置
@@ -97,8 +95,13 @@
 							latitude: res.latitude,
 							longitude: res.longitude,
 							iconPath: '/static/image/home/location.png',
+<<<<<<< HEAD
 							width: 30,
 							height: 30
+=======
+							width : 38,
+							height : 30,
+>>>>>>> 260f70e59eebfa09281d5d57173337efd210e7dc
 						})
 					},
 					fail() {
diff --git a/pages/index/order.vue b/pages/index/order.vue
deleted file mode 100644
index 40a85c9..0000000
--- a/pages/index/order.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-	<view class="page">
-		
-		<navbar
-		title="订单中心"
-		/>
-		
-		<uv-tabs :list="tabs" 
-		:activeStyle="{color : '#FD5100', fontWeight : 600}"
-		lineColor="#FD5100"
-		lineHeight="8rpx"
-		lineWidth="50rpx"
-		@click="clickTabs"></uv-tabs>
-		
-		<view v-if="orderList.length > 0" class="list">
-			<view class="item" 
-			v-for="(item, index) in orderList.records" 
-			@click="toOrderDetail(item.id)"
-			:key="index">
-	
-				<view class="top">
-					<view class="service">
-						<text>{{item.projectId_dictText}}</text>
-						<text>{{item.type_dictText}}</text>
-					</view>
-					<view class="status">
-						<text> {{item.state_dictText}}</text>
-					</view>
-				</view>
-	
-				<view class="content">
-	
-					<view class="left">
-						<image mode="aspectFill" :src="item.image"></image>
-					</view>
-	
-					<view class="right">
-						<view class="text-hidden-1">
-							客户姓名：{{item.name}}
-						</view>
-						<view class="text-hidden-1">
-							产品规格：{{item.unit}}
-						</view>
-						<view class="text-hidden-1">
-							租赁地址：{{item.address}}
-						</view>
-						<!-- <view class="text-hidden-1">
-							总计时间：{{item.useTime}}分钟
-						</view> -->
-						
-					</view>
-	
-				</view>
-	
-				<view class="bottom">
-					<view class="price">
-						总价格：<text class="num">{{item.money}}元</text>
-					</view>
-					<view class="b1">
-						查看物流
-					</view>
-					<!-- <view @click.stop="toPayOrder(item)" class="b2" v-if="item.state == 0">
-						立即付款
-					</view>
-					<view class="b1" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 3">
-						再来一单
-					</view>
-					<view class="b2" @click.stop="toEvaluate(item.id,item.projectId,item.technicianId)" v-if="item.state == 3">
-						立即评价
-					</view>
-					<view class="b2" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 4">
-						再来一单
-					</view> -->
-				</view>
-	
-			</view>
-		</view>
-		
-		<tabber select="2"/>
-	</view>
-</template>
-
-<script>
-	import tabber from '@/components/base/tabbar.vue'
-	import { mapGetters } from 'vuex'
-	export default {
-		components : {
-			tabber,
-		},
-		data() {
-			return {
-				tabs: [{
-						name: '全部'
-					},
-					{
-						name: '租赁押金'
-					},
-					{
-						name: '水洗租赁'
-					},
-					{
-						name: '破损换货'
-					},
-					{
-						name: '退货退款'
-					}
-				],
-				queryParams: {
-					pageNo: 1,
-					pageSize: 10
-				},
-				// orderList: [
-				// 	{
-				// 		money : 99.99,
-				// 		address : '广东省广州市越秀区城南故事C3栋2802',
-				// 		name : '李**',
-				// 		phone : '150*****091',
-				// 		unit : '120*40*75【桌子尺寸】',
-				// 		image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
-				// 		state_dictText : '已完成',
-				// 	}
-				// ], //订单列表数据
-				orderList : {
-					records : [],
-					total : 0,
-				},
-				state : -1,
-			}
-		},
-		onShow() {
-			this.orderPage()
-		},
-		//滚动到屏幕底部
-		onReachBottom() {
-			if(this.queryParams.pageSize < this.orderList.total){
-				this.queryParams.pageSize += 10
-				this.orderPage()
-			}
-		},
-		methods: {
-			orderPage(){
-				let queryParams = {
-					...this.queryParams,
-				}
-				if(this.state != -1){
-					queryParams.state = this.state
-				}
-				this.$api('orderPage', queryParams, res => {
-					if(res.code == 200){
-						this.orderList = res.result
-					}
-				})
-			},
-			//点击tab栏
-			clickTabs(index) {
-				if (index == 0) {
-					this.state = -1;
-				} else {
-					this.state = index - 1;
-				}
-				this.queryParams.pageSize = 10
-				this.orderPage()
-			},
-			//跳转订单详情页面
-			toOrderDetail(id) {
-				uni.navigateTo({
-					url: '/pages_order/order/orderDetail?id=' + id
-				})
-			},
-			getOrderList(){
-				
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.page{
-	}
-	.list {
-		.item {
-			width: calc(100% - 40rpx);
-			background-color: #fff;
-			margin: 20rpx;
-			box-sizing: border-box;
-			border-radius: 16rpx;
-			padding: 30rpx;
-	
-			.top {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: 30rpx;
-	
-				.service {}
-	
-				.status {
-					font-size: 26rpx;
-					font-weight: 600;
-				}
-			}
-	
-			.content {
-				display: flex;
-				margin: 10rpx 0;
-	
-				.left {
-					width: 150rpx;
-					height: 150rpx;
-					border-radius: 10rpx;
-	
-					image {
-						width: 150rpx;
-						height: 150rpx;
-						border-radius: 10rpx;
-					}
-				}
-	
-				.right {
-					width: calc(100% - 160rpx);
-					color: #777;
-					font-size: 24rpx;
-					padding-left: 20rpx;
-					line-height: 40rpx;
-					background-color: #F8F8F8;
-				}
-			}
-	
-			.bottom {
-				display: flex;
-				justify-content: space-between;
-				font-size: 25rpx;
-				.price {
-					font-weight: 900;
-					text {
-						color: #ff780099;
-						font-size: 30rpx;
-					}
-				}
-				.b1 {
-					border: 1px solid #777;
-					color: #777;
-					box-sizing: border-box;
-				}
-	
-				.b2 {
-					background: linear-gradient(178deg, #4FD3BC, #60C285);
-					color: #fff;
-				}
-	
-				view {
-					margin: 12rpx;
-					border-radius: 28rpx;
-					padding: 8rpx 28rpx;
-					margin-bottom: 0;
-				}
-			}
-		}
-	}
-</style>
diff --git a/pages/login/login.vue b/pages_order/auth/login.vue
similarity index 100%
rename from pages/login/login.vue
rename to pages_order/auth/login.vue
diff --git a/pages/login/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
similarity index 96%
rename from pages/login/wxUserInfo.vue
rename to pages_order/auth/wxUserInfo.vue
index 3f229ef..933745c 100644
--- a/pages/login/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -46,7 +46,7 @@
 		data() {
 			return {
 				userInfo: {
-					headImage: '/static/image/login/user.png', //设置了一个本地默认头像
+					headImage: '../static/login/user.png', //设置了一个本地默认头像
 					nickName: '',
 					name: ''
 				}
@@ -91,7 +91,7 @@
 						// 	}
 						// })
 						
-						uni.navigateTo({
+						uni.reLaunch({
 							url: "/pages/index/index"
 						})
 					})
diff --git a/pages/autonym/autonym.vue b/pages_order/autonym/autonym.vue
similarity index 100%
rename from pages/autonym/autonym.vue
rename to pages_order/autonym/autonym.vue
diff --git a/pages/record/record.vue b/pages_order/record/record.vue
similarity index 96%
rename from pages/record/record.vue
rename to pages_order/record/record.vue
index 98d8972..45aca35 100644
--- a/pages/record/record.vue
+++ b/pages_order/record/record.vue
@@ -2,7 +2,15 @@
 <template>
 	<view class="record">
 		<!-- 自定义导航栏 -->
-		<uni-nav-bar dark :fixed="true" shadow background-color="var(--main-color)" status-bar left-icon="left" title="签到记录" @clickLeft="toHome" />
+		<uni-nav-bar 
+		dark 
+		:fixed="true" 
+		shadow 
+		background-color="var(--main-color)" 
+		status-bar 
+		left-icon="left" 
+		title="签到记录" 
+		@clickLeft="$utils.navigateBack" />
 
 		<!-- 签到日历 -->
 		<view class="sign-calendar main">
@@ -120,12 +128,6 @@
 					`${currentMonth < 10 ? "0" + currentMonth : currentMonth}.${currentDay < 10 ? "0" + currentDay : currentDay}`
 			},
 			
-			//返回首页
-			toHome(){
-				uni.navigateTo({
-					url: "/pages/index/index"
-				})
-			}
 		}
 	}
 </script>
diff --git a/static/image/autonym/autoym-bg.png b/pages_order/static/autonym/autoym-bg.png
similarity index 100%
rename from static/image/autonym/autoym-bg.png
rename to pages_order/static/autonym/autoym-bg.png
diff --git a/static/image/login/user.png b/pages_order/static/login/user.png
similarity index 100%
rename from static/image/login/user.png
rename to pages_order/static/login/user.png
diff --git a/static/image/cart/1.png b/static/image/cart/1.png
deleted file mode 100644
index 9807f34..0000000
Binary files a/static/image/cart/1.png and /dev/null differ
diff --git a/static/image/cart/2.png b/static/image/cart/2.png
deleted file mode 100644
index 64b1c45..0000000
Binary files a/static/image/cart/2.png and /dev/null differ
diff --git a/static/image/product/favorable.png b/static/image/product/favorable.png
deleted file mode 100644
index edae056..0000000
Binary files a/static/image/product/favorable.png and /dev/null differ