pyt
2025-02-25 35555822406486e2b82d3c4004aabe1e8601499f
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
5个文件已修改
84 ■■■■ 已修改文件
H5/pages/Appeal/Appeal.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/components/certificate/certificate.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/index/index.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/location/location.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/utils/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/Appeal/Appeal.vue
@@ -29,8 +29,8 @@
                    class="uni-input flex1" maxlength="11" placeholder="请输入群众联系电话" />
            </view>
            <view class="card  flex a-center h-108 j-between" @click="goTopage">
                <text class="w-108 fs-27 font-bold mr-85">发生地点</text>
            <view class="card  flex a-center h-108 j-between" @click="goTopagelocation()">
                <text class="w-108 fs-27 font-bold mr-85">地点</text>
                <view class=" flex a-center j-between flex1">
                    <input v-model="location" disabled placeholder-style="color: rgba(0,0,0,0.3);font-size:27rpx;"
                        class="uni-input flex1" placeholder="请选择问题发生具体地点" />
@@ -172,57 +172,68 @@
                        title: '请选择时间',
                        icon: 'none'
                    })
                    return
                } else if (!this.problemType) {
                    uni.showToast({
                        title: '请选择问题类型',
                        icon: 'none'
                    })
                    return
                } else if (!this.name) {
                    uni.showToast({
                        title: '请输入群众姓名',
                        icon: 'none'
                    })
                    return
                } else if (!this.contactNumber) {
                    uni.showToast({
                        title: '请输入联系电话',
                        icon: 'none'
                    })
                    return
                } else if (!preciseRegex.test(this.contactNumber)) {
                    uni.showToast({
                        title: '请输入正确的手机号',
                        icon: 'none'
                    })
                    return
                } else if (!this.location) {
                    uni.showToast({
                        title: '请选择地点',
                        icon: 'none'
                    })
                    return
                } else if (!this.detailedAddress) {
                    uni.showToast({
                        title: '请输入详细地址',
                        icon: 'none'
                    })
                    return
                } else if (!this.descriptionTitle) {
                    uni.showToast({
                        title: '请输入问题标题',
                        icon: 'none'
                    })
                    return
                } else if (!this.descriptionContent) {
                    uni.showToast({
                        title: '请输入问题描述',
                        icon: 'none'
                    })
                    return
                } else if (this.images == 0) {
                    uni.showToast({
                        title: '请上传图片',
                        icon: 'none'
                    })
                    return
                } else if (this.videos == 0) {
                    uni.showToast({
                        title: '请上传视频',
                        icon: 'none'
                    })
                    return
                }
                const data = {
                    time: this.time,
@@ -269,7 +280,8 @@
                this.showDate = false
                this.showList = false
            },
            goTopage() {
            goTopagelocation() {
                console.log('0000000000000000');
                uni.navigateTo({
                    url: '/pages/location/location'
                })
H5/pages/components/certificate/certificate.vue
@@ -12,7 +12,7 @@
                                <text>身份证号码:</text>
                                <text>所在党组织:</text>
                            </view>
                            <view class="flex flex-column a-end lh-48">
                            <view class="flex flex-column a-end font-bold lh-48">
                                <text>{{info.name}}</text>
                                <text>{{info.idCard}}</text>
                                <text>{{info.partyOrganization}}</text>
H5/pages/index/index.vue
@@ -23,25 +23,33 @@
                <text class="color2" @click="showData =!showData">查看更多</text>
            </view>
            <view class="flex flex-wrap j-between">
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center" v-if="member==1" @click="onClick()" >
                    <image class="w-94 h-77 ml-38" src="/static/home/img7.png" mode=""></image>
                    <text class="ml-37 font-bold">党员证</text>
                </view>
                <view class="pt-38 pb-38 bg1 w-333 flex br-19 mt-19 a-center" @click="goTopage()">
                    <image class="w-81 h-77 ml-38" src="/static/home/img4.png" mode=""></image>
                    <text class="ml-37">诉求录入</text>
                    <text class="ml-37 font-bold">诉求录入</text>
                </view>
                <view class="pt-38  pb-38 bg1 w-333 mt-19 br-19 flex a-center" @click="goToList()">
                    <image class="w-81 h-77 ml-38" src="/static/home/img2.png" mode=""></image>
                    <text class="ml-37">诉求列表</text>
                    <text class="ml-37 font-bold ">诉求列表</text>
                </view>
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center">
                    <image class="w-79 h-77 ml-38" src="/static/home/img1.png" mode=""></image>
                    <text class="ml-37">回访评价</text>
                    <text class="ml-37 font-bold">回访评价</text>
                </view>
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center">
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center"  v-if="member==2">
                    <image class="w-81 h-77 ml-38" src="/static/home/img8.png" mode=""></image>
                    <text class="ml-37">统计分析</text>
                    <text class="ml-37 font-bold">统计分析</text>
                </view>
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center" @click="onClick()" v-if="showData">
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center"  v-if="showData&&member==1">
                    <image class="w-81 h-77 ml-38" src="/static/home/img8.png" mode=""></image>
                    <text class="ml-37 font-bold">统计分析</text>
                </view>
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center"  @click="onClick()" v-if="showData&&member==2">
                    <image class="w-94 h-77 ml-38" src="/static/home/img7.png" mode=""></image>
                    <text class="ml-37">党员证</text>
                    <text class="ml-37 font-bold">党员证</text>
                </view>
            </view>
@@ -53,18 +61,18 @@
                    <view class="msg mr-19" @click="changeActive(1)" :class="isactive==1? 'active':''">
                        消息
                        <view class="tips">
                            {{msgList.length}}
                            {{noreadlist.length}}
                        </view>
                    </view>
                    <view class="representative" @click="changeActive(2)" :class="isactive==2? 'active':''">
                        待办
                        <view class="tips">
                            {{msgList.length}}
                            {{noreadlists.length}}
                        </view>
                    </view>
                </view>
                <view class="list mt-29">
                    <view class="flex a-center mb-27" v-for="item in msgList" :key="item.id">
                    <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>
                            <view class="tips" v-if="item.readStatus==2">
@@ -74,11 +82,11 @@
                        <view class="border-b flex1 ml-18 pb-33">
                            <view class="fs-31  font-w500 flex  flex1 j-between">
                                <text>{{item.title}}</text>
                                <text class="fs-23 font-w400">{{item.time}}分钟前</text>
                                <text class="fs-23 font-w400">{{item.time}}</text>
                            </view>
                            <view class="fs-27 flex j-between mt-8">
                                <text></text>
                                <text style="color: rgba(102, 102, 102, 1);">{{item.promptType==1?'临期提醒':'超时提醒'}}</text>
                                <view class="read" v-if="item.readStatus==1">已读</view>
                                <view class="noread" v-else>未读</view>
@@ -117,10 +125,13 @@
                pageNum: 1,
                bannerlist: [],
                msgList: [],
                msgLists: [],
                msgListTotal: [],
                member: 1,
                userInfo: {},
                isLoading: false,
                noreadlist: [],
                noreadlists: [],
            }
        },
        onPullDownRefresh() {
@@ -198,13 +209,17 @@
                        // 计算分钟数
                        const minutes = Math.floor(remainingSecondsAfterHours / 60);
                        item.time = days && hours ? `${days} 天 ${hours}小时 ${minutes} ` : !days && hours ?
                            `${hours}小时 ${minutes}` : `${minutes}`
                        item.time = days && hours ? `${days} 天前 ` : !days && hours ?
                            `${hours}小时 ${minutes} 分钟前` : `${minutes} 分钟前`
                        return item
                    })
                    this.msgList = JSON.parse(JSON.stringify(this.msgListTotal)).filter(item => item.promptType ==
                        2)
                    this.msgLists = JSON.parse(JSON.stringify(this.msgListTotal)).filter(item => item.promptType ==
                        1)
                    this.noreadlists = this.msgLists.filter(item => item.readStatus === 0)
                    this.noreadlist = this.msgList.filter(item => item.readStatus === 0)
                    console.log(this.msgListTotal, 'this.msgListTotal');
                })
            },
