From bf0a2d0e9819c2966b13b9914838874052b7d822 Mon Sep 17 00:00:00 2001 From: tx <2622874537@qq.com> Date: Wed, 25 Sep 2024 18:03:49 +0800 Subject: [PATCH] 111 --- common/http.interceptor.js | 4 +- components/tab-bar/tab-bar.vue | 30 +- manifest.json | 2 +- page_user/StoreManagement.vue | 45 +++ page_user/carSelection.vue | 308 +++++++++++++++++--- pages.json | 7 + pages/index/index.vue | 516 ++++++++++++++++++++++++++------- pages/login/login.vue | 25 +- static/tabbar/home-act.png | Bin 0 -> 1618 bytes static/tabbar/home.png | Bin 0 -> 1768 bytes static/tabbar/map-active.png | Bin 714 -> 0 bytes static/tabbar/map.png | Bin 597 -> 0 bytes static/tabbar/my-act.png | Bin 0 -> 2204 bytes static/tabbar/my.png | Bin 0 -> 2279 bytes static/tabbar/order-active.png | Bin 529 -> 0 bytes static/tabbar/order.png | Bin 477 -> 0 bytes static/tabbar/worke-active.png | Bin 474 -> 0 bytes static/tabbar/worke.png | Bin 419 -> 0 bytes 18 files changed, 755 insertions(+), 182 deletions(-) create mode 100644 page_user/StoreManagement.vue create mode 100644 static/tabbar/home-act.png create mode 100644 static/tabbar/home.png delete mode 100644 static/tabbar/map-active.png delete mode 100644 static/tabbar/map.png create mode 100644 static/tabbar/my-act.png create mode 100644 static/tabbar/my.png delete mode 100644 static/tabbar/order-active.png delete mode 100644 static/tabbar/order.png delete mode 100644 static/tabbar/worke-active.png delete mode 100644 static/tabbar/worke.png diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 74d0787..5ab6a81 100644 --- a/common/http.interceptor.js +++ b/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, @@ -21,7 +21,7 @@ const install = (Vue, vm) => { // 创特:wx3428c498d5061192 // 俞山岛： wx4d178f8c80348214 // 请求拦截部分 - Vue.prototype.$u.http.interceptor.request = (config) => { + Vue.prototype.$u.http.interceptor.request = (config) => { // 引用token // 方式一，存放在vuex的token，假设使用了uView封装的vuex方式 // 见：https://uviewui.com/components/globalVariable.html diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue index e78a0fe..13bc6ba 100644 --- a/components/tab-bar/tab-bar.vue +++ b/components/tab-bar/tab-bar.vue @@ -1,14 +1,14 @@ @@ -107,68 +122,267 @@ 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: { - tosele(){ + 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' + url: '/page_user/carSelection' }) }, - getMapLocation(){ + + + getMapLocation() { uni.chooseLocation({ - success:(res)=> { + success: (res) => { console.log(res); // this.getRegionFn(res); }, - fail:()=>{ + fail: () => { // 如果用uni.chooseLocation没有获取到地理位置，则需要获取当前的授权信息，判断是否有地理授权信息 uni.getSetting({ success: (res) => { console.log(res); var status = res.authSetting; - if(!status['scope.userLocation']){ - // 如果授权信息中没有地理位置的授权，则需要弹窗提示用户需要授权地理信息 + if (!status['scope.userLocation']) { + // 如果授权信息中没有地理位置的授权，则需要弹窗提示用户需要授权地理信息 uni.showModal({ - title:"是否授权当前位置", - content:"需要获取您的地理位置，请确认授权，否则地图功能将无法使用", - success:(tip)=>{ - if(tip.confirm){ - // 如果用户同意授权地理信息，则打开授权设置页面，判断用户的操作 + title: "是否授权当前位置", + content: "需要获取您的地理位置，请确认授权，否则地图功能将无法使用", + success: (tip) => { + if (tip.confirm) { + // 如果用户同意授权地理信息，则打开授权设置页面，判断用户的操作 uni.openSetting({ - success:(data)=>{ - // 如果用户授权了地理信息在，则提示授权成功 - if(data.authSetting['scope.userLocation']===true){ + success: (data) => { + // 如果用户授权了地理信息在，则提示授权成功 + if (data + .authSetting[ + 'scope.userLocation' + ] === true + ) { uni.showToast({ - title:"授权成功", - icon:"success", - duration:1000 + title: "授权成功", + icon: "success", + duration: 1000 }) // 授权成功后，然后再次chooseLocation获取信息 uni.chooseLocation({ - success: (res) => { - console.log("详细地址",res); + success: ( + res + ) => { + console + .log( + "详细地址", + res + ); // this.getRegionFn(res); } }) - }else{ + } else { uni.showToast({ - title:"授权失败", - icon:"none", - duration:1000 + title: "授权失败", + icon: "none", + duration: 1000 }) } } @@ -180,9 +394,9 @@ }, fail: (res) => { uni.showToast({ - title:"调用授权窗口失败", - icon:"none", - duration:1000 + title: "调用授权窗口失败", + icon: "none", + duration: 1000 }) } }) @@ -201,54 +415,117 @@ .page { width: 100%; - .car_card{ + 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; padding: 28rpx 34rpx; width: 676rpx; - + background: #FFFFFF; - + border-radius: 20rpx 20rpx 20rpx 20rpx; - .car_info{ + + .car_info { margin-top: 44rpx; display: flex; flex-wrap: nowrap; - .car_img{ - image{ + + .car_img { + image { width: 166rpx; height: 128rpx; } } - .info{ - .modle{ + + .info { + .modle { font-weight: 600; font-size: 28rpx; color: #3D3D3D; } - .price{ + + .price { margin-top: 44rpx; font-weight: 400; font-size: 24rpx; color: #FF1C1C; - span{ + + span { font-weight: 500; font-size: 44rpx; } } } } - .card_top{ + + .card_top { display: flex; flex-wrap: nowrap; align-items: center; justify-content: space-between; - .tit{ + + .tit { font-weight: 600; font-size: 32rpx; color: #3D3D3D; } - .txt{ + + .txt { display: flex; flex-wrap: nowrap; align-items: center; @@ -257,12 +534,14 @@ color: #3D3D3D; } } - .type_box{ + + .type_box { margin-top: 8rpx; display: flex; flex-wrap: nowrap; align-items: center; - .type{ + + .type { padding: 2rpx 12rpx; font-weight: 400; font-size: 24rpx; @@ -270,7 +549,8 @@ background: #DCEDFF; border-radius: 4rpx 4rpx 4rpx 4rpx; } - .address{ + + .address { margin-left: 20rpx; font-weight: 400; font-size: 28rpx; @@ -278,13 +558,15 @@ } } } - .kefu{ + + .kefu { position: fixed; right: 0; bottom: 500rpx; width: 94rpx; height: 94rpx; } + .backimg { // position: fixed; width: 750rpx; @@ -295,7 +577,8 @@ /* 背景图片等比缩放以覆盖整个容器 */ background-position: center; } - .choose_card{ + + .choose_card { // position: fixed; padding-bottom: 28rpx; margin: 0 auto; @@ -303,9 +586,10 @@ width: 676rpx; // height: 511rpx; background: #FFFFFF; - border-radius:20rpx 20rpx 20rpx 20rpx; + border-radius: 20rpx 20rpx 20rpx 20rpx; z-index: 110; - .check{ + + .check { margin-bottom: 40rpx; display: flex; flex-wrap: nowrap; @@ -316,14 +600,16 @@ background-size: cover; /* 背景图片等比缩放以覆盖整个容器 */ background-position: center; - .txt1{ + + .txt1 { width: 50%; text-align: center; font-weight: 600; font-size: 40rpx; color: #3D3D3D; } - .txt2{ + + .txt2 { width: 50%; text-align: center; font-weight: 600; @@ -331,9 +617,10 @@ color: #808080; } } - .btn{ + + .btn { margin: 0 auto; - + display: flex; align-items: center; justify-content: center; @@ -346,8 +633,9 @@ font-size: 36rpx; color: #FFFFFF; } - .time_box{ - margin: 0 auto; + + .time_box { + margin: 0 auto; padding: 22rpx 24rpx 28rpx 24rpx; display: flex; flex-wrap: nowrap; @@ -355,31 +643,37 @@ // height: 128rpx; background: #EEEEEE; border-radius: 20rpx 20rpx 20rpx 20rpx; - .time_li{ + + .time_li { width: 50%; - .txt{ + + .txt { font-weight: 400; font-size: 24rpx; color: #808080; } - .words{ + + .words { margin-top: 6rpx; font-weight: 600; font-size: 32rpx; color: #3D3D3D; - image{ + + image { width: 40rpx; height: 22rpx; } } } } - .area_li{ + + .area_li { display: flex; flex-wrap: nowrap; align-items: flex-start; padding: 0 34rpx 28rpx 34rpx; - .dingw{ + + .dingw { display: flex; align-items: center; margin-left: 30rpx; @@ -387,42 +681,50 @@ font-weight: 400; font-size: 28rpx; color: #808080; - image{ + + image { margin-left: 8rpx; width: 30rpx; height: 30rpx; } } - .city{ - - .txt{ + + .city { + + .txt { font-weight: 400; font-size: 24rpx; color: #808080; } - .words{ + + .words { margin-top: 6rpx; font-weight: 600; font-size: 32rpx; color: #3D3D3D; - image{ + + image { width: 40rpx; height: 22rpx; } } } - .area{ + + .area { margin-left: 20rpx; - .top{ + + .top { display: flex; flex-wrap: nowrap; align-items: center; - .txt{ + + .txt { font-weight: 400; font-size: 24rpx; color: #808080; } - .type{ + + .type { margin-left: 10rpx; background: #FFE9D4; border-radius: 4rpx 4rpx 4rpx 4rpx; @@ -432,12 +734,28 @@ color: #FF8C1E; } } - .bot{ + + .bot { + display: flex; + flex-wrap: nowrap; + align-items: center; margin-top: 6rpx; - font-weight: 600; - font-size: 32rpx; - color: #3D3D3D; - image{ + + .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 @@ } } } - - \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index e8cff5f..46a8947 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,9 +1,10 @@