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

Lou

2023-11-21 3996edaff821a160269ad918b8e90bb446b9c93b

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

 pages/home/index.vue

@@ -637,12 +637,11 @@
            },



            // 页面跳转

            pushPage({

                id,

                title

            }) {

            pushPage(item) {

                console.log(item,8888)

                const {id,title,addressType} = item;

                if (id !== void 0) {

                    let url = `/subPackage/house/list/index?id=${id}&title=${title}`

                    let url = `/subPackage/house/list/index?id=${id}&title=${title}&addressType=${addressType}`

                    this.$u.func.globalNavigator(url, "navTo")

                }

            },


 subPackage/house/family/index.vue

@@ -139,7 +139,8 @@
                    code: this.currentId,

                    roleName: uni.getStorageSync('activeRole').roleName,

                    name: this.addressType == 1 ? "" : this.neiCode,

                    addressType: this.addressType == 3 ? 2 : 1

                    buildingName:this.addressType == 4 ?this.buildingName: "",

                    addressType: this.addressType

                }

                const res = await getHouseList(param)

                const aoiList = res.data.aoiList

@@ -171,9 +172,9 @@
            // 跳转到商铺页面

            pushShopPage(name, item) {

                const {

                    addressCode

                    addressCode,addressType

                } = item

                let url = `/subPackage/house/houseNumber/index?stdId=${addressCode}`

                let url = `/subPackage/house/houseNumber/index?stdId=${addressCode}&addressType=${addressType}`

                this.$u.func.globalNavigator(url, "navTo")

            }

        }


 subPackage/house/houseNumber/index.vue

@@ -197,11 +197,17 @@
                    lat: '',

                    lng: ''

                },

                marker: []

                marker: [],

                addressType:2,

                placeId:""

            }

        },

        onLoad(option) {

            this.stdId = option.stdId

            this.addressType = option.addressType

            if(this.addressType ==4){

                this.placeId = this.stdId

            }

            this.getBuildingDetail()

        },

        methods: {

@@ -217,7 +223,9 @@
                    code,

                    data

                } = await getPlaceDetail({

                    houseCode: this.stdId

                    houseCode: this.addressType==4?"":this.stdId,

                    addressType: this.addressType,

                    id: this.placeId

                })

                if (code !== 200) {

                    uni.showToast({

@@ -299,7 +307,7 @@
            },

            cscjClick() {

                // this.$u.func.globalNavigator('/subPackage/workbench/views/cscj?stdId=' + this.stdId)

                this.$u.func.globalNavigator('/subPackage/workbench/views/cscj?houseCode=' + this.stdId)

                this.$u.func.globalNavigator(`/subPackage/workbench/views/cscj?houseCode=${this.stdId}&addressType=${this.addressType}`)

            },

            csjlClick() {

                this.$u.func.globalNavigator('/subPackage/workbench/views/csjl?stdId=' + this.stdId)


 subPackage/house/list/index.vue

@@ -46,6 +46,7 @@
                currentId: '',

                curSelectSite: {},

                curHouseTitle: '',

                addressType:1,

                houseList: [{

                    title: '-'

                }],

@@ -57,10 +58,12 @@
        onLoad(e) {

            const {

                id,

                title

                title,

                addressType

            } = e

            this.currentId = id

            this.curHouseTitle = title

            this.addressType = addressType



        },

        onShow() {

@@ -79,7 +82,8 @@
                const param = {

                    type: 2,

                    code: this.currentId,

                    roleName: uni.getStorageSync('activeRole').roleName

                    roleName: uni.getStorageSync('activeRole').roleName,

                    addressType:this.addressType

                }

                const res = await getHouseList(param)

                const aoiList = res.data.aoiList

@@ -116,7 +120,7 @@
                    return

                }

                // addressType == 3 街路巷

                if (addressType == 1 || addressType == 3) {

                if (addressType == 1 || addressType == 3 || addressType == 4) {

                    if (id !== void 0) {

                        let url = `/subPackage/house/family/index?id=${id}&housingName=${this.curHouseTitle}

                        &buildingName=${title}&addressType=${addressType}&neiCode=${this.currentId}`

@@ -124,7 +128,6 @@
                    }

                } else {

                    // 跳转场所页面 addressType == 2

                    console.log(value, 8888)

                    // let url = `/subPackage/workbench/views/cscj?stdId=${id}`

                    let url = `/subPackage/workbench/views/cscj?houseCode=${id}`

                    this.$u.func.globalNavigator(url, "navTo")


 subPackage/workbench/views/cscj.vue

@@ -344,7 +344,8 @@
                activeIds: [],

                showLabelList: [],

                houseCode: "",

                currentId: ""

                currentId: "",

                addressType:2

            }

        },

        watch: {

@@ -359,7 +360,6 @@
            },

            showLabelList(newVal) {

            }



        },



        created() {

@@ -375,10 +375,12 @@
            const {

                houseCode,

                id,

                type

                type,

                addressType

            } = option

            this.houseCode = houseCode

            this.currentId = id

            this.addressType = addressType

            if (this.currentId || this.houseCode) {

                this.getBuildingDetail()

            }

@@ -444,7 +446,8 @@
                let idorCodeParams = {}

                if (this.houseCode) {

                    idorCodeParams = {

                        houseCode: this.houseCode

                        houseCode: this.houseCode,

                        addressType:this.addressType

                    }

                }

                if (this.currentId) {