@@ -212,11 +227,14 @@
                this.isactive = value
                if (value == 1) {
                    this.msgList = JSON.parse(JSON.stringify(this.msgListTotal)).filter(item => item.promptType == 2)
                this.noreadlist = this.msgList.filter(item => item.readStatus === 0)
                } else {
                    this.msgList = JSON.parse(JSON.stringify(this.msgListTotal)).filter(item => item.promptType == 1)
                    this.msgLists = JSON.parse(JSON.stringify(this.msgListTotal)).filter(item => item.promptType == 1)
                    this.noreadlists = this.msgLists.filter(item => item.readStatus === 0)
                }
            },
            change() {
                console.log('1111');
H5/pages/location/location.vue
@@ -43,11 +43,18 @@
                uid: 0,
                keyword: '',
                locationList: [],
                city: '攀枝花市'
                city: '攀枝花市',
                markers:[],
            };
        },
        methods: {
 clearMarkers() {
            // 清除所有标点
            this.markers.forEach((marker) => {
                this.map.removeOverlay(marker);
            });
            this.markers = []; // 清空存储标点的数组
        },
            back() {
                uni.navigateBack()
            },
@@ -150,6 +157,7 @@
            this.map.centerAndZoom(point, 12);
            var marker = new BMapGL.Marker(point);
            this.map.addOverlay(marker);
            this.markers.push(marker);
            var myGeo = new BMapGL.Geocoder();
            // 根据坐标得到地址描述    
            myGeo.getLocation(new BMapGL.Point(res.longitude, res.latitude), (result) => {
@@ -160,6 +168,7 @@
            })
            this.map.addEventListener('click', (e) => {
                this.clearMarkers()
                var mercator = this.map.lnglatToMercator(e.latlng.lng, e.latlng.lat);
                this.latitude = e.latlng.lat
                this.longitude = e.latlng.lng
@@ -177,6 +186,7 @@
                })
                var marker = new BMapGL.Marker(point);
                this.map.addOverlay(marker);
                this.markers.push(marker);
            });
            // },
            // error:err=>{
