diff --git a/App.vue b/App.vue
index b1f389e..91e64cd 100644
--- a/App.vue
+++ b/App.vue
@@ -69,8 +69,8 @@ export default {
}
}
});
-
- // 开始监听网络状态变化
+ uni.removeStorageSync('getCouponCodeTime'); //清掉弹窗有优惠劵的时间记录 避免重进的时候不会弹窗
+ // // 开始监听网络状态变化
listenNetworkChange();
uni.hideTabBar()
const { setTheme, getUserInfo, storeState,logOut } = useMainStore();
@@ -180,6 +180,9 @@ page {
:deep(.uv-radio__icon-wrap){
border-width: 5rpx!important;
}
+:deep(.uv-checkbox__icon-wrap){
+ border-width: 5rpx!important;
+}
.uni-tabbar{
display: none;
diff --git a/components/coupon.vue b/components/coupon.vue
index 978f47e..42a967e 100644
--- a/components/coupon.vue
+++ b/components/coupon.vue
@@ -1,9 +1,9 @@
-
+
-
+
-
+
-
+
- {{ item.couponCode }} {{ couponTitle(item) }}
+
+ {{ couponTitle(item) }}
@@ -96,12 +102,12 @@
-
+
- {{ item.couponCode }} {{ couponTitle(item) }}
+
+ {{ couponTitle(item) }}
@@ -153,9 +160,15 @@
-
+
@@ -666,23 +679,17 @@ defineExpose({
.confirm{
height: 100rpx;
width: 100%;
- background-color: #fff;
+ background-color: #F1F2F7;
display: flex;
justify-content: center;
.next-btn{
position: absolute;
bottom:30upx;
width: 90%;
- padding: 4px 0;
- font-size: 28rpx;
- font-weight: bold;
- color: var(--text-color);
- background: var(--active-color);
- border-radius: 16rpx;
}
}
height: 100%;
- background-color: #fff;
+ background-color: #F1F2F7;
border-radius: 18upx 18upx 0 0;
padding-bottom: 40upx;
display: flex;
@@ -704,6 +711,7 @@ defineExpose({
font-size: 36rpx;
align-self: self-start;
margin-left: 40rpx;
+ font-weight: 600;
}
}
.content{
@@ -719,24 +727,25 @@ defineExpose({
display: flex;
padding: 40upx;
width: 100%;
- margin: 20upx 0;
+ margin-bottom: 20upx;
border-radius: 18upx;
- color: #fff;
- background: linear-gradient(90deg, var(--left-linear), var(--right-linear));
+ color: #9D9FA2;
+ background-color: #FFFFFF;
+ // background: linear-gradient(90deg, var(--left-linear), var(--right-linear));
box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.13);
font-size: 22upx;
- &::after{
- content: "";
- position: absolute;
- top: 2px;
- right: -7px;
- width: 14px; /* 调整宽度 */
- height: 100%; /* 调整高度以适应圆形的垂直排列 */
- background: radial-gradient(#ffffff 0px, #ffffff 5px, transparent 5px, transparent);
- background-size: 14px 14px; /* 保持圆形的大小 */
- background-repeat: repeat-y; /* 垂直重复 */
- z-index: 9;
- }
+ // &::after{
+ // content: "";
+ // position: absolute;
+ // top: 2px;
+ // right: -7px;
+ // width: 14px; /* 调整宽度 */
+ // height: 100%; /* 调整高度以适应圆形的垂直排列 */
+ // background: radial-gradient(#ffffff 0px, #ffffff 5px, transparent 5px, transparent);
+ // background-size: 14px 14px; /* 保持圆形的大小 */
+ // background-repeat: repeat-y; /* 垂直重复 */
+ // z-index: 9;
+ // }
.left{
width: 68%;
display: flex;
@@ -746,16 +755,18 @@ defineExpose({
font-size: 36upx;
letter-spacing: 4upx;
font-weight: bold;
+ color: #000;
}
.desc{
margin-top: 10upx;
}
.input{
- background-color: var(--bg-popup);
+ background-color: #FFFFFF;
+ border: 1px solid #E5E5E5;
+ color: #000;
text-align: center;
width: 220upx;
border-radius: 12upx;
- color: var(--text-color);
margin-top: 20upx;
}
&::before{
@@ -764,7 +775,7 @@ defineExpose({
height: 32upx;
width: 32upx;
border-radius: 99rpx;
- background-color: #fff;
+ background-color: #F1F2F7;
position: absolute;
bottom: 0;
top: -56upx;
@@ -776,12 +787,12 @@ defineExpose({
height: 32upx;
width: 32upx;
border-radius: 99rpx;
- background-color: #fff;
+ background-color: #F1F2F7;
position: absolute;
bottom: -56upx;
right: -18upx;
}
- border-right: 1px solid #fff;
+ // border-right: 1px solid #fff;
}
.right{
width: 32%;
@@ -808,7 +819,14 @@ defineExpose({
letter-spacing: 4upx;
}
-
+ &::before{
+ content: ' ';
+ display: block;
+ height: calc(100% + 20rpx);
+ border: 1px dashed #F1F2F7;
+ position: absolute;
+ left: 0;
+ }
}
}
}
diff --git a/components/myPopup.vue b/components/myPopup.vue
index 1d6097f..c76b7e9 100644
--- a/components/myPopup.vue
+++ b/components/myPopup.vue
@@ -9,6 +9,7 @@
:closeable="props.closeable"
@change="handleChange"
:safeAreaInsetBottom="false"
+ zIndex="999"
>
@@ -48,8 +49,10 @@
emit('update:modelValue', e.show);
}
const maskClick = () => {
+ if (props.closeOnClickOverlay) {
modelValue.value = false;
}
+ }
const emit = defineEmits(['close', 'confirm', 'update:modelValue']);
const modelValue = computed({
get() {
diff --git a/pages.json b/pages.json
index 7d6f749..7a47666 100644
--- a/pages.json
+++ b/pages.json
@@ -44,7 +44,10 @@
"path": "videoTutorial/index"
},
{
- "path": "reserve/index"
+ "path": "reserve/index",
+ "style": {
+ "navigationBarTitleText": "城市迷你仓"
+ }
},
{
"path": "validationInfo/index",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 87e3b8e..fcd2cd2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,5 @@
-
@@ -21,12 +20,12 @@
-
+
{{ siteDistance }}KM
-
+
{{ unitTypeData[0]?.sitdAddress }}
@@ -71,10 +70,20 @@
({{ unitTypeData[state.active].description }})
+
+ {{ $t("site.full") }}
+
+ {{
+ isApply === false
+ ? "加入候补"
+ : "已候补"
+ }}
+
+
暂无可用仓型，请选择其他门店～
-
+
-
体积
@@ -93,6 +102,16 @@
+ -
+ 优惠劵
+
+ {{ couponDesc(item) }}
+ {{
+ $t("detail.noselect")
+ }}
+
+
+
-
租金
{{ state.priceData?.price ? `￥ ${state.priceData?.price}` :
@@ -116,6 +135,12 @@
+
+ 预约咨询
+
+ 填写预约，专员为您估价与讲解。
+
+
租赁相关问题可联系客服咨询(电话:4008181813)
@@ -132,22 +157,29 @@
-
+
+ 租金￥{{ state.priceData.discountExpense ? `${state.priceData.discountExpense}` : '--'
+ }}
+ ￥{{ state.priceData.lockerExpense }}
+
+
+
+
+
-
下单
@@ -336,6 +368,11 @@
优惠信息 -￥ {{ state.priceData.favorable }}
+
+ 优惠劵优惠-￥ {{
+ state.priceData.codeFavorable
+ }}
+
租期优惠（{{state.month}}个月长租）-￥ {{ state.priceData.leaseDiscount }}
@@ -365,7 +402,7 @@
}" :textStyle="{
fontSize: '32rpx',
fontWeight: 'bold',
- }" color="#FB322E" :disabled="!state.lockerId && !state.month" @click="goOrder" shape="circle"
+ }" color="#FB322E" :disabled="!state.lockerId || !state.month" @click="goOrder" shape="circle"
class="goOrder">下单
@@ -442,6 +479,43 @@
color="#FB322E"
/>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/site/shijingtu.svg b/static/site/shijingtu.svg
new file mode 100644
index 0000000..88a6bc0
--- /dev/null
+++ b/static/site/shijingtu.svg
@@ -0,0 +1,3 @@
+
diff --git a/static/site/yuyuekancang.svg b/static/site/yuyuekancang.svg
new file mode 100644
index 0000000..e2d60bb
--- /dev/null
+++ b/static/site/yuyuekancang.svg
@@ -0,0 +1,3 @@
+
diff --git a/store/index.js b/store/index.js
index 6b4932d..a22b4c9 100644
--- a/store/index.js
+++ b/store/index.js
@@ -47,6 +47,7 @@ export const useMainStore = defineStore('main', () => {
return getApi.GetUserInfo().then(res=>{
if(res.code == 200){
storeState.value.userInfo = res.data ?? {}
+ storeState.value.hasTrytoLogin = true
uni.setStorage({
key:'userInfo',
data:res.data
diff --git a/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue b/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue
index dfd1912..62f9d97 100644
--- a/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue
+++ b/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue
@@ -14,7 +14,7 @@