From 208b5a9f559dd2c7298759fdfe37d07c926cbd4d Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 23 九月 2024 17:09:21 +0800
Subject: [PATCH] 完善提现
---
src/pages/company/index.vue | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/pages/company/index.vue b/src/pages/company/index.vue
index eb0c0ad..7a24b95 100644
--- a/src/pages/company/index.vue
+++ b/src/pages/company/index.vue
@@ -16,9 +16,9 @@
鎵撳崱鏃ユ湡锛歿{$util.formatDate(item.workDate)}}
</text>
</view>
- <view class="c-p-26">
+ <view class="c-p-18 chuany-font28">
<view class="chuany-flex chuany-justify-between">
- <text class="chuany-font34 ">
+ <text class="chuany-font32">
{{item.orderName}}
</text>
<view class="chuany-flex chuany-justify-between">
@@ -30,19 +30,22 @@
<!-- <up-tag text="宸茬‘璁�" shape="circle" type="success" plain plainFill size='mini'></up-tag> -->
</view>
</view>
- <view class="c-p-t-14">
- 濮撳悕锛歿{item.workerUserName}}
+ <view class="text-69">
+ <view class="c-p-t-8">
+ 濮撳悕锛歿{item.workerUserName}}
+ </view>
+ <view class="c-p-t-8">
+ 鎵撳崱璁板綍锛歿{item.dakaMingxi}}
+ </view>
</view>
- <view class="c-p-t-14">
- 鎵撳崱璁板綍锛歿{item.dakaMingxi}}
- </view>
- <view class="chuany-flex chuany-justify-between chuany-flex-wrap">
- <view class="chuany-width48 c-p-t-14">
+
+ <view class="chuany-flex chuany-justify-between chuany-flex-wrap text-69 c-p-t-8">
+ <view class="chuany-width48">
<text>
鏂瑰紡锛歿{item.workerTypeName}}
</text>
</view>
- <view class="chuany-width48 chuany-flex c-p-t-14">
+ <view class="chuany-width48 chuany-flex">
<text>
宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
</text>
@@ -52,7 +55,7 @@
<text v-else>{{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}</text> -->
</view>
- <view class="chuany-width48 chuany-flex c-p-t-14">
+ <view class="chuany-width48 chuany-flex c-p-t-8">
<text>
鏃堕暱锛�
</text>
@@ -61,7 +64,7 @@
border="surround" v-model="item.workTime"></up-input>
</view>
- <view class="chuany-width48 chuany-flex c-p-t-14" v-if="item.workerType==1">
+ <view class="chuany-width48 chuany-flex c-p-t-8" v-if="item.workerType==1">
<text>
鏁伴噺锛�
</text>
@@ -69,7 +72,7 @@
@blur='(val) => {item.todaySalary=$util.roundToTwo(item.workCount*item.workPrice)}'
v-model="item.workCount"></up-input>
</view>
- <view class="chuany-width48 chuany-flex c-p-t-14">
+ <view class="chuany-width48 chuany-flex c-p-t-8">
<text>
宸ヨ祫锛�
</text>
@@ -77,10 +80,11 @@
v-model="item.todaySalary"></up-input>
<!-- <text v-else>{{item.todaySalary}} 鍏�</text> -->
</view>
- <view class="chuany-width48 c-p-t-14">
+ <view class="chuany-width48 c-p-t-8">
<view class="chuany-width10">
- <up-button class="button-layout__item" :text="item.isShenPiName!=='宸茬粨绠�'?'纭':'淇敼'" size="mini"
- :loading='item.isLoading' :loadingText="item.isShenPiName!=='宸茬粨绠�'?'纭涓�':'淇敼涓�'"
+ <up-button class="button-layout__item" :text="item.isShenPiName!=='宸茬粨绠�'?'纭':'淇敼'"
+ size="mini" :loading='item.isLoading'
+ :loadingText="item.isShenPiName!=='宸茬粨绠�'?'纭涓�':'淇敼涓�'"
@tap.stop='saveDakaDetailCompany(item)' type="warning"></up-button>
</view>
</view>
@@ -153,14 +157,15 @@
obj.workCount = item.workCount
}
item.isLoading = true
+ console.log(item.isShenPiName, 'item.isShenPiName鈥�');
this.$api.saveDakaDetailCompany(obj).then(res => {
if (res.code == 1) {
this.$util.showToast({
- title: '纭鎴愬姛锛�',
+ title: item.isShenPiName == '宸茬粨绠�' ? '淇敼鎴愬姛锛�' : '纭鎴愬姛锛�',
icon: 'success'
})
this.PostMyComDakaListPage();
- }else {
+ } else {
this.$util.showToast({
title: res.error ? res.error : '澶辫触锛�'
})
@@ -195,10 +200,10 @@
if (this.pageIndex == 1) {
this.viewList = res.data.items
} else {
- this.viewList.concat(...res.data.items)
+ this.viewList = this.viewList.concat(...res.data.items)
}
console.log(this.viewList, this.viewList.length, 'this.viewList');
- this.viewList.forEach(item=>{
+ this.viewList.forEach(item => {
item.isLoading = false
})
// totalPages.value = res.data.totalCount
--
Gitblit v1.9.1