修复问题

Lou

2023-12-28 58d533b992d434f9e82cebf5771af488744aecb8

修复问题

 api/user.js

@@ -54,16 +54,7 @@
    })
}

// 获取用户信息
export const getUser = (id) => {
    return http.request({
        url: '/api/blade-user/detail',
        method: 'GET',
        params: {
            id
        }
    })
}


// 获取所有用户
export const getUserList = () => {
@@ -103,6 +94,30 @@
    })
}


// 获取用户信息
export const getUser = (id) => {
    return http.request({
        url: '/blade-system/user/detail',
        method: 'GET',
        params: {
            id
        }
    })
}

// 获取用户信息
export const fetchUserInfo = (id) => {
    return http.request({
        url: '/blade-system/user/details',
        method: 'GET',
        params: {
            id
        }
    })
}


export default {
    token,
    userInfo,

 common/setting.js

@@ -11,7 +11,8 @@
    // 开发环境接口Url
    // devUrl:'http://z4042833u6.wicp.vip',
    // devUrl: 'http://192.168.0.106:9528',
    devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl: 'https://srgdjczzxtpt.com:2080/api',
    devUrl:'https://kt39592615.goho.co',
    minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
    // minioBaseUrl:"http://192.168.0.103:9528/",
    // minioBaseUrl: 'https://srgdjczzxtpt.com:2080/',

 pages/circle/index.vue

@@ -14,7 +14,7 @@
            <view class="content">
                <view class="topic-item" v-for="(item,index) in list">
                    <view class="flex">
                        <u-avatar size="44" :src="item.avatar"></u-avatar>
                        <u-avatar size="44" :src="showAvatar(item.avatar)"></u-avatar>
                        <view class="ml-20 flex f-d-c">
                            <text class="f-26 mb-10">{{item.name}}</text>
                            <text class="f-24 c-66">{{item.createTime}}</text>
@@ -51,7 +51,7 @@
                        </view>
                        <scroll-view scroll-y="true" class="popup-scroll" v-if="commentList.length">
                            <view class="comment-item flex" v-for="(i,k) in commentList" :key="k">
                                <u-avatar size="40" :src="i.avatar"></u-avatar>
                                <u-avatar size="40" :src="showAvatar(i.avatar)"></u-avatar>
                                <view class="ml-20 flex f-d-c">
                                    <text class="f-26 c-99">{{i.name}}</text>
                                    <view class="comment-content f-28">
@@ -143,6 +143,11 @@

        methods: {

			
            showAvatar(src){
                return `${minioBaseUrl}${src}`
            },

            refreshList() {
                this.keyword = "";
                this.$refs.paging.reload();

 pages/home/index.vue

@@ -78,12 +78,6 @@
                <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">

@@ -114,26 +108,6 @@
                    </view>

                </view>

            </view>



            <!-- <view class="mb-20 p-20" v-if="roleType == 2">

                <caption-row title="社区" />

                <view class="mt-20">

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

                        <u-grid-item @click="navigatorPage(`/subPackage/article/communityList?type=1`)">

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

                            <text class="f-26  mt-10">选举调查</text>

                        </u-grid-item>

                        <u-grid-item @click="navigatorPage(`/subPackage/article/communityList?type=0`)">

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

                            <text class="f-26  mt-10">公益报名</text>

                        </u-grid-item>

                        <u-grid-item @click="navigatorPage('')">

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

                            <text class="f-26  mt-10">公共收益</text>

                        </u-grid-item>

                    </u-grid>

                </view>

            </view> -->



            <view class="bgc-ff mb-20 p-20 pb-20" v-if="jobList.length">

                <caption-row title="工作台" />


 pages/login/login-account.vue

@@ -110,6 +110,7 @@
<script>
    import md5 from '@/utils/md5.js'
    import loginMixin from '@/mixin/loginMixin'
    import { fetchUserInfo } from "@/api/user.js"
    export default {
        onLoad(option) {
            const {
@@ -183,11 +184,12 @@
                        .token(this.tenantId, this.form.phone, md5(this.form.password))
                        .then(data => {
                            uni.setStorageSync("phoneNmber", this.form.phone)
                            // this.getUserInfo(data);
                            this.$u.func.login(data)
                        })
                        .catch(err => {
                            this.$u.func.showToast({
                                title: err.data.error_description
                                title: err.data.error_description  ||  "服务器错误" 
                            })
                        })
                })
@@ -200,7 +202,17 @@
                    this.$set(this.passwordProps, "passwordIcon", "eye-off")
                this.passwordProps.passwordType == "password" ? this.$set(this.passwordProps, "passwordType", "text") :
                    this.$set(this.passwordProps, "passwordType", "password")
            },
			
            getUserInfo(data){
               fetchUserInfo(data.user_id).then(res=>{
                   console.log(res)
                   if(res.code == 200){
                           this.$u.vuex('userInfo',JSON.parse(res.data))
            }
               })
            },
			
        }
    }
</script>

 pages/user/center.vue

@@ -11,9 +11,9 @@
            <!-- 用户信息 -->
            <view class="user-box">
                <view class="left">
                    <image v-if="userInfo.avatar" :src="userInfo.avatar" class="avatar" mode="aspectFill"></image>
                    <image v-if="userInfo.avatar" :src="setAvatar(userInfo.avatar)" class="avatar" mode="aspectFill"></image>
                    <image v-else src="/static/icon/user-01.png" class="avatar" mode="aspectFill"></image>
                    <view class="user-name">{{ userInfo.nick_name }}</view>
                    <view class="user-name">{{ userInfo.real_name }}</view>
                    <!-- <view class="tag">{{ userInfo.tenant_id }}</view> -->
                </view>
                <view @click="navigator('/subPackage/user/editUserInfo/editUserInfo')" class="edit-btn">编辑资料</view>
@@ -90,8 +90,8 @@

<script>
    
    import  userInfo from "@/api/user.js"
	
    import { fetchUserInfo } from "@/api/user.js"
    import { minioBaseUrl } from "@/common/setting.js"
    export default {
        data() {
            return {
@@ -108,7 +108,8 @@
                    }
                ],
                roleType: 1,
                addressType:1
                addressType:1,
                user_info:{}
            };
        },
        
