Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
f813fede by lttnew
Options

优化

1 parent f1508768
Inline Side-by-side
Showing 8 changed files with 104 additions and 142 deletions
myCenter/goPay.vue
......@@ -118,62 +118,62 @@ const preferentialPolicy = ref(false)
const preferentialData = ref({
name: '优惠'
})
const payType = ref('2')
const isPaying = ref(false)
const payName = ref('')
const assoName = ref('')
const app = getApp()
const pickFirst = (...values) => {
const value = values.find(item => item !== undefined && item !== null && String(item).trim() !== '')
return value ? String(value) : ''
}
const getOrderContent = (content) => {
if (!content) return {}
if (typeof content === 'object') return content
try {
return JSON.parse(content)
} catch (e) {
return {}
}
}
const fillPayDisplayInfo = (data = {}, content = {}, option = {}) => {
const memberInfo = app.globalData?.memberInfo || {}
const deptInfo = app.globalData?.dept || app.globalData?.userInfo?.dept || {}
payName.value = pickFirst(
memberInfo.name,
content.memberName,
data.memberName,
data.payDeptName,
content.payDeptName,
data.payMemName,
content.payMemName,
option.payName ? decodeURIComponent(option.payName) : '',
data.orderName,
content.orderName,
deptInfo.deptName
)
assoName.value = pickFirst(
memberInfo.aname,
memberInfo.associateName,
memberInfo.assoName,
deptInfo.aname,
deptInfo.associateName,
data.assoName,
data.associateName,
data.associationName,
data.aname,
data.parentName,
content.assoName,
content.associateName,
content.associationName,
content.aname,
content.parentName,
option.assoName ? decodeURIComponent(option.assoName) : ''
)
}
const payType = ref('2')
const isPaying = ref(false)
const payName = ref('')
const assoName = ref('')
const app = getApp()
const pickFirst = (...values) => {
const value = values.find(item => item !== undefined && item !== null && String(item).trim() !== '')
return value ? String(value) : ''
}
const getOrderContent = (content) => {
if (!content) return {}
if (typeof content === 'object') return content
try {
return JSON.parse(content)
} catch (e) {
return {}
}
}
const fillPayDisplayInfo = (data = {}, content = {}, option = {}) => {
const memberInfo = app.globalData?.memberInfo || {}
const deptInfo = app.globalData?.dept || app.globalData?.userInfo?.dept || {}
payName.value = pickFirst(
memberInfo.name,
content.memberName,
data.memberName,
data.payDeptName,
content.payDeptName,
data.payMemName,
content.payMemName,
option.payName ? decodeURIComponent(option.payName) : '',
data.orderName,
content.orderName,
deptInfo.deptName
)
assoName.value = pickFirst(
memberInfo.aname,
memberInfo.associateName,
memberInfo.assoName,
deptInfo.aname,
deptInfo.associateName,
data.assoName,
data.associateName,
data.associationName,
data.aname,
data.parentName,
content.assoName,
content.associateName,
content.associationName,
content.aname,
content.parentName,
option.assoName ? decodeURIComponent(option.assoName) : ''
)
}
const memberTotalFee = computed(() => {
const total = memberFee.value * form.value.renewYear
......@@ -246,14 +246,14 @@ const handelPay = async () => {
let data
// 再次支付
if (payForm.value.id && payForm.value.payStatus === '0') {
const [err, res] = await to(api.payForOrder({
id: payForm.value.id,
renewYear: form.value.renewYear,
payType: payType.value,
type: payType.value,
contactPerson: form.value.contactPerson,
contactTel: form.value.contactTel
}))
const [err, res] = await to(api.payForOrder({
id: payForm.value.id,
renewYear: form.value.renewYear,
payType: payType.value,
type: payType.value,
contactPerson: form.value.contactPerson,
contactTel: form.value.contactTel
}))
if (err || res.code !== 200) {
uni.hideLoading()
isPaying.value = false
......@@ -325,29 +325,29 @@ const handelPay = async () => {
isPaying.value = false
}
onLoad((option) => {
console.log(66, option)
fillPayDisplayInfo({}, {}, option)
// 接收订单ID（再次支付时）
if (option.orderId) {
payForm.value.id = option.orderId
payForm.value.payStatus = '0'
// 获取订单详情
to(api.orderDetail(option.orderId)).then(([err, res]) => {
if (!err && res.data) {
const content = getOrderContent(res.data.content)
form.value.renewYear = content.yearCount || 1
fillPayDisplayInfo(res.data, content, option)
}
})
}
onLoad((option) => {
console.log(66, option)
fillPayDisplayInfo({}, {}, option)
// 接收订单ID（再次支付时）
if (option.orderId) {
payForm.value.id = option.orderId
payForm.value.payStatus = '0'
// 获取订单详情
to(api.orderDetail(option.orderId)).then(([err, res]) => {
if (!err && res.data) {
const content = getOrderContent(res.data.content)
form.value.renewYear = content.yearCount || 1
fillPayDisplayInfo(res.data, content, option)
}
})
}
// 接收年限
if (option.renewYear) {
form.value.renewYear = Number(option.renewYear)
}
// 初始化获取费用和优惠
init()
})
// 初始化获取费用和优惠
init()
})
// 初始化接口
async function init() {
......@@ -424,6 +424,7 @@ async function getZtxDiscountPolicyApi() {
}
.info-label {
width: 120rpx;
font-size: 28rpx;
color: #666;
}
......
myCenter/order.vue
......@@ -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 || '—',
......
myCenter/teamInfo.vue
......@@ -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>
......
pages/index/daoGuanOrder.vue
......@@ -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 || '—',
......
pages/invoice/apply.vue
......@@ -271,6 +271,7 @@ function closeSuccessModal() {
.content {
padding: 20rpx;
padding-bottom: 80rpx;
}
.form-item {
......
personal/home.vue
......@@ -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()
......
personal/order.vue
......@@ -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) => {
......
personalVip/order.vue
......@@ -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!