diff --git a/App.vue b/App.vue index cf377ab..1c1446a 100644 --- a/App.vue +++ b/App.vue @@ -188,7 +188,7 @@ text { position: fixed; bottom: -1px; left: 0; - padding:20rpx 0; + height: 95rpx; padding-bottom: 40rpx; background-color: #fff; height: 160upx; @@ -207,7 +207,7 @@ text { .uni-tabbar__label { color: #000; font-size: 24rpx !important; - margin-top: 8px; + margin-top: 12rpx; } .uni-tabbar__item.call-phone-item { diff --git a/components/myCustomtTabBar.vue b/components/myCustomtTabBar.vue index 73278a6..e623fa8 100644 --- a/components/myCustomtTabBar.vue +++ b/components/myCustomtTabBar.vue @@ -21,7 +21,7 @@ -
+
{{ item.label }}
@@ -115,12 +115,12 @@ const handleTabItemTap = (index) => { svg { max-width: 100%; - height: 40rpx; - width: 40rpx; + height: 37.5rpx; + width: 36rpx; } image{ max-width: 100%; - height: 42rpx; - width: 38rpx; + height: 37.5rpx; + width: 36rpx; } diff --git a/pages/index/index.vue b/pages/index/index.vue index 7feaaa2..d3ad6e9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,10 +4,10 @@ - {{ unitTypeData[0]?.city }}·{{ unitTypeData[0]?.district }} + {{ unitTypeData[0]?.city }}·{{ unitTypeData[0]?.district }} - 更多分店 + 更多分店 @@ -433,6 +463,7 @@ const getSiteApi = useSiteApi(); const getApi2 = useLoginApi2(); const getClientSiteApi = ClientSite(); +const openPopupRef = ref(null); const unitPopupRef = ref(null); const monthPopupRef = ref(null); const payPopupRef = ref(null); @@ -481,6 +512,17 @@ const state = ref({ }, }); +const closePopup = () => { + openPopupRef.value.close(); +} +const openPopup = () => { + openPopupRef.value.open(); +} + +const callPhone = ()=>{ + window.location.href = `tel:${projectInfo.callPhone}`; + closePopup(); +} const goOrder = async () => { if (!state.value.lockerId) { @@ -885,6 +927,15 @@ onLoad(async (params) => { const parseUrlRes = parseUrlParams(decodeURIComponent(params.q)); if (parseUrlRes.mediatorId) uni.setStorageSync('mediatorId', parseUrlRes.mediatorId); } + //如果链接带了lockerId 则直接跳转到订单详情 + let url = window.location.href; + if(parseUrlParams(url).lockerId){ + + + + } + + uni.$on('homeSiteId', (data) => { if (data.id) { state.value.siteId = data.id @@ -1087,10 +1138,67 @@ function changeMove(event) { width: 100%; background-color: #FFFFFF; position: fixed; - bottom: 159upx; - padding: 20rpx; + bottom: 158upx; + padding: 16rpx 20rpx 12rpx 20rpx; box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.05); } +.modal-container-callPhone { + // height: 700rpx; + // background: #000; + display: flex; + justify-content: flex-start; + align-items: center; + flex-direction: column; + padding: 32rpx; + + .modal-title { + width: 100%; + text-align: center; + font-weight: bold; + font-size: 36rpx; + color: #000000; + } + + :deep(.uv-upload__wrap) { + display: flex; + } + + .modal-text { + width: 100%; + margin-top: 20rpx; + padding: 20rpx; + font-size: 32rpx; + font-weight: 600; + text-align: center; + line-height: 32rpx; + } + + .upload { + margin-top: 30rpx; + height: 250rpx; + width: 100%; + // background: #000; + display: flex; + justify-content: center; + // overflow-x: scroll; + overflow-y: scroll; + // white-space: nowrap; + flex-wrap: nowrap; + // overflow: hidden; + } + + .modal-button { + margin-top: 20rpx; + width: 100%; + min-height: 86rpx; + display: flex; + gap: 20rpx; + + :deep(.uv-button-wrapper) { + flex: 1; + } + } +} .payPopupBox { .garyBox { @@ -1110,8 +1218,9 @@ function changeMove(event) { } .toOrder { + min-height: 88rpx; padding: 0; - padding-left: 40rpx; + padding-left: 28rpx; border-radius: 999rpx; display: flex; justify-content: space-between; @@ -1176,6 +1285,9 @@ function changeMove(event) { } .unitPopupBox { + :deep(.uv-radio__label-wrap){ + display: none; + } min-height: 50%; padding: 32rpx; // padding-bottom: calc(32rpx + constant(safe-area-inset-bottom)); @@ -1183,6 +1295,10 @@ function changeMove(event) { .title { margin-bottom: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + } @@ -1282,6 +1398,7 @@ function changeMove(event) { .agreement-top { display: flex; justify-content: space-between; + align-items: center; padding: 20rpx 0rpx; margin-bottom: 20rpx; font-size:36rpx; @@ -1328,9 +1445,8 @@ function changeMove(event) { .agreed { display: flex; - font-weight: bold; width: 100%; - padding-bottom: 0rpx; + padding-bottom: 16rpx; padding-left: 40rpx; .check-wrap { @@ -1362,9 +1478,8 @@ function changeMove(event) { } .stress { - font-size: 26rpx; - color: #A8AAAC; - font-weight: 600; + font-size: 24rpx; + color: #9D9FA2; } } .agreed2{ @@ -1378,7 +1493,7 @@ function changeMove(event) { .check-wrap { display: flex; align-items: center; - margin-right: 8rpx; + margin-right: 10rpx; :deep(.uv-radio__label-wrap){ display: none; } @@ -1403,15 +1518,14 @@ function changeMove(event) { } .stress { - font-size: 26rpx; - color: #A8AAAC; - font-weight: 600; + font-size: 24rpx; + color: #9D9FA2; } } .toOrder { padding: 0; - padding-left: 40rpx; + padding-left: 28rpx; border-radius: 999rpx; display: flex; justify-content: space-between; @@ -1486,7 +1600,7 @@ function changeMove(event) { padding: 32rpx 0; justify-content: space-between; border-bottom: 1px solid #a8aaac20; - padding-left: 10rpx; + // padding-left: 10rpx; // &:first-child { // padding-top: 0; // } @@ -1675,11 +1789,11 @@ uni-swiper-item { .unitType { padding: 40rpx; .title { - padding-left: 10rpx; + // padding-left: 10rpx; } .bottom { .name{ - padding-left: 10rpx; + // padding-left: 10rpx; } display: flex; align-items: baseline; diff --git a/pages/personal/index.vue b/pages/personal/index.vue index ddd5a59..8625133 100644 --- a/pages/personal/index.vue +++ b/pages/personal/index.vue @@ -5,13 +5,13 @@
  • 订单详情 - +
  • 信息验证 - +