From 260f70e59eebfa09281d5d57173337efd210e7dc Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sun, 20 Oct 2024 23:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/tabbar.vue                         |   4 +-
 pages.json                                         |  75 +++---
 pages/index/cart.vue                               | 259 --------------------
 pages/index/center.vue                             |   4 +-
 pages/index/index.vue                              |  12 +-
 pages/index/order.vue                              | 260 ---------------------
 {pages/login => pages_order/auth}/login.vue        |   0
 {pages/login => pages_order/auth}/wxUserInfo.vue   |   4 +-
 {pages => pages_order}/autonym/autonym.vue         |   0
 {pages => pages_order}/record/record.vue           |  16 +-
 .../static}/autonym/autoym-bg.png                  | Bin
 .../image => pages_order/static}/login/user.png    | Bin
 static/image/cart/1.png                            | Bin 1933 -> 0 bytes
 static/image/cart/2.png                            | Bin 5540 -> 0 bytes
 static/image/product/favorable.png                 | Bin 282 -> 0 bytes
 15 files changed, 58 insertions(+), 576 deletions(-)
 delete mode 100644 pages/index/cart.vue
 delete mode 100644 pages/index/order.vue
 rename {pages/login => pages_order/auth}/login.vue (100%)
 rename {pages/login => pages_order/auth}/wxUserInfo.vue (96%)
 rename {pages => pages_order}/autonym/autonym.vue (100%)
 rename {pages => pages_order}/record/record.vue (96%)
 rename {static/image => pages_order/static}/autonym/autoym-bg.png (100%)
 rename {static/image => pages_order/static}/login/user.png (100%)
 delete mode 100644 static/image/cart/1.png
 delete mode 100644 static/image/cart/2.png
 delete mode 100644 static/image/product/favorable.png

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 98e4d68..0325ec6 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,34 +11,44 @@
 			"style": {
 				"navigationBarTitleText": "我的"
 			}
-		},
-		{
-			"path": "pages/record/record",
-			"style": {
-				"navigationBarTitleText": "打卡记录"
-			}
-		},
-		{
-			"path" : "pages/autonym/autonym",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
-			}
 		}
 	],
-	// "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 5e57b8f..aebf307 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,8 @@
 							latitude: res.latitude,
 							longitude: res.longitude,
 							iconPath: '/static/image/home/location.png',
-							width : 30,
-							height : 30
+							width : 38,
+							height : 30,
 						})
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的纬度：' + res.latitude);
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 9807f3469590d15ab9d9e6e97189899446c10988..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1933
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
TDoWti00000NkvXXu0mjf!F8`Q

diff --git a/static/image/cart/2.png b/static/image/cart/2.png
deleted file mode 100644
index 64b1c45f7b04ddc6b508641919612f8de7fcc03e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5540
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

diff --git a/static/image/product/favorable.png b/static/image/product/favorable.png
deleted file mode 100644
index edae056ac9eac6b684fdf44a4cd73d3cb25596e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq002Ay000jN1^@s6xDu>!00001b5ch_0Itp)
z=>Px#)Ja4^R7gwhmb(hVKoCW5@Spqve^68qEQ}&p*x9Ous9=ovsBG+FP>?7HY23|Z
zB&kHponj%`ehzcy&Mxc3QCLHY8EiX5P;LWs@WeV}@WYAkA&U_OLFqMs9=S-*CqXJ;
zt#GoKAeoNA&!`x}s^0?nOHtVjW^KZyuu#@z!a{>I#uRU*haHeN2Z)S^_YJUirL!hg
zw+`B^OJS1<Ser0w1>I|cj=qWCU#+#mg?hADy`cwf&|dcb=0C01?NY5&oQ>$-n8KKm
gC%j#ml78!h4`L9O113>V0000007*qoM6N<$g2SwLa{vGU