@@ -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 0000000000000000000000000000000000000000..391b3db16b4a131eded474aa83be13b05cd7148b
GIT binary patch
literal 3165
zcmV-j45IUiP)
F
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
\ No newline at end of file
diff --git a/static/tabbar/user2.png b/static/tabbar/user2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e46b46457c8461bdff835bcfcb363a12bd4544be
GIT binary patch
literal 2756
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
KMNUMnLSTZSd03kO
literal 0
HcmV?d00001