diff --git a/page_fenbao/storedlist/trueorder.vue b/page_fenbao/storedlist/trueorder.vue
index 6a50220..e1f28c1 100644
--- a/page_fenbao/storedlist/trueorder.vue
+++ b/page_fenbao/storedlist/trueorder.vue
@@ -43,9 +43,6 @@
-
-
-
选择套餐
@@ -157,10 +154,10 @@
-
+
@@ -300,8 +297,6 @@
-
-
@@ -449,8 +444,8 @@
{{taocanlist[fanganindex].startRule.startingPrice}}元
/
{{taocanlist[fanganindex].startRule.startingTime}}
- 时
- 分
+ 小时
+ 分钟
天
@@ -460,8 +455,8 @@
{{taocanlist[fanganindex].startRule.timeoutPrice}}元
/
{{taocanlist[fanganindex].startRule.timeoutTime}}
- 时
- 分
+ 小时
+ 分钟
天
@@ -479,15 +474,15 @@
{{rule.start == null ? '0' : rule.start}}
- 时
- 分
+ 小时
+ 分钟
天
以上
{{rule.start == null ? '0' : rule.start}}-{{rule.end}}
- 时
- 分
+ 小时
+ 分钟
天
@@ -495,8 +490,8 @@
每{{rule.fee}}
元/{{rule.eachUnit}}
- 时
- 分
+ 小时
+ 分钟
天
@@ -743,7 +738,6 @@
}
},
onLoad(option) {
-
console.log(option,'sasdadas');
if(option.duoirder){
this.duoirder = option.duoirder
@@ -1152,7 +1146,7 @@
uni.showToast({
title: '客服电话为空',
icon: 'none',
- duration: 2000
+ duration: 5000
})
return
}
@@ -1172,12 +1166,13 @@
})
},
getQiniuToken() {
- console.log('diaou');
- this.$u.get("/common/qiniuToken").then((res) => {
- if (res.code == 200) {
- this.token=res.data
- }
- })
+ this.$u.get("/common/qiniuToken").then((res) => {
+ if (res.code == 200) {
+ this.token=res.data
+ }else if(res.code == 401){
+ this.getlogo()
+ }
+ })
},
recordVideo() {
// 调用录像API
@@ -1209,7 +1204,8 @@
console.log('录像失败：', err);
uni.showToast({
title: '录像失败，请重试',
- icon: 'none'
+ icon: 'none',
+ duration:5000
});
}
})
@@ -1249,8 +1245,8 @@
// 如果有子选项，不立即计算
if (!(selectedItem && selectedItem.subList && selectedItem.subList.length > 0)) {
this.$nextTick(() => {
- this.getjisuan();
- });
+ this.getjisuan()
+ })
}
},
@@ -1575,6 +1571,7 @@
// 开锁方法
openDevice() {
+ this.mxflag = true
let xllat = null
let xllng = null
uni.getLocation({
@@ -1753,13 +1750,6 @@
this.wenbentxtflag = true
this.wenbentxt = '开锁中...'
this.openDevice()
- // this.zhezhaoflag = true
- // setTimeout(() => {
- // uni.switchTab({
- // url: '/pages/index/index?orderid=' + resp.data.pay.bstId
- // })
- // uni.hideLoading()
- // }, 2000)
}
}else if(resp.code == 401){
// this.logoflag = true
@@ -2070,7 +2060,7 @@
clearTimeout(this.scrollPauseTimers[index])
delete this.scrollPauseTimers[index]
}
-
+ // 选中之后展示高亮自动进行滚动
// 从左至右滚动：初始位置在左边（0），向右滚动
// 当滚动到第一个文字的末尾（maxScrollLeft）时，继续滚动，此时第二个文字正好接上
// 当滚动到第二个文字的末尾（maxScrollLeft * 2）时，重置为0，形成无缝循环
@@ -2190,15 +2180,6 @@
}
return '--'
},
- // 点击进行导航
- // btndaohang() {
- // uni.openLocation({
- // latitude: 11, //纬度-目的地/坐标点
- // longitude: 11, //经度-目的地/坐标点
- // name: 11, //地点名称
- // address: 11 //详细地点名称
- // })
- // },
// 点击进行登录
getPhoneNumber(e) {
let that = this
@@ -2452,7 +2433,6 @@
position: fixed;
bottom: 100rpx;
left: 38rpx;
- // margin-top: 128rpx;
display: flex;
align-items: center;
justify-content: center;
@@ -2584,12 +2564,9 @@
height: 370rpx;
background: rgba(255, 255, 255, 0.2);
border-radius: 40rpx;
- // box-shadow: 0 rgba(0, 0, 0, 0.1);
backdrop-filter: blur(10rpx);
-webkit-backdrop-filter: blur(10rpx); /* For Safari */
- // border: 1rpx solid rgba(255, 255, 255, 0.3);
z-index: 10;
-
}
}
@@ -3155,40 +3132,33 @@
font-size: 28rpx;
font-weight: 500;
color: #6B7280;
-
text {
color: #4297F3;
font-weight: 600;
}
}
-
.bot {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 32rpx;
box-sizing: border-box;
-
.lt {
display: flex;
align-items: center;
-
.money {
font-weight: 700;
font-size: 40rpx;
color: #EF4444;
-
text {
font-size: 56rpx;
}
}
-
.mx {
font-size: 30rpx;
font-weight: 600;
color: #4297F3;
margin-left: 32rpx;
-
text {
margin-left: 8rpx;
}
@@ -3243,11 +3213,9 @@
border-radius: 20rpx;
overflow: hidden;
margin-top: 20rpx;
-
.bot {
display: flex;
justify-content: space-between;
-
view {
margin-top: 2rpx;
margin-right: 2rpx;
@@ -3263,11 +3231,9 @@
color: #3D3D3D;
}
}
-
.top {
display: flex;
justify-content: space-between;
-
view {
margin-right: 2rpx;
width: 50%;
@@ -3281,7 +3247,6 @@
}
}
}
-
.biaoge {
width: 648rpx;
max-height: 522rpx;
@@ -3289,11 +3254,9 @@
border-radius: 20rpx;
overflow: hidden;
margin-top: 20rpx;
-
.bot {
display: flex;
justify-content: space-between;
-
view {
margin-top: 2rpx;
margin-right: 2rpx;
@@ -3308,11 +3271,9 @@
color: #3D3D3D;
}
}
-
.top {
display: flex;
justify-content: space-between;
-
view {
margin-right: 2rpx;
width: 50%;
@@ -3326,27 +3287,23 @@
}
}
}
-
.name {
font-weight: 600;
font-size: 28rpx;
color: #3D3D3D;
}
-
.qcxz {
font-weight: 600;
font-size: 28rpx;
color: #3D3D3D;
margin-top: 16rpx;
}
-
.tishi {
font-size: 28rpx;
color: #3D3D3D;
margin-top: 16rpx;
}
}
-
.yajin {
margin: auto;
margin-top: 16rpx;
@@ -3356,13 +3313,11 @@
border-radius: 20rpx;
padding: 18rpx 24rpx;
box-sizing: border-box;
-
.sixia {
font-size: 28rpx;
color: #808080;
margin-top: 18rpx;
}
-
.jiaoya {
width: 642rpx;
height: 156rpx;
@@ -3372,26 +3327,22 @@
padding-top: 30rpx;
padding-left: 34rpx;
box-sizing: border-box;
-
.ts {
text {
padding-bottom: 0 !important;
}
-
display: flex;
align-items: center;
font-weight: 600;
font-size: 32rpx;
color: #3D3D3D;
}
-
.sm {
font-size: 28rpx;
color: #3D3D3D;
margin-top: 14rpx;
}
}
-
.tuihuan {
display: flex;
justify-content: space-between;
@@ -3444,7 +3395,6 @@
align-items: center;
font-size: 24rpx;
color: #3D3D3D;
-
image {
width: 24rpx;
height: 27rpx;
@@ -3452,48 +3402,39 @@
}
}
}
-
page {
background: #F7F7F7;
border-radius: 0rpx 0rpx 0rpx 0rpx;
width: 100%;
}
-
.zcfangan {
margin: auto;
- // padding: 18rpx 24rpx;
padding-right: 0 !important;
box-sizing: border-box;
width: 698rpx;
max-height: 555257rpx;
- // background: #FFFFFF;
border-radius: 20rpx;
margin-top: 16rpx;
-
.shichang {
display: flex;
justify-content: space-between;
margin-top: 48rpx;
align-items: center;
-
.zcsc {
font-size: 28rpx;
color: #3D3D3D;
}
-
.jisuan {
display: flex;
align-items: center;
padding-right: 24rpx;
box-sizing: border-box;
-
.zong {
font-weight: 600;
font-size: 28rpx;
color: #3D3D3D;
margin-right: 10rpx;
}
-
.jibu {
width: 229rpx;
height: 56rpx;
@@ -3504,11 +3445,9 @@
padding: 0 24rpx;
box-sizing: border-box;
justify-content: center;
-
text {
font-size: 32rpx;
}
-
input {
width: 120rpx;
height: 56rpx;
@@ -3520,7 +3459,6 @@
}
}
}
-
.name {
font-size: 32rpx;
color: #111827;
@@ -3551,7 +3489,8 @@
flex-direction: column;
align-items: center;
justify-content: center;
- min-height: 200rpx;
+ height: 218rpx;
+ overflow: hidden;
box-sizing: border-box;
transition: all 0.3s ease;
@@ -3568,7 +3507,6 @@
justify-content: center;
z-index: 10;
box-shadow: 0 4rpx 12rpx rgba(66, 151, 243, 0.4);
-
.check-mark {
font-size: 32rpx;
font-weight: 700;
@@ -3581,7 +3519,6 @@
.package-name-wrapper {
width: 100%;
margin-bottom: 18rpx;
-
// scroll-view 样式
::v-deep .uni-scroll-view {
width: 100%;
@@ -3657,6 +3594,7 @@
background: linear-gradient(135deg, #F0F7FF 0%, #FFFFFF 100%);
box-shadow: 0 6rpx 20rpx rgba(66, 151, 243, 0.25);
transform: translateY(-2rpx);
+ height: 100% !important;
}
&.interval-billing {
diff --git a/page_user/hcshenhe.vue b/page_user/hcshenhe.vue
index be2678e..1149aa2 100644
--- a/page_user/hcshenhe.vue
+++ b/page_user/hcshenhe.vue
@@ -19,7 +19,6 @@
-
还车
@@ -138,10 +137,11 @@
}
}else{
uni.hideLoading()
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ uni.showModal({
+ title: '提示',
+ content: res.msg,
+ showCancel: false,
+ confirmText: '知道了'
})
}
})
@@ -201,18 +201,20 @@
})
} else {
uni.hideLoading()
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ uni.showModal({
+ title: '提示',
+ content: res.msg,
+ showCancel: false,
+ confirmText: '知道了'
})
}
})
}else{
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ uni.showModal({
+ title: '提示',
+ content: res.msg,
+ showCancel: false,
+ confirmText: '知道了'
})
}
})
@@ -258,10 +260,11 @@
})
} else {
uni.hideLoading()
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ uni.showModal({
+ title: '提示',
+ content: res.msg,
+ showCancel: false,
+ confirmText: '知道了'
})
}
})
@@ -315,30 +318,33 @@
uni.showToast({
title: '未知错误',
icon: 'none',
- duration: 2000
+ duration: 5000
})
} else {
uni.hideLoading()
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ uni.showModal({
+ title: '提示',
+ content: res.msg,
+ showCancel: false,
+ confirmText: '知道了'
})
}
})
}else{
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ uni.showModal({
+ title: '提示',
+ content: res.msg,
+ showCancel: false,
+ confirmText: '知道了'
})
}
})
}else{
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ uni.showModal({
+ title: '提示',
+ content: res.msg,
+ showCancel: false,
+ confirmText: '知道了'
})
}
})
@@ -355,7 +361,7 @@
uni.showToast({
title: res.msg,
icon: 'none',
- duration: 2000
+ duration: 5000
})
}
})