Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2021-07-05 e7bacabf3e4d76e74b72358e37d46ac4378a3ec6

Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

 api/mock/home.js

@@ -20,15 +20,15 @@
        try {
            const list = [{
                id: '1',
                img: '/static/images/home/banner.png',
                img: '/static/images/home/homeTop1.png',
                url: ''
            }, {
                id: '2',
                img: '/static/images/home/banner.png',
                img: '/static/images/home/homeTop2.png',
                url: ''
            }, {
                id: '3',
                img: '/static/images/home/banner.png',
                img: '/static/images/home/homeTop3.png',
                url: ''
            }];
            resolute(list);
@@ -46,11 +46,11 @@
            const list = [{
                id: '1',
                img: '/static/images/home/focus.png',
                title: '神舟十二号载人发射任务取得圆满成功'
                title: '江西工程学院召开反诈骗承诺书签定工作部署会'
            }, {
                id: '2',
                img: '/static/images/home/service.png',
                title: '全国累计报告接种新冠疫苗超9亿剂次'
                title: '江西最严标准惩处妨害疫情防控犯罪，首例涉疫情诈骗'
            }];
            resolute(list);
        } catch (e) {

 manifest.json

@@ -1,6 +1,6 @@
{
    "name" : "群防群控",
    "appid" : "__UNI__88EDF2B",
    "appid" : "__UNI__1A57486",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",

 pages/business/business.vue

@@ -24,7 +24,7 @@
                </navigator>
            </view>
            <view class="view-business-nav">
                <navigator class="patrolBtn" url="/pages/riskReporting/riskReporting">
                <navigator class="patrolBtn" url="/pages/groupChat/groupChat">
                    <image src="../../static/workbench/task4.png"></image>
                    <span>通讯录</span>
                </navigator>

 pages/groupChat/chatingQZ.vue

@@ -221,8 +221,8 @@
                        'content-type': 'application/x-www-form-urlencoded', 
                    },
                    data:{
                        //gid: that.recipientId
                        gid: "1"
                        gid: that.recipientId
                        //gid: "1"
                    },
                    success:(res)=> {
                        // recAvatar: null,//接收者头像
@@ -234,7 +234,9 @@
                            }else{
                                resdata[i].avatar = resdata[i].avatar;
                            }
							
                            if(resdata[i].sender_id == that.senId){
                                that.senAvatar = resdata[i].avatar;
                            }
                            
                        }
                        let msg = res.data.data;
@@ -325,12 +327,12 @@
                }
                nowTime = t
                let sendMsg = {
                    senderId: that.senId,
                    recipientId: that.recipientId,
                    sender_id: that.senId,
                    post_message: e.message,
                    message_type: 0,
                    status: 0,
                    post_time: nowTime,
                    avatar:that.senAvatar
                }
                
                uni.request({
@@ -342,9 +344,9 @@
                        messageType: 0,
                        status: 0,
                        postTime: sentTime,
                        gid:that.recipientId
                    },
                    success:(res)=> {
						
                    }
                });
                

 pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue

@@ -18,14 +18,14 @@
            <view class="title">照片上传:</view>
            <view class="t">
                <view class="main">
                    <image @tap="takePhoto" src="../../../../static/JQimg/相机.png" mode=""></image>
                    <image @tap="takePhoto" src="../../../../static/JQimg/xiangji.png" mode=""></image>
                </view>
            </view>
            <seeImgs  class="seeImgs" :imgs="imgs" :videos="[]" @del="delImg" :type="'imgs'"></seeImgs>
            <view class="title">视频上传:</view>
            <view class="s">
                <view class="main">
                    <image @tap="takeVideo" src="../../../../static/JQimg/视频.png" mode=""></image>
                    <image @tap="takeVideo" src="../../../../static/JQimg/shipin.png" mode=""></image>
                </view>
            </view>
            <seeImgs class="seeImgsVideo" :imgs="[]" :videos="videos" @del="delVideo" :type="'videos'"></seeImgs>

 static/JQimg/shipin.png

 static/JQimg/xiangji.png

 static/images/home/homeTop1.png

 static/images/home/homeTop2.png

 static/images/home/homeTop3.png