修改冲突

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>

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: {},
@@ -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,

project.private.config.json

@@ -1,5 +1,7 @@
 {
-  "setting": {},
+  "setting": {
+    "compileHotReLoad": true
+  },
   "condition": {
     "miniprogram": {
       "list": [