问题修复

zengh

2021-07-07 7001de2b8cd0b94d22815b4df65cbeb47e1ee216

问题修复

 components/contacts/contacts.vue

@@ -19,9 +19,21 @@
                        <img class="img" :src=Pdata.avatar>
                    </view>
                    <view class="t-type">{{Pdata.GroupName}}</view>
                    <view class="t-id">{{Pdata.postTime}}</view>
                    <!-- <view class="t-id">{{Pdata.postTime}}</view> -->
                </view>
                <view class="bottom">{{Pdata.GroupContent}}</view>
            </view>
        </view>
        <view class="inPColumn" v-if="fromW == 2">
            <view class="left" @click="TXLchating">
                <view class="top">
                    <view class="userImg">
                        <img class="img" :src=Pdata.avatar>
                    </view>
                    <view class="t-type">{{Pdata.realName}}</view>
                    <!-- <view class="t-id">{{Pdata.postTime}}</view> -->
                </view>
                <view class="bottom">电话：{{Pdata.phone}}</view>
            </view>
        </view>
    </view>
@@ -59,6 +71,14 @@
                    url: '/pages/groupChat/chatingQZ?chatID=' + datas.id.toString()
                });
            },
            TXLchating(){
                //发起聊天
                var datas = this.Pdata;
                //alert(datas.name)
                uni.navigateTo({
                    url: '/pages/groupChat/chating?chatID=' + datas.id.toString()
                });
            },
            onClose() { //触摸遮罩事件
                this.setData({
                    popuShow: false

 pages.json

@@ -7,12 +7,9 @@
            "path": "pages/loging/loging",
            "name": "loging",
            "style": {
                "navigationBarTitleText": "请登录"
                // "navigationBarBackgroundColor": "#0cd7e5"
                // "app-plus": {
                //     "animationType": "fade-in",
                //     "animationDuration": 300
                // }
                "navigationBarTitleText": "请登录",
                "enablePullDownRefresh": false,
                "navigationStyle": "custom"
            }
        },
        {
@@ -20,7 +17,7 @@
            "name": "loging",
            "style": {
                "navigationBarTitleText": "注册账号",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle": "white"
                // "app-plus": {
                //     "animationType": "fade-in",
@@ -143,7 +140,7 @@
            "name": "groupChat",
            "style": {
                "navigationBarTitleText": "我要说",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle":"white"
            }
        },
@@ -228,7 +225,7 @@
            "name": "equipment",
            "style": {
                "navigationBarTitleText": "巡逻管理",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle": "white"
            }
        },
@@ -260,7 +257,7 @@
            "name": "alarm_list",
            "style": {
                "navigationBarTitleText": "群防任务",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle": "white"
            }
        },
@@ -301,7 +298,7 @@
            "name": "mapJQtijiao",
            "style": {
                "navigationBarTitleText": "处理结果",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle": "white"
            }
        },
@@ -310,7 +307,7 @@
            "name": "alarmOver",
            "style": {
                "navigationBarTitleText": "任务详情",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle": "white"
            }
        },

 pages/article/article_detail.vue

@@ -2,10 +2,10 @@
    <view>
        <view class="banner">
            <image class="banner-img" :src="article.url"></image>
            <view class="banner-title">{{article.title}}</view>
        </view>
		
        <view class="banner-title">{{article.title}}</view>
        <view class="article-meta">
			
            <view class="article-author">{{article.sourceName}}</view>
            <text class="article-text">发表于</text>
            <text class="article-time">{{article.createTime}}</text>
@@ -81,16 +81,14 @@
            width: 100%;
        }
        .banner-title {
            position: relative;
            left: 20rpx;
            max-height: 84upx;
            overflow: hidden;
            position: absolute;
            left: 30upx;
            bottom: 30upx;
            width: 90%;
            font-size: 32upx;
            color: #000000;
            font-weight: 400;
            line-height: 42upx;
            color: white;
            z-index: 11;
        }
        

 pages/business/business.vue

