diff --git a/src/views/components/CommonReminder.vue b/src/views/components/CommonReminder.vue
new file mode 100644
index 0000000..2929912
--- /dev/null
+++ b/src/views/components/CommonReminder.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 办理完成
+
+
+
+ 办理中
+
+
+
+ 待办理
+
+
+
+ 已超期
+
+
+
+
+
+
+ {{ action.label }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index 256bbb8..9201a34 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -50,6 +50,7 @@
>
-
-
入住办理:
-
5号楼-1单元-805-南卧1
-
张三 男 187*****8989
-
37*************12
-
等待签订电子合同
-
-
+
+
+
+ 入住办理:
+
+
+
+ 5号楼-1单元-805-南卧1
+
+
+
+ 张三四
+
+
+
+ 男
+
+
+
+ 187*****8989
+
+
+
+ 37*************12
+
+
+
+ 等待签订电子合同
+
+
+
+
+
+
@@ -103,7 +125,7 @@
:style="{ backgroundColor: item.color }"
>
@@ -177,20 +199,46 @@
+
+
+
+
@@ -464,11 +625,11 @@ export default {
align-items: center;
}
::v-deep .el-card__body {
- padding: 15px 20px 0px 20px;
+ padding:14px 20px;
width: 100%;
}
.box-card {
- margin-top: 1%;
+ margin: 2% 0;
border: 1px solid #e0e0e0;
border-radius: 4px;
-radius: 4px;
@@ -509,6 +670,10 @@ export default {
}
.status {
color: #ff2e2e;
+ font-size: 14px;
+ display: flex;
+ flex-wrap: nowrap;
+ white-space: nowrap;
}
.menu {
color: #2f50ff;
@@ -564,7 +729,7 @@ export default {
margin-top: 20px;
}
.eva-info {
- div{
+ div {
font-size: 14px;
}
span {
diff --git a/src/views/residence/checkIn/index.vue b/src/views/residence/checkIn/index.vue
index 131e6f6..00e8f2c 100644
--- a/src/views/residence/checkIn/index.vue
+++ b/src/views/residence/checkIn/index.vue
@@ -1,11 +1,13 @@
-
+
-
+
-
- 入住信息
+ 核验信息
@@ -76,71 +88,155 @@
姓名:张三
性别:女
- 身份证:420102199001010000
手机号:-01-01
- 入住房间-01-01
- 办理入住日期
- 预订入住天数
- 实际居住天数-01-01
+
+ 资格核验:已通过
+
+
+ 所选房间:国信棠樾云邸5号楼1单元805北卧
+
+ 本次入住天数:
+ 剩余可住天数:
+ 本次选房时间:-01-01
-
-
-
-
-
- {{ dict.label }}
+
+
+
+
+ 核验信息
+
+
+
+ 入住房间:420102199001010000
+ 姓名:张三
+ 性别:女
+ 手机号:-01-01
+
+
+
+
+
+ 物资发放
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合同签订
+
+
+ 等待签订
+
+
+ 查看合同
+
+
+
+
+
+
+
+
+ 缴纳履约保证金
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 等待支付
+
+
+
+
+
+
+ 已通过线下支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
{{ currentStep === 1 ? "取消" : "上一步" }}
- {{ currentStep === dataList.length ? "释放房源" : "下一步" }}
+ {{ currentStep === dataList.length - 1 ? "履约保证金" : "下一步" }}
@@ -159,29 +255,29 @@ export default {
// 这里可以定义数据
dataList: [
{
- title: "信息确认",
+ title: "核验信息",
imageSrc: require("@/assets/images/address-card.png"),
- bgColor: "#FFE4E1",
+ bgColor: "#FBEDC8",
},
{
- title: "物资领取",
+ title: "物资发放",
imageSrc: require("@/assets/images/antFill-gift.png"),
- bgColor: "#E0FFFF",
+ bgColor: "#C2E2F9",
},
{
title: "合同签订",
imageSrc: require("@/assets/images/fa-book.png"),
- bgColor: "#F0FFF0",
+ bgColor: "#FBD5D5",
},
{
title: "履约保证金",
imageSrc: require("@/assets/images/pay-circle.png"),
- bgColor: "#FFF0F5",
+ bgColor: "#8BFDD3",
},
{
title: "办理完成",
imageSrc: require("@/assets/images/check_circle.png"),
- bgColor: "#FFF0F5",
+ bgColor: "#CFCDFB",
},
],
arrow: require("@/assets/images/arrow_forward.png"),
@@ -207,28 +303,55 @@ export default {
{ label: "入住期间有异常", value: "3" },
{ label: "入住期间有异常", value: "4" },
],
+ susIcon: require("@/assets/images/check-circle-fas.png"),
currentStep: 1, // 当前步骤
+ stepCompleted: this.dataList
+ ? Array(this.dataList.length - 1).fill(false)
+ : [], // 存储每个步骤的完成状态
};
},
methods: {
+ // 返回首页
+ goBack() {
+ this.$router.push({ path: "/" });
+ },
+ handleQuery() {
+ console.log("查询操作");
+ },
handleCancel() {
+ this.$router.push({ path: "/" });
console.log("取消操作");
},
// 上一步操作
handlePrevStep() {
- if (this.currentStep > 1) {
+ if (this.currentStep > 0) {
this.currentStep--;
+ console.log("上currentStep::", this.currentStep);
+ console.log("dataList.::", this.dataList);
+
+ if (this.currentStep <= this.stepCompleted.length) {
+ this.stepCompleted[this.currentStep - 1] = false;
+
+ console.log("stepCompleted::", this.stepCompleted);
+ }
}
},
// 下一步操作
handleNextStep() {
if (this.currentStep < this.dataList.length) {
this.currentStep++;
+ console.log("下一步操作", this.currentStep);
+
+ if (this.currentStep > 1) {
+ this.stepCompleted[this.currentStep - 2] = true;
+
+ console.log("stepCompleted下::", this.stepCompleted);
+ }
}
},
- // 释放房源操作,可根据实际需求实现逻辑
+ // 完成办理
handleReleaseHouse() {
- console.log("释放房源操作");
+ console.log("完成办理");
},
},
computed: {
@@ -264,6 +387,30 @@ export default {
padding: 15px 33px;
border-radius: 4px;
}
+ .model {
+ position: relative;
+ }
+ }
+ .checkout-process-container {
+ width: 26px;
+ height: 26px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .arrow-container {
+ width: 28px;
+ height: 28px;
+ margin-left: 13px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ }
+ .checkout-process {
+ position: absolute;
+ top: -5px;
+ right: -3px;
}
.button-group {
position: fixed;
diff --git a/src/views/residence/checkOut/index.vue b/src/views/residence/checkOut/index.vue
index c2a1de3..0a033dd 100644
--- a/src/views/residence/checkOut/index.vue
+++ b/src/views/residence/checkOut/index.vue
@@ -2,7 +2,7 @@
@@ -21,20 +21,23 @@
:src="item.imageSrc"
>
{{ item.title }}
+
+
+
+
+
-
-
@@ -138,8 +141,8 @@
-
-
+
+
退房信息
@@ -149,13 +152,12 @@
姓名:张三
性别:女
手机号:-01-01
-
退房类型-01-01
-
+
退房检查
@@ -405,12 +407,12 @@
- {{ currentStep === dataList.length-1 ? "释放房源" : "下一步" }}
+ {{ currentStep === dataList.length - 1 ? "释放房源" : "下一步" }}
@@ -503,48 +505,50 @@ export default {
};
},
methods: {
+ goBack() {
+ this.$router.push({ path: "/" });
+ },
// 查询
handleQuery() {
console.log("查询操作");
},
handleCancel() {
+ this.$router.push({ path: "/" });
+
console.log("取消操作");
},
// 上一步操作
handlePrevStep() {
if (this.currentStep > 0) {
this.currentStep--;
- console.log('上currentStep::',this.currentStep);
- console.log('dataList.::',this.dataList);
-
- if (this.currentStep <=this.stepCompleted.length) {
+ console.log("上currentStep::", this.currentStep);
+ console.log("dataList.::", this.dataList);
+
+ if (this.currentStep <= this.stepCompleted.length) {
this.stepCompleted[this.currentStep - 1] = false;
if (this.currentStep == 3) {
- this.stepCompleted[this.currentStep ] = false;
+ this.stepCompleted[this.currentStep] = false;
}
- console.log('stepCompleted::',this.stepCompleted);
-
+ console.log("stepCompleted::", this.stepCompleted);
}
}
},
// 下一步操作
handleNextStep() {
-
if (this.currentStep < this.dataList.length) {
- this.currentStep++;
- console.log("下一步操作",this.currentStep);
+ this.currentStep++;
+ console.log("下一步操作", this.currentStep);
if (this.currentStep > 1) {
this.stepCompleted[this.currentStep - 2] = true;
- if(this.currentStep === 4){
+ if (this.currentStep === 4) {
this.stepCompleted[this.currentStep - 1] = true;
}
- console.log('stepCompleted下::',this.stepCompleted);
-
+ console.log("stepCompleted下::", this.stepCompleted);
}
}
},
- // 释放房源操作,可根据实际需求实现逻辑
+ // 释放房源操作
handleReleaseHouse() {
console.log("释放房源操作");
},
@@ -613,6 +617,22 @@ export default {
position: relative;
}
}
+ .checkout-process-container {
+ width: 26px;
+ height: 26px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .arrow-container {
+ width: 42px;
+ height: 28px;
+ margin-left: 13px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ }
.checkout-process {
position: absolute;
top: -5px;