Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

Lou

2023-12-08 d34e5c0dbf6b5b0963e55c4db5e6f42d50f480e6

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

 http/api.js

@@ -121,25 +121,25 @@
        const currentPage = pages[pages.length - 1]
        uni.setStorageSync("responIndex", 0)
        uni.clearStorageSync()
        uni.redirectTo({
            url: `/pages/login/login-account?redirect=/${currentPage.route}`
        })
		
		 
        // uni.showModal({
        //     title: "提示",
        //     content: "请登录",
        //     showCancel: false,
        //     success: res => {
        //         if (res.confirm) {
        //             uni.redirectTo({
        //                 url: `/pages/login/login-account?redirect=/${currentPage.route}`
        //             })
        //         } else if (res.cancel) {
        //             console.log('用户点击取消');
        //         }
        //     }
        // })
		
		 
        uni.showModal({
            title: "提示",
            content: "请登录",
            showCancel: false,
            success: res => {
                if (res.confirm) {
                    uni.redirectTo({
                        url: `/pages/login/login-account?redirect=/${currentPage.route}`
                    })
                } else if (res.cancel) {
                    console.log('用户点击取消');
                }
            }
        })
    }else {
        uni.showToast({
            title: '系统繁忙,请稍后再试',

 pages/home/index.vue

@@ -257,7 +257,7 @@
                liveList: [], //生活菜单

                contactList: [], //便民服务联系方式

                isShowHouse: false, //显示楼盘表

                isShowNotice: false, //显示通知公告

                isShowNotice: true, //显示通知公告

                isShowContact: false,

                bannerList: [],

                navList: [{

@@ -298,11 +298,11 @@
        },



        onReady() {

            if (!uni.getStorageSync("userInfo")) {

                uni.redirectTo({

                    url: "/pages/login/login-account"

                })

            }

            // if (!uni.getStorageSync("userInfo")) {

            //     uni.redirectTo({

            //         url: "/pages/login/login-account"

            //     })

            // }

        },



        computed: {

@@ -357,7 +357,7 @@
                this.selectRole = uni.getStorageSync("activeRole")

                this.getMenuList()

                this.getSiteList()

                // this.getNoticeList()

                this.getNoticeList()

            },



            getBanner() {


 pages/login/login-account.vue

@@ -25,7 +25,8 @@
                    <u-checkbox shape="circle"  size="16" ></u-checkbox>
                </u-checkbox-group>
                
                <view class="f-22">我已阅读并同意<text class="c-main">用户协议</text>和<text class="c-main">隐私政策</text>以及 <text class="c-main">《中国移动认证服务条款》</text>·同时登录并使用基层智治综合协同平台</view>
                <view class="f-22">我已阅读并同意<text class="c-main">用户协议</text>和<text class="c-main">隐私政策</text>以及 <text
                        class="c-main">《中国移动认证服务条款》</text>·同时登录并使用基层智治综合协同平台</view>
            </view>
         </view>
         
@@ -46,9 +47,11 @@

                        <u-input placeholder="请输入密码" prefixIcon="lock" prefixIconStyle="font-size: 28px;color: #017BFC"
                            placeholderStyle="font-size:28rpx;color:#ABABAB;"
                            customStyle="background:#fff;width:634rpx;height:120rpx;"  :type="passwordProps.passwordType" v-model="form.password">
                            customStyle="background:#fff;width:634rpx;height:120rpx;" :type="passwordProps.passwordType"
                            v-model="form.password">
                            <template slot="suffix">
                                <u-icon @click="showPassword" :name="passwordProps.passwordIcon" size="24" color="#9FA5C0"></u-icon>
                                <u-icon @click="showPassword" :name="passwordProps.passwordIcon" size="24"
                                    color="#9FA5C0"></u-icon>
                            </template>
                        </u-input>
                    </u-form-item>
@@ -160,6 +163,7 @@

        onLoad() {
            this.screenHeight = `${uni.getSystemInfoSync().screenHeight}px`;
            this.form.phone = uni.getStorageSync("phoneNmber");
        },

        methods: {
@@ -178,6 +182,7 @@
                    this.$u.api
                        .token(this.tenantId, this.form.phone, md5(this.form.password))
                        .then(data => {
                            uni.setStorageSync("phoneNmber", this.form.phone)
                            this.$u.func.login(data)
                        })
                        .catch(err => {
@@ -437,6 +442,7 @@
            justify-content: space-evenly;
        }
    }

    .submit-btn{
        width:634rpx;
        height:94rpx;
@@ -445,9 +451,11 @@
        border-radius: 8rpx 8rpx 8rpx 8rpx;
        color:#fff;
    }

    .mt-190{
        margin-top:190rpx;
    }

    .btn{
        width:634rpx;
        height:94rpx;
@@ -455,6 +463,7 @@
        margin-top:30rpx;
        
    }

    .agreement{
        width:634rpx;
        margin:37rpx auto 0;

 subPackage/bs/views/zhsb.vue

@@ -67,6 +67,9 @@
    },

    methods: {

        async getHouseRent() {

                if (!this.houseCode) {

                    this.houseCode = uni.getStorageSync("siteInfo").houseCode

                }

            const res = await getHouseRentInfo(this.houseCode)

            const {

                aoiName,

@@ -81,12 +84,16 @@
            this.room = (!!unitName ? unitName : '') + doorplateName + "室"
            this.num = 0

            houseRentalList !== 0 && houseRentalList.forEach(item => {

                const { houseTenantVOList, dueTime, rentalTime } = item
                item.num = houseTenantVOList.length
                    const {

                        householdVOList,

                        dueTime,

                        rentalTime

                    } = item

                    item.num = householdVOList.length

                this.num += item.num

                if (item.num !== 0) {
                    item.name = houseTenantVOList[0].name
                    item.housingRentalId = houseTenantVOList[0].housingRentalId
                        item.name = householdVOList[0].name

                        item.housingRentalId = householdVOList[0].housingRentalId

                }

                this.rentList = houseRentalList

            })

@@ -137,6 +144,7 @@
    .location {

        font-weight: 700;
        font-size: 27rpx;


        text {
            color: #AAAAAA;
        }

@@ -167,11 +175,13 @@
.box-title {

    margin: 25rpx 0;
    display: flex;


    .line {
        width: 8rpx;
        margin-right: 10rpx;
        background-color: #2978FF;
    }


    .title {
        font-weight: 700;
    }


 subPackage/house/member/index.vue

@@ -194,7 +194,7 @@
                    relationName: '',
                    location: "",
                    title: "",
                    roleType:null,
                    // roleType:null,
                    description: "",
                },
                rules: {
@@ -383,7 +383,7 @@
                const workStatusIndex = this.dataList.workStatusList.findIndex(item => item.name === this.workStatusName)
                const maritalStatusIndex = this.dataList.maritalStatusList.findIndex(item => item.name === this.maritalStatusName)
                
                this.form['roleType'] = roleTypeIndex >0 ? this.dataList.roleList[roleTypeIndex].value : ""
                this.form['roleType'] = roleTypeIndex >=0 ? this.dataList.roleList[roleTypeIndex].value : ""
                this.form['relationship'] = relationshipIndex >0 ? this.dataList.relationshipList[relationshipIndex].value: ""
                this.form['gender'] = genderIndex >0 ?this.dataList.genderList[genderIndex].value: ""
                this.form['isPrimaryContact'] = isPrimaryContactIndex >0 ?this.dataList.isPrimaryContactList[isPrimaryContactIndex].value: ""

 subPackage/user/family/edit.vue

@@ -368,7 +368,7 @@
            },
            //类型选择确认
            typeSelect(item) {
                const [ result ] = e.value
                const [ result ] = item.value
                this[this.selectBusModel] = result.name
                this.form[this.selectBusKey] = result.value
                this.typeShow = !this.typeShow