小程序登录相关内容

nngkxxdp/src/main/resources/static/natj/progress/dataDetail.html

@@ -55,7 +55,7 @@
         },
         xAxis: {
             type: 'category',
-            data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月','2023.1月-3月'],
+            data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月','2023年第一季度',"2023.1月-4月"],
             axisPointer: {
                 type: 'shadow'
             },
@@ -93,7 +93,7 @@
                     }
                 },
                 data: [
-                    40.1, 28.8, 20.3, 14.2, 13.8, 13.1, 11.3, 10.9, 9.5, 7.4, 2.0, 4.6, 4.6, 5.6, 3.2, 1.0, -1.0, 0.5, 0.9, -0.7, -0.4, 8.3,5.0
+                    40.1, 28.8, 20.3, 14.2, 13.8, 13.1, 11.3, 10.9, 9.5, 7.4, 2.0, 4.6, 4.6, 5.6, 3.2, 1.0, -1.0, 0.5, 0.9, -0.7, -0.4, 8.3,5.0,1.8
                 ]
             }
         ]
@@ -121,7 +121,7 @@
         xAxis: [
             {
                 type: 'category',
-                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月','2023.1月-3月'],
+                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月','2023年第一季度','2023.1月-4月'],
                 axisPointer: {
                     type: 'shadow'
                 },
@@ -162,7 +162,7 @@
                     }
                 },
                 data: [
-                    12.3, 20.6, 7.0, 11.1, 16.4, 15.2, 13.4, 8.0, 5.9, 0.1, 2.5, 9.6, -0.7, -6.9, 4.8, -3.1, -0.3, 2.0, 1.0, -5.9, -3.8, 11.5,17.5
+                    12.3, 20.6, 7.0, 11.1, 16.4, 15.2, 13.4, 8.0, 5.9, 0.1, 2.5, 9.6, -0.7, -6.9, 4.8, -3.1, -0.3, 2.0, 1.0, -5.9, -3.8, 11.5,17.5,22.1
                 ]
             }
         ]
@@ -191,7 +191,7 @@
         xAxis: [
             {
                 type: 'category',
-                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月', '2023.1月-3月'],
+                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月', '2023年第一季度','2023.1月-4月'],
                 axisPointer: {
                     type: 'shadow'
                 },
@@ -251,7 +251,7 @@
                         return value + ' 万平方米';
                     }
                 },
-                data: [39.6, 56.08, 79.73, 112.4, 123.82, 134.79, 153.2, 183.92, 204.78, 234.1, 14.1, 37.8, 61.5, 82.4, 101.3, 109.3, 112.2, 121.3, 133.6, 134.8, 149.45, 12.4,38.7]
+                data: [39.6, 56.08, 79.73, 112.4, 123.82, 134.79, 153.2, 183.92, 204.78, 234.1, 14.1, 37.8, 61.5, 82.4, 101.3, 109.3, 112.2, 121.3, 133.6, 134.8, 149.45, 12.4,38.7,47.1]
             },
             {
                 name: '同比增减（%）',
@@ -263,7 +263,7 @@
                     }
                 },
                 data: [
-                    41.9, 39.4, 23.9, 21.2, 10.6, 5.1, -9.4, -3.5, -2.0, -11.3, 25.9, -4.5, 9.7, 3.1, -9.9, -11.7, -16.7, -20.8, -27.3, -34.2, -36.1, -12.9,2.3
+                    41.9, 39.4, 23.9, 21.2, 10.6, 5.1, -9.4, -3.5, -2.0, -11.3, 25.9, -4.5, 9.7, 3.1, -9.9, -11.7, -16.7, -20.8, -27.3, -34.2, -36.1, -12.9,2.3,-23.5
                 ]
             }
         ]
@@ -296,7 +296,8 @@
         ['2022.1月-11月', 53, -22, 37.8, 14.7],
         ['2022年全年', 56.8, 0.7, 39.5, -13.5],
         ['2023.1月-2月', 8.83, -8.1, 6.89, -15.7],