@@ -125,13 +126,35 @@
        
        mounted() {
            this.setHeadHeight()
			
        },
        methods: {
            
            
            setAvatar(avatar){
                return `${minioBaseUrl}${avatar}`
            },
			
			
            getUserInfo(){
                userInfo().then(res=>{
                let id = uni.getStorageSync("userInfo").user_id;
                // console.log("userInfo===>",  uni.getStorageSync("userInfo"))
                // return;
               fetchUserInfo(id).then(res=>{
                    console.log(res)
                   if(res.code == 200){
                       console.log(JSON.parse(res.data));
                       return;
                        let data =  res.data;
                        let userInfo = res.data;
					   
                        data = JSON.parse(data);
                       if(data.avatar){
                           data.avatar = `${minioBaseUrl}${data.avatar}`
                       }
                       this.user_info = data;
                       this.$u.vuex('userInfo',JSON.parse(userInfo))
                    }   
                })
            },
            

 subPackage/label/hotelList.vue

@@ -10,11 +10,12 @@
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                    <text class="f-28">时间</text>
                    <text class="f-28 c-66">{{i.applyTime}}</text>
                    <text class="f-28 c-66">{{i.createTime}}</text>
                </view>
            </view>
        </view>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
        <u-toast ref="uToast"></u-toast>
    </view>
</template>

@@ -41,6 +42,14 @@

        methods: {
            getList() {
                this.$nextTick(() => {
                    this.loadingStatus = 'loadmore'
                    this.$refs.uToast.show({
                        type: 'loading',
                        message: '正在加载',
                        duration: 9999999
                    })
                })
                getHotelReportingList({
                    checkUserId: uni.getStorageSync("userInfo").user_id,
                    page: this.currentPage,
@@ -55,6 +64,9 @@
                    }
                    let records = res.data.records;
                    this.list = [...this.list, ...records]
                    this.$nextTick(() => {
                        this.$refs.uToast.isShow = false
                    })
                    this.loadingStatus = 'nomore'
                })
            },

 subPackage/statistics/index.vue

@@ -239,7 +239,7 @@
            
            setNumber(num){
                if(num){
                    let n = Number(reportData.result2) * 100
                    let n = Number(this.reportData.result2) * 100
                    return  n.toFixed(2)
                }else {
                    return num

 subPackage/task/index.vue

@@ -136,16 +136,6 @@
                    <u-icon name="arrow-right" color="#999"></u-icon>
                </view>
            </view>
            <!-- <view class="nav-item flex j-c-s-b a-i-c" @click="navTo()">
                <text class="f-28">取保候审</text>
                <view class="flex">
                    <block v-if="false">
                        <text class="f-28 c-99">待处理</text>
                        <view class="dot bgc-main">{{countInfo.comprehensiveTask}}</view>
                    </block>
                    <u-icon name="arrow-right" color="#999"></u-icon>
                </view>
            </view> -->
        </view>
    </view>
</template>
@@ -188,8 +178,7 @@
                    for(let i of list){
                        i.count = 0;
                        if(i.remark == '1'){
                            if(i.name == "报事报修"){
                            }
                            if (i.name == "报事报修") {}
                            this.comprehensive.push(i)
                        }else {
                            this.securityList.push(i)
@@ -303,6 +292,7 @@
    .mb-20 {
        margin-bottom: 20rpx;
    }

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

 subPackage/user/editUserInfo/editUserInfo.vue

@@ -10,7 +10,7 @@
            <view class="form-item flex j-c-s-b a-i-c">
                <text class="f-30">昵称</text>
                <view class="nickname">
                    <input class="nickname-value" type="nickname"  placeholder="请输入昵称"  v-model="info.nick_name"  @blur="getInputValue"  />
                    <input class="nickname-value" type="nickname"  placeholder="请输入昵称"  v-model="info.realName"  @blur="getInputValue"  />
                </view>
                
            </view>
@@ -28,7 +28,8 @@
    import {
        prodUrl,
        clientId,
        clientSecret
        clientSecret,
        minioBaseUrl
    } from '@/common/setting'
    export default {
        data(){
@@ -36,8 +37,9 @@
                avatar:"",
                info:{
                    avatar:"",
                    nick_name:"",
                    id:""
                    realName:"",
                    id:"",
                    deptId:""
                },
                header: {},
                uploadConfig: {
@@ -48,11 +50,16 @@
        },
        onLoad() {
            this.getHeader()
            this.avatar = this.userInfo.avatar;
            this.info.avatar = this.userInfo.avatar;
            this.info.nick_name = this.userInfo.nick_name;
            this.info.id = uni.getStorageSync("userInfo").user_id
            this.info.deptId = uni.getStorageSync("userInfo").dept_id
            let { avatar,real_name,user_id,dept_id }  = uni.getStorageSync("userInfo");
            if(avatar){
                this.avatar = `${minioBaseUrl}${avatar}`
            }else {
                this.avatar = avatar;
            }
            this.info.avatar = avatar;
            this.info.realName = real_name
            this.info.id = user_id
            this.info.deptId = dept_id
        },
        methods:{
            
@@ -92,7 +99,7 @@
            
            getInputValue(e){
                console.log(e);
                this.info.nickname = e.detail.value;
                this.info.realName = e.detail.value;
            },
            
            
@@ -103,6 +110,10 @@
                            title:res.msg
                        })
                        setTimeout(()=>{
                         let userInfo =    uni.getStorageSync("userInfo");
                         userInfo.avatar = this.info.avatar;
                         userInfo.real_name = this.info.realName;
                         this.$u.vuex('userInfo',userInfo);	  
                            uni.navigateBack()
                        },300)
                    }

 subPackage/workbench/components/formItem.vue

@@ -7,7 +7,7 @@
            <u-form-item label="电话号码" class="form-item">

                <u--input v-model="form.telephone" border="none" placeholder="请填写电话号码"></u--input>

            </u-form-item>

            <u-form-item label="根据地" class="form-item">

            <u-form-item label="暂住地" class="form-item">

                <u--input v-model="form.tempAddress" border="none" placeholder="请填写地址"></u--input>

            </u-form-item>

        </u-form>

@@ -38,6 +38,7 @@
    .form-box {
        background-color: #fff;
        padding: 0 30rpx;



        .form-item {

            border-bottom: 1rpx solid #f6f6f6;

            padding: 0 20rpx;


 subPackage/workbench/views/cscj.vue

@@ -1,8 +1,6 @@
<template>

    <view class="container">

        <view class="wrap">





            <u-form labelWidth="70" :model="form" :rules="rules" ref="form">

                <view class="item">

                    <!-- u-form-item v-if="!currentId" @click="showPicker = true" class="form-item" labelWidth="100" label="楼栋:"

@@ -25,9 +23,10 @@


                    <u-form-item @click="popup" class="form-item" labelWidth="100" label="标签:" :required="isRequired"

                        :disabled="isDisabled" prop="label">

                        <u--input border="none"  v-model="categoryValue"  disabled disabledColor="#ffffff" placeholder="请选择">

                        </u--input>

                        <u-icon slot="right" name="arrow-right"  v-if="!currentId"></u-icon>

                        <u-input border="none" v-model="categoryValue" disabled disabledColor="#ffffff"

                            placeholder="请选择">

                        </u-input>

                        <u-icon v-if="!currentId" slot="right" name="arrow-right"></u-icon>

                    </u-form-item>

                    <!-- <view v-if="showLabelList.length" class="label" style="border-bottom:1px solid eff1f3;">

                        <view v-for="(item,index) in showLabelList" :key="index" class="activeLabel">

@@ -35,14 +34,12 @@
                                @close="delTag(item)" :text="item.text"></u-tag>

                        </view>

                    </view> -->

					
                    <!-- <view v-if="categoryValue.length" class="label" style="border-bottom:1px solid eff1f3;">

                        <view v-for="(item,index) in categoryValue" :key="index" class="activeLabel">

                            <u-tag :closable="currentId?false:true"  size="mini"

                                @close="delTag()" :text="item.categoryName"></u-tag>

                        </view>

                    </view> -->

					
                    <u-form-item class="form-item" labelWidth="100" label="备注:" prop="remark">

                        <u--input  v-if="!currentId" border="none" v-model="form.remark" placeholder="请输入">

                        </u--input>

@@ -51,8 +48,6 @@
                        </view>

                        

                    </u-form-item>



					


                    <u-form-item label="经纬度:" prop="location" labelWidth="100">

                        <view class="address-row flex j-c-s-b a-i-c">

@@ -67,6 +62,13 @@
                            </view>

                        </view>

                    </u-form-item>



                    <u-form-item label="地址:" labelWidth="100" v-if="form.location">

                        <view class="address-row">

                            {{form.location}}

                        </view>

                    </u-form-item>



                </view>



                <view class="item">

@@ -74,13 +76,13 @@
                        <box-title title="负责人信息"></box-title>

                    </view>

                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"

                        label="场所负责人:" prop="username">

                        <u--input border="none" v-model="form.username" placeholder="请输入">

                        label="场所负责人:" prop="principal">

                        <u--input border="none" v-model="form.principal" placeholder="请输入">

                        </u--input>

                    </u-form-item>

                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"

                        label="手机号:" prop="phone">

                        <u--input border="none" v-model="form.phone" placeholder="请输入">

                        label="手机号:" prop="principalPhone">

                        <u--input border="none" v-model="form.principalPhone" placeholder="请输入">

                        </u--input>

                    </u-form-item>

                </view>

@@ -105,7 +107,7 @@






            <view class="item">

            <view class="item" v-if="currentId">

                <view class="box-title">

                    <box-title title="综治网格">

                        <template slot="titleMore">

@@ -135,7 +137,7 @@






            <view class="item">

            <view class="item" v-if="currentId">

                <view class="box-title">

                    <box-title title="公安网格">

                        <template slot="titleMore">

@@ -165,8 +167,9 @@
            @cancel="showPicker = false"></u-picker>





        <u-picker :show="isShowCatePicker"  :defaultIndex="categoryIndex"  ref="catePicker" keyName="categoryName" :columns="categoryList"

            @confirm="confirmCategory" @change="changeCategory" @cancel="isShowCatePicker = false"></u-picker>

        <u-picker :show="isShowCatePicker" :defaultIndex="categoryIndex" ref="catePicker" keyName="categoryName"

            :columns="categoryList" @confirm="confirmCategory" @change="changeCategory"

            @cancel="isShowCatePicker = false"></u-picker>





    </view>

@@ -220,8 +223,8 @@
                    remark: "",

                    imageUrls: "",

                    placeName: "",

                    username: '',

                    phone: '',

                    principal: '',

                    principalPhone: '',

                    lat: '',

                    lng: '',

                    location:''

@@ -383,7 +386,7 @@
                categoryIndex: [],

                firstId: "",

                secondId: "",

                categoryValue: []

                categoryValue: ""

            }

        },

        created() {

@@ -614,8 +617,10 @@
                    this.categoryValue = data.placePoiLabelVOList[data.placePoiLabelVOList.length-1].labelName;

                    uni.$u.sleep(500).then(() => {

                       data.placePoiLabelVOList.forEach(item=>{

                         let firstIndex = this.categoryList[0].findIndex(i => i.categoryNo==item.poiCode)

                         let childIndex = this.categoryList[1].findIndex(i => i.categoryNo == item.poiCode)

                            let firstIndex = this.categoryList[0].findIndex(i => i.categoryNo ==

                                item.poiCode)

                            let childIndex = this.categoryList[1].findIndex(i => i.categoryNo ==

                                item.poiCode)

                         this.categoryIndex = [firstIndex,childIndex]

                       })                      

                    })

@@ -720,7 +725,7 @@
                    success: (res) => {

                        this.form.lat = res.latitude;

                        this.form.lng = res.longitude;

                        this.form.laction = res.address;

                        this.form.location = res.address;

                        this.form.jwd =

                            `${Number(res.longitude).toFixed(6)},${Number(res.latitude).toFixed(6)}`

                    }

@@ -799,6 +804,7 @@
            //弹出层打开

            popup() {

                // this.$refs.uniPopup.open()

                if (this.currentId) return;

                this.isShowCatePicker = true;



            },


 subPackage/workbench/views/cshw.vue

@@ -40,7 +40,7 @@
                </view>

                <view class="item-row flex a-i-c j-c-s-b">

                    <text class="f-28">地址</text>

                    <text class="address f-28 c-66">{{ item.localtion ? item.localtion : '未完善' }}</text>

                    <text class="address f-28 c-66">{{ item.location ? item.location : '未完善' }}</text>

                </view>

                <view class="item-row flex a-i-c j-c-s-b">

                    <text class="f-28">法人信息</text>


 subPackage/workbench/views/editExamine.vue

@@ -4,8 +4,8 @@
            <view class="base">

                <box-title :title="'基本信息'"></box-title>

                <u-form labelWidth="70" :model="form" :rules="rules" ref="form" class="form">

                    <u-form-item label="场所位置" required class="form-item" prop="localtion" @click="getLocation">

                        <u--input border="none" v-model="form.localtion" placeholder="请选择场所位置"></u--input>

                    <u-form-item label="场所位置" required class="form-item" prop="location" @click="getLocation">

                        <u--input border="none" v-model="form.location" placeholder="请选择场所位置"></u--input>

                        <u-icon slot="right" name="arrow-right"></u-icon>

                    </u-form-item>

                    <u-form-item label="场所名称" required class="form-item" prop="placeName">

@@ -49,7 +49,7 @@
                </view>



                <view class="add-person">

                    <u-button type="success" plain @click="addPerson">在加一人</u-button>

                    <u-button type="success" plain @click="addPerson">再加一人</u-button>

                </view>

            </view>

        </view>

@@ -85,7 +85,7 @@
                form: {

                    id: '',

                    placeId: '',

                    localtion: '',

                    location: '',

                    placeName: '',

                    legalPerson: '',

                    legalTel: '',

@@ -93,7 +93,7 @@
                    planImageUrls: []

                },

                rules: {

                    localtion: {

                    location: {

                        required: true,

                        message: '请选择地址',

                        trigger: ['blur', 'change']

@@ -129,7 +129,7 @@
                        const {

                            address

                        } = addressResult

                        this.form.localtion = address

                        this.form.location = address

                    }

                })

            },

@@ -269,11 +269,10 @@
        height: 100%;

        display: flex;

        flex-direction: column;



        .main-content {

            height: 0;

            flex: 1;

            overflow-y: auto;

            // height: 0;

            // flex: 1;

            // overflow-y: auto;

            padding: 0 30rpx 250rpx 30rpx;



            .base,


 subPackage/workbench/views/examine.vue

@@ -77,8 +77,8 @@
        </view> -->

        <footer-btn @click="submit" v-if="confirmFlag == 3" text="通过" />

        <view class="footer flex a-i-c j-c-s-b" v-if="confirmFlag == 1">

            <button class="footer-btn" @click="submit(1)">通过</button>

            <button class="footer-btn" @click="submit(2)">驳回</button>

            <button class="footer-btn" @click="submit(2)">通过</button>

            <button class="footer-btn" @click="submit(3)">驳回</button>

        </view>





@@ -132,7 +132,7 @@
                    },

                    {

                        label: '场所位置',

                        name: 'localtion',

                        name: 'location',

                        value: '未完善'

                    },

                ],

@@ -269,7 +269,8 @@
                })

            },

            submit(type) {

                if (type == 2) {

                this.form.confirmFlag = type;

                if (type == 3) {

                    this.isShowModal = true;

                } else {

                    this.checkPlaceExt()


 subPackage/workbench/views/workLog.vue

@@ -46,9 +46,8 @@
            :formatter="formatter" @confirm="confirmDate" @cancel="isShowPicker = false"></u-datetime-picker>
        <!-- <u-picker :show="isShowPicker" :columns="scStatus" :defaultIndex="houseIndex" @cancel="isShowPicker = false"
            @confirm="confirmHouse()"></u-picker> -->
        <view class="footer">
            <button class="footer-btn" @click="submitInfo">提交</button>
        </view>
         <footer-btn  @click="submitInfo"   />
		
    </view>

</template>