@@ -12,7 +12,7 @@
                </navigator>
            </view>
            <view class="view-business-nav">
                <navigator class="patrolBtn" url="/pages/alarm_list/alarm_list">
                <navigator class="patrolBtn" url="/pages/patrol/patrol">
                    <image src="../../static/workbench/task2.png"></image>
                    <span>巡视任务</span>
                </navigator>
@@ -24,7 +24,7 @@
                </navigator>
            </view>
            <view class="view-business-nav">
                <navigator class="patrolBtn" url="/pages/groupChat/groupChat">
                <navigator class="patrolBtn" url="/pages/groupChat/groupChat?txlType=2">
                    <image src="../../static/workbench/task4.png"></image>
                    <span>通讯录</span>
                </navigator>

 pages/groupChat/chating.vue

@@ -206,7 +206,6 @@
            },
            // 获取聊天数据
            _getMsg(page) {
				
                var that = this;
                that.senId = WxStorage.get("ids");
                uni.request({
@@ -266,7 +265,10 @@
                        
                        that.$nextTick(() => {
                            that.isanimation = false
                            that.scrollToView = 'msg' + that.getData[0].id
                            if(that.getData.length != 0){
                                that.scrollToView = 'msg' + that.getData[0].id
                            }
							
                        })
                        // 数据加载完毕关闭动画，停止数据加载
                        clearInterval(this.loading)
@@ -365,7 +367,10 @@
                this.scrollToView = ''
                this.$nextTick(() => {
                    let len = this.getData.length -1
                    this.scrollToView = 'msg' + this.getData[0].id
                    if(this.getData.length != 0){
                        this.scrollToView = 'msg' + this.getData[0].id
                    }
					
                })
            },
            // 地图定位

 pages/groupChat/groupChat.vue

@@ -146,6 +146,7 @@
                                }
                            }
                            that.dataListP = resdata;
                            that.swiperHeight = resdata.length * 85;
                        }
                    });
                }else if(this.current == 1){
@@ -156,13 +157,33 @@
                            senderId: WxStorage.get("ids")
                        },
                        success:(res)=> {
                            var resdata = res.data.data;
                            var resdata = res.data.data;	
                            for (var i = 0; i < resdata.length; i++) {
                                if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                    resdata[i].avatar = "http://s16s652780.51mypc.cn/img/bg/qunz.png";
                                }
                            }
                            that.dataListQZ = resdata;
                            that.swiperHeight = resdata.length * 85;
                        }
                    })
                }else if(this.current == 2){
                    uni.request({
                        url:"http://s16s652780.51mypc.cn/api//blade-user/pages?current=1&size=9999",
                        method:"get",
                        data:{
                            senderId: WxStorage.get("ids")
                        },
                        success:(res)=> {
                            var resdata = res.data.data.records;
                            for (var i = 0; i < resdata.length; i++) {
					
                                if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                    resdata[i].avatar = "http://s16s652780.51mypc.cn/img/bg/img-logo.png";
                                }
                            }
                            that.dataListTXL = resdata;
                            that.swiperHeight = resdata.length * 85;
                        }
                    })
                }

 pages/loging/loging.vue