-        ['2023.1月-3月', 14.3, -1.5, 11.2, -3.4]
+        ['2023年第一季度', 14.3, -1.5, 11.2, -3.4],
+        ['2023.1月-4月', 20.76, 4.6, 17.05, 4.1]
     ]
     var chartDom = document.getElementById('finance');
     var myChart = echarts.init(chartDom);

nngkxxdp/src/main/resources/static/zdjc/sy.html

@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" href="./css/wj.css"/>
     <link rel="stylesheet" href="./css/foot.css">
     <script type="text/javascript" src="../constans.js"></script>
-    <script src="./layui/layer.js" type="text/javascript" charset="utf-8"></script>
+<!--    <script src="./layui/layer.js" type="text/javascript" charset="utf-8"></script>-->
     <script src="./layui/layui.js" type="text/javascript" charset="utf-8"></script>
     <script defer async type="text/javascript" src="//gov.govwza.cn/dist/aria.js?appid=f9d6e7b3fdc3e0b4b98ceccb24f22aa7" charset="utf-8" wapForceOldFixed="false" loadData="false" id="ariascripts"></script>
     <script src="./js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
@@ -365,6 +365,7 @@
         })
         initSearchParams();
         initDetail();
+
         initPage();
         // hotSearch();
 
@@ -385,7 +386,7 @@
         if (sessionStorage.ELK_YEAR && sessionStorage.ELK_YEAR != "null") {
             params.year = sessionStorage.ELK_YEAR;
         }
-        var index = layer.load(2);
+        // var index = layer.load(2);
         $.ajax({
             type: 'get',
             url: PATH + '/elk/search',

nnzwminiapp/app.json

@@ -1,129 +1,131 @@
 {
-    "pages": [
-        "pages/index/index",
-        "pages/publics/index/index",
-        "pages/collection/collection",
-        "pages/newsPaper/newsPaper",
-        "pages/customerServe/customerServe",
-        "pages/ZCWDK/add/add",
-        "pages/ZCWDK/index/index",
-        "pages/nais/nais",
-        "pages/dataCenterZWTJ/dataCenterZWTJ",
-        "pages/login/login",
-        "pages/deliciousList/deliciousList",
-        "pages/aticleList/aticleList",
-        "pages/commentList/commentList",
-        "pages/serve/serve",
-        "pages/dataCenter/dataCenter",
-        "pages/dataCenterXXTJ/dataCenterXXTJ",
-        "pages/ZCWDK/info/info",
-        "pages/articlDetail/articlDetail",
-        "pages/yjzjDetail/yjzjDetail",
-        "pages/programList/programList",
-        "pages/leaveMessage/leaveMessage",
-        "pages/leaveMessage2/leaveMessage2",
-        "pages/web/web",
-        "pages/comment/comment",
-        "pages/publics/government/government",
-        "pages/publics/publicLeaderDetail/publicLeaderDetail",
-        "pages/publics/leaderInfo/leaderInfo",
-        "pages/publics/governmentArticles/governmentArticles",
-        "pages/publics/governmentArticlesDetail/governmentArticlesDetail",
-        "pages/publics/baseAffairs/baseAffairs",
-        "pages/publics/interpretation/interpretation",
-        "pages/publics/fileList/fileList",
-        "pages/publics/fileDetail/fileDetail",
-        "pages/myCenter/myCenter",
-        "pages/ourCanteen/ourCanteen",
-        "pages/publics/topics/topics",
-        "pages/zxft/fileList",
-        "pages/blankpage/blankpage",
-        "pages/publics/publicSystem/publicSystem",
-        "pages/publics/publicContent/publicContent",
-        "pages/zmhd/zmhd",
-        "pages/videoRecommend/videoRecommend",
-        "pages/phoneNewsPaper/phoneNewsPaper",
-        "pages/map/map",
-        "pages/map-vr/map-vr"
-    ],
-    "requiredPrivateInfos": [
-        "getLocation",
-        "choosePoi"
-    ],
-    "subpackages": [
-        {
-            "root": "pagesPublic",
-            "pages": [
-                "pages/yxnaJfq/yxnaJfq",
-                "pages/yxnaJfh/yxnaJfh",
-                "pages/yxnaQxn/yxnaQxn",
-                "pages/yxna/yxna",
-                "pages/album/album",
-                "pages/albumDetail/albumDetail",
-                "pages/albumEdit/albumEdit",
-                "pages/menu/menu",
-                "pages/myCollection/myCollection",
-                "pages/myComment/myComment",
-                "pages/like/like",
-                "pages/work-order/work-order",
-                "pages/work-order-detail/work-order-detail"
-            ]
-        }
-    ],
-    "window": {
-        "backgroundTextStyle": "light",
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarTitleText": "Weixin",
-        "navigationBarTextStyle": "black"
-    },
-    "tabBar": {
-        "custom": true,
-        "color": "#999",
-        "selectedColor": "#3D98FF",
-        "backgroundColor": "#fff",
-        "borderStyle": "white",
-        "list": [
-            {
-                "selectedIconPath": "pages/images/f-fw2.png",
-                "iconPath": "pages/images/f-sy.png",
-                "pagePath": "pages/index/index",
-                "text": "首页"
-            },
-            {
-                "selectedIconPath": "pages/images/f-gk2.png",
-                "iconPath": "pages/images/f-gk.png",
-                "pagePath": "pages/publics/index/index",
-                "text": "公开"
-            },
-            {
-                "selectedIconPath": "pages/images/f-gk2.png",
-                "iconPath": "pages/images/f-gk.png",
-                "pagePath": "pages/nais/nais",
-                "text": "这是南岸"
-            },
-            {
-                "selectedIconPath": "pages/images/f-fw2.png",
-                "iconPath": "pages/images/f-fw.png",
-                "pagePath": "pages/serve/serve",
-                "text": "服务"
-            },
-            {
-                "selectedIconPath": "pages/images/f-wd2.png",
-                "iconPath": "pages/images/f-wd.png",
-                "pagePath": "pages/myCenter/myCenter",
-                "text": "我的"
-            }
-        ]
-    },
-    "plugins": {
-        "routePlan": {
-            "version": "1.0.19",
-            "provider": "wx50b5593e81dd937a"
-        }
-    },
-    "permission": {
-        "scope.userLocation": {
-            "desc": "我们将获取您的定位信息用于地点展示"
-        }
+  "pages": [
+    "pages/index/index",
+    "pages/publics/index/index",
+    "pages/collection/collection",
+    "pages/newsPaper/newsPaper",
+    "pages/customerServe/customerServe",
+    "pages/ZCWDK/add/add",
+    "pages/ZCWDK/index/index",
+    "pages/nais/nais",
+    "pages/dataCenterZWTJ/dataCenterZWTJ",
+    "pages/login/login",
+    "pages/deliciousList/deliciousList",
+    "pages/aticleList/aticleList",
+    "pages/commentList/commentList",
+    "pages/serve/serve",
+    "pages/dataCenter/dataCenter",
+    "pages/dataCenterXXTJ/dataCenterXXTJ",
+    "pages/ZCWDK/info/info",
+    "pages/articlDetail/articlDetail",
+    "pages/yjzjDetail/yjzjDetail",
+    "pages/programList/programList",
+    "pages/leaveMessage/leaveMessage",
+    "pages/leaveMessage2/leaveMessage2",
+    "pages/web/web",
+    "pages/comment/comment",
+    "pages/publics/government/government",
+    "pages/publics/publicLeaderDetail/publicLeaderDetail",
+    "pages/publics/leaderInfo/leaderInfo",
+    "pages/publics/governmentArticles/governmentArticles",
+    "pages/publics/governmentArticlesDetail/governmentArticlesDetail",
+    "pages/publics/baseAffairs/baseAffairs",
+    "pages/publics/interpretation/interpretation",
+    "pages/publics/fileList/fileList",
+    "pages/publics/fileDetail/fileDetail",
+    "pages/myCenter/myCenter",
+    "pages/ourCanteen/ourCanteen",
+    "pages/publics/topics/topics",
+    "pages/zxft/fileList",
+    "pages/blankpage/blankpage",
+    "pages/publics/publicSystem/publicSystem",
+    "pages/publics/publicContent/publicContent",
+    "pages/zmhd/zmhd",
+    "pages/videoRecommend/videoRecommend",
+    "pages/phoneNewsPaper/phoneNewsPaper",
+    "pages/map/map",
+    "pages/map-vr/map-vr",
+    "pages/aticle1/aticle",
+    "pages/aticle2/aticle"
+  ],
+  "requiredPrivateInfos": [
+    "getLocation",
+    "choosePoi"
+  ],
+  "subpackages": [
+    {
+      "root": "pagesPublic",
+      "pages": [
+        "pages/yxnaJfq/yxnaJfq",
+        "pages/yxnaJfh/yxnaJfh",
+        "pages/yxnaQxn/yxnaQxn",
+        "pages/yxna/yxna",
+        "pages/album/album",
+        "pages/albumDetail/albumDetail",
+        "pages/albumEdit/albumEdit",
+        "pages/menu/menu",
+        "pages/myCollection/myCollection",
+        "pages/myComment/myComment",
+        "pages/like/like",
+        "pages/work-order/work-order",
+        "pages/work-order-detail/work-order-detail"
+      ]
     }
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "Weixin",
+    "navigationBarTextStyle": "black"
+  },
+  "tabBar": {
+    "custom": true,
+    "color": "#999",
+    "selectedColor": "#3D98FF",
+    "backgroundColor": "#fff",
+    "borderStyle": "white",
+    "list": [
+      {
+        "selectedIconPath": "pages/images/f-fw2.png",
+        "iconPath": "pages/images/f-sy.png",
+        "pagePath": "pages/index/index",
+        "text": "首页"
+      },
+      {
+        "selectedIconPath": "pages/images/f-gk2.png",
+        "iconPath": "pages/images/f-gk.png",
+        "pagePath": "pages/publics/index/index",
+        "text": "公开"
+      },
+      {
+        "selectedIconPath": "pages/images/f-gk2.png",
+        "iconPath": "pages/images/f-gk.png",
+        "pagePath": "pages/nais/nais",
+        "text": "这是南岸"
+      },
+      {
+        "selectedIconPath": "pages/images/f-fw2.png",
+        "iconPath": "pages/images/f-fw.png",
+        "pagePath": "pages/serve/serve",
+        "text": "服务"
+      },
+      {
+        "selectedIconPath": "pages/images/f-wd2.png",
+        "iconPath": "pages/images/f-wd.png",
+        "pagePath": "pages/myCenter/myCenter",
+        "text": "我的"
+      }
+    ]
+  },
+  "plugins": {
+    "routePlan": {
+      "version": "1.0.19",
+      "provider": "wx50b5593e81dd937a"
+    }
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "我们将获取您的定位信息用于地点展示"
+    }
+  }
 }

nnzwminiapp/pages/aticle1/aticle.json

@@ -1,4 +1,6 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "“掌新南岸”微信小程序用户隐私政策"
+  "navigationBarTitleText": "“掌新南岸”微信小程序用户隐私政策",
+  "navigationBarBackgroundColor": "#508FF4",
+  "navigationBarTextStyle": "white"
 }

nnzwminiapp/pages/aticle2/aticle.json

@@ -1,4 +1,6 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "“掌新南岸”小程序用户服务协议"
+  "navigationBarTitleText": "“掌新南岸”小程序用户服务协议",
+  "navigationBarBackgroundColor": "#508FF4",
+  "navigationBarTextStyle": "white"
 }

nnzwminiapp/pages/login/login.js

@@ -21,6 +21,9 @@ Page({
 		agree: false,
 		canIUse: wx.canIUse('button.open-type.getUserInfo'),
 		showLogin: false,
+		deda: 0,
+		loadText: "登录中..."
+		
 	},
 
 	/**
@@ -94,6 +97,23 @@ Page({
 						code: res.code,
 						phoneCode: phoneCode
 					};
+					let int = setInterval(function () {
+						that.setData({
+							deda: that.data.deda + 1
+						})
+						switch (that.data.deda) {
+							case 1:
+								that.setData({
+									loadText: "初始化华龙网用户数据中..."
+								})
+								break
+							case 7:
+								that.setData({
+									loadText: "初始化静态资源中"
+								})
+								break
+						}
+					}, 1000)
 					that.setData({
 						showLogin: true
 					})
@@ -109,8 +129,12 @@ Page({
 							let pages = getCurrentPages();
 							let prevPage = pages[pages.length - 2];
 							that.setData({
-								showLogin: false
+								showLogin: false,
+								deda: 0,
+								loadText: "登录中..."
 							})
+							clearInterval(int)
+
 							prevPage.setData({
 								loginReturnFlag: true
 							})
@@ -124,7 +148,7 @@ Page({
 							wx.showModal({
 								title: '登录失败',
 								content: '登录失败,请重试',
-								complete: (res) => {}
+								complete: (res) => { }
 							})
 						}
 
@@ -137,6 +161,15 @@ Page({
 
 	},
 
+	protocolTips() {
+		wx.showToast({
+			title: '请同意服务协议',
+			icon: 'error',
+			duration: 1500 //持续的时间
+		})
+		return
+	},
+
 	showSettingToast: function (e) {
 		wx.showModal({
 			title: '提示！',
@@ -152,6 +185,16 @@ Page({
 			}
 		})
 	},
+	serviceAgreement(){
+		wx.navigateTo({
+			url: '/pages/aticle1/aticle',
+		})
+	},
+	informationProcessing(){
+		wx.navigateTo({
+			url: '/pages/aticle2/aticle',
+		})
+	},
 
 	/**
 	 * 生命周期函数--监听页面卸载

nnzwminiapp/pages/login/login.wxml

@@ -4,7 +4,7 @@
 	<view wx:if="{{showLogin}}" style="display: flex;align-items: center;justify-content: center;height: 100vh;width: 100%;position: absolute;background-color: #F5F6F8;z-index: 9999;">
 		<view style="display: flex;flex-direction: column;align-items: center;justify-content: center;padding-top: 80rpx;">
 			<t-loading theme="circular" size="90rpx" layout="vertical"></t-loading>
-			<view style="color: #000;padding-top: 18rpx;font-size: 32rpx;letter-spacing: 3rpx;">登录中</view>
+			<view style="color: #000;padding-top: 18rpx;font-size: 32rpx;letter-spacing: 3rpx;">{{loadText}}</view>
 		</view>
 	</view>
 
@@ -19,14 +19,20 @@
       <view style="height: 66rpx">
         <image src="{{agreementImg}}" bindtap="agreementSuccess" style="height: 40rpx;width: 40rpx"></image>
       </view>
-      <view style="height: 66rpx;font-size:24rpx;color: #333333;display:flex;align-items:center;justify-content:center">
-        阅读并同意《服务协议及个人信息处理规则》和《xxx 个人信息处理规则》
+      <!-- display:flex; -->
+      <view style="width:95%;  height: 66rpx;font-size:24rpx;color: #333333;align-items:center;justify-content:center">
+        <view style="float:left">阅读并同意</view><view style="float:left;color:#ff7a14;text-decoration: underline" bind:tap="serviceAgreement">《服务协议及个人信息处理规则》</view>和 <view style="float:left;color:#ff7a14;text-decoration: underline" bind:tap="informationProcessing">《个人信息处理规则》</view> 
       </view>
     </view>
   </view>
 
   <view style="margin-top: 10rpx">
-    <button open-type="getPhoneNumber" type="primary" bindgetphonenumber="getPhoneNumber" style="width: 80%;display: flex;align-items:center;justify-content: center">
+    <button wx:if="{{!agree}}"  type="primary" bindtap="protocolTips" style="width: 80%;display: flex;align-items:center;justify-content: center">
+      <image style="height: 33rpx;width: 41rpx" src="{{imgUrl}}wx-login.png"></image>
+      <text style="padding-left: 15rpx;font-size:27rpx">微信用户一键登录</text>
+    </button>
+
+    <button wx:if="{{agree}}" open-type="getPhoneNumber" type="primary" bindgetphonenumber="getPhoneNumber" style="width: 80%;display: flex;align-items:center;justify-content: center">
       <image style="height: 33rpx;width: 41rpx" src="{{imgUrl}}wx-login.png"></image>
       <text style="padding-left: 15rpx;font-size:27rpx">微信用户一键登录</text>
     </button>

nnzwminiapp/pages/login/login.wxss

@@ -1 +1,5 @@
 /* pages/login/login.wxss */
+
+.xyys{
+    
+}