首页及logo替换

nnzwminiapp/pages/index/index.js

@@ -84,7 +84,70 @@ Page({
 			// 	img: imgUrl + 'service-10.png',
 			// 	name: '更多功能'
 			// }
-		],
+    ],
+    serviceItems3:[{
+				img: imgUrl + 'wzl1.png',
+				name: '南岸融媒'
+      },
+      {
+				img: imgUrl + 'wzl2.png',
+				name: '政务之窗'
+      },
+      {
+				img: imgUrl + 'wzl3.png',
+				name: '城市热线'
+      },
+      {
+				img: imgUrl + 'wzl4.png',
+				name: '南岸视讯'
+      },
+      {
+				img: imgUrl + 'wzl5.png',
+				name: '直播南岸'
+			}
+    ],
+    serviceItems4: [{
+      img: imgUrl + 'shyk.png',
+      name: '三会一课'
+    },
+    {
+      img: imgUrl + 'cqjk.png',
+      name: '重庆经开'
+    },
+    {
+      img: imgUrl + 'wmsj.png',
+      name: '文明实践'
+    },
+    {
+      img: imgUrl + 'dbzs.png',
+      name: '代表之声'
+    },
+    {
+      img: imgUrl + 'jqzc.png',
+      name: '集群注册'
+    }
+    ],
+    serviceItems5: [{
+      img: imgUrl + 'bmdt.png',
+      name: '便民地图'
+    },
+    {
+      img: imgUrl + 'zczx.png',
+      name: '政策咨询'
+    },
+    {
+      img: imgUrl + 'zsxm.png',
+      name: '招商项目'
+    },
+    {
+      img: imgUrl + 'tcjf.png',
+      name: '停车缴费'
+    },
+    {
+      img: imgUrl + 'bsdt.png',
+      name: '办事大厅'
+    }
+    ],
 		// 百姓聚焦
 		peopleService: [{
 				id: 1,

nnzwminiapp/pages/index/index.wxml

@@ -60,11 +60,22 @@
 			</view>
 			<!-- 内容top -->
 		</view>
-        
-            <view style="padding: 25rpx 30rpx;background: #ffffff;">
+    <!-- 视频推荐 -->
+		<view class="three" style="height:163rpx;width:100%;padding-left:15rpx;background-color: #F5F5F5;">
+			<image src="{{imgUrl}}index-video-recommend.png" style="height:163rpx;width:720rpx" bindtap="gotoSPTJ"></image> 
+		</view>
+    <view class="content-service" style="margin-left: 20rpx;margin-right: 20rpx;">
+					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems3 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item2">
+						<view data-item="{{index}}">
+							<image src="{{ item.img }}" style="height:120rpx;width:120rpx"></image>
+						</view>
+						<!-- <view data-item="{{index}}">{{ item.name }}</view> -->
+					</view>
+		</view>
+    <view style=" margin-left: 20rpx;margin-right: 20rpx; margin-bottom: 15rpx;border-radius: 20rpx; background: #ffffff;">
 			<!-- <view class="content-search-tab" style="height: 588rpx;"> -->
 				<view class="content-service">
-					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems1 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
+					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems4 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
 						<view data-item="{{index}}">
 							<image src="{{ item.img }}" style="height:88rpx;width:88rpx"></image>
 						</view>
@@ -72,19 +83,19 @@
 					</view>
 				</view>
 				<view class="content-service">
-					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems1 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
+					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems5 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
 						<view data-item="{{index}}">
 							<image src="{{ item.img }}" style="height:88rpx;width:88rpx"></image>
 						</view>
 						<view data-item="{{index}}">{{ item.name }}</view>
 					</view>
 				</view>
-			</view>
+		</view>
 
 		<!-- 视频推荐 -->
 		<!-- <view class="three" style="height:163rpx;width:100%;padding-left:15rpx;background-color: #F5F5F5;">
-			<image src="{{imgUrl}}index-video-recommend.png" style="height:163rpx;width:720rpx" bindtap="gotoSPTJ"></image> -->
-			<!-- <swiper current="{{lun}}" indicator-dots="{{true}}" style="height: 100%;width: 720rpx">
+			<image src="{{imgUrl}}index-video-recommend.png" style="height:163rpx;width:720rpx" bindtap="gotoSPTJ"></image> 
+			<swiper current="{{lun}}" indicator-dots="{{true}}" style="height: 100%;width: 720rpx">
 				<swiper-item bindtap="gotoNewsPaper">
 					<image src="{{imgUrl}}index-video-banner.png" style="height:163rpx;width:100%"></image>
 				</swiper-item>
@@ -94,8 +105,8 @@
 				<swiper-item>
 					<image src="{{imgUrl}}self-service.png" style="height:163rpx;width:100%"></image>
 				</swiper-item>
-			</swiper> -->
-		<!-- </view> -->
+			</swiper>
+		</view> -->
 		<!-- 南岸动态 -->
 		<view class="content-na" style="height:512rpx;width:100%;background-color:#F5F5F5;position:relative;overflow: hidden;margin-top: 5rpx;">
 			<!-- 浮动 -->

nnzwminiapp/pages/index/index.wxss

@@ -19,10 +19,11 @@ scroll-view ::-webkit-scrollbar {
 .top-logo {
 	z-index: 99;
 	position: absolute;
-	left: 50%;
+  left: 50%;
+  margin-top: 50rpx;
 	transform: translate(-50%);
-	width: 426rpx;
-	height: 150rpx;
+	width: 380rpx;
+	height: 120rpx;
 }
 
 /* 第一个内容，浮动上移 */
@@ -84,6 +85,16 @@ scroll-view ::-webkit-scrollbar {
 	width: 119rpx;
 }
 
+.content-service-item2 {
+	/* font-size: 25rpx; */
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	height: 140rpx;
+	width: 140rpx;
+}
+
 /* 百信聚焦 */
 .people-title {
 	display: flex;

nnzwminiapp/pages/login/login.wxml

@@ -10,7 +10,7 @@
 
   <view style="height: 280rpx;width: 100%;display:flex;align-items:center;justify-content:center;padding-top:130rpx">
     <view>
-      <image src="{{imgUrl}}login-top-icon.png" style="height: 175rpx;width: 370rpx"></image>
+      <image src="{{imgUrl}}loginLogo.png" style="height: 140rpx;width: 140rpx"></image>
     </view>
   </view>
 

nnzwminiapp/pages/publics/index/index.wxml

@@ -5,7 +5,7 @@
 		<!-- 顶部栏 -->
 		<view class="top">
 			<image src="{{imgUrl}}topbg.webp" style="width: 100%;height:519rpx"></image>
-			<image src="{{imgUrl}}toplogo.png" class="top-logo" style="top: {{navHeight}}rpx"></image>
+			<image src="{{imgUrl}}publicLogo.png" class="top-logo" style="top: {{navHeight}}rpx"></image>
 			<!-- <view class="top-serach">
         <view class="search-input">
           <input style="height: 72rpx;" placeholder="请在此输入关键字" />

nnzwminiapp/pages/zmhd/zmhd.wxml

@@ -10,28 +10,28 @@
 	<!-- 4个内容 -->
 	<view style="padding-top: 34rpx;display: flex;align-items: center;justify-content: flex-start;flex-wrap: wrap;">
 		<!-- 智能问答 -->
-		<view style="border-radius: 10rpx;height: 193rpx;width: 339rpx;background-image: url({{imgUrl}}zmhd-ask-question.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;" bindtap="gotoZlwd">
+		<view style="border-radius: 10rpx;height: 193rpx;width: 100%;background-image: url({{imgUrl}}zmhd-ask-question.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;" bindtap="gotoZlwd">
 			<view>
 				<view class="main-content-title" style="padding-left: 32rpx;padding-top:41rpx">智能问答</view>
 				<view class="main-content-content" style="padding-left: 30rpx;padding-top:15rpx;color: #D26256;">咨询答疑，请找我</view>
 			</view>
 		</view>
 		<!-- 12345热线 -->
-		<view style="border-radius: 10rpx;height: 193rpx;width: 339rpx;background-image: url({{imgUrl}}zmhd-12345-call.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;" bindtap="callTheHotline">
+		<view style="border-radius: 10rpx;height: 193rpx;width: 100%;background-image: url({{imgUrl}}zmhd-12345-call.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;" bindtap="callTheHotline">
 			<view>
 				<view class="main-content-title" style="padding-left: 32rpx;padding-top:41rpx">12345热线</view>
 				<view class="main-content-content" style="padding-left: 30rpx;padding-top:15rpx;color: #5F7FC7;">政务服务便民热线</view>
 			</view>
 		</view>
 		<!-- 投诉建议 -->
-		<view style="border-radius: 10rpx;height: 193rpx;width: 339rpx;background-image: url({{imgUrl}}zmhd-complaint.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;" bindtap="gototsjy">
+		<!-- <view style="border-radius: 10rpx;height: 193rpx;width: 339rpx;background-image: url({{imgUrl}}zmhd-complaint.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;" bindtap="gototsjy">
 			<view>
 				<view class="main-content-title" style="padding-left: 32rpx;padding-top:41rpx">投诉建议</view>
 				<view class="main-content-content" style="padding-left: 30rpx;padding-top:15rpx;color: #34917C;">欢迎您反映问题</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 微信客服 -->
-		<view style="border-radius: 10rpx;height: 193rpx;width: 339rpx;background-image: url({{imgUrl}}zmhd-weixin-customer-service.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;">
+		<view style="border-radius: 10rpx;height: 193rpx;width: 100%;background-image: url({{imgUrl}}zmhd-weixin-customer-service.png);background-size:cover;margin-right: 21rpx;margin-bottom: 26rpx;">
 			<view>
 				<view class="main-content-title" style="padding-left: 32rpx;padding-top:41rpx">微信客服</view>
 				<view class="main-content-content" style="padding-left: 30rpx;padding-top:15rpx;color: #94763C">有什么想说的，畅所欲言</view>