Merge remote-tracking branch 'remotes/origin/xcx-v2' into kdnh-xcx

# Conflicts:
#	images/Version2.3/button_2.png
#	pages.json

App.vue

@@ -11,6 +11,36 @@
 					uni.setStorageSync('code', loginRes.code);
 				}
 			})
+			//小程序热更新
+			if (wx.canIUse('getUpdateManager')) {
+			  const updateManager = wx.getUpdateManager()
+			  updateManager.onCheckForUpdate(function (res) {
+			   if (res.hasUpdate) {
+				updateManager.onUpdateReady(function () {
+				 wx.showModal({
+				  title: '更新提示',
+				  content: '新版本已经准备好，是否重启应用？',
+				  success: function (res) {
+				   if (res.confirm) {
+					updateManager.applyUpdate()
+				   }
+				  }
+				 })
+				})
+				updateManager.onUpdateFailed(function () {
+				 wx.showModal({
+				  title: '已经有新版本了哟~',
+				  content: '新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~'
+				 })
+				})
+			   }
+			  })
+			 } else {
+			  wx.showModal({
+			   title: '提示',
+			   content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+			  })
+			 }
 		},
 		onShow: function() {
 			// this.onMQTT();

pages.json

@@ -560,13 +560,13 @@
 				{
 					"path": "emergencyEvacuationBig",//应急疏散
 					"style": {
-						"navigationBarTitleText": "应急处置"
+						"navigationBarTitleText": "风险处置"
 					}
 				},
 				{
 					"path": "emergencyEvacuationBigFullScreen",//应急疏散
 					"style": {
-						"navigationBarTitleText": "应急处置",
+						"navigationBarTitleText": "风险处置",
 						"pageOrientation": "landscape"
 					}
 				},