董国庆
2025-02-28 eb2b9200aa356fd5423b69cf1615ce4d9fcd25a0
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
1个文件已添加
6个文件已修改
59 ■■■■■ 已修改文件
H5/.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/Appeal/Appeal.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/add-progress/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/progress/progress.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/result-entry/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/postpone-apply.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/work-detail.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/.gitignore
New file
@@ -0,0 +1 @@
unpackage
H5/pages/Appeal/Appeal.vue
@@ -232,12 +232,6 @@
                        icon: 'none'
                    })
                    return
                } else if (!this.descriptionContent) {
                    uni.showToast({
                        title: '请输入问题描述',
                        icon: 'none'
                    })
                    return
                }
                const data = {
                    time: this.time,
H5/pages/add-progress/index.vue
@@ -35,7 +35,7 @@
                <image src="@/static/noNull.png" class="w-35 h-35 mr-13 shrink0" />
                <view class="fs-23 color99">办理进度描述不能为空</view>
            </view>
            <view class="fs-27 mt-38 lh-38 font-bold">图片</view>
            <view class="fs-27 mt-38 lh-38 font-bold">上传图片</view>
            <view class="flex wrap mt-27">
                <view class="relative mr-15" v-for="(item, index) in localImageUrls" :key="index">
                    <image v-if="item != 'loading'" :src="item" class="w-140 h-140 shrink0 br-8" />
@@ -52,7 +52,7 @@
                </view>
                <image @tap="uploadImg(1)" src="/static/Appeal/add.png" class="w-140 h-140 shrink0" />
            </view>
            <view class="fs-27 mt-37 lh-38 font-bold">视频</view>
            <view class="fs-27 mt-37 lh-38 font-bold">上传视频</view>
            <view class="flex wrap mt-27">
                <view class="imgOrVedio" v-for="(ite, ind) in video" :key="ind">
                    <video v-if="ite != 'loading'" id="myVideo" class="videoImg shrink0" disabled :controls="false"
@@ -73,7 +73,9 @@
                <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">确认添加</view>
        <view @click.stop="submit" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed"
            style="width: calc(100% - 62rpx);bottom: calc(env(safe-area-inset-bottom) + 10rpx);">确认添加</view>
        <view class="btn-box"></view>
        <view class="safe-box"></view>
    </view>
</template>
@@ -384,4 +386,8 @@
    .zIndex999 {
        z-index: 999;
    }
    .btn-box {
        height: 120rpx;
    }
</style>
H5/pages/progress/progress.vue
@@ -78,8 +78,10 @@
                暂无数据
            </view>
        </view>
        <view v-if="type" @tap="toAdd" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4">添加办理进度
        <view v-if="type" @tap="toAdd" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed"
            style="width: calc(100% - 62rpx);bottom: calc(env(safe-area-inset-bottom) + 10rpx);">添加办理进度
        </view>
        <view class="btn-box"></view>
        <view class="safe-box"></view>
    </view>
</template>
@@ -103,16 +105,18 @@
                return dayjs(val).format('YYYY-MM-DD HH:mm:ss')
            }
        },
        onShow(params) {
            this.id = params.id
        onLoad(params) {
            if (params.type) {
                this.type = false
                uni.setNavigationBarTitle({
                    title: '办理进度'
                })
            }
            this.id = params.id
        },
        onShow(params) {
            getComplaintDetail({
                id: params.id
                id: this.id
            }).then(res => {
                this.info = {
@@ -326,4 +330,8 @@
    #myVideo {
        z-index: 1;
    }
    .btn-box {
        height: 120rpx;
    }
</style>
H5/pages/result-entry/index.vue
@@ -124,7 +124,7 @@
                    <image src="@/static/noNull.png" class="w-35 h-35 mr-13 shrink0" />
                    <view class="fs-23 color99">办结结果描述不能为空</view>
                </view>
                <view class="fs-27 mt-38 lh-38 font-bold">图片</view>
                <view class="fs-27 mt-38 lh-38 font-bold">上传图片</view>
                <view class="flex wrap mt-27">
                    <view class="relative mr-15" v-for="(item, index) in localImageUrls" :key="index">
                        <image v-if="item != 'loading'" :src="item" class="w-140 h-140 shrink0 br-8" />
@@ -142,7 +142,7 @@
                    </view>
                    <image @tap="uploadImg(1)" src="/static/Appeal/add.png" class="w-140 h-140 shrink0" />
                </view>
                <view class="fs-27 mt-37 lh-38 font-bold">视频</view>
                <view class="fs-27 mt-37 lh-38 font-bold">上传视频</view>
                <view class="flex wrap mt-27">
                    <view class="imgOrVedio" v-for="(ite, ind) in completionVideos" :key="ind">
                        <video v-if="ite != 'loading'" id="myVideo" class="videoImg shrink0" disabled :controls="false"
@@ -168,7 +168,9 @@
                    style="height: 365rpx;width: calc(100% - 31rpx);" placeholder="请输入补充说明内容" /> -->
            </view>
        </view>
        <view @click.stop="submit" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4">提交办结结果</view>
        <view @click.stop="submit" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed"
            style="width: calc(100% - 62rpx);bottom: calc(env(safe-area-inset-bottom) + 10rpx);">提交办结结果</view>
        <view class="btn-box"></view>
        <view class="safe-box"></view>
        <u-picker :show="showList" :columns="columns" @confirm="confirm" @cancel="cancel"></u-picker>
    </view>
@@ -585,4 +587,8 @@
        font-size: 30rpx;
        color: #FF4948 !important;
    }
    .btn-box {
        height: 120rpx;
    }
</style>
H5/pages/work-detail/postpone-apply.vue
@@ -73,8 +73,10 @@
                <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">提交延期申请
        <view @click.stop="submit" class="mt-38 fs-35 lh-96 br-48 txt-center font-bold bgcolor6 color4 fixed"
            style="width: calc(100% - 62rpx);bottom: calc(env(safe-area-inset-bottom) + 10rpx);">提交延期申请
        </view>
        <view class="btn-box"></view>
        <view class="safe-box"></view>
        <u-popup round="19rpx" :show="showPop" mode="center" @close="close" @open="open">
            <view class="popup-content">
@@ -469,4 +471,8 @@
            cursor: pointer;
        }
    }
    .btn-box {
        height: 120rpx;
    }
</style>
H5/pages/work-detail/work-detail.vue
@@ -149,8 +149,8 @@
            <view class="problem">
                <view class="title">问题描述</view>
                <view class="desc">
                    <view class="top">{{ orderInfo.descriptionTitle || "" }}</view>
                    <view class="line1"></view>
                    <!-- <view class="top">{{ orderInfo.descriptionTitle || "" }}</view> -->
                    <!-- <view class="line1"></view> -->
                    <view class="context">{{ orderInfo.descriptionContent || '' }}</view>
                </view>