H5/utils/request.js
@@ -20,7 +20,7 @@
    return new Promise(function(resolve, reject) {
        let token =
            'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE4OTI0ODk0OTc5Nzk5NDA4NjUsInR5cGUiOjEsImV4cCI6MTc0MDQ2NjQ3MCwiY3JlYXRlZCI6MTc0MDM4MDA3MDQzN30.oOlB8GBE50WmV4Kw-Uuy33rQpQ-homoJQ61QXs34rkQIr-jFlAn9dUOgebitI9bz5PUaFImSldhY6vokRjmYlg'
            'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjU2MDYyLCJ0eXBlIjoxLCJleHAiOjE3NDE3MDU5MTgsImNyZWF0ZWQiOjE3NDA0MDk5MTg3MDF9.k9ck3gWfVElSCl1uUI_5fZ3lEbFgtbQs_OaJku4I4bXoUO77kUnHsghkPBFdRknFHa49fTdAEdHn0wsb_XN5tg'
        //党员 eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE4OTI0ODk0OTc5Nzk5NDA4NjUsInR5cGUiOjEsImV4cCI6MTc0MDQ2NjQ3MCwiY3JlYXRlZCI6MTc0MDM4MDA3MDQzN30.oOlB8GBE50WmV4Kw-Uuy33rQpQ-homoJQ61QXs34rkQIr-jFlAn9dUOgebitI9bz5PUaFImSldhY6vokRjmYlg
        // 社区  eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE1OTAxNzYwNTgxNTY1NDgwOTgsInR5cGUiOjEsImV4cCI6MTc0MTcwNTE1OSwiY3JlYXRlZCI6MTc0MDQwOTE1OTEwMH0.AmeZFq2Pj2y2bRF1AolsRWHA4ehobBdx1-LtQHIJzub8WjEh_TxZ-PTEI7uiujlLWKhJE07PCVCggAdeuF3UIA
        // 市  eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE4OTI0MjE4MjgwODU4Mzc4MjYsInR5cGUiOjEsImV4cCI6MTc0MTY5ODg0OCwiY3JlYXRlZCI6MTc0MDQwMjg0ODMzN30.7IYRD37yTkhqcnKyXWcqKk_iTisMp3ar_ByfuVR7Go9rK8ZnGJrlwC3z4NF_ly7IIoBHgE2E4IAvfm3ccam8wg