Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

pyt

2025-02-25 46d364569cd4a3fff3b8a6b908bd357a3845bc83

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

 H5/pages/index/index.vue

@@ -19,7 +19,7 @@
        </view>
        <view class="pt-38 pl-31 pr-31 flex flex-column">
            <view class="flex j-between a-center">
                <text class="color1 fs-31">工作台</text>
                <text class="color1 fs-31 font-bold">工作台</text>
                <text class="color2 fs-27" @click="showData =!showData">查看更多</text>
            </view>
            <view class="flex flex-wrap j-between">
@@ -176,7 +176,7 @@
            getMessagelist() {
                const data = {
                    pageNum: this.pageNum,
                    pageSize: 10
                    pageSize: 5
                }
                getMessagelist(data).then(resp => {
                    console.log(resp, '获取消息列表');

 H5/pages/work-detail/postpone-apply.vue

@@ -128,18 +128,18 @@
                        title: '请输入办理进度描述'
                    })
                }
                if (this.imgUrls.length == 0) {
                    return uni.showToast({
                        icon: 'none',
                        title: '请上传图片'
                    })
                }
                if (this.video.length == 0) {
                    return uni.showToast({
                        icon: 'none',
                        title: '请上传视频'
                    })
                }
                // if (this.imgUrls.length == 0) {
                //     return uni.showToast({
                //         icon: 'none',
                //         title: '请上传图片'
                //     })
                // }
                // if (this.video.length == 0) {
                //     return uni.showToast({
                //         icon: 'none',
                //         title: '请上传视频'
                //     })
                // }
                this.showPop = true

            },
@@ -147,8 +147,8 @@
                let obj = {
                    complaintId: this.complaintId,
                    comment: this.describe,
                    images: this.imgUrls.join(','),
                    videos: this.video.join(',')
                    images: this.imgUrls.length > 0 ? this.imgUrls.join(',') : '',
                    videos: this.video.length > 0 ? this.video.join(',') : ''
                }
                saveProcess(obj).then(res => {
                    if (res.code == 200) {