Merge branch 'master' of http://116.63.33.55/git/nazw

# Conflicts:
#	nngkxxdp/src/main/resources/static/nnzwminiapp/pages/serve/serve.wxml

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.js

@@ -324,7 +324,21 @@ Page({
 			this.setData({
 				naItemTab: 1
 			})
-	},
+  },
+  // 点击服务
+  clickService1(e) {
+    const index = e.currentTarget.dataset.item
+    switch(index) {
+      case 0: {
+        wx.navigateToMiniProgram({
+          appId: 'wxd2ade0f25a874ee2',
+          success(res) {
+            // 打开成功
+          }
+        })
+      };break;
+    }
+  },
 	toDataCenter() {
 		wx.navigateTo({
 			url: '/pages/dataCenter/dataCenter',

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.wxml

@@ -21,11 +21,11 @@
 			</view>
 			<!-- 服务内容1 -->
 			<view class="content-service" style="margin-top: 15rpx">
-				<view wx:for="{{ serviceItems1 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
-					<view>
+				<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 data-item="{{index}}">
 						<image src="{{ item.img }}" style="height:88rpx;width:88rpx"></image>
 					</view>
-					<view>{{ item.name }}</view>
+					<view data-item="{{index}}">{{ item.name }}</view>
 				</view>
 			</view>
 			<!-- 服务内容2 -->
@@ -527,7 +527,7 @@
 				<!-- content -->
 				<view style="margin-top:10rpx;width: 100%;height: 136rpx;display:flex;flex-wrap: wrap;justify-content: space-between;">
 					<!-- 按钮 -->
-					<view wx:for="{{ mapServiceData }}" wx:for-item="item" wx:for-index="index" wx:key="index" style="height: 50rpx;width: 139rpx;background-color: #EEF5FF;display:flex;align-items:center;justify-content:center;font-size:24rpx;color: #333333;letter-spacing: 2rpx;">
+					<view bindtap="gotoDTSS" wx:for="{{ mapServiceData }}" wx:for-item="item" wx:for-index="index" wx:key="index" style="height: 50rpx;width: 139rpx;background-color: #EEF5FF;display:flex;align-items:center;justify-content:center;font-size:24rpx;color: #333333;letter-spacing: 2rpx;">
 						{{item.name}}
 					</view>
 				</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/serve/serve.js

@@ -1,7 +1,7 @@
 // pages/nais/nais.js
 import {
 	imgUrl
-  } from "../api/request"
+} from "../api/request"
 let app = getApp();
 Page({
 
@@ -9,8 +9,28 @@ Page({
 	 * 页面的初始数据
 	 */
 	data: {
-		naItem:0,
-		imgUrl: imgUrl
+		naItem: 0,
+		imgUrl: imgUrl,
+		processingData: ''
+	},
+	getProcessingData() {
+		wx.request({
+			url: 'https://zwykb.cq.gov.cn/inspur/county/compound?regionCode=500108',
+			method: 'POST',
+			success: res => {
+				res.data.data.DISSSATIS_RATE = Math.floor(res.data.data.DISSSATIS_NUM / (res.data.data.TOTAL_NUM - res.data.data.SATIS_NUM) * 10000) / 100;
+				res.data.data.SATIS_RATE = Math.floor(res.data.data.SATIS_NUM / res.data.data.TOTAL_NUM * 10000) / 100;
+				this.setData({
+					processingData: res.data.data
+				})
+
+			}
+		})
+  },
+  gotoDTSS() {
+		wx.navigateTo({
+			url: '/pages/web/web?url='+"https://www.cqna.gov.cn/maps/sy_mobile.html",
+		  })	
 	},
 	/**
 	 * 生命周期函数--监听页面初次渲染完成
@@ -24,36 +44,28 @@ Page({
 	 */
 	onShow() {
 		if (typeof this.getTabBar === 'function' &&
-		this.getTabBar()) {
-		this.getTabBar().setData({
-		  selected: 3
-		})
-	  }
-	},
-	onHide(){
-		if (typeof this.getTabBar === 'function' &&
-		this.getTabBar()) {
-		this.getTabBar().setData({
-		  selected: -1
-		})
-	  }	
+			this.getTabBar()) {
+			this.getTabBar().setData({
+				selected: 3
+			})
+		}
 	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
 	onHide() {
-
+		if (typeof this.getTabBar === 'function' &&
+			this.getTabBar()) {
+			this.getTabBar().setData({
+				selected: -1
+			})
+		}
 	},
-
 	/**
 	 * 生命周期函数--监听页面卸载
 	 */
 	onUnload() {
-		
+
 	},
-	onLoad(){
-		
+	onLoad() {
+		this.getProcessingData();
 	},
 	naChangeItem: function (e) {
 		this.setData({

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/serve/serve.wxml

@@ -1,163 +1,164 @@
 <!--pages/serve/serve.wxml-->
 <!-- 头部 -->
 <scroll-view style="height: 1549rpx;" scroll-y="true">
-<view class="header" style="background-image: url({{imgUrl}}bgfw.png)">
-	<image src="{{imgUrl}}map-logo.png" class="logo"></image>
-	<view class="search">
-		<input bindinput="bindKeyInput" placeholder="请在此输入关键字" placeholder-class="search-style" />
-		<button>
-			<image src="{{imgUrl}}fwserch.png" alt="" style="width: 16px;height: 16px;"></image>
-		</button>
-	</view>
-	<ul class="banner">
-		<li>
-			<image src="{{imgUrl}}fwzx.png" alt=""></image><span>咨询</span>
-		</li>
-		<li>
-			<image src="{{imgUrl}}fwyy.png" alt=""></image><span>预约</span>
-		</li>
-		<li>
-			<image src="{{imgUrl}}fwzn.png" alt=""></image><span>指南</span>
-		</li>
-		<li>
-			<image src="{{imgUrl}}fwjd.png" alt=""></image><span>进度</span>
-		</li>
-		<li>
-			<image src="{{imgUrl}}fwts.png" alt=""></image><span>投诉</span>
-		</li>
-	</ul>
-</view>
-<!-- 一件事一次办 -->
-<view class="view-yjyb cont-width">
-	<view class="title">
-		<view class="line"></view>
-		<view>一件事一次办</view>
-	</view>
-	<view class="list">
-		<view class="nav" style="background-image: url({{imgUrl}}yjsycb-gjj.png);color: #1C61CE;">公积金一件事</view>
-		<view class="nav" style="background-image: url({{imgUrl}}yjsycb-jjh.png);color: #A6741E;">公积金一件事</view>
-		<view class="nav" style="background-image: url({{imgUrl}}yjsycb-shtt.png);color: #DC5C0F;">基金会谈</view>
-	</view>
-</view>
-<!-- 生活缴费 -->
-<view class="view-shjf cont-widthl">
-	<view class="title" style="background-image: url({{imgUrl}}bg-shjf.png);">
-		<view style="font-size: 19px;font-weight: bold;color: #333333;">生活缴费</view>
-		<view style="font-size: 13px;color: #EFB878;margin-top: 5px;">便民生活 生活缴费一站式平台</view>
-	</view>
-	<ul class="list">
-		<li>
-			<image src="{{imgUrl}}shjf-sf.png" alt="" style="width: 27px;height: 37px;"></image><span>水费</span>
-		</li>
-		<li>
-			<image src="{{imgUrl}}shjf-df.png" alt="" style="width: 30px;height: 34px;"></image><span>电费</span>
-		</li>
-		<li>
-			<image src="{{imgUrl}}shjf-qf.png" alt="" style="width: 29px;height: 37px;"></image><span>气费</span>
-		</li>
-	</ul>
-</view>
-<!-- 办事 -->
-<view class="view-bs cont-widthl">
-	<view class="nav">
-		<view style="display: flex;">
-			<button class="nav-grbs {{naItem==0?'click':''}}" bindtap="naChangeItem" data-item="0">个人办事</button>
-			<button class="nav-qybs {{naItem==1?'click':''}}" bindtap="naChangeItem" data-item="1">企业办事</button>
+	<view class="header" style="background-image: url({{imgUrl}}bgfw.png)">
+		<image src="{{imgUrl}}map-logo.png" class="logo"></image>
+		<view class="search">
+			<input bindinput="bindKeyInput" placeholder="请在此输入关键字" placeholder-class="search-style" />
+			<button>
+				<image src="{{imgUrl}}fwserch.png" alt="" style="width: 16px;height: 16px;"></image>
+			</button>
 		</view>
 		<view class="more" bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp">更多 ></view>
+		<ul class="banner">
+			<li>
+				<image src="{{imgUrl}}fwzx.png" alt=""></image><span>咨询</span>
+			</li>
+			<li>
+				<image src="{{imgUrl}}fwyy.png" alt=""></image><span>预约</span>
+			</li>
+			<li>
+				<image src="{{imgUrl}}fwzn.png" alt=""></image><span>指南</span>
+			</li>
+			<li>
+				<image src="{{imgUrl}}fwjd.png" alt=""></image><span>进度</span>
+			</li>
+			<li>
+				<image src="{{imgUrl}}fwts.png" alt=""></image><span>投诉</span>
+			</li>
+		</ul>
 	</view>
-	<view wx:if="{{naItem==0}}">
-		<include src="navTabgr.wxml" />
+	<!-- 一件事一次办 -->
+	<view class="view-yjyb cont-width">
+		<view class="title">
+			<view class="line"></view>
+			<view>一件事一次办</view>
+		</view>
+		<view class="list">
+			<view class="nav" style="background-image: url({{imgUrl}}yjsycb-gjj.png);color: #1C61CE;">公积金一件事</view>
+			<view class="nav" style="background-image: url({{imgUrl}}yjsycb-jjh.png);color: #A6741E;">公积金一件事</view>
+			<view class="nav" style="background-image: url({{imgUrl}}yjsycb-shtt.png);color: #DC5C0F;">基金会谈</view>
+		</view>
 	</view>
-	<view wx:elif="{{naItem==1}}">
-		<include src="navTabqy.wxml" />
+	<!-- 生活缴费 -->
+	<view class="view-shjf cont-widthl">
+		<view class="title" style="background-image: url({{imgUrl}}bg-shjf.png);">
+			<view style="font-size: 19px;font-weight: bold;color: #333333;">生活缴费</view>
+			<view style="font-size: 13px;color: #EFB878;margin-top: 5px;">便民生活 生活缴费一站式平台</view>
+		</view>
+		<ul class="list">
+			<li>
+				<image src="{{imgUrl}}shjf-sf.png" alt="" style="width: 27px;height: 37px;"></image><span>水费</span>
+			</li>
+			<li>
+				<image src="{{imgUrl}}shjf-df.png" alt="" style="width: 30px;height: 34px;"></image><span>电费</span>
+			</li>
+			<li>
+				<image src="{{imgUrl}}shjf-qf.png" alt="" style="width: 29px;height: 37px;"></image><span>气费</span>
+			</li>
+		</ul>
 	</view>
-</view>
-<!-- 地图服务 -->
-<view class="view-dtfw cont-widthl">
-	<view class="title" style="background-image: url({{imgUrl}}bg-dtfw.png);">
-		<view style="font-size: 19px;font-weight: bold;color: #333333;">地图服务</view>
-		<view style="font-size: 13px;color: #7763E7;margin-top: 5px;">便民生活 生活缴费一站式平台</view>
+	<!-- 办事 -->
+	<view class="view-bs cont-widthl">
+		<view class="nav">
+			<view style="display: flex;">
+				<button class="nav-grbs {{naItem==0?'click':''}}" bindtap="naChangeItem" data-item="0">个人办事</button>
+				<button class="nav-qybs {{naItem==1?'click':''}}" bindtap="naChangeItem" data-item="1">企业办事</button>
+			</view>
+			<view class="more">更多 ></view>
+		</view>
+		<view wx:if="{{naItem==0}}">
+			<include src="navTabgr.wxml" />
+		</view>
+		<view wx:elif="{{naItem==1}}">
+			<include src="navTabqy.wxml" />
+		</view>
 	</view>
-	<ul class="list">
-		<li>政务公开</li>
-		<li>政务公开</li>
-		<li>政务公开</li>
-		<li>政务公开</li>
-		<li>政务公开</li>
-		<li>政务公开</li>
-		<li>政务公开</li>
-		<li>政务公开</li>
+	<!-- 地图服务 -->
+	<view class="view-dtfw cont-widthl">
+		<view class="title" style="background-image: url({{imgUrl}}bg-dtfw.png);">
+			<view style="font-size: 19px;font-weight: bold;color: #333333;">地图服务</view>
+			<view style="font-size: 13px;color: #7763E7;margin-top: 5px;">便民生活 生活缴费一站式平台</view>
+		</view>
+		<ul class="list">
+		<li bindtap="gotoDTSS">政务公开</li>
+		<li bindtap="gotoDTSS">政务服务</li>
+		<li bindtap="gotoDTSS">党群服务</li>
+		<li bindtap="gotoDTSS">核酸检测</li>
+		<li bindtap="gotoDTSS">教育资源</li>
+		<li bindtap="gotoDTSS">医疗卫生</li>
+		<li bindtap="gotoDTSS">户籍管理</li>
+		<li bindtap="gotoDTSS">交通服务</li>
 	</ul>
-	<view class="more">
+	<view bindtap="gotoDTSS" class="more">
 		查看更多 >>
 	</view>
-</view>
-<!-- 办理数据 -->
-<view class="view-blsj cont-width">
-	<view class="title">
-		<view class="line"></view>
-		<view>办理数据</view>
 	</view>
-	<view class="x-title"><span>办事数据</span><span>（数据截至上自然月）</span></view>
-	<ul class="blsj">
-		<li style="background-image: url({{imgUrl}}blsj1.png);">
-			<view class="top">最多跑一次事项数</view>
-			<view class="bottom"><span class="number">1371</span><span>件</span></view>
-		</li>
-		<li style="background-image: url({{imgUrl}}blsj2.png);">
-			<view class="top">最多跑一次事项数</view>
-			<view class="bottom"><span class="number">1371</span><span>件</span></view>
-		</li>
-		<li style="background-image: url({{imgUrl}}blsj3.png);">
-			<view class="top">最多跑一次事项数</view>
-			<view class="bottom"><span class="number">1371</span><span>件</span></view>
-		</li>
-		<li style="background-image: url({{imgUrl}}blsj4.png);">
-			<view class="top">最多跑一次事项数</view>
-			<view class="bottom"><span class="number">1371</span><span>件</span></view>
-		</li>
-	</ul>
-	<view class="x-title"><span>好差评数据</span><span>（数据截至上一自然月）</span></view>
-	<ul class="hcpsj">
-		<li>
-			<view class="top">
-				<image src="{{imgUrl}}hcpsj1.png" alt=""></image><span>评价数</span>
-			</view>
-			<view class="bottom"><span class="number">11225566</span><span>个</span></view>
-		</li>
-		<li>
-			<view class="top">
-				<image src="{{imgUrl}}hcpsj2.png" alt=""></image><span>评价数</span>
-			</view>
-			<view class="bottom"><span class="number">11225566</span><span>个</span></view>
-		</li>
-		<li>
-			<view class="top">
-				<image src="{{imgUrl}}hcpsj3.png" alt=""></image><span>评价数</span>
-			</view>
-			<view class="bottom"><span class="number">11225566</span><span>个</span></view>
-		</li>
-		<li>
-			<view class="top">
-				<image src="{{imgUrl}}hcpsj4.png" alt=""></image><span>评价数</span>
-			</view>
-			<view class="bottom"><span class="number">11225566</span><span>个</span></view>
-		</li>
-	</ul>
-</view>
-<!-- 住页游乐购 -->
-<view class="view-zyylg cont-width">
-	<view class="title">
-		<view class="line"></view>
-		<view>住业游乐购</view>
+	<!-- 办理数据 -->
+	<view class="view-blsj cont-width">
+		<view class="title">
+			<view class="line"></view>
+			<view>办理数据</view>
+		</view>
+		<view class="x-title"><span>办事数据</span><span>（数据截至上自然月）</span></view>
+		<ul class="blsj">
+			<li style="background-image: url({{imgUrl}}blsj1.png);">
+				<view class="top">最多跑一次事项数</view>
+				<view class="bottom"><span class="number">{{processingData.HANDLING_NUM}}</span><span>件</span></view>
+			</li>
+			<li style="background-image: url({{imgUrl}}blsj2.png);">
+				<view class="top">一次都不跑事项数</view>
+				<view class="bottom"><span class="number">{{processingData.ARRIVE_NUM}}</span><span>件</span></view>
+			</li>
+			<li style="background-image: url({{imgUrl}}blsj3.png);">
+				<view class="top">事项总数</view>
+				<view class="bottom"><span class="number">{{processingData.ITEM_NUM}}</span><span>件</span></view>
+			</li>
+			<li style="background-image: url({{imgUrl}}blsj4.png);">
+				<view class="top">月度办件数</view>
+				<view class="bottom"><span class="number">{{processingData.RECEIVENUMBERS}}</span><span>件</span></view>
+			</li>
+		</ul>
+		<view class="x-title"><span>好差评数据</span><span>（数据截至上一自然月）</span></view>
+		<ul class="hcpsj">
+			<li>
+				<view class="top">
+					<image src="{{imgUrl}}hcpsj1.png" alt=""></image><span>评价数</span>
+				</view>
+				<view class="bottom"><span class="number">{{processingData.TOTAL_NUM}}</span><span>个</span></view>
+			</li>
+			<li>
+				<view class="top">
+					<image src="{{imgUrl}}hcpsj2.png" alt=""></image><span>好评率</span>
+				</view>
+				<view class="bottom"><span class="number">{{processingData.SATIS_RATE}}</span><span>%</span></view>
+			</li>
+			<li>
+				<view class="top">
+					<image src="{{imgUrl}}hcpsj3.png" alt=""></image><span>差评数</span>
+				</view>
+				<view class="bottom"><span class="number">{{processingData.DISSSATIS_NUM}}</span><span>个</span></view>
+			</li>
+			<li>
+				<view class="top">
+					<image src="{{imgUrl}}hcpsj4.png" alt=""></image><span>差评整改率</span>
+				</view>
+				<view class="bottom"><span class="number">{{processingData.DISSSATIS_RATE}}</span><span>%</span></view>
+			</li>
+		</ul>
+	</view>
+	<!-- 住页游乐购 -->
+	<view class="view-zyylg cont-width">
+		<view class="title">
+			<view class="line"></view>
+			<view>住业游乐购</view>
+		</view>
+		<ul>
+			<li style="background-image: url({{imgUrl}}bg-zhu.png);">住</li>
+			<li style="background-image: url({{imgUrl}}bg-ye.png);">业</li>
+			<li style="background-image: url({{imgUrl}}bg-you.png);">游</li>
+			<li style="background-image: url({{imgUrl}}bg-le.png);">乐</li>
+			<li style="background-image: url({{imgUrl}}bg-gou.png);">购</li>
+		</ul>
 	</view>
-	<ul>
-		<li style="background-image: url({{imgUrl}}bg-zhu.png);">住</li>
-		<li style="background-image: url({{imgUrl}}bg-ye.png);">业</li>
-		<li style="background-image: url({{imgUrl}}bg-you.png);">游</li>
-		<li style="background-image: url({{imgUrl}}bg-le.png);">乐</li>
-		<li style="background-image: url({{imgUrl}}bg-gou.png);">购</li>
-	</ul>
-</view>
 </scroll-view>