diff --git a/src/components/SearchIpt/index.vue b/src/components/SearchIpt/index.vue
index 479fb1f..b1da733 100644
--- a/src/components/SearchIpt/index.vue
+++ b/src/components/SearchIpt/index.vue
@@ -9,7 +9,9 @@
}
"
>
- {{ props.activeTypeName }}
+
+ {{ props.activeTypeName }}
+
@@ -38,7 +40,11 @@
-
+
@@ -104,6 +110,7 @@ const onInputChange = (value) => {
border-right: none;
border-top-left-radius: 18px;
border-bottom-left-radius: 18px;
+ font-size: 13px;
.check-item {
position: absolute;
diff --git a/src/pages.json b/src/pages.json
index 778e24c..4419117 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -199,8 +199,7 @@
"pagePath": "pages/cart/index",
"text": "预约车",
"iconPath": "static/tab-bar/car.png",
- "selectedIconPath": "static/tab-bar/car_sel.png",
- "visible": false
+ "selectedIconPath": "static/tab-bar/car_sel.png"
},
{
"pagePath": "pages/message/index",
diff --git a/src/pages/class-page/index.vue b/src/pages/class-page/index.vue
index 76a28f5..7254181 100644
--- a/src/pages/class-page/index.vue
+++ b/src/pages/class-page/index.vue
@@ -1,9 +1,9 @@
-
-
- 分类
+
+ 返回
+ 分类筛选
@@ -108,16 +108,33 @@ onShow(() => {
background: linear-gradient(to bottom, #c0e9ce, #e4f2f2, #f9f9f9);
}
+// .nav-title {
+// position: relative;
+// padding: 15px;
+// .nav-title-text {
+// position: absolute;
+// left: 50%;
+// top: 50%;
+// transform: translate(-50%, -50%);
+// color: #333;
+// font-size: 16px;
+// }
+// }
+
:deep(.van-cell-group--inset) {
padding: 15px 0;
}
.companyClass {
display: flex;
flex-wrap: wrap;
+ align-items: center;
+
view {
- width: calc((100% - 20px) / 3);
- margin-right: 10px;
- margin-top: 10px;
+ // width: calc((100% - 20px) / 3);
+ // margin-right: 10px;
+ // margin-top: 10px;
+ width: 98%;
+ margin-bottom: 10px;
padding: 0 6px;
height: 32px;
line-height: 32px;
@@ -126,15 +143,7 @@ onShow(() => {
box-sizing: border-box;
color: #999999;
background-color: #e9e9e9;
- font-size: 14px;
- }
-
- & view:nth-child(3n) {
- margin-right: 0;
- }
- & view:hover {
- background-color: #22ab9b !important;
- color: #fff !important;
+ font-size: 13px;
}
}
.deviceClass {
@@ -144,7 +153,7 @@ onShow(() => {
padding-left: 10px;
view {
width: 100%;
- margin-top: 10px;
+ margin-top: 8px;
padding: 0 6px;
height: 32px;
line-height: 32px;
@@ -153,7 +162,7 @@ onShow(() => {
box-sizing: border-box;
color: #999999;
background-color: #e9e9e9;
- font-size: 14px;
+ font-size: 13px;
}
& view:nth-child(2n) {
@@ -177,29 +186,19 @@ onShow(() => {
display: none;
}
-:deep(.van-sidebar-item__text) {
- white-space: nowrap; /* 防止换行 */
- overflow: hidden; /* 隐藏溢出的内容 */
- text-overflow: ellipsis; /* 显示省略号 */
- max-width: 100%; /* 最大宽度,根据需要设置 */
- display: block; /* 确保是块级元素 */
-}
:deep(.van-tabs__nav) {
background-color: #c5ead3;
padding: 0 8px;
}
:deep(.van-sidebar-item) {
- padding: 0 8px;
- background-color: #daefe8;
- color: #333333;
- font-size: 14px;
- height: 32px;
- line-height: 32px;
+ padding: 2px 8px;
+ font-size: 13px;
}
:deep(.van-sidebar-item--select, .van-sidebar-item--select:active) {
background-color: #22ab9b;
color: #fff;
- border-radius: 16px;
+ font-weight: normal;
+ border-radius: 6px;
}
:deep(.van-sidebar) {
padding: 0 4px;
diff --git a/src/pages/demand-details/index.vue b/src/pages/demand-details/index.vue
index 47bc96f..a1f8cb5 100644
--- a/src/pages/demand-details/index.vue
+++ b/src/pages/demand-details/index.vue
@@ -2,18 +2,9 @@
-
-
-
- 需求详情
-
+
+ 返回
+ 需求详情
@@ -242,7 +233,7 @@ onLoad(async (options) => {
// box-sizing: border-box;
// background: linear-gradient(to bottom, #bfdfdb, #f9f9f9, #fff);
- font-size: 16px;
+ font-size: 14px;
.card-style {
width: 97%;
@@ -250,7 +241,7 @@ onLoad(async (options) => {
border-radius: 6px;
padding: 8px 12px;
box-sizing: border-box;
- font-size: 16px;
+ font-size: 14px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
.goods-name {
@@ -260,7 +251,7 @@ onLoad(async (options) => {
display: flex;
align-items: center;
justify-content: space-between;
- font-size: 18px;
+ font-size: 16px;
font-weight: bold;
letter-spacing: 2px;
@@ -272,7 +263,7 @@ onLoad(async (options) => {
.text-right {
margin-top: 6px;
- font-size: 16px;
+ font-size: 14px;
text-align: right;
}
}
@@ -282,7 +273,7 @@ onLoad(async (options) => {
.goods-details text,
.demand-list text {
margin-right: 16px;
- font-size: 16px;
+ font-size: 14px;
color: #5c5b5b;
}
diff --git a/src/pages/goods-details/components/details-model.vue b/src/pages/goods-details/components/details-model.vue
index 7c8ab13..ba9bb40 100644
--- a/src/pages/goods-details/components/details-model.vue
+++ b/src/pages/goods-details/components/details-model.vue
@@ -41,10 +41,6 @@
上架数量:{{ deviceInfo.devUapNum }}
访问量:{{ deviceInfo.companyVisitNum }}
-
-
- 合肥市
-
@@ -52,32 +48,9 @@
{{ item.goods_label }}{{ deviceInfo[item.label_content] }}
-
-
+
{
.van-swipe {
width: 100%;
height: 40vh;
-
- // .van-image {
- // width: 100%;
- // height: 100%;
- // }
}
.card-style {
diff --git a/src/pages/goods-list/index.vue b/src/pages/goods-list/index.vue
index 0b2e42d..f233847 100644
--- a/src/pages/goods-list/index.vue
+++ b/src/pages/goods-list/index.vue
@@ -4,18 +4,9 @@
-
-
-
- 装备共享大厅
-
+
+
+ 装备共享大厅
-
- 租金
+ 租金
- 上架时间
+ 上架时间
- 筛选
+ 上架时间
@@ -449,9 +433,7 @@ onShow(() => {})
display: flex;
justify-content: space-between;
padding: 10px;
- box-sizing: border-box;
- border-top-left-radius: 20px;
- border-top-right-radius: 20px;
+ font-size: 13px;
// background: $uni-bg-color;
.filter-box {
@@ -462,12 +444,16 @@ onShow(() => {})
display: flex;
align-items: center;
+ text {
+ margin-right: 6px;
+ }
+
.filter-type {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
- padding: 0 6px;
+ // padding: 0 6px;
& .van-icon:first-child {
transform: rotateZ(-90deg);
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 6116ac7..875bd6d 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -2,43 +2,6 @@
@@ -598,9 +600,6 @@ const tabList = ref([
{ tab_name: '待出库', order_status: 2 },
{ tab_name: '待收货', order_status: 3 },
{ tab_name: '租赁中', order_status: 4 },
- { tab_name: '已退租', order_status: 5 },
- { tab_name: '已完成', order_status: 20 },
- { tab_name: '已取消', order_status: 99 },
])
//
diff --git a/src/style/vant.scss b/src/style/vant.scss
index 2361e4d..57323cb 100644
--- a/src/style/vant.scss
+++ b/src/style/vant.scss
@@ -46,6 +46,21 @@
.view-file {
color: #00a288;
}
+.nav-title {
+ position: relative;
+ padding: 15px 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .nav-title-text {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ color: #333;
+ font-size: 16px;
+ }
+}
// :root {
// --van-primary-color:#00a288;
diff --git a/vite.config.js b/vite.config.js
index 8b2ddac..bc2a013 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -33,10 +33,10 @@ export default defineConfig({
proxy: {
// 在此处编写代理规则
'/api': {
- target: 'http://36.33.26.201:17788/proxyApi',
+ // target: 'http://36.33.26.201:17788/proxyApi',
// target: 'http://192.168.2.123:28080',
// target: 'http://192.168.2.122:28080',
- // target: 'http://192.168.0.244:28580', // 测试服务
+ target: 'http://192.168.0.244:28580', // 测试服务
changeOrigin: true,
rewrite: (path) => {
return path.replace(/\/api/, '')