hejianhao
2025-02-25 db3b389f6239cc4f3a6932e1a3227cd426d1529d
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
5个文件已修改
147 ■■■■■ 已修改文件
H5/pages/Appeal/Appeal.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/components/certificate/certificate.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/index/index.vue 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/list/list.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/postpone-apply.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/Appeal/Appeal.vue
@@ -4,16 +4,25 @@
            <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">
                    <input v-model="time" disabled placeholder-style="color: rgba(0,0,0,0.3);font-size:27rpx;"
                        class="uni-input flex1" maxlength="10" placeholder="请选择问题发生的时间" />
                    <view class="flex1" v-if="time">
                        {{time}}
                    </view>
                    <view class="flex1" v-else style="color: rgba(0,0,0,0.3);font-size:27rpx;">
                        请选择问题发生的时间
                    </view>
                    <image src="/static/Appeal/left.png" class="w-19 h-19" mode=""></image>
                </view>
            </view>
            <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="showList=true">
                    <input v-model="problemType" disabled placeholder-style="color: rgba(0,0,0,0.3);font-size:27rpx;"
                        class="uni-input flex1" maxlength="10" placeholder="请选择问题类型" />
                    <view class="flex1" v-if="problemType">
                        {{problemType}}
                    </view>
                    <view class="flex1" v-else style="color: rgba(0,0,0,0.3);font-size:27rpx;">
                        请选择问题类型
                    </view>
                    <image src="/static/Appeal/left.png" class="w-19 h-19" mode=""></image>
                </view>
            </view>
@@ -32,8 +41,13 @@
            <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="请选择问题发生具体地点" />
                    <view class="flex1" v-if="location">
                        {{location}}
                    </view>
                    <view class="flex1" v-else style="color: rgba(0,0,0,0.3);font-size:27rpx;">
                        请选择问题发生具体地点
                    </view>
                    <image src="/static/Appeal/left.png" class="w-19 h-19" mode=""></image>
                </view>
            </view>
@@ -49,6 +63,7 @@
                        <input v-model="descriptionTitle" placeholder-style="color: rgba(0,0,0,0.3);font-size:27rpx;"
                            class="h-94 pl-31 flex1" placeholder="请输入问题标题" />
                    </view>
                    <textarea name="" v-model="descriptionContent" id="" cols="30" placeholder="请输入问题描述内容"
                        placeholder-style="color: rgba(0, 0, 0, 0.30);font-size:27rpx;" rows="10"></textarea>
                </view>
@@ -172,57 +187,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,
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
@@ -19,29 +19,37 @@
        </view>
        <view class="pt-38 pl-31 pr-31 flex flex-column">
            <view class="flex j-between a-center">
                <text class="color1">工作台</text>
                <text class="color2" @click="showData =!showData">查看更多</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">
                <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() {
@@ -165,7 +176,7 @@
            getMessagelist() {
                const data = {
                    pageNum: this.pageNum,
                    pageSize: 10
                    pageSize: 5
                }
                getMessagelist(data).then(resp => {
                    console.log(resp, '获取消息列表');
@@ -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/list/list.vue
@@ -71,11 +71,11 @@
                </view>
                <view class="mt-27 ml-40 mr-40 br-19 bgColor4 pt-34 pb-34 fs-27 pl-27 pr-27 flex a-center j-between">
                    <text>{{ item.location || '' }}</text>
                    <image src="../../static/position@2x.png" mode="aspectFill" class="w-31 h-31 ml-10 shrink0"></image>
                    <image src="../../static/position@2x.png" class="w-31 h-31 ml-10 shrink0"></image>
                </view>
                <view class="ml-40 mr-40 mt-31 flex j-between a-center fs-27 txt-center">
                    <view class="">
                        <view class="">
                        <view class="font-bold">
                            问题类型
                        </view>
                        <view class="tip">
@@ -83,7 +83,7 @@
                        </view>
                    </view>
                    <view class="">
                        <view class="">
                        <view class="font-bold">
                            群众姓名
                        </view>
                        <view class="mt-10">
@@ -91,7 +91,7 @@
                        </view>
                    </view>
                    <view class="">
                        <view class="">
                        <view class="font-bold">
                            联系电话
                        </view>
                        <view class="mt-10">
@@ -100,7 +100,7 @@
                    </view>
                </view>
                <view v-if="item.status != '3'" class="fs-27 mt-31 ml-40 mr-40">
                    <view class="">
                    <view class="font-bold">
                        问题描述
                    </view>
                    <view class="mt-10 lh-38">
@@ -108,12 +108,12 @@
                    </view>
                </view>
                <view v-if="item.status != '3' && item.images" class="fs-27 mt-31 ml-40">
                    <view class="">
                    <view class="font-bold">
                        描述图片
                    </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>
@@ -123,11 +123,11 @@
                    <view class="txt-center fs-23 mt-27 color6">
                        创建时间:{{ item.createTime | formatTime }}
                    </view>
                    <view v-if="!['3','5'].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 color7">
                    <view v-if="!(['3','5','7'].includes(item.status))" class="flex a-center j-center fs-23 mt-29 txt-center">
                        <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>
@@ -266,6 +266,7 @@
    .tip {
        height: 40rpx;
        background-color: #FFFBE6;
        border: 2rpx solid #FFF1B8;
        border-radius: 8rpx;
        color: #FAAD14;
        text-align: center;
@@ -320,6 +321,10 @@
        color: #999999;
    }
    .color10 {
        color: #636363;
    }
    .bgColor1 {
        background: linear-gradient(270deg, #FFB318 0%, #FF330D 100%);
        width: 58rpx;
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) {