Commit 607c89be authored by 袁玲利's avatar 袁玲利

Merge branch 'develop' into uat

parents 3598fbeb 5e9e293f
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</view> </view>
<view class="right"> <view class="right">
<van-popover v-model="showPopover" trigger="click" placement="bottom-end"> <van-popover v-model="showPopover" trigger="click" placement="bottom-end">
<view v-for="(item, index) in actions" @click="onSelect(item)" :id="item.id ? item.id : '#item'+index"> <view class="popoverItem" v-for="(item, index) in actions" @click="onSelect(item)" :id="item.id ? item.id : '#item'+index">
{{item.text}} {{item.text}}
</view> </view>
<template #reference> <template #reference>
...@@ -2223,4 +2223,16 @@ ...@@ -2223,4 +2223,16 @@
line-height: 120rpx; line-height: 120rpx;
font-weight: 600; font-weight: 600;
} }
.popoverItem {
width: 225rpx;
margin: 0 20rpx;
height: 40rpx;
line-height: 40rpx;
text-align: center;
font-size: 30rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
border-bottom: 1rpx solid #dddddd;
}
</style> </style>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</view> </view>
<view class="right"> <view class="right">
<van-popover v-model="showPopover" trigger="click" placement="bottom-end"> <van-popover v-model="showPopover" trigger="click" placement="bottom-end">
<view v-for="(item, index) in actions" @click="onSelect(item)" :id="item.id ? item.id : '#item'+index"> <view class="popoverItem" v-for="(item, index) in actions" @click="onSelect(item)" :id="item.id ? item.id : '#item'+index">
{{item.text}} {{item.text}}
</view> </view>
<template #reference> <template #reference>
...@@ -1859,4 +1859,16 @@ ...@@ -1859,4 +1859,16 @@
line-height: 50px; line-height: 50px;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
} }
.popoverItem {
width: 225rpx;
margin: 0 20rpx;
height: 40rpx;
line-height: 40rpx;
text-align: center;
font-size: 30rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
border-bottom: 1rpx solid #dddddd;
}
</style> </style>
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