Merge branch 'main' of https://gitea.lihaink.cn/mkm/OfficeApp
This commit is contained in:
weipengfei
commit
33205f116c
@ -371,7 +371,7 @@
|
||||
}
|
||||
this.doneGood()
|
||||
this.showPop = false
|
||||
this.showMore()
|
||||
// this.showMore()
|
||||
|
||||
},
|
||||
// 送达
|
||||
@ -380,8 +380,15 @@
|
||||
take_code: this.take_code,
|
||||
logistics_id: this.goodsInfo.id
|
||||
}).then(res => {
|
||||
console.log(res)
|
||||
this.$emit('showTost')
|
||||
this.$emit('getlist')
|
||||
}).catch(err => {
|
||||
console.log(err.msg)
|
||||
uni.showToast({
|
||||
title: err.msg,
|
||||
icon: "none"
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
@ -1,56 +1,123 @@
|
||||
<template>
|
||||
<view class="c_task_item" @click="clickTask">
|
||||
|
||||
<view class="personnel_list">
|
||||
<view class="cards">
|
||||
<view class="cards_head">
|
||||
<text style="font-size: 32rpx">任务名称: {{datas.title}}</text>
|
||||
<text>点击查看</text>
|
||||
</view>
|
||||
<view class="cards_content">
|
||||
<view class="right" style="width: 100%;">
|
||||
<view class="" style="display: flex;">
|
||||
<view>任务状态 :</view>
|
||||
<view class="text" style="color: #ff7c32;">
|
||||
<text v-if="datas.status==3" style="color: #488F00;">已完成</text>
|
||||
<text v-else-if="datas.status==5" style="color: #ccc;">已关闭</text>
|
||||
<block v-else-if="(datas.type==31||datas.type==32||datas.type==33||datas.type==34||datas.type==35)">
|
||||
<block v-if="datas.extend&&datas.extend.informationg">
|
||||
{{(datas.extend.informationg.update?datas.extend.informationg.update:0)+'/'+(datas.extend.informationg.count?datas.extend.informationg.count:0)}}
|
||||
</block>
|
||||
<block
|
||||
v-else-if="datas.extend&&datas.extend.transaction&&datas.extend.transaction.arr">
|
||||
{{total_price+'元/'+(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元'}}
|
||||
<!-- <text style="color: #488F00;margin-left: 26rpx;">{{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:0)+'元'}}</text> -->
|
||||
</block>
|
||||
<block v-else-if="datas.extend&&datas.extend.update">
|
||||
<text v-if="datas.extend.update.transfer&&datas.extend.update.transfer.lnglat[0]||datas.status==3" style="color: #488f00;">抵达终点</text>
|
||||
<text v-else-if="datas.extend.update.terminus&&datas.extend.update.terminus.lnglat[0]">抵达中转点</text>
|
||||
<view class="c_task_item" @click="clickTask">
|
||||
<view class="personnel_list">
|
||||
<view class="cards">
|
||||
<view class="cards_head">
|
||||
<text style="font-size: 32rpx">任务名称: {{ datas.title }}</text>
|
||||
<text>点击查看</text>
|
||||
</view>
|
||||
<view class="cards_content">
|
||||
<view class="right" style="width: 100%">
|
||||
<view class="" style="display: flex">
|
||||
<view>任务状态 :</view>
|
||||
<view class="text" style="color: #ff7c32">
|
||||
<text v-if="datas.status == 3" style="color: #488f00"
|
||||
>已完成</text
|
||||
>
|
||||
<text v-else-if="datas.status == 5" style="color: #ccc"
|
||||
>已关闭</text
|
||||
>
|
||||
<block
|
||||
v-else-if="
|
||||
datas.type == 31 ||
|
||||
datas.type == 32 ||
|
||||
datas.type == 33 ||
|
||||
datas.type == 34 ||
|
||||
datas.type == 35
|
||||
"
|
||||
>
|
||||
<block v-if="datas.extend && datas.extend.informationg">
|
||||
{{
|
||||
(datas.extend.informationg.update
|
||||
? datas.extend.informationg.update
|
||||
: 0) +
|
||||
"/" +
|
||||
(datas.extend.informationg.count
|
||||
? datas.extend.informationg.count
|
||||
: 0)
|
||||
}}
|
||||
</block>
|
||||
<block
|
||||
v-else-if="
|
||||
datas.extend &&
|
||||
datas.extend.transaction &&
|
||||
datas.extend.transaction.arr
|
||||
"
|
||||
>
|
||||
{{
|
||||
(datas.extend.transaction.arr.transaction_pool
|
||||
? datas.extend.transaction.arr.transaction_pool
|
||||
: 0) +
|
||||
"元/" +
|
||||
(datas.extend.transaction.arr.day_money
|
||||
? datas.extend.transaction.arr.day_money
|
||||
: 0) +
|
||||
"元"
|
||||
}}
|
||||
<!-- <text style="color: #488F00;margin-left: 26rpx;">{{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:1)+'元'}}</text> -->
|
||||
</block>
|
||||
<block v-else-if="datas.extend && datas.extend.update">
|
||||
<text
|
||||
v-if="
|
||||
(datas.extend.update.transfer &&
|
||||
datas.extend.update.transfer.lnglat[0]) ||
|
||||
datas.status == 3
|
||||
"
|
||||
style="color: #488f00"
|
||||
>抵达终点</text
|
||||
>
|
||||
<text
|
||||
v-else-if="
|
||||
datas.extend.update.terminus &&
|
||||
datas.extend.update.terminus.lnglat[0]
|
||||
"
|
||||
>抵达中转点</text
|
||||
>
|
||||
<text v-else>进行中</text>
|
||||
</block>
|
||||
<block v-else>进行中</block>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
<view style="display: flex;justify-content: space-between;align-items: center;">
|
||||
<view>
|
||||
<text>完成时间 :</text>
|
||||
<text>{{datas.end_time}}</text>
|
||||
</view>
|
||||
<text v-if="datas.status==2||datas.status==1" style="background-color: #ff7c32;"
|
||||
class="status">进行中</text>
|
||||
<text v-if="datas.status==3" style="background-color: #488F00;" class="status">已完成</text>
|
||||
<text v-if="datas.status==5" style="background-color: #ccc;" class="status">已关闭</text>
|
||||
</view>
|
||||
<view class="">
|
||||
<text>任务金额 :</text>
|
||||
<text> {{datas.money+'元'||'0.00'}} </text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="top">
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
style="
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
"
|
||||
>
|
||||
<view>
|
||||
<text>完成时间 :</text>
|
||||
<text>{{ datas.end_time }}</text>
|
||||
</view>
|
||||
<text
|
||||
v-if="datas.status == 2 || datas.status == 1"
|
||||
style="background-color: #ff7c32"
|
||||
class="status"
|
||||
>进行中</text
|
||||
>
|
||||
<text
|
||||
v-if="datas.status == 3"
|
||||
style="background-color: #488f00"
|
||||
class="status"
|
||||
>已完成</text
|
||||
>
|
||||
<text
|
||||
v-if="datas.status == 5"
|
||||
style="background-color: #ccc"
|
||||
class="status"
|
||||
>已关闭</text
|
||||
>
|
||||
</view>
|
||||
<view class="">
|
||||
<text>任务金额 :</text>
|
||||
<text> {{ datas.money + "元" || "0.00" }} </text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="top">
|
||||
<view class="left">
|
||||
<view>任务名称:</view>
|
||||
<view class="text">{{datas.title}}</view>
|
||||
@ -98,247 +165,242 @@
|
||||
</view>
|
||||
</view>
|
||||
-->
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
Toast
|
||||
} from '../../libs/uniApi';
|
||||
export default {
|
||||
name: "task",
|
||||
props: {
|
||||
datas: {
|
||||
type: Object,
|
||||
default: function() {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
};
|
||||
},
|
||||
created() {
|
||||
try{
|
||||
|
||||
}catch(e){
|
||||
//TODO handle the exception
|
||||
import {
|
||||
Toast
|
||||
} from '../../libs/uniApi';
|
||||
export default {
|
||||
name: "task",
|
||||
props: {
|
||||
datas: {
|
||||
type: Object,
|
||||
default: function () {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
|
||||
};
|
||||
},
|
||||
created () {
|
||||
try {
|
||||
|
||||
} catch (e) {
|
||||
//TODO handle the exception
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
total_price () {
|
||||
return this.datas?.extend?.transaction?.arr?.transaction_pool ? this.datas.extend.transaction.arr.total_price += +this.datas.extend.transaction.arr.transaction_pool : this.datas.extend.transaction.arr.total_price
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
navTo (url) {
|
||||
if (url) {
|
||||
uni.showLoading({
|
||||
title: '加载中',
|
||||
mask: true
|
||||
});
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
success () {
|
||||
uni.hideLoading()
|
||||
}
|
||||
})
|
||||
} else Toast('暂未开放')
|
||||
},
|
||||
computed:{
|
||||
total_price(){
|
||||
return this.datas?.extend?.transaction?.arr?.transaction_pool?this.datas.extend.transaction.arr.total_price += +this.datas.extend.transaction.arr.transaction_pool: this.datas.extend.transaction.arr.total_price
|
||||
clickTask () {
|
||||
// console.log('点击', this.$props.datas);
|
||||
// if ((this.$props.datas.type != 31) && this.$props.datas.status !== 2 && this.$props.datas.status !== 1) {
|
||||
// return this.$props.datas.status == 3 ? Toast('任务已完成!') : Toast('任务已结束!');
|
||||
// }
|
||||
if (this.$props.datas.type == 31) {
|
||||
// this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
|
||||
if (this.$store.state.app.userInfo.admin_id) this.navTo(`/subpkg/captain/captain?task_id=${this.$props.datas?.id}`);
|
||||
else this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`);
|
||||
} else if (this.$props.datas.type == 32) {
|
||||
// this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
|
||||
this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`)
|
||||
} else if (this.$props.datas.type == 33) {
|
||||
this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}`)
|
||||
} else if (this.$props.datas.type == 34) {
|
||||
this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`)
|
||||
} else if (this.$props.datas.type == 35) {
|
||||
this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`)
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
navTo(url) {
|
||||
if(url){
|
||||
uni.showLoading({
|
||||
title: '加载中',
|
||||
mask: true
|
||||
});
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
success() {
|
||||
uni.hideLoading()
|
||||
}
|
||||
})
|
||||
}else Toast('暂未开放')
|
||||
},
|
||||
clickTask() {
|
||||
// console.log('点击', this.$props.datas);
|
||||
// if ((this.$props.datas.type != 31) && this.$props.datas.status !== 2 && this.$props.datas.status !== 1) {
|
||||
// return this.$props.datas.status == 3 ? Toast('任务已完成!') : Toast('任务已结束!');
|
||||
// }
|
||||
if (this.$props.datas.type == 31) {
|
||||
// this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
|
||||
if(this.$store.state.app.userInfo.admin_id)this.navTo(`/subpkg/captain/captain?task_id=${this.$props.datas?.id}`);
|
||||
else this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`);
|
||||
} else if (this.$props.datas.type == 32) {
|
||||
// this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
|
||||
this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`)
|
||||
} else if(this.$props.datas.type == 33){
|
||||
this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}`)
|
||||
}else if(this.$props.datas.type == 34){
|
||||
this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`)
|
||||
}else if(this.$props.datas.type == 35){
|
||||
this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`)
|
||||
}
|
||||
else this.navTo('');
|
||||
}
|
||||
}
|
||||
}
|
||||
else this.navTo('');
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.c_task_item {
|
||||
margin: 0 auto;
|
||||
// margin-bottom: 28rpx;
|
||||
width: 694rpx;
|
||||
// background: #FFFFFF;
|
||||
border-radius: 14rpx 14rpx 14rpx 14rpx;
|
||||
opacity: 1;
|
||||
font-size: 25rpx;
|
||||
font-weight: 400;
|
||||
color: #999999;
|
||||
line-height: 39rpx;
|
||||
.c_task_item {
|
||||
margin: 0 auto;
|
||||
// margin-bottom: 28rpx;
|
||||
width: 694rpx;
|
||||
// background: #FFFFFF;
|
||||
border-radius: 14rpx 14rpx 14rpx 14rpx;
|
||||
opacity: 1;
|
||||
font-size: 25rpx;
|
||||
font-weight: 400;
|
||||
color: #999999;
|
||||
line-height: 39rpx;
|
||||
|
||||
.text {
|
||||
font-size: 28rpx;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
line-height: 39rpx;
|
||||
margin-left: 18rpx;
|
||||
}
|
||||
.text {
|
||||
font-size: 28rpx;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
line-height: 39rpx;
|
||||
margin-left: 18rpx;
|
||||
}
|
||||
|
||||
.top {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 28rpx;
|
||||
border-bottom: 1rpx solid #F5F5F5FF;
|
||||
.top {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 28rpx;
|
||||
border-bottom: 1rpx solid #f5f5f5ff;
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
justify-content: left;
|
||||
align-items: center;
|
||||
}
|
||||
.left {
|
||||
display: flex;
|
||||
justify-content: left;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.right {
|
||||
.icon {
|
||||
width: 43rpx;
|
||||
height: 43rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.right {
|
||||
.icon {
|
||||
width: 43rpx;
|
||||
height: 43rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.bottom {
|
||||
padding: 28rpx;
|
||||
display: flex;
|
||||
.bottom {
|
||||
padding: 28rpx;
|
||||
display: flex;
|
||||
|
||||
.b_left {
|
||||
width: 103.39rpx;
|
||||
height: 94.63rpx;
|
||||
margin-right: 18rpx;
|
||||
}
|
||||
.b_left {
|
||||
width: 103.39rpx;
|
||||
height: 94.63rpx;
|
||||
margin-right: 18rpx;
|
||||
}
|
||||
|
||||
.b_right {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
flex-direction: column;
|
||||
.b_right {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
flex-direction: column;
|
||||
|
||||
.item {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
// margin: 18rpx 28rpx 0 28rpx;
|
||||
.item {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
// margin: 18rpx 28rpx 0 28rpx;
|
||||
|
||||
// &:last-child {
|
||||
// padding-bottom: 18rpx;
|
||||
// }
|
||||
// &:last-child {
|
||||
// padding-bottom: 18rpx;
|
||||
// }
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
}
|
||||
.left {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.right {
|
||||
font-size: 32rpx;
|
||||
font-weight: 400;
|
||||
color: #3274F9;
|
||||
line-height: 39rpx;
|
||||
.right {
|
||||
font-size: 32rpx;
|
||||
font-weight: 400;
|
||||
color: #3274f9;
|
||||
line-height: 39rpx;
|
||||
|
||||
.price {
|
||||
font-size: 25rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.price {
|
||||
font-size: 25rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
.personnel_list {
|
||||
// padding: 28rpx 0;
|
||||
padding-bottom: 28rpx;
|
||||
|
||||
.personnel_list {
|
||||
// padding: 28rpx 0;
|
||||
padding-bottom: 28rpx;
|
||||
.cards {
|
||||
margin: 0 auto;
|
||||
// margin-bottom: 28rpx;
|
||||
width: 694rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 30rpx;
|
||||
opacity: 1;
|
||||
overflow: hidden;
|
||||
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
|
||||
|
||||
.cards_head {
|
||||
padding: 28rpx;
|
||||
background-color: $theme-oa-color;
|
||||
color: white;
|
||||
height: 100rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.cards {
|
||||
margin: 0 auto;
|
||||
// margin-bottom: 28rpx;
|
||||
width: 694rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 30rpx;
|
||||
opacity: 1;
|
||||
overflow: hidden;
|
||||
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
|
||||
.cards_content {
|
||||
padding: 28rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
.cards_head {
|
||||
padding: 28rpx;
|
||||
background-color: $theme-oa-color;
|
||||
color: white;
|
||||
height: 100rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.left {
|
||||
text-align: center;
|
||||
// padding: 15rpx 25rpx;
|
||||
padding-top: 20rpx;
|
||||
|
||||
.cards_content {
|
||||
padding: 28rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
width: 160rpx;
|
||||
background-color: $theme-oa-color;
|
||||
color: white;
|
||||
border-radius: 40rpx;
|
||||
|
||||
.left {
|
||||
text-align: center;
|
||||
// padding: 15rpx 25rpx;
|
||||
padding-top: 20rpx;
|
||||
.cir {
|
||||
width: 120rpx;
|
||||
height: 120rpx;
|
||||
background-color: #ffffff;
|
||||
margin-left: 25rpx;
|
||||
border-radius: 120rpx;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
width: 160rpx;
|
||||
background-color: $theme-oa-color;
|
||||
color: white;
|
||||
border-radius: 40rpx;
|
||||
.right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
.cir {
|
||||
width: 120rpx;
|
||||
height: 120rpx;
|
||||
background-color: #ffffff;
|
||||
margin-left: 25rpx;
|
||||
border-radius: 120rpx;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
view {
|
||||
text:nth-child(2) {
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
|
||||
.right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
.status {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
color: white;
|
||||
text-align: center;
|
||||
padding: 10rpx 30rpx;
|
||||
border-radius: 30rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
view {
|
||||
.u_avatar {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
|
||||
text:nth-child(2) {
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
|
||||
.status {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
color: white;
|
||||
text-align: center;
|
||||
padding: 10rpx 30rpx;
|
||||
border-radius: 30rpx;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.u_avatar {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
}
|
||||
}
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -1,26 +1,26 @@
|
||||
let httpApiThree;
|
||||
let httpApi; // 总域名
|
||||
let httpApiTwo; // 物流系统域名
|
||||
let httpApi; // 总域名
|
||||
let httpApiTwo; // 物流系统域名
|
||||
|
||||
// const env = 'dev'; // 开发
|
||||
const env = 'prod'; // 生产
|
||||
// const env = 'dev'; // 开发
|
||||
const env = 'prod'; // 生产
|
||||
// const env = 'prew'; // 预上线
|
||||
|
||||
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' //测试环境
|
||||
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' //测试环境
|
||||
}
|
||||
|
||||
|
||||
|
||||
1040
pages.json
1040
pages.json
File diff suppressed because it is too large
Load Diff
@ -1,22 +1,24 @@
|
||||
<template>
|
||||
<view class="">
|
||||
<view class="card">
|
||||
<!-- <view class="item">
|
||||
<view class="price">{{c_money(card.total_price)}}</view>
|
||||
</view> -->
|
||||
<view class="item">
|
||||
<view class="item" v-if="card.is_show == true">
|
||||
<view>交易金额剩余池</view>
|
||||
<view class="price">{{c_money(card.transaction_pool)}}</view>
|
||||
<!-- <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
|
||||
<view class="price" v-else>0.00</view> -->
|
||||
<view class="price">{{ c_money(card.transaction_pool) }}</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view>目标完成金额</view>
|
||||
<!-- <view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view>
|
||||
<view class="price" v-else>0.00</view> -->
|
||||
<view class="price">{{c_money(card.day_money)}}</view>
|
||||
<view class="price">{{ c_money(card.day_money) }}</view>
|
||||
</view>
|
||||
<!-- <view class="item">
|
||||
<view>交易金额剩余池</view>
|
||||
<view class="price">{{c_money(card.transaction_pool)}}</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
|
||||
<!-- <view class="nav">
|
||||
<view class="title">账单流水</view>
|
||||
<view class="right">
|
||||
@ -26,7 +28,6 @@
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
|
||||
<view class="list">
|
||||
<!-- <view class="item" v-for="(item, index) in 10" :key="index">
|
||||
<view class="top">
|
||||
@ -50,262 +51,265 @@
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="item" v-for="(item, index) in list" :key="item.id">
|
||||
<view class="top">
|
||||
账单日期：{{item.create_time}}
|
||||
</view>
|
||||
<view class="top"> 账单日期：{{ item.create_time }} </view>
|
||||
<view class="t_bottom">
|
||||
<view class="order">订单编号：{{item.order_sn}}</view>
|
||||
<view class="price">交易额: {{item.total_price}}</view>
|
||||
<view class="order">订单编号：{{ item.order_sn }}</view>
|
||||
<view class="price">交易额: {{ item.total_price }}</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>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { Toast } from '../../libs/uniApi'
|
||||
import { taskOrderDetail } from "@/api/task.js"
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
card: {
|
||||
total_price: "0.00",
|
||||
status: 1,
|
||||
day_money: "0.00",
|
||||
transaction_pool: "0.00"
|
||||
},
|
||||
list: [],
|
||||
task_id: '',
|
||||
loadConfig: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
lastpage: '',
|
||||
loadingText: '努力加载中',
|
||||
loadmoreText: '轻轻上拉',
|
||||
nomoreText: '我也是有底线的~~',
|
||||
status: 'loadmore'
|
||||
},
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
options.task_id ? this.task_id = options.task_id : null;
|
||||
this.initLoad();
|
||||
},
|
||||
onShow() {},
|
||||
onReachBottom() {
|
||||
this.loadList();
|
||||
},
|
||||
methods: {
|
||||
navTo(url) {
|
||||
url ?
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
}) : Toast('暂未开放')
|
||||
import { Toast } from '../../libs/uniApi'
|
||||
import { taskOrderDetail } from "@/api/task.js"
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
card: {
|
||||
total_price: "0.00",
|
||||
status: 1,
|
||||
day_money: "0.00",
|
||||
transaction_pool: "0.00",
|
||||
is_show: true
|
||||
},
|
||||
async initLoad() {
|
||||
this.loadConfig.page = 1;
|
||||
this.loadConfig.status = "loadmore";
|
||||
this.list = [];
|
||||
await this.loadList();
|
||||
list: [],
|
||||
task_id: '',
|
||||
loadConfig: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
lastpage: '',
|
||||
loadingText: '努力加载中',
|
||||
loadmoreText: '轻轻上拉',
|
||||
nomoreText: '我也是有底线的~~',
|
||||
status: 'loadmore'
|
||||
},
|
||||
async loadList() {
|
||||
try {
|
||||
let that = this;
|
||||
if (this.loadConfig.status == "nomore") return;
|
||||
this.loadConfig.status = "loading"
|
||||
let res = await taskOrderDetail({
|
||||
page: this.loadConfig.page,
|
||||
limit: this.loadConfig.limit,
|
||||
id: this.task_id,
|
||||
// company_id: this.$store.state.app.userInfo.company_id
|
||||
})
|
||||
this.loadConfig.status = "loadmore";
|
||||
if (res.data?.list?.length == 0 || res.data?.list?.length < 25) {
|
||||
this.loadConfig.status = "nomore"
|
||||
} else {
|
||||
this.loadConfig.page++;
|
||||
}
|
||||
let extend = res.data?.extend;
|
||||
Object.keys(this.card).forEach((key)=>{
|
||||
if(extend?.transaction?.arr[key]!=null&&extend?.transaction?.arr[key]!=undefined)this.card[key] = extend?.transaction?.arr[key];
|
||||
})
|
||||
this.card.transaction_pool += this.card.total_price;
|
||||
this.list = [...this.list, ...res.data?.list]
|
||||
} catch (e) {
|
||||
this.loadConfig.status = "nomore"
|
||||
}
|
||||
},
|
||||
c_money(str){
|
||||
try{
|
||||
if(!isNaN(str)){
|
||||
typeof str != 'string' ? str = str.toFixed(2) : str = parseFloat(str).toFixed(2);
|
||||
}else str = '0.00'
|
||||
}catch(e){
|
||||
str = '0.00'
|
||||
}
|
||||
return '¥'+str;
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.initLoad().then(()=>{
|
||||
uni.stopPullDownRefresh()
|
||||
})
|
||||
}
|
||||
},
|
||||
onLoad (options) {
|
||||
options.task_id ? this.task_id = options.task_id : null;
|
||||
this.initLoad();
|
||||
},
|
||||
onShow () { },
|
||||
onReachBottom () {
|
||||
this.loadList();
|
||||
},
|
||||
methods: {
|
||||
navTo (url) {
|
||||
url ?
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
}) : Toast('暂未开放')
|
||||
},
|
||||
async initLoad () {
|
||||
this.loadConfig.page = 1;
|
||||
this.loadConfig.status = "loadmore";
|
||||
this.list = [];
|
||||
await this.loadList();
|
||||
},
|
||||
async loadList () {
|
||||
try {
|
||||
let that = this;
|
||||
if (this.loadConfig.status == "nomore") return;
|
||||
this.loadConfig.status = "loading"
|
||||
let res = await taskOrderDetail({
|
||||
page: this.loadConfig.page,
|
||||
limit: this.loadConfig.limit,
|
||||
id: this.task_id,
|
||||
// company_id: this.$store.state.app.userInfo.company_id
|
||||
})
|
||||
this.loadConfig.status = "loadmore";
|
||||
if (res.data?.list?.length == 0 || res.data?.list?.length < 25) {
|
||||
this.loadConfig.status = "nomore"
|
||||
} else {
|
||||
this.loadConfig.page++;
|
||||
}
|
||||
let extend = res.data?.extend;
|
||||
Object.keys(this.card).forEach((key) => {
|
||||
if (extend?.transaction?.arr[key] != null && extend?.transaction?.arr[key] != undefined) this.card[key] = extend?.transaction?.arr[key];
|
||||
})
|
||||
this.card.transaction_pool += this.card.total_price;
|
||||
this.list = [...this.list, ...res.data?.list]
|
||||
} catch (e) {
|
||||
this.loadConfig.status = "nomore"
|
||||
}
|
||||
},
|
||||
c_money (str) {
|
||||
try {
|
||||
if (!isNaN(str)) {
|
||||
typeof str != 'string' ? str = str.toFixed(2) : str = parseFloat(str).toFixed(2);
|
||||
} else str = '0.00'
|
||||
} catch (e) {
|
||||
str = '0.00'
|
||||
}
|
||||
return '¥' + str;
|
||||
}
|
||||
},
|
||||
onPullDownRefresh () {
|
||||
this.initLoad().then(() => {
|
||||
uni.stopPullDownRefresh()
|
||||
})
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.card {
|
||||
margin: 28rpx auto;
|
||||
width: 694rpx;
|
||||
height: 158rpx;
|
||||
background: #0122c7;
|
||||
border-radius: 18rpx 18rpx 18rpx 18rpx;
|
||||
opacity: 1;
|
||||
padding: 28rpx 12rpx;
|
||||
.card {
|
||||
margin: 28rpx auto;
|
||||
width: 694rpx;
|
||||
height: 158rpx;
|
||||
background: #0122c7;
|
||||
border-radius: 18rpx 18rpx 18rpx 18rpx;
|
||||
opacity: 1;
|
||||
padding: 28rpx 12rpx;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
|
||||
.item {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
font-size: 28rpx;
|
||||
flex: 1;
|
||||
border-right: 1px solid #fff;
|
||||
|
||||
.item {
|
||||
&:last-child {
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
.price {
|
||||
font-size: 42rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.nav {
|
||||
margin: 28rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
|
||||
.title {
|
||||
font-size: 32rpx;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
&:before {
|
||||
content: "";
|
||||
width: 6rpx;
|
||||
height: 26rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-right: 10rpx;
|
||||
display: inline-block;
|
||||
background-color: #0122c7;
|
||||
}
|
||||
}
|
||||
|
||||
.right {
|
||||
display: flex;
|
||||
|
||||
.btn {
|
||||
margin-left: 28rpx;
|
||||
}
|
||||
|
||||
.active {
|
||||
color: #0122c7;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.list {
|
||||
.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: #ff7c32;
|
||||
border-radius: 26rpx 26rpx 26rpx 26rpx;
|
||||
color: #fff;
|
||||
margin-right: 28rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
font-size: 28rpx;
|
||||
flex: 1;
|
||||
border-right: 1px solid #fff;
|
||||
|
||||
&:last-child {
|
||||
border-right: none;
|
||||
.text {
|
||||
font-size: 25rpx;
|
||||
font-weight: 400;
|
||||
color: #999999;
|
||||
line-height: 39rpx;
|
||||
|
||||
.t_item {
|
||||
display: flex;
|
||||
|
||||
&:nth-child(1) {
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.tips {
|
||||
font-size: 28rpx;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.price {
|
||||
font-size: 42rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 32rpx;
|
||||
font-weight: 500;
|
||||
color: #f02828;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.nav {
|
||||
margin: 28rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
|
||||
.title {
|
||||
font-size: 32rpx;
|
||||
font-weight: 500;
|
||||
.t_bottom {
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
|
||||
&:before {
|
||||
content: "";
|
||||
width: 6rpx;
|
||||
height: 26rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-right: 10rpx;
|
||||
display: inline-block;
|
||||
background-color: #0122c7;
|
||||
}
|
||||
}
|
||||
|
||||
.right {
|
||||
display: flex;
|
||||
|
||||
.btn {
|
||||
margin-left: 28rpx;
|
||||
}
|
||||
|
||||
.active {
|
||||
color: #0122c7;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.list {
|
||||
.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: #FF7C32;
|
||||
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;
|
||||
|
||||
&:nth-child(1) {
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.tips {
|
||||
font-size: 28rpx;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.price {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 32rpx;
|
||||
font-weight: 500;
|
||||
color: #F02828;
|
||||
}
|
||||
}
|
||||
|
||||
.t_bottom {
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.price {
|
||||
color: #FF7C32;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.price {
|
||||
color: #ff7c32;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Loading…
x
Reference in New Issue
Block a user