From e85c224f6cbd2bf979e56d91802107fc8432ad20 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 27 May 2020 21:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/heartNew/heartNew.js | 11 +++++++++++
pages/heartNew/heartNew.wxml | 4 ++--
pages/heartNew/heartNew.wxss | 4 ++--
subpages/heart/pages/volunteer/volunteer.wxml | 10 +++++-----
subpages/heart/pages/volunteer/volunteer.wxss | 2 +-
utils/activity.js | 7 ++++++-
utils/api.js | 2 +-
7 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index d6278af..f3d757e 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -33,6 +33,7 @@ Page({
actId: '',//判断返回以后是否需要刷新列表
volunteerlist:[],//志愿者列表
listLength:0,//数据长度判断是否需要加载
+ getImgUrl:''
},
/**
@@ -40,6 +41,7 @@ Page({
*/
onLoad: function (options) {
this.bannerListV2()
+ this.getImgUrl()//获取配置图片
this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight,
navigationHeight: app.globalData.deviceInfo.navigationHeight,
@@ -238,6 +240,15 @@ Page({
wx.stopPullDownRefresh();
})
},
+ // 获取配置图片
+ getImgUrl:function(){//0：咨询热线
+ let that = this
+ api.getImgUrl('0').then(function (res) {
+ that.setData({
+ getImgUrl: res.data[0].imgUrl
+ })
+ })
+ },
/**
* 页面上拉触底事件的处理函数
*/
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index dd1a206..55f74a2 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -4,7 +4,7 @@
-
+
志愿者去哪儿
@@ -15,7 +15,7 @@
-
+
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index c18263f..8590b7e 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -50,7 +50,7 @@ page {
.header .navigation .title {
display: flex;
align-items: center;
- justify-content: center;
+ /* justify-content: center; */
width: calc(100% - 46rpx);
margin-left: 46rpx;
color: rgba(255, 255, 255, 0.9);
@@ -59,7 +59,7 @@ page {
}
.header .navigation .title .title-right {
- margin-right: 46rpx;
+ /* margin-right: 46rpx; */
}
.home {
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index d969f34..9136f1c 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/subpages/heart/pages/volunteer/volunteer.wxml
@@ -83,7 +83,7 @@
-
+
@@ -99,15 +99,15 @@
-
+
-
+
@@ -138,7 +138,7 @@
-
+
diff --git a/subpages/heart/pages/volunteer/volunteer.wxss b/subpages/heart/pages/volunteer/volunteer.wxss
index e2a287a..1d66626 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxss
+++ b/subpages/heart/pages/volunteer/volunteer.wxss
@@ -206,7 +206,7 @@ textarea {
overflow: hidden;
}
-.basic-info .list-item .right .placeholder-style {
+.placeholder-style {
font-size: 28rpx;
color: #999;
}
diff --git a/utils/activity.js b/utils/activity.js
index b673823..0cd039c 100644
--- a/utils/activity.js
+++ b/utils/activity.js
@@ -3,7 +3,8 @@ module.exports = {
getActivityList: getActivityList,
bannerList,
bannerListV2,
- volunteerlist
+ volunteerlist,
+ getImgUrl
}
function getActivityList(params) {
@@ -21,3 +22,7 @@ function bannerListV2() {
function volunteerlist(params) {
return fly.get('app-user/volunteer/list',params)
}
+// 获取配置图片
+function getImgUrl(imgType) {
+ return fly.get(`imgConfig/getImgUrl/${imgType}`)
+}
\ No newline at end of file
diff --git a/utils/api.js b/utils/api.js
index e600be3..7499e06 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -133,7 +133,7 @@ function gridLeaderRegister(mobile, smsCode, wxCode) {
function prepareComplete() {
- return fly.get('app-user/user/getInfoById', {})
+ return fly.get('app-user/user/prepareComplete', {})
}
function sendSms(mobile) {