diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index d8ed083..ca76ed6 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -53,6 +53,8 @@ Page({
btnLeft: 0,
shouye: {},
scanBtn: {}, // 扫码签到改为可配置
+ applyBtn: {}, // 申请发单按钮改为可配置
+ tabLeftList: [], // 首页配置按钮+申请发单按钮
},
/**
@@ -367,6 +369,35 @@ Page({
},
// 获取配置图片
getImgUrl:function (){//0:咨询热线
+ let params = {
+ imageTypes: '0, 5, 8, 9'
+ }
+ api.getImgUrlList(params).then(res => {
+ console.log(res.data)
+ this.data.tabRightList = []
+ res.data.forEach( item => {
+ if (item.imgType == '0') {
+ this.setData({
+ getImgUrl: item
+ })
+ } else if (item.imgType == '5') {
+ this.data.tabRightList.push(item)
+ this.setData({
+ tabRightList: this.data.tabRightList
+ })
+ } else if (item.imgType == '8') {
+ this.setData({
+ scanBtn: item
+ })
+ } else if (item.imgType == '9') {
+ this.data.tabLeftList[0] = item
+ this.setData({
+ tabLeftList: this.data.tabLeftList
+ })
+ }
+ })
+ })
+ return
let that = this
api.getImgUrl("0").then(function (res) {
that.setData({
@@ -520,11 +551,15 @@ Page({
if (e.currentTarget.dataset.code == 'ptg') {
wx.navigateTo({
url: `/subpages/heart/pages/groupBuyList/groupBuyList?title=${e.currentTarget.dataset.title}`
- })
+ })
} else if (e.currentTarget.dataset.code == 'sds') {
wx.navigateTo({
url: `/subpages/heart/pages/dropByList/dropByList?title=${e.currentTarget.dataset.title}`
- })
+ })
+ } else if (e.currentTarget.dataset.code == 'volunteer_sqfd') {
+ this.myApply()
+ } else if (e.currentTarget.dataset.code == 'shouye') {
+ this.toShouye()
}
},
//选择志愿者标签筛选
@@ -609,10 +644,11 @@ Page({
api.moduleCategory(params).then(res => {
console.log('获取模块列表',res.data)
res.data.forEach( item => {
- if (item.categoryCode == 'shouye') {
- this.data.shouye = { ...item }
+ if (item.categoryCode == 'shouye') {
+ this.data.tabLeftList[1] = item
this.setData({
- shouye: this.data.shouye
+ shouye: item,
+ tabLeftList: this.data.tabLeftList
})
}
})
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index 3936482..ca14977 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -53,6 +53,12 @@
+
+
+
+
+
+
@@ -110,15 +116,16 @@
-
+ img-url="{{applyBtn.imgUrl}}"
+ bindmovebtnCallBack="myApply"> -->
-
+ bindmovebtnCallBack="toShouye"> -->
\ No newline at end of file
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index c4b9f5e..fdaeb6a 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -290,6 +290,29 @@ button:last-child {
/* banner end */
+/* 拼团购/顺道捎 左侧按钮 */
+.tab-left {
+ position: fixed;
+ left: 0;
+ z-index: 997;
+ margin-top: 36rpx;
+ display: flex;
+ flex-direction: column;
+}
+.tab-left image {
+ width: 200rpx;
+ height: 88rpx;
+}
+.tab-left .tab {
+ position: relative;
+}
+.tab-left .tab .tab-text {
+ position: absolute;
+ left: 40rpx;
+ top: 26rpx;
+ color: white;
+ font-size: 34rpx;
+}
/* 拼团购/顺道捎 右侧按钮 */
.tab-right {
position: fixed;
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 4ce1219..7fc97c9 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.6.37"
+ const versionNum = "1.6.38"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag
diff --git a/utils/activity.js b/utils/activity.js
index bcf03cc..61435b6 100644
--- a/utils/activity.js
+++ b/utils/activity.js
@@ -9,7 +9,8 @@ module.exports = {
getBannerDetail,
getVolunteerTags,
getToken,
- moduleCategory
+ moduleCategory,
+ getImgUrlList
}
function getActivityList (params) {
@@ -54,4 +55,9 @@ function getToken (wxCode) {
// 一键服务/解码锦水 改版模块类别接口 20210428
function moduleCategory(params) {
return fly.get('news/module/moduleCategory', params)
+}
+
+// 获取图片配置列表 优化
+function getImgUrlList (params) {
+ return fly.get('imgConfig/getImgUrlList', params)
}
\ No newline at end of file
diff --git a/utils/config.js b/utils/config.js
index 2ea636f..836194a 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -8,7 +8,7 @@ module.exports = {
function BASEURL() {
// return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境
return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
- // return 'http://192.168.43.8:9094/epdc-api/api/'
+ // return 'http://10.10.10.91:9094/epdc-api/api/'
// return 'https://nei.netease.com/api/apimock-v2/068b11343b2a993a9292d11f4b3fa8a8/api/'
}