hejianhao
2025-02-26 70bb0198e17336355d698f7242e0ba85165a1bec
修改bug
11个文件已修改
1个文件已添加
242 ■■■■■ 已修改文件
H5/config/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/manifest.json 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages.json 78 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/Appeal/Appeal.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/add-progress/index.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/index/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/location/location.vue 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/location/service.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/progress/progress.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/result-entry/index.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/maxVideo.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/work-detail.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/config/index.js
@@ -1,4 +1,5 @@
export default {
    // BASE_URL: 'https://huacheng.psciio.com',
    BASE_URL: 'http://192.168.110.188:6194',
    imageUrl: 'https://huacheng.psciio.com/api/huacheng-applets/common/uploadimages',
}
H5/manifest.json
@@ -1,6 +1,6 @@
{
    "name": "三个身边",
    "appid": "",
    "appid": "__UNI__5950066",
    "description": "",
    "versionName": "1.0.0",
    "versionCode": "100",
@@ -76,6 +76,9 @@
            "treeShaking": {
                "enable": false
            }
        },
        "router": {
            "base": "./"
        }
    }
}
H5/pages.json
@@ -1,51 +1,52 @@
{
    "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
    {
        "path": "pages/index/index",
        "style": {
            "navigationBarTitleText": "首页",
            "navigationStyle": "custom"
        }
    },
    {
        "path": "pages/list/list",
        "style": {
            "navigationBarTitleText": "诉求列表",
            "navigationBarBackgroundColor": "#fff"
        }
    },
    {
        "path": "pages/delay/delay",
        "style": {
            "navigationBarTitleText": "延期情况说明",
            "navigationBarBackgroundColor": "#fff"
        }
    },
    {
        "path": "pages/progress/progress",
        "style": {
            "navigationBarTitleText": "办理进度",
            "navigationBarBackgroundColor": "#fff"
        }
    },
        {
            "path": "pages/index/index",
            "style": {
                "navigationBarTitleText": "首页",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/list/list",
            "style": {
                "navigationBarTitleText": "诉求列表",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/delay/delay",
            "style": {
                "navigationBarTitleText": "延期情况说明",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/progress/progress",
            "style": {
                "navigationBarTitleText": "办理进度",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/add-progress/index",
            "style": {
                "navigationBarTitleText": "办理进度",
                "navigationStyle": "custom"
            }
        }, {
            "path": "pages/work-detail/work-detail",
            "style": {
                "navigationBarBackgroundColor": "#ffffff",
                "navigationBarTitleText": "诉求详情",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/work-detail/maxVideo",
            "style": {
                "navigationBarBackgroundColor": "#000000",
                "navigationBarTitleText": "播放视频",
                "navigationStyle": "custom"
            }
        },
@@ -53,26 +54,27 @@
            "path": "pages/problemReporting/problemReporting",
            "style": {
                "navigationBarTitleText": "问题上报",
                "navigationBarBackgroundColor": "#ffffff"
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/dispatchWorkOrder/dispatchWorkOrder",
            "style": {
                "navigationBarTitleText": "工单下派",
                "navigationBarBackgroundColor": "#ffffff"
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/Appeal/Appeal",
            "style": {
                "navigationBarTitleText": "诉求录入",
                "navigationBarBackgroundColor": "#ffffff"
                // "navigationBarTitleText": "诉求录入",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/location/location",
            "style": {
                "navigationBarTitleText": "选择地点",
                "navigationStyle": "custom"
            }
        },
@@ -80,21 +82,21 @@
            "path": "pages/result-entry/index",
            "style": {
                "navigationBarTitleText": "办结结果录入",
                "navigationBarBackgroundColor": "#ffffff"
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/work-detail/postpone-apply",
            "style": {
                "navigationBarTitleText": "延期申请",
                "navigationBarBackgroundColor": "#ffffff"
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/progress/progress",
            "style": {
                "navigationBarTitleText": "办理进度录入",
                "navigationBarBackgroundColor": "#ffffff"
                "navigationStyle": "custom"
            }
        }
    ],
H5/pages/Appeal/Appeal.vue
@@ -4,10 +4,7 @@
            <view class="card  flex a-center h-108 j-between">
                <text class="w-108 fs-27 font-bold mr-85">发生时间</text>
                <view class=" flex a-center j-between flex1" @click="showDate=true">
                    <view class=" flex a-center j-between flex1" @click="showList=true">
                    <view class=" flex a-center j-between flex1">
                        <view class="flex1" v-if="time">
                            {{time}}
                        </view>
@@ -16,8 +13,6 @@
                        </view>
                        <image src="/static/Appeal/left.png" class="w-19 h-19" mode=""></image>
                    </view>
                </view>
            </view>
            <view class="card  flex a-center h-108 j-between">
@@ -148,6 +143,11 @@
                videos: [],
            };
        },
        onReady() {
            uni.setNavigationBarTitle({
                title: '诉求录入'
            })
        },
        onLoad() {
            this.getproblem()
        },
H5/pages/add-progress/index.vue
@@ -1,6 +1,5 @@
<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>
@@ -158,7 +157,7 @@
                })
            },
            uploadImg(type) {
                if (!this.againCklicFlag) return
                // if (!this.againCklicFlag) return
                this.againCklicFlag = false
                if (type == 1) {
                    uni.chooseImage({
@@ -209,6 +208,9 @@
                                })
                            }
                        },
                        fail: () => {
                            this.againCklicFlag = true
                        }
                    })
                } else {
                    uni.chooseVideo({
@@ -254,6 +256,9 @@
                                    })
                                }
                            })
                        },
                        fail: () => {
                            this.againCklicFlag = true
                        }
                    })
                }
H5/pages/index/index.vue
@@ -73,6 +73,10 @@
                    </view>
                </view>
                <view class="list mt-29">
                    <view v-if="isactive==1?msgList.length == 0:msgLists.length == 0" class="txt-center">
                        <image src="../../static/空空如也@2x.png" mode="widthFix" class="w80"></image>
                        <view class="fs-23 mt-20 mb-20 color4">暂无数据</view>
                    </view>
                    <view class="flex a-center mb-27" v-for="item in isactive==1?msgList:msgLists" :key="item.id">
                        <view class="avater pb-33">
                            <image class="w-85 h-85 br50" src="/static/home/img9.png" mode=""></image>
@@ -94,7 +98,8 @@
                            </view>
                        </view>
                    </view>
                    <text class="flex j-center fs-27 color4 pb-48" @click="Allread">全部已读</text>
                    <text v-if="isactive==1?msgList.length > 0:msgLists.length > 0"
                        class="flex j-center fs-27 color4 pb-48" @click="Allread">全部已读</text>
                </view>
@@ -149,7 +154,7 @@
        },
        onLoad(e) {
            if (e.token) {
                uni.setStorageSync('token', 'Bearer ' + token)
                uni.setStorageSync('token', 'Bearer ' + e.token)
            }
            this.getBanner()
            this.getMessagelist()
@@ -385,7 +390,7 @@
    }
    .bg-img {
        height: 648rpx;
        height: 550rpx;
    }
    .swiper {
H5/pages/location/location.vue
@@ -1,10 +1,8 @@
<template>
    <view class="content">
        <u-navbar title="选择地点" bgColor="transparent" titleStyle="font-size: 35rpx;font-weight:bold;" placeholder>
            <view slot="left" @click="back">
                <image src="/static/location/back.png" class="w-19 h-35" mode=""></image>
            </view>
        </u-navbar>
        <view slot="left" @click="back">
            <image src="/static/location/back.png" class="w-19 h-35" mode=""></image>
        </view>
        <view class="" id="container">
        </view>
@@ -24,8 +22,9 @@
            </view>
            <view class="card" @click="changeAdr(item.id,item)" :class="item.id ==uid ?'activecard':''"
                v-for="item in locationList" :key="item.id">
                <text>{{item.address}}</text>
                <text class="font-w500 fs-23 mt-25" style="color: rgba(0, 0, 0, 0.6);">{{item.address}}</text>
                <text>{{item.title || item.name}}</text>
                <text class="font-w500 fs-23 mt-25"
                    style="color: rgba(0, 0, 0, 0.6);">{{item.address || item.name}}</text>
            </view>
        </view>
@@ -34,6 +33,9 @@
</template>
<script>
    import {
        searchLocation
    } from './service'
    export default {
        data() {
            return {
@@ -44,29 +46,35 @@
                keyword: '',
                locationList: [],
                city: '攀枝花市',
                markers:[],
                markers: [],
            };
        },
        methods: {
 clearMarkers() {
            // 清除所有标点
            this.markers.forEach((marker) => {
                this.map.removeOverlay(marker);
            });
            this.markers = []; // 清空存储标点的数组
        },
            clearMarkers() {
                // 清除所有标点
                this.markers.forEach((marker) => {
                    this.map.removeOverlay(marker);
                });
                this.markers = []; // 清空存储标点的数组
            },
            back() {
                uni.navigateBack()
            },
            changeAdr(value, addr) {
                console.log(value, addr, 'asdasdada');
                this.uid = value
                const pages = getCurrentPages()
                let prevPage = pages[pages.length - 2];
                prevPage.location = addr.address
                prevPage.latitude = addr.point.lat
                prevPage.longitude = addr.point.lng
                if (addr.point) {
                    prevPage.latitude = addr.point.lat
                    prevPage.longitude = addr.point.lng
                }
                if (addr.location) {
                    prevPage.latitude = addr.location.lat
                    prevPage.longitude = addr.location.lng
                }
                prevPage.location = addr.address || addr.name
                setTimeout(() => {
                    uni.navigateBack()
                }, 200)
@@ -74,6 +82,24 @@
            // 搜索地点
            searchLocation() {
                if (!this.keyword) return;
                searchLocation({
                    query: this.keyword,
                    location: `${this.latitude},${this.longitude }`,
                }).then(res => {
                    if (res.code == 200) {
                        this.searchResults = res.data;
                        if (res.data.length > 0) {
                            this.latitude = res.data[0].location.lat
                            this.longitude = res.data[0].location.lng
                        }
                        this.locationList = res.data.map((result, index) => {
                            result.id = index + 1
                            return result
                        });
                        console.log(this.locationList);
                    }
                })
                return
                uni.request({
                    url: `https://api.map.baidu.com/place/v2/search`,
                    method: 'GET',
@@ -165,7 +191,7 @@
                    item.id = index + 1
                    return item
                })
                console.log(this.locationList);
            })
            this.map.addEventListener('click', (e) => {
                this.clearMarkers()
H5/pages/location/service.js
New file
@@ -0,0 +1,6 @@
import request from '@/utils/request.js'
// 地点搜索
export const searchLocation = (params) => {
    return request.get(`/api/huacheng-sangeshenbian/applet/home/search-location`, params)
}
H5/pages/progress/progress.vue
@@ -6,7 +6,7 @@
                <view class="color1">{{ ["正在办理", "延期办理", "超时办理", "已办结", "群众撤销", "上报待审核", "上级驳回"][info.status] }}</view>
            </view>
            <view class="mx-13 mt-33 pt-35 pb-33 px-27 br-19 flex a-center j-between bgcolor1">
                <view class="fs-27 lh-38 color2">{{ info.detailedAddress }}</view>
                <view class="fs-27 lh-38 color2">{{ info.location }}</view>
                <image src="@/static/detailImg/dwei.png" class="w-31 h-31 shrink0" />
            </view>
            <view class="flex a-center j-between mt-31 mx-13">
@@ -40,7 +40,7 @@
                    <view class="flex1">
                        <view class="flex a-center j-between mb-10">
                            <view class="name">{{ item.createByName }}</view>
                            <view class="time">{{ item.createTime }}</view>
                            <view class="time">{{ item.createTime | formatTime }}</view>
                        </view>
                        <view class="context">{{ item.describe }}</view>
                        <view class="proImg">
@@ -85,6 +85,7 @@
</template>
<script>
    import dayjs from '../../uni_modules/uview-ui/libs/util/dayjs'
    import {
        getComplaintDetail
    } from './service'
@@ -96,6 +97,12 @@
                type: true,
            }
        },
        filters: {
            formatTime(val) {
                if (!val) return ''
                return dayjs(val).format('YYYY-MM-DD HH:mm:ss')
            }
        },
        onLoad(params) {
            this.id = params.id
            if (params.type) {
H5/pages/result-entry/index.vue
@@ -32,12 +32,12 @@
                        <view class="shrink0 color2 font-w400">
                            <view>创建时间</view>
                            <view>问题类型</view>
                            <view>群众</view>
                            <view>群众姓名</view>
                            <view>联系电话</view>
                            <view>详细地址</view>
                        </view>
                        <view class="font-bold txt-aligin-r" style="max-width: 404rpx;">
                            <view>{{ info.createTime }}</view>
                            <view>{{ info.createTime | formatTime }}</view>
                            <view>{{ info.problemType }}</view>
                            <view>{{ info.name }}</view>
                            <view>{{ info.contactNumber }}</view>
@@ -55,8 +55,8 @@
                    </view>
                    <view class="fs-27 mt-35 lh-38 font-bold">描述图片</view>
                    <view class="flex wrap mt-27">
                        <view @tap="viewImage(item)" class="relative mr-15" v-for="item in info.images.split(',')"
                            :key="item">
                        <view @tap="viewImage(item)" class="relative mr-15"
                            v-for="item in info.images && info.images.split(',')" :key="item">
                            <image :src="item" class="w-140 h-140 shrink0 br-8" />
                            <view class="absolute w-140 h-140 bgcolor5 top0 left0 br-8 flex a-center j-center">
                                <image @tap="viewImage(item)" src="@/static/Appeal/amplify.png" class="w-19 h-19" />
@@ -65,8 +65,8 @@
                    </view>
                    <view class="fs-27 mt-37 lh-38 font-bold">描述视频</view>
                    <view class="flex wrap mt-27">
                        <view @tap="openVideo(item)" class="relative mr-15" v-for="item in info.videos.split(',')"
                            :key="item">
                        <view @tap="openVideo(item)" class="relative mr-15"
                            v-for="item in info.videos && info.videos.split(',')" :key="item">
                            <video id="myVideo" class="w-140 h-140 mt-19 shrink0" disabled :controls="false"
                                :show-center-play-btn="false" :src="item" />
                            <view class="videoOpen" @click.stop="openVideo(item)">
@@ -179,6 +179,7 @@
        saveResult,
        getComplaintDetail
    } from './service'
    import dayjs from '../../uni_modules/uview-ui/libs/util/dayjs'
    import config from '@/config/index.js'
    export default {
        data() {
@@ -208,6 +209,12 @@
                this.info = res.data
            })
        },
        filters: {
            formatTime(val) {
                if (!val) return ''
                return dayjs(val).format('YYYY-MM-DD HH:mm:ss')
            }
        },
        methods: {
            submit() {
                if (!this.status) {
@@ -226,20 +233,7 @@
                        mask: true
                    })
                }
                if (this.completionImages.length == 0) {
                    return uni.showToast({
                        title: '请上传办结结果图片',
                        icon: 'none',
                        mask: true
                    })
                }
                if (this.completionVideos.length == 0) {
                    return uni.showToast({
                        title: '请上传办结结果视频',
                        icon: 'none',
                        mask: true
                    })
                }
                saveResult({
                    id: this.id,
                    status: this.status == '已办结' ? 3 : 4,
@@ -291,7 +285,7 @@
                })
            },
            uploadImg(type) {
                if (!this.againCklicFlag) return
                // if (!this.againCklicFlag) return
                this.againCklicFlag = false
                if (type == 1) {
                    uni.chooseImage({
H5/pages/work-detail/maxVideo.vue
@@ -1,7 +1,5 @@
<template>
    <view>
        <u-navbar title=" " bgColor="#000000" autoBack leftIconColor="#ffffff">
        </u-navbar>
        <view class="preview-full">
            <video class="videoMax" :autoplay="true" :src="videoUrl" :show-fullscreen-btn="false">
H5/pages/work-detail/work-detail.vue
@@ -1,7 +1,5 @@
<template>
    <view class="content">
        <u-navbar title="诉求详情" :bgColor="scoreTopHeight>100?'#ffffff':'transparent'" autoBack>
        </u-navbar>
        <view class="topColor">
        </view>
        <view class="allContent">
@@ -381,7 +379,7 @@
            }
        },
        onShow() {
            // alert(uni.getStorageSync('token'))
            this.getDetailInfo()
        },
        onLoad(params) {
@@ -392,7 +390,6 @@
            getUserInfo().then(res => {
                if (res.data == null) {
                    this.isParty = true
                    console.log('111111')
                }
                this.userInfo = {
                    ...res.data