config.js

@@ -2,11 +2,7 @@ var host = "https://carbonneutral.bjfs.org.cn";//线上
 // var host = "https://carbon.my-footprint.cn";//线上域名2
 
 // var host = "https://tanzhonghe-admin.com";//本地
-<<<<<<< HEAD
-// var host = "https://carbon.scdxtc.cn";//大向天诚服务器
-=======
 // var host = "http://carbon.scdxtc.cn";//大向天诚服务器
->>>>>>> 7aeb254a85a161e4f3eef68e01a6674b00a20fb1
 var config = {
 	host: host,
 	appkey: '8c10f27733333fef726885b08ff9d858',//appkey 碳中和Y

pages/gproduct/gproduct.js

@@ -58,15 +58,6 @@ 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,
@@ -81,11 +72,13 @@ 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
 			})

project.config.json

@@ -21,7 +21,6 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": true,
@@ -32,11 +31,12 @@
     },
     "enableEngineNative": false,
     "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
+    "minifyWXSS": true
-    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.2",