修改冲突

pages/gproduct/gproduct.wxml

@@ -19,34 +19,37 @@
 			<view class="title">碳中和项目选择</view>
 			<view class="info">
 				<picker bindchange="casesChange" value="{{curCaseIndex}}" range-key="name" range="{{threeList}}">
-					<view class="picker">{{flag?threeList[curCaseIndex].name:"默认选项"}}</view>
+					<!-- <view class="picker">{{flag?threeList[curCaseIndex].name:"默认选项"}}</view> -->
+					<view class="picker">{{threeList[curCaseIndex].name}}</view>
 				</picker>
 			</view>
 		</view>
 	</view>
-	<!-- 项目选择 -->
-	<view class="address" wx:if="{{isXiangm}}">
-		<!-- <view class="title">森林经营项目</view> -->
-		<image style="width:38rpx;height:35rpx" src="/img/nav/case.png"></image>
-		<view class="title">碳中和项目类型选择</view>
-		<view class="info">
-			<picker bindchange="senChange" value="{{senIndex}}" range-key="name" range="{{senList}}">
-				<view class="picker">
-					{{flag?senList[senIndex].name:"默认选项"}}
-				</view>
-			</picker>
-		</view>
-	</view>
 	<!-- 地址选择 -->
 	<view class="address">
 		<!-- <view class="title">地址选择</view> -->
 		<image style="width:38rpx;height:35rpx" src="/img/nav/address.png"></image>
-		<view class="title">碳中和项目地点选择</view>
+		<view class="title">项目地点选择</view>
 		<view class="info">
 			<picker bindchange="addrressChange" value="{{addressIndex}}" range-key="info" range="{{threeList[curCaseIndex].address}}">
 				<view class="picker">
 					<!-- address -->
-					{{flag?threeList[curCaseIndex].address[addressIndex].info:"默认选项"}}
+					<!-- {{flag?threeList[curCaseIndex].address[addressIndex].info:"默认选项"}} -->
+					{{threeList[curCaseIndex].address[addressIndex].info}}
+				</view>
+			</picker>
+		</view>
+	</view>
+	<!-- 项目选择 -->
+	<view class="address" wx:if="{{isXiangm}}">
+		<!-- <view class="title">森林经营项目</view> -->
+		<image style="width:38rpx;height:35rpx" src="/img/nav/case.png"></image>
+		<view class="title">项目类型选择</view>
+		<view class="info">
+			<picker bindchange="senChange" value="{{senIndex}}" range-key="name" range="{{senList}}">
+				<view class="picker">
+					<!-- {{flag?senList[senIndex].name:"默认选项"}} -->
+					{{senList[senIndex].name}}
 				</view>
 			</picker>
 		</view>

project.config.json

@@ -31,17 +31,17 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
+    "useIsolateContext": false,
     "userConfirmedBundleSwitch": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,
-    "showES6CompileOption": false,
-    "useStaticServer": true,
     "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
     "useCompilerPlugins": false,
-    "minifyWXML": true
+    "ignoreUploadUnusedFiles": true,
+    "useStaticServer": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.2",

project.private.config.json

@@ -38,6 +38,5 @@
       ]
     }
   },
-  "projectname": "%E7%A2%B3%E4%B8%AD%E5%92%8C3",
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }