mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增统一域名配置,修改流水详情样式

Browse Source
This commit is contained in:
weipengfei 2023-09-08 10:02:37 +08:00
parent 2aa067a6bf
commit 001599a826
3 changed files with 182 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
config/app.js
View File

@ -1,20 +1,29 @@
let httpApiThree; let httpApiThree;
let httpApi; let httpApi; // 总域名
let httpApiTwo; let httpApiTwo; // 物流系统域名
// 正式使用的域名 // const env = 'dev'; // 开发
// httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 const env = 'prod'; // 生产
// httpApi = 'https://preview-worker-task.lihaink.cn' //预上线 // const env = 'prew'; // 预上线
httpApi = 'https://worker-task.lihaink.cn' //正式
// 物流 switch(env){
httpApiTwo = 'https://logistics.lihaink.cn' //正式环境 case 'prod':
// httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 httpApi = 'https://worker-task.lihaink.cn' //正式
httpApiTwo = 'https://logistics.lihaink.cn' //正式环境
httpApiThree = 'https://worker-task.lihaink.cn' //正式
break;
case 'prew':
httpApi = 'https://preview-worker-task.lihaink.cn' //预上线
httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线
httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
break;
default:
httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
}
// httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
// httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线
httpApiThree = 'https://worker-task.lihaink.cn' //正式
// #ifdef H5 // #ifdef H5
// httpApiThree = 'baseUrlTest' //生产 // httpApiThree = 'baseUrlTest' //生产
// #endif // #endif

6
subpkg/finance/finance.vue
View File

