修改冲突

master
chen 2022-08-10 18:16:06 +08:00
commit 55d7438036
3 changed files with 7 additions and 5 deletions

View File

@ -3,5 +3,5 @@
<view class="title">微信授权页面</view> <view class="title">微信授权页面</view>
<view class="describe">此页面是微信授权页面,点击下方按钮弹出授权或跳转页面</view> <view class="describe">此页面是微信授权页面,点击下方按钮弹出授权或跳转页面</view>
<button class="btn" open-type='getUserInfo' wx:if="{{canIUse}}" bindtap="getUserProfile">点击微信授权</button> <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> </view>

View File

@ -71,7 +71,7 @@ Page({
} }
this.setData({ this.setData({
curCaseIndex: event.detail.value, curCaseIndex: event.detail.value,
isShif: false, isShif: this.data.threeList[event.detail.value].type=='forest_management'?true:false,
senIndex: 0, senIndex: 0,
addressIndex:0, addressIndex:0,
priceList: {}, priceList: {},
@ -360,14 +360,14 @@ Page({
var that = this var that = this
var tree_items = [] var tree_items = []
var management_items = [] var management_items = []
if (this.data.newDo_type == 'afforestation') { if (this.data.newDo_type == 'afforestation') {
for (var p in this.data.priceList) { for (var p in this.data.priceList) {
tree_items.push({ tree_items.push({
coding: p, coding: p,
amount: this.data.priceList[p].num amount: this.data.priceList[p].num
}) })
} }
} else { } else {
for (var p in this.data.priceList) { for (var p in this.data.priceList) {
management_items.push({ management_items.push({
id: this.data.priceList[p].id, id: this.data.priceList[p].id,

View File

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