修复问题

Lou

2023-12-25 32627760d62fcc7261333973a294ebab9b6419a9

修复问题

 api/reporting/reporting.js

@@ -117,7 +117,7 @@
//修改旅店安全
export const setHotelReporting = (data) => {
    return http.request({
        url: '/blade-task/task/update',
        url: '/blade-taskHotelReporting/taskHotelReporting/update',
        method: 'POST',
        data: data
    })

 api/system/role.js

@@ -77,13 +77,11 @@
    })
}

export const dynamicMenu = (roleId) => {
export const dynamicMenu = (params) => {
    return http.request({
        url: '/blade-system/menu/dynamicMenu',
        method: 'GET',
        params: {
            roleId
        }
        params
    })
}


 pages/home/index.vue

@@ -67,6 +67,12 @@
                <view class="nav bgc-ff" v-if="liveList.length || roleType == 2">

                    <!-- <caption-row title="生活" /> -->

                    <u-grid :border="false" col="4">

                    <!--     <u-grid-item @click.native="navigatorPage('subPackage/label/bail')"  v-if="curSelectSite.addressType == 1">

                            <view class="nav-item flex f-d-c a-i-c">

                                <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>

                                <text class="nav-item-text f-26 mt-20">取保候审</text>

                            </view>

                        </u-grid-item> -->

                        <block v-if="liveList.length">

                            <u-grid-item @click.native="navigatorPage(i.path)" v-for="(i,k) in liveList" :key="k">

                                <view class="nav-item flex f-d-c a-i-c">

@@ -275,14 +281,6 @@
            })

        },



        onReady() {

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

            //     uni.redirectTo({

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

            //     })

            // }

        },



        onShareAppMessage() {



        },

@@ -389,8 +387,6 @@
                    phoneNumber: phone

                })

            },







            async getNoticeList() {

                const param = {

@@ -504,7 +500,6 @@
            getMenuList() {

                this.menuList = uni.getStorageSync("menu")

                this.liveList = this.setLiveMenu(this.hasMenu('生活'));

                // this.contactList = this.hasMenu('快捷拨号');

                this.jobList = this.hasMenu('工作台')

                if (this.menuList.length) {

                    this.getContactMenu();

@@ -554,11 +549,13 @@
                if (arr.length) {

                    let index = this.getLiveMenuItem(arr, 1)

                    let index2 = this.getLiveMenuItem(arr, 2)

                    let index3 = this.getLiveMenuItem(arr, 3)

                    if (this.curSelectSite.addressType == 1) {

                        if (index != -1) {

                            arr.splice(index, 1)

                            index = this.getLiveMenuItem(arr, 1)

                            index2 = this.getLiveMenuItem(arr, 2)

                            index3 = this.getLiveMenuItem(arr, 3)

                        }

                        if (index2 == -1 && this.roleType == 2) {

                            arr.push({

@@ -568,6 +565,18 @@
                            })

                            index = this.getLiveMenuItem(arr, 1)

                            index2 = this.getLiveMenuItem(arr, 2)

                            index3 = this.getLiveMenuItem(arr, 3)

                        }

                        console.log("index3===>",index3)

                        if(index3 ==  -1){

                            arr.push({

                                name: "取保候审",

                                path: "/subPackage/label/bail",

                                pictureImg: "/static/icon/nav-11.png"

                            })

                            index = this.getLiveMenuItem(arr, 1)

                            index2 = this.getLiveMenuItem(arr, 2)

                            index3 = this.getLiveMenuItem(arr, 3)

                        }



                    } else {

@@ -579,11 +588,19 @@
                            })

                            index = this.getLiveMenuItem(arr, 1)

                            index2 = this.getLiveMenuItem(arr, 2)

                            index3 = this.getLiveMenuItem(arr, 3)

                        }

                        if (index2 != -1) {

                            arr.splice(index2, 1)

                            index = this.getLiveMenuItem(arr, 1)

                            index2 = this.getLiveMenuItem(arr, 2)

                            index3 = this.getLiveMenuItem(arr, 3)

                        }

                        if(index3 != -1){

                            arr.splice(index3, 1)

                            index = this.getLiveMenuItem(arr, 1)

                            index2 = this.getLiveMenuItem(arr, 2)

                            index3 = this.getLiveMenuItem(arr, 3)

                        }

                    }

                }

@@ -594,9 +611,12 @@
                if (type == 1) {

                    let index = arr.findIndex(item => item.name == "标签报事")

                    return index;

                } else {

                } else if(type == 2){

                    let index2 = arr.findIndex(item => item.name == "租户上报")

                    return index2

                }else {

                    let index3 = arr.findIndex(item => item.name.trim() == "取保候审")

                    return index3

                }

            },



