From ee010e7160f0a4dee5e0c2fde55d488f4f2f9788 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 六月 2024 09:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/applePeo.vue | 113 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 68 insertions(+), 45 deletions(-)
diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index 2f62cce..8dc231d 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/h5/pages/staff/vehicle/applePeo.vue
@@ -15,30 +15,40 @@
/>
</view>
<view class="member_list">
- <checkbox-group v-model="selList" @change="changeMem">
- <view v-for="item in memberList" :key="item.id" class="line">
- <image
- :src="
- item.faceImgFull
- ? item.faceImgFull
- : require('@/static/logo@2x.png')
- "
- class="avatar"
- mode=""
- ></image>
- <view class="content">
- <view class="info">
- <text class="name">{{ item.name }}</text>
- <!-- <text class="tag">tag</text> -->
- </view>
- <view class="depart">{{ item.companyName }}</view>
+ <view v-for="(item, index) in memberList" :key="item.id" class="line">
+ <image
+ :src="
+ item.faceImgFull
+ ? item.faceImgFull
+ : require('@/static/logo@2x.png')
+ "
+ class="avatar"
+ mode=""
+ ></image>
+ <view class="content">
+ <view class="info">
+ <text class="name">{{ item.name }}</text>
+ <!-- <text class="tag">tag</text> -->
</view>
- <label>
- <checkbox :checked="item.checked" :value="String(item.id)" class="checkbox" />
- </label>
- <text></text>
+ <view class="depart">{{ item.companyName }}</view>
</view>
- </checkbox-group>
+ <image
+ @click="changeMem(item, index)"
+ v-if="item.checked"
+ src="@/static/meeting/icon/ic_choose_sel@2x.png"
+ mode="widthFix"
+ class="checked"
+ ></image>
+ <image
+ @click="changeMem(item, index)"
+ v-if="!item.checked"
+ src="@/static/meeting/icon/ic_choose@2x.png"
+ mode="widthFix"
+ class="checked"
+ ></image>
+ <text></text>
+ </view>
+
<view class="empty"></view>
</view>
<!-- -->
@@ -55,7 +65,7 @@
mode=""
></image>
</view>
- <view class="btn" @click="onSubmit">纭({{selList.length}}/20)</view>
+ <view class="btn" @click="onSubmit">纭({{ selList.length }}/20)</view>
</view>
<!-- -->
<u-popup
@@ -100,8 +110,8 @@
data() {
return {
memberList: [],
- selList: [],
param: {},
+ selList: [],
isShowSelMem: false
}
@@ -109,32 +119,42 @@
onLoad() {
this.initData()
},
+ mounted() {
+ this.$eventBus.$on('applePeoDetail', (res)=>{
+ res.forEach(item => {
+ this.changeMem(item)
+ })
+ this.$nextnick(() => {
+ this.$forceUpdate()
+ })
+ })
+ },
methods: {
onSubmit() {
this.$eventBus.$emit('applePeo', this.selList)
uni.navigateBack()
},
- changeMem(e) {
- const arr = e.detail.value
- let arrTemp = arr.map(item => {
- let obj = {}
- this.memberList.forEach(ite => {
- if (item == ite.id) {
- obj.name = ite.name.split('-')[0]
- obj.componey = ite.name.split('-')[1] || ''
- obj.id = ite.id
- }
- })
- return obj
- })
- this.selList = arrTemp
- // this.$forceUpdate()
+ changeMem(item, index) {
+ item.checked = !item.checked
+ this.selList = this.memberList.filter(i => i.checked)
+ // const arr = e.detail.value
+ // let arrTemp = arr.map(item => {
+ // let obj = {}
+ // this.memberList.forEach(ite => {
+ // if (item == ite.id) {
+ // obj.name = ite.name.split('-')[0]
+ // obj.componey = ite.name.split('-')[1] || ''
+ // obj.id = ite.id
+ // }
+ // })
+ // return obj
+ // })
+ // this.selList = arrTemp
+ this.$forceUpdate()
},
handleRemove(item) {
- const selIndex = this.selList.findIndex(i => i.id === item.id)
- this.selList.splice(selIndex, 1)
this.memberList.forEach(ite => {
- if(item.id === ite.id){
+ if (item.id === ite.id) {
ite.checked = false
}
})
@@ -168,7 +188,7 @@
font-weight: 600;
}
.btn {
- color: #279baa;
+ color: $uni-color-primary;
}
}
.modal_mem_list {
@@ -225,7 +245,7 @@
align-items: center;
.members {
width: 500rpx;
- color: #4d98a7;
+ color: $uni-color-primary;
white-space: nowrap;
overflow: hidden; //鏂囨湰瓒呭嚭闅愯棌
text-overflow: ellipsis;
@@ -240,7 +260,7 @@
width: 690rpx;
height: 88rpx;
line-height: 88rpx;
- background: #279baa;
+ background: $uni-color-primary;
border-radius: 44rpx;
color: #fff;
text-align: center;
@@ -282,6 +302,9 @@
}
}
}
+ .checked{
+ width: 48rpx;
+ }
}
.empty {
width: 100%;
--
Gitblit v1.9.3