From 63ecd83a0f17442cb1ce3b497f4c7932fda4177f Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期五, 23 五月 2025 20:42:47 +0800
Subject: [PATCH] 修改
---
H5/pages/supervision/supervision.vue | 13 +++++-
H5/pages/supervision/supervision-progress.vue | 9 +++-
H5/pages/work-detail/work-detail.vue | 44 ++++++++++++++++++++--
H5/pages/supervision/edit-supervision-progress.vue | 7 +++
H5/main.js | 4 +-
5 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/H5/main.js b/H5/main.js
index 4622693..966b093 100644
--- a/H5/main.js
+++ b/H5/main.js
@@ -7,8 +7,8 @@
const jweixin = require('jweixin-module')
window.wx = {}
/*引入，注释可关闭*/
-import vconsole from "vconsole";
-Vue.prototype.vconsole = new vconsole();
+// import vconsole from "vconsole";
+// Vue.prototype.vconsole = new vconsole();
Vue.config.productionTip = false
Vue.prototype.$store = store
Vue.prototype.$jweixin = jweixin
diff --git a/H5/pages/supervision/edit-supervision-progress.vue b/H5/pages/supervision/edit-supervision-progress.vue
index 01be03c..a74177a 100644
--- a/H5/pages/supervision/edit-supervision-progress.vue
+++ b/H5/pages/supervision/edit-supervision-progress.vue
@@ -73,7 +73,8 @@
<image @tap="uploadImg(2)" src="@/static/Appeal/add.png" class="w-140 h-140 shrink0" />
</view>
</view>
- <view @click.stop="submit" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed zIndex1000"
+ <view @click.stop="submit"
+ class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed zIndex99999"
style="width: calc(100% - 62rpx);bottom: calc(env(safe-area-inset-bottom) + 10rpx);">确认</view>
<view class="btn-box"></view>
<view class="safe-box"></view>
@@ -293,6 +294,10 @@
</script>
<style scoped lang="scss">
+ .zIndex99999 {
+ z-index: 999999 !important;
+ }
+
.bs-1 {
box-shadow: 0rpx 0rpx 27rpx 0rpx rgba(0, 0, 0, 0.1);
}
diff --git a/H5/pages/supervision/supervision-progress.vue b/H5/pages/supervision/supervision-progress.vue
index bfe207a..1a7f4c7 100644
--- a/H5/pages/supervision/supervision-progress.vue
+++ b/H5/pages/supervision/supervision-progress.vue
@@ -85,7 +85,8 @@
暂无数据
</view>
</view>
- <view v-if="type" @tap="toAdd" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed"
+ <view v-if="type" @tap="toAdd"
+ class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed zIndex99999"
style="width: calc(100% - 62rpx);bottom: calc(env(safe-area-inset-bottom) + 10rpx);">添加办理进度
</view>
<CustomPopup ref="customPopup" closeText="取消" @comfirm="deleteProgress">
@@ -143,7 +144,7 @@
icon: 'none',
mask: true,
title: '删除办理进度成功',
- duration:2000
+ duration: 2000
})
setTimeout(() => {
getComplaintDetail({
@@ -191,6 +192,10 @@
</script>
<style scoped lang="scss">
+ .zIndex99999 {
+ z-index: 999999 !important;
+ }
+
.bs-1 {
box-shadow: 0rpx 0rpx 27rpx 0rpx rgba(0, 0, 0, 0.1);
}
diff --git a/H5/pages/supervision/supervision.vue b/H5/pages/supervision/supervision.vue
index 53cecc3..b00f7e4 100644
--- a/H5/pages/supervision/supervision.vue
+++ b/H5/pages/supervision/supervision.vue
@@ -250,9 +250,16 @@
});
},
toDetailProgress(item) {
- uni.navigateTo({
- url: `/pages/supervision/supervision-progress?id=${this.type==1?item.id :item.complaintId}`
- })
+ if (this.type == 1) {
+ uni.navigateTo({
+ url: `/pages/supervision/supervision-progress?id=${this.type==1?item.id :item.complaintId}`
+ })
+ } else {
+ uni.navigateTo({
+ url: `/pages/work-detail/work-detail?id=${item.complaintId}`
+ })
+ }
+
},
fetchList(params, callback) {
if (this.status == 'loading') return
diff --git a/H5/pages/work-detail/work-detail.vue b/H5/pages/work-detail/work-detail.vue
index 91f1dc2..62795be 100644
--- a/H5/pages/work-detail/work-detail.vue
+++ b/H5/pages/work-detail/work-detail.vue
@@ -371,7 +371,8 @@
<view class="popup-content">
<view class="title-pop">操作驳回</view>
<view class="pop-textArea">
- <u--textarea v-model="rejectText" placeholder="请输入驳回原因"></u--textarea>
+ <textarea placeholder-class="noticeTxt" v-model="rejectText" placeholder="请输入驳回原因"
+ style="width: 98%;height: 90%;"></textarea>
</view>
<view class="botton-btn">
<view class="cancle" @click.stop="showPop = false">取消</view>
@@ -1344,6 +1345,9 @@
width: 576.92rpx;
// height: 425rpx;
border-radius: 19rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
.title-pop {
font-family: PingFangSC, PingFang SC;
@@ -1356,10 +1360,42 @@
}
.pop-textArea {
- padding: 34rpx 44rpx 0 44rpx;
- margin: 2rpx;
+ padding: 34rpx 0rpx 0 0px;
+ height: 230rpx !important;
+ width: 530.92rpx;
+ // box-sizing: border-box;
- ::v-deep .u-textarea {}
+ // padding-left: 20rpx;
+ // width: 500rpx;
+ ::v-deep .uni-textarea {
+ margin-left: 30rpx;
+ display: inline-block;
+ box-sizing: border-box;
+ width: 530.92rpx !important;
+ }
+
+ .noticeTxt {
+ padding-left: 30rpx;
+ padding-top: 20rpx;
+ font-size: 27rpx;
+ }
+
+ ::v-deep .uni-textarea-compute {
+ margin-left: 30rpx !important;
+ }
+
+
+ ::v-deep .uni-textarea-textarea {
+ margin: 4rpx 4rpx 4px 10rpx !important;
+ padding: 20rpx !important;
+ // height: 200rpx !important;
+ // width: 300rpx !important;
+ border: 1rpx solid #666160 !important;
+ width: 96%;
+ height: 95%;
+ font-size: 27rpx;
+ box-sizing: border-box;
+ }
}
--
Gitblit v1.7.1