From 15850051b0b791d6bc68aa089f94d8f8ceb49b65 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 02 Jul 2021 09:16:34 +0800
Subject: [PATCH] 首页修改

---
 pages/home/home.vue |   48 ++++++++++++-----------
 package-lock.json   |    9 ++++
 api/mock/home.js    |   22 +++++-----
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/api/mock/home.js b/api/mock/home.js
index ea07ffa..6af0a4b 100644
--- a/api/mock/home.js
+++ b/api/mock/home.js
@@ -80,6 +80,11 @@
 					url: ''
 				},
 				{
+					name: '我要办',
+					img: '/static/images/home/n3.png',
+					url: ''
+				},
+				{
 					name: '我要说',
 					img: '/static/images/home/n4.png',
 					url: ''
@@ -103,38 +108,33 @@
 	return new Promise((resolute, reject) => {
 		try {
 			const list = [{
-					name: '人口登记',
+					name: '我要看',
 					img: '/static/images/home/s1.png',
 					url: ''
 				},
 				{
-					name: '工商年报',
+					name: '我要查',
 					img: '/static/images/home/s2.png',
 					url: ''
 				},
 				{
-					name: '税务登记',
+					name: '我要报',
 					img: '/static/images/home/s3.png',
 					url: ''
 				},
 				{
-					name: '健康码',
+					name: '我要说',
 					img: '/static/images/home/s4.png',
 					url: ''
 				},
 				{
-					name: '便民服务',
+					name: '我要巡',
 					img: '/static/images/home/s5.png',
 					url: ''
 				},
 				{
-					name: '通办大厅',
+					name: '我要办',
 					img: '/static/images/home/s6.png',
-					url: ''
-				},
-				{
-					name: '智能问答',
-					img: '/static/images/home/s7.png',
 					url: ''
 				}
 			];
diff --git a/package-lock.json b/package-lock.json
index 74d1ecf..6848581 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,8 @@
 {
-  "requires": true,
+  "name": "qfqk-android",
+  "version": "1.0.0",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "axios": {
       "version": "0.21.1",
@@ -24,6 +26,11 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
       "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
+    },
+    "uview-ui": {
+      "version": "1.8.4",
+      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.8.4.tgz",
+      "integrity": "sha1-4yu/I3lCHTGQIuMk4ct7U4fTvUQ="
     }
   }
 }
diff --git a/pages/home/home.vue b/pages/home/home.vue
index a4fcb7b..d503d90 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -5,11 +5,11 @@
 			<u-navbar :is-fixed="false" :border-bottom="false" :is-back="false" title=""
 				:background="{ background: '#0BB9C8' }">
 				<view class="nav-wrap">
-					<picker mode="selector" :range="positionArr" range-key="name" @change="changePicker"
+					<!-- <picker mode="selector" :range="positionArr" range-key="name" @change="changePicker"
 						class="picker-box">
 						{{ position }}
 						<u-icon name="arrow-down" class="arrow" size="18" color="#C9C9C9"></u-icon>
-					</picker>
+					</picker> -->
 					<image src="/static/images/rider.png" class="rider" mode="widthFix" v-if="!focus"></image>
 
 					<view class="search-input" v-else>
@@ -35,9 +35,29 @@
 			</swiper>
 		</view>
 		<!-- 头部 end -->
+		
+		<!-- 服务按钮 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">
+					<navigator url="" hover-class="none" class="service-item">
+						<image :src="item.img" mode="widthFix" class="img"></image>
+						<view class="name">{{ item.name }}</view>
+					</navigator>
+				</u-grid-item>
+				<u-grid-item bg-color="transparent" key="8">
+					<navigator url="/pages/service/service" hover-class="none" class="service-item">
+						<image src="/static/images/home/s8.png" mode="widthFix" class="img"></image>
+						<view class="name">更多</view>
+					</navigator>
+				</u-grid-item>
+			</u-grid>
+		</view>
+		<!-- 服务按钮 end -->
+		
 
 		<!-- 头部按钮 start -->
-		<view class="nav">
+		<!-- <view class="nav">
 			<u-grid :col="5" :border="false">
 				<u-grid-item bg-color="transparent" v-for="(item, index) in navButton" :key="index">
 					<navigator :url="item.url" hover-class="none" class="nav-item">
@@ -46,7 +66,7 @@
 					</navigator>
 				</u-grid-item>
 			</u-grid>
-		</view>
+		</view> -->
 		<!-- 头部按钮 end -->
 
 		<!-- 公告 start -->
@@ -62,24 +82,6 @@
 		</view>
 		<!-- 公告 end -->
 
-		<!-- 服务按钮 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">
-					<navigator url="" hover-class="none" class="service-item">
-						<image :src="item.img" mode="widthFix" class="img"></image>
-						<view class="name">{{ item.name }}</view>
-					</navigator>
-				</u-grid-item>
-				<u-grid-item bg-color="transparent" key="8">
-					<navigator url="/pages/service/service" hover-class="none" class="service-item">
-						<image src="/static/images/home/s8.png" mode="widthFix" class="img"></image>
-						<view class="name">更多</view>
-					</navigator>
-				</u-grid-item>
-			</u-grid>
-		</view> -->
-		<!-- 服务按钮 end -->
 
 		<!-- 新闻模块 start -->
 		<view class="news">
@@ -366,7 +368,7 @@
 	.service-box {
 		background: #ffffff;
 		border-radius: 20px 20px 20px 20px;
-		margin: 30rpx 20rpx 0;
+		margin: 30rpx 20rpx 30rpx;
 		padding: 0rpx 20rpx;
 
 		.service-item {

--
Gitblit v1.9.3