From 2f3221b7c90d5663fdb312653a2d188bc4628370 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 10:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/index/index.vue | 123 ++++++++++++++++++++++------------------
1 files changed, 68 insertions(+), 55 deletions(-)
diff --git a/mini-program/pages/index/index.vue b/mini-program/pages/index/index.vue
index fac27dc..6e87813 100644
--- a/mini-program/pages/index/index.vue
+++ b/mini-program/pages/index/index.vue
@@ -2,35 +2,33 @@
<view class="index">
<view class="zhezhao" v-show="view" @click="view = null"></view>
<view class="head">
- <view class="head-title">
- <view class="head-title-left" @click="jumpList">
- <image src="/static/ic_paihang@2x.png" mode="widthFix"></image>
- <text>鎺掕姒�</text>
- </view>
- <view class="head-title-name">閫夋嫨鐐瑰皢鑰佸笀</view>
- <view class="head-title-left" style="opacity: 0;">
- <image src="/static/ic_paihang@2x.png" mode="widthFix"></image>
- <text>鎺掕姒�</text>
- </view>
- </view>
<view class="head-search">
<view class="head-search-input">
- <u-search placeholder="璇疯緭鍏ヨ�佸笀濮撳悕" height="36" v-model="form.name" :showAction="false" @search="search"></u-search>
+ <view class="head-title-left" @click="jumpList">
+ <image src="/static/ic_paihang@2x.png" mode="widthFix"></image>
+ <text>鎺掕姒�</text>
+ </view>
+ <view class="head-search-input-right">
+ <u-search placeholder="璇疯緭鍏ヨ�佸笀濮撳悕" height="36" v-model="form.name" :showAction="false" @search="search" @clear="search"></u-search>
+ </view>
</view>
<view class="cate">
<view class="cate-item" @click="clickRow(1)">
- <text :style="{ fontWeight: (view === 1 || form.bustypeIds) ? 'bold' : '', color: (view === 1 || form.bustypeIds) ? '#222222' : '' }">{{form.bustypeIds ? form.bustypeName : '鍟嗕笟鍖栫被鍨�'}}</text>
+ <text :style="{ fontWeight: (view === 1 || form.bustypeIdList.length > 0) ? 'bold' : '', color: (view === 1 || form.bustypeIdList.length > 0) ? '#222222' : '' }">{{form.bustypeIdList.length > 0 ? form.bustypeName : '鍟嗕笟鍖栫被鍨�'}}</text>
<image src="/static/ar_open_sel8@2x.png" mode="widthFix" v-if="view === 1"></image>
+ <image src="/static/ar_open_sel@2x.png" mode="widthFix" v-else-if="view !== 1 && form.bustypeIdList.length > 0"></image>
<image src="/static/ar_open7@2x.png" mode="widthFix" v-else></image>
</view>
<view class="cate-item" @click="clickRow(2)">
- <text :style="{ fontWeight: (view === 2 || form.fieldIds) ? 'bold' : '', color: (view === 2 || form.fieldIds) ? '#222222' : '' }">鎿呴暱棰嗗煙</text>
+ <text :style="{ fontWeight: (view === 2 || form.fieldIdList.length > 0) ? 'bold' : '', color: (view === 2 || form.fieldIdList.length > 0) ? '#222222' : '' }">鎿呴暱棰嗗煙</text>
<image src="/static/ar_open_sel8@2x.png" mode="widthFix" v-if="view === 2"></image>
+ <image src="/static/ar_open_sel@2x.png" mode="widthFix" v-else-if="view !== 2 && form.fieldIdList.length > 0"></image>
<image src="/static/ar_open7@2x.png" mode="widthFix" v-else></image>
</view>
<view class="cate-item" @click="clickRow(3)">
<text :style="{ fontWeight: (view === 3 || form.orderByType) ? 'bold' : '', color: (view === 3 || form.orderByType) ? '#222222' : '' }">{{form.orderByType ? form.orderByName : '榛樿鎺掑簭'}}</text>
<image src="/static/ar_open_sel8@2x.png" mode="widthFix" v-if="view === 3"></image>
+ <image src="/static/ar_open_sel@2x.png" mode="widthFix" v-else-if="view !== 3 && form.orderByType"></image>
<image src="/static/ar_open7@2x.png" mode="widthFix" v-else></image>
</view>
</view>
@@ -87,12 +85,13 @@
</view>
</view>
<view class="item-info-d" v-if="item.isShow">
- {{item.zhankai ? item.content : item.contentCopy}}<text @click.stop="zhankai(item)">{{item.zhankai ? '鏀惰捣' : '鏇村'}}</text>
+ <!-- @click.stop="zhankai(item)" -->
+ {{item.zhankai ? item.content : item.contentCopy}}<text>{{item.zhankai ? '鏀惰捣' : '鏇村'}}</text>
</view>
<view class="item-info-d" v-else>
{{item.content}}
</view>
- <view class="item-info-price">
+ <view class="item-info-price" v-if="item.fee">
<text>鏍囧噯鏀惰垂</text>
<text>{{item.fee}}</text>
</view>
@@ -109,14 +108,15 @@
form: {
orderByType: '',
orderByName: '',
- fieldIds: '',
- bustypeIds: '',
+ fieldIdList: [],
+ bustypeIdList: [],
bustypeName: '',
name: ''
},
list1: [],
list2: [],
list3: [
+ { name: '榛樿鎺掑簭', id: '', active: true },
{ name: '鏀惰垂浠庨珮鍒颁綆', id: '0', active: false },
{ name: '鏀惰垂浠庝綆鍒伴珮', id: '1', active: false },
{ name: '绛夌骇浠庨珮鍒颁綆', id: '2', active: false },
@@ -143,7 +143,14 @@
this.$u.api.memberPage({
capacity: 10,
page: this.page,
- model: this.form
+ model: {
+ orderByType: this.form.orderByType ? this.form.orderByType : 3,
+ orderByName: this.form.orderByName,
+ fieldIdList: this.form.fieldIdList,
+ bustypeIdList: this.form.bustypeIdList,
+ bustypeName: this.form.bustypeName,
+ name: this.form.name
+ }
}).then(res => {
if (res.code === 200) {
res.data.records.forEach(item => {
@@ -170,7 +177,11 @@
},
clickSearch(i, type) {
if (type === 1) {
- this.form.bustypeIds = this.list1[i].id
+ if (this.list1[i].id) {
+ this.form.bustypeIdList = [this.list1[i].id]
+ } else {
+ this.form.bustypeIdList = []
+ }
this.form.bustypeName = this.list1[i].name
this.list1.forEach((item, index) => {
item.active = index === i
@@ -178,7 +189,7 @@
this.view = null
} else if (type === 2) {
this.list2[i].active = !this.list2[i].active
- this.form.fieldIds = this.list2.filter(item => item.active).map(item => item.id).join(',')
+ this.form.fieldIdList = this.list2.filter(item => item.active).map(item => item.id)
this.$forceUpdate()
} else {
this.form.orderByType = this.list3[i].id
@@ -203,6 +214,7 @@
if (res.code === 200) {
res.data.active = false
this.list1 = res.data
+ this.list1.unshift({ name: '鍏ㄩ儴', id: null, active: true })
}
})
this.$u.api.categoryList({ type: 2 })
@@ -246,7 +258,7 @@
width: 100%;
background: #FFFFFF;
border-radius: 8rpx;
- padding: 24rpx;
+ padding: 30rpx;
box-sizing: border-box;
display: flex;
align-items: flex-start;
@@ -299,26 +311,30 @@
}
.item-info-a {
display: flex;
- align-items: center;
+ align-items: flex-start;
text {
&:nth-child(1) {
+ flex-shrink: 0;
font-weight: 600;
font-size: 30rpx;
color: #222222;
}
&:nth-child(2) {
+ width: 280rpx;
font-weight: 400;
font-size: 24rpx;
color: #777777;
margin-left: 10rpx;
+ margin-top: 7rpx;
}
}
}
.item-info-b {
+ width: 80%;
display: flex;
flex-wrap: wrap;
align-items: center;
- margin-top: 8rpx;
+ margin-top: 16rpx;
.item-info-b-row {
padding: 0 8rpx;
box-sizing: border-box;
@@ -330,8 +346,9 @@
font-size: 22rpx;
color: #2E68C4;
margin-right: 8rpx;
+ margin-bottom: 8rpx;
&:last-child {
- margin: 0;
+ margin-right: 0;
}
}
}
@@ -358,6 +375,7 @@
}
.item-info-d {
width: 100%;
+ line-height: 40rpx;
font-weight: 400;
font-size: 24rpx;
color: #333333;
@@ -381,49 +399,44 @@
}
.head {
width: 100%;
- height: 260rpx;
+ height: 172rpx;
+ padding-top: 12rpx;
+ box-sizing: border-box;
position: sticky;
top: 0;
left: 0;
z-index: 9;
background-color: #ffffff;
- .head-title {
- width: 100%;
- height: 88rpx;
- padding: 0 30rpx;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .head-title-left {
- display: flex;
- align-items: center;
- image {
- width: 40rpx;
- height: 40rpx;
- }
- text {
- font-weight: 400;
- font-size: 26rpx;
- color: #2E68C4;
- margin-left: 8rpx;
- }
- }
- .head-title-name {
- font-weight: 500;
- font-size: 32rpx;
- color: #111111;
- }
- }
.head-search {
width: 100%;
height: 172rpx;
.head-search-input {
width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
padding: 0 30rpx;
box-sizing: border-box;
height: 72rpx;
- margin-top: 12rpx;
+ .head-title-left {
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ margin-right: 30rpx;
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ }
+ text {
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #2E68C4;
+ margin-left: 8rpx;
+ }
+ }
+ .head-search-input-right {
+ flex: 1;
+ }
}
.sou {
width: 100%;
--
Gitblit v1.9.3