Merge branch 'dev' into 'master'

uniapp【修复】:下单页面发票根据后台设置是否显示

See merge request jianweie/coreshoppro!113
This commit is contained in:
花城
2025-01-10 02:45:51 +00:00

View File

@@ -174,7 +174,7 @@
size="20"></uv-switch> size="20"></uv-switch>
</view> </view>
</view> </view>
<view class="invoice-box" @click="handleRouteNavigateTo(`/pages/subpackage/member/invoice/set/set`)"> <view class="invoice-box" @click="handleRouteNavigateTo(`/pages/subpackage/member/invoice/set/set`)" v-if="shopConfigStore.config.invoiceSwitch == ShowInvoiceEnum.yes">
<view class="tit">发票</view> <view class="tit">发票</view>
<view class="icon"> <view class="icon">
<view class="desc">{{ state.invoice?.name || '无' }}</view> <view class="desc">{{ state.invoice?.name || '无' }}</view>
@@ -240,7 +240,7 @@
import { import {
PaymentTypeEnum, OrderDistributionEnum, ShowStoresSwitchEnum, PaymentTypeEnum, OrderDistributionEnum, ShowStoresSwitchEnum,
OpenPointEnum, PointExchangeModelEnum, ShowPointExchangePriceEnum, OpenPointEnum, PointExchangeModelEnum, ShowPointExchangePriceEnum,
PointsGiveModeEnum, ShowPointsGiveMsgEnum, OrderPayStatusEnum, ShowCouponEnum PointsGiveModeEnum, ShowPointsGiveMsgEnum, OrderPayStatusEnum, ShowCouponEnum ,ShowInvoiceEnum
} from '@/core/enum'; } from '@/core/enum';
import { queryOrderDistributionModel, getSubscriptionTmplIds, queryCreateOrder, queryUserDefaultShip, queryDefaultStore, queryCartList, queryUserPoint, queryCartCoupon } from '@/core/api'; import { queryOrderDistributionModel, getSubscriptionTmplIds, queryCreateOrder, queryUserDefaultShip, queryDefaultStore, queryCartList, queryUserPoint, queryCartCoupon } from '@/core/api';
import type { Response, AddressType, ShopConfigStoreType, StoreListType } from '@/core/models'; import type { Response, AddressType, ShopConfigStoreType, StoreListType } from '@/core/models';