@@ -201,4 +118,9 @@ svg {
height: 40rpx;
width: 40rpx;
}
+image{
+ max-width: 100%;
+ height: 42rpx;
+ width: 38rpx;
+}
diff --git a/components/myUpload.vue b/components/myUpload.vue
index 7a5bd4f..b873d77 100644
--- a/components/myUpload.vue
+++ b/components/myUpload.vue
@@ -6,7 +6,7 @@
:width="props.width"
:height="props.height"
imageMode="aspectFit"
- :maxCount="1"
+ :maxCount="props.maxCount"
:sizeType="['compressed']"
:previewFullImage="false"
:uploadText="props.uploadText"
@@ -54,6 +54,10 @@ const props = defineProps({
height: {
type: String,
default: "220rpx"
+ },
+ maxCount: {
+ type: Number,
+ default: 1
}
});
const emit = defineEmits(["update:modelValue"]);
diff --git a/pages.json b/pages.json
index 950601d..7d6f749 100644
--- a/pages.json
+++ b/pages.json
@@ -87,6 +87,12 @@
}
}
}
+ },
+ {
+ "path": "pages/moveOut/index",
+ "style": {
+ "navigationBarTitleText": "城市迷你仓"
+ }
},
{
"path": "pages/goodsList/index",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 07c53ab..c96a5e6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -106,7 +106,19 @@
-
+
+
+
+
+
+
+
+
+ 阅读并同意《订仓协议》
+
+
+ 租赁相关问题可联系客服咨询(电话:4008181813)
+
{{ state.priceData.expense ? `¥ ${state.priceData.expense}` : '¥--'
}}
@@ -126,19 +138,12 @@
class="goOrder">下单
+
+
暂无可用仓型,请选择其他门店~
-
-
-
-
-
-
-
- 阅读并同意《电子租赁条款》
-
-
+
+
+
+
+
+ 退仓说明:
+
+
+
+
+ 退仓后,您将失去开门权限!请确认已经清空仓内物品,14个工作日内,系统将会自动返还押金。
+
+
+
+
+
+ {{ $t("unlock.confirmOut") }}
+
+
+
+
+
+
+
+
+ {{ $t("unlock.moveoutReminder") }}
+
+ {{ $t("unlock.moveoutSuccess") }}
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/unlock/index.vue b/pages/unlock/index.vue
index 073a05f..732568a 100644
--- a/pages/unlock/index.vue
+++ b/pages/unlock/index.vue
@@ -860,7 +860,12 @@ const cancelOrder = () => {
}
function openMoveOutModal() {
- moveOutPopup.value.open()
+ uni.navigateTo({
+ url: '/pages/moveOut/index?orderId=' + state.value.selectItem.orderId
+ })
+ closeDetailPopup();
+
+ // moveOutPopup.value.open()
}
function closeMoveOutModal() {
moveOutPopup.value.close()
diff --git a/static/tabbar/user.png b/static/tabbar/user.png
new file mode 100644
index 0000000..391b3db
Binary files /dev/null and b/static/tabbar/user.png differ
diff --git a/static/tabbar/user.svg b/static/tabbar/user.svg
deleted file mode 100644
index 8feebc2..0000000
--- a/static/tabbar/user.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/static/tabbar/user2.png b/static/tabbar/user2.png
new file mode 100644
index 0000000..e46b464
Binary files /dev/null and b/static/tabbar/user2.png differ