From cc01607ad15fa69ad52bc0c81e8cfdc4b7effed8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 30 五月 2025 17:16:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
wx/pages/report_details/report_details.vue | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 104 insertions(+), 16 deletions(-)
diff --git a/wx/pages/report_details/report_details.vue b/wx/pages/report_details/report_details.vue
index b86cfd2..96f51cb 100644
--- a/wx/pages/report_details/report_details.vue
+++ b/wx/pages/report_details/report_details.vue
@@ -82,7 +82,7 @@
<view class="box_tuihui" v-if="[10,11,12].includes(info.status)">
<view class="box_tuihui_label">
鏀舵璐︽埛淇℃伅纭
- <text>淇敼</text>
+ <text @click="openInfo">淇敼</text>
</view>
<view class="box_tuihui_list">
<view class="box_tuihui_list_row">
@@ -231,9 +231,9 @@
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type == 0"></image>
<video :src="item.fileurlFull" v-if="item.type == 1" />
</view>
- <view class="info_list_item_tu_up" @click="upload(2)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
+ <!-- <view class="info_list_item_tu_up" @click="upload(2)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
- </view>
+ </view> -->
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
@@ -249,9 +249,9 @@
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type === 0"></image>
<video :src="item.fileurlFull" v-if="item.type === 1"></video>
</view>
- <view class="info_list_item_tu_up" @click="upload(3)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
+ <!-- <view class="info_list_item_tu_up" @click="upload(3)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
- </view>
+ </view> -->
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
@@ -267,9 +267,9 @@
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type === 0"></image>
<video :src="item.fileurlFull" v-if="item.type === 1"></video>
</view>
- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
+ <!-- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
- </view>
+ </view> -->
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
@@ -285,9 +285,9 @@
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type === 0"></image>
<video :src="item.fileurlFull" v-if="item.type === 1"></video>
</view>
- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
+ <!-- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
- </view>
+ </view> -->
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
@@ -303,9 +303,9 @@
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type === 0"></image>
<video :src="item.fileurlFull" v-if="item.type === 1"></video>
</view>
- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
+ <!-- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
- </view>
+ </view> -->
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
@@ -320,9 +320,9 @@
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type === 0"></image>
<video :src="item.fileurlFull" v-if="item.type === 1"></video>
</view>
- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
+ <!-- <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
- </view>
+ </view> -->
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
<view class="info_list_item_tu_zw"></view>
@@ -405,6 +405,27 @@
content='鏄惁纭璧斾粯閲戦?'
@confirm="confirmPrice"
@cancel="show1 = false" />
+ <!-- 淇敼鏀舵淇℃伅 -->
+ <u-popup :show="show2" round="20" mode="bottom" closeable @close="show2 = false">
+ <view class="sk">
+ <view class="sk_head">
+ 淇敼鏀舵甯愭埛淇℃伅
+ </view>
+ <u--form :model="form" :rules="rules" ref="uForm">
+ <u-form-item label="寮�鎴烽摱琛�" labelWidth="80" required prop="receiveBank" borderBottom ref="item">
+ <u--input v-model="form.receiveBank" border="none" placeholder="璇疯緭鍏�"></u--input>
+ </u-form-item>
+ <u-form-item label="璐﹀彿" labelWidth="80" required prop="receiveAccount" borderBottom ref="item">
+ <u--input v-model="form.receiveAccount" border="none" placeholder="璇疯緭鍏�"></u--input>
+ </u-form-item>
+ <u-form-item label="鎴峰悕" labelWidth="80" required prop="receiveUserName" borderBottom ref="item">
+ <u--input v-model="form.receiveUserName" border="none" placeholder="璇疯緭鍏�"></u--input>
+ </u-form-item>
+ </u--form>
+ <view style="width: 100%; height: 40rpx;"></view>
+ <u-button type="primary" text="淇濆瓨" @click="submitInfo"></u-button>
+ </view>
+ </u-popup>
</view>
</template>
@@ -417,10 +438,36 @@
info: null,
show: false,
show1: false,
+ show2: false,
height: 'auto',
height1: 'auto',
height2: 'auto',
- fileList: []
+ fileList: [],
+ form: {
+ receiveBank: '',
+ receiveAccount: '',
+ receiveUserName: ''
+ },
+ rules: {
+ receiveBank: {
+ type: 'string',
+ required: true,
+ message: '璇疯緭鍏ュ紑鎴烽摱琛�',
+ trigger: ['blur']
+ },
+ receiveAccount: {
+ type: 'string',
+ required: true,
+ message: '璇疯緭鍏ヨ处鍙�',
+ trigger: ['blur']
+ },
+ receiveUserName: {
+ type: 'string',
+ required: true,
+ message: '璇疯緭鍏ユ埛鍚�',
+ trigger: ['blur']
+ }
+ }
};
},
onLoad(option) {
@@ -434,6 +481,26 @@
...mapState(['cookies'])
},
methods: {
+ openInfo() {
+ this.form.receiveBank = this.info.receiveBank
+ this.form.receiveAccount = this.info.receiveAccount
+ this.form.receiveUserName = this.info.receiveUserName
+ this.show2 = true
+ },
+ submitInfo() {
+ this.$refs.uForm.validate().then(res => {
+ this.$u.api.updReceiveInfo({
+ ...this.form,
+ id: this.id
+ }).then(res => {
+ this.show2 = false
+ uni.showToast({ title: '淇敼鎴愬姛', icon: 'success' })
+ this.getDetails()
+ })
+ }).catch(errors => {
+
+ })
+ },
queren() {
this.show1 = true
},
@@ -615,6 +682,20 @@
<style lang="scss" scoped>
.box {
width: 100%;
+ .sk {
+ width: 100%;
+ padding: 30rpx;
+ box-sizing: border-box;
+ .sk_head {
+ width: 100%;
+ height: 50rpx;
+ line-height: 50rpx;
+ text-align: center;
+ font-size: 34rpx;
+ color: #222222;
+ margin-bottom: 30rpx;
+ }
+ }
.meade {
width: 100%;
display: flex;
@@ -982,9 +1063,11 @@
.info_list_row {
width: 100%;
min-height: 80rpx;
+ padding-left: 50rpx;
display: flex;
align-items: flex-start;
margin-bottom: 40rpx;
+ position: relative;
&:last-child {
margin: 0 !important;
}
@@ -993,7 +1076,11 @@
width: 20rpx;
min-height: 80rpx;
margin-right: 20rpx;
- position: relative;
+ position: absolute;
+ top: 5rpx;
+ left: 0;
+ height: 100%;
+ // position: relative;
.info_list_row_xian_d {
width: 28rpx;
height: 28rpx;
@@ -1021,7 +1108,8 @@
}
}
.info_list_row_info {
- flex: 1;
+ // flex: 1;
+ width: 100%;
display: flex;
flex-direction: column;
.info_list_row_info_top {
--
Gitblit v1.9.3