From 06efd184e7d2ba00e6573c257f1bf1ae7a312701 Mon Sep 17 00:00:00 2001
From: yaya <3504524067@qq.com>
Date: Tue, 2 Aug 2022 21:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/auth/auth.wxml        |  2 +-
 pages/gproduct/gproduct.js  |  8 ++++----
 project.config.json         | 19 ++++++++++++-------
 project.private.config.json | 18 +++++++-----------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/pages/auth/auth.wxml b/pages/auth/auth.wxml
index 506fb8a..226141d 100644
--- a/pages/auth/auth.wxml
+++ b/pages/auth/auth.wxml
@@ -3,5 +3,5 @@
   <view class="title">微信授权页面</view>
   <view class="describe">此页面是微信授权页面，点击下方按钮弹出授权或跳转页面</view>
   <button class="btn" open-type='getUserInfo' wx:if="{{canIUse}}" bindtap="getUserProfile">点击微信授权</button>
-  <navigator wx:if="{{!canIUse}}" class="btn" url="/pages/auth/auth" open-type="reLaunch" hover-class="other-navigator-hover">已经授权点击调转</navigator>
+  <navigator wx:if="{{!canIUse}}" class="btn" url="/pages/index/index" open-type="reLaunch" hover-class="other-navigator-hover">已经授权点击调转</navigator>
 </view>
\ No newline at end of file
diff --git a/pages/gproduct/gproduct.js b/pages/gproduct/gproduct.js
index edd6d7f..dd72ec6 100644
--- a/pages/gproduct/gproduct.js
+++ b/pages/gproduct/gproduct.js
@@ -71,7 +71,7 @@ Page({
 		}
 		this.setData({
 			curCaseIndex: event.detail.value,
-			isShif: false,
+			isShif: this.data.threeList[event.detail.value].type=='forest_management'?true:false,
 			senIndex: 0,
 			addressIndex:0,
 			priceList: {},
@@ -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
@@ -360,14 +360,14 @@ Page({
 		var that = this
 		var tree_items = []
 		var management_items = []
-		if (this.data.newDo_type == 'afforestation') {
+		if (this.data.newDo_type == 'afforestation') {
 			for (var p in this.data.priceList) {
 				tree_items.push({
 					coding: p,
 					amount: this.data.priceList[p].num
 				})
 			}
-		} else {
+		} else {
 			for (var p in this.data.priceList) {
 				management_items.push({
 					id: this.data.priceList[p].id,
diff --git a/project.config.json b/project.config.json
index 9dc5f66..6814f1a 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,
@@ -36,16 +37,16 @@
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,
-    "showES6CompileOption": false
+    "showES6CompileOption": false,
+    "useStaticServer": true,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": 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..662c9cf 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,15 +1,8 @@
 {
-  "setting": {},
+  "setting": {
+    "compileHotReLoad": true
+  },
   "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
     "miniprogram": {
       "list": [
         {
@@ -39,9 +32,12 @@
         {
           "name": "pages/user/user",
           "pathName": "pages/user/user",
+          "query": "",
           "scene": null
         }
       ]
     }
-  }
+  },
+  "projectname": "%E7%A2%B3%E4%B8%AD%E5%92%8C3",
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }
\ No newline at end of file