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

Merge branch 'main' of https://gitea.lihaink.cn/mkm/OfficeApp

Browse Source
This commit is contained in:
weipengfei 2023-09-13 16:45:07 +08:00
commit 33205f116c
5 changed files with 1105 additions and 1032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/logistiComptent/logistiCard/logistiCard.vue
View File

@ -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"
})
})
},

114
components/task/taskItem.vue
View File

@ -1,6 +1,5 @@
<template>
<view class="c_task_item" @click="clickTask">
<view class="personnel_list">
<view class="cards">
<view class="cards_head">
@ -8,43 +7,111 @@
<text>点击查看</text>
</view>
<view class="cards_content">
<view class="right" style="width: 100%;">
<view class="" style="display: flex;">
<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)">
<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)}}
{{
(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> -->
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-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
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>
<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>
<text> {{ datas.money + "元" || "0.00" }} </text>
</view>
</view>
</view>
@ -98,7 +165,6 @@
</view>
</view>
-->
</view>
</template>
@ -198,7 +264,7 @@
display: flex;
justify-content: space-between;
padding: 28rpx;
border-bottom: 1rpx solid #F5F5F5FF;
border-bottom: 1rpx solid #f5f5f5ff;
.left {
display: flex;
@ -246,7 +312,7 @@
.right {
font-size: 32rpx;
font-weight: 400;
color: #3274F9;
color: #3274f9;
line-height: 39rpx;
.price {
@ -256,14 +322,12 @@
}
}
}
}
.personnel_list {
// padding: 28rpx 0;
padding-bottom: 28rpx;
.cards {
margin: 0 auto;
// margin-bottom: 28rpx;
@ -314,7 +378,6 @@
justify-content: space-between;
view {
text:nth-child(2) {
margin-left: 20rpx;
}
@ -326,7 +389,6 @@
text-align: center;
padding: 10rpx 30rpx;
border-radius: 30rpx;
}
}
}

2
pages.json
View File

@ -558,7 +558,7 @@
"path": "property/index",
"style": {
"navigationBarTitleText": "资产管理",
"enablePullDownRefresh": false,
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#0122C7",
"navigationBarTextStyle": "white"
}

38
subpkg/blockTransaction/blockTransaction.vue
View File

@ -1,11 +1,10 @@
<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" 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">
@ -14,9 +13,12 @@
<view class="price" v-else>0.00</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,16 +51,18 @@
</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>
</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>
@ -74,7 +77,8 @@
total_price: "0.00",
status: 1,
day_money: "0.00",
transaction_pool: "0.00"
transaction_pool: "0.00",
is_show: true
},
list: [],
task_id: '',
@ -232,7 +236,7 @@
margin-bottom: 28rpx;
width: 694rpx;
// height: 238rpx;
background: #FFFFFF;
background: #ffffff;
border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1;
padding: 28rpx;
@ -246,12 +250,12 @@
&:before {
display: inline-block;
content: '交易明细';
content: "交易明细";
width: 137rpx;
height: 49rpx;
line-height: 49rpx;
text-align: center;
background: #FF7C32;
background: #ff7c32;
border-radius: 26rpx 26rpx 26rpx 26rpx;
color: #fff;
margin-right: 28rpx;
@ -288,7 +292,7 @@
align-items: center;
font-size: 32rpx;
font-weight: 500;
color: #F02828;
color: #f02828;
}
}
@ -302,7 +306,7 @@
flex-wrap: wrap;
.price {
color: #FF7C32;
color: #ff7c32;
flex-shrink: 0;
}
}