Commit 49262148 authored by 郭欢's avatar 郭欢

'修改,'

parent a1d56712
......@@ -133,6 +133,7 @@
padding-top: 0.4rem;
padding-bottom: 0.2rem;
text-align: center;
font-size: 0.34rem;
}
.order-item {
width: 6.9rem;
......@@ -320,19 +321,19 @@
text-align: left;
padding-left: 0.2rem;
margin-bottom: 0.1rem;
font-size: 0.3rem;
font-size: 0.34rem;
}
.input::-webkit-input-placeholder {
color: #c8c8c8;
font-size: 0.3rem;
font-size: 0.34rem;
}
.math-btn {
margin-left: 0.3rem;
margin-right: 0.3rem;
color: #0256ff;
font-size: 0.3rem;
font-size: 0.34rem;
}
.hc_total {
......
......@@ -92,6 +92,10 @@
height: 100%;
border-radius: 0.08rem;
}
.list-cont {
max-height: 4.6rem;
overflow-y: auto;
}
.list-item {
margin-bottom: 0.4rem;
}
......@@ -182,12 +186,18 @@
}
.cancel_cont {
width: 6.9rem;
max-height: 7rem;
// max-height: 7rem;
background: #fff;
border-radius: 0.12rem;
padding-top: 0.4rem;
padding-bottom: 0.2rem;
text-align: center;
font-size: 0.34rem;
}
.cancel_cont .hc_total {
font-size: 0.34rem;
margin-top: .2rem;
}
// .van-popup {
// width: 6.9rem;
......@@ -251,11 +261,11 @@
text-align: left;
padding-left: 0.2rem;
margin-bottom: 0.1rem;
font-size: 0.3rem;
font-size: 0.34rem;
}
.input::-webkit-input-placeholder {
color: #c8c8c8;
font-size: 0.3rem;
font-size: 0.34rem;
}
.hc_field{
width: 6.3rem;
......@@ -266,14 +276,15 @@
text-align: left;
padding-left: 0.2rem;
margin: 0 auto 0.1rem;
font-size: 0.3rem;
font-size: 0.34rem;
line-height: 0.76rem;
}
.math-btn {
margin-left: 0.3rem;
margin-right: 0.3rem;
margin-top: 0.1rem;
color: #0256ff;
font-size: 0.3rem;
font-size: 0.34rem;
}
.hc_total {
text-align: left;
......@@ -290,7 +301,7 @@
color: #ffffff;
text-align: center;
line-height: 0.78rem;
margin: 1.2rem auto;
margin: .5rem auto .2rem auto;
}
// 日期选择样式
.date {
......@@ -336,4 +347,8 @@
/deep/ .van-picker__confirm, /deep/ .van-picker__cancel {
font-size: 0.4rem !important;
}
/deep/ .van-popup.van-popup--center {
// border-radius: .12rem;
}
\ No newline at end of file
......@@ -109,7 +109,7 @@
<div class="item_line"></div>
</div>
<div class="material" v-if="item.pay_order != ''">
<div class="item-title">已支付耗材</div>
<div class="item-title">已支付耗材</div>
<div v-for="(parent, index) in item.pay_order" :key="index">
<div
class="ma-item flex-h flex-hb"
......@@ -227,26 +227,28 @@
<van-popup v-model="hcShow" close-icon="close">
<div class="cancel_cont">
<div class="pop_title">备注耗材</div>
<div class="list-item" v-for="(item, index) in addList" :key="index">
<input
class="input"
maxlength="20"
v-model="item.goods_name"
type="text"
placeholder="请输入耗材名称"
/>
<!-- <input class="input" maxlength="3" v-model.number="item.number" type="number" placeholder="请输入耗材个数" /> -->
<van-field
class="hc_field"
v-model.number="item.number"
type="number"
placeholder="请输入耗材个数"
maxlength="3"
/>
<div class="list-cont">
<div class="list-item" v-for="(item, index) in addList" :key="index">
<input
class="input"
maxlength="20"
v-model="item.goods_name"
type="text"
placeholder="请输入耗材名称"
/>
<!-- <input class="input" maxlength="3" v-model.number="item.number" type="number" placeholder="请输入耗材个数" /> -->
<van-field
class="hc_field"
v-model.number="item.number"
type="number"
placeholder="请输入耗材个数"
maxlength="3"
/>
</div>
</div>
<div class="math-btn flex-h flex-vc flex-hb">
<div v-if="addList.length > 1" class="del-btn" @click="delMeth">-删除</div>
<div class="add-btn" @click="addMeth">+新增</div>
<div v-if="addList.length > 1" class="del-btn" @click="delMeth">- 删除</div>
<div class="add-btn" @click="addMeth">+ 新增</div>
</div>
<div class="btnItem flex-h">
<div class="cancel" @click="cancel">取消</div>
......@@ -264,30 +266,14 @@
v-for="(item, index) in expend_detail.list"
:key="index"
>
<div class="one one1 one_title text-line-one">
{{
item.parent_detail
? item.parent_detail.goods_name
: '其它'
}}
</div>
<div class="one one1 one_title text-line-one">{{ item.parent_detail ? item.parent_detail.goods_name : '其它' }}</div>
<div class="one one2 flex-h">
<div class="_one text-line-one">
{{
item.is_free == 2
? item.good_detail.goods_name
: item.goods_name
}}
</div>
<div class="_one text-line-one">{{ item.is_free == 2 ? item.good_detail.goods_name : item.goods_name }}</div>
<div class="_two text-line-one">*{{ item.number }}</div>
</div>
<div class="one one3">{{ item.price }}</div>
</div>
<div class="hc_total">
共计{{ expend_detail.number }}件,总价: ¥{{
expend_detail.price
}}
</div>
<div class="hc_total">共计{{ expend_detail.number }}件,总价: ¥{{ expend_detail.price }}</div>
<div class="sure-btn" @click="cancel">确定</div>
</div>
</van-popup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment