From 9fed9a5c84198d0527b536373f67920def965fa3 Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Thu, 22 Oct 2020 15:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.5.2=20=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=AD=E5=B1=85=E5=8A=A1=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 04a45a7..b14b124 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.5.1"
+    const versionNum = "1.5.2"
     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 60f8cc5..9e32098 100644
--- a/project.config.json
+++ b/project.config.json
@@ -34,24 +34,37 @@
   "compileType": "miniprogram",
   "libVersion": "2.8.2",
   "appid": "wx6dcf544cdae7d4ec",
-  "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9                                   1%E7%AB%AF",
+  "projectname": "e%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%91%E7%AB%AF",
+  "cloudfunctionTemplateRoot": "",
+  "watchOptions": {
+    "ignore": []
+  },
   "debugOptions": {
     "hidedInDevtools": []
   },
-  "isGameTourist": false,
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
+  "scripts": {},
   "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
     "plugin": {
+      "current": -1,
       "list": []
     },
     "game": {
       "list": []
     },
     "gamePlugin": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": [
         {
           "id": 0,
@@ -60,12 +73,6 @@
           "query": "gid=1233592630168813569",
           "scene": 1011
         },
-        {
-          "name": "pages/indexNew/indexNew",
-          "pathName": "pages/indexNew/indexNew",
-          "query": "scene=module_ma_code_zyzqn",
-          "scene": 1011
-        },
         {
           "id": 2,
           "name": "网格长注册",
@@ -94,12 +101,6 @@
           "query": "scene=1277169327606366209&from=analysis",
           "scene": null
         },
-        {
-          "name": "工作端跳转",
-          "pathName": "pages/indexNew/indexNew",
-          "query": "scene=1280737901335838721&from=work",
-          "scene": null
-        },
         {
           "id": 7,
           "name": "我有事说",
diff --git a/utils/config.js b/utils/config.js
index d099316..e94fe91 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,8 +6,8 @@ module.exports = {
 };
 
 function BASEURL() {
-  return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
-  // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+  // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+  return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
   // return 'http://192.168.43.19:9094/epdc-api/api/'
 }