@@ -1,30 +1,50 @@
<template>
    <view id="login" ref="login">
        <!-- <span style="position: absolute;top: 0;">user: {{$store.state.message.useName}}</span> -->
        <view class="main">
            <view class="topImg">
                <image class="Timg" src="../../static/users.png" mode=""></image>
    <view class="container">
        <u-navbar :is-fixed="false" :border-bottom="false" :is-back="false" back-icon-name="arrow-leftward" title="登录"
            :background="{ background: '#fff' }" title-color="#000000">
            <view class="" slot="right">
                <image src="/static/images/login/c8.png" class="set-icon" mode="widthFix"></image>
            </view>
            <view class="titie">
                <span>群防群控APP</span>
        </u-navbar>

        <view class="content">
            <view class="top">
                <view class="titie">
                    <span>群防群控APP</span>
                </view>
                <view class="cell">
                    <view class="name">账号</view>
                    <view class="input-box">
                        <input type="text" v-model="names" placeholder="请输入账号" class="ipt" placeholder-class="hold"
                            @blur="handleInputCheck" />
                    </view>
                </view>
                <view class="cell">
                    <view class="name">密码</view>
                    <view class="input-box">
                        <input type="password" v-model="passwords" placeholder="请输入密码" class="ipt"
                            placeholder-class="hold" @blur="handleInputCheck" />
                    </view>
                </view>
				
                <!-- <view class="agree">
                    登录即代表同意
                    <text class="a">《用户协议》</text>
                    和
                    <text class="a">《隐私政策》</text>
                </view> -->
                <button class="submit" @click="longing(names,passwords)" :disabled="disabled">登录</button>
                <view class="tip">未注册用户注册审核通过后才可登录</view>
                <navigator url="/pages/registerUser/registerUser" hover-class="none" class="change">注册 ></navigator>
            </view>
            <view class="name">
                <span>账号：</span>
                <input type="text" v-model="names" placeholder="请输入账号" />
            </view>
            <view class="password">
                <span>密码：</span>
                <input type="password" v-model="passwords" placeholder="请输入密码" />
            </view>
            <view class="loging">
                <button class="confirm bubble" @click="longing(names,passwords)" type="default">登录</button>
                <button class="zhuce" @click="zhuce" type="default">没有账号？点击注册</button>
            </view>
            <view class="msg">
                <span>{{msg}}</span>
                <icon :type="icons" :color="colors" size="20" />

            <!-- 社交账号登录 -->
            <view class="bottom">
                <view class="tag"></view>
                <!-- <view class="tsp">江西北邮信息通信技术有限公司</view> -->
            </view>
        </view>
        <!--  -->
    </view>
</template>

@@ -37,7 +57,8 @@
                names: '',
                passwords: '',
                msg: '',
                colors: '#123456'
                colors: '#123456',
                disabled: true
            }
        },
        computed: {
@@ -74,6 +95,7 @@
                if (this.msg == "格式正确") {
                    this.icons = 'success';
                    this.colors = '#4ac503';
                    this.disabled = false
                } else {
                    this.icons = 'warn';
                    this.colors = '#d53c00';
@@ -88,7 +110,16 @@
                if (this.msg == "格式正确") {
                    uni.showNavigationBarLoading();
                    this.$store.dispatch('loging', data)
                }else{
                    uni.showToast({
                        title: '格式错误，请重试',
                        icon:'none',
                        duration: 2000
                    });
                }
            },
            handleInputCheck() {
                //this.disabled = false
            },
            zhuce(){
                uni.navigateTo({
@@ -128,140 +159,208 @@
</script>

<style lang="scss">
    page {
        background-image: linear-gradient(to right, #07d4f3, #6099f3) //页面背景颜色
    .titie{
        display: block;
        width: 281rpx;
        height: auto;
        margin: 0 auto 120rpx;
        span {
            font-weight: 600;
            font-size: 6vw;
            color: #14b9c8;
        }
    }

    #login {
        width: 100%;
        height: 157vw;
    .container {
        min-height: 100vh;
        overflow: hidden;
	
        .set-icon {
            vertical-align: middle;
            width: 41rpx;
            height: auto;
            margin-right: 35rpx;
        }
    }
	
    .content {
        display: flex;
        flex-direction: column;
        justify-content: space-around;
        align-items: center;
        justify-content: center;

        .main {
            border-radius: 5vw;
            border: 1px solid #fff;
            width: 80vw;
            height: 100vw;
            background-image: linear-gradient(to right, #f3f3f3, #f3f3f3);
            display: flex;
            justify-content: center;
            align-items: center;
            flex-direction: column;

            .loging {
                width: 65vw;
                height: 13vw;
                margin: 1vw 0;
	
        height: 90vh;
        width: 100%;
	
        .top {
            width: 100%;
        }
	
        .logo {
            display: block;
            width: 281rpx;
            height: auto;
            margin: 0 auto 120rpx;
        }
	
        .cell {
            width: 100%;
            padding: 0 85rpx;
            box-sizing: border-box;
            margin-top: 36rpx;
	
            .name {
                font-size: 22rpx;
                font-family: Source Han Sans CN;
                font-weight: 400;
                color: #3e4a59;
                line-height: 30rpx;
                opacity: 0.72;
            }

            .topImg,
            .titie,
            .name,
            .password,

            .msg {
                width: 65vw;
                height: 13vw;
                // border: 1px solid #00ff7f;
	
            .input-box {
                padding: 30rpx 0;
                border-bottom: 2rpx solid #f6f6f6;
                display: flex;
                align-items: center;
                justify-content: center;
                margin: 1vw 0;
            }

            .topImg {
                .Timg {
                    width: 13vw;
                    height: 13vw;
	
                .code {
                    font-size: 22rpx;
                    font-family: Source Han Sans CN;
                    font-weight: 400;
                    color: #0d0d0d;
                    line-height: 30rpx;
	
                    text {
                        color: #14b9c8;
                    }
                }
            }

            .titie {
                span {
                    font-weight: 600;
                    font-size: 6vw;
	
                .ipt {
                    flex: 1;
                    // height: 24rpx;
                    font-size: 24rpx;
                }
            }

            .name,
            .password {
                border-bottom: 1px solid rgba($color: #b9b9b9, $alpha: .7);
                margin-bottom: 0;
                margin-bottom: 0;

                span {
                    display: inline-block;
                    width: 15vw;
                }

                input {
                    width: 40vw;
                }
            }

            .msg {
                font-size: 3vw;
                width: 65vw;
                height: 6vw;
                display: flex;
                align-items: center;
                justify-content: center;
                // border: 1px solid #00ff7f;

                span,
                icon {
                    margin: 0 1vw;
	
                .hold {
                    font-size: 26rpx;
                    font-family: Source Han Sans CN;
                    font-weight: 400;
                    color: #3e4a59;
                    line-height: 30px;
                    opacity: 0.45;
                }
            }
        }
    }

    /* 按钮 */
    .confirm {
        width: 325rpx;
        height: 80rpx;
        background-color: #07c160;
        border-radius: 6rpx;
        font-size: 30rpx;
        color: #fff;
        line-height: 80rpx;
        text-align: center;

    }

    .bubble {
        position: relative;
        overflow: hidden;
    }

    .bubble:after {
        content: "44444";
        background-color: #5c9899;
        position: absolute;
        width: 750rpx;
        height: 750rpx;
        left: calc(50% - 375rpx);
        top: calc(50% - 375rpx);
        opacity: 0;
        margin: auto;
        border-radius: 50%;
        transform: scale(1);
        transition: all 0.5s ease-in-out;
    }

    .bubble:active:after {
        transform: scale(0);
        opacity: 1;
        transition: 0s;
    }

    .zhuce {
        position: relative;
        font-size: 0.2rem;
        width: 10rem;
        top: 1rem;
        border: 1px solid transparent;
	
        .agree {
            margin: 27rpx 95rpx 0;
            font-size: 22rpx;
            font-family: Adobe Heiti Std;
            font-weight: normal;
            color: #cacaca;
            line-height: 34rpx;
	
            .a {
                color: #000000;
            }
        }
	
        .submit {
            margin: 60rpx 90rpx 0;
            border: none;
            width: 572rpx;
            height: 86rpx;
            line-height: 86rpx;
            box-sizing: border-box;
            border-radius: 15rpx;
            background-color: #14b9c8;
            color: #ffffff;
	
            &::after {
                content: none;
            }
	
            &::before {
                content: none;
            }
	
            &[disabled='true'] {
                background: #e4e4e4;
                font-size: 36rpx;
                font-family: Source Han Sans CN;
                font-weight: 500;
                color: #ffffff;
            }
        }
	
        .tip {
            margin-top: 30rpx;
            text-align: center;
            font-size: 22rpx;
            font-family: Adobe Heiti Std;
            font-weight: normal;
            color: #cacaca;
            line-height: 34rpx;
        }
        .tsp {
            margin-top: 30rpx;
            text-align: center;
            font-size: 28rpx;
            font-family: Adobe Heiti Std;
            font-weight: normal;
            color: #a8a8a8;
            line-height: 34rpx;
        }
	
        .change {
            margin-top: 20rpx;
            text-align: center;
            font-size: 22rpx;
            font-family: Adobe Heiti Std;
            font-weight: normal;
            color: #14b9c8;
            line-height: 34rpx;
        }
	
        .tag {
            display: flex;
            justify-content: center;
            align-items: center;
            font-size: 22rpx;
            font-family: Adobe Heiti Std;
            font-weight: normal;
            color: #9f9f9f;
            line-height: 34rpx;
	
            &::before {
                content: '';
                display: block;
                width: 160rpx;
                height: 1px;
                background: #d8d8d8;
                opacity: 0.86;
            }
	
            &::after {
                content: '';
                display: block;
                width: 160rpx;
                height: 1px;
                background: #d8d8d8;
                opacity: 0.86;
            }
        }
	
        .chat-arr {
            margin-top: 50rpx;
            display: flex;
            align-items: center;
            justify-content: space-between;
	
            .icon {
                width: 73rpx;
                height: 73rpx;
            }
        }
    }
</style>

 pages/loging/logingc.vue

New file
@@ -0,0 +1,267 @@
<template>
    <view id="login" ref="login">
        <!-- <span style="position: absolute;top: 0;">user: {{$store.state.message.useName}}</span> -->
        <view class="main">
            <view class="topImg">
                <image class="Timg" src="../../static/users.png" mode=""></image>
            </view>
            <view class="titie">
                <span>群防群控APP</span>
            </view>
            <view class="name">
                <span>账号：</span>
                <input type="text" v-model="names" placeholder="请输入账号" />
            </view>
            <view class="password">
                <span>密码：</span>
                <input type="password" v-model="passwords" placeholder="请输入密码" />
            </view>
            <view class="loging">
                <button class="confirm bubble" @click="longing(names,passwords)" type="default">登录</button>
                <button class="zhuce" @click="zhuce" type="default">没有账号？点击注册</button>
            </view>
            <view class="msg">
                <span>{{msg}}</span>
                <icon :type="icons" :color="colors" size="20" />
            </view>
        </view>
    </view>
</template>

<script>
    import WxStorage from "../../static/lib/wxStorage.js" //微信Storage
    export default {
        data() {
            return {
                icons: '',
                names: '',
                passwords: '',
                msg: '',
                colors: '#123456'
            }
        },
        computed: {
            OURpass() {
                return this.$store.state.loging;
            }
        },
        methods: {
            judgeUse() {
                var login = WxStorage.get("init") //重复登录
                var name = WxStorage.get("name")
                var userID = WxStorage.get("ids")
                var accounts = WxStorage.get("accounts");
                var pass = WxStorage.get("pass");
                console.log(login);
                if (login == "true" && name != '') {
                    //获取用户信息
                    var data = {
                        userName: name,
                        userID: userID
                    }
                    this.$store.commit('getUse', data)
                    // wx.reLaunch({
                    //     url: '/pages/alarm_list/alarm_list?login=' + data.userName
                    // })
                    this.names = accounts;
                    this.passwords = pass;
                }
            },
            judgeMsg() {
                this.msg = this.names == '' ? (this.passwords == '' ? '账号密码不能为空' : '账号不能为空') : (this.passwords == '' ?
                    '密码不能为空' : this.passwords.length <= 5 ? '密码最少6位' :
                    '格式正确');
                if (this.msg == "格式正确") {
                    this.icons = 'success';
                    this.colors = '#4ac503';
                } else {
                    this.icons = 'warn';
                    this.colors = '#d53c00';
                }
            },
            longing(name, pass) {
                var data = {
                    name: name,
                    pass: pass,
                }
                this.judgeMsg();
                if (this.msg == "格式正确") {
                    uni.showNavigationBarLoading();
                    this.$store.dispatch('loging', data)
                }
            },
            zhuce(){
                uni.navigateTo({
                    url:'/pages/registerUser/registerUser'
                })
            }
        },
        created() {
            this.judgeUse();
        },
        watch: {
            names() {
                this.judgeMsg();
            },
            passwords() {
                this.judgeMsg();
            },
            OURpass() {
                if (this.OURpass == true) {
                    this.passwords = '******';
                    uni.hideNavigationBarLoading();
                    uni.reLaunch({
                        url: '../home/home'
                    })
                    return '成功登录'
                } else {
                    this.icons = 'warn';
                    this.colors = '#d53c00';
                    this.msg = '账号密码错误';
                    this.$store.commit('loginReset', this); //重置登录
                    uni.hideNavigationBarLoading();
                    return '未成功登录'
                }
            }
        }
    }
</script>

<style lang="scss">
    page {
        background-image: linear-gradient(to right, #07d4f3, #6099f3) //页面背景颜色
    }

    #login {
        width: 100%;
        height: 157vw;
        display: flex;
        align-items: center;
        justify-content: center;

        .main {
            border-radius: 5vw;
            border: 1px solid #fff;
            width: 80vw;
            height: 100vw;
            background-image: linear-gradient(to right, #f3f3f3, #f3f3f3);
            display: flex;
            justify-content: center;
            align-items: center;
            flex-direction: column;

            .loging {
                width: 65vw;
                height: 13vw;
                margin: 1vw 0;
            }

            .topImg,
            .titie,
            .name,
            .password,

            .msg {
                width: 65vw;
                height: 13vw;
                // border: 1px solid #00ff7f;
                display: flex;
                align-items: center;
                justify-content: center;
                margin: 1vw 0;
            }

            .topImg {
                .Timg {
                    width: 13vw;
                    height: 13vw;
                }
            }

            .titie {
                span {
                    font-weight: 600;
                    font-size: 6vw;
                }
            }

            .name,
            .password {
                border-bottom: 1px solid rgba($color: #b9b9b9, $alpha: .7);
                margin-bottom: 0;
                margin-bottom: 0;

                span {
                    display: inline-block;
                    width: 15vw;
                }

                input {
                    width: 40vw;
                }
            }

            .msg {
                font-size: 3vw;
                width: 65vw;
                height: 6vw;
                display: flex;
                align-items: center;
                justify-content: center;
                // border: 1px solid #00ff7f;

                span,
                icon {
                    margin: 0 1vw;
                }
            }
        }
    }

    /* 按钮 */
    .confirm {
        width: 325rpx;
        height: 80rpx;
        background-color: #07c160;
        border-radius: 6rpx;
        font-size: 30rpx;
        color: #fff;
        line-height: 80rpx;
        text-align: center;

    }

    .bubble {
        position: relative;
        overflow: hidden;
    }

    .bubble:after {
        content: "44444";
        background-color: #5c9899;
        position: absolute;
        width: 750rpx;
        height: 750rpx;
        left: calc(50% - 375rpx);
        top: calc(50% - 375rpx);
        opacity: 0;
        margin: auto;
        border-radius: 50%;
        transform: scale(1);
        transition: all 0.5s ease-in-out;
    }

    .bubble:active:after {
        transform: scale(0);
        opacity: 1;
        transition: 0s;
    }

    .zhuce {
        position: relative;
        font-size: 0.2rem;
        width: 10rem;
        top: 1rem;
        border: 1px solid transparent;
    }
</style>

 pages/registerUser/registerUser.vue

@@ -3,7 +3,7 @@
        <u-form :model="form" ref="uForm">
            <u-form-item :label="item.title" :prop="item.froms" label-width="200" :left-icon="item.img" :required="true"
                v-for="(item, index) in list" :key="index">
                <u-input v-model="form[item.froms]" />
                <u-input v-model="form[item.froms]"  :placeholder="item.placeholder" />
            </u-form-item>
            <u-form-item style="display: none;" label="选择部门" left-icon="account-fill" label-width="200" :required="true">
                <u-input v-model="form.obj" type="select" :border="true" @click="show = true" />
@@ -17,9 +17,9 @@
                </u-radio-group>
            </u-form-item>
        </u-form>
        <u-button @click="camera" :style="{backgroundColor:facebc,color:faceco,border: `1px solid ${facebc}`}">
            人脸验证{{faceMsg}}</u-button>
        <u-button @click="submit">提交</u-button>
        <u-button class="submit" @click="camera">
            下一步{{faceMsg}}</u-button>
        <!-- <u-button class="submit" @click="submit">提交</u-button> -->
    </view>
</template>

@@ -31,33 +31,38 @@
                list: [{
                        title: '账号',
                        img: 'man-add-fill',
                        froms: 'user'

                        froms: 'user',
                        placeholder: '请输入帐号'
                    },
                    {
                        title: '密码',
                        img: 'lock-fill',
                        froms: 'pass'
                        froms: 'pass',
                        placeholder: '请输入密码'
                    },
                    {
                        title: '再输密码',
                        title: '确认密码',
                        img: 'lock-fill',
                        froms: 'passTwo'
                        froms: 'passTwo',
                        placeholder: '请确认密码'
                    },
                    {
                        title: '姓名',
                        img: 'account',
                        froms: 'name'
                        froms: 'name',
                        placeholder: '请输入姓名'
                    },
                    {
                        title: '身份证',
                        img: 'fingerprint',
                        froms: 'carId'
                        froms: 'carId',
                        placeholder: '请输入身份证'
                    },
                    {
                        title: '手机号',
                        img: 'phone-fill',
                        froms: 'phone'
                        froms: 'phone',
                        placeholder: '请输入手机号'
                    }
                ],
                sex: [{
@@ -165,79 +170,84 @@
        methods: {
            camera() {
                let that = this;
                uni.showLoading({
                    title: '加载中'
                uni.showToast({
                    title: '功能研发中',
                    icon:'none',
                    duration: 2000
                });
                var i = 0;
                var time = setTimeout(() => {
                    if (i == 0) {
                        uni.showToast({
                            title: '未进行验证！',
                            icon: "none",
                            duration: 1000
                        });
                        clearTimeout(time);
                        time = null;
                    } else {
                        // console.log('进行验证')
                    }
                }, 2000)
                uni.chooseImage({
                    count: 1, //默认9
                    sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
                    // sourceType: 'camera', //从相册选择
                    sourceType: ['camera', 'album'], //从相册选择
                    success: function(res) {
                        i = 1;
                        var img = res.tempFiles;
                        console.log('img', img)
                        // imgToBase64(res)
                        var url = that.$store.state.piAPI + 'blade-user/faceCompare',
                            // var url = 'http://192.168.0.114:82/' + 'blade-user/faceCompare',
                            data = {
                                "name": that.form.name,
                                "idCardNo": that.form.carId
                            };
                        uni.uploadFile({
                            url: url,
                            filePath: img[0].path,
                            name: 'file',
                            formData: data,
                            success: (data) => {
                                if (data.statusCode == 200) {
                                    var data = JSON.parse(data.data);
                                    if (data.data.result == 0) {
                                        that.faceState = 1;
                                        uni.showToast({
                                            title: '人脸识别成功！',
                                            icon: "none",
                                            duration: 1000
                                        });
                                    } else {
                                        that.faceState = -1;
                                        uni.showToast({
                                            title: data.data.errMsg == "pic not has face" ?
                                                '未检测到人脸' : data.data.errMsg,
                                            icon: "none",
                                            duration: 1000
                                        });
                                    }
                                } else {
                                    that.faceState = 0;
                                    uni.showToast({
                                        title: '服务器连接失败！',
                                        icon: "none",
                                        duration: 1000
                                    });
                                }
                                console.log(data)
                            }
                        });
                    },
                    complete: function() {
                        console.log(4534)
                    }
                })
                // uni.showLoading({
                //     title: '加载中'
                // });
                // var i = 0;
                // var time = setTimeout(() => {
                //     if (i == 0) {
                //         uni.showToast({
                //             title: '未进行验证！',
                //             icon: "none",
                //             duration: 1000
                //         });
                //         clearTimeout(time);
                //         time = null;
                //     } else {
                //         // console.log('进行验证')
                //     }
                // }, 2000)
                // uni.chooseImage({
                //     count: 1, //默认9
                //     sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
                //     // sourceType: 'camera', //从相册选择
                //     sourceType: ['camera', 'album'], //从相册选择
                //     success: function(res) {
                //         i = 1;
                //         var img = res.tempFiles;
                //         console.log('img', img)
                //         // imgToBase64(res)
                //         var url = that.$store.state.piAPI + 'blade-user/faceCompare',
                //             // var url = 'http://192.168.0.114:82/' + 'blade-user/faceCompare',
                //             data = {
                //                 "name": that.form.name,
                //                 "idCardNo": that.form.carId
                //             };
                //         uni.uploadFile({
                //             url: url,
                //             filePath: img[0].path,
                //             name: 'file',
                //             formData: data,
                //             success: (data) => {
                //                 if (data.statusCode == 200) {
                //                     var data = JSON.parse(data.data);
                //                     if (data.data.result == 0) {
                //                         that.faceState = 1;
                //                         uni.showToast({
                //                             title: '人脸识别成功！',
                //                             icon: "none",
                //                             duration: 1000
                //                         });
                //                     } else {
                //                         that.faceState = -1;
                //                         uni.showToast({
                //                             title: data.data.errMsg == "pic not has face" ?
                //                                 '未检测到人脸' : data.data.errMsg,
                //                             icon: "none",
                //                             duration: 1000
                //                         });
                //                     }
                //                 } else {
                //                     that.faceState = 0;
                //                     uni.showToast({
                //                         title: '服务器连接失败！',
                //                         icon: "none",
                //                         duration: 1000
                //                     });
                //                 }
                //                 console.log(data)
                //             }
                //         });
                //     },
                //     complete: function() {
                //         console.log(4534)
                //     }
                // })
            },
            startRecord() {
                this.flag = true;
@@ -321,6 +331,33 @@
</script>

<style lang="scss" scoped>
    .submit {
        margin: 30rpx 50rpx 0;
        border: none;
        width: 572rpx;
        height: 86rpx;
        line-height: 86rpx;
        box-sizing: border-box;
        border-radius: 15rpx;
        background-color: #14b9c8;
        color: #ffffff;
		
        &::after {
            content: none;
        }
		
        &::before {
            content: none;
        }
		
        &[disabled='true'] {
            background: #e4e4e4;
            font-size: 36rpx;
            font-family: Source Han Sans CN;
            font-weight: 500;
            color: #ffffff;
        }
    }
    .registerUser {
        padding: 0 1.2rem;
    }

 static/images/login/c8.png

 xcxMapJQLG/xcxmap.html

@@ -73,10 +73,10 @@
            <div class="dingwei" @click="locationMap">
                <img style="width: 60%" src="./img/dingwei.png" alt="">
            </div>
            <div class="shuaxin" @click="refreshMap">
            <!-- <div class="shuaxin" @click="refreshMap">
                <img style="width: 60%" src="./img/刷新.png" alt="">
            </div>
            <div class="baozu" @click="refreshMap">
            </div> -->
            <!-- <div class="baozu" @click="refreshMap">
                <div class="bz-once">
                    <img style="width: 60%" src="./img/提示.png" alt="">
                    <div id="bz-title">
@@ -89,7 +89,7 @@
                        编队
                    </div>
                </div>
            </div>
            </div> -->
            <div id="map">
            </div>
            <div id="Umain">