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

董国庆

2025-03-20 b563735228e1eb843e66097fa1bdbfa620da5832

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

 H5/components/customPopup.vue

@@ -1,5 +1,6 @@
<template>
    <u-popup :show="show" mode="center" bgColor="transparent" @open="openPopup" :closeOnClickOverlay="false" zIndex="10071">
    <u-popup :overlayOpacity="overlayOpacity" :show="show" mode="center" bgColor="transparent" @open="openPopup"
        :closeOnClickOverlay="false" zIndex="10071">
        <view class="bgImg px-61 pt-46 pb-37 br-28">
            <view class="txt-center font-bold fs-35 color2">
                提示
@@ -38,6 +39,10 @@
            isCountDown: {
                type: Boolean,
                default: false
            },
            overlayOpacity: {
                type: Number,
                default: 0.5
            }
        },
        data() {

 H5/main.js

@@ -5,7 +5,9 @@
import './uni.promisify.adaptor'
import CustomPopup from '@/components/customPopup.vue'
const jweixin = require('jweixin-module')

/*引入，注释可关闭*/
// import vconsole from "vconsole";
// Vue.prototype.vconsole = new vconsole();
Vue.config.productionTip = false
Vue.prototype.$store = store
Vue.prototype.$jweixin = jweixin

 H5/manifest.json

@@ -1,6 +1,6 @@
{
    "name": "三个身边",
    "appid": "__UNI__DB035F5",
    "name" : "“三个身边”群众工作机制",
    "appid" : "__UNI__4B73B99",
    "description": "",
    "versionName": "1.0.0",
    "versionCode": "100",
@@ -72,7 +72,7 @@
    "vueVersion": "2",
    "h5": {
        "template": "index.html",
        "title": "三个身边",
        "title" : "“三个身边”群众工作机制",
        "optimization": {
            "treeShaking": {
                "enable": false

 H5/package-lock.json

@@ -2,10 +2,49 @@
  "requires": true,
  "lockfileVersion": 1,
  "dependencies": {
    "@babel/runtime": {
      "version": "7.26.10",
      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.10.tgz",
      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
      "requires": {
        "regenerator-runtime": "^0.14.0"
      }
    },
    "copy-text-to-clipboard": {
      "version": "3.2.0",
      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz",
      "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q=="
    },
    "core-js": {
      "version": "3.41.0",
      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.41.0.tgz",
      "integrity": "sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA=="
    },
    "jweixin-module": {
      "version": "1.6.0",
      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
    },
    "mutation-observer": {
      "version": "1.0.3",
      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
    },
    "regenerator-runtime": {
      "version": "0.14.1",
      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
    },
    "vconsole": {
      "version": "3.15.1",
      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.1.tgz",
      "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==",
      "requires": {
        "@babel/runtime": "^7.17.2",
        "copy-text-to-clipboard": "^3.0.1",
        "core-js": "^3.11.0",
        "mutation-observer": "^1.0.3"
      }
    }
  }
}

 H5/pages.json

@@ -137,7 +137,7 @@
    ],
    "globalStyle": {
        "navigationBarTextStyle": "black",
        "navigationBarTitleText": "三个身边",
        "navigationBarTitleText": "“三个身边”群众工作机制",
        "navigationBarBackgroundColor": "#F8F8F8",
        "backgroundColor": "#F8F8F8"
    },

 H5/pages/authentication/authentication.vue

@@ -196,12 +196,13 @@
        methods: {
            // 返回小程序主页
            back() {
                let userInfo = uni.getStorageSync('userInfo')
                if (userInfo.isAdmin) {
                    uni.navigateBack()
                } else {
                    this.$jweixin.miniProgram.navigateBack()
                }
                // let userInfo = uni.getStorageSync('userInfo')
                // if (userInfo.isAdmin) {
                //     uni.navigateBack()
                // } else {
                //     this.$jweixin.miniProgram.navigateBack()
                // }
            },
            // 提交（优化后）
            async save() {
@@ -439,7 +440,7 @@
    }

    .content {
        background-image: url('/static/home/bg@2x.png');
        background-image: url('@/static/home/bg@2x.png');
        background-size: 750rpx 648rpx;
        padding-top: 100rpx;


 H5/pages/components/certificate/certificate.vue

@@ -5,7 +5,7 @@
                <view class="popup_content flex flex-column a-center">
                    <text class="fs-35 font-bold color3 mt-46">党员证件</text>
                    <view class="bg font-w500 fs-23 mt-38 flex  flex-column a-center">
                        <image :src="info.avatar" class="w-133 h-156 mt-52" mode=""></image>
                        <image :src="info.avatar" class="w-133 h-133 mt-52" mode=""></image>
                        <view class="flex j-between" style="width: 481rpx;">
                            <view class="flex flex-column mr-40 lh-44">
                                <text>姓名：</text>
@@ -22,7 +22,7 @@
                        </view>

                    </view>
                    <view class="flex a-center mt-24">
                    <view class="flex a-center">
                        <view class="btn_left" @click="onclose">
                            关闭
                        </view>
@@ -75,13 +75,13 @@

    /deep/ .u-popup__content {
        width: 635rpx;
        height: 692rpx;
        height: 672rpx;
        border-radius: 40rpx;
    }

    .popup_main {
        width: 635rpx;
        height: 692rpx;
        height: 672rpx;
        border-radius: 40rpx;
        background-image: url('@/static/home/bg1.png');
        /* 背景图片铺满容器 */
@@ -99,9 +99,10 @@
        height: 423rpx;
        background-image: url('@/static/home/bg2.png');
        /* 背景图片铺满容器 */
        background-size: 100% 100%;
        background-size: 100%;
        /* 背景图片不重复 */
        background-repeat: no-repeat;
		
        /* 背景图片居中显示 */
        background-position: center;
    }

 H5/pages/evaluate/evaluate-detail.vue

@@ -61,21 +61,21 @@
                video: [],
                rate: null, //评价打分
                list: [{
                    img: '../../static/detailImg/img1.png',
                    tit: '不满意',
                    value: 0
                }, {
                    img: '../../static/detailImg/img2.png',
                    tit: '一般',
                    value: 1
                    img: '../../static/detailImg/img4.png',
                    tit: '非常满意',
                    value: 3
                }, {
                    img: '../../static/detailImg/img3.png',
                    tit: '满意',
                    value: 2
                }, {
                    img: '../../static/detailImg/img4.png',
                    tit: '非常满意',
                    value: 3
                    img: '../../static/detailImg/img2.png',
                    tit: '一般',
                    value: 1
                }, {
                    img: '../../static/detailImg/img1.png',
                    tit: '不满意',
                    value: 0
                }],
            }
        },

 H5/pages/evaluate/evaluate.vue

@@ -84,21 +84,21 @@
                rulsFlag: false,
                rate: null, //评价打分
                list: [{
                    img: '../../static/detailImg/img1.png',
                    tit: '不满意',
                    value: 0
                }, {
                    img: '../../static/detailImg/img2.png',
                    tit: '一般',
                    value: 1
                    img: '../../static/detailImg/img4.png',
                    tit: '非常满意',
                    value: 3
                }, {
                    img: '../../static/detailImg/img3.png',
                    tit: '满意',
                    value: 2
                }, {
                    img: '../../static/detailImg/img4.png',
                    tit: '非常满意',
                    value: 3
                    img: '../../static/detailImg/img2.png',
                    tit: '一般',
                    value: 1
                }, {
                    img: '../../static/detailImg/img1.png',
                    tit: '不满意',
                    value: 0
                }],
            }
        },

 H5/pages/index/index.vue

@@ -144,7 +144,8 @@
            </view>
        </u-popup>
        <!-- 认证弹窗 -->
        <CustomPopup ref="renzhengPop" confirmText="去认证" @close="closeH5" @comfirm="toRenzheng">
        <CustomPopup :overlayOpacity="overlayOpacity" ref="renzhengPop"
            confirmText="去认证" @close="closeH5" @comfirm="toRenzheng">
            <view class="txt-center fs-31 lh-42 pt-50 pb-17 color5">
                <view class="">
                    您暂未认证党员信息，
@@ -177,13 +178,13 @@
        <CustomPopup ref="confirmPop" confirmText="确认" :isCountDown="true" :isOneBtn="true" @comfirm="comfirm">
            <view class="txt-center fs-31 lh-42 pt-48 pb-58 color5">
                <view class="">
                    请仔细核对账号信息以及功能是否与
                    请仔细核对账号信息和功能， 是否与
                </view>
                <view class="">
                    组织要求的职责匹配，如不匹配，请
                    本人职责匹配，如不匹配，请向社区、
                </view>
                <view class="">
                    向社区、部门反映修改权限！
                    部门反映修改权限！
                </view>
            </view>
        </CustomPopup>
@@ -224,6 +225,7 @@
                noreadlists: [],
                changeRolePopup: false,
                activeRole: 1,
                overlayOpacity: 0.5
            }
        },
        onPullDownRefresh() {
@@ -297,9 +299,14 @@
                    changeIdentity({
                        identity: e.identity
                    }).then(res => {
                        uni.showToast({
                            title:'修改成功'
                        })
                        setTimeout(()=>{
                        this.changeRolePopup = false
                        this.getMessagelist()
                        this.getappletcinfo()
                        },1000)
                    })
                }
            },
@@ -358,14 +365,17 @@
                })
            },
            async getappletcinfo() {
				
                // 获取三个身边当前用户信息 用于判断用户是否是上级
                let res = await getCurrentUserInfo()
                // 获取身份信息
                let resp = await getappletcinfo()
                let index = resp.data.permissions.findIndex(item => item.identity == 2)
                resp.data.isAdmin = index >= 0 ? 1 : 0
				
                if (resp.data.permissions.length > 0) {
                    resp.data.roleName = resp.data.permissions.find(item => item.identity == resp.data.identity).name
                    obj = resp.data.permissions.find(item => item.identity == resp.data.identity).name
                }
                resp.data.isAdmin = res.data ? 1 : 0
                this.userInfo = {
                    ...resp.data,
                    ...res.data
@@ -376,23 +386,27 @@
                    this.$refs.dongjiePop.showPopup()
                    return
                }
				
                if (!this.userInfo.isPartymember && this.userInfo.identity == '1' && this.userInfo.auditStatus ==
                    null) {
                    // 党员没有认证,多个角色
                    this.$refs.renzhengPop.showPopup()
                    this.overlayOpacity = 0.5
                    return
                }
                if (!this.userInfo.isPartymember && this.userInfo.auditStatus === null && !this.userInfo.identity) {
                    // 没有认证过且没有提交认证,单个角色
                    this.$refs.renzhengPop.showPopup()
                    this.overlayOpacity = 1
                    return
                }
                if (!this.userInfo.isPartymember && this.userInfo.auditStatus === 0 && this.userInfo.identity == '1') {
                if (!this.userInfo.isPartymember && this.userInfo.auditStatus === 0 && this.userInfo.identity != '2') {
                    // 审核中
                    this.$refs.shenhePop.showPopup()
                    return
                }
                if (!this.userInfo.isPartymember && this.userInfo.auditStatus === 2 && this.userInfo.identity == '1') {
                console.log(this.userInfo);
                if (!this.userInfo.isPartymember && this.userInfo.auditStatus === 2 && this.userInfo.identity != '2') {
                    // 审核拒绝
                    this.$refs.jujuePop.showPopup()
                    return
@@ -404,7 +418,6 @@
                    })
                    return
                }

                if (this.userInfo.identity == 2 && !this.userInfo.isConfirmContent) {
                    //管理员确认
                    this.$refs.confirmPop.showPopup()

 H5/pages/work-detail/work-detail.vue

@@ -374,8 +374,8 @@

                scoreTopHeight: 0, //距离顶部多高

                userInfo: {}, //个人信息
                isParty: false, //这是党员
                userInfo: uni.getStorageSync('userInfo'), //个人信息
                isParty: false, //true 党员 false 管理员
            };
        },
        onPageScroll(e) {
@@ -396,15 +396,15 @@
            if (params.id) {
                this.id = params.id
            }

            getUserInfo().then(res => {
                if (res.data == null || res.data.accountLevel == 5) {
                    this.isParty = true
                }
                this.userInfo = {
                    ...res.data
                }
            })
            this.isParty = uni.getStorageSync('userInfo').identity == 1 ? true : false
            // getUserInfo().then(res => {
            //     if (res.data == null || res.data.accountLevel == 5) {
            //         this.isParty = true
            //     }
            //     this.userInfo = {
            //         ...res.data
            //     }
            // })
        },
        methods: {
            open() {},