diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4eb1ced..a5c7b66 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,32 +16,25 @@
暂无更多公告! 暂无更多公告! 暂无更多公告!
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -61,8 +54,14 @@
{{equipment.status === 'normal' ? '正常' : '异常'}}
- 租赁时间: {{equipment.startTime}}
- 到期时间: {{equipment.endTime}}
+
+ 租赁时间:
+ {{equipment.startTime}}
+
+
+ 到期时间:
+ {{equipment.endTime}}
+
@@ -79,7 +78,11 @@
:class="{ active: index === 0 }"
@click="onNavClick(index)"
>
- {{index === 0 ? '🏠' : index === 1 ? '➕' : '😊'}}
+
{{nav}}
@@ -91,6 +94,11 @@ import commonEnum from "../../enum/commonEnum";
export default {
data() {
return {
+ background: ['color1', 'color2', 'color3'],
+ indicatorDots: true,
+ autoplay: true,
+ interval: 2000,
+ duration: 500,
commonEnum : commonEnum,
title: '设备租赁',
currentBannerIndex: 0,
@@ -138,7 +146,7 @@ export default {
status: 'normal',
startTime: '2025-07-25 13:23:59',
endTime: '2026-07-25 13:23:59',
- image: '/static/stove.svg'
+ image: commonEnum.TEMP2
},
{
id: 2,
@@ -146,7 +154,7 @@ export default {
status: 'normal',
startTime: '2025-07-25 13:23:59',
endTime: '2026-07-25 13:23:59',
- image: '/static/burner.svg'
+ image: commonEnum.TEMP3
}
]
}
@@ -196,6 +204,21 @@ export default {
title: `切换到${navItems[index]}`,
icon: 'none'
});
+ },
+
+ // 获取导航图标
+ getNavIcon(index) {
+ const isActive = index === 0; // 当前首页是激活状态
+ switch(index) {
+ case 0: // 首页
+ return isActive ? this.commonEnum.HOME_ACTIVE : this.commonEnum.HOME;
+ case 1: // 申请租赁
+ return isActive ? this.commonEnum.RENT_ACTIVE : this.commonEnum.RENT;
+ case 2: // 个人中心
+ return isActive ? this.commonEnum.PERSONAL_CENTER_ACTIVE : this.commonEnum.PERSONAL_CENTER;
+ default:
+ return this.commonEnum.HOME;
+ }
}
}
}
@@ -203,6 +226,16 @@ export default {
\n","import MiniProgramPage from 'D:/work/HBuilderProjects/HomeLease/pages/index/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["commonEnum","uni"],"mappings":";;;AA0FA,MAAK,YAAU;AAAA,EACb,OAAO;AACL,WAAO;AAAA,MACL,YAAaA,gBAAU;AAAA,MACvB,OAAO;AAAA,MACP,oBAAoB;AAAA,MACpB,YAAY;AAAA,QACV;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACT;AAAA,MACD;AAAA,MACD,eAAe;AAAA,QACb;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,QAAQ;AAAA,UACR,WAAW;AAAA,UACX,SAAS;AAAA,UACT,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,QAAQ;AAAA,UACR,WAAW;AAAA,UACX,SAAS;AAAA,UACT,OAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACD;AAAA,EACD,SAAS;AAEP,SAAK,oBAAmB;AAAA,EACzB;AAAA,EACD,SAAS;AAAA;AAAA,IAEP,sBAAsB;AACpB,kBAAY,MAAM;AAChB,aAAK,sBAAsB,KAAK,qBAAqB,KAAK,KAAK,WAAW;AAAA,MAC3E,GAAE,GAAI;AAAA,IACR;AAAA;AAAA,IAGD,WAAW,OAAO;AAChB,WAAK,qBAAqB;AAAA,IAC3B;AAAA;AAAA,IAGD,cAAc,OAAO;AACnB,WAAK,qBAAqB;AAAA,IAC3B;AAAA;AAAA,IAGD,QAAQ,WAAW;AACjBC,oBAAAA,MAAI,UAAU;AAAA,QACZ,OAAO,OAAO,UAAU,IAAI;AAAA,QAC5B,MAAM;AAAA,MACR,CAAC;AAAA,IACF;AAAA;AAAA,IAGD,iBAAiB,WAAW;AAC1BA,oBAAAA,MAAI,UAAU;AAAA,QACZ,OAAO,KAAK,UAAU,IAAI;AAAA,QAC1B,MAAM;AAAA,MACR,CAAC;AAAA,IACF;AAAA;AAAA,IAGD,WAAW,OAAO;AAChB,YAAM,WAAW,CAAC,MAAM,QAAQ,MAAM;AACtCA,oBAAAA,MAAI,UAAU;AAAA,QACZ,OAAO,MAAM,SAAS,KAAK,CAAC;AAAA,QAC5B,MAAM;AAAA,MACR,CAAC;AAAA,IACH;AAAA,EACF;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACvMA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"index.js","sources":["pages/index/index.vue","C:/Users/Administrator/Downloads/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvaW5kZXgvaW5kZXgudnVl"],"sourcesContent":["\n \n\n \n \n\n \n \n \n \n 暂无更多公告! 暂无更多公告! 暂无更多公告!\n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n 我的租赁设备\n \n \n \n \n \n \n \n 租赁时间:\n {{equipment.startTime}}\n \n \n 到期时间:\n {{equipment.endTime}}\n \n \n \n \n \n \n \n\n \n \n \n \n {{nav}}\n \n \n \n\n\n\n\n\n","import MiniProgramPage from 'D:/work/HBuilderProjects/HomeLease/pages/index/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["commonEnum","uni"],"mappings":";;;AA6FA,MAAK,YAAU;AAAA,EACb,OAAO;AACL,WAAO;AAAA,MACL,YAAY,CAAC,UAAU,UAAU,QAAQ;AAAA,MACzC,eAAe;AAAA,MACf,UAAU;AAAA,MACV,UAAU;AAAA,MACV,UAAU;AAAA,MACV,YAAaA,gBAAU;AAAA,MACvB,OAAO;AAAA,MACP,oBAAoB;AAAA,MACpB,YAAY;AAAA,QACV;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACR;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU;AAAA,UACV,OAAO;AAAA,QACT;AAAA,MACD;AAAA,MACD,eAAe;AAAA,QACb;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,QAAQ;AAAA,UACR,WAAW;AAAA,UACX,SAAS;AAAA,UACT,OAAOA,gBAAU,WAAC;AAAA,QACnB;AAAA,QACD;AAAA,UACE,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,QAAQ;AAAA,UACR,WAAW;AAAA,UACX,SAAS;AAAA,UACT,OAAOA,gBAAU,WAAC;AAAA,QACpB;AAAA,MACF;AAAA,IACF;AAAA,EACD;AAAA,EACD,SAAS;AAEP,SAAK,oBAAmB;AAAA,EACzB;AAAA,EACD,SAAS;AAAA;AAAA,IAEP,sBAAsB;AACpB,kBAAY,MAAM;AAChB,aAAK,sBAAsB,KAAK,qBAAqB,KAAK,KAAK,WAAW;AAAA,MAC3E,GAAE,GAAI;AAAA,IACR;AAAA;AAAA,IAGD,WAAW,OAAO;AAChB,WAAK,qBAAqB;AAAA,IAC3B;AAAA;AAAA,IAGD,cAAc,OAAO;AACnB,WAAK,qBAAqB;AAAA,IAC3B;AAAA;AAAA,IAGD,QAAQ,WAAW;AACjBC,oBAAAA,MAAI,UAAU;AAAA,QACZ,OAAO,OAAO,UAAU,IAAI;AAAA,QAC5B,MAAM;AAAA,MACR,CAAC;AAAA,IACF;AAAA;AAAA,IAGD,iBAAiB,WAAW;AAC1BA,oBAAAA,MAAI,UAAU;AAAA,QACZ,OAAO,KAAK,UAAU,IAAI;AAAA,QAC1B,MAAM;AAAA,MACR,CAAC;AAAA,IACF;AAAA;AAAA,IAGD,WAAW,OAAO;AAChB,YAAM,WAAW,CAAC,MAAM,QAAQ,MAAM;AACtCA,oBAAAA,MAAI,UAAU;AAAA,QACZ,OAAO,MAAM,SAAS,KAAK,CAAC;AAAA,QAC5B,MAAM;AAAA,MACR,CAAC;AAAA,IACF;AAAA;AAAA,IAGD,WAAW,OAAO;AAChB,YAAM,WAAW,UAAU;AAC3B,cAAO,OAAK;AAAA,QACV,KAAK;AACH,iBAAO,WAAW,KAAK,WAAW,cAAc,KAAK,WAAW;AAAA,QAClE,KAAK;AACH,iBAAO,WAAW,KAAK,WAAW,cAAc,KAAK,WAAW;AAAA,QAClE,KAAK;AACH,iBAAO,WAAW,KAAK,WAAW,yBAAyB,KAAK,WAAW;AAAA,QAC7E;AACE,iBAAO,KAAK,WAAW;AAAA,MAC3B;AAAA,IACF;AAAA,EACF;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC9NA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 8cb5b13..e03b4d9 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -6938,9 +6938,9 @@ function isConsoleWritable() {
return isWritable;
}
function initRuntimeSocketService() {
- const hosts = "172.21.144.1,192.168.2.30,127.0.0.1";
+ const hosts = "172.30.208.1,192.168.2.30,127.0.0.1";
const port = "8090";
- const id = "mp-weixin_PmNvfx";
+ const id = "mp-weixin_KIxU6O";
const lazy = typeof swan !== "undefined";
let restoreError = lazy ? () => {
} : initOnError();
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 0ca4a4f..848234e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -4,6 +4,11 @@ const enum_commonEnum = require("../../enum/commonEnum.js");
const _sfc_main = {
data() {
return {
+ background: ["color1", "color2", "color3"],
+ indicatorDots: true,
+ autoplay: true,
+ interval: 2e3,
+ duration: 500,
commonEnum: enum_commonEnum.commonEnum,
title: "设备租赁",
currentBannerIndex: 0,
@@ -51,7 +56,7 @@ const _sfc_main = {
status: "normal",
startTime: "2025-07-25 13:23:59",
endTime: "2026-07-25 13:23:59",
- image: "/static/stove.svg"
+ image: enum_commonEnum.commonEnum.TEMP2
},
{
id: 2,
@@ -59,7 +64,7 @@ const _sfc_main = {
status: "normal",
startTime: "2025-07-25 13:23:59",
endTime: "2026-07-25 13:23:59",
- image: "/static/burner.svg"
+ image: enum_commonEnum.commonEnum.TEMP3
}
]
};
@@ -103,6 +108,20 @@ const _sfc_main = {
title: `切换到${navItems[index]}`,
icon: "none"
});
+ },
+ // 获取导航图标
+ getNavIcon(index) {
+ const isActive = index === 0;
+ switch (index) {
+ case 0:
+ return isActive ? this.commonEnum.HOME_ACTIVE : this.commonEnum.HOME;
+ case 1:
+ return isActive ? this.commonEnum.RENT_ACTIVE : this.commonEnum.RENT;
+ case 2:
+ return isActive ? this.commonEnum.PERSONAL_CENTER_ACTIVE : this.commonEnum.PERSONAL_CENTER;
+ default:
+ return this.commonEnum.HOME;
+ }
}
}
};
@@ -110,22 +129,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
return {
a: $data.commonEnum.LOCATION,
b: $data.commonEnum.ANNOUNCEMENT_ICON,
- c: common_vendor.f($data.bannerList, (banner, index, i0) => {
- return {
- a: banner.id,
- b: $data.currentBannerIndex === index ? 1 : "",
- c: common_vendor.o(($event) => $options.onBannerClick(index), banner.id)
- };
- }),
+ c: $data.commonEnum.TEMP1,
d: $data.commonEnum.TEMP1,
- e: common_vendor.f($data.bannerList, (banner, index, i0) => {
- return {
- a: index,
- b: $data.currentBannerIndex === index ? 1 : "",
- c: common_vendor.o(($event) => $options.onDotClick(index), index)
- };
- }),
- f: common_vendor.f($data.equipmentList, (equipment, k0, i0) => {
+ e: $data.commonEnum.TEMP1,
+ f: $data.commonEnum.TEMP1,
+ g: $data.indicatorDots,
+ h: $data.autoplay,
+ i: $data.interval,
+ j: $data.duration,
+ k: common_vendor.f($data.equipmentList, (equipment, k0, i0) => {
return {
a: equipment.image,
b: common_vendor.t(equipment.name),
@@ -138,9 +150,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
i: common_vendor.o(($event) => $options.onEquipmentClick(equipment), equipment.id)
};
}),
- g: common_vendor.f(["首页", "申请租赁", "个人中心"], (nav, index, i0) => {
+ l: common_vendor.f(["首页", "申请租赁", "个人中心"], (nav, index, i0) => {
return {
- a: common_vendor.t(index === 0 ? "🏠" : index === 1 ? "➕" : "😊"),
+ a: $options.getNavIcon(index),
b: common_vendor.t(nav),
c: index,
d: index === 0 ? 1 : "",
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index b4d37bf..1e4f34f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
@@ -1 +1 @@
-暂无更多公告! 暂无更多公告! 暂无更多公告!我的租赁设备租赁时间: {{equipment.e}}到期时间: {{equipment.f}}{{nav.a}}{{nav.b}}
\ No newline at end of file
+暂无更多公告! 暂无更多公告! 暂无更多公告!我的租赁设备租赁时间:{{equipment.e}}到期时间:{{equipment.f}}{{nav.b}}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
index f4db835..97d742a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@@ -23,6 +23,15 @@
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
+.swiper.data-v-1cf27b2a {
+ height: 300rpx;
+}
+.swiper .swiper-item.data-v-1cf27b2a {
+ display: block;
+ height: 300rpx;
+ line-height: 300rpx;
+ text-align: center;
+}
.home-container.data-v-1cf27b2a {
background: linear-gradient(to bottom, #FFDDCA 0px, #FFDDCA 450rpx, #f5f5f5 450rpx, #f5f5f5 100%);
min-height: 100vh;
@@ -39,6 +48,8 @@
display: flex;
justify-content: space-between;
align-items: center;
+ background: #FFDDCA;
+ z-index: 999;
}
.header .location-info.data-v-1cf27b2a {
display: flex;
@@ -72,7 +83,6 @@
overflow: hidden;
height: 34rpx;
border-radius: 100rpx;
- border: #4cd964 solid 1px;
}
.announcement-bar .announcementIcon.data-v-1cf27b2a {
height: 32rpx;
@@ -90,7 +100,6 @@
color: black;
white-space: nowrap;
animation: scroll-text-1cf27b2a 10s linear infinite;
- border: #4cd964 solid 1px;
display: inline-block;
padding-left: 100%;
}
@@ -196,12 +205,15 @@
padding: 0 30rpx;
}
.section-title.data-v-1cf27b2a {
- font-size: 32rpx;
- font-weight: bold;
- color: #333;
+ width: 180rpx;
+ height: 33rpx;
+ background: #FFFFFF;
+ font-size: 14px;
+ font-weight: 400;
+ color: #3D3D3D;
margin-bottom: 20rpx;
- padding: 20rpx 0;
- border-bottom: 1rpx solid #eee;
+ padding: 14rpx 20rpx;
+ border-radius: 4px;
}
.equipment-list.data-v-1cf27b2a {
display: flex;
@@ -216,18 +228,20 @@
gap: 30rpx;
box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
transition: all 0.3s ease;
+ justify-content: center;
+ align-items: center;
+}
+.equipment-item .equipment-image.data-v-1cf27b2a {
+ width: 160rpx;
+ height: 106rpx;
+ border-radius: 10rpx;
+ background-color: #f8f9fa;
+ flex-shrink: 0;
}
.equipment-item.data-v-1cf27b2a:active {
transform: scale(0.98);
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.15);
}
-.equipment-image.data-v-1cf27b2a {
- width: 120rpx;
- height: 120rpx;
- border-radius: 10rpx;
- background-color: #f8f9fa;
- flex-shrink: 0;
-}
.equipment-info.data-v-1cf27b2a {
flex: 1;
display: flex;
@@ -241,18 +255,18 @@
margin-bottom: 15rpx;
}
.equipment-name.data-v-1cf27b2a {
- font-size: 28rpx;
- font-weight: bold;
- color: #333;
+ font-size: 16px;
+ font-weight: 500;
+ color: #3D3D3D;
}
.status-badge.data-v-1cf27b2a {
- padding: 4rpx 12rpx;
- border-radius: 20rpx;
- font-size: 20rpx;
- color: #fff;
+ padding: 4rpx 26rpx;
+ border-radius: 5rpx;
+ font-size: 24rpx;
+ color: #40C186;
}
.status-badge.normal.data-v-1cf27b2a {
- background-color: #52c41a;
+ background-color: #EBFFF6;
}
.status-badge.warning.data-v-1cf27b2a {
background-color: #faad14;
@@ -266,19 +280,27 @@
gap: 8rpx;
margin-bottom: 15rpx;
}
-.detail-item.data-v-1cf27b2a {
+.detail-item-row.data-v-1cf27b2a {
+ display: flex;
+ justify-content: space-between;
+}
+.detail-item-row .detail-item-time.data-v-1cf27b2a {
+ color: #817F7F;
+ font-size: 26rpx;
+}
+.detail-item-row .detail-item.data-v-1cf27b2a {
font-size: 24rpx;
color: #666;
}
.renew-btn.data-v-1cf27b2a {
- align-self: flex-end;
+ margin-right: 0;
background: #F15A04;
color: #fff;
- border: none;
- border-radius: 25rpx;
- padding: 15rpx 30rpx;
- font-size: 24rpx;
+ border-radius: 5px;
+ padding: 0 57rpx;
+ font-size: 32rpx;
font-weight: 500;
+ margin-top: 10rpx;
}
/* 底部导航 */
@@ -307,14 +329,13 @@
transform: scale(0.95);
}
.nav-icon.data-v-1cf27b2a {
- font-size: 40rpx;
- color: #999;
+ width: 48rpx;
+ height: 48rpx;
}
.nav-text.data-v-1cf27b2a {
font-size: 20rpx;
color: #999;
}
-.nav-item.active .nav-icon.data-v-1cf27b2a,
.nav-item.active .nav-text.data-v-1cf27b2a {
color: #ff9a9e;
}
\ No newline at end of file