作者 吴孟雨

合并master

正在显示 49 个修改的文件 包含 1131 行增加649 行删除
... ... @@ -12,6 +12,7 @@
"pages/my/chargePhoneNum/chargePhoneNum",
"pages/my/myCard/myCard",
"pages/my/groupBuyDetail/groupBuyDetail",
"pages/my/groupBuyDetail2/groupBuyDetail2",
"pages/my/buyCard/buyCard",
"pages/my/protocol/protocol",
"pages/my/groupBupShare/groupBupShare",
... ...
... ... @@ -5,68 +5,97 @@ Page({
* 页面的初始数据
*/
data: {
punchState: true,
address: ''
},
//打卡申诉
punchApply(){
punchApply() {
wx.navigateTo({
url: 'punchAppeal/punchAppeal',
})
},
//打卡
punch() {
var that = this
wx.getLocation({
type: 'wgs84',
success: function(res) {
var latitude = res.latitude
var longitude = res.longitude
var speed = res.speed
var accuracy = res.accuracy
that.setData({
address: '天津市',
punchState: false
})
},
})
// wx.chooseLocation({
// success: function(res) {
// console.log(res)
// var latitude = res.latitude
// var longitude = res.longitude
// var address = res.address
// that.setData({
// address: address,
// punchState:false
// })
// },
// })
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -3,11 +3,12 @@
<view class='circle_large'>
<view class='circle_middle'>
<view class='circle_small'>
<text wx:if='{{}}'>一键打卡</text>
<text class='iconfont icon-dui'></text>
<text wx:if='{{punchState}}' bindtap='punch'>一键打卡</text>
<text class='iconfont icon-dui' wx:else></text>
</view>
</view>
</view>
<view class='punch_info'>当前:未获取</view>
<view class='punch_info' wx:if="{{address==''}}">当前:未获取</view>
<view class='punch_info' wx:else>当前:{{address}}</view>
<view class='punch_btn' bindtap='punchApply'>打卡申诉</view>
</view>
\ No newline at end of file
... ...
... ... @@ -42,9 +42,11 @@
font-size: 90rpx;
}
.punch_info{
width: 600rpx;
font-size: 32rpx;
color: #FFFFFF;
margin-top: 60rpx;
text-align: center;
}
.punch_btn {
width: 200rpx;
... ...
... ... @@ -54,10 +54,10 @@ Page({
},
})
},
//跳转申诉详情页
listDetail(){
//跳转申诉详情页
listDetail() {
wx.navigateTo({
url:'../punchAppealDetail/punchAppealDetail',
url: '../punchAppealDetail/punchAppealDetail',
})
},
/**
... ...
... ... @@ -2,6 +2,7 @@
page {
background: #f5f5f5;
overflow: hidden;
}
.tab_box {
... ... @@ -58,6 +59,7 @@ page {
width: 100%;
font-size: 28rpx;
padding: 30rpx;
box-sizing: border-box;
color: #6e6e6e;
}
... ...
... ... @@ -13,6 +13,20 @@ Page({
url: '../punchAppealDetail2/punchAppealDetail2',
})
},
//上传图片
uploadImg() {
wx.chooseImage({
success: function (res) {
console.log(res)
const tempFilePaths = res.tempFilePaths
wx.uploadFile({
url: '',
filePath: 'tempFilePaths[0]',
name: 'file',
})
},
})
},
/**
* 生命周期函数--监听页面加载
*/
... ...
... ... @@ -7,60 +7,74 @@ Page({
data: {
},
//上传图片
uploadImg() {
wx.chooseImage({
success: function(res) {
console.log(res)
const tempFilePaths = res.tempFilePaths
wx.uploadFile({
url: '',
filePath: 'tempFilePaths[0]',
name: 'file',
})
},
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -25,4 +25,5 @@
<text>当前:xxx实验室</text>
</view>
</view>
</view>
\ No newline at end of file
</view>
<view class='submit_btn' bindtap='againSubmit'>提交</view>
\ No newline at end of file
... ...
... ... @@ -13,14 +13,14 @@
</view>
</view>
<view class="jiexi">解析长图</view>
<view class="footer">
<view class="service" bindtap="clickAgreeBtn">
<view class="agree_box">
<view class="agree_btn" wx:if="{{is_agree}}"></view>
</view>
<text>服务协议</text>
</view>
<view class="order_btn">去预约</view>
<view class="jiexi">解析长图</view>
<view class="footer" wx:if="{{is_the_week}}">
<view class="service" bindtap="clickAgreeBtn" bindtap='serviceProtocol'>
<view class="agree_box">
<view class="agree_btn" wx:if="{{is_agree}}"></view>
</view>
<text>服务协议</text>
</view>
<view class="order_btn" bindtap='goAppointment'>去预约</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -5,131 +5,135 @@ const months = []
const days = []
for (let i = 1990; i <= date.getFullYear(); i++) {
years.push(i)
years.push(i)
}
for (let i = 1 ; i <= 12; i++) {
months.push(i)
for (let i = 1; i <= 12; i++) {
months.push(i)
}
for (let i = 1 ; i <= 31; i++) {
days.push(i)
for (let i = 1; i <= 31; i++) {
days.push(i)
}
Page({
/**
* 页面的初始数据
*/
data: {
name: '',
sex: ['男','女'],
city: ['北京市','天津市','河北省'],
years: years,
year: date.getFullYear(),
months: months,
month: 2,
days: days,
day: 2,
value: [9999, 1, 1],
},
inputName(e) {
this.setData({name: e.detail.value});
},
//选择性别
sexPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
sex_index: e.detail.value,
is_sex_change: true,
})
},
//选择生日
birthPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
birth_date: e.detail.value,
is_birth_change: true,
})
// const val = e.detail.value;
// this.setData({
// year: this.data.years[val[0]],
// month: this.data.months[val[1]],
// day: this.data.days[val[2]]
// })
},
//选择城市
cityPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
city_index: e.detail.value,
is_city_change: true,
})
},
//保存
clickSave() {
if(this.data.name === '') {
wx.showToast({
title: '请填写学员姓名',
icon: 'none'
})
}else {
wx.navigateBack({delta: 1})
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
/**
* 页面的初始数据
*/
data: {
name: '',
sex: ['男', '女'],
city: ['北京市', '天津市', '河北省'],
years: years,
year: date.getFullYear(),
months: months,
month: 2,
days: days,
day: 2,
value: [9999, 1, 1],
},
inputName(e) {
this.setData({
name: e.detail.value
});
},
//选择性别
sexPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
sex_index: e.detail.value,
is_sex_change: true,
})
},
//选择生日
birthPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
birth_date: e.detail.value,
is_birth_change: true,
})
// const val = e.detail.value;
// this.setData({
// year: this.data.years[val[0]],
// month: this.data.months[val[1]],
// day: this.data.days[val[2]]
// })
},
//选择城市
cityPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
city_index: e.detail.value,
is_city_change: true,
})
},
//保存
clickSave() {
if (this.data.name === '') {
wx.showToast({
title: '请填写学员姓名',
icon: 'none'
})
} else {
wx.navigateTo({
url: '../../../my/myProfile/myProfile',
})
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -54,57 +54,59 @@ Page({
*/
onLoad: function (options) {
},
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
const self = this;
setTimeout(function () {
self.setData({show: true})
},500)
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
const self = this;
setTimeout(function() {
self.setData({
show: true
})
}, 500)
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
}
})
\ No newline at end of file
... ...
<!--pages/index/confirm-appointment-info/confirm-appointment-info.wxml-->
<view class="content">
<view class="tips {{show?'active':''}}">
<!--<view>-->
<view class="iconfont icon-jinggao"></view>
<text>请在15分钟内确认预约,超时系统将自动取消!</text>
<!--</view>-->
</view>
<view class="time">
<view class="line"></view>
<text>预约时间 : </text>
<text class="date-time">2018年10月10号 10:00-11:30</text>
</view>
<view class="tips {{show?'active':''}}">
<!--<view>-->
<view class="iconfont icon-jinggao"></view>
<text>请在15分钟内确认预约,超时系统将自动取消!</text>
<!--</view>-->
</view>
<view class="time">
<view class="line"></view>
<text>预约时间 : </text>
<text class="date-time">2018年10月10号 10:00-11:30</text>
</view>
<view class="address">
<view class="time">
<view class="line"></view>
<text>预约地址 :</text>
</view>
<view class="address-detail">
<!--<text>-->
朝阳区万寿路5号楼马兰大厦B座301念读书馆内朝阳区读书馆内朝阳区万寿路5号楼马兰大厦B座301念读书万寿路5号楼马兰大厦B座301念读书
<!--</text>-->
</view>
<view class="address">
<view class="time">
<view class="line"></view>
<text>预约地址 :</text>
</view>
<view class="phone-num">
<view class="line"></view>
<text>预约电话 :</text>
<text class="phone">188****8888</text>
<view class="address-detail">
<!--<text>-->
朝阳区万寿路5号楼马兰大厦B座301念读书馆内朝阳区读书馆内朝阳区万寿路5号楼马兰大厦B座301念读书万寿路5号楼马兰大厦B座301念读书
<!--</text>-->
</view>
<view class="children-name">
<view class="left-name">
<view class="line"></view>
<text>学员姓名</text>
</view>
<image src="../../../images/add_btn.png" bindtap="addStudent"></image>
</view>
<view class="phone-num">
<view class="line"></view>
<text>预约电话 :</text>
<text class="phone">188****8888</text>
</view>
<view class="children-name">
<view class="left-name">
<view class="line"></view>
<text>学员姓名</text>
</view>
<view class="name-box">
<view class="check-box" wx:for="{{children}}" wx:key="index" bindtap="chooseChildren"
data-index="{{index}}">
<view class="name {{item.is_choose?'change-color':''}}">{{item.name}}</view>
<image src="../../../images/choose_icon.png" wx:if="{{item.is_choose}}" class="check-icon"></image>
</view>
<image src="../../../images/add_btn.png" bindtap="addStudent"></image>
</view>
<view class="name-box">
<view class="check-box" wx:for="{{children}}" wx:key="index" bindtap="chooseChildren" data-index="{{index}}">
<view class="name {{item.is_choose?'change-color':''}}">{{item.name}}</view>
<image src="../../../images/choose_icon.png" wx:if="{{item.is_choose}}" class="check-icon"></image>
</view>
</view>
<view class="footer">
<view class="confirm_btn" bindtap="submit">
... ...
... ... @@ -7,6 +7,7 @@ page {
width: 100%;
display: flex;
flex-direction: column;
padding-top: 30rpx;
}
.tips {
width: 100%;
... ...
... ... @@ -5,122 +5,215 @@ Page({
* 页面的初始数据
*/
data: {
array: ['北京市', '天津市', '上海市', '河北省'],
currentCity: '北京市',
is_change: false,
show_submit_btn: false,
areaTest: [
{area: '朝阳区', list: [{id: 1,name: '798实验室'},{id: 2,name:'木鱼湖实验室'},{id: 3,name:'南锣鼓巷实验室'}]},
{area: '东城区', list: [{id: 4,name: '798实验室'},{id: 5,name:'木鱼湖实验室'},{id: 6,name:'南锣鼓巷实验室'}]},
{area: '西城区', list: [{id: 7,name: '798实验室'},{id: 11,name:'木鱼湖实验室'},{id: 8,name:'南锣鼓巷实验室'}]},
{area: '昌平区', list: [{id: 9,name: '798实验室'},{id: 12,name:'木鱼湖实验室'},{id: 10,name:'南锣鼓巷实验室'}]},
],
test: {title: '798实验室,本实验室分为三个阶段,第一阶段由家长和孩子共同完成,第二阶段由孩子独立完成。家长在旁边指导,第三阶段巴拉巴拉',
list:[{week:'周六',date: '10月20日',time:'10:00 — 11:30',rest: 6},
{week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 0},
{week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
{week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 0},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周六',date: '10月20日',time:'10:00 — 11:30',rest: 6}
]},
},
//选择城市
bindPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
index: e.detail.value,
is_change: true,
})
},
//选择实验室
chooseTest(e) {
console.log(e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
const current_id = e.currentTarget.dataset.id;
this.setData({currentTest: current,currentId: current_id})
},
//选择时段
chooseTime(e) {
console.log(e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
this.setData({currentTime: current})
},
//点击单人预约
singleAppointment() {
this.setData({show_submit_btn: true})
},
//点击双人预约
doubleAppointment() {
this.setData({show_submit_btn: true})
},
submit() {
wx.navigateTo({url: '/pages/index/confirm-appointment-info/confirm-appointment-info'})
array: ['北京市', '天津市', '上海市', '河北省'],
currentCity: '北京市',
is_change: false,
show_submit_btn: false,
areaTest: [{
area: '朝阳区',
list: [{
id: 1,
name: '798实验室'
}, {
id: 2,
name: '木鱼湖实验室'
}, {
id: 3,
name: '南锣鼓巷实验室'
}]
},
{
area: '东城区',
list: [{
id: 4,
name: '798实验室'
}, {
id: 5,
name: '木鱼湖实验室'
}, {
id: 6,
name: '南锣鼓巷实验室'
}]
},
{
area: '西城区',
list: [{
id: 7,
name: '798实验室'
}, {
id: 11,
name: '木鱼湖实验室'
}, {
id: 8,
name: '南锣鼓巷实验室'
}]
},
{
area: '昌平区',
list: [{
id: 9,
name: '798实验室'
}, {
id: 12,
name: '木鱼湖实验室'
}, {
id: 10,
name: '南锣鼓巷实验室'
}]
},
],
test: {
title: '798实验室,本实验室分为三个阶段,第一阶段由家长和孩子共同完成,第二阶段由孩子独立完成。家长在旁边指导,第三阶段巴拉巴拉',
list: [{
week: '周六',
date: '10月20日',
time: '10:00 — 11:30',
rest: 6
},
{
week: '周日',
date: '10月21日',
time: '15:00 — 16:30',
rest: 0
},
{
week: '周日',
date: '10月21日',
time: '15:00 — 16:30',
rest: 6
},
{
week: '周日',
date: '10月21日',
time: '15:00 — 16:30',
rest: 0
},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周六',date: '10月20日',time:'10:00 — 11:30',rest: 6}
]
},
},
//选择城市
bindPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value)
this.setData({
index: e.detail.value,
is_change: true,
})
},
//选择实验室
chooseTest(e) {
console.log(e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
const current_id = e.currentTarget.dataset.id;
this.setData({
currentTest: current,
currentId: current_id
})
},
//选择时段
chooseTime(e) {
console.log(e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
this.setData({
currentTime: current
})
},
//点击单人预约
singleAppointment() {
// this.setData({
// show_submit_btn: true
// })
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info'
})
},
//点击双人预约
doubleAppointment() {
// this.setData({
// show_submit_btn: true
// })
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info'
})
},
submit() {
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info'
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.data.areaTest.forEach((v,i)=>{
Object.keys(v).forEach(v=>{
console.log(v)//取到了key
console.log(this.data.areaTest[i][v])//取到了值
})
onLoad: function(options) {
this.data.areaTest.forEach((v, i) => {
Object.keys(v).forEach(v => {
console.log(v) //取到了key
console.log(this.data.areaTest[i][v]) //取到了值
})
// console.log(this.data.areaTest);
})
// console.log(this.data.areaTest);
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -33,6 +33,7 @@ Page({
currentSwiper: e.detail.current
})
},
//首次登录小程序,跳转到认证手机页面
goPhoneCode() {
wx.navigateTo({url: '/pages/index/phone-code/phone-code'})
},
... ...
<!--index.wxml-->
<view class="container">
<!--蒙层-->
<view class="modal" wx:if="{{!hasPhone}}" bindtap="goPhoneCode"></view>
<view class="modal" wx:if="{{!hasPhone}}" bindtap="goPhoneCode"></view>
<!--轮播图-->
<!--轮播图-->
<view class="wrap">
<swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true"
bindchange="swiperChange">
<swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true" bindchange="swiperChange">
<block wx:for="{{imgUrls}}" wx:key="index">
<swiper-item>
<navigator url="{{item.url}}" hover-class="navigator-hover">
<view class="index_top">
<image src="{{item.url}}" class="slide-image" mode="aspectFill"/>
<image src="{{item.url}}" class="slide-image" mode="aspectFill" />
</view>
</navigator>
</swiper-item>
... ... @@ -24,17 +23,59 @@
</view>
</view>
<!--购买-->
<!--购买-->
<view class="btn-box" bindtap="goBuyCard">
<view class="buy-btn">
<text>点击图片可跳转到购买页</text>
</view>
</view>
<!--实验列表-->
<import src="/templates/templates.wxml" />
<view class="past_template">
<template is="this-experiment" data="{{this_week_test_info}}"></template>
<template is="past-experiment" data="{{...past_test_info}}"></template>
<!--实验列表-->
<!--<import src="/templates/templates.wxml" />-->
<!--<view class="past_template">-->
<!--<template is="experiment" data="{{...this_week_test_info}}"></template>-->
<!--<template is="experiment" data="{{...past_test_info}}"></template>-->
<!--</view>-->
<!-- <import src="/templates/templates.wxml" /> -->
<view class="past_template">
<!-- <template is="experiment" data="{{...this_week_test_info}}"></template>
<template is="experiment" data="{{...past_test_info}}"></template> -->
<view class='experiment_box'>
<view class="title_box">
<view class="line"></view>
<text>本周实验</text>
<!-- <text>往期实验</text> -->
</view>
<view wx:for="{{info}}" wx:key="index" data-index="{{index}}" bindtap="goTestDetail" data-is_the_week='{{true}}'>
<view class="test_box">
<view class="time">{{item.time}}</view>
<view class="img_box">
<image src="{{item.url}}"></image>
</view>
</view>
<view class="order_box">
<text catchtap="goAppointment" data-index="{{index}}">前往预约</text>
</view>
</view>
</view>
</view>
<view class='experiment_box'>
<view class="title_box" bindtap="goTestDetail" data-is_the_week='{{false}}'>
<view class="line"></view>
<text>往期实验</text>
</view>
<view wx:for="{{info}}" wx:key="index" data-index="{{index}}" bindtap="goTestDetail" data-is_the_week='{{false}}'>
<view class="test_box">
<view class="time">{{item.time}}</view>
<view class="img_box">
<image src="{{item.url}}"></image>
</view>
</view>
<view class="order_box">
<text>查看</text>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -14,7 +14,7 @@ page {
left: 0;
top: 0;
background-color: #000000;
opacity: 0;
opacity: 0.8;
z-index: 10;
}
... ...
... ... @@ -6,88 +6,94 @@ Page({
* 页面的初始数据
*/
data: {
fun_id: 2,
time: '获取验证码', //倒计时
currentTime: 61
fun_id: 2,
time: '获取验证码', //倒计时
currentTime: 61
},
getCode: function (options) {
var that = this;
var currentTime = that.data.currentTime;
interval = setInterval(function () {
currentTime--;
that.setData({
time: currentTime + '秒'
})
if (currentTime <= 0) {
clearInterval(interval);
that.setData({
time: '重新发送',
currentTime: 61,
disabled: false
})
}
}, 1000)
},
getVerificationCode() {
this.getCode();
var that = this;
getCode: function(options) {
var that = this;
var currentTime = that.data.currentTime;
interval = setInterval(function() {
currentTime--;
that.setData({
disabled: true
time: currentTime + '秒'
})
if (currentTime <= 0) {
clearInterval(interval);
that.setData({
time: '重新发送',
currentTime: 61,
disabled: false
})
}
}, 1000)
},
getVerificationCode() {
this.getCode();
var that = this;
that.setData({
disabled: true
})
},
//确认
confirm() {
wx.switchTab({
url: '../../index/index'
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -15,7 +15,7 @@
</view>
<view class="confirm_box">
<view class="confirm_btn">
<view class="confirm_btn" bindtap='confirm'>
<text>确 定</text>
</view>
</view>
... ...
... ... @@ -19,7 +19,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({currentTab: +options.currentTab})
},
/**
... ... @@ -33,7 +33,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
console.log('show',this.data.currentTab)
},
/**
... ...
<!--pages/my/all-appointment/all-appointment.wxml-->
<view class="content">
<!--tab-->
<view class="tab-box">
<view wx:for="{{tab}}" wx:key="index" bindtap="changeTab" data-index="{{index}}"
class="{{currentTab == index?'change-color':''}}">{{item}}</view>
</view>
<!--预约列表-->
<view class="list-box">
<view class="order-box">
<view class="head">
<text class="number">预约单号:000120180208</text>
<text class="appointment-state" wx:if="{{currentTab === 1}}" style="color: #FC5B63;">待确认</text>
<text class="appointment-state" wx:if="{{currentTab === 2}}">已预约</text>
<text class="appointment-state" wx:if="{{currentTab === 3}}" style="color: #464646;">已取消</text>
<text class="appointment-state" wx:if="{{currentTab === 4}}" style="color: #C3C3C3;">已结束</text>
</view>
<view class="section">
<image src="../../../images/red_line.png" wx:if="{{currentTab === 1}}" class="blue-line"></image>
<image src="../../../images/blue_line.png" wx:if="{{currentTab === 2}}" class="blue-line"></image>
<image src="../../../images/deep_grey_line.png" wx:if="{{currentTab === 3}}" class="blue-line"></image>
<image src="../../../images/grey_line.png" wx:if="{{currentTab === 4}}" class="blue-line"></image>
<view class="right-box">
<view class="right-top-box">
<view class="iconfont icon-dingwei"></view>
<view class="address">北京市朝阳区万寿路马兰大厦B座北京市朝阳区万寿路马兰大厦B座</view>
</view>
<view class="right-bottom-box">
<view class="iconfont icon-shangwutubiao"></view>
<view class="date-box">
<view class="date">预约日期:2018.09.02 10:00-11:30</view>
<view class="not_confirm" wx:if="{{currentTab === 1}}">
<view class="go-cancel">取消</view>
<view class="go-confirm">去确认</view>
</view>
<view class="cancel" wx:if="{{currentTab === 2}}">取消</view>
<view class="iconfont icon-quxiao" wx:if="{{currentTab === 3}}"></view>
<view class="iconfont icon-jieshu" wx:if="{{currentTab === 4}}"></view>
</view>
</view>
</view>
<!--tab-->
<view class="tab-box">
<view wx:for="{{tab}}" wx:key="index" bindtap="changeTab" data-index="{{index}}" class="{{currentTab == index?'change-color':''}}">{{item}}</view>
</view>
<!--预约列表-->
<view class="list-box">
<view class="order-box">
<view class="head">
<text class="number">预约单号:000120180208</text>
<text class="appointment-state" wx:if="{{currentTab === 1}}" style="color: #FC5B63;">待确认</text>
<text class="appointment-state" wx:if="{{currentTab === 2}}">已预约</text>
<text class="appointment-state" wx:if="{{currentTab === 3}}" style="color: #464646;">已取消</text>
<text class="appointment-state" wx:if="{{currentTab === 4}}" style="color: #C3C3C3;">已结束</text>
</view>
<view class="section">
<image src="../../../images/red_line.png" wx:if="{{currentTab === 1}}" class="blue-line"></image>
<image src="../../../images/blue_line.png" wx:if="{{currentTab === 2}}" class="blue-line"></image>
<image src="../../../images/deep_grey_line.png" wx:if="{{currentTab === 3}}" class="blue-line"></image>
<image src="../../../images/grey_line.png" wx:if="{{currentTab === 4}}" class="blue-line"></image>
<view class="right-box">
<view class="right-top-box">
<view class="iconfont icon-dingwei"></view>
<view class="address">北京市朝阳区万寿路马兰大厦B座北京市朝阳区万寿路马兰大厦B座</view>
</view>
<view class="right-bottom-box">
<view class="iconfont icon-shangwutubiao"></view>
<view class="date-box">
<view class="date">预约日期:2018.09.02 10:00-11:30</view>
<view class="not_confirm" wx:if="{{currentTab === 1}}">
<view class="go-cancel">取消</view>
<view class="go-confirm">去确认</view>
</view>
<view class="cancel" wx:if="{{currentTab === 2}}">取消</view>
<view class="iconfont icon-quxiao" wx:if="{{currentTab === 3}}"></view>
<view class="iconfont icon-jieshu" wx:if="{{currentTab === 4}}"></view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -15,11 +15,11 @@ page {
-moz-box-sizing: border-box;
box-sizing: border-box;
background-color: #fff;
/*border-bottom: 4rpx solid #3FA9F5;*/
/* border-bottom: 1rpx solid #ebebeb; */
}
.tab-box view {
line-height: 80rpx;
/*position: relative;*/
position: relative;
}
.change-color {
color: #3FA9F5;
... ...
... ... @@ -7,67 +7,97 @@ Page({
data: {
userlist: ['张三', '里斯'],
index: -1,
pay_success: false,
},
//选择成员
userList(e) {
this.setData({
index: e.detail.value
})
},
//添加学员
addUser() {
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student',
})
},
//服务协议
serviceProtocol() {
wx.navigateTo({
url: '../protocol/protocol',
})
},
//确认支付
confirmPay() {
this.setData({pay_success: true});
this.changeState();
wx.navigateBack({
delta: 1
})
},
//更新上一页面的购买状态
changeState() {
var pages = getCurrentPages();
if(pages.length > 1) {
var beforePage = pages[pages.length - 2]//获取上一页面实例
if(this.data.pay_success) {
beforePage.refreshModal()
}
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -14,7 +14,7 @@
</picker>
<view class='iconfont icon-daosanjiao'></view>
</view>
<view class='add_box'>
<view class='add_box' bindtap='addUser'>
<text class='iconfont icon-jia'></text>
<text>添加学员</text>
</view>
... ... @@ -22,10 +22,10 @@
<view class='service_info_box'>
<text class='iconfont icon-xuanzhong'></text>
<text>我已阅读并同意畅玩卡</text>
<text class='service_info'>服务协议</text>
<text class='service_info' bindtap='serviceProtocol'>服务协议</text>
</view>
<view class='service_btn_box'>
<view>需支付:¥288.00</view>
<view class='pay_btn'>确定</view>
<view class='pay_btn' bindtap='confirmPay'>确定</view>
</view>
</view>
\ No newline at end of file
... ...
/* pages/buyCard/buyCard.wxss */
@import '../groupBuy/groupBuy.wxss';
@import '../charge/charge.wxss';
.long_img{
width: 100%;
min-height: 1500rpx;
}
.add_person_box {
display: flex;
align-items: center;
... ...
{}
\ No newline at end of file
{
"navigationBarTitleText": "畅玩卡介绍"
}
\ No newline at end of file
... ...
... ... @@ -2,14 +2,14 @@
.content_box {
width: 100%;
height: 100%;
min-height: 2000rpx;
background: #e0e0e0;
font-size: 32rpx;
color: #000;
padding: 30rpx;
position: fixed;
/* position: fixed;
top: 0;
left: 0;
left: 0; */
text-align: center;
/* display: flex;
align-items: center;
... ...
... ... @@ -8,13 +8,14 @@ Page({
userlist: ['张三', '里斯'],
index: -1,
},
//选择成员
userList(e) {
this.setData({
index:e.detail.value
index: e.detail.value
})
},
//兑换并绑定按钮
chargeBtn() {
wx.showModal({
... ... @@ -25,6 +26,13 @@ Page({
})
},
//添加学员
addUser() {
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student',
})
},
/**
* 生命周期函数--监听页面加载
*/
... ...
... ... @@ -21,7 +21,7 @@
</picker>
<view class='iconfont icon-daosanjiao'></view>
</view>
<view class='add_box'>
<view class='add_box' bindtap='addUser'>
<text class='iconfont icon-jia'></text>
<text>添加学员</text>
</view>
... ...
... ... @@ -49,7 +49,9 @@ page {
}
.icon-jia {
display: inline-block;
display: flex;
align-items: center;
justify-content: center;
width: 34rpx;
height: 34rpx;
background: #3fa9f5;
... ...
... ... @@ -2,7 +2,7 @@
<view class='content_box'>
<view class='banner_box'>
<view class='head_img'>
<image src='../../images/head.png'></image>
<image src='../../../images/head.png'></image>
</view>
<view>微信昵称</view>
</view>
... ...
... ... @@ -5,74 +5,103 @@ Page({
* 页面的初始数据
*/
data: {
current:0
current: 0,
chargenum: "2059788797",
},
//tab切换
tabCharge(e){
var index=e.currentTarget.dataset.current
var current=this.data.current
if(index==current){
return false
}else{
this.setData({
current:index
//tab切换
tabCharge(e) {
var index = e.currentTarget.dataset.current
var current = this.data.current
if (index == current) {
return false
} else {
this.setData({
current: index
})
}
},
//服务协议
serviceProtocol() {
wx.navigateTo({
url: '../protocol/protocol',
})
}
},
},
//查看详情
listDetail() {
wx.navigateTo({
url: '../groupBuyDetail/groupBuyDetail',
})
},
// 长按复制
copy: function(e) {
var that = this;
wx.setClipboardData({
data: that.data.chargenum,
success: function(res) {
wx.showToast({
title: '复制成功',
});
}
});
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -13,14 +13,14 @@
<block wx:if='{{current==0}}'>
<view class='content_box'>
<view class='item_list' wx:for='{{[1,2,3]}}' wx:key=''>
<view class='list_title_box'>
<view class='list_title_box' bindtap='listDetail'>
<view>查看详情</view>
<view class='iconfont icon-fanhui'></view>
</view>
<view class='list_info_box'>
<view class='info_item'>
<view class='info_box'>
<image src='../../../images/start-logo.png'></image>
<image src='../../../images/logo.png'></image>
<view class='info_label'>发起人</view>
</view>
<view class='info_time'>
... ... @@ -30,7 +30,7 @@
</view>
<view class='info_item'>
<view class='info_box'>
<image src='../../../images/start-logo.png'></image>
<image src='../../../images/logo.png'></image>
<view class='info_label'>发起人</view>
</view>
<view class='info_time'>
... ... @@ -62,7 +62,7 @@
<view class='user_info_box'>
<view class='user_info'>
<view class='info_box'>
<image src='../../../images/start-logo.png'></image>
<image src='../../../images/logo.png'></image>
<view class='info_label'>发起人</view>
</view>
<view>发起人姓名</view>
... ... @@ -94,7 +94,7 @@
<view class='list_tab list_content' wx:for='{{[1,2,3]}}' wx:key=''>
<view class='list_tab_item'>2018.10.10</view>
<view class='list_tab_item'>未兑换</view>
<view class='list_tab_item'>2059788797</view>
<view class='list_tab_item'><text selectable='true' bindlongtap='copy'>{{chargenum}}</text></view>
</view>
</view>
</view>
... ... @@ -120,7 +120,7 @@
<view class='service_info_box'>
<text class='iconfont icon-xuanzhong'></text>
<text>我已阅读并同意畅玩卡</text>
<text class='service_info'>服务协议</text>
<text class='service_info' bindtap='serviceProtocol'>服务协议</text>
</view>
<view class='service_btn_box'>
<view>单价:¥188.00</view>
... ...
... ... @@ -2,6 +2,7 @@
page {
background: #f5f5f5;
overflow: hidden;
}
.banner_img {
... ... @@ -22,6 +23,7 @@ page {
height: 80rpx;
background: #fff;
padding: 0 40rpx;
box-sizing: border-box;
font-size: 32rpx;
color: #464646;
display: flex;
... ... @@ -50,10 +52,10 @@ page {
align-items: center;
justify-content: space-between;
padding: 0 22rpx;
box-sizing: border-box;
font-size: 30rpx;
color: #464646;
text-align: center;
box-sizing: border-box;
}
.tab_item {
... ... @@ -77,7 +79,6 @@ page {
.content_box {
margin-top: 20rpx;
/* padding-bottom: 100rpx; */
}
.null_box {
... ... @@ -89,6 +90,7 @@ page {
margin-bottom: 20rpx;
background: #fff;
padding: 0 20rpx;
box-sizing: border-box;
}
.list_title_box {
... ... @@ -98,6 +100,7 @@ page {
font-size: 28rpx;
color: #464646;
padding: 10rpx 0;
box-sizing: border-box;
border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
}
... ... @@ -109,6 +112,7 @@ page {
display: flex;
align-items: flex-start;
padding: 20rpx 20rpx;
box-sizing: border-box;
}
.info_item {
... ... @@ -208,6 +212,7 @@ page {
align-items: flex-start;
justify-content: space-between;
padding-bottom: 20rpx;
box-sizing: border-box;
}
.user_info {
... ... @@ -227,7 +232,9 @@ page {
}
.state_box {
padding-top: 35rpx;
text-align: right;
box-sizing: border-box;
}
.bottom_box {
... ... @@ -269,8 +276,6 @@ page {
bottom: -28rpx;
left: 50%;
transform: translateX(-50%);
/* padding: 2rpx 8rpx;
box-sizing: border-box; */
background: rgba(252, 91, 99, 1);
border-radius: 10rpx;
font-size: 18rpx;
... ... @@ -283,6 +288,7 @@ page {
.list_content {
border: 0 !important;
padding: 15rpx 0 !important;
box-sizing: border-box;
}
.list_content .list_tab_item {
... ... @@ -339,6 +345,7 @@ page {
font-size: 30rpx !important;
color: #464646 !important;
padding-left: 20rpx !important;
box-sizing: border-box;
background: #fff !important;
}
... ...
... ... @@ -5,62 +5,70 @@ Page({
* 页面的初始数据
*/
data: {
isFolded: true,
},
//查看全部
listMore(e) {
console.log(e)
this.setData({
isFolded: !this.data.isFolded,
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
<!--pages/groupBuyDetail/groupBuyDetail.wxml-->
<view class='banner_img'>
<image src='../../images/banner.jpg'></image>
<image src='../../../images/banner.jpg'></image>
</view>
<view class='content_box'>
<view class='item_list' wx:for='{{[1]}}' wx:key=''>
<view class='list_title_box'>
<view>查看详情</view>
<view class='list_title_box' bindtap='listMore'>
<view>查看全部</view>
<view class='iconfont icon-fanhui'></view>
</view>
<view class='list_info_box'>
<view class='info_item' wx:for='{{[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,11,1,1,1,1,1,1,1,1,1,1,1,1,1]}}' wx:key=''>
<view class="list_info_box {{isFolded?'hide':'show'}}" >
<view class='info_item' wx:for='{{[1,1,1,1,1]}}' wx:key=''>
<view class='info_box'>
<image src='../../images/start-logo.png'></image>
<image src='../../../images/img1.png'></image>
<view class='info_label'>发起人</view>
</view>
<view class='info_time'>
... ... @@ -32,7 +32,7 @@
<view class='user_info_box'>
<view class='user_info'>
<view class='info_box'>
<image src='../../images/start-logo.png'></image>
<image src='../../../images/img1.png'></image>
<view class='info_label'>发起人</view>
</view>
<view>发起人姓名</view>
... ...
... ... @@ -6,13 +6,13 @@
}
.service_btn_box {
background: linear-gradient(-78deg, rgba(255, 83, 2, 1), rgba(252, 116, 0, 1));
display: flex;
align-items: center;
justify-content: center;
font-size: 36rpx;
color: #fff;
position: fixed;
background: linear-gradient(-78deg, rgba(255, 83, 2, 1), rgba(252, 116, 0, 1)) !important;
display: flex !important;
align-items: center !important;
justify-content: center !important;
font-size: 36rpx !important;
color: #fff !important;
position: fixed !important;
bottom: 0;
left: 0;
}
... ...
// pages/my/groupBuyDetail2/groupBuyDetail2.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
{}
\ No newline at end of file
... ...
<!--pages/my/groupBuyDetail2/groupBuyDetail2.wxml-->
<text>pages/my/groupBuyDetail2/groupBuyDetail2.wxml</text>
... ...
/* pages/my/groupBuyDetail2/groupBuyDetail2.wxss */
\ No newline at end of file
... ...
// pages/my/my.js
Page({
/**
* 页面的初始数据
*/
data: {
},
//跳转我的预约
myAppointment() {
},
//我的唱完卡
myCard() {
wx.navigateTo({
url: 'myCard/myCard',
})
},
//联系客服
contact() {
wx.navigateTo({
url: 'serviceWeChat/serviceWeChat',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
// pages/my/my.js
Page({
/**
* 页面的初始数据
*/
data: {
},
//兑换
charge() {
wx.navigateTo({
url: '../my/charge/charge',
})
},
//我的资料
myProfile(){
wx.navigateTo({
url: '../my/myProfile/myProfile',
})
},
//跳转我的预约
myAppointment() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 0,
})
},
goNotConfirm() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 1,
})
},
goAppointed() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 2,
})
},
goCanceled() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 3,
})
},
goEnded() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 4,
})
},
//我的唱完卡
myCard() {
wx.navigateTo({
url: 'myCard/myCard',
})
},
//联系客服
contact() {
wx.navigateTo({
url: 'serviceWeChat/serviceWeChat',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -10,7 +10,7 @@
<view class='phone_num'>139****0939</view>
</view>
</view>
<view class='my_info_box'>
<view class='my_info_box' bindtap='myProfile'>
<view class='iconfont icon-bianji2'></view>
<view>我的资料</view>
</view>
... ... @@ -26,25 +26,25 @@
</view>
</view>
<view class='list_tab_box'>
<view class='tab_item'>
<view class='tab_item' bindtap="goNotConfirm">
<view class='list_img'>
<image src='../../images/my1.png'></image>
</view>
<view>待确认</view>
</view>
<view class='tab_item'>
<view class='tab_item' bindtap="goAppointed">
<view class='list_img'>
<image src='../../images/my1.png'></image>
</view>
<view>已预约</view>
</view>
<view class='tab_item'>
<view class='tab_item' bindtap="goCanceled">
<view class='list_img'>
<image src='../../images/my1.png'></image>
</view>
<view>已取消</view>
</view>
<view class='tab_item'>
<view class='tab_item' bindtap="goEnded">
<view class='list_img'>
<image src='../../images/my1.png'></image>
</view>
... ... @@ -57,7 +57,7 @@
<view class='list_title'>我的畅玩卡</view>
<view class='iconfont icon-fanhui'></view>
</view>
<view class='info_box'>
<view class='info_box' bindtap='charge'>
<view class='list_title'>兑换</view>
</view>
<view class='info_box' bindtap='contact'>
... ...
// pages/MyProfile/MyProfile.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
// pages/MyProfile/MyProfile.js
Page({
/**
* 页面的初始数据
*/
data: {
},
//跟换手机号
chargePhoneNum() {
wx.navigateTo({
url: '../chargePhoneNum/chargePhoneNum',
})
},
//添加学员
addUser() {
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student',
})
},
//编辑学员信息
editInfo() {
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student',
})
},
//续卡
renewalInfo() {
wx.navigateTo({
url: '../myCard/myCard',
})
},
//购卡
buyCard() {
wx.navigateTo({
url: '../myCard/myCard',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
... ... @@ -9,17 +9,18 @@
</view>
<view class='info_box'>
<view>手机号:188*****888</view>
<view>更换手机号</view>
<view class='info_content' bindtap='chargePhoneNum'>更换手机号</view>
</view>
<view class='title_box'>
<view class='list_title'>我的学员</view>
<view class='add_box'>
<view class='add_box' bindtap='addUser'>
<text class='iconfont icon-jia'></text>
<text>添加学员</text>
</view>
</view>
<!-- 未绑定年卡,就需要显示为“购卡”;已有年卡就显示为“续卡” -->
<view class='box'>
<view class='list_item' wx:for='{{[1,1]}}' wx:key=''>
<view class='list_item'>
<view class='list_info'>
<text>姓名:男</text>
<text>性 别:男</text>
... ... @@ -29,11 +30,26 @@
<text>所在城市:北京</text>
</view>
<view class='list_label_box'>
<view class='label_item edit_btn'>编辑学员信息</view>
<view class='label_item renewal_btn'>续卡</view>
<view class='label_item'>删除学员</view>
<view class='label_item edit_btn' bindtap='editInfo'>编辑学员信息</view>
<view class='label_item renewal_btn' bindtap='renewalInfo'>续卡</view>
<view class='label_item' bindtap='delUser'>删除学员</view>
</view>
<view class='hint_info'>畅玩卡周期:2018.10.01-2019.10.01</view>
</view>
<view class='list_item'>
<view class='list_info'>
<text>姓名:男</text>
<text>性 别:男</text>
</view>
<view class='list_info'>
<text>生日:2000.01.01</text>
<text>所在城市:北京</text>
</view>
<view class='list_label_box'>
<view class='label_item edit_btn' bindtap='editInfo'>编辑学员信息</view>
<view class='label_item renewal_btn' bindtap='buyCard'>购卡</view>
<view class='label_item' bindtap='delUser'>删除学员</view>
</view>
<view class='hint_info'>无绑定畅玩卡</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -46,6 +46,13 @@ page {
background: #fff;
padding: 34rpx 40rpx;
margin-top: 20rpx;
font-size: 32rpx;
color: #464646;
}
.info_content {
font-size: 24rpx;
color: #3fa9f5;
}
.title_box {
... ... @@ -56,7 +63,9 @@ page {
}
.icon-jia {
display: inline-block;
display: flex;
align-items: center;
justify-content: center;
width: 34rpx;
height: 34rpx;
background: #3fa9f5;
... ... @@ -97,8 +106,8 @@ page {
.list_item {
width: 100%;
background: #fff;
padding:0 20rpx;
min-height: 210rpx;
padding: 0 20rpx;
min-height: 230rpx;
box-sizing: border-box;
position: relative;
overflow: hidden;
... ... @@ -110,11 +119,12 @@ page {
display: flex;
align-items: center;
justify-content: space-between;
padding:10rpx 20rpx;
border-bottom: 1rpx solid #DEDEDE;
padding: 10rpx 20rpx;
border-bottom: 1rpx solid #dedede;
}
.list_info:nth-child(2){
border-bottom: 0rpx;
.list_info:nth-child(2) {
border-bottom: 0rpx;
}
.list_info text {
... ... @@ -123,35 +133,41 @@ page {
font-size: 28rpx;
color: #6e6e6e;
}
.list_label_box{
.list_label_box {
display: flex;
align-items: center;
justify-content: flex-end;
margin: 10rpx 0;
}
.label_item{
.label_item {
width: 130rpx;
height: 40rpx;
border: 1rpx solid #3FA9F5;
border: 1rpx solid #3fa9f5;
border-radius: 10rpx;
font-size: 18rpx;
color: #3FA9F5;
color: #3fa9f5;
display: flex;
align-items: center;
justify-content: center;
margin-left: 30rpx;
}
.edit_btn,.renewal_btn{
background: #3FA9F5;
.edit_btn, .renewal_btn {
background: #3fa9f5;
color: #fff;
border: 0;
}
.renewal_btn{
background: #FC5B63;
.renewal_btn {
background: #fc5b63;
}
.hint_info{
.hint_info {
width: 100%;
height: 40rpx;
background: #3FA9F5;
background: #3fa9f5;
color: #fff;
font-size: 18rpx;
line-height: 40rpx;
... ... @@ -159,4 +175,4 @@ page {
position: absolute;
bottom: 0;
left: 0;
}
\ No newline at end of file
}
... ...
... ... @@ -7,4 +7,5 @@
<view class='content'>还有简短的汉字以内的文字介绍还有简
短的汉字以内的文字介绍还有简短的汉
字以内的文字介绍还有简短的汉字以</view>
</view>
\ No newline at end of file
</view>
<view class='bottom_btn'>点击复制客服微信号</view>
\ No newline at end of file
... ...
... ... @@ -28,3 +28,15 @@
color: #6f6f6f;
padding: 0 100rpx;
}
.bottom_btn{
width: 500rpx;
height: 88rpx;
border-radius: 16rpx;
background: #3FA9F5;
font-size: 36rpx;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
margin: 40rpx auto 0 auto;
}
\ No newline at end of file
... ...