From dfb64b622d076d26e1a88fd3f3e9dc34600d5bc3 Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Mon, 3 Aug 2020 17:33:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.21=20=E9=94=A6=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E8=B1=A1banner=E4=BC=98=E5=8C=96=EF=BC=9B=E4=B8=80?=
 =?UTF-8?q?=E9=94=AE=E6=9C=8D=E5=8A=A1=E5=A2=9E=E5=8A=A0=E4=BC=97=E5=88=9B?=
 =?UTF-8?q?=E5=8D=AB=E7=94=9F=E5=9F=8E=EF=BC=8C=E5=AE=89=E5=85=A8360?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97;=20=E7=AD=BE=E5=88=B0=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=A7=BB=E8=87=B3=E9=A6=96=E9=A1=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js | 2 +-
 project.config.json            | 6 +++---
 utils/config.js                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index e17ecc3..c2a779c 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.4.20"
+    const versionNum = "1.4.21"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/project.config.json b/project.config.json
index 24ee6f9..6fc0371 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,
-		"compileHotReLoad": false,
-		"useIsolateContext": true
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
diff --git a/utils/config.js b/utils/config.js
index 6cf2c13..5986183 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,13 +6,13 @@ module.exports = {
 };
 
 function BASEURL() {
-  return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+  // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
   // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
   // return "http://219.146.91.110:9094/epdc-api/api/"  // 测试环境 ip接口地址
   // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
   // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
   //  return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
-  // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+  return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
   // return 'http://192.168.43.19:9094/epdc-api/api/'
 }