新增统一域名配置,修改流水详情样式
This commit is contained in:
parent
2aa067a6bf
commit
001599a826
@ -1,20 +1,29 @@
|
||||
let httpApiThree;
|
||||
let httpApi;
|
||||
let httpApiTwo;
|
||||
let httpApi; // 总域名
|
||||
let httpApiTwo; // 物流系统域名
|
||||
|
||||
// 正式使用的域名
|
||||
// httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
|
||||
// httpApi = 'https://preview-worker-task.lihaink.cn' //预上线
|
||||
httpApi = 'https://worker-task.lihaink.cn' //正式
|
||||
// const env = 'dev'; // 开发
|
||||
const env = 'prod'; // 生产
|
||||
// const env = 'prew'; // 预上线
|
||||
|
||||
// 物流
|
||||
httpApiTwo = 'https://logistics.lihaink.cn' //正式环境
|
||||
// httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
|
||||
switch(env){
|
||||
case 'prod':
|
||||
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
|
||||
// httpApiThree = 'baseUrlTest' //生产
|
||||
// #endif
|
||||
|
@ -486,7 +486,7 @@ page {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px solid #3274f9;
|
||||
border: 1px solid #0122c7;
|
||||
|
||||
&:nth-child(1) {
|
||||
border-radius: 30rpx 0 0 30rpx;
|
||||
@ -525,7 +525,7 @@ page {
|
||||
.blue {
|
||||
width: 137rpx;
|
||||
height: 49rpx;
|
||||
background: #3274f9;
|
||||
background: #0122c7;
|
||||
border-radius: 26rpx 26rpx 26rpx 26rpx;
|
||||
font-size: 25rpx;
|
||||
font-weight: 400;
|
||||
@ -594,7 +594,7 @@ page {
|
||||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
text-align: center;
|
||||
background: #3274f9;
|
||||
background: #0122c7;
|
||||
border-radius: 26rpx 26rpx 26rpx 26rpx;
|
||||
color: #fff;
|
||||
margin-right: 28rpx;
|
||||
|
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="">
|
||||
<view class="" style="width: 100vw;overflow: hidden;">
|
||||
<view class="calendar">
|
||||
<picker mode="date" fields="month" @change="bindDateChangeMonth">
|
||||
<view class="date">
|
||||
@ -7,39 +7,64 @@
|
||||
<view>{{nowDate.y}}</view>
|
||||
</view>
|
||||
</picker>
|
||||
<uni-calendar :insert="true" @change="changeDate" :date="nowYMD" :showMonth="false"/>
|
||||
<uni-calendar :insert="true" @change="changeDate" :date="nowYMD" :showMonth="false" />
|
||||
</view>
|
||||
<view class="detail">
|
||||
<uni-section class="title" titleFontSize="32rpx" :title="'账单明细 '+ nowYMD" type="line"></uni-section>
|
||||
<view class="card">
|
||||
<view class="item">
|
||||
<view class="text">
|
||||
收益总金额(元)
|
||||
押金(元)
|
||||
<view class="price">{{income}}</view>
|
||||
</view>
|
||||
<view class="tips">
|
||||
平台收益:{{terraceIncome.count}}元({{terraceIncome.num}}笔)
|
||||
押金:{{terraceIncome.count}}元({{terraceIncome.num}}笔)
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="text">
|
||||
支出总金额(元)
|
||||
个人收益金额(元)
|
||||
<view class="price">{{disbursement}}</view>
|
||||
</view>
|
||||
<view class="tips">
|
||||
平台支出:{{terraceIncome.count}}元({{terraceIncome.num}}笔)
|
||||
收益:{{terraceIncome.count}}元({{terraceIncome.num}}笔)
|
||||
</view>
|
||||
</view>
|
||||
<view class="all">
|
||||
<view>收益总金额(元):</view>
|
||||
<view class="price">
|
||||
{{aggregateAmount}}
|
||||
<view class="all" style="justify-content: space-between;">
|
||||
<view></view>
|
||||
<view style="display: flex;">
|
||||
<view>收益总金额(元):</view>
|
||||
<view class="price">
|
||||
{{aggregateAmount}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<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="blue">账单详情</view>
|
||||
<view>账单日期:{{item.create_time}}</view>
|
||||
@ -54,8 +79,9 @@
|
||||
<view>入账金额:{{item.change_amount_desc>0?item.change_amount:'0.00'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
|
||||
</view> -->
|
||||
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
|
||||
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -68,12 +94,12 @@
|
||||
return {
|
||||
transition: true,
|
||||
billList: [],
|
||||
nowDate:{
|
||||
nowDate: {
|
||||
y: '',
|
||||
m: '',
|
||||
d: ''
|
||||
},
|
||||
loadConfig:{
|
||||
loadConfig: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
loadingText: '努力加载中',
|
||||
@ -88,31 +114,31 @@
|
||||
this.loadBill()
|
||||
},
|
||||
onShow() {},
|
||||
computed:{
|
||||
nowYMD(){
|
||||
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;
|
||||
return this.nowDate.y+'-'+m+'-'+d;
|
||||
computed: {
|
||||
nowYMD() {
|
||||
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;
|
||||
return this.nowDate.y + '-' + m + '-' + d;
|
||||
},
|
||||
// 总收益
|
||||
aggregateAmount(){
|
||||
return (this.income>this.disbursement?this.income-this.disbursement:0).toFixed(2);
|
||||
aggregateAmount() {
|
||||
return (this.income > this.disbursement ? this.income - this.disbursement : 0).toFixed(2);
|
||||
},
|
||||
// 收益
|
||||
income(){
|
||||
income() {
|
||||
let count = 0;
|
||||
this.billList.forEach(item=>{
|
||||
item.action==1?count+=+item.change_amount:null;
|
||||
this.billList.forEach(item => {
|
||||
item.action == 1 ? count += +item.change_amount : null;
|
||||
})
|
||||
return count.toFixed(2);
|
||||
},
|
||||
// 平台收益
|
||||
terraceIncome(){
|
||||
terraceIncome() {
|
||||
let count = 0;
|
||||
let num = 0;
|
||||
this.billList.forEach(item=>{
|
||||
if(item.action==1&&item.change_type!==201){
|
||||
count+=+item.change_amount;
|
||||
this.billList.forEach(item => {
|
||||
if (item.action == 1 && item.change_type !== 201) {
|
||||
count += +item.change_amount;
|
||||
num++;
|
||||
}
|
||||
})
|
||||
@ -122,20 +148,20 @@
|
||||
};
|
||||
},
|
||||
// 支出
|
||||
disbursement(){
|
||||
disbursement() {
|
||||
let count = 0;
|
||||
this.billList.forEach(item=>{
|
||||
item.action==2?count+=+item.change_amount:null;
|
||||
this.billList.forEach(item => {
|
||||
item.action == 2 ? count += +item.change_amount : null;
|
||||
})
|
||||
return count.toFixed(2);
|
||||
},
|
||||
// 平台支出
|
||||
terraceDisbursement(){
|
||||
terraceDisbursement() {
|
||||
let count = 0;
|
||||
let num = 0;
|
||||
this.billList.forEach(item=>{
|
||||
if(item.action==2&&item.change_type!==201){
|
||||
count+=+item.change_amount;
|
||||
this.billList.forEach(item => {
|
||||
if (item.action == 2 && item.change_type !== 201) {
|
||||
count += +item.change_amount;
|
||||
num++;
|
||||
}
|
||||
})
|
||||
@ -150,26 +176,26 @@
|
||||
},
|
||||
methods: {
|
||||
async loadBill() {
|
||||
if(this.loadConfig.status=="nomore")return;
|
||||
this.loadConfig.status="loading"
|
||||
if (this.loadConfig.status == "nomore") return;
|
||||
this.loadConfig.status = "loading"
|
||||
let res = await accountLogLists({
|
||||
type: 'um', //账户余额
|
||||
page_no: this.loadConfig.page,
|
||||
page_size: this.loadConfig.page_size,
|
||||
page_size: this.loadConfig.limit,
|
||||
time: this.nowYMD
|
||||
});
|
||||
this.loadConfig.status="loadmore"
|
||||
if(res.data.lists.length<this.loadConfig.limit){
|
||||
this.loadConfig.status="nomore"
|
||||
}else {
|
||||
this.loadConfig.status = "loadmore"
|
||||
if (res.data.lists.length < this.loadConfig.limit) {
|
||||
this.loadConfig.status = "nomore"
|
||||
} else {
|
||||
this.loadConfig.page++;
|
||||
}
|
||||
this.billList = [...this.billList, ...res.data.lists];
|
||||
},
|
||||
initDate(){
|
||||
initDate() {
|
||||
let date = new Date();
|
||||
this.nowDate.y = date.getFullYear();
|
||||
this.nowDate.m = date.getMonth()+1;
|
||||
this.nowDate.m = date.getMonth() + 1;
|
||||
this.nowDate.d = date.getDate();
|
||||
},
|
||||
// 选择日期
|
||||
@ -183,10 +209,10 @@
|
||||
this.loadBill();
|
||||
},
|
||||
// 选择月份
|
||||
bindDateChangeMonth(e){
|
||||
bindDateChangeMonth(e) {
|
||||
this.nowDate.y = e.detail.value.split('-')[0];
|
||||
let m = e.detail.value.split('-')[1];
|
||||
this.nowDate.m = m<10 ? +m : m;
|
||||
this.nowDate.m = m < 10 ? +m : m;
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
@ -199,6 +225,7 @@
|
||||
.calendar {
|
||||
background-color: #fff;
|
||||
padding-bottom: 28rpx;
|
||||
|
||||
.date {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
@ -227,7 +254,7 @@
|
||||
background-color: transparent;
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
|
||||
|
||||
.card {
|
||||
width: 694rpx;
|
||||
// height: 454rpx;
|
||||
@ -278,25 +305,28 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.bill_list{
|
||||
|
||||
.bill_list {
|
||||
// background-color: #f5f5f5;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
.card{
|
||||
|
||||
.card {
|
||||
width: 694rpx;
|
||||
padding: 28rpx;
|
||||
background-color: #fff;
|
||||
margin-bottom: 21rpx;
|
||||
.top{
|
||||
|
||||
.top {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 25rpx;
|
||||
font-weight: 400;
|
||||
color: #333333FF;
|
||||
line-height: 39rpx;
|
||||
.blue{
|
||||
|
||||
.blue {
|
||||
width: 137rpx;
|
||||
height: 49rpx;
|
||||
background: #3274F9;
|
||||
@ -311,26 +341,30 @@
|
||||
margin-right: 28rpx;
|
||||
}
|
||||
}
|
||||
.bottom{
|
||||
|
||||
.bottom {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
height: 160rpx;
|
||||
.left{
|
||||
|
||||
.left {
|
||||
flex: 1;
|
||||
text-align: center;
|
||||
font-size: 25rpx;
|
||||
font-weight: 400;
|
||||
color: #666666;
|
||||
line-height: 39rpx;
|
||||
.num{
|
||||
|
||||
.num {
|
||||
font-size: 39rpx;
|
||||
font-weight: 500;
|
||||
color: #F02828;
|
||||
line-height: 39rpx;
|
||||
}
|
||||
}
|
||||
.right{
|
||||
|
||||
.right {
|
||||
flex: 1;
|
||||
font-size: 25rpx;
|
||||
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>
|
Loading…
x
Reference in New Issue
Block a user