Commit dabb884a by tangjinlin

Merge branch 'znz_dev' into 'master'

Znz dev

See merge request !5
parents 00ae2888 bd55f2e8
......@@ -43,6 +43,12 @@ Page({
},
back: function () {
wx.navigateBack({
delta: 1
})
},
//选择年龄段
selectAge(e) {
let age = e.currentTarget.dataset['index']
......
<!--pages/ageChange/ageChange.wxml-->
<custom-navi text="年龄选择" back="{{true}}" home="{{false}}"></custom-navi>
<view class='ageChange'>
<image src='../../img/2.jpg'></image>
<text>请选择您的孩子的年龄段</text>
<view style="background:{{age==1?'#3AAB69':'#fff'}}" bindtap='selectAge' data-index="1">3~6岁</view>
<view style="background:{{age==2?'#3AAB69':'#fff'}}" bindtap='selectAge' data-index="2">7岁以上</view>
<view style="background:{{age==0?'#3AAB69':'#fff'}}" bindtap='selectAge' data-index="0">暂不选择</view>
<view class='button' style='border:none'>
<view style="width:100%;height:100%;background:#0D76ED;color:#fff" bindtap="updateAge">提交</view>
</view>
<!-- <custom-navi text="年龄选择" back="{{true}}" home="{{false}}"></custom-navi> -->
<image class='background-image' src='/img/registerBg.jpg' mode="aspectFill"></image>
<view class="title" bindtap='back'>
<image src="/img/left1.png" style="width:40px;height:40px;margin-right:5px"></image>年龄选择
</view>
<view class='ageChange'>
<image src='/img/logo1.png' mode="widthFix"></image>
<text>请选择您的孩子的年龄段</text>
<view style="background:{{age==1?'#d8477f':'transparent'}};color:{{age==1?'#fff':'#d8477f'}}" bindtap='selectAge' data-index="1">3~6 岁</view>
<view style="background:{{age==2?'#d8477f':'transparent'}};color:{{age==2?'#fff':'#d8477f'}}" bindtap='selectAge' data-index="2">7 岁以上</view>
<view style="background:{{age==0?'#d8477f':'transparent'}};color:{{age==0?'#fff':'#d8477f'}}" bindtap='selectAge' data-index="0">暂不选择</view>
<view class='button' style='border:none;margin-top:10%;color:#fff;'>
<view style="width:100%;height:100%;background:linear-gradient(to right, #e85c6d, #fb689b);border-radius: 20px;font-size: 18px;" bindtap="updateAge">提交</view>
</view>
</view>
\ No newline at end of file
/* pages/ageChange/ageChange.wxss */
.ageChange>image{
.background-image {
height: 100%;
position: fixed;
width: 100%;
left: 0px;
top: 0px;
}
.title {
position: fixed;
top: 4%;
left: 5%;
display: flex;
align-items: center;
font-size: 18px;
color: #fff;
}
.ageChange {
width: 100%;
height: 100%;
position: absolute;
left: 0px;
}
.ageChange>image {
display: block;
width: 100px;
height: 100px;
border-radius: 50%;
margin: 0 auto;
width: 30%;
margin: 30% auto 0;
}
.ageChange>text{
.ageChange>text {
display: block;
color: #fff;
width: 100%;
text-align: center;
font-size: 18px;
margin: 30px 0 40px;
}
.ageChange>view{
width: 200px;
.ageChange>view {
width: 50%;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 16px;
margin: 15px auto;
border: 1px solid #ccc;
font-size: 18px;
margin: 20px auto;
border: 1rpx solid #d8477f;
border-radius: 20px;
}
\ No newline at end of file
......@@ -6,21 +6,21 @@ Page({
* 页面的初始数据
*/
data: {
faqList:[]
keyword: '',
faqList: []
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
onReady: function () {},
/**
* 生命周期函数--监听页面显示
......@@ -32,8 +32,7 @@ Page({
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
onShareAppMessage: function () {},
//获取在线答疑列表
getFaqList() {
......@@ -42,7 +41,9 @@ Page({
//获取用户消息列表
wx.request({
url: app.url + 'ajax_get_faq_top_dat.php',
header: { 'content-type': 'application/json' },
header: {
'content-type': 'application/json'
},
data: {
unionId: config.unionId,
},
......@@ -56,13 +57,30 @@ Page({
})
}
},
fail: function (res) { },
complete: function (res) { },
fail: function (res) {},
complete: function (res) {},
})
},
keywordInput(e) {
this.setData({
keyword: e.detail.value
})
},
searchFaq() {
if (this.data.keyword == null || this.data.keyword == '') {
wx.showToast({
title: '请输入关键词',
icon: 'success',
duration: 1500
});
return;
}
},
//咨询详细页面
faqDetail(e){
faqDetail(e) {
let faqId = e.currentTarget.dataset['index']
wx.navigateTo({
url: '../faqDetail/faqDetail?faqId=' + faqId,
......@@ -81,5 +99,11 @@ Page({
wx.navigateTo({
url: '../newFaq/newFaq',
})
}
},
back: function () {
wx.navigateBack({
delta: 1
})
},
})
\ No newline at end of file
<!--pages/myNews/myNews.wxml-->
<custom-navi text="在线答疑" back="{{true}}" home="{{true}}" ></custom-navi>
<view class="topBg">
<image class='background-image' src='/img/faqTop.png' mode="widthFix"></image>
</view>
<view class="title" bindtap='back'>
<image src="/img/left1.png" style="width:40px;height:40px;margin-right:5px"></image>在线答疑
</view>
<view class="titleArea">
<text>亲爱的志愿者\n欢迎来到志愿者服务大厅</text>
<text>亲爱的志愿者\n欢迎来到志愿者服务大厅</text>
</view>
<view class="searchArea">
<text>关键词索引</text>
<input class="input" name="keyword" placeholder="搜索从这里开始" bindinput="keywordInput" placeholder-class="input_center" />
<view bindtap="searchFaq">搜索</view>
</view>
<view class='topTitle'>
<view class='leftLine' style="border-left: 5px solid #eb5e76;"></view>
<text class="title">热门资讯</text>
<view class='rightTitle' bindtap='myFaq'>
<image src="/img/rpoint.png"></image>
<text>我的咨询</text>
</view>
<view class='leftTitle'>
<view class='leftLine'></view>
<text class="hot_title">热门资讯</text>
</view>
<view class='rightTitle' bindtap='myFaq'>
<text>我的咨询</text>
<view></view>
</view>
</view>
<view class="hotFaqs">
<view bindtap='faqDetail' wx:for="{{faqList}}" class="faqItem" data-index="{{item.id}}" wx:key="{{index}}">
<view class="faqRow1">
<view class="faqCotent">{{item.content}}</view>
<view class="faqReplycount">回复:{{item.reply_count}}</view>
</view>
<view class="faqRow2">最佳答案:{{item.best_detail_content}}</view>
</view>
<view class="content">
<view class="hotFaqs">
<view bindtap='faqDetail' wx:for="{{faqList}}" class="faqItem" data-index="{{item.id}}" wx:key="{{index}}">
<view class="faqContent">
<view class="faqRow1">
<view class="faqCotent">{{item.content}}</view>
<view class="faqReplycount">回复:{{item.reply_count}}</view>
</view>
<view class="faqRow2">最佳答案:{{item.best_detail_content}}</view>
</view>
</view>
</view>
</view>
<view bindtap='newFaq' class="newFaqButton">立即咨询</view>
\ No newline at end of file
<view bindtap='newFaq' class="newFaqButton">
<view>立即咨询</view>
</view>
</view>
\ No newline at end of file
/* pages/myNews/faq.wxss */
.background-image {
position: fixed;
width: 100%;
left: 0;
top: 0;
background: #fff;
z-index: 200;
}
.title {
position: fixed;
top: 4%;
left: 2%;
display: flex;
align-items: center;
font-size: 18px;
color: #fff;
z-index: 201;
}
.titleArea {
margin-top: 20px;
position: fixed;
top: 12%;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
z-index: 200;
}
.titleArea text {
text-align: center;
font-size: 20px;
font-weight: 500;
color: #fff;
background: pink;
}
.searchArea {
position: fixed;
top: 30%;
width: 100%;
height: 60px;
background-color: #fff;
z-index: 190;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.searchArea text {
font-size: 16px;
font-weight: 400;
margin: 0 10px;
}
.searchArea>input {
flex: 1;
margin-right:10px;
height: 40px;
line-height: 40px;
font-size: 14px;
background: #f6f6f6;
border-radius: 30px;
text-align: center;
}
.searchArea{
margin: 1%;
width:98%;
white-space:nowrap;
padding: 10px;
.searchArea view {
font-size: 16px;
color: #fb689b;
font-weight: 400;
margin: 0 10px;
}
.input_center {
text-align: center;
color: #bcbcbc;
}
.topTitle {
position: static;
position: fixed;
top: 38%;
width: 100%;
height: 30px;
height: 35px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
background-color: #fff;
z-index: 200;
}
.topTitle .title {
margin-left: 10px;
font-size: 20px;
font-weight: bolder;
color: #000;
.topTitle .leftTitle {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.topTitle .leftLine {
.topTitle .leftTitle .leftLine {
height: 20px;
border-left: 5px solid #efc04c;
width: 6px;
border-radius: 3px;
background-color: #ed5f77;
margin-left: 5%;
}
.topTitle .leftTitle .hot_title {
margin-left: 10px;
font-size: 20px;
font-weight: bolder;
color: #000;
}
.topTitle .rightTitle {
position: absolute;
right: 5%;
width: 100%;
display: flex;
flex-direction: row;
flex-direction: row-reverse;
align-items: center;
margin-right: 5%;
}
.topTitle .rightTitle text {
margin-right: 5px;
.topTitle .rightTitle view {
background-color: #e70012;
width: 10px;
height: 10px;
border-radius: 50%;
}
.topTitle .rightTitle image {
margin-top: 3px;
margin-right: 5px;
width: 12px;
height: 12px;
.topTitle .rightTitle text {
margin-left: 10px;
font-size: 16px;
font-weight: 400;
border-bottom: 1px solid #333333;
}
.hotFaqs{
width:100%;
white-space:nowrap;
.content {
width: 100%;
height: 100%;
position: absolute;
top: 45%;
}
.faqItem{
width:90%;
margin-top: 10px;
margin-left: 0;
margin-right: 0;
padding:10px;
.hotFaqs {
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
align-items: center;
border-radius: 5px;
border: 1rpx solid gray;
}
.faqRow1{
width:100%;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.faqCotent{
font-size: 18px;
.faqItem {
width: 100%;
margin-top: 20px;
}
.faqReplycount{
font-size: 16px;
.faqContent {
margin: 0 3%;
padding: 3% 5%;
display: flex;
flex-direction: column;
border-radius: 10px;
box-shadow: 0 0 15px -3px rgb(0, 0, 0, 0.3);
}
.faqRow2{
width:100%;
.faqRow1 {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
font-size: 16px;
margin-bottom: 10px;
}
.newFaqButton{
position: fixed;
bottom: 10px;
height: 30px;
line-height: 30px;
border-radius: 15px;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
font-size: 14px;
.newFaqButton {
position: fixed;
bottom: 0;
width: 100%;
display: flex;
align-items: center;
/* background: #fff; */
}
.newFaqButton view {
text-align: center;
margin: 0 auto;
width: 80%;
height: 50px;
line-height: 50px;
border-radius: 25px;
margin-bottom: 10px;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
font-size: 18px;
}
\ No newline at end of file
<!--pages/leaderRegistered/leaderRegistered.wxml-->
<custom-navi text="注册" back="{{false}}" home="{{false}}"></custom-navi>
<image class='background-image' src='/img/registerBg.jpg' mode="aspectFill"></image>
<view class="title">注册</view>
<view class='leaderRegistered'>
<image src='../../img/2.jpg'></image>
<view class='title_leaderRegistered'><text>{{leaderTitle}}领导:</text>欢迎来到志愿者平台!</view>
<view class='con_leaderRegistered'>
</view>
<view style='display:flex;justify-content: center;margin-top:100px;' class='button'>
<van-button type="default" open-type="getUserInfo" bind:getuserinfo="regist">注册</van-button></view>
</view>
<image src='/img/logo1.png' mode="widthFix"></image>
<view class='title_leaderRegistered'>
<text>{{leaderTitle}}领导</text>
<view>欢迎来到志愿者平台</view>
</view>
<view style='display:flex;justify-content: center;margin-top:80px;' class='button'>
<van-button type="default" open-type="getUserInfo" bind:getuserinfo="regist">注册</van-button>
</view>
</view>
\ No newline at end of file
/* pages/leaderRegistered/leaderRegistered.wxss */
.leaderRegistered>image{
width: 100px;
height: 100px;
.background-image {
height: 100%;
position: absolute;
width: 100%;
left: 0px;
top: 0px;
}
.title {
position: absolute;
top: 5%;
left: 5%;
font-size: 16px;
color: #fff;
}
.leaderRegistered {
width: 100%;
height: 100%;
position: absolute;
left: 0px;
}
.leaderRegistered>image {
display: block;
border-radius: 50%;
margin: 0 auto;
width: 40%;
margin: 40% auto 0;
}
.title_leaderRegistered{
.title_leaderRegistered {
color: #fff;
width: 75%;
font-size: 18px;
margin: 30px auto 10px;
margin: 60px auto 10px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.title_leaderRegistered>text{
color: red;
.title_leaderRegistered>text {
font-size: 14px;
font-weight: 300;
padding-bottom: 15px;
}
.con_leaderRegistered{
width: 80%;
margin: 0 auto;
.title_leaderRegistered>view {
font-size: 18px;
}
.con_leaderRegistered>view{
display: flex;
align-items: center;
.leaderRegistered button {
padding: 20px 130px;
width: 100%;
height: 60px;
line-height: 60px;
border-radius: 30px;
border: 0px;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
}
.con_leaderRegistered>view input{
border: 1px solid #ccc;
height: 40px;
padding-left: 10px;
button>view {
font-size: 18px;
}
.leaderRegistered button{
padding: 0 80px;
}
\ No newline at end of file
<!--pages/memberChange/memberChange.wxml-->
<custom-navi text="会员" back="{{true}}" home="{{true}}"></custom-navi>
<custom-navi text="返回" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='memberChange'>
<view class='con_memberChange'>
<view class='top_memberChange'>
{{entity.title}}
</view>
<view class='money_memberChange'>
金额:<text>{{entity.money}}元</text>
金额<text>{{entity.money}}元</text>
</view>
<view class='huiyuan'>{{entity.comment}}</view>
<view class='btn'>
<view bindtap="buy">购买</view>
<view bindtap="cancel">放弃</view>
<view class="buy" bindtap="buy">购买</view>
<view class="cancel" bindtap="cancel">放弃</view>
</view>
</view>
</view>
......
/* pages/memberChange/memberChange.wxss */
.con_memberChange{
.con_memberChange {
position: fixed;
top: 0;
left: 0;
......@@ -8,38 +8,72 @@
margin: auto;
width: 260px;
height: 280px;
display: flex;
flex-direction: column;
align-items: center;
}
.top_memberChange{
.top_memberChange {
width: 100%;
text-align: left;
text-align: center;
font-size: 14px;
color: #333333;
font-weight: 500;
}
.money_memberChange{
.money_memberChange {
width: 100%;
font-size: 14px;
font-size: 18px;
margin: 20px 0;
color: #eb5e76;
font-weight: bold;
display: flex;
align-items: center;
justify-content: center;
}
.money_memberChange>text{
margin-left: 20px;
.money_memberChange text {
font-size: 18px;
margin: 20px 0;
}
.huiyuan{
font-size: 12px;
.huiyuan {
color: #a8a8a8;
font-size: 14px;
margin-bottom: 10px;
}
.btn{
.btn {
width: 100%;
display: flex;
justify-content: space-between;
margin-top: 20px!important;
flex-direction: column;
align-items: center;
justify-content: center;
}
.btn>view{
width: 120px;
.btn>view {
margin: 10px 0;
}
.btn>.buy {
width: 80%;
height: 30px;
text-align: center;
line-height: 30px;
border-radius: 5px;
background: rgb(91,155,213);
border-radius: 15px;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
font-size: 14px;
}
.con_memberChange>view{
margin-top: 15px;
.btn>.cancel {
width: 80%;
height: 30px;
text-align: center;
line-height: 30px;
border-radius: 15px;
background: transparent;
border: 1rpx solid #fd66a1;
color: #e85b93;
font-size: 14px;
}
\ No newline at end of file
<!--pages/myNews/myNews.wxml-->
<custom-navi text="我的咨询" back="{{true}}" home="{{true}}" ></custom-navi>
<custom-navi text="我的咨询" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class="hotFaqs">
<view bindtap='faqDetail' wx:for="{{faqList}}" class="faqItem" data-index="{{item.id}}" wx:key="{{index}}">
......
<!--pages/familyUser/familyUser.wxml-->
<custom-navi text="用户注册" back="{{false}}" home="{{false}}"></custom-navi>
<image class='background-image' src='/img/registerBg.jpg' mode="aspectFill"></image>
<view class="title">注册</view>
<view class='familyUser'>
<image src='../../img/2.jpg'></image>
<text>欢迎来到志愿者平台!</text>
<view style='display:flex;justify-content: center;margin-top:100px;' class='button'>
<van-button type="default" open-type="getUserInfo" bind:getuserinfo="regist">进入首页</van-button>
</view>
</view>
<image src='/img/logo1.png' mode="widthFix"></image>
<text>欢迎来到志愿者平台!</text>
<view style='display:flex;justify-content: center;margin-top:100px;' class='button'>
<van-button type="default" open-type="getUserInfo" bind:getuserinfo="regist">进入首页</van-button>
</view>
</view>
\ No newline at end of file
/* pages/familyUser/familyUser.wxss */
.familyUser>image{
.background-image {
height: 100%;
position: absolute;
width: 100%;
left: 0px;
top: 0px;
}
.title {
position: absolute;
top: 5%;
left: 5%;
font-size: 16px;
color: #fff;
}
.familyUser {
width: 100%;
height: 100%;
position: absolute;
left: 0px;
}
.familyUser>image {
display: block;
margin-top: 20px;
width: 100px;
height: 100px;
border-radius: 50%;
margin: 0 auto;
width: 40%;
margin: 40% auto 0;
}
.familyUser>text{
.familyUser>text {
display: block;
width: 100%;
text-align: center;
font-size: 18px;
margin-top: 30px;
color: #fff;
}
.button button {
padding: 20px 110px;
width: 100%;
height: 60px;
line-height: 60px;
border-radius: 30px;
border: 0px;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
}
\ No newline at end of file
/* pages/socialUserRegister/socialUserRegister.wxss */
.jigouRegistered{
.background-image {
height: 100%;
position: absolute;
width: 100%;
left: 0px;
top: 0px;
}
.title {
position: absolute;
top: 5%;
left: 5%;
font-size: 16px;
color: #fff;
}
.jigouRegistered {
width: 100%;
height: 100%;
position: relative;
}
.jigouRegistered>image{
.jigouRegistered>view>image {
display: block;
width: 100px;
height: 100px;
border-radius: 50%;
margin: 20px auto 70px;
width: 40%;
margin: 20% auto 70px;
}
.formtable>view{
.formtable>view {
width: 280px;
margin: 40px auto;
}
.surejigou{
.surejigou {
position: absolute;
top: 0;
left: 0;
......@@ -22,7 +40,8 @@
height: 100%;
z-index: 200;
}
.conSurejigou{
.conSurejigou {
position: absolute;
top: 100px;
left: 0;
......@@ -35,14 +54,16 @@
border-radius: 10px;
border: 1px solid #ccc;
}
.conSurejigou>text{
.conSurejigou>text {
display: block;
width: 100%;
text-align: center;
font-size: 16px;
margin-top: 30px
}
.btnagreen{
.btnagreen {
position: absolute;
bottom: 20px;
left: 0;
......@@ -50,69 +71,115 @@
display: flex;
justify-content: center;
}
.van-button{
height: 30px!important;
.van-button {
height: 30px !important;
}
.content{
.content {
width: 90%;
margin: 40px auto;
}
.upload{
position: absolute;
.upload {
position: relative;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: #fff;
z-index: 200;
}
.upload>text{
.upload>view {
position: fixed;
display: block;
top: 0;
left: 0;
width: 100%;
height: 30px;
line-height: 30px;
text-align: center;
height: 8%;
background: #fff;
z-index: 200;
}
.upload>view>text {
position: fixed;
display: block;
top: 5%;
left: 5%;
font-size: 16px;
border: 1px solid #ccc;
}
.mainUpload{
width: 90%;
margin: 20px auto 0;
.mainUpload {
position: absolute;
top: 0;
width: 100%;
height: 100%;
background: #fff;
margin: 20% auto 0;
}
.mainUpload>view{
.mainUpload .upload_info {
display: flex;
flex-direction: column;
margin-bottom: 40px;
}
.mainUpload>view>text{
display: block;
width: 100px;
text-align: right;
font-size: 14px;
}
.mainUpload>view>view{
width: 90px;
.mainUpload .upload_info text {
font-weight: 600;
padding-left: 5%;
}
.mainUpload>view>view>text{
display: block;
font-size: 14px;
color: #4F4F4F;
height: 120px;
.mainUpload .upload_info view {
display: flex;
flex-direction: row;
justify-content: space-between;
}
.uploadPic>view{
width: 100%;
.upload_info view .a_b {
display: flex;
width: 50%;
flex-direction: column;
align-items: center;
height: 40px;
flex-wrap: wrap;
margin-bottom: 10px;
justify-content: center;
}
.uploadPic>view>text{
width: 100px;
text-align: right;
font-size: 16px;
margin-right: 5px
.upload_info view .a_b button {
padding: 50px 60px;
font-size: 35px;
box-shadow: 0 0 15px 0px rgba(0, 0, 0, 0.1);
margin: 15px;
}
.uploadPic>view>image{
width: 60px;
height: 34px;
margin-left: 20px;
.upload_info view .a_b .van-uploader__preview {
width: 100%;
margin: 0;
}
.button button {
padding: 20px 110px;
width: 100%;
height: 60px;
line-height: 60px;
border-radius: 30px;
border: 0px;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
}
.scroll {
position: absolute;
top: 0;
width: 100%;
height: 100%;
}
.scroll .button {
width: 80%;
padding-left: 10%;
}
.formtable view text {
color: #fff;
font-weight: 300;
font-size: 16px;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment