aike/emis-sapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

账单显示优化调整

Browse Source
This commit is contained in:
linfso 2025-07-08 17:33:02 +08:00
parent 7607f7c920
commit 62174891d8
6 changed files with 127 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/api/bill.js
View File

@ -11,6 +11,16 @@ export const getInfoBySettleBillNo = (data = {})=> {
return coreRequest(url.getInfoBySettleBillNo, data, {}, 'get')
}
// 获取简化账单信息
export const getSimpleInfoBySettleBillNo = (data = {})=> {
return coreRequest(url.getSimpleInfoBySettleBillNo, data, {}, 'get')
}
// 获取子账单信息
export const getSubBillListBySettleBillNo = (data = {})=> {
return coreRequest(url.getSubBillListBySettleBillNo, data, {}, 'get')
}
// 获取微信支付二维码
export const getWxPayQrCode = (data = {})=> {
return coreRequest(url.getWxPayQrCode, data, {}, 'get')

4
common/api/url.js
View File

@ -56,6 +56,10 @@ export default {
scanCheckBillCode: `/oms2c/emisWaybill/scanCheckBillCode`, // 扫码下单寄件-checke
queryBSettleillList: `/oms2c/emisSettleBill/listSimple`, // 账单列表
getInfoBySettleBillNo: `/oms2c/emisSettleBill/getInfoBySettleBillNo`, // 获取账单详情
getSimpleInfoBySettleBillNo: `/oms2c/emisSettleBill/getSimpleInfoBySettleBillNo`, // 获取简化账单详情
getSubBillListBySettleBillNo: `/oms2c/emisSettleBill/listSubBill`, // 获取账单子账单明细
getWxPayQrCode: `/oms2c/emisSettleBill/getWxPayQrCode`, // 获取微信支付二维码
sumbitWxPay: `/oms2c/emisSettleBill/sumbitWxPay`, // 账单-唤起微信立即支付

8
components/tpx-scroll-view/tpx-scroll-view.vue
View File

@ -80,6 +80,12 @@
return 'dfl'
}
},
pageSize: {
default () {
return 20
}
},
maxHeight: {
default () {
return ''
@ -91,7 +97,7 @@
reqLoading: false,
page: { // 分页参数
pageNum: 1,
pageSize: 20,
pageSize: this.pageSize,
},
showLoadMore: false, // 是否显示加载更多的loading
loadedAll: false, // 是否加载了所有数据

14
manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "探路速运",
"appid" : "__UNI__21F858F",
"appid" : "__UNI__BAEB38C",
"description" : "探路速运",
"versionName" : "1.0.0",
"versionCode" : "100",
@ -98,6 +98,18 @@
"appkey_ios" : "aatodo",
"appkey_android" : "b7feefb9882f1d0953fbeffb1cef8aec"
}
},
"share" : {
"weixin" : {
"appid" : "wx79c800bfadd5b081",
"UniversalLinks" : ""
}
},
"oauth" : {
"weixin" : {
"appid" : "wx79c800bfadd5b081",
"UniversalLinks" : ""
}
}
},
"orientation" : [ "portrait-primary" ],

153
pages/bill/detail.vue
View File

