111

common/http.interceptor.js

@@ -9,7 +9,7 @@ const install = (Vue, vm) => {
 		// 测试环境
         // baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
 		// 俞山岛
-        baseUrl: 'https://dche.ccttiot.com/prod-api',
+        baseUrl: 'http://192.168.2.250:8090',
 		// 创特
         loadingText: '努力加载中~',  
         loadingTime: 10000,

components/tab-bar/tab-bar.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="cont">
 		<view class="tab"  @tap.stop="changeTabbar(0)">
-			<image src="@/static/tabbar/worke.png" mode="" v-show="indexs!=0"></image>
+			<image src="https://lxnapi.ccttiot.com/bike/img/static/ujqtjatCLwwZdpRmRmXA" mode="" v-show="indexs!=0"></image>
-			<image src="@/static/tabbar/worke-active.png" mode="" v-show="indexs==0"></image>
+			<image src="https://lxnapi.ccttiot.com/bike/img/static/uJdVl8YDhrpXWulJcpLJ" mode="" v-show="indexs==0"></image>
-			<view class="txt" :class="indexs==0?'act1':''" >工作台</view>
+			<!-- <view class="txt" :class="indexs==0?'act1':''" >工作台</view> -->
 		</view>
 		<view class="tab" @tap.stop="changeTabbar(1)">
-			<image src="@/static/tabbar/map.png" mode="" v-show="indexs!=1" style="width: 36rpx;height: 36rpx;"></image>
+			<image src="https://lxnapi.ccttiot.com/bike/img/static/umbX39XSQm23r4sHwphm" mode="" v-show="indexs!=1" ></image>
-			<image src="@/static/tabbar/map-active.png" mode="" v-show="indexs==1" style="width: 36rpx;height: 36rpx;"></image>
+			<image src="https://lxnapi.ccttiot.com/bike/img/static/uDdpWhrMfUJ1mxEBzGOF" mode="" v-show="indexs==1" ></image>
-			<view class="txt" :class="indexs==1?'act1':''">地图</view>
+			<!-- <view class="txt" :class="indexs==1?'act1':''">地图</view> -->
 		</view>
 		<!-- <view class="tab" @tap.stop="changeTabbar(2)">
 			<image src="@/static/tabbar/order.png" mode="" v-show="indexs!=2" style="width: 28rpx;height: 36.4rpx;"></image>
@@ -55,7 +55,7 @@
 				
 				if(index==0){
 					uni.redirectTo({
-						url:'/pages_admin/admin_worke',
+						url:'/pages/index/index',
 						 routeType: 'wx://modal',
 						success() {
 							that.currentTabbarIndex = index
@@ -64,15 +64,7 @@
 					console.log('点击了',index);
 				}else if(index==1){
 					uni.redirectTo({
-						url:'/pages_admin/admin_index',
+						url:'/pages/my',
-						 routeType: 'wx://modal',
-						success() {
-							that.currentTabbarIndex = index
-						}
-					})
-				}else if(index==2){
-					uni.redirectTo({
-						url:'/pages_admin/admin_order',
 						 routeType: 'wx://modal',
 						success() {
 							that.currentTabbarIndex = index
@@ -109,15 +101,15 @@
 		display: flex;
 		// align-items: center;
 		justify-content: space-around;
-		border-top: 2rpx solid #95989D;
+		// border-top: 2rpx solid #95989D;
 		.tab{
 			width: 100rpx;
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: center;
 			image{
-				width: 40rpx;
+				width: 64rpx;
-				height: 40rpx;
+				height: 94rpx;
 			}
 			.txt{
 				text-align: center;

manifest.json

@@ -51,7 +51,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "libVersion" : "latest",
-        "appid" : "wx3428c498d5061192",
+        "appid" : "wx21a50f113c30d41a",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

page_user/StoreManagement.vue

@@ -0,0 +1,45 @@
+<template>
+	<view class="page">
+		<u-navbar :is-back="false" title="店铺管理" :border-bottom="false" :background="bgc" title-color='#000'	title-size='36' height='45'></u-navbar>
+		<view class="searc_box">
+			<view class="search">
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+				bgc: {
+					backgroundColor: "#fff",
+				},
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background: #F7FAFE;
+	}
+	.page{
+		.searc_box{
+			padding: 36rpx;
+			width: 750rpx;
+			.search{
+				width: 100%;
+				height: 68rpx;
+				border: 2rpx solid #4297F3;
+				border-radius: 20rpx;
+			}
+		}
+	}
+</style>

page_user/carSelection.vue

@@ -8,14 +8,14 @@
 			<view class="ips_box">
 				<view class="ipt">
 					<view class="left">
-						<view class="txt">
+						<view class="txt1">
-							文三数字生活...|
+						{{addressInfo}}
 						</view>
 						<view class="txt">
-							09月02日取车|
+							|{{time}} 取车|
 						</view>
 						<view class="txt">
-							日租
+							{{dataInfo.dictLabel}}
 						</view>
 					</view>
 					<view class="right" @click="showchoose=true">
@@ -26,32 +26,33 @@
 			<view class="choose_card" v-if="showchoose">
 
 				<view class="area_li">
-					<view class="city">
+					<view class="city" @click="showCity()">
 						<view class="txt">
 							取车城市
 						</view>
-						<view class="words">
+						<view class="words" style="white-space: nowrap;">
-							宁德
+							{{cityList[0].cityName}}
-							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode="">
+							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
-							</image>
 						</view>
 					</view>
-					<view class="area" @click="getMapLocation()">
+					<view class="area" @click="getMapLocation()" style="white-space: nowrap;">
 						<view class="top">
 							<view class="txt">
-								取车城市
+								取车地点
 							</view>
 							<view class="type">
 								距最近店铺727m
 							</view>
 						</view>
 						<view class="bot">
-							福鼎市太姥山镇...
+							<view class="txt3">
-							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode="">
+								{{addressInfo}}
-							</image>
+							</view>
+				
+							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
 						</view>
 					</view>
-					<view class="dingw">
+					<view class="dingw" style="white-space: nowrap;" @click="getaddress()">
 						当前位置
 						<image src="https://lxnapi.ccttiot.com/bike/img/static/unTHfCN5IgnVKDbadsFp" mode=""></image>
 					</view>
@@ -61,20 +62,18 @@
 						<view class="txt">
 							取车时间
 						</view>
-						<view class="words">
+						<view class="words" @click="time1=true">
-							09月2日 今天
+							{{time}} 
-							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode="">
+							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
-							</image>
 						</view>
 					</view>
 					<view class="time_li">
 						<view class="txt">
 							选择租车周期
 						</view>
-						<view class="words">
+						<view class="words"  @click="showdata=true">
-							时租
+							{{dataInfo.dictLabel}}
-							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode="">
+							<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
-							</image>
 						</view>
 					</view>
 				</view>
@@ -122,29 +121,18 @@
 					</view>
 				</view>
 			</view>
-			<view class="choosedata" v-if="false">
+			<u-picker mode="time" v-model="time1" :params="params" @confirm="confirm1" start-year="2024"
+				:default-time="pickertime" start="2024"></u-picker>
+			<!-- <u-mask :show="showdata" @click="closeData()" :z-index='100' /> -->
+			<view class="choosedata" v-if="showdata">
 				<view class="tit">
 					请选择租车周期
-					<image src="https://lxnapi.ccttiot.com/bike/img/static/uLzTHCbE6TTRPYj6rv8X" mode=""></image>
+					<image src="https://lxnapi.ccttiot.com/bike/img/static/uLzTHCbE6TTRPYj6rv8X" mode="" @click="closeData()"></image>
 				</view>
-				<view class="li">
+				<view class="li" v-for="(item,index) in dataList" :key="index" :class="index == dataIndex? 'act':''" @click="chooseData(item,index)">
-					时租
+					{{item.dictLabel}}
-				</view>
-				<view class="li act">
-					时租
-				</view>
-				<view class="li">
-					时租
-				</view>
-				<view class="li">
-					时租
-				</view>
-				<view class="li">
-					时租
-				</view>
-				<view class="li">
-					时租
 				</view>
+				
 			</view>
 
 		</view>
@@ -163,10 +151,69 @@
 				showchoose: false,
 				CouponLists: [],
 				hight: 0,
-				showkf
+				showkf:false,
+				cityList: [],
+				dataList: [],
+				gps: {},
+				cityInfo: {},
+				cityIndex: -1,
+				addressInfo: '',
+				time1: false,
+				params: {
+					year: false,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				startTime: '',
+				pickertime: '',
+				time: '',
+				showdata:false,
+				dataIndex:0,
+				dataInfo:{},
+				shopList:[]
 			}
 		},
+		onLoad() {
+			this.getcityList()
+			this.getdata()
+		},
 		onShow() {
+			let that = this
+			uni.getLocation({
+				type: 'gcj02',
+				success: function(lb) {
+			
+					that.gps.latitude = lb.latitude;
+					that.gps.longitude = lb.longitude;
+					that.getCity()
+					that.getaddress()
+					that.getshopList()
+				},
+				fail: function(error) {
+					uni.showToast({
+						title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+						icon: 'none',
+						duration: 2000
+					});
+					// that.getmarks()
+					// 在这里处理获取位置信息失败的情况
+				}
+			
+			})
+			// 获取当前日期，并设置startDate和pickertime
+			const now = new Date();
+			const month = now.getMonth() + 1; // 月份从0开始，因此加1
+			const day = now.getDate();
+			
+			// 格式化为 MM-DD 的字符串
+			this.startDate = `${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+			this.time = `${month < 10 ? '0' : ''}${month}月${day < 10 ? '0' : ''}${day}日`;
+			// 初始化pickertime为当天的默认日期
+			this.pickertime = this.startDate;
+			
 			this.$nextTick(() => {
 				const query = uni.createSelectorQuery().in(this);
 				query.select('.ips_box').boundingClientRect(data => {
@@ -177,6 +224,144 @@
 			});
 		},
 		methods: {
+			getshopList(){
+				let data={
+					// phoneLon:this.gps.latitude,
+					phoneLon:120.257144,
+					// phoneLat:this.gps.longitude,
+					phoneLat:27.105719,
+					isFreeCar:true
+				}
+				this.$u.post(`app/getStoreListByLocation`,data).then((res) => {
+					if (res.code == 200) {
+						this.shopList = res.data;
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			chooseData(item,index){
+				this.dataInfo=item
+				this.dataIndex=index
+			},
+			closeData(){
+				this.showdata=false
+			},
+			confirm1(selectedDate) {
+				// 将用户选择的日期和当前日期进行比较
+			
+				// 从回调中获取选择的月份和日期
+				const selectedMonth = parseInt(selectedDate.month, 10);
+				const selectedDay = parseInt(selectedDate.day, 10);
+			
+				// 获取当前日期
+				const now = new Date();
+				const currentMonth = now.getMonth() + 1;
+				const currentDay = now.getDate();
+			
+				// 比较选择的日期和当前日期
+				if (selectedMonth < currentMonth || (selectedMonth === currentMonth && selectedDay < currentDay)) {
+					// 如果选择的日期比当前日期早，则重置为pickertime
+					const now = new Date();
+					const month = now.getMonth() + 1; // 月份从0开始，因此加1
+					const day = now.getDate();
+					
+					// 格式化为 MM-DD 的字符串
+					
+					this.time = `${month < 10 ? '0' : ''}${month}月${day < 10 ? '0' : ''}${day}日`;
+					uni.showToast({
+						title: '选择的日期不能小于当前日期',
+						icon: 'none',
+						duration: 2000
+					});
+				} else {
+					// 否则，设置为用户选择的日期
+					this.time = `${selectedDate.month}月${selectedDate.day}日`;
+				}
+			},
+			
+			getaddress() {
+				this.$u.get(`app/getAddress?lon=` + this.gps.longitude + '&lat=' + this.gps.latitude).then((res) => {
+					if (res.code == 200) {
+						this.addressInfo = res.data;
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			getCity() {
+				this.$u.get(`app/getCity?lon=` + this.gps.longitude + '&lat=' + this.gps.latitude).then((res) => {
+					if (res.code == 200) {
+						this.cityInfo = res.data;
+			
+						// 假设 cityList 是一个包含城市信息的数组，并且 cityInfo 中有一个唯一标识字段，例如 cityName 或 cityId
+						const index = this.cityList.findIndex(city => city.cityName === this.cityInfo.cityName);
+			
+						if (index !== -1) {
+							this.cityIndex = index
+							console.log('City found at index:', index);
+							// 可以在这里对找到的索引进行其他处理
+						} else {
+							console.log('City not found in the list');
+						}
+			
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			showCity() {
+			
+			},
+			getdata() {
+			
+				this.$u.get("/app/getDictData?dictType=rl_rental_period").then((res) => {
+					if (res.code == 200) {
+						this.dataList = res.data
+						this.dataInfo=this.dataList[0]
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+			
+					}
+				});
+			},
+			getcityList() {
+			
+				this.$u.get("app/city/list").then((res) => {
+					if (res.code == 200) {
+						this.cityList = res.data
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+			
+					}
+				});
+			},
+			tosele() {
+				uni.navigateTo({
+					url: '/page_user/carSelection'
+				})
+			},
+					
 					
 		}
 	}
@@ -271,6 +456,19 @@
 							font-size: 24rpx;
 							color: #6F6F6F;
 						}
+						.txt1{
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #6F6F6F;
+							width: 252rpx;
+							/* 设置宽度 */
+							white-space: nowrap;
+							/* 禁止文本换行 */
+							overflow: hidden;
+							/* 超出部分隐藏 */
+							text-overflow: ellipsis;
+							/* 超出部分显示省略号 */
+						}
 					}
 
 					.right {
@@ -575,10 +773,24 @@
 						}
 
 						.bot {
+							display: flex;
+							flex-wrap: nowrap;
+							align-items: center;
 							margin-top: 6rpx;
+						
+							.txt3 {
 								font-weight: 600;
 								font-size: 32rpx;
 								color: #3D3D3D;
+								width: 252rpx;
+								/* 设置宽度 */
+								white-space: nowrap;
+								/* 禁止文本换行 */
+								overflow: hidden;
+								/* 超出部分隐藏 */
+								text-overflow: ellipsis;
+								/* 超出部分显示省略号 */
+							}
 						
 							image {
 								width: 40rpx;

pages.json

@@ -117,6 +117,13 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "StoreManagement",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 				
 

pages/index/index.vue

@@ -11,30 +11,33 @@
 				</view>
 			</view>
 			<view class="area_li">
-				<view class="city">
+				<view class="city" @click="showCity()">
 					<view class="txt">
 						取车城市
 					</view>
-					<view class="words">
+					<view class="words" style="white-space: nowrap;">
-						宁德
+						{{cityList[0].cityName}}
 						<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
 					</view>
 				</view>
-				<view class="area" @click="getMapLocation()">
+				<view class="area" @click="getMapLocation()" style="white-space: nowrap;">
 					<view class="top">
 						<view class="txt">
-							取车城市
+							取车地点
 						</view>
 						<view class="type">
 							距最近店铺727m
 						</view>
 					</view>
 					<view class="bot">
-						福鼎市太姥山镇... 
+						<view class="txt3">
+							{{addressInfo}}
+						</view>
+
 						<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
 					</view>
 				</view>
-				<view class="dingw">
+				<view class="dingw" style="white-space: nowrap;" @click="getaddress()">
 					当前位置
 					<image src="https://lxnapi.ccttiot.com/bike/img/static/unTHfCN5IgnVKDbadsFp" mode=""></image>
 				</view>
@@ -44,8 +47,8 @@
 					<view class="txt">
 						取车时间
 					</view>
-					<view class="words">
+					<view class="words" @click="time1=true">
-						09月2日 今天
+						{{time}} 
 						<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
 					</view>
 				</view>
@@ -53,8 +56,8 @@
 					<view class="txt">
 						选择租车周期
 					</view>
-					<view class="words">
+					<view class="words"  @click="showdata=true">
-					时租
+						{{dataInfo.dictLabel}}
 						<image src="https://lxnapi.ccttiot.com/bike/img/static/uJkuBFsHACP6tnUo5nYm" mode=""></image>
 					</view>
 				</view>
@@ -64,38 +67,50 @@
 			</view>
 			<image class="kefu" src="https://lxnapi.ccttiot.com/bike/img/static/u8osHvZfHL7u3lbveVXx" mode=""></image>
 		</view>
-		<view class="car_card">
+		<view class="car_card" v-for="(item,index) in shopList" :key="index">
 			<view class="card_top">
 				<view class="tit">
-					本田电动车
+				{{item.name}}
 				</view>
 				<view class="txt">
-					2辆可租 <view class="iconfont icon-xiangyou1"> </view>
+					{{item.rentalCar}}辆可租 <view class="iconfont icon-xiangyou1"> </view>
 				</view>
 			</view>
 			<view class="type_box">
 				<view class="type">
-					727m
+					{{item.distance}}m
 				</view>
 				<view class="address">
-					天目山路148号
+					{{item.simpleAddress}}
 				</view>
 			</view>
 			<view class="car_info">
 				<view class="car_img">
-					<image src="https://lxnapi.ccttiot.com/bike/img/static/uzgNTmtp5axPAOysf4cJ" mode=""></image>
+					<image :src="item.models[0].picture" mode=""></image>
 				</view>
 				<view class="info">
 					<view class="modle">
-						全新车网红泡泡50KM...
+						{{item.models[0].model}}
 					</view>
 					<view class="price">
-						日租￥ <span>108</span>
+						日租￥ <span>{{item.models[0].price}}</span>
 					</view>
 				</view>
 			</view>
 		</view>
+		<u-picker mode="time" v-model="time1" :params="params" @confirm="confirm1" start-year="2024"
+			:default-time="pickertime" start="2024"></u-picker>
+		<u-mask :show="showdata" @click="closeData()" :z-index='100' />
+		<view class="choosedata" v-if="showdata">
+			<view class="tit">
+				请选择租车周期
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/uLzTHCbE6TTRPYj6rv8X" mode="" @click="closeData()"></image>
+			</view>
+			<view class="li" v-for="(item,index) in dataList" :key="index" :class="index == dataIndex? 'act':''" @click="chooseData(item,index)">
+				{{item.dictLabel}}
+			</view>
 			
+		</view>
 		<tab-bar :indexs='0' style=""></tab-bar>
 	</view>
 </template>
@@ -107,27 +122,216 @@
 				bgc: {
 					backgroundColor: "#fff",
 				},
+				cityList: [],
+				dataList: [],
+				gps: {},
+				cityInfo: {},
+				cityIndex: -1,
+				addressInfo: '',
+				time1: false,
+				params: {
+					year: false,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				startTime: '',
+				pickertime: '',
+				time: '',
+				showdata:false,
+				dataIndex:0,
+				dataInfo:{},
+				shopList:[]
 
 			}
 		},
 		onLoad() {
-		
+			this.getcityList()
+			this.getdata()
 		},
 		computed: {
 
 		},
 		onShow() {
+			let that = this
+			uni.getLocation({
+				type: 'gcj02',
+				success: function(lb) {
+
+					that.gps.latitude = lb.latitude;
+					that.gps.longitude = lb.longitude;
+					that.getCity()
+					that.getaddress()
+					that.getshopList()
+				},
+				fail: function(error) {
+					uni.showToast({
+						title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+						icon: 'none',
+						duration: 2000
+					});
+					// that.getmarks()
+					// 在这里处理获取位置信息失败的情况
+				}
+
+			})
+			// 获取当前日期，并设置startDate和pickertime
+			const now = new Date();
+			const month = now.getMonth() + 1; // 月份从0开始，因此加1
+			const day = now.getDate();
+
+			// 格式化为 MM-DD 的字符串
+			this.startDate = `${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+			this.time = `${month < 10 ? '0' : ''}${month}月${day < 10 ? '0' : ''}${day}日`;
+			// 初始化pickertime为当天的默认日期
+			this.pickertime = this.startDate;
 			
 		},
 		watch: {
 
 		},
 		methods: {
+			getshopList(){
+				let data={
+					// phoneLon:this.gps.latitude,
+					phoneLon:120.257144,
+					// phoneLat:this.gps.longitude,
+					phoneLat:27.105719,
+					isFreeCar:true
+				}
+				this.$u.post(`app/getStoreListByLocation`,data).then((res) => {
+					if (res.code == 200) {
+						this.shopList = res.data;
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			chooseData(item,index){
+				this.dataInfo=item
+				this.dataIndex=index
+			},
+			closeData(){
+				this.showdata=false
+			},
+			confirm1(selectedDate) {
+				// 将用户选择的日期和当前日期进行比较
+
+				// 从回调中获取选择的月份和日期
+				const selectedMonth = parseInt(selectedDate.month, 10);
+				const selectedDay = parseInt(selectedDate.day, 10);
+
+				// 获取当前日期
+				const now = new Date();
+				const currentMonth = now.getMonth() + 1;
+				const currentDay = now.getDate();
+
+				// 比较选择的日期和当前日期
+				if (selectedMonth < currentMonth || (selectedMonth === currentMonth && selectedDay < currentDay)) {
+					// 如果选择的日期比当前日期早，则重置为pickertime
+					const now = new Date();
+					const month = now.getMonth() + 1; // 月份从0开始，因此加1
+					const day = now.getDate();
+					
+					// 格式化为 MM-DD 的字符串
+					
+					this.time = `${month < 10 ? '0' : ''}${month}月${day < 10 ? '0' : ''}${day}日`;
+					uni.showToast({
+						title: '选择的日期不能小于当前日期',
+						icon: 'none',
+						duration: 2000
+					});
+				} else {
+					// 否则，设置为用户选择的日期
+					this.time = `${selectedDate.month}月${selectedDate.day}日`;
+				}
+			},
+
+			getaddress() {
+				this.$u.get(`app/getAddress?lon=` + this.gps.longitude + '&lat=' + this.gps.latitude).then((res) => {
+					if (res.code == 200) {
+						this.addressInfo = res.data;
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			getCity() {
+				this.$u.get(`app/getCity?lon=` + this.gps.longitude + '&lat=' + this.gps.latitude).then((res) => {
+					if (res.code == 200) {
+						this.cityInfo = res.data;
+
+						// 假设 cityList 是一个包含城市信息的数组，并且 cityInfo 中有一个唯一标识字段，例如 cityName 或 cityId
+						const index = this.cityList.findIndex(city => city.cityName === this.cityInfo.cityName);
+
+						if (index !== -1) {
+							this.cityIndex = index
+							console.log('City found at index:', index);
+							// 可以在这里对找到的索引进行其他处理
+						} else {
+							console.log('City not found in the list');
+						}
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			showCity() {
+
+			},
+			getdata() {
+
+				this.$u.get("/app/getDictData?dictType=rl_rental_period").then((res) => {
+					if (res.code == 200) {
+						this.dataList = res.data
+						this.dataInfo=this.dataList[0]
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+
+					}
+				});
+			},
+			getcityList() {
+
+				this.$u.get("app/city/list").then((res) => {
+					if (res.code == 200) {
+						this.cityList = res.data
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+
+					}
+				});
+			},
 			tosele() {
 				uni.navigateTo({
 					url: '/page_user/carSelection'
 				})
 			},
+		
+		
 			getMapLocation() {
 				uni.chooseLocation({
 					success: (res) => {
@@ -151,7 +355,11 @@
 												uni.openSetting({
 													success: (data) => {
 														// 如果用户授权了地理信息在，则提示授权成功
-														if(data.authSetting['scope.userLocation']===true){
+														if (data
+															.authSetting[
+																'scope.userLocation'
+																] === true
+															) {
 															uni.showToast({
 																title: "授权成功",
 																icon: "success",
@@ -159,8 +367,14 @@
 															})
 															// 授权成功后，然后再次chooseLocation获取信息
 															uni.chooseLocation({
-																success: (res) => {
+																success: (
-																	console.log("详细地址",res);
+																	res
+																	) => {
+																	console
+																		.log(
+																			"详细地址",
+																			res
+																			);
 																	// this.getRegionFn(res);
 																}
 															})
@@ -201,6 +415,61 @@
 
 	.page {
 		width: 100%;
+		padding-bottom: 200rpx;
+		.choosedata {
+			padding: 46rpx 37rpx;
+			position: fixed;
+			bottom: 0;
+			width: 750rpx;
+			// height: 757rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 0 0;
+			z-index: 101;
+		
+			.tit {
+				margin-bottom: 54rpx;
+				position: relative;
+				width: 100%;
+				text-align: center;
+				font-weight: 600;
+				font-size: 40rpx;
+				color: #3D3D3D;
+		
+				image {
+					position: absolute;
+					right: 36rpx;
+					width: 52rpx;
+					height: 52rpx;
+				}
+			}
+		
+		
+		
+			.li {
+				margin-bottom: 24rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: center;
+				width: 676rpx;
+				height: 88rpx;
+				background: #F7F7F7;
+				border-radius: 14rpx 14rpx 14rpx 14rpx;
+				border: 2rpx solid #fff;
+				font-weight: 600;
+				font-size: 36rpx;
+				color: #3D3D3D;
+			}
+		
+			.act {
+		
+				background: #DCEDFF;
+		
+				border: 2rpx solid #4297F3;
+			}
+		}
+		
+		
 		.car_card {
 			margin: 0 auto;
 			margin-top: 16rpx;
@@ -210,27 +479,32 @@
 			background: #FFFFFF;
 
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
+
 			.car_info {
 				margin-top: 44rpx;
 				display: flex;
 				flex-wrap: nowrap;
+
 				.car_img {
 					image {
 						width: 166rpx;
 						height: 128rpx;
 					}
 				}
+
 				.info {
 					.modle {
 						font-weight: 600;
 						font-size: 28rpx;
 						color: #3D3D3D;
 					}
+
 					.price {
 						margin-top: 44rpx;
 						font-weight: 400;
 						font-size: 24rpx;
 						color: #FF1C1C;
+
 						span {
 							font-weight: 500;
 							font-size: 44rpx;
@@ -238,16 +512,19 @@
 					}
 				}
 			}
+
 			.card_top {
 				display: flex;
 				flex-wrap: nowrap;
 				align-items: center;
 				justify-content: space-between;
+
 				.tit {
 					font-weight: 600;
 					font-size: 32rpx;
 					color: #3D3D3D;
 				}
+
 				.txt {
 					display: flex;
 					flex-wrap: nowrap;
@@ -257,11 +534,13 @@
 					color: #3D3D3D;
 				}
 			}
+
 			.type_box {
 				margin-top: 8rpx;
 				display: flex;
 				flex-wrap: nowrap;
 				align-items: center;
+
 				.type {
 					padding: 2rpx 12rpx;
 					font-weight: 400;
@@ -270,6 +549,7 @@
 					background: #DCEDFF;
 					border-radius: 4rpx 4rpx 4rpx 4rpx;
 				}
+
 				.address {
 					margin-left: 20rpx;
 					font-weight: 400;
@@ -278,6 +558,7 @@
 				}
 			}
 		}
+
 		.kefu {
 			position: fixed;
 			right: 0;
@@ -285,6 +566,7 @@
 			width: 94rpx;
 			height: 94rpx;
 		}
+
 		.backimg {
 			// position: fixed;
 			width: 750rpx;
@@ -295,6 +577,7 @@
 			/* 背景图片等比缩放以覆盖整个容器 */
 			background-position: center;
 		}
+
 		.choose_card {
 			// position: fixed;
 			padding-bottom: 28rpx;
@@ -305,6 +588,7 @@
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			z-index: 110;
+
 			.check {
 				margin-bottom: 40rpx;
 				display: flex;
@@ -316,6 +600,7 @@
 				background-size: cover;
 				/* 背景图片等比缩放以覆盖整个容器 */
 				background-position: center;
+
 				.txt1 {
 					width: 50%;
 					text-align: center;
@@ -323,6 +608,7 @@
 					font-size: 40rpx;
 					color: #3D3D3D;
 				}
+
 				.txt2 {
 					width: 50%;
 					text-align: center;
@@ -331,6 +617,7 @@
 					color: #808080;
 				}
 			}
+
 			.btn {
 				margin: 0 auto;
 
@@ -346,6 +633,7 @@
 				font-size: 36rpx;
 				color: #FFFFFF;
 			}
+
 			.time_box {
 				margin: 0 auto;
 				padding: 22rpx 24rpx 28rpx 24rpx;
@@ -355,18 +643,22 @@
 				// height: 128rpx;
 				background: #EEEEEE;
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
+
 				.time_li {
 					width: 50%;
+
 					.txt {
 						font-weight: 400;
 						font-size: 24rpx;
 						color: #808080;
 					}
+
 					.words {
 						margin-top: 6rpx;
 						font-weight: 600;
 						font-size: 32rpx;
 						color: #3D3D3D;
+
 						image {
 							width: 40rpx;
 							height: 22rpx;
@@ -374,11 +666,13 @@
 					}
 				}
 			}
+
 			.area_li {
 				display: flex;
 				flex-wrap: nowrap;
 				align-items: flex-start;
 				padding: 0 34rpx 28rpx 34rpx;
+
 				.dingw {
 					display: flex;
 					align-items: center;
@@ -387,12 +681,14 @@
 					font-weight: 400;
 					font-size: 28rpx;
 					color: #808080;
+
 					image {
 						margin-left: 8rpx;
 						width: 30rpx;
 						height: 30rpx;
 					}
 				}
+
 				.city {
 
 					.txt {
@@ -400,28 +696,34 @@
 						font-size: 24rpx;
 						color: #808080;
 					}
+
 					.words {
 						margin-top: 6rpx;
 						font-weight: 600;
 						font-size: 32rpx;
 						color: #3D3D3D;
+
 						image {
 							width: 40rpx;
 							height: 22rpx;
 						}
 					}
 				}
+
 				.area {
 					margin-left: 20rpx;
+
 					.top {
 						display: flex;
 						flex-wrap: nowrap;
 						align-items: center;
+
 						.txt {
 							font-weight: 400;
 							font-size: 24rpx;
 							color: #808080;
 						}
+
 						.type {
 							margin-left: 10rpx;
 							background: #FFE9D4;
@@ -432,11 +734,27 @@
 							color: #FF8C1E;
 						}
 					}
+
 					.bot {
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
 						margin-top: 6rpx;
+
+						.txt3 {
 							font-weight: 600;
 							font-size: 32rpx;
 							color: #3D3D3D;
+							width: 252rpx;
+							/* 设置宽度 */
+							white-space: nowrap;
+							/* 禁止文本换行 */
+							overflow: hidden;
+							/* 超出部分隐藏 */
+							text-overflow: ellipsis;
+							/* 超出部分显示省略号 */
+						}
+
 						image {
 							width: 40rpx;
 							height: 22rpx;
@@ -446,6 +764,4 @@
 			}
 		}
 	}
-
-
 </style>

pages/login/login.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="page">
-		<view class="fixed">
+		<!-- <view class="fixed">
+			
+		</view> -->
 		<u-navbar title="登录" :border-bottom="false" :background="background" title-color='#000' title-size='36'
 			back-icon-color='#000' height='45'></u-navbar>
-		</view>
 		<!-- <u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='45' >
 			
 		</u-navbar> -->
@@ -18,10 +19,10 @@
 		</view> -->
 		<view class="pages2" v-if="deptId==100&&pageindex==0">
 			<view class="imgbox">
-				<image src="https://lxnapi.ccttiot.com/bike/img/static/umJTSzDVtnfpyYrZY0VJ" mode=""></image>
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/uyfgcFQ5ATQTbTzCrzgn " mode="" style="height: 634rpx;"></image>
 			</view>
 			<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
-				style="margin-top: 30rpx;">
+				style="margin-top: 100rpx;">
 				<!-- <image src="https://lxnapi.ccttiot.com/bike/img/static/uka0jHcbyy1we0qwbiov" mode=""></image> -->
 				快捷登录
 			</button>
@@ -29,9 +30,9 @@
 				<image src="https://lxnapi.ccttiot.com/bike/img/static/ubSJ6aNMOUfPf80iotGv" mode=""></image>
 				验证码登录
 			</view> -->
-			<view class="tipss"  @click="pageindex=1" style="width: 100%;text-align: center;margin-top: 50rpx;color: #ccc;">
+		<!-- 	<view class="tipss"  @click="pageindex=1" style="width: 100%;text-align: center;margin-top: 50rpx;color: #ccc;">
 				验证码登录
-			</view>
+			</view> -->
 			<!-- 	<view class="button1"  @click="back">
 				取消登录
 			</view> -->
@@ -618,7 +619,7 @@
 							if (res.code == 200) {
 								console.log(res, 'resres');
 								wx.setStorageSync('token', res.token);
-								that.ceshi()
+								// that.ceshi()
 								// uni.switchTab({
 								// 	url: '/pages/index/index'
 								// })
@@ -848,12 +849,12 @@
 			.imgbox {
 				margin-top: 0rpx;
 				width: 750rpx;
-				height: 1274rpx;
+				// height: 1274rpx;
 				z-index: 0;
 
 				image {
 					width: 750rpx;
-					height: 1274rpx;
+					// height: 1274rpx;
 				}
 			}
 
@@ -862,7 +863,7 @@
 				display: flex;
 				align-items: center;
 				justify-content: center;
-				margin-top: 100rpx;
+				margin-top: 300rpx;
 				width: 586rpx;
 				height: 90rpx;
 				background: #64B6A8;