GULIMMO
2023-11-13 16b76678a97846a548f1e6c2038f46d607b06a4b
页面样式及功能优化
9 files modified
145 ■■■■ changed files
subPackage/bs/views/rentDetail.vue 20 ●●●●● patch | view | raw | blame | history
subPackage/house/family/index.vue 11 ●●●● patch | view | raw | blame | history
subPackage/house/houseNumber/index.vue 9 ●●●●● patch | view | raw | blame | history
subPackage/house/list/index.vue 11 ●●●● patch | view | raw | blame | history
subPackage/house/member/householdLabel.vue 13 ●●●●● patch | view | raw | blame | history
subPackage/house/member/index.vue 19 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/cshw.vue 23 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/csjl.vue 21 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/rental.vue 18 ●●●● patch | view | raw | blame | history
subPackage/bs/views/rentDetail.vue
@@ -36,9 +36,8 @@
                    <view class="title">合同上传</view>
                    <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
                        :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
                        uploadIcon="/static/icon/upload.png"
                        :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg"
                        @delete="deletePic">
                        uploadIcon="/static/icon/upload.png" :maxCount="uploadConfig.maxCount"
                        :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
                    </u-upload>
                </view>
            </view>
@@ -62,9 +61,11 @@
            </view>
        </u-form>
        <!-- 事件类型下拉框 -->
        <select-bus v-if="typeShow" :show="typeShow" v-model="form[selectBusModel]" type="radio"
        <!-- <select-bus v-if="typeShow" :show="typeShow" v-model="form[selectBusModel]" type="radio"
            :popupTitle="selectBusTitle" :dataLists="selectBusList" @cancel="typeShow = false" @submit="typeSelect">
        </select-bus>
        </select-bus> -->
        <u-picker :closeOnClickOverlay="true" v-if="typeShow" :show="typeShow" :columns="[selectBusList]"
            @close="typeShow = false" @cancel="typeShow = false" keyName="name" @confirm="typeSelect"></u-picker>
        <!--出租时间选择-->
        <u-datetime-picker v-model="currentTime" v-if="rentTimeShow" :closeOnClickOverlay="true"
            @close="rentTimeShow = false" :show="rentTimeShow" mode="date" @confirm="rentTimeConfirm"
