From 2b439577794120fe38ba203d3299cfeb5afa6eee Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Wed, 10 Aug 2022 18:14:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gproduct/gproduct.js   |  2 +-
 pages/gproduct/gproduct.wxml | 35 +++++++++++++++++++----------------
 project.config.json          | 23 ++++++++++++++---------
 project.private.config.json  | 13 +++----------
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/pages/gproduct/gproduct.js b/pages/gproduct/gproduct.js
index edd6d7f..15c9c98 100644
--- a/pages/gproduct/gproduct.js
+++ b/pages/gproduct/gproduct.js
@@ -285,7 +285,7 @@ Page({
 			},
 			success(res) {
 				if (res.data.result == 'success') {
-					var threeList = JSON.parse(res.data.data).cases;
+					var threeList = JSON.parse(res.data.data).cases;
 					if(threeList[0].type=='forest_management'){
 						that.setData({
 							isXiangm:true
diff --git a/pages/gproduct/gproduct.wxml b/pages/gproduct/gproduct.wxml
index d5ec968..d65adc0 100644
--- a/pages/gproduct/gproduct.wxml
+++ b/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>
diff --git a/project.config.json b/project.config.json
index 9dc5f66..32523e5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,7 +1,8 @@
 {
-  "description": "项目配置文件",
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -30,22 +31,22 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
+    "useIsolateContext": false,
     "userConfirmedBundleSwitch": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,
-    "showES6CompileOption": false
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true,
+    "useStaticServer": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.2",
   "appid": "wxf0ac33e1fb0d8358",
   "projectname": "tanzhongheY",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "isGameTourist": false,
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
@@ -62,5 +63,9 @@
     "miniprogram": {
       "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 05fc033..9f72084 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,15 +1,6 @@
 {
   "setting": {},
   "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
     "miniprogram": {
       "list": [
         {
@@ -39,9 +30,11 @@
         {
           "name": "pages/user/user",
           "pathName": "pages/user/user",
+          "query": "",
           "scene": null
         }
       ]
     }
-  }
+  },
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }
\ No newline at end of file