diff --git a/pages.json b/pages.json index f3e14bc..17e3d52 100644 --- a/pages.json +++ b/pages.json @@ -138,8 +138,10 @@ { "path": "pages/order/chargorder/detailInf/detail", "style": { - "navigationBarTitleText": "充电单详情", - "enablePullDownRefresh": false + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0aca46", + "navigationBarTextStyle": "white" } }, @@ -241,6 +243,22 @@ "enablePullDownRefresh": false } + }, + { + "path": "billingPage/billingRecord/billingRecord", + "style": { + "navigationBarTitleText": "开票记录", + "enablePullDownRefresh": false + } + + }, + { + "path": "billingPage/invoiceDetail/invoiceDetail", + "style": { + "navigationBarTitleText": "开票详情", + "enablePullDownRefresh": false + } + }, { "path": "billingPage/billingMean/billingMean", diff --git a/pages/order/chargorder/detailInf/detail.vue b/pages/order/chargorder/detailInf/detail.vue index a0e826d..5164048 100644 --- a/pages/order/chargorder/detailInf/detail.vue +++ b/pages/order/chargorder/detailInf/detail.vue @@ -1,111 +1,71 @@ @@ -188,6 +148,13 @@ }) } + const pay_handle_invoice = () => { + sheep.$router.go('/pagesCenter/billingPage/addInvoice/addInvoice', { + orderNo: detail.list.id, + orderType: 2, + }); + } + const handle_pay_money = async (e) => { sheep.$router.go('/pagesCenter/pay/index', { id: e.payOrderId, @@ -300,4 +267,50 @@ top: 50%; transform: translateY(-50%); } + + // + .title_tops { + height: 260rpx; + background: #0aca46; + display: flex; + align-items: center; + justify-content: center; + position: relative; + + .status_title { + position: absolute; + left: 80rpx; + top: 10rpx; + font-size: 14px; + color: #fff; + } + } + + .line_center { + width: 90%; + height: 20rpx; + background: #08ab40; + position: relative; + + // border-radius: 10rpx; + .white_box { + width: 95%; + // height: 400rpx; + padding: 15rpx; + background: #fff; + position: absolute; + top: 10rpx; + left: 50%; + transform: translate(-50%); + box-shadow: + 0px 1.4px 1.2px rgba(0, 0, 0, 0.017), + 0px 3.4px 2.9px rgba(0, 0, 0, 0.024), + 0px 6.4px 5.5px rgba(0, 0, 0, 0.03), + 0px 11.4px 9.8px rgba(0, 0, 0, 0.036), + 0px 21.3px 18.4px rgba(0, 0, 0, 0.043), + 0px 51px 44px rgba(0, 0, 0, 0.06); + border-bottom-left-radius: 15rpx; + border-bottom-right-radius: 15rpx; + } + } \ No newline at end of file diff --git a/pages/order/chargorder/detailInf/detail_yuan.vue b/pages/order/chargorder/detailInf/detail_yuan.vue new file mode 100644 index 0000000..0852a0f --- /dev/null +++ b/pages/order/chargorder/detailInf/detail_yuan.vue @@ -0,0 +1,313 @@ + + + + + \ No newline at end of file diff --git a/pages/order/swaporder/detailInf/detailInf.vue b/pages/order/swaporder/detailInf/detailInf.vue index 7eaa093..9279f76 100644 --- a/pages/order/swaporder/detailInf/detailInf.vue +++ b/pages/order/swaporder/detailInf/detailInf.vue @@ -109,6 +109,9 @@ + + + @@ -145,6 +148,14 @@ onShow(() => { isDetail.value = true }) + + const pay_handle_invoice = () => { + sheep.$router.go('/pagesCenter/billingPage/addInvoice/addInvoice', { + orderNo: detail.list.id, + orderType: 1, + }); + } + const pay_handle = async () => { await uni.request({ //刷新token url: config.baseUrl + "app-api/cloud/swapOrder/createPayOrder", diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue index 15fd138..eff3141 100644 --- a/pages/userCenter/userCenter.vue +++ b/pages/userCenter/userCenter.vue @@ -115,9 +115,9 @@ - + - 开发票 + 开票记录 @@ -251,7 +251,7 @@ return; } else { uni.navigateTo({ - url: '/pagesCenter/billingPage/addInvoice/addInvoice' + url: '/pagesCenter/billingPage/billingRecord/billingRecord' }) } // else if (realNameAuthFlag.value != 1) { diff --git a/pagesCenter/billingPage/addInvoice/addInvoice.vue b/pagesCenter/billingPage/addInvoice/addInvoice.vue index 6bf9e67..d857aca 100644 --- a/pagesCenter/billingPage/addInvoice/addInvoice.vue +++ b/pagesCenter/billingPage/addInvoice/addInvoice.vue @@ -184,10 +184,15 @@ trigger: ['blur', 'change'] } } + + const orderNo =ref(null) + const orderType =ref(null) // onLoad((option) => { // console.log(option, 'option'); + orderNo.value = option.orderNo + orderType.value = option.orderType // if (option.detail) { // let detail = JSON.parse(option.detail) // model1.userInfo.invoiceHeader = detail.invoiceHeader @@ -214,7 +219,7 @@ // updataId.value = detail.id // console.log('JSON.parse(option.detail)', JSON.parse(option.detail)); // } - handle_start_access_token() + // handle_start_access_token() }) // 监听 watch(checked, (newVal, oldVal) => { @@ -303,10 +308,10 @@ // model1.userInfo.cardNo = '' // } let data = { - orderNo: 12, + orderNo: orderNo.value, invoiceStatus: 0, type: checked.value, - orderType: 1, + orderType: orderType.value, // 1 invoiceTitle: model1.userInfo.invoiceTitle, dutyNumber: model1.userInfo.dutyNumber, @@ -321,13 +326,22 @@ method: 'POST', data: data, }).then(res => { - uni.$u.toast(res.data.msg) + if(res.data.code == 0) { + uni.$u.toast('申请成功') + } else { + uni.$u.toast(res.data.msg) + } + setTimeout(function() { + uni.navigateBack({ + delta: 1, + }); + }, 500) + // console.log(res.data.msg, '=======?'); // setTimeout(function() { // uni.navigateBack({ // delta: 1, // }); // }, 500) - console.log(res.data.msg, '=======?'); }) }).catch((error) => { diff --git a/pagesCenter/billingPage/billingRecord/billingRecord.vue b/pagesCenter/billingPage/billingRecord/billingRecord.vue index b723539..36a389e 100644 --- a/pagesCenter/billingPage/billingRecord/billingRecord.vue +++ b/pagesCenter/billingPage/billingRecord/billingRecord.vue @@ -1,8 +1,17 @@ @@ -270,9 +312,11 @@ margin-left: 8rpx; } } -.line-last { + + .line-last { border-bottom: 1px solid #eee; } + .line-last:last-child { border: 0; } @@ -289,22 +333,26 @@ .check { margin-right: 24rpx; } + .content-state-orange { - border: 1px solid #FF7B0E; - color: #FF7B0E; - } - .content-state-blue { - border: 1px solid #4C91FF; - color: #4C91FF; - } - .content-state-red { - border: 1px solid #F2634F; - color: #F2634F; - } - .content-state-green { - border: 1px solid #26C3C0; - color: #26C3C0; - } + border: 1px solid #FF7B0E; + color: #FF7B0E; + } + + .content-state-blue { + border: 1px solid #4C91FF; + color: #4C91FF; + } + + .content-state-red { + border: 1px solid #F2634F; + color: #F2634F; + } + + .content-state-green { + border: 1px solid #26C3C0; + color: #26C3C0; + }