Browse Source

版本 1.6.37 志愿者注册小组改为非必选;扫码签到改为后台配置;

release
ZhaoTongYao 4 years ago
parent
commit
1e7a8e9e9f
  1. 9
      pages/heartNew/heartNew.js
  2. 4
      pages/heartNew/heartNew.wxml
  3. 2
      pages/toRegister/toRegister.js
  4. 10
      subpages/heart/pages/volunteer/volunteer.js
  5. 2
      subpages/heart/pages/volunteer/volunteer.wxml

9
pages/heartNew/heartNew.js

@ -52,6 +52,7 @@ Page({
btnTop: 0, btnTop: 0,
btnLeft: 0, btnLeft: 0,
shouye: {}, shouye: {},
scanBtn: {}, // 扫码签到改为可配置
}, },
/** /**
@ -379,6 +380,14 @@ Page({
tabRightList: res.data tabRightList: res.data
}) })
}) })
api.getImgUrl("8").then(function (res) {
console.log(res.data)
if (res.data.length > 0) {
that.setData({
scanBtn: res.data[0]
})
}
})
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数

4
pages/heartNew/heartNew.wxml

@ -120,14 +120,14 @@
img-url="../../images/heart/apply-new.png" img-url="../../images/heart/apply-new.png"
bindmovebtnCallBack="myApply"></move-btn> bindmovebtnCallBack="myApply"></move-btn>
<move-btn <move-btn
wx:if="{{btnTop!=0}}" wx:if="{{scanBtn.imgUrl && btnTop!=0}}"
area-top="120" area-top="120"
area-height="90%" area-height="90%"
button-width="200" button-width="200"
button-height="200" button-height="200"
button-top="{{btnTop}}" button-top="{{btnTop}}"
button-left="{{btnLeft}}" button-left="{{btnLeft}}"
img-url="../../images/home/scan.png" img-url="{{scanBtn.imgUrl}}"
bindmovebtnCallBack="scanCode"></move-btn> bindmovebtnCallBack="scanCode"></move-btn>
<move-btn wx:if="{{shouye.id}}" <move-btn wx:if="{{shouye.id}}"

2
pages/toRegister/toRegister.js

@ -21,7 +21,7 @@ Page({
// } // }
// }) // })
let that = this let that = this
const versionNum = "1.6.36" const versionNum = "1.6.37"
api.getScanSwitch(versionNum).then(function (res) { api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data) console.log(res.data)
let state = res.data.scanFlag let state = res.data.scanFlag

10
subpages/heart/pages/volunteer/volunteer.js

@ -42,7 +42,7 @@ Page({
volunteerTag: {}, //志愿者标签id volunteerTag: {}, //志愿者标签id
tagList: [{ tagList: [{
tagName: '请选择', tagName: '请选择',
id: '0' id: ''
}], }],
tagIndex: 0, tagIndex: 0,
}, },
@ -284,10 +284,10 @@ Page({
this.showToast("请输入昵称") this.showToast("请输入昵称")
return false return false
} }
if (this.data.volunteerTag.id == '0') { // if (this.data.volunteerTag.id == '') {
this.showToast("请选择小组") // this.showToast("请选择小组")
return false // return false
} // }
// if(!this.data.volunteerSignature){ // if(!this.data.volunteerSignature){
// this.showToast("请输入格言") // this.showToast("请输入格言")
// return false // return false

2
subpages/heart/pages/volunteer/volunteer.wxml

@ -90,7 +90,7 @@
</view> </view>
</view> </view>
<view class="head-portrait"> <view class="head-portrait">
<view class="head-portrait-name"><text class="must">*</text>选择小组</view> <view class="head-portrait-name">选择小组</view>
<!-- <view class="time">{{volunteerTag.tag}}</view> --> <!-- <view class="time">{{volunteerTag.tag}}</view> -->
<picker bindchange="choosePicker" value="{{tagIndex}}" range="{{tagList}}" range-key="tagName"> <picker bindchange="choosePicker" value="{{tagIndex}}" range="{{tagList}}" range-key="tagName">
<view class="picker"> <view class="picker">

Loading…
Cancel
Save