From 2d549ff101fcb63d4c9ef8cd1f1dcf4e1eded412 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 13 Jul 2020 17:24:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=A5=E8=87=AA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AB=AF=E5=92=8C=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC,state=3D4=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4leader=5Fgrid=E5=92=8Cwork=5Fgrid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/indexNew/indexNew.js | 12 +++++++++---
 project.config.json        | 21 ++++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index e6ce20a..c59941b 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -74,7 +74,8 @@ Page({
     leaderGridId:'', //领导网格6.22
     workGridId:'', //工作网格7.08
     completeInfoDialogVisible: false, //完善信息
-    homePagePhone: {}
+    homePagePhone: {},
+    fromprogram: '' //来自工作端=work 或者 数据分析端=leader 的跳转
   },
   onShow: function () {
     if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) {
@@ -107,7 +108,8 @@ Page({
       this.setData({
         statusHeight: app.globalData.deviceInfo.statusHeight,
         navigationHeight: app.globalData.deviceInfo.navigationHeight,
-        gridId: options.scene
+        gridId: options.scene,
+        fromprogram: options.from
       })
     } else {
       this.setData({
@@ -312,7 +314,7 @@ Page({
             })
 
             // 优化注册流程
-            if (that.data.gid) {
+            if (that.data.gid && !that.data.fromprogram) {
               if (that.data.gid == "gridLeader") {
                 wx.redirectTo({
                   url: "/pages/gridLeaderRegister/gridLeaderRegister"
@@ -329,6 +331,10 @@ Page({
                   wx.redirectTo({
                     url: "/pages/formid/formid?gid=" + para.defaultGridId
                   })
+                } else if (that.data.fromprogram) {                  
+                  wx.redirectTo({
+                    url: "/pages/formid/formid?gid=" + that.data.gid
+                  })
                 } else if (app.globalData.tempGridId == "") {
                   wx.redirectTo({
                     url: "/pages/toRegister/toRegister"
diff --git a/project.config.json b/project.config.json
index 7ffa9ec..37e83d4 100644
--- a/project.config.json
+++ b/project.config.json
@@ -17,15 +17,15 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
 		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"compileHotReLoad": false,
+		"useIsolateContext": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
@@ -93,6 +93,21 @@
 					"id": -1,
 					"name": "社群列表",
 					"pathName": "subpages/associationNew/pages/associationlist/associationlist",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 5,
+					"name": "数据端跳转",
+					"pathName": "pages/indexNew/indexNew",
+					"query": "scene=1277169327606366209&from=analysis",
+					"scene": null
+				},
+				{
+					"id": 6,
+					"name": "工作端跳转",
+					"pathName": "pages/indexNew/indexNew",
+					"query": "scene=1280737901335838721&from=work",
 					"scene": null
 				}
 			]

From 029ff153fc9d4015760c67753c3442d887c3f72f Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Mon, 13 Jul 2020 18:10:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.14=20=E6=9C=AA?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=BF=87=E7=9A=84=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E5=88=AB=E9=BB=98=E8=AE=A4=E6=B3=A8=E5=86=8C=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BD=91=E6=A0=BC=E5=92=8C=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 373e158..90fe382 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.4.13"
+    const versionNum = "1.4.14"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag