miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 a5ff9860a005c005a0cef8bd52ba5a29657674c4 1 个父辈 625f6831

科学小队长团购部分调整

内嵌 并排对比
正在显示 18 个修改的文件 包含 194 行增加 和 109 行删除
{
"pages": [
"pages/my/groupBuyDetail2/groupBuyDetail2",
"pages/index/index",
"pages/index/confirm-appointment-info/confirm-appointment-info",
"pages/index/phone-code/phone-code",
... ...
... ... @@ -20,25 +20,28 @@ Page({
wx.getLocation({
type: 'wgs84',
success: function(res) {
console.log(res)
var latitude = res.latitude
var longitude = res.longitude
var speed = res.speed
var accuracy = res.accuracy
},
})
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
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
// })
// },
// })
},
/**
* 生命周期函数--监听页面加载
... ...
... ... @@ -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;
}
... ...
... ... @@ -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
... ...
... ... @@ -5,74 +5,82 @@ Page({
* 页面的初始数据
*/
data: {
is_agree: true,
is_the_week: true,
is_agree: true,
is_the_week: true,
},
clickAgreeBtn() {
this.setData({is_agree: !this.data.is_agree});
console.log(this.data.is_agree);
},
//去预约
goAppointment(){
clickAgreeBtn() {
this.setData({
is_agree: !this.data.is_agree
});
console.log(this.data.is_agree);
},
//去预约
goAppointment() {
wx.navigateTo({
url: '/pages/index/go-appointment/go-appointment',
})
},
//服务协议
serviceProtocol() {
wx.navigateTo({
url: '../../my/protocol/protocol',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
this.setData({
is_the_week: JSON.parse(options.is_the_week)
is_the_week: JSON.parse(options.is_the_week)
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
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/index/activity-detail/activity-detail.wxml-->
<view class="content">
<view class="head">
<view class="img_box">
<image src="../../../images/test_img.jpg" class="activity_img"></image>
</view>
<view class="title">
<view class="line"></view>
<view class="test_detail">
<text>科学队长实验室：雷电的产生！</text>
<view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。</view>
</view>
</view>
<view class="head">
<view class="img_box">
<image src="../../../images/test_img.jpg" class="activity_img"></image>
</view>
<view class="title">
<view class="line"></view>
<view class="test_detail">
<text>科学队长实验室：雷电的产生！</text>
<view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。</view>
</view>
</view>
</view>
<view class="jiexi">解析长图</view>
<view class="footer" wx:if="{{is_the_week}}">
<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" bindtap='goAppointment'>去预约</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
... ...
... ... @@ -7,6 +7,7 @@ page {
width: 100%;
display: flex;
flex-direction: column;
padding-top: 30rpx;
}
.tips {
width: 100%;
... ...
... ... @@ -131,15 +131,21 @@ Page({
//点击单人预约
singleAppointment() {
this.setData({
show_submit_btn: true
// this.setData({
// show_submit_btn: true
// })
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info'
})
},
//点击双人预约
doubleAppointment() {
this.setData({
show_submit_btn: true
// this.setData({
// show_submit_btn: true
// })
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info'
})
},
... ... @@ -148,7 +154,7 @@ Page({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info'
})
},
/**
* 生命周期函数--监听页面加载
*/
... ...
... ... @@ -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>
... ...
... ... @@ -5,75 +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',
})
}
},
//服务协议
serviceProtocol(){},
},
//查看详情
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,7 +13,7 @@
<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>
... ... @@ -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>
... ...
... ... @@ -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,8 +232,9 @@ page {
}
.state_box {
padding-top:35rpx;
padding-top: 35rpx;
text-align: right;
box-sizing: border-box;
}
.bottom_box {
... ... @@ -270,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;
... ... @@ -284,6 +288,7 @@ page {
.list_content {
border: 0 !important;
padding: 15rpx 0 !important;
box-sizing: border-box;
}
.list_content .list_tab_item {
... ... @@ -340,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;
}
... ...
... ... @@ -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
... ...