@@ -245,9 +246,10 @@
                this.typeShow = true
            },
            //类型选择确认
            typeSelect(item) {
                this[this.selectBusModel] = item.name
                this.form[this.selectBusKey] = item.value
            typeSelect(e) {
                const [ result ] = e.value
                this[this.selectBusModel] = result.name
                this.form[this.selectBusKey] = result.value
                this.typeShow = !this.typeShow
            },
            rentTimeClick() {
@@ -570,6 +572,7 @@
                background-color: #ffffff;
                margin-top: 30rpx;
                border-radius: 8rpx;
                .box-title {
                    display: flex;
                    justify-content: space-between;
@@ -631,6 +634,7 @@
            }
        }
    }
    /deep/ .u-form-item {
        padding: 5rpx 20rpx;
        border-bottom: 1px solid #eff1f3;
subPackage/house/family/index.vue
@@ -78,6 +78,7 @@
                <u-divider text="已经到底了"></u-divider>
            </view>
        </view>
        <u-toast ref="uToast"></u-toast>
    </view>
</template>
@@ -126,9 +127,10 @@
        },
        methods: {
            async getBuildingList() {
                uni.showToast({
                    title: '数据加载中',
                    icon: 'loading'
                this.$refs.uToast.show({
                    type: 'loading',
                    message: '正在加载',
                    duration: 9999999
                })
                this.isShowBuild = false
                this.isShowShop = false
@@ -154,6 +156,9 @@
                    this.isShowShop = true
                    this.shopList = shopList || []
                }
                this.$nextTick(() => {
                    this.$refs.uToast.isShow = false
                })
            },
            pushPage(name, scItem) {
                const {
subPackage/house/houseNumber/index.vue
@@ -41,6 +41,7 @@
                <line-item :list="firemanData"></line-item>
            </view>
        </view>
        <u-toast ref="uToast"></u-toast>
        <view class="btn-box">
            <view class="sl-box" @click="csjlClick">
                <u-icon name="/static/icon/menu-01.png" size="30"></u-icon>
@@ -204,6 +205,11 @@
        },
        methods: {
            async getBuildingDetail() {
                this.$refs.uToast.show({
                    type: 'loading',
                    message: '正在加载',
                    duration: 9999999
                })
                // const {
                //     code,
                //     data
@@ -285,6 +291,9 @@
                    latitude: lat,
                    longitude: lng,
                 }]
                this.$nextTick(() => {
                    this.$refs.uToast.isShow = false
                })
            },
            imgPreview(value) {
                uni.previewImage({
subPackage/house/list/index.vue
@@ -26,7 +26,7 @@
                    </view>
                </view>
            </view>
            <u-toast ref="uToast"></u-toast>
            <u-divider text="已经到底了"></u-divider>
        </view>
    </view>
@@ -71,6 +71,11 @@
        },
        methods: {
            async getHouseInfo() {
                this.$refs.uToast.show({
                    type: 'loading',
                    message: '正在加载',
                    duration: 9999999
                })
                const param = {
                    type: 2,
                    code: this.currentId,
@@ -97,7 +102,9 @@
                        title: '-'
                    }]
                }
                this.$nextTick(() => {
                    this.$refs.uToast.isShow = false
                })
            },
            pushPage(value) {
                const {
subPackage/house/member/householdLabel.vue
@@ -24,10 +24,9 @@
                    <newBoxTitle :title="item.name"></newBoxTitle>
                    <view class="label-btn-box">
                        <view v-for="(item, k) in item.children" :key="k">
                            <u-button size="mini" type="primary"
                                :color="item.color"
                                :style="{color: item.color && '#fff'}"
                                :text="item.name" @click="showLabelPopup(item)"></u-button>
                            <u-button size="mini" type="primary" :color="item.color"
                                :style="{color: item.color && '#fff'}" :text="item.name"
                                @click="showLabelPopup(item)"></u-button>
                        </view>
                    </view>
                </view>
@@ -120,6 +119,11 @@
        created() {},
        mounted() {
            this.getDoorPlateAddressDetail()
            this.$nextTick(() => {
                if (this.labelBtnList.length === 0) {
                    this.getLabelList()
                }
            })
        },
        onLoad(option) {
            const data = JSON.parse(option.data);
@@ -255,7 +259,6 @@
    }
</style>
<style scoped lang="scss">
    .container {
        position: relative;
        width: 100%;
subPackage/house/member/index.vue
@@ -159,9 +159,11 @@
        </view>
        <!-- 事件类型下拉框 -->
        <select-bus v-if="typeShow" :show="typeShow" v-model="form[selectBusModel]" type="radio"
    <!--     <select-bus v-if="typeShow" :show="typeShow" v-model="form[selectBusModel]" type="radio"
            :popupTitle="selectBusTitle" :dataLists="selectBusList" @cancel="typeShow = false" @submit="typeSelect">
        </select-bus>
        </select-bus> -->
        <u-picker :closeOnClickOverlay="true" v-if="typeShow" :show="typeShow" :columns="[selectBusList]"
            @close="typeShow = false" @cancel="typeShow = false" keyName="name" @confirm="typeSelect"></u-picker>
    </view>
</template>
@@ -354,8 +356,9 @@
            },
            //类型选择确认
            typeSelect(item) {
                this[this.selectBusModel] = item.name
                this.form[this.selectBusModel] = item.value
                const [ result ] = e.value
                this[this.selectBusModel] = result.name
                this.form[this.selectBusKey] = result.value
                this.typeShow = !this.typeShow
            },
            //表单提交
@@ -434,6 +437,7 @@
        flex-direction: column;
        background: #F5F5F5;
        .main {
            position: relative;
            height: 0;
@@ -445,7 +449,8 @@
                height: 0;
                flex: 1;
                overflow-y: auto;
                padding-bottom: 36rpx;
                padding-bottom: 120rpx;
                // padding-bottom: 36rpx;
            }
@@ -454,6 +459,10 @@
                justify-content: space-around;
                align-items: center;
                height: 116rpx;
                position: fixed;
                left: 0;
                bottom: 0;
                width: 100%;
            }
        }
subPackage/workbench/views/cshw.vue
@@ -13,11 +13,13 @@
            </view>
        </u-sticky>
        <view class="list">
            <view class="list-item bgc-ff mb-20" v-for="item in siteList" :key="item.id" @click="pushPage(item.placeId, item.id)">
            <view class="list-item bgc-ff mb-20" v-for="item in siteList" :key="item.id"
                @click="pushPage(item.placeId, item.id)">
                <view class="item-title flex a-i-c j-c-s-b mb-20">
                    <text class="f-32 fw">{{ item.placeName ? item.placeName : '场所信息未完善' }}</text>
                    <!-- <u-tag text="待审批" type="warning" plain plainFill></u-tag> -->
                    <u-tag class="u_tag" size="mini" :text="findObjValue(item.confirmFlag, tabList).name" :type="findObjValue(item.confirmFlag, tabList).type" plain plainFill></u-tag>
                    <u-tag class="u_tag" size="mini" :text="findObjValue(item.confirmFlag, tabList).name"
                        :type="findObjValue(item.confirmFlag, tabList).type" plain plainFill></u-tag>
                    <!-- <u-tag text="审核拒绝" type="error" plain plainFill></u-tag> -->
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
@@ -30,6 +32,7 @@
                </view>
            </view>
        </view>
        <u-toast ref="uToast"></u-toast>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
    </view>
</template>
@@ -81,12 +84,19 @@
        },
        methods: {
            async getSiteList() {
                this.$refs.uToast.show({
                    type: 'loading',
                    message: '正在加载',
                    duration: 9999999
                })
                this.loadingStatus = 'loadingmore'
                const params = {
                    placeName: this.keyWord,
                    confirmFlag: this.tabStatus
                }
                const { roleName } = this.currentRole
                const {
                    roleName
                } = this.currentRole
                const res = await getSiteMaintenanceData({
                    ...params,
                    roleName,
@@ -107,6 +117,9 @@
                    return
                }
                this.siteList = [...this.siteList, ...records]
                this.$nextTick(() => {
                    this.$refs.uToast.isShow = false
                })
                this.loadingStatus = 'nomore'
            },
            changeTab(e) {
@@ -134,7 +147,9 @@
                return res
            },
            pushPage(placeId, id) {
                const { roleAlias } = this.currentRole
                const {
                    roleAlias
                } = this.currentRole
                if (roleAlias === "inhabitant") {
                    return
                }
subPackage/workbench/views/csjl.vue
@@ -7,7 +7,8 @@
                </view>
                <view class="search">
                    <u-search placeholder="请输入场所名称" v-model="iptContext" :clearabled="true" :showAction="true"
                        :animation="true" @change="keyWordChange" @search="searchConfirm" @clear="clearConfirm"></u-search>
                        :animation="true" @change="keyWordChange" @search="searchConfirm"
                        @clear="clearConfirm"></u-search>
                </view>
            </view>
        </u-sticky>
@@ -30,6 +31,7 @@
                </view>
            </view>
        </view>
        <u-toast ref="uToast"></u-toast>
        <u-loadmore :status="status" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
    </view>
</template>
@@ -76,8 +78,15 @@
        },
        methods: {
            async getrRecordList(placeName = this.iptContext, isPerfect = this.tabsType) {
                this.$refs.uToast.show({
                    type: 'loading',
                    message: '正在加载',
                    duration: 9999999
                })
                this.status = 'loadmore'
                const { roleName } = this.currentRole
                const {
                    roleName
                } = this.currentRole
                console.log(this.currentRole);
                const {
                    code,
@@ -98,6 +107,9 @@
                    return
                }
                this.recordsData = [...this.recordsData, ...records]
                this.$nextTick(() => {
                    this.$refs.uToast.isShow = false
                })
                this.status = 'nomore'
            },
            tabClick({
@@ -123,7 +135,9 @@
                this.iptContext = ''
                this.searchConfirm()
            },
            pushPage({ id }) {
            pushPage({
                id
            }) {
                if (!id) {
                    uni.showToast({
                        title: "关键参数为空",
@@ -162,6 +176,7 @@
    .info-box {
        padding: 20rpx 30rpx;
        // background-color: #f6f6f6;
        .records-card {
            background: #fff;
subPackage/workbench/views/rental.vue
@@ -59,7 +59,7 @@
                </view>
            </view>
        </view>
        <u-toast ref="uToast"></u-toast>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="已经到底了" line />
    </view>
</template>
@@ -195,7 +195,9 @@
                });
            },
            getStatistics(auditStatus = '') {
                const { roleName } = this.currentRole
                const {
                    roleName
                } = this.currentRole
                let params = {
                    roleName
                }
@@ -218,7 +220,14 @@
            },
            async getRentalHouseInfo(params = {}) {
                this.loadingStatus = 'loadmore'
                const { roleName } = this.currentRole
                this.$refs.uToast.show({
                    type: 'loading',
                    message: '正在加载',
                    duration: 9999999
                })
                const {
                    roleName
                } = this.currentRole
                const {
                    code,
                    data: {
@@ -238,6 +247,9 @@
                    return
                }
                this.tenantList = [...this.tenantList, ...records]
                this.$nextTick(() => {
                    this.$refs.uToast.isShow = false
                })
                this.loadingStatus = 'nomore'
            },
            search() {