@@ -719,7 +739,6 @@
                                `/subPackage/house/roomDetails/index?id=${code}&from=scan`, "navTo")

                        } else if (doorplateType == "中门牌") {

                            if (addressLevel == 4) { //自建房

                                // this.showAction(code)

                                this.$u.func.globalNavigator(

                                    `/subPackage/house/roomDetails/detail?code=${code}`, "navTo")

                            } else { //商铺

@@ -749,24 +768,7 @@
                        })

                    }

                })

            },



            showAction(code) {

                uni.showActionSheet({

                    title: "请选择",

                    itemList: ['场所', '户室'],

                    success: (res) => {

                        if (res.tapIndex == 0) {

                            this.$u.func.globalNavigator(

                                `/subPackage/house/houseNumber/index?stdId=${code}`, "navTo")

                        } else {

                            this.$u.func.globalNavigator(

                                `/subPackage/house/roomDetails/index?id=${code}&from=scan`, "navTo")

                        }

                    }

                })

            }



        }

    }

</script>


 pages/user/center.vue

@@ -19,7 +19,7 @@
                <view @click="navigator('/subPackage/user/editUserInfo/editUserInfo')" class="edit-btn">编辑资料</view>
            </view>
            <!-- 操作按钮 -->
            <view class="nav"  v-if="roleType == 1">
            <view class="nav"  v-if="roleType == 1 && addressType == 1">
                <navigator url="/subPackage/user/family/list" hover-class="none" class="nav-item">
                    <!-- <image src="/static/images/user/n1.png" class="icon" mode=""></image> -->
                    <u-icon name="account"  color="#fff"  size="28"></u-icon>
@@ -89,6 +89,9 @@
</template>

