From 074f334d060ec7d33d39cdeaae5ed84a2a2dd3a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 八月 2023 18:20:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
h5_standard/src/components/newCom/Material.vue | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/h5_standard/src/components/newCom/Material.vue b/h5_standard/src/components/newCom/Material.vue
index 5621f22..edab66b 100644
--- a/h5_standard/src/components/newCom/Material.vue
+++ b/h5_standard/src/components/newCom/Material.vue
@@ -1,13 +1,17 @@
<template>
<van-popup
v-model:show="props.show"
+ :close-on-click-overlay="false"
+ round
position="bottom"
:style="{ height: '80%' }">
- <div class="title">
- <div class="close" @click="close"><van-icon name="arrow-down" size="30" color="#ffffff" /></div>
- </div>
<div class="content">
<div class="content_search content_top">
+ <div class="title">
+ <img class="close" src="@/assets/icon/ic_close@2x.png" alt="" style="opacity: 0;" />
+ <span>閫夋嫨鐗╂枡</span>
+ <img class="close" src="@/assets/icon/ic_close@2x.png" alt="" @click="close" />
+ </div>
<v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О"></v-Search>
</div>
<div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
@@ -163,21 +167,6 @@
</script>
<style lang="scss" scoped>
- .title {
- position: fixed;
- right: 50px;
- bottom: 100px;
- z-index: 9;
- .close {
- width: 80px;
- height: 80px;
- border-radius: 50%;
- background: #999999;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
.content {
.content_code {
position: fixed;
@@ -197,6 +186,24 @@
position: sticky;
top: 88px;
z-index: 9;
+ .title {
+ width: 100%;
+ padding: 0 0 30px 0;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ span {
+ font-size: 30px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #222222;
+ }
+ .close {
+ width: 28px;
+ height: 28px;
+ }
+ }
.content_search_x {
height: 24px;
}
@@ -209,7 +216,7 @@
color: #666666;
position: sticky;
z-index: 99;
- top: 127px;
+ top: 195px;
}
.content_list {
width: 100%;
--
Gitblit v1.9.3