diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue index f3a9d61..599a789 100644 --- a/packageA/center/applyDetail.vue +++ b/packageA/center/applyDetail.vue @@ -547,13 +547,17 @@ export default { uni.showToast({ title: '订单处理中...', icon: 'none', - duration: 2000 + duration: 1000 }); - setTimeout(()=>{ - uni.redirectTo({ - url: '/packageA/my/success?id=' + this.orderInfo.id + '&order_no=' + this.orderInfo.order_no - }) - },1500) + uni.navigateTo({ + url: '/packageA/my/success?id=' + this.orderInfo.id + '&order_no=' + this.orderInfo.order_no + }) + + // setTimeout(()=>{ + // uni.redirectTo({ + // url: '/packageA/my/success?id=' + this.orderInfo.id + '&order_no=' + this.orderInfo.order_no + // }) + // },1500) }, openUrl(url) { diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index 1f0db3c..a33d5a7 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -62,7 +62,7 @@ @click="toAddInvoic(item.id, item.order_no)">申请开票 开票中 查看开票 + @click="checkInvoice(item.user_invoice_apply_id, item.order_no)">查看发票 查看详情 @@ -485,7 +485,7 @@ height: 70rpx; line-height: 70rpx; text-align: center; - color: #999999; + color: #323232; border: 2rpx solid #323232; border-radius: 276rpx 276rpx 276rpx 276rpx; margin-right: 10rpx; diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue index 0a97add..224f49a 100644 --- a/packageA/my/pendinPayDetail.vue +++ b/packageA/my/pendinPayDetail.vue @@ -94,7 +94,6 @@ {{ formattime(detailAny.paytime) }} - {{detailAny.status}} diff --git a/packageB/invoice/addHead.vue b/packageB/invoice/addHead.vue index 2d18281..779d263 100644 --- a/packageB/invoice/addHead.vue +++ b/packageB/invoice/addHead.vue @@ -4,7 +4,7 @@ - + @@ -29,7 +29,8 @@ - + + @@ -48,6 +49,7 @@ + @@ -73,31 +75,42 @@ + - + + + + + + + + + + + --> - + - + + @@ -235,36 +249,7 @@ invoice_reservation_email: '', is_default: null }, - rules: { - // invoice_type: [{ - // required: true, - // message: '请选择发票类型', - // trigger: 'blur' - // }], - invoice_header: [{ - required: true, - // type: 'invoice_header', - message: '请输入抬头名称', - trigger: 'blur' - }], - // invoice_type: [{ - // required: true, - // // type: 'invoice_type', - // message: '请选择抬头类型', - // trigger: 'blur' - // }], - invoice_reservation_phone: [{ - required: true, - // type: 'invoice_reservation_phone', - message: '请输入发票预留手机号', - trigger: 'blur' - }], - invoice_reservation_email: [{ - required: true, - message: '请输入发票预留邮箱', - trigger: 'blur' - }], - }, + detail: '', //第二个detail detailAny: '', //第一个detail qrimages: '', @@ -297,11 +282,13 @@ methods: { handleHeadTp1() { this.form.invoice_type = 'ordinary' + this.form.head_type = '' console.log('1-1', this.form.invoice_type); }, handleHeadTp2() { // this.$set(this.form.invoice_type = 'special') this.form.invoice_type = 'special' + this.form.head_type = 'corporate' console.log('2-2', this.form.invoice_type); }, handlePerson() { @@ -677,15 +664,31 @@ // width: 100%; margin-top: 0rpx; background-color: #ffffff; - padding: 10rpx 20rpx; + padding: 10rpx 30rpx; border-radius: 20rpx; + + .line-row { + width: 700rpx; + height: 1rpx; + background: #F0F0F0; + border-radius: 0rpx 0rpx 0rpx 0rpx; + } + } .recipientInfo { margin-top: 30rpx; background-color: #ffffff; - padding: 10rpx 20rpx; + padding: 10rpx 30rpx; border-radius: 20rpx; + + .line-row { + width: 700rpx; + height: 1rpx; + background: #F0F0F0; + border-radius: 0rpx 0rpx 0rpx 0rpx; + } + } .defaultInfo { @@ -735,11 +738,11 @@ display: grid; justify-content: center; position: fixed; - bottom: 0; + bottom: 60rpx; // left: 0; right: -2rpx; z-index: 99; - background-color: #ffffff; + background-color: #f5f5f5; color: #bbfc5b; .invoiceBtn { diff --git a/packageB/invoice/addInvoice.vue b/packageB/invoice/addInvoice.vue index 0e7e4b8..c1bba4e 100644 --- a/packageB/invoice/addInvoice.vue +++ b/packageB/invoice/addInvoice.vue @@ -16,17 +16,18 @@ 已选择{{num}}个订单 预计发票金额：￥ - {{totalPrice}} + {{totalPrice}} + 预计金额仅作为参考，请以合并后的实际金额为准 - + - + + - + - + + - - + + + 商品明细 + @@ -91,8 +95,9 @@ + - + 选择预设抬头类型 @@ -107,27 +112,30 @@ --> + - - + + + - + + - + - + + + - + + @@ -136,13 +144,14 @@ - + - - + + + @@ -155,7 +164,7 @@ - + @@ -186,8 +195,9 @@ {{item.tax_id}} - - + @@ -213,6 +223,13 @@ --> + + + + 暂无数据 + + + @@ -233,7 +250,7 @@ - + @@ -242,8 +259,9 @@ ·发票内容将显示详细商品名称与价格信息 ·部分商家可能开具发票内容为商品所属类别及价格信息，如有特殊需求，请向商家客服咨询。 - - + + - + + :class="{ selected: recordIndexSelected(item.status) }" @click="selecRecordIndex(item.status)"> {{ item.text }} - + - + 抬头信息仅用于开具发票，请勿用于转账等其他用途谨防受骗 - + @@ -56,8 +56,7 @@ 申请开票 - + 暂无数据 @@ -67,7 +66,7 @@ - + @@ -102,7 +101,7 @@ 已作废 --> - + @@ -153,71 +152,82 @@ - - + + 暂无数据 - + + + - + - - - 专业发票抬头 - 个人发票抬头 - - - - - 默认 - {{item.invoice_header}} + + + + 专业发票抬头 + + + + + 默认 + {{item.invoice_header}} + + {{item.tax_id}} + + + + - {{item.tax_id}} - - - - + + + 个人发票抬头 + + + + + 默认 + {{item.invoice_header}} + + {{item.tax_id}} + + + + + + + + - + 添加发票抬头 - - - + + + 暂无数据 - + @@ -284,7 +294,7 @@ num: 0, id: 0, headList: [], //抬头管理 - HeadId:null, + HeadId: null, }; }, onLoad(option) { @@ -317,7 +327,7 @@ this.getInvoiceList() } else if (that.selected == 1) { console.log('记录', this.recordeStatus); - + this.getRecordList() } else { console.log('抬头'); @@ -330,7 +340,7 @@ // console.log('index',index); return this.selected === index; }, - + //获取可开发票列表 getInvoiceList() { uni.$u.http.get('/api/school.newactivity.order/order_list', { @@ -340,7 +350,7 @@ // status: 9, // keywords: this.keywords, invoice_status: 0, - have_invoice:1, + have_invoice: 1, } }).then(res => { console.log('code', res.code); @@ -387,21 +397,21 @@ // this.order_nos = JSON.stringify(list) this.order_nos = JSON.stringify(list.join(',')) this.num = list.length - console.log('num:', this.num,list1); - if(this.num > 1) { + console.log('num:', this.num, list1); + if (this.num > 1) { list1.forEach(e => { // if(e.payprice) this.totalPrice += e.payprice }) - }else if(this.num > 1){ - this.totalPrice =list1[0].payprice - }else{ - + } else if (this.num > 1) { + this.totalPrice = list1[0].payprice + } else { + } - + console.log('num:', this.num, 'totalPrice:', this.totalPrice); - console.log('unInvoiceList',this.unInvoiceList.length); - if(this.unInvoiceList.length == 0){ + console.log('unInvoiceList', this.unInvoiceList.length); + if (this.unInvoiceList.length == 0) { uni.showToast({ title: '暂无可开发票的订单，请先去参加活动下单', icon: 'none', @@ -432,8 +442,8 @@ // url: '/packageB/invoice/addInvoice?order_nos=' + this.order_nos + '&num=' + this.num // }) }, - - + + //提交记录 getRecordList() { console.log('提交记录', this.recordeStatus); @@ -460,7 +470,7 @@ }, //提交记录的列表状态切换 selecRecordIndex(recordStatus) { - console.log('selecRecordIndex',recordStatus) + console.log('selecRecordIndex', recordStatus) // const that = this; this.recordeStatus = recordStatus; console.log('recordeStatus', this.recordeStatus) @@ -473,12 +483,12 @@ }, //查看发票信息 toPageInvoiceInfo(item) { - console.log('toPageInvoiceInfo',item); + console.log('toPageInvoiceInfo', item); uni.navigateTo({ - url:'/packageB/invoice/invoiceInfo?id=' + item.id + url: '/packageB/invoice/invoiceInfo?id=' + item.id }) }, - + //抬头管理列表 getHeadList() { uni.$u.http.get('/api/school.header/header_list', { @@ -508,12 +518,12 @@ }, editHead(id) { this.HeadId = id - console.log('HeadId',this.HeadId); + console.log('HeadId', this.HeadId); uni.navigateTo({ url: '/packageB/invoice/addHead?id=' + this.HeadId }) }, - + } } @@ -531,6 +541,7 @@ // overflow: hidden; .tabs { + z-index: 1000; background: #ffffff; width: 100%; display: flex; @@ -625,7 +636,7 @@ position: absolute; top: 0; font-size: 28rpx; - font-weight: 400; + font-weight: bold; } .itenCon-actPrice { @@ -660,28 +671,30 @@ bottom: 66rpx; margin-left: 5%; } - - + + .record-tabs { background: #f5f5f5; width: 100%; z-index: 1000; + background-color: #f5f5f5; display: flex; overflow-x: auto; position: fixed; - top: 90rpx; + top: 70rpx; margin: 10rpx 0; - border-radius: 30rpx; + padding: 20rpx 0; + // border-radius: 30rpx; -webkit-overflow-scrolling: touch; font-family: PingFang SC, PingFang SC; - - + + .s-header { display: flex; justify-content: center; align-items: center; width: 150rpx; - height: 80rpx; + height: 60rpx; font-weight: 400; font-size: 28rpx; color: #9E9E9E; @@ -693,10 +706,10 @@ position: relative; z-index: 1000; } - + .s-header.selected { width: 150rpx; - height: 80rpx; + height: 60rpx; background-color: #ffffff; // font-weight: 800; // font-size: 32rpx; @@ -704,25 +717,26 @@ line-height: 28rpx; z-index: 1000; } - + } - - + + .recordList { width: 100%; height: auto; display: block; justify-content: center; - margin-top: 120rpx; + margin-top: 100rpx; + - .recordList-item { display: flex; justify-content: center; align-items: center; background-color: #ffffff; width: 91%; - margin-top: 20rpx; + // margin-top: 20rpx; + margin-bottom: 20rpx; padding: 20rpx 30rpx; height: 220rpx; // margin: 0 auto; @@ -745,7 +759,7 @@ position: absolute; top: 0; font-size: 28rpx; - font-weight: 400; + font-weight: bold; } .itenCon2-actPrice { @@ -766,7 +780,7 @@ font-weight: 400; font-size: 28rpx; } - + .lookInvoice3 { width: 200rpx; display: flex; @@ -792,13 +806,13 @@ } .recordList-items { - display: block; + display: grid; background-color: #ffffff; width: 91%; margin-top: 20rpx; padding: 20rpx 30rpx; - height: 220rpx auto; - // margin: 0 auto; + height: auto; + margin: 0 auto; .reListIts-item { display: flex; @@ -806,7 +820,7 @@ align-items: center; width: 100%; margin-bottom: 20rpx; - margin: 0 auto; + // margin: 0 auto; // background-color: #9E9E9E; .itsItem-img2 { @@ -818,7 +832,7 @@ .itsItem-con2 { margin-left: 30rpx; - width: 65%; + width: 78%; height: 160rpx; position: relative; color: #323232; @@ -827,7 +841,7 @@ position: absolute; top: 0; font-size: 28rpx; - font-weight: 400; + font-weight: bold; } .itsItemCon2-actPrice { @@ -897,14 +911,14 @@ } } } - + .manageRecord { z-index: 100; position: fixed; top: 70rpx; // width: 100%; // margin: 0rpx 20rpx 20rpx 20rpx; - padding: 20rpx ; + padding: 20rpx 30rpx; font-family: PingFang SC, PingFang SC; font-weight: 400; font-size: 28rpx; @@ -919,20 +933,25 @@ background-color: #f5f5f5; // margin: 0 auto; } - + .manageList { + width: 100%; display: grid; justify-content: center; - margin-top: 80rpx; + position: relative; + top: 90rpx; + margin: 0 auto; + row-gap: 20rpx; // padding-top: 20rpx; .manageList-item { background-color: #ffffff; padding: 20rpx 0; - width: 96%; - margin-bottom: 20rpx; - border-radius: 20rpx; + width: 710rpx; + // margin-left: 20rpx; + // margin-bottom: 30rpx; margin: 0 auto; + border-radius: 20rpx; .manage-type { width: 100%; @@ -945,11 +964,12 @@ // text-align: center; font-style: normal; text-transform: none; - margin: 20rpx; + // margin: 20rpx; + padding: 30rpx; } .manageLine { - width: 750rpx; + width: 100%; height: 1rpx; background: #EEEEEE; border-radius: 0rpx 0rpx 0rpx 0rpx; @@ -958,28 +978,33 @@ .manageCon { display: flex; justify-content: space-between; - margin: 20rpx; + // justify-content: center; + // margin: 20rpx; + padding: 30rpx; align-items: center; .messContext { - display: block; + display: grid; + .textFir { display: flex; justify-content: left; align-items: center; + .defaultBox { width: 68rpx; height: 32rpx; background: #FFEEEE; border-radius: 6rpx; color: #EB1B1B; - border: 1rpx solid #EB1B1B; + border: 2rpx solid #EB1B1B; text-align: center; - font-size: 26rpx; + font-size: 22rpx; font-weight: 500; margin-right: 10rpx; + // padding: 10rpx; } .manageName { @@ -1013,15 +1038,15 @@ } } } - + .footer-mangBtn { width: 100%; height: 160rpx; - background-color: #ffffff; + background-color: #f5f5f5; position: fixed; bottom: 0; left: 0; - + .invoiceBtn { width: 90%; height: 90rpx; @@ -1039,23 +1064,23 @@ align-items: center; text-align: center; position: fixed; - bottom: 32rpx; + bottom: 66rpx; margin-left: 5%; } } - + } } - - - .bottom_box{ + + + .bottom_box { display: grid; justify-content: center; align-items: center; width: 100%; position: absolute; - top:40%; + top: 40%; } } diff --git a/packageB/invoice/invoiceInfo.vue b/packageB/invoice/invoiceInfo.vue index c3d014e..a76f4f8 100644 --- a/packageB/invoice/invoiceInfo.vue +++ b/packageB/invoice/invoiceInfo.vue @@ -159,26 +159,30 @@