From e7bacabf3e4d76e74b72358e37d46ac4378a3ec6 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 05 Jul 2021 17:21:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
static/JQimg/xiangji.png | 0
pages/groupChat/chatingQZ.vue | 14 ++++++++------
manifest.json | 2 +-
api/mock/home.js | 10 +++++-----
static/JQimg/shipin.png | 0
static/images/home/homeTop3.png | 0
pages/business/business.vue | 2 +-
pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue | 4 ++--
static/images/home/homeTop2.png | 0
static/images/home/homeTop1.png | 0
10 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/api/mock/home.js b/api/mock/home.js
index e899d64..d1f9b18 100644
--- a/api/mock/home.js
+++ b/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) {
diff --git a/manifest.json b/manifest.json
index f12f798..e1ec915 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "群防群控",
- "appid" : "__UNI__88EDF2B",
+ "appid" : "__UNI__1A57486",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/pages/business/business.vue b/pages/business/business.vue
index f1885f3..e84f243 100644
--- a/pages/business/business.vue
+++ b/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>
diff --git a/pages/groupChat/chatingQZ.vue b/pages/groupChat/chatingQZ.vue
index fde4bf8..0d47c8f 100644
--- a/pages/groupChat/chatingQZ.vue
+++ b/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)=> {
-
}
});
diff --git a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue b/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
index 5928fc8..371899f 100644
--- a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
+++ b/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>
diff --git "a/static/JQimg/\350\247\206\351\242\221.png" b/static/JQimg/shipin.png
similarity index 100%
rename from "static/JQimg/\350\247\206\351\242\221.png"
rename to static/JQimg/shipin.png
Binary files differ
diff --git "a/static/JQimg/\347\233\270\346\234\272.png" b/static/JQimg/xiangji.png
similarity index 100%
rename from "static/JQimg/\347\233\270\346\234\272.png"
rename to static/JQimg/xiangji.png
Binary files differ
diff --git a/static/images/home/homeTop1.png b/static/images/home/homeTop1.png
new file mode 100644
index 0000000..32eb4b9
--- /dev/null
+++ b/static/images/home/homeTop1.png
Binary files differ
diff --git a/static/images/home/homeTop2.png b/static/images/home/homeTop2.png
new file mode 100644
index 0000000..b73a74f
--- /dev/null
+++ b/static/images/home/homeTop2.png
Binary files differ
diff --git a/static/images/home/homeTop3.png b/static/images/home/homeTop3.png
new file mode 100644
index 0000000..f9dc1cf
--- /dev/null
+++ b/static/images/home/homeTop3.png
Binary files differ
--
Gitblit v1.9.3