@ -486,7 +486,7 @@ page {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border: 1px solid #3274f9; border: 1px solid #0122c7;
&:nth-child(1) { &:nth-child(1) {
border-radius: 30rpx 0 0 30rpx; border-radius: 30rpx 0 0 30rpx;
@ -525,7 +525,7 @@ page {
.blue { .blue {
width: 137rpx; width: 137rpx;
height: 49rpx; height: 49rpx;
background: #3274f9; background: #0122c7;
border-radius: 26rpx 26rpx 26rpx 26rpx; border-radius: 26rpx 26rpx 26rpx 26rpx;
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
@ -594,7 +594,7 @@ page {
height: 49rpx; height: 49rpx;
line-height: 49rpx; line-height: 49rpx;
text-align: center; text-align: center;
background: #3274f9; background: #0122c7;
border-radius: 26rpx 26rpx 26rpx 26rpx; border-radius: 26rpx 26rpx 26rpx 26rpx;
color: #fff; color: #fff;
margin-right: 28rpx; margin-right: 28rpx;

204
subpkg/orderDetail/orderDetail.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class=""> <view class="" style="width: 100vw;overflow: hidden;">
<view class="calendar"> <view class="calendar">
<picker mode="date" fields="month" @change="bindDateChangeMonth"> <picker mode="date" fields="month" @change="bindDateChangeMonth">
<view class="date"> <view class="date">
@ -7,30 +7,32 @@
<view>{{nowDate.y}}</view> <view>{{nowDate.y}}</view>
</view> </view>
</picker> </picker>
<uni-calendar :insert="true" @change="changeDate" :date="nowYMD" :showMonth="false"/> <uni-calendar :insert="true" @change="changeDate" :date="nowYMD" :showMonth="false" />
</view> </view>
<view class="detail"> <view class="detail">
<uni-section class="title" titleFontSize="32rpx" :title="'账单明细 '+ nowYMD" type="line"></uni-section> <uni-section class="title" titleFontSize="32rpx" :title="'账单明细 '+ nowYMD" type="line"></uni-section>
<view class="card"> <view class="card">
<view class="item"> <view class="item">
<view class="text"> <view class="text">
收益总金额(元) 押金(元)
<view class="price">{{income}}</view> <view class="price">{{income}}</view>
</view> </view>
<view class="tips"> <view class="tips">
平台收益：{{terraceIncome.count}}元（{{terraceIncome.num}}笔） 押金：{{terraceIncome.count}}元（{{terraceIncome.num}}笔）
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="text"> <view class="text">
支出总金额(元) 个人收益金额(元)
<view class="price">{{disbursement}}</view> <view class="price">{{disbursement}}</view>
</view> </view>
<view class="tips"> <view class="tips">
平台支出：{{terraceIncome.count}}元（{{terraceIncome.num}}笔） 收益：{{terraceIncome.count}}元（{{terraceIncome.num}}笔）
</view> </view>
</view> </view>
<view class="all"> <view class="all" style="justify-content: space-between;">
<view></view>
<view style="display: flex;">
<view>收益总金额(元):</view> <view>收益总金额(元):</view>
<view class="price"> <view class="price">
{{aggregateAmount}} {{aggregateAmount}}
@ -38,8 +40,31 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view class="bill_list"> <view class="bill_list">
<view class="card" v-for="(item, index) in billList" :key="index"> <view class="item" v-for="(item, index) in billList" :key="item.id">
<view class="top">
账单日期: {{ item.create_time }}
</view>
<view class="bottom">
<view class="text">
<view class="t_item">
<view class="t_title">任务名称：</view>
<view class="tips">{{ item.remark }}</view>
</view>
<view class="t_item">
<view class="t_title">收益来源：</view>
<view class="tips">
<text v-if="item.change_type == 202" style="color: #46be61">{{ item.type_desc }}</text>
<text v-else-if="item.change_type == 203" style="color: #ff7c32">{{ item.type_desc }}</text>
<text v-else="item.change_type == 203">{{ item.type_desc }}</text>
</view>
</view>
</view>
<view class="price">{{ item.change_amount_desc }}</view>
</view>
</view>
<!-- <view class="card" v-for="(item, index) in billList" :key="index">
<view class="top"> <view class="top">
<view class="blue">账单详情</view> <view class="blue">账单详情</view>
<view>账单日期：{{item.create_time}}</view> <view>账单日期：{{item.create_time}}</view>
@ -54,8 +79,9 @@
<view>入账金额:{{item.change_amount_desc>0?item.change_amount:'0.00'}}</view> <view>入账金额:{{item.change_amount_desc>0?item.change_amount:'0.00'}}</view>
</view> </view>
</view> </view>
</view> </view> -->
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
</view> </view>
</view> </view>
</template> </template>
@ -68,12 +94,12 @@
return { return {
transition: true, transition: true,
billList: [], billList: [],
nowDate:{ nowDate: {
y: '', y: '',
m: '', m: '',
d: '' d: ''
}, },
loadConfig:{ loadConfig: {
page: 1, page: 1,
limit: 15, limit: 15,
loadingText: '努力加载中', loadingText: '努力加载中',
@ -88,31 +114,31 @@
this.loadBill() this.loadBill()
}, },
onShow() {}, onShow() {},
computed:{ computed: {
nowYMD(){ nowYMD() {
let m = this.nowDate.m<10?'0'+this.nowDate.m:this.nowDate.m; let m = this.nowDate.m < 10 ? '0' + this.nowDate.m : this.nowDate.m;
let d = this.nowDate.d<10?'0'+this.nowDate.d:this.nowDate.d; let d = this.nowDate.d < 10 ? '0' + this.nowDate.d : this.nowDate.d;
return this.nowDate.y+'-'+m+'-'+d; return this.nowDate.y + '-' + m + '-' + d;
}, },
// 总收益 // 总收益
aggregateAmount(){ aggregateAmount() {
return (this.income>this.disbursement?this.income-this.disbursement:0).toFixed(2); return (this.income > this.disbursement ? this.income - this.disbursement : 0).toFixed(2);
}, },
// 收益 // 收益
income(){ income() {
let count = 0; let count = 0;
this.billList.forEach(item=>{ this.billList.forEach(item => {
item.action==1?count+=+item.change_amount:null; item.action == 1 ? count += +item.change_amount : null;
}) })
return count.toFixed(2); return count.toFixed(2);
}, },
// 平台收益 // 平台收益
terraceIncome(){ terraceIncome() {
let count = 0; let count = 0;
let num = 0; let num = 0;
this.billList.forEach(item=>{ this.billList.forEach(item => {
if(item.action==1&&item.change_type!==201){ if (item.action == 1 && item.change_type !== 201) {
count+=+item.change_amount; count += +item.change_amount;
num++; num++;
} }
}) })
@ -122,20 +148,20 @@
}; };
}, },
// 支出 // 支出
disbursement(){ disbursement() {
let count = 0; let count = 0;
this.billList.forEach(item=>{ this.billList.forEach(item => {
item.action==2?count+=+item.change_amount:null; item.action == 2 ? count += +item.change_amount : null;
}) })
return count.toFixed(2); return count.toFixed(2);
}, },
// 平台支出 // 平台支出
terraceDisbursement(){ terraceDisbursement() {
let count = 0; let count = 0;
let num = 0; let num = 0;
this.billList.forEach(item=>{ this.billList.forEach(item => {
if(item.action==2&&item.change_type!==201){ if (item.action == 2 && item.change_type !== 201) {
count+=+item.change_amount; count += +item.change_amount;
num++; num++;
} }
}) })
@ -150,26 +176,26 @@
}, },
methods: { methods: {
async loadBill() { async loadBill() {
if(this.loadConfig.status=="nomore")return; if (this.loadConfig.status == "nomore") return;
this.loadConfig.status="loading" this.loadConfig.status = "loading"
let res = await accountLogLists({ let res = await accountLogLists({
type: 'um', //账户余额 type: 'um', //账户余额
page_no: this.loadConfig.page, page_no: this.loadConfig.page,
page_size: this.loadConfig.page_size, page_size: this.loadConfig.limit,
time: this.nowYMD time: this.nowYMD
}); });
this.loadConfig.status="loadmore" this.loadConfig.status = "loadmore"
if(res.data.lists.length<this.loadConfig.limit){ if (res.data.lists.length < this.loadConfig.limit) {
this.loadConfig.status="nomore" this.loadConfig.status = "nomore"
}else { } else {
this.loadConfig.page++; this.loadConfig.page++;
} }
this.billList = [...this.billList, ...res.data.lists]; this.billList = [...this.billList, ...res.data.lists];
}, },
initDate(){ initDate() {
let date = new Date(); let date = new Date();
this.nowDate.y = date.getFullYear(); this.nowDate.y = date.getFullYear();
this.nowDate.m = date.getMonth()+1; this.nowDate.m = date.getMonth() + 1;
this.nowDate.d = date.getDate(); this.nowDate.d = date.getDate();
}, },
// 选择日期 // 选择日期
@ -183,10 +209,10 @@
this.loadBill(); this.loadBill();
}, },
// 选择月份 // 选择月份
bindDateChangeMonth(e){ bindDateChangeMonth(e) {
this.nowDate.y = e.detail.value.split('-')[0]; this.nowDate.y = e.detail.value.split('-')[0];
let m = e.detail.value.split('-')[1]; let m = e.detail.value.split('-')[1];
this.nowDate.m = m<10 ? +m : m; this.nowDate.m = m < 10 ? +m : m;
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -199,6 +225,7 @@
.calendar { .calendar {
background-color: #fff; background-color: #fff;
padding-bottom: 28rpx; padding-bottom: 28rpx;
.date { .date {
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
@ -279,24 +306,27 @@
} }
} }
.bill_list{ .bill_list {
// background-color: #f5f5f5; // background-color: #f5f5f5;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.card{
.card {
width: 694rpx; width: 694rpx;
padding: 28rpx; padding: 28rpx;
background-color: #fff; background-color: #fff;
margin-bottom: 21rpx; margin-bottom: 21rpx;
.top{
.top {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
color: #333333FF; color: #333333FF;
line-height: 39rpx; line-height: 39rpx;
.blue{
.blue {
width: 137rpx; width: 137rpx;
height: 49rpx; height: 49rpx;
background: #3274F9; background: #3274F9;
@ -311,26 +341,30 @@
margin-right: 28rpx; margin-right: 28rpx;
} }
} }
.bottom{
.bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 160rpx; height: 160rpx;
.left{
.left {
flex: 1; flex: 1;
text-align: center; text-align: center;
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
line-height: 39rpx; line-height: 39rpx;
.num{
.num {
font-size: 39rpx; font-size: 39rpx;
font-weight: 500; font-weight: 500;
color: #F02828; color: #F02828;
line-height: 39rpx; line-height: 39rpx;
} }
} }
.right{
.right {
flex: 1; flex: 1;
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
@ -339,6 +373,72 @@
} }
} }
} }
.item {
margin: 0 auto;
margin-bottom: 28rpx;
width: 694rpx;
// height: 238rpx;
background: #ffffff;
border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1;
padding: 28rpx;
.top {
margin-bottom: 28rpx;
font-size: 25rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
&:before {
display: inline-block;
content: "账单详情";
width: 137rpx;
height: 49rpx;
line-height: 49rpx;
text-align: center;
background: #0122c7;
border-radius: 26rpx 26rpx 26rpx 26rpx;
color: #fff;
margin-right: 28rpx;
}
} }
.bottom {
display: flex;
justify-content: space-between;
.text {
font-size: 25rpx;
font-weight: 400;
color: #999999;
line-height: 39rpx;
.t_item {
display: flex;
.t_title {
margin-bottom: 16rpx;
flex-shrink: 0 !important;
}
.tips {
font-size: 28rpx;
font-weight: 400;
color: #333333;
}
}
}
.price {
display: flex;
align-items: center;
font-size: 32rpx;
font-weight: 500;
color: #f02828;
}
}
}
}
</style> </style>