@ -1,11 +1,9 @@
<template>
<tpx-page>
<tpx-layout>
<template #body>
<template v-slot:header>
<view >
<view class="dt-head">
<!-- <u-text :text="'账单信息'" size="30" :bold="true"></u-text>
<u-line margin="20rpx 0 20rpx"></u-line> -->
<view class="dt-item">
<view class="lb1">账单编号：</view>
<view class="lb2" style="font-weight: bold;">{{info.settleBillNo}}</view>
@ -45,27 +43,13 @@
<view class="dt-item" >
<view class="">支付状态：</view>
<view class="lb2">
<tetx v-if="info.paymentStatus == '0'">未付款</tetx>
<tetx v-if="info.paymentStatus == '1'">已付款</tetx>
<tetx v-if="info.paymentStatus == '2'">部分付款</tetx>
<text v-if="info.paymentStatus == '0'">未付款</text>
<text v-if="info.paymentStatus == '1'">已付款</text>
<text v-if="info.paymentStatus == '2'">部分付款</text>
</view>
<!-- <view class="lb2 clr-prm font-weight">已付款</view> -->
</view>
<!-- <view class="dt-item mt-30">
<view class="lb1">收款账户</view>
<view class="lb2">
<u-row >
<u-avatar size="80" shape="square"></u-avatar>
<view class="pl-10">
<u-text :text="'探路供应链（江苏）有限公司'" size="28" :bold="true" ></u-text>
<u-text :text="'介绍'" size="26" color="#666" margin="10rpx 0 0 0"></u-text>
</view>
</u-row>
</view>
</view> -->
<view v-if="info.paymentStatus!=1" class="dt-item mt-30">
<view v-if="info.paymentStatus!=1&&info.thisPayMoney>0" class="dt-item mt-30">
<view class="">待支付：</view>
<view class="zhfxin">
<view style="display: inline-block;">
@ -73,11 +57,11 @@
</view>
</view>
</view>
<view class="dt-item mt-30">
<view class="lb1">备注：</view>
<view v-if="info.paymentStatus!=1" class="dt-item mt-30">
<view style="width: 50px;">备注：</view>
<view >
<view v-if="info.blLockOnlinePay=='T'" style="display: inline-block;">
<u-text :text="`${info.lockOnlinePayReason}`" size="26" color="red" align="left"></u-text>
<u-text :text="`${info.lockOnlinePayReason}`" size="42" color="red" align="left"></u-text>
</view>
<view v-if="info.blLockOnlinePay!='T'" style="display: inline-block;">
<u-text :text="`账单支持在线支付,收款和开票：探路供应链（江苏）有限公司`" size="26" color="black" align="left"></u-text>
@ -85,14 +69,26 @@
</view>
</view>
</view>
<view class="dt-body">
<u-text :text="'运单列表'" size="30" :bold="true"></u-text>
<view style="background: #fff;padding-left: 10px;">
<u-text :text="'运单列表:'" size="30" :bold="true"></u-text>
<u-line margin="20rpx 0 20rpx"></u-line>
<view v-for="(item) in info.subBillList" >
<!-- <view class="dt-item"> -->
</view>
</view>
</template>
<template v-slot:body>
<view class="pos-abt-all">
<tpx-scroll-view v-model:resObject="resData" :pageSize="5" :searchParam="searchParam" :getListFun="getListFun"
ref="listRef"
>
<view class="">
<!-- 列表数据 -->
<view v-for="(item) in resData.list" class="ord-list-item" >
<u-row justify="between" align="top">
<u-col span="6">
<u-text :text="`运单号：${item.billCode}`" size="26" :bold="true"
margin="14rpx 0 0 0"></u-text>
<!-- <view style="display: inline-flex;">
@ -133,32 +129,32 @@
<u-text :text="`寄件公司：${item.waybillDetail.sendCompany}`" size="26"
margin="14rpx 0 0 0"></u-text>
</u-col>
</u-row>
<u-row justify="between" align="top">
</u-row>
<u-row >
<u-col span="12">
<u-text :text="`费用备注：${item.waybillDetail.feeRemark}`" size="26"
margin="14rpx 0 0 0"></u-text>
</u-col>
</u-row>
<!-- </view> -->
</view>
<tpx-empty v-if="!(info.subBillList && info.subBillList.length > 0)" size="sm"></tpx-empty>
</view>
</tpx-scroll-view>
</view>
</template>
<template #footer>
<view v-if="info.paymentStatus!=1&&info.blLockOnlinePay!='T'" class="blcok-white-noradius">
<view v-if="info.paymentStatus!=1&&info.blLockOnlinePay!='T'&&info.thisPayMoney>0" class="blcok-white-noradius">
<u-button @click="handleCallPay()" type="primary" size="large" shape="circle"
custom-style="height:80rpx;font-size: 30rpx;"
>立即支付</u-button>
</view>
</template>
</tpx-layout>
</tpx-page>
</tpx-page>
</template>
<script>
@ -188,6 +184,10 @@
info: {},
payQrImageUrl: '',
pageLoading: true,
searchParam: {
settleBillNo: '',
},
resData: { list: [] }
}
},
onLoad(queryOption) {
@ -201,28 +201,32 @@
getSendSiteList: apiService.getSendSiteList,
async initData() {
await this.getDetailData()
if(this.info.paymentStatus != 1) {
await this.getPayQrcode()
}
this.pageLoading = false
this.triggerListReload();
},
async getDetailData(){
let res = await apiService.getInfoBySettleBillNo({settleBillNo: this.queryOption.blNo, _loading: true })
let res = await apiService.getSimpleInfoBySettleBillNo({settleBillNo: this.queryOption.blNo, _loading: true })
this.info = res.data || {}
this.searchParam.settleBillNo=this.queryOption.blNo;
},
triggerListReload(){
this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
},
async getListFun(param){
console.log("===>getListFun===>",param);
param.settleBillNo=this.queryOption.blNo;
let res = await apiService.getSubBillListBySettleBillNo(param)
return res
},
async getPayQrcode(){
// let res = await apiService.getWxPayQrCode({settleBillNo: this.queryOption.blNo, _loading: true })
// this.payQrImageUrl = res.data
},
async handleCallPay(){
let info = this.$store.getters.userInfo
// console.log('==>info.openId==>', info.openId);
let openId = info.openId;
let res = await apiService.sumbitWxPay({settleBillNo: this.queryOption.blNo,openId:openId,_loading: true })
// 调起微信支付
// console.log('==>res.data=>', res.data);
let weChatPayData = res.data;
// console.log('==>weChatPayData=>', weChatPayData);
uni.requestPayment({
provider: 'wxpay',
timeStamp: weChatPayData.timeStamp,
@ -235,20 +239,14 @@
title: '支付成功',
icon: 'none'
});
// console.log('支付成功', res);
// 业务逻辑
},
fail: function(err) {
uni.showToast({
title: '支付失败:'+err,
icon: 'none'
});
// console.log('支付失败', err);
}
});
// console.log(res)
// debugger
},
formatSendDay(sendDate){
return dayjs(sendDate).format('YYYY-MM-DD');
@ -263,11 +261,25 @@
background-color: #F6F6F6;
height: 100% !important;
}
.customer_nav_bar {
padding-top: 30rpx;
background-color: #FFF;
position: relative;
}
</style>
<style scoped lang="scss">
.pgb-cont{
padding: 30rpx;
}
.pgb-header {
// padding-top: --status-bar-height;
padding-top: 30rpx;
background-color: #FFF;
position: relative;
}
.dt-head {
margin-top: 30rpx;
// margin-top: 30rpx;
padding: 30rpx;
background-color: #FFF;
position: relative;
@ -292,18 +304,33 @@
font-weight: bold;
}
}
.zhfxin{
.ord-list-item{
box-shadow: 0rpx 3rpx 12rpx 0rpx rgba(139,139,139,0.06);
border-radius: 20rpx;
padding: 22rpx 30rpx;
background-color: #fff;
margin-bottom: 30rpx;
}
.yditem{
padding: 20rpx 20rpx;
background-color: #F6F6F6;
border-radius: 6rpx;
margin-bottom: 20rpx;
.search-more-panel{
overflow: hidden;
position: absolute;
left: 0;
right: 0;
height: calc(70vh);
z-index: 200;
}
.ydi-lab{
.smp-body{
padding: 30rpx;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
flex-direction: column;
height: 100%;
background-color: #FFF;
border-radius: 0 0 30rpx 30rpx;
box-sizing: border-box;
}
.smp-content{
flex: 1;
position: relative;
}
</style>

2
pages/bill/list.vue
View File

@ -168,7 +168,7 @@
searchParam: {
searchValue: '',
_date: [],
paymentStatus: '',
paymentStatus: '0',
params: {
billCode:null
}