style: remove global .border class and standardize border styles
Delete the unused global .border SCSS utility class from border.scss. Replace all usages of the generic "border" class with explicit "border border-[#e5e8ee]" to match the original border styling, and retain the dynamic border color override in the OrderQrcode component.
This commit is contained in:
@@ -31,7 +31,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view
|
<view
|
||||||
class="flex flex-col w-full items-center justify-center rounded-[8px] border pt-[16px] pb-[32px] mt-[12px]">
|
class="flex flex-col w-full items-center justify-center rounded-[8px] border border-[#e5e8ee] pt-[16px] pb-[32px] mt-[12px]">
|
||||||
<view class="flex flex-row justify-between w-full px-[12px]">
|
<view class="flex flex-row justify-between w-full px-[12px]">
|
||||||
<view class="bg-[#F0F8F3] text-[#0CCD58] text-[14px] px-[12px] leading-[24px] rounded-[12px]">凭证{{
|
<view class="bg-[#F0F8F3] text-[#0CCD58] text-[14px] px-[12px] leading-[24px] rounded-[12px]">凭证{{
|
||||||
selectedVoucherList.length > 1 ? currentVoucherIndex + 1 : '' }}</view>
|
selectedVoucherList.length > 1 ? currentVoucherIndex + 1 : '' }}</view>
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
selectedVoucher.writeOffCount }}份</view>
|
selectedVoucher.writeOffCount }}份</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="flex items-center justify-center mt-[20px] p-[20px] rounded-[12px] border borderColor"
|
<view class="flex items-center justify-center mt-[20px] p-[20px] rounded-[12px] border border-[#e5e8ee]"
|
||||||
:style="{ borderColor: selectedVoucher?.color }">
|
:style="{ borderColor: selectedVoucher?.color }">
|
||||||
<Qrcode v-if="showQrcode" :size="props.size" :unit="props.unit" :val="qrcodeVal" :loadMake="true"
|
<Qrcode v-if="showQrcode" :size="props.size" :unit="props.unit" :val="qrcodeVal" :loadMake="true"
|
||||||
:onval="true" />
|
:onval="true" />
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
orderData.workOrderStatus !== '2' &&
|
orderData.workOrderStatus !== '2' &&
|
||||||
orderData.workOrderStatus !== '3'
|
orderData.workOrderStatus !== '3'
|
||||||
" class="flex items-center justify-between">
|
" class="flex items-center justify-between">
|
||||||
<text class="cancel border rounded-[6px] text-[12px] leading-[16px] text-[#525866] ml-auto"
|
<text class="cancel border border-[#e5e8ee] rounded-[6px] text-[12px] leading-[16px] text-[#525866] ml-auto"
|
||||||
@click="cancelCall">取消呼叫</text>
|
@click="cancelCall">取消呼叫</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
// 边框
|
|
||||||
.border {
|
|
||||||
border: 1px solid #e5e8ee;
|
|
||||||
}
|
|
||||||
|
|
||||||
.border-top {
|
.border-top {
|
||||||
border-top: 1px solid #e5e8ee;
|
border-top: 1px solid #e5e8ee;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user