From ef1b3b4c73bb1b30e945ec1c8b1ec0f342f790f9 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 11:30:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
static/images/home/handle001.png | 0
pages/home/home.vue | 4 ++--
static/images/home/handle.png | 0
static/images/home/report002.png | 0
static/workbench/task3.png | 0
static/images/home/partrol.png | 0
api/mock/home.js | 8 ++++----
pages/business/business.vue | 8 ++++----
static/workbench/task1.png | 0
static/images/home/search004.png | 0
static/images/home/report.png | 0
static/workbench/task4.png | 0
static/images/home/more.png | 0
static/images/home/report001.png | 0
static/workbench/huojian.png | 0
static/images/home/say.png | 0
static/images/home/search02.png | 0
static/images/home/look.png | 0
static/workbench/task2.png | 0
static/images/home/search003.png | 0
static/images/home/searchs.png | 0
21 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/api/mock/home.js b/api/mock/home.js
index 6af0a4b..a4f49cf 100644
--- a/api/mock/home.js
+++ b/api/mock/home.js
@@ -114,12 +114,12 @@
},
{
name: '我要查',
- img: '/static/images/home/s2.png',
+ img: '/static/images/home/search004.png',
url: ''
},
{
name: '我要报',
- img: '/static/images/home/s3.png',
+ img: '/static/images/home/report001.png',
url: ''
},
{
@@ -129,12 +129,12 @@
},
{
name: '我要巡',
- img: '/static/images/home/s5.png',
+ img: '/static/images/home/s6.png',
url: ''
},
{
name: '我要办',
- img: '/static/images/home/s6.png',
+ img: '/static/images/home/handle001.png',
url: ''
}
];
diff --git a/pages/business/business.vue b/pages/business/business.vue
index 10903a0..87a86b2 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -7,25 +7,25 @@
<!-- <squareBut :data="squareBut"></squareBut> -->
<view class="view-business-nav">
<navigator class="patrolBtn" url="/pages/alarm_list/alarm_list">
- <image src="../../static/workbench/task.png"></image>
+ <image src="../../static/workbench/task1.png"></image>
<span>群防任务</span>
</navigator>
</view>
<view class="view-business-nav">
<navigator class="patrolBtn" url="/pages/alarm_list/alarm_list">
- <image src="../../static/workbench/task1.png"></image>
+ <image src="../../static/workbench/task2.png"></image>
<span>巡视任务</span>
</navigator>
</view>
<view class="view-business-nav">
<navigator class="patrolBtn" url="/pages/reported/reported">
- <image src="../../static/workbench/report.png"></image>
+ <image src="../../static/workbench/task3.png"></image>
<span>异常上报</span>
</navigator>
</view>
<view class="view-business-nav">
<navigator class="patrolBtn" url="/pages/riskReporting/riskReporting">
- <image src="../../static/workbench/addressbook.png"></image>
+ <image src="../../static/workbench/task4.png"></image>
<span>通讯录</span>
</navigator>
</view>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 93b5058..7032c1e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -36,7 +36,7 @@
</view>
<!-- 头部 end -->
- <!-- 服务按钮 start -->
+ <!-- 服务按钮 start 业务办理-->
<view class="service-box">
<u-grid :col="4" :border="false">
<u-grid-item bg-color="transparent" v-for="(item, index) in serviceButton" :key="index">
@@ -105,7 +105,7 @@
2021.06.17
</view>
</view>
- <image src="" mode="" class="img"></image>
+ <image src="/static/workbench/huojian.png" mode="" class="img"></image>
</navigator>
<u-loadmore :status="status" />
</view>
diff --git a/static/images/home/handle.png b/static/images/home/handle.png
new file mode 100644
index 0000000..80ce56a
--- /dev/null
+++ b/static/images/home/handle.png
Binary files differ
diff --git a/static/images/home/handle001.png b/static/images/home/handle001.png
new file mode 100644
index 0000000..5170b50
--- /dev/null
+++ b/static/images/home/handle001.png
Binary files differ
diff --git a/static/images/home/look.png b/static/images/home/look.png
new file mode 100644
index 0000000..610c8a6
--- /dev/null
+++ b/static/images/home/look.png
Binary files differ
diff --git a/static/images/home/more.png b/static/images/home/more.png
new file mode 100644
index 0000000..0a9a229
--- /dev/null
+++ b/static/images/home/more.png
Binary files differ
diff --git a/static/images/home/partrol.png b/static/images/home/partrol.png
new file mode 100644
index 0000000..cdffdca
--- /dev/null
+++ b/static/images/home/partrol.png
Binary files differ
diff --git a/static/images/home/report.png b/static/images/home/report.png
new file mode 100644
index 0000000..1c3637b
--- /dev/null
+++ b/static/images/home/report.png
Binary files differ
diff --git a/static/images/home/report001.png b/static/images/home/report001.png
new file mode 100644
index 0000000..6378116
--- /dev/null
+++ b/static/images/home/report001.png
Binary files differ
diff --git a/static/images/home/report002.png b/static/images/home/report002.png
new file mode 100644
index 0000000..909f76e
--- /dev/null
+++ b/static/images/home/report002.png
Binary files differ
diff --git a/static/images/home/say.png b/static/images/home/say.png
new file mode 100644
index 0000000..84672b6
--- /dev/null
+++ b/static/images/home/say.png
Binary files differ
diff --git a/static/images/home/search003.png b/static/images/home/search003.png
new file mode 100644
index 0000000..1a7e884
--- /dev/null
+++ b/static/images/home/search003.png
Binary files differ
diff --git a/static/images/home/search004.png b/static/images/home/search004.png
new file mode 100644
index 0000000..97e25bd
--- /dev/null
+++ b/static/images/home/search004.png
Binary files differ
diff --git a/static/images/home/search02.png b/static/images/home/search02.png
new file mode 100644
index 0000000..cf47d06
--- /dev/null
+++ b/static/images/home/search02.png
Binary files differ
diff --git a/static/images/home/searchs.png b/static/images/home/searchs.png
new file mode 100644
index 0000000..a2823a6
--- /dev/null
+++ b/static/images/home/searchs.png
Binary files differ
diff --git a/static/workbench/huojian.png b/static/workbench/huojian.png
new file mode 100644
index 0000000..50b127e
--- /dev/null
+++ b/static/workbench/huojian.png
Binary files differ
diff --git a/static/workbench/task1.png b/static/workbench/task1.png
index e6a51c1..5499846 100644
--- a/static/workbench/task1.png
+++ b/static/workbench/task1.png
Binary files differ
diff --git a/static/workbench/task2.png b/static/workbench/task2.png
new file mode 100644
index 0000000..e4c43a7
--- /dev/null
+++ b/static/workbench/task2.png
Binary files differ
diff --git a/static/workbench/task3.png b/static/workbench/task3.png
new file mode 100644
index 0000000..1b63d85
--- /dev/null
+++ b/static/workbench/task3.png
Binary files differ
diff --git a/static/workbench/task4.png b/static/workbench/task4.png
new file mode 100644
index 0000000..4a5167f
--- /dev/null
+++ b/static/workbench/task4.png
Binary files differ
--
Gitblit v1.9.3