From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug

---
 h5_standard/src/components/common/Warehouse.vue |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/h5_standard/src/components/common/Warehouse.vue b/h5_standard/src/components/common/Warehouse.vue
index 72312dd..6333630 100644
--- a/h5_standard/src/components/common/Warehouse.vue
+++ b/h5_standard/src/components/common/Warehouse.vue
@@ -2,7 +2,7 @@
     <van-popup
         v-model:show="props.show"
         position="bottom"
-        :style="{ height: '100%' }">
+        :style="{ height: props.height }">
         <div class="title">
             <div class="close" @click="close"><van-icon name="arrow-down" size="30" color="#ffffff" /></div>
         </div>
@@ -16,11 +16,16 @@
                     v-model:loading="loading"
                     :finished="finished"
                     finished-text="娌℃湁鏇村浜唦"
-                    @load="onLoad"
-                >
+                    @load="onLoad">
                     <div class="content_list">
                         <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
-                            <div class="content_list_item_name">{{item.name}}</div>
+                            <div class="content_list_item_name">
+                                <span style="color: #03AF76;" v-if="item.tmodel.label == 'APPLIANCE_ONTEST'">[{{ item.tmodel.code }}]</span>
+                                <span style="color: #305ED5;" v-if="item.tmodel.label == 'APPLIANCE_MIX'">[{{ item.tmodel.code }}]</span>
+                                <span style="color: #F5A400;" v-if="item.tmodel.label == 'APPLIANCE_OFFTEST'">[{{ item.tmodel.code }}]</span>
+                                <span style="color: red;" v-if="item.tmodel.label == 'APPLIANCE_USELESS'">[{{ item.tmodel.code }}]</span>
+                                <span>{{item.name}}</span>
+                            </div>
                         </div>
                     </div>
                 </van-list>
@@ -136,6 +141,10 @@
         systemDicDataId: {
             type: String,
             default: ''
+        },
+        height: {
+            type: String,
+            default: '100%'
         }
     })
 
@@ -220,7 +229,15 @@
                     margin-right: 10px;
                 }
                 .content_list_item_name {
-                    font-size: 28px;
+                    width: 100%;
+                    display: flex;
+                    align-items: center;
+                    span {
+                        font-size: 30px;
+                        font-family: PingFangSC-Regular, PingFang SC;
+                        font-weight: 400;
+                        color: #222222;
+                    }
                 }
             }
         }

--
Gitblit v1.9.3