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

董国庆

2025-02-25 fe0ac2c205258d5bff70560940ee7f187024760b

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

 H5/pages.json

@@ -33,8 +33,7 @@
        {
            "path": "pages/add-progress/index",
            "style": {
                "navigationBarTitleText": "添加办理进度",
                "navigationBarBackgroundColor": "#ffffff"
                "navigationStyle": "custom"
            }
        }, {
            "path": "pages/work-detail/work-detail",

 H5/pages/add-progress/index.vue

@@ -1,5 +1,6 @@
<template>
    <view class="px-31 pt-38">
        <u-navbar placeholder title="办理进度" @leftClick="back"></u-navbar>
        <view v-if="Object.keys(info).length != 0" class="br-19 bs-1 pt-21 pb-35 px-27 bgcolor2">
            <view class="flex a-center j-between fs-23 lh-33 font-bold">
                <view>诉求号：{{ info.serialNumber }}</view>
@@ -106,24 +107,17 @@
            })
        },
        methods: {
            back() {
                uni.navigateBack({
                    delta: 2
                })
            },
            submit() {
                if (!this.describe) {
                    this.rulsFlag = true
                    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: '请上传视频'
                    })
                }
                let obj = {

 H5/pages/index/index.vue

@@ -176,7 +176,7 @@
            getMessagelist() {
                const data = {
                    pageNum: this.pageNum,
                    pageSize: 10
                    pageSize: 5
                }
                getMessagelist(data).then(resp => {
                    console.log(resp, '获取消息列表');

 H5/pages/list/list.vue

@@ -113,7 +113,7 @@
                    </view>

                    <view class="mt-19 flex wrap a-center">

                        <image v-for="(item1,index) in item.images" :key="index" :src="item1"

                            @click="previewImage(item.images,index)" class="br-19 w-142 h-154 mr-13 mb-10 shrink0"

                            @click.stop="previewImage(item.images,index)" class="br-19 w-142 h-154 mr-13 mb-10 shrink0"

                            mode="aspectFill"></image>

                    </view>

                </view>

@@ -124,10 +124,10 @@
                        创建时间：{{ item.createTime | formatTime }}

                    </view>

                    <view v-if="!(['3','5','7'].includes(item.status))" class="flex a-center j-center fs-23 mt-29 txt-center">

                        <view @click="addProgress(item.id)" class="h-58 lh-58 bgColor5 w-192 br-29 color10">

                        <view @click.stop="addProgress(item.id)" class="h-58 lh-58 bgColor5 w-192 br-29 color10">

                            添加办理进度

                        </view>

                        <view @click="addResult(item.id)" class="ml-38 h-58 lh-58 bgColor6 w-192 br-29 color8">

                        <view @click.stop="addResult(item.id)" class="ml-38 h-58 lh-58 bgColor6 w-192 br-29 color8">

                            办理结果录入

                        </view>

                    </view>


 H5/pages/progress/progress.vue

@@ -65,6 +65,12 @@
                </view>
            </view>
        </view>
        <view v-if="info.complaintProgresses.length == 0" class="mt-200">
            <image src="../../static/空空如也@2x.png" mode="widthFix" class="w100"></image>
            <view class="txt-center mt-94 fs-27 color9">
                暂无数据
            </view>
        </view>
        <view v-if="type" @tap="toAdd" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4">添加办理进度
        </view>
        <view class="safe-box"></view>
@@ -139,6 +145,10 @@
        color: #FFFFFF;
    }

    .color9 {
        color: #999999;
    }

    .bgcolor1 {
        background: linear-gradient(270deg, rgba(255, 241, 0, 0.5) 0%, rgba(255, 249, 172, 0.25) 48%, rgba(255, 255, 255, 0.2) 100%, #FFFFFF 100%);
    }