f813fede by lttnew

优化

1 parent f1508768
......@@ -424,6 +424,7 @@ async function getZtxDiscountPolicyApi() {
}
.info-label {
width: 120rpx;
font-size: 28rpx;
color: #666;
}
......
......@@ -118,8 +118,8 @@
<view class="invoice-info-list">
<view class="invoice-info-row">
<view class="invoice-info-label">发票类型</view>
<view :class="{ 'vat-type': invoiceData.invoiceType == 2 }" class="invoice-type-badge">
{{ invoiceData.invoiceType == 1 ? '普通发票' : '增值税专用发票' }}
<view :class="{ 'vat-type': invoiceData.invoiceStatus == 2 }" class="invoice-type-badge">
{{ invoiceData.specialFlag == '2' ? '普通发票' : '增值税专用发票' }}
</view>
</view>
<view class="invoice-info-row">
......@@ -541,6 +541,8 @@ const viewInvoice = (item) => {
// 其他类型显示发票信息弹窗
invoiceData.value = {
invoiceType: item.invoiceType || 1,
specialFlag: item.specialFlag ,
invoiceStatus: item.invoiceStatus ,
invoiceBuyerName: item.invoiceTitle || item.invoiceBuyerName || '—',
invoiceBuyerTaxno: item.invoiceTaxno || item.invoiceBuyerTaxno || '',
invoicePushPhone: item.invoiceEmail || item.invoicePushPhone || '—',
......
......@@ -23,7 +23,7 @@
<view v-else class="lh35">{{form.phone}}</view>
</uni-forms-item>
<uni-forms-item label="地址">
<!-- <uni-forms-item label="地址">
<uni-data-picker :readonly="!edit" :clear-icon="false" v-if="form.siteRegionId"
v-model="form.siteRegionId" :localdata="options" @change="onchangeRegionId">
</uni-data-picker>
......@@ -33,12 +33,12 @@
<uni-data-picker :readonly="!edit" :clear-icon="false" v-else-if="form.siteProvinceId"
v-model="form.siteProvinceId" :localdata="options" @change="onchangeRegionId">
</uni-data-picker>
</uni-forms-item>
</uni-forms-item> -->
<uni-forms-item label="详细地址">
<!-- <uni-forms-item label="详细地址">
<uni-easyinput v-if="edit" type="textarea" v-model="form.siteAddress"></uni-easyinput>
<view v-else class="lh35">{{form.siteAddress}}</view>
</uni-forms-item>
</uni-forms-item> -->
<uni-forms-item label="机构介绍">
<uni-easyinput v-if="edit" type="textarea" v-model="form.introduce"></uni-easyinput>
......
......@@ -150,8 +150,8 @@
<view class="invoice-info-list">
<view class="invoice-info-row">
<view class="invoice-info-label">票据类型</view>
<view :class="{ 'vat-type': invoiceData.invoiceType == 2 }" class="invoice-type-badge">
{{ invoiceData.invoiceType == 1 ? '普通票据' : '增值税专用票据' }}
<view :class="{ 'vat-type': invoiceData.invoiceStatus == 2 }" class="invoice-type-badge">
{{ invoiceData.specialFlag == '2' ? '普通发票' : '增值税专用发票' }}
</view>
</view>
<view class="invoice-info-row">
......@@ -663,6 +663,8 @@ const viewInvoice = (item) => {
// 其他类型显示发票信息弹窗
invoiceData.value = {
invoiceType: item.invoiceType || 1,
specialFlag: item.specialFlag ,
invoiceStatus: item.invoiceStatus ,
invoiceBuyerName: item.invoiceTitle || item.invoiceBuyerName || '—',
invoiceBuyerTaxno: item.invoiceTaxno || item.invoiceBuyerTaxno || '',
invoicePushPhone: item.invoiceEmail || item.invoicePushPhone || '—',
......
......@@ -271,6 +271,7 @@ function closeSuccessModal() {
.content {
padding: 20rpx;
padding-bottom: 80rpx;
}
.form-item {
......
......@@ -367,17 +367,17 @@ const confirmBind = async () => {
idcCode: bindForm.value.idcCode
}))
uni.hideLoading()
if (res.data != 1) {
handelGo()
closeBindPopup()
} else {
// if (res.data != 1) {
// // handelGo()
// closeBindPopup()
// } else {
uni.showToast({
title: '绑定成功',
icon: 'success'
})
closeBindPopup()
await getWebInfo()
}
// }
if (err) {
console.log(err)
handelGo()
......
......@@ -148,45 +148,6 @@
</view>
</scroll-view>
<!-- 发票查看弹窗 -->
<view v-if="showInvoicePopup" class="invoice-popup-mask" @click="closeInvoicePopup">
<view class="invoice-popup-content" @click.stop>
<view class="invoice-popup-header">
<text class="invoice-popup-title">发票信息</text>
<view class="invoice-popup-close" @click.stop="closeInvoicePopup"></view>
</view>
<view class="invoice-popup-body">
<view class="invoice-info-list">
<view class="invoice-info-row">
<view class="invoice-info-label">发票类型</view>
<view :class="{ 'vat-type': invoiceData.invoiceType == 2 }" class="invoice-type-badge">
{{ invoiceData.invoiceType == 1 ? '普通发票' : '增值税专用发票' }}
</view>
</view>
<view class="invoice-info-row">
<text class="invoice-info-label">发票抬头</text>
<text class="invoice-info-value">{{ invoiceData.invoiceBuyerName || '—' }}</text>
</view>
<view v-if="invoiceData.invoiceBuyerTaxno" class="invoice-info-row">
<text class="invoice-info-label">纳税人识别号</text>
<text class="invoice-info-value">{{ invoiceData.invoiceBuyerTaxno }}</text>
</view>
<view class="invoice-info-row">
<text class="invoice-info-label">接收邮箱</text>
<text class="invoice-info-value">{{ invoiceData.invoicePushPhone || '—' }}</text>
</view>
<view class="invoice-info-row">
<text class="invoice-info-label">开票时间</text>
<text class="invoice-info-value">{{ invoiceData.invoiceTime || '—' }}</text>
</view>
<view class="invoice-info-row">
<text class="invoice-info-label">开票金额</text>
<text class="invoice-info-value">{{ invoiceData.price || '—' }}</text>
</view>
</view>
</view>
</view>
</view>
<!-- 自定义删除确认弹窗 -->
<view v-if="showDelPopup" class="popup-mask" @touchmove.stop.prevent @click.stop="closeDelPopup">
......@@ -471,11 +432,6 @@ const viewInvoice = (item) => {
}
};
// 关闭发票弹窗
const closeInvoicePopup = () => {
showInvoicePopup.value = false;
isPopupOpen.value = false;
};
// 取消订单
const handleCancel = (item) => {
......
......@@ -130,8 +130,8 @@
<view class="invoice-info-list">
<view class="invoice-info-row">
<view class="invoice-info-label">票据类型</view>
<view :class="{ 'vat-type': invoiceData.invoiceType == 2 }" class="invoice-type-badge">
{{ invoiceData.invoiceType == 1 ? '普通票据' : '增值税专用票据' }}
<view :class="{ 'vat-type': invoiceData.invoiceType == 1 }" class="invoice-type-badge">
{{ invoiceData.invoiceType == 2 ? '普通票据' : '增值税专用票据' }}
</view>
</view>
<view class="invoice-info-row">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!