From ef740fb1a1bd2a68b15a42f82acb4e5924192ab4 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 3 Sep 2021 18:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                  |  4 ++--
 pages/gproduct/gproduct.js | 11 +++++++++--
 project.config.json        |  7 +++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/config.js b/config.js
index cee1a2c..e8bd325 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
-// var host = "https://carbonneutral.bjfs.org.cn";//线上
+var host = "https://carbonneutral.bjfs.org.cn";//线上
 // var host = "https://carbon.my-footprint.cn";//线上域名2
 
 // var host = "https://tanzhonghe-admin.com";//本地
-var host = "https://carbon.scdxtc.cn";//大向天诚服务器
+// var host = "https://carbon.scdxtc.cn";//大向天诚服务器
 var config = {
 	host: host,
 	appkey: '8c10f27733333fef726885b08ff9d858',//appkey 碳中和Y
diff --git a/pages/gproduct/gproduct.js b/pages/gproduct/gproduct.js
index 91fbc64..8057063 100644
--- a/pages/gproduct/gproduct.js
+++ b/pages/gproduct/gproduct.js
@@ -58,6 +58,15 @@ Page({
 		}
 	},
 	casesChange(event) {
+		if(this.data.threeList[event.detail.value].type=='forest_management'){
+			this.setData({
+				isXiangm:true
+			})
+		} else {
+			this.setData({
+				isXiangm:false
+			})
+		}
 		this.setData({
 			curCaseIndex: event.detail.value,
 			isShif: false,
@@ -72,13 +81,11 @@ Page({
 		})
 		if (event.detail.value == 1) {
 			this.setData({
-				isXiangm: true,
 				newDo_type: this.data.senList[this.data.senIndex].type,
 				cases_position_id:this.data.threeList[this.data.curCaseIndex].address[0].id
 			})
 		} else {
 			this.setData({
-				isXiangm: false,
 				newDo_type: this.data.threeList[this.data.curCaseIndex].type,
 				cases_position_id:this.data.threeList[this.data.curCaseIndex].address[0].id
 			})
diff --git a/project.config.json b/project.config.json
index c13c7a7..589d6a5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -21,6 +21,7 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": true,
@@ -30,14 +31,12 @@
       "outputPath": ""
     },
     "enableEngineNative": false,
-    "bundle": false,
     "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.16.0",