diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index aad2ea1..a39b126 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -483,10 +483,11 @@ line-height: 70rpx; text-align: center; color: #999999; - border: 2rpx solid #999999; + border: 2rpx solid #323232; border-radius: 276rpx 276rpx 276rpx 276rpx; margin-right: 10rpx; } + .btn_InvIng { width: 180rpx; diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue index f9e203d..38bdb69 100644 --- a/packageA/my/pendinPayDetail.vue +++ b/packageA/my/pendinPayDetail.vue @@ -117,7 +117,7 @@ :safeAreaInsetBottom="false" :closeable="false"> - 请确认是否取消报名 + 请确认是否取消报名 若频繁取消,可能会影响账号部分功能使用。建议您确认行程后再操作。 @@ -1139,7 +1139,7 @@ } .name { - width: 288rpx; + width: 320rpx; height: 36rpx; font-family: PingFang SC Bold, PingFang SC Bold; font-weight: 600; diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue index 1a3a5bd..a8ea597 100644 --- a/packageA/my/pendinPayStatus.vue +++ b/packageA/my/pendinPayStatus.vue @@ -124,11 +124,19 @@ - + 申请售后 + + 开发票 + + + 查看发票 + @@ -253,6 +261,19 @@ url: `/packageA/afterSales/index?id=${id}` }) }, + //申请发票 + toAddInvoic(id, order_no) { + const num = 1 + uni.navigateTo({ + url: '/packageB/invoice/addInvoice?id=' + id + "&order_nos=" + order_no + "&num=" + num + }) + }, + //查看发票 + checkInvoice(id, order_no) { + uni.navigateTo({ + url: '/packageB/invoice/invoiceInfo?id=' + id + "&order_no=" + order_no + }) + }, //星期 dateWeeks(timestamp) { return dateWeek(timestamp) @@ -537,6 +558,7 @@ width: 100%; height: 166rpx; margin-top: 50rpx; + display: grid; .footer-right { width: 690rpx; @@ -552,6 +574,21 @@ color: #BBFC5B; } } + + .footer-right2 { + width: 690rpx; + height: 90rpx; + background: #f5f5f5; + border-radius: 148rpx; + border: 2rpx solid #323232; + + span { + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 36rpx; + color: #9C9C9C; + } + } .footer-right1 { width: 690rpx; diff --git a/packageB/invoice/addInvoice.vue b/packageB/invoice/addInvoice.vue index d4f18e2..2dae1f1 100644 --- a/packageB/invoice/addInvoice.vue +++ b/packageB/invoice/addInvoice.vue @@ -109,15 +109,15 @@ - - - @@ -125,7 +125,7 @@ border="none" /> - @@ -141,7 +141,7 @@ placeholder="请输入发票预留手机号" border="none" /> - @@ -186,7 +186,7 @@ {{item.tax_id}} - + @@ -215,7 +215,7 @@ - + - 添加抬头 + 添加抬头 @@ -382,6 +382,10 @@ } console.log('order_nos:', this.order_nos,'totalPrice:',this.totalPrice); }, + onShow() { + this.headShow = false; + this.getHeadList(); + }, onReady() { console.log('设置规则:', this.rules); this.$refs.uForm.setRules(this.rules); @@ -485,6 +489,18 @@ console.log('5555',this.form); this.closeHeadShow(); }, + addHead() { + uni.navigateTo({ + url: '/packageB/invoice/addHead' + }) + }, + editHead(id) { + this.HeadId = id + console.log('HeadId',this.HeadId); + uni.navigateTo({ + url: '/packageB/invoice/addHead?id=' + this.HeadId + }) + }, submit() { console.log('sub1'); if (this.form.invoice_reservation_phone == '') { @@ -1001,8 +1017,40 @@ margin-left: 2%; } } - + + + } + + .popup-footer1 { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + + .headBtn { + width: 90%; + height: 90rpx; + background-color: #323232; + border-radius: 148rpx; + color: #BBFC5B; + font-size: 36rpx; + font-weight: 400; + line-height: 50rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + text-transform: none; + font-style: normal; + display: flex; + justify-content: center; + align-items: center; + text-align: center; + position: fixed; + bottom: 66rpx; + margin-left: 2%; + } + } + + } diff --git a/packageB/invoice/invoiceInfo.vue b/packageB/invoice/invoiceInfo.vue index bc94108..c3d014e 100644 --- a/packageB/invoice/invoiceInfo.vue +++ b/packageB/invoice/invoiceInfo.vue @@ -47,7 +47,7 @@ - + @@ -69,9 +69,9 @@ data() { return { popupStyImg: { - width: '700rpx', + width: '650rpx', padding: '24rpx 24rpx 42rpx 24rpx', - height: '500rpx', + height: '600rpx', margin: '0 auto', // 水平居中 display: 'flex', justifyContent: 'start', diff --git a/pages/my/applyOwner.vue b/pages/my/applyOwner.vue index 102abf1..f07ab08 100644 --- a/pages/my/applyOwner.vue +++ b/pages/my/applyOwner.vue @@ -39,7 +39,7 @@ 机构联系人 - @@ -69,9 +69,9 @@ 详细地址 - + + style="width: 400rpx;" placeholder-class="plasty" />