<script>
	
    import  userInfo from "@/api/user.js"
	
    export default {
        data() {
            return {
@@ -104,23 +107,34 @@
                        url: "/subPackage/user/password/index"
                    }
                ],
                roleType: 1
                roleType: 1,
                addressType:1
            };
        },
        
        onShow() {
            // this.getUserInfo();
            let role = uni.getStorageSync('activeRole')
            if (role.roleAlias == "inhabitant") {
                this.roleType = 1
            } else {
                this.roleType = 2;
            }
            this.addressType = uni.getStorageSync("siteInfo").addressType;
        },
        
        mounted() {
            this.setHeadHeight()
        },
        methods: {
			
			
            getUserInfo(){
                userInfo().then(res=>{
                    console.log(res)
                })
            },
			
            setHeadHeight() {
                const that = this
            

 store/index.js

@@ -133,9 +133,16 @@
    },
    actions:{
        getMenuList({commit}){
            let id = uni.getStorageSync("activeRole").id;
            // let id = uni.getStorageSync("activeRole").id;
            let { id, roleName } = uni.getStorageSync("activeRole")
            return new Promise((resolve,reject)=>{
                dynamicMenu(id).then(res=>{
                 let param = {
                     roleId:id
                 }
                if(uni.getStorageSync("siteInfo").addressType == 1 && roleName == "居民"){
                    param.labelType = 1;
                }
                dynamicMenu(param).then(res=>{
                    if(res.code == 200){
                        let data = res.data;
                        if(!data) return

 subPackage/bs/views/repair.vue

@@ -49,6 +49,13 @@
                        <button class="item-btn" :style="{backgroundColor:i.background}">立即上报</button>
                    </view>
                </view>
                <view class="nav-item" @click="navTo('addRepair')"   v-if="curSelectSite.addressType == 2">
                    <image class="nav-item-bg" src="/static/icon/nav-bg-09.png" mode="aspectFill"></image>
                    <view class="nav-item-inner flex f-d-c">
                        <text class="f-32 mb-30">企业商户上报</text>
                        <button class="item-btn" style="background-color:#F4B862">立即上报</button>
                    </view>
                </view>


            </view>
@@ -98,13 +105,13 @@
                        path: "addRepair",
                        background: "#F4B862"
                    },
                    {
                        title: "企业商户上报",
                        type: 5,
                        bgImg: "/static/icon/nav-bg-09.png",
                        path: "addRepair",
                        background: "#F4B862"
                    },
                    // {
                    //     title: "企业商户上报",
                    //     type: 5,
                    //     bgImg: "/static/icon/nav-bg-09.png",
                    //     path: "addRepair",
                    //     background: "#F4B862"
                    // },

                ]
            }

 subPackage/bs/views/zhsb.vue

@@ -124,8 +124,8 @@
        background: #F6F6F6;



        .content-box {

            height: 0;

            flex: 1;

            // height: 0;

            // flex: 1;

            overflow-y: auto;

            margin: 20rpx 30rpx;

        }


 subPackage/house/member/householdLabel.vue

@@ -16,7 +16,8 @@
                    <view class="info">

                        <view>姓名：{{householdInfo.name}}</view>

                        <view class="flex">

                            手机：{{householdInfo.phoneNumber || ""}} <u-icon v-if="householdInfo.phoneNumber"  name="phone-fill" color="#4586FE"></u-icon>

                            手机：{{householdInfo.phoneNumber || ""}} <u-icon v-if="householdInfo.phoneNumber"

                                name="phone-fill" color="#4586FE"></u-icon>

                        </view>

                    </view>

                </view>

@@ -132,7 +133,7 @@
            // this.getDoorPlateAddressDetail()

        },

        onShow() {

            this.getLabelList()	
            this.getLabelList()

        },

        methods: {

            // 获取房屋详情

@@ -263,20 +264,17 @@
</style>

<style scoped lang="scss">

    .container {

        position: relative;

        width: 100%;

        height: 100%;

        display: flex;

        flex-direction: column;

        background: #f6f6f6;



        .main {

            position: relative;

            height: 0;

            flex: 1;

            display: flex;

            flex-direction: column;



            // position: relative;

            // height: 0;

            // flex: 1;

            // display: flex;

            // flex-direction: column;

            .base {

                padding: 20rpx 18rpx;

                display: flex;

@@ -291,8 +289,8 @@
            }



            .content {

                height: 0;

                flex: 1;

                // height: 0;

                // flex: 1;

                overflow-y: auto;

                margin: 20rpx 30rpx;



@@ -360,4 +358,4 @@
            }

        }

    }

</style>

</style>

 subPackage/house/roomControl/index.vue

@@ -391,7 +391,7 @@


<style scoped lang="scss">

    .container {

        position: relative;

        // position: relative;

        width: 100%;

        height: 100%;

        display: flex;

@@ -400,15 +400,15 @@
        font-size: 30rpx;



        .main {

            position: relative;

            height: 0;

            flex: 1;

            display: flex;

            flex-direction: column;

            // position: relative;

            // height: 0;

            // flex: 1;

            // display: flex;

            // flex-direction: column;



            .content {

                height: 0;

                flex: 1;

                // height: 0;

                // flex: 1;

                overflow-y: auto;

                padding: 20rpx 30rpx;




 subPackage/house/roomDetails/index.vue

@@ -460,17 +460,17 @@
        font-size: 26rpx;



        .main {

            position: relative;

            height: 0;

            flex: 1;

            // position: relative;

            // height: 0;

            // flex: 1;

            display: flex;

            flex-direction: column;

            padding: 20rpx 30rpx;

            padding-bottom: 120rpx;



            .content {

                height: 0;

                flex: 1;

                // height: 0;

                // flex: 1;

                overflow-y: auto;



                .base {


 subPackage/label/bail.vue

@@ -12,7 +12,7 @@
                    <u-input v-model="info.checkTelephone" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
                        inputAlign="right"></u-input>
                </u-form-item>
                <u-form-item label="申请名称" prop="applyName" borderBottom  required>
                <u-form-item label="申请事由" prop="applyName" borderBottom  required>
                    <u-input v-model="info.applyName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
                        inputAlign="right"></u-input>
                </u-form-item>
@@ -32,7 +32,7 @@
                        <view class="address-content f-28" v-if="info.location">
                            {{info.location}}
                        </view>
                        <view class="address-content f-28 c-99" v-if="!info.location">
                        <view class="address-content f-28"  style="color: #c0c4cc;"  v-if="!info.location">
                            请选择位置
                        </view>
                        <view class="location-btn c-main f-24"  @click="getLocation()">
@@ -88,23 +88,28 @@
                    reportType:1
                },
                rules: {
                    'name': {
                    'checkName': {
                        type: 'string',
                        required: true,
                        message: '请输入姓名',
                        trigger: ['blur', 'change']
                    },
					
                    'checkName': {
                        type: 'string',
                    'checkPhone': {
                        type: 'number',
                        required: true,
                        message: '请输入手机',
                        trigger: ['blur', 'change']
                    },
                    'checkPhone': {
                        type: 'number',
                    'applyName': {
                        type: 'string',
                        required: true,
                        message: '请输入名称',
                        message: '请输入事由',
                        trigger: ['blur', 'change']
                    },
                    'applyTime': {
                        type: 'string',
                        required: true,
                        message: '请输入选择时间',
                        trigger: ['blur', 'change']
                    },
                    'location':{
@@ -272,6 +277,7 @@
    .address-content{
        width:calc(100% - 116rpx - 20rpx);
        margin-right:20rpx;
        text-align: right;
    }
    .location-btn{
        width:116rpx;

 subPackage/label/index.vue

@@ -122,7 +122,7 @@
        methods:{
            
            getMenu(){
                let labelList = this.curSiteInfo.categoryLabelList;
                let labelList = this.curSiteInfo.categoryList;
                let navList = this.navList;
                let list = []
                for(let i =0,ii=labelList.length;i<ii;i++){

 subPackage/task/index.vue

@@ -33,8 +33,10 @@
            <view class="nav-item flex j-c-s-b a-i-c"  @click="navTo(i.path)"  v-for="i in comprehensive">
                <text class="f-28">{{i.name}}</text>
                <view class="flex">
                    <!-- <text class="f-28 c-99">待处理</text>
                    <view class="dot bgc-main">3</view> -->
                    <block v-if="i.count > 0">
                        <text class="f-28 c-99">待处理</text>
                        <view class="dot bgc-main">{{i.count}}</view>
                    </block>
                    <u-icon name="arrow-right" color="#999"></u-icon>
                </view>
            </view>
@@ -124,7 +126,7 @@
                </view>
            </view>
            
            <view class="nav-item flex j-c-s-b a-i-c" @click="navTo()"    v-for="i in securityList">
            <view class="nav-item flex j-c-s-b a-i-c" @click="navTo(i.path)"    v-for="i in securityList">
                <text class="f-28">{{i.name}}</text>
                <view class="flex">
                    <block v-if="false">
@@ -183,20 +185,33 @@
                let list = uni.getStorageSync("taskMenu");
                if(list.length){
                    for(let i of list){
                        i.count = 0;
                        if(i.remark == '1'){
                            if(i.name == "报事报修"){
                            }
                            this.comprehensive.push(i)
                        }else {
                            this.securityList.push(i)
                        }
                    }
                }
				
            },
			
		
			
            
            getCount() {
                getCountTypeNumber().then(res => {
                    if (res.code == 200) {
                        this.countInfo = res.data;
                        for(let i of this.comprehensive){
                            if(i.name == "住户审核"){
                                i.count = res.data.zhufang;
                            }
                            if(i.name == "租房管理"){
                                i.count = res.data.chuzhu;
                            }
                        }
                    }
                })
            },
@@ -204,6 +219,8 @@
                getRepairsStatistics().then(res => {
                    if (res.code == 200) {
                        this.repairsCount = res.data;
                        let index = this.comprehensive.findIndex(item=> item.name == "报事报修")
                        this.comprehensive[index].count = res.data;
                    }
                })
            },

 subPackage/workbench/views/bailReportDetail.vue

@@ -163,7 +163,7 @@
                        value: '未完善'
                    },
                    {
                        label: '申请名称',
                        label: '申请事由',
                        name: 'applyName',
                        value: '未完善'
                    },
@@ -268,8 +268,9 @@
                this.showSelectDate = false;
            },
            showPicker() {
                if (this.roleType == 1 && this.status != 2) return;
                this.isPickerShow = true
                if (this.roleType == 1){
                    this.isPickerShow = true
                };
            },

            showConfirmFlag(status) {

 subPackage/workbench/views/cscj.vue

@@ -301,17 +301,18 @@
                            value: "暂无数据"

                        }

                    ],

                    scene: [{

                            label: "场所照片",

                            name: 'imageUrls',

                            value: "",

                            useSlot: "pic",

                        },

                        {

                            label: "场所负责人",

                            name: 'username',

                            value: "未完善",

                        },

                    scene: [

                        // {

                        //     label: "场所照片",

                        //     name: 'imageUrls',

                        //     value: "",

                        //     useSlot: "pic",

                        // },

                        // {

                        //     label: "场所负责人",

                        //     name: 'username',

                        //     value: "未完善",

                        // },

                        {

                            label: "采集人",

                            name: 'createUserName',

@@ -350,30 +351,32 @@
                            value: "暂无数据"

                        }

                    ],

                    scene: [{

                            label: "消防照片",

                            useSlot: "pic",

                        },

                        {

                            label: "采集人",

                            value: "未完善"

                        },

                        {

                            label: "采集时间",

                            value: "未完善"

                        },

                        {

                            label: "消防负责人",

                            value: "未完善",

                        },

                        {

                            label: "采集人",

                            value: "未完善"

                        },

                        {

                            label: "采集时间",

                            value: "未完善",

                        },

                    scene: [

						
                        // {

                        //     label: "消防照片",

                        //     useSlot: "pic",

                        // },

                        // {

                        //     label: "采集人",

                        //     value: "未完善"

                        // },

                        // {

                        //     label: "采集时间",

                        //     value: "未完善"

                        // },

                        // {

                        //     label: "消防负责人",

                        //     value: "未完善",

                        // },

                        // {

                        //     label: "采集人",

                        //     value: "未完善"

                        // },

                        // {

                        //     label: "采集时间",

                        //     value: "未完善",

                        // },

                        {

                            label: "历史事件",

                            value: "未完善",


 subPackage/workbench/views/hotelReportDetail.vue

@@ -179,7 +179,7 @@
                ],
                currentId: '',
                currentData: {},
                id: "",
                taskId: "",
                fireImages: [],
                scImageUrls: [],
                pfImageUrls: [],
@@ -187,11 +187,12 @@
                selectStatus: "",
                remark: "",
                roleType:"",
                status:1
                status:1,
                id:""
            }
        },
        onLoad(option) {
            this.id = option.id;
            this.taskId = option.id;
            this.getDetailInfo(option.id);
            let roleName = uni.getStorageSync("activeRole").roleName
            if(roleName == "居民"){
@@ -214,6 +215,7 @@
                }).then(res => {
                    console.log(res);
                    let data = res.data;
                    this.id = data.id;
                    this.basicData.forEach(item => {
                        item.value = data[item.name]
                    })
@@ -240,6 +242,7 @@
            submit() {
                let data = {
                    id: this.id,
                    taskId:this.taskId,
                    status: this.selectStatus,
                    remark: this.remark
                }
@@ -256,11 +259,26 @@
                            title: '更新失败',
                            icon: 'error'
                        })
                        return
						
                    }else {
                        uni.showToast({
                            title: '提交成功',
                        })
                        this.reLoadPrePage();
                    }
                    uni.navigateBack()
					
                })
            },
			
            //刷新上一页数据后返回
            reLoadPrePage() {
                let pages = getCurrentPages();
                let prePage = pages[pages.length - 2];
                prePage.$vm.currentPage = 1, 
                prePage.$vm.list = [];
                prePage.$vm.getList();
                uni.navigateBack();
            },	
        }
    }
</script>

 subPackage/workbench/views/labelReportDetail.vue

@@ -107,17 +107,19 @@
                ],
                currentId: '',
                currentData: {},
                id: "",
                taskId: "",
                imageUrls: [],
                goodsImageUrls: [],
                selectStatus: "",
                remark: "",
                roleType:"",
                status:1
                status:1,
                id:""
				
            }
        },
        onLoad(option) {
            this.id = option.id;
            this.taskId = option.id;
            this.getDetailInfo(option.id);
            
            let roleName = uni.getStorageSync("activeRole").roleName
@@ -143,6 +145,7 @@
                }).then(res => {
                    console.log(res);
                    let data = res.data;
                    this.id = data.id;
                    this.status = res.confirmFlag;
                    this.basicData.forEach(item => {
                        item.value = data[item.name]
@@ -168,6 +171,7 @@
            submit() {
                let data = {
                    id: this.id,
                    taskId:this.taskId,
                    status: this.selectStatus,
                    remark: this.remark
                }
@@ -184,11 +188,26 @@
                            title: '更新失败',
                            icon: 'error'
                        })
                        return
                    }
                    uni.navigateBack()
                    }else {
                           uni.showToast({
                               title: '提交成功',
                           })
                        this.reLoadPrePage();
                    }
                    
                })
            },
			
            //刷新上一页数据后返回
            reLoadPrePage() {
                let pages = getCurrentPages();
                let prePage = pages[pages.length - 2];
                prePage.$vm.currentPage = 1, 
                prePage.$vm.list = [];
                prePage.$vm.getList();
                uni.navigateBack();
            },	
			
        }
    }
</script>

 subPackage/workbench/views/patrol.vue

@@ -8,13 +8,14 @@
                        inputAlign="right"></u-input>
                </u-form-item>
                <u-form-item label="巡查内容" borderBottom prop="context"  required>
                    <u-input type="textarea" v-model="info.context" border="none" placeholderClass="f-28 c-99"
                    <!-- <u-input type="textarea" v-model="info.context" border="none" placeholderClass="f-28 c-99"
                        inputAlign="right" placeholder="请输入巡查内容" >
                    </u-input>
                    </u-input> -->
                    <u--textarea v-model="info.context" inputAlign="right" placeholder="请输入巡查内容"  placeholderClass="f-28 c-99"></u--textarea>
                </u-form-item>

                <u-form-item label="巡查时间" prop="patrolTime" borderBottom required  @click="showSelectDate = true">
                    <u-input v-model="info.patrolTime" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
                    <u-input v-model="info.patrolTime" disabled disabledColor="#ffffff" border="none" placeholder="请选择时间"
                        placeholderClass="f-28 c-99" inputAlign="right"></u-input>
                    <u-icon slot="right" name="arrow-right"></u-icon>
                </u-form-item>
@@ -92,6 +93,11 @@
                patrolTime: Number(new Date())
            }
        },
		
        onLoad(){
            this.info.patrolTime = uni.$u.timeFormat(Number(new Date()), 'yyyy-mm-dd hh:MM:ss')
        },
		
        methods: {

            confirmDate(e) {

 subPackage/workbench/views/schoolReportDetail.vue

@@ -157,7 +157,7 @@
                ],
                currentId: '',
                currentData: {},
                id: "",
                taskId: "",
                foImageUrls: [], //四个一工程照片
                fireFacsImageUrls: [], //灭火器图片
                scImageUrls: [], // 安全通道图片
@@ -167,11 +167,12 @@
                selectStatus: "",
                remark: "",
                roleType:"",
                status:1
                status:1,
                id:""
            }
        },
        onLoad(option) {
            this.id = option.id;
            this.taskId = option.id;
            this.getDetailInfo(option.id);
            let roleName = uni.getStorageSync("activeRole").roleName
            if(roleName == "居民"){
@@ -188,6 +189,7 @@
                }).then(res => {
                    console.log(res);
                    let data = res.data;
                    this.id = data.id;
                    this.basicData.forEach(item => {
                        item.value = data[item.name] || "未完善"
                    })
@@ -214,6 +216,7 @@
            submit() {
                let data = {
                    id: this.id,
                    taskId:this.taskId,
                    status: this.selectStatus,
                    remark: this.remark
                }
@@ -230,11 +233,25 @@
                            title: '更新失败',
                            icon: 'error'
                        })
                        return
						
                    }else{
                        uni.showToast({
                            title: '提交成功',
                        })
                        this.reLoadPrePage();
                    }
                    uni.navigateBack()
                })
            },
            //刷新上一页数据后返回
            reLoadPrePage() {
                let pages = getCurrentPages();
                let prePage = pages[pages.length - 2];
                prePage.$vm.currentPage = 1, 
                prePage.$vm.list = [];
                prePage.$vm.getList();
                uni.navigateBack();
            },	
        }
    }
</script>