正在显示
18 个修改的文件
包含
194 行增加
和
109 行删除
1 | { | 1 | { |
2 | "pages": [ | 2 | "pages": [ |
3 | + "pages/my/groupBuyDetail2/groupBuyDetail2", | ||
3 | "pages/index/index", | 4 | "pages/index/index", |
4 | "pages/index/confirm-appointment-info/confirm-appointment-info", | 5 | "pages/index/confirm-appointment-info/confirm-appointment-info", |
5 | "pages/index/phone-code/phone-code", | 6 | "pages/index/phone-code/phone-code", |
@@ -20,25 +20,28 @@ Page({ | @@ -20,25 +20,28 @@ Page({ | ||
20 | wx.getLocation({ | 20 | wx.getLocation({ |
21 | type: 'wgs84', | 21 | type: 'wgs84', |
22 | success: function(res) { | 22 | success: function(res) { |
23 | - console.log(res) | ||
24 | var latitude = res.latitude | 23 | var latitude = res.latitude |
25 | var longitude = res.longitude | 24 | var longitude = res.longitude |
26 | var speed = res.speed | 25 | var speed = res.speed |
27 | var accuracy = res.accuracy | 26 | var accuracy = res.accuracy |
28 | - }, | ||
29 | - }) | ||
30 | - wx.chooseLocation({ | ||
31 | - success: function(res) { | ||
32 | - console.log(res) | ||
33 | - var latitude = res.latitude | ||
34 | - var longitude = res.longitude | ||
35 | - var address = res.address | ||
36 | that.setData({ | 27 | that.setData({ |
37 | - address: address, | ||
38 | - punchState:false | 28 | + address: '天津市', |
29 | + punchState: false | ||
39 | }) | 30 | }) |
40 | }, | 31 | }, |
41 | }) | 32 | }) |
33 | + // wx.chooseLocation({ | ||
34 | + // success: function(res) { | ||
35 | + // console.log(res) | ||
36 | + // var latitude = res.latitude | ||
37 | + // var longitude = res.longitude | ||
38 | + // var address = res.address | ||
39 | + // that.setData({ | ||
40 | + // address: address, | ||
41 | + // punchState:false | ||
42 | + // }) | ||
43 | + // }, | ||
44 | + // }) | ||
42 | }, | 45 | }, |
43 | /** | 46 | /** |
44 | * 生命周期函数--监听页面加载 | 47 | * 生命周期函数--监听页面加载 |
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | 2 | ||
3 | page { | 3 | page { |
4 | background: #f5f5f5; | 4 | background: #f5f5f5; |
5 | + overflow: hidden; | ||
5 | } | 6 | } |
6 | 7 | ||
7 | .tab_box { | 8 | .tab_box { |
@@ -58,6 +59,7 @@ page { | @@ -58,6 +59,7 @@ page { | ||
58 | width: 100%; | 59 | width: 100%; |
59 | font-size: 28rpx; | 60 | font-size: 28rpx; |
60 | padding: 30rpx; | 61 | padding: 30rpx; |
62 | + box-sizing: border-box; | ||
61 | color: #6e6e6e; | 63 | color: #6e6e6e; |
62 | } | 64 | } |
63 | 65 |
@@ -5,74 +5,82 @@ Page({ | @@ -5,74 +5,82 @@ Page({ | ||
5 | * 页面的初始数据 | 5 | * 页面的初始数据 |
6 | */ | 6 | */ |
7 | data: { | 7 | data: { |
8 | - is_agree: true, | ||
9 | - is_the_week: true, | 8 | + is_agree: true, |
9 | + is_the_week: true, | ||
10 | }, | 10 | }, |
11 | - clickAgreeBtn() { | ||
12 | - this.setData({is_agree: !this.data.is_agree}); | ||
13 | - console.log(this.data.is_agree); | ||
14 | - }, | ||
15 | - //去预约 | ||
16 | - goAppointment(){ | 11 | + clickAgreeBtn() { |
12 | + this.setData({ | ||
13 | + is_agree: !this.data.is_agree | ||
14 | + }); | ||
15 | + console.log(this.data.is_agree); | ||
16 | + }, | ||
17 | + //去预约 | ||
18 | + goAppointment() { | ||
17 | wx.navigateTo({ | 19 | wx.navigateTo({ |
18 | url: '/pages/index/go-appointment/go-appointment', | 20 | url: '/pages/index/go-appointment/go-appointment', |
19 | }) | 21 | }) |
20 | }, | 22 | }, |
23 | + //服务协议 | ||
24 | + serviceProtocol() { | ||
25 | + wx.navigateTo({ | ||
26 | + url: '../../my/protocol/protocol', | ||
27 | + }) | ||
28 | + }, | ||
21 | /** | 29 | /** |
22 | * 生命周期函数--监听页面加载 | 30 | * 生命周期函数--监听页面加载 |
23 | */ | 31 | */ |
24 | - onLoad: function (options) { | 32 | + onLoad: function(options) { |
25 | this.setData({ | 33 | this.setData({ |
26 | - is_the_week: JSON.parse(options.is_the_week) | 34 | + is_the_week: JSON.parse(options.is_the_week) |
27 | }) | 35 | }) |
28 | }, | 36 | }, |
29 | 37 | ||
30 | /** | 38 | /** |
31 | * 生命周期函数--监听页面初次渲染完成 | 39 | * 生命周期函数--监听页面初次渲染完成 |
32 | */ | 40 | */ |
33 | - onReady: function () { | 41 | + onReady: function() { |
34 | 42 | ||
35 | }, | 43 | }, |
36 | 44 | ||
37 | /** | 45 | /** |
38 | * 生命周期函数--监听页面显示 | 46 | * 生命周期函数--监听页面显示 |
39 | */ | 47 | */ |
40 | - onShow: function () { | 48 | + onShow: function() { |
41 | 49 | ||
42 | }, | 50 | }, |
43 | 51 | ||
44 | /** | 52 | /** |
45 | * 生命周期函数--监听页面隐藏 | 53 | * 生命周期函数--监听页面隐藏 |
46 | */ | 54 | */ |
47 | - onHide: function () { | 55 | + onHide: function() { |
48 | 56 | ||
49 | }, | 57 | }, |
50 | 58 | ||
51 | /** | 59 | /** |
52 | * 生命周期函数--监听页面卸载 | 60 | * 生命周期函数--监听页面卸载 |
53 | */ | 61 | */ |
54 | - onUnload: function () { | 62 | + onUnload: function() { |
55 | 63 | ||
56 | }, | 64 | }, |
57 | 65 | ||
58 | /** | 66 | /** |
59 | * 页面相关事件处理函数--监听用户下拉动作 | 67 | * 页面相关事件处理函数--监听用户下拉动作 |
60 | */ | 68 | */ |
61 | - onPullDownRefresh: function () { | 69 | + onPullDownRefresh: function() { |
62 | 70 | ||
63 | }, | 71 | }, |
64 | 72 | ||
65 | /** | 73 | /** |
66 | * 页面上拉触底事件的处理函数 | 74 | * 页面上拉触底事件的处理函数 |
67 | */ | 75 | */ |
68 | - onReachBottom: function () { | 76 | + onReachBottom: function() { |
69 | 77 | ||
70 | }, | 78 | }, |
71 | 79 | ||
72 | /** | 80 | /** |
73 | * 用户点击右上角分享 | 81 | * 用户点击右上角分享 |
74 | */ | 82 | */ |
75 | - onShareAppMessage: function () { | 83 | + onShareAppMessage: function() { |
76 | 84 | ||
77 | } | 85 | } |
78 | }) | 86 | }) |
1 | <!--pages/index/activity-detail/activity-detail.wxml--> | 1 | <!--pages/index/activity-detail/activity-detail.wxml--> |
2 | <view class="content"> | 2 | <view class="content"> |
3 | - <view class="head"> | ||
4 | - <view class="img_box"> | ||
5 | - <image src="../../../images/test_img.jpg" class="activity_img"></image> | ||
6 | - </view> | ||
7 | - <view class="title"> | ||
8 | - <view class="line"></view> | ||
9 | - <view class="test_detail"> | ||
10 | - <text>科学队长实验室:雷电的产生!</text> | ||
11 | - <view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。</view> | ||
12 | - </view> | ||
13 | - </view> | 3 | + <view class="head"> |
4 | + <view class="img_box"> | ||
5 | + <image src="../../../images/test_img.jpg" class="activity_img"></image> | ||
14 | </view> | 6 | </view> |
7 | + <view class="title"> | ||
8 | + <view class="line"></view> | ||
9 | + <view class="test_detail"> | ||
10 | + <text>科学队长实验室:雷电的产生!</text> | ||
11 | + <view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。</view> | ||
12 | + </view> | ||
13 | + </view> | ||
14 | + </view> | ||
15 | 15 | ||
16 | - <view class="jiexi">解析长图</view> | ||
17 | - <view class="footer" wx:if="{{is_the_week}}"> | ||
18 | - <view class="service" bindtap="clickAgreeBtn"> | ||
19 | - <view class="agree_box"> | ||
20 | - <view class="agree_btn" wx:if="{{is_agree}}"></view> | ||
21 | - </view> | ||
22 | - <text>服务协议</text> | ||
23 | - </view> | ||
24 | - <view class="order_btn" bindtap='goAppointment'>去预约</view> | 16 | + <view class="jiexi">解析长图</view> |
17 | + <view class="footer" wx:if="{{is_the_week}}"> | ||
18 | + <view class="service" bindtap="clickAgreeBtn" bindtap='serviceProtocol'> | ||
19 | + <view class="agree_box"> | ||
20 | + <view class="agree_btn" wx:if="{{is_agree}}"></view> | ||
21 | + </view> | ||
22 | + <text>服务协议</text> | ||
25 | </view> | 23 | </view> |
24 | + <view class="order_btn" bindtap='goAppointment'>去预约</view> | ||
25 | + </view> | ||
26 | </view> | 26 | </view> |
@@ -131,15 +131,21 @@ Page({ | @@ -131,15 +131,21 @@ Page({ | ||
131 | 131 | ||
132 | //点击单人预约 | 132 | //点击单人预约 |
133 | singleAppointment() { | 133 | singleAppointment() { |
134 | - this.setData({ | ||
135 | - show_submit_btn: true | 134 | + // this.setData({ |
135 | + // show_submit_btn: true | ||
136 | + // }) | ||
137 | + wx.navigateTo({ | ||
138 | + url: '/pages/index/confirm-appointment-info/confirm-appointment-info' | ||
136 | }) | 139 | }) |
137 | }, | 140 | }, |
138 | 141 | ||
139 | //点击双人预约 | 142 | //点击双人预约 |
140 | doubleAppointment() { | 143 | doubleAppointment() { |
141 | - this.setData({ | ||
142 | - show_submit_btn: true | 144 | + // this.setData({ |
145 | + // show_submit_btn: true | ||
146 | + // }) | ||
147 | + wx.navigateTo({ | ||
148 | + url: '/pages/index/confirm-appointment-info/confirm-appointment-info' | ||
143 | }) | 149 | }) |
144 | }, | 150 | }, |
145 | 151 | ||
@@ -148,7 +154,7 @@ Page({ | @@ -148,7 +154,7 @@ Page({ | ||
148 | url: '/pages/index/confirm-appointment-info/confirm-appointment-info' | 154 | url: '/pages/index/confirm-appointment-info/confirm-appointment-info' |
149 | }) | 155 | }) |
150 | }, | 156 | }, |
151 | - | 157 | + |
152 | /** | 158 | /** |
153 | * 生命周期函数--监听页面加载 | 159 | * 生命周期函数--监听页面加载 |
154 | */ | 160 | */ |
@@ -8,13 +8,14 @@ Page({ | @@ -8,13 +8,14 @@ Page({ | ||
8 | userlist: ['张三', '里斯'], | 8 | userlist: ['张三', '里斯'], |
9 | index: -1, | 9 | index: -1, |
10 | }, | 10 | }, |
11 | + | ||
11 | //选择成员 | 12 | //选择成员 |
12 | userList(e) { | 13 | userList(e) { |
13 | this.setData({ | 14 | this.setData({ |
14 | - index:e.detail.value | 15 | + index: e.detail.value |
15 | }) | 16 | }) |
16 | - | ||
17 | }, | 17 | }, |
18 | + | ||
18 | //兑换并绑定按钮 | 19 | //兑换并绑定按钮 |
19 | chargeBtn() { | 20 | chargeBtn() { |
20 | wx.showModal({ | 21 | wx.showModal({ |
@@ -25,6 +26,13 @@ Page({ | @@ -25,6 +26,13 @@ Page({ | ||
25 | }) | 26 | }) |
26 | }, | 27 | }, |
27 | 28 | ||
29 | + //添加学员 | ||
30 | + addUser() { | ||
31 | + wx.navigateTo({ | ||
32 | + url: '../../index/confirm-appointment-info/add-student/add-student', | ||
33 | + }) | ||
34 | + }, | ||
35 | + | ||
28 | /** | 36 | /** |
29 | * 生命周期函数--监听页面加载 | 37 | * 生命周期函数--监听页面加载 |
30 | */ | 38 | */ |
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | </picker> | 21 | </picker> |
22 | <view class='iconfont icon-daosanjiao'></view> | 22 | <view class='iconfont icon-daosanjiao'></view> |
23 | </view> | 23 | </view> |
24 | - <view class='add_box'> | 24 | + <view class='add_box' bindtap='addUser'> |
25 | <text class='iconfont icon-jia'></text> | 25 | <text class='iconfont icon-jia'></text> |
26 | <text>添加学员</text> | 26 | <text>添加学员</text> |
27 | </view> | 27 | </view> |
@@ -5,75 +5,103 @@ Page({ | @@ -5,75 +5,103 @@ Page({ | ||
5 | * 页面的初始数据 | 5 | * 页面的初始数据 |
6 | */ | 6 | */ |
7 | data: { | 7 | data: { |
8 | - current:0 | 8 | + current: 0, |
9 | + chargenum: "2059788797", | ||
9 | }, | 10 | }, |
10 | -//tab切换 | ||
11 | - tabCharge(e){ | ||
12 | - var index=e.currentTarget.dataset.current | ||
13 | - var current=this.data.current | ||
14 | - if(index==current){ | ||
15 | - return false | ||
16 | - }else{ | ||
17 | - this.setData({ | ||
18 | - current:index | 11 | + |
12 | + //tab切换 | ||
13 | + tabCharge(e) { | ||
14 | + var index = e.currentTarget.dataset.current | ||
15 | + var current = this.data.current | ||
16 | + if (index == current) { | ||
17 | + return false | ||
18 | + } else { | ||
19 | + this.setData({ | ||
20 | + current: index | ||
21 | + }) | ||
22 | + } | ||
23 | + }, | ||
24 | + | ||
25 | + //服务协议 | ||
26 | + serviceProtocol() { | ||
27 | + wx.navigateTo({ | ||
28 | + url: '../protocol/protocol', | ||
19 | }) | 29 | }) |
20 | - } | ||
21 | - }, | ||
22 | -//服务协议 | ||
23 | - serviceProtocol(){}, | 30 | + }, |
31 | + | ||
32 | + //查看详情 | ||
33 | + listDetail() { | ||
34 | + wx.navigateTo({ | ||
35 | + url: '../groupBuyDetail/groupBuyDetail', | ||
36 | + }) | ||
37 | + }, | ||
38 | + | ||
39 | + // 长按复制 | ||
40 | + copy: function(e) { | ||
41 | + var that = this; | ||
42 | + wx.setClipboardData({ | ||
43 | + data: that.data.chargenum, | ||
44 | + success: function(res) { | ||
45 | + wx.showToast({ | ||
46 | + title: '复制成功', | ||
47 | + }); | ||
48 | + } | ||
49 | + }); | ||
50 | + }, | ||
51 | + | ||
24 | /** | 52 | /** |
25 | * 生命周期函数--监听页面加载 | 53 | * 生命周期函数--监听页面加载 |
26 | */ | 54 | */ |
27 | - onLoad: function (options) { | 55 | + onLoad: function(options) { |
28 | 56 | ||
29 | }, | 57 | }, |
30 | 58 | ||
31 | /** | 59 | /** |
32 | * 生命周期函数--监听页面初次渲染完成 | 60 | * 生命周期函数--监听页面初次渲染完成 |
33 | */ | 61 | */ |
34 | - onReady: function () { | 62 | + onReady: function() { |
35 | 63 | ||
36 | }, | 64 | }, |
37 | 65 | ||
38 | /** | 66 | /** |
39 | * 生命周期函数--监听页面显示 | 67 | * 生命周期函数--监听页面显示 |
40 | */ | 68 | */ |
41 | - onShow: function () { | 69 | + onShow: function() { |
42 | 70 | ||
43 | }, | 71 | }, |
44 | 72 | ||
45 | /** | 73 | /** |
46 | * 生命周期函数--监听页面隐藏 | 74 | * 生命周期函数--监听页面隐藏 |
47 | */ | 75 | */ |
48 | - onHide: function () { | 76 | + onHide: function() { |
49 | 77 | ||
50 | }, | 78 | }, |
51 | 79 | ||
52 | /** | 80 | /** |
53 | * 生命周期函数--监听页面卸载 | 81 | * 生命周期函数--监听页面卸载 |
54 | */ | 82 | */ |
55 | - onUnload: function () { | 83 | + onUnload: function() { |
56 | 84 | ||
57 | }, | 85 | }, |
58 | 86 | ||
59 | /** | 87 | /** |
60 | * 页面相关事件处理函数--监听用户下拉动作 | 88 | * 页面相关事件处理函数--监听用户下拉动作 |
61 | */ | 89 | */ |
62 | - onPullDownRefresh: function () { | 90 | + onPullDownRefresh: function() { |
63 | 91 | ||
64 | }, | 92 | }, |
65 | 93 | ||
66 | /** | 94 | /** |
67 | * 页面上拉触底事件的处理函数 | 95 | * 页面上拉触底事件的处理函数 |
68 | */ | 96 | */ |
69 | - onReachBottom: function () { | 97 | + onReachBottom: function() { |
70 | 98 | ||
71 | }, | 99 | }, |
72 | 100 | ||
73 | /** | 101 | /** |
74 | * 用户点击右上角分享 | 102 | * 用户点击右上角分享 |
75 | */ | 103 | */ |
76 | - onShareAppMessage: function () { | 104 | + onShareAppMessage: function() { |
77 | 105 | ||
78 | } | 106 | } |
79 | }) | 107 | }) |
@@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
13 | <block wx:if='{{current==0}}'> | 13 | <block wx:if='{{current==0}}'> |
14 | <view class='content_box'> | 14 | <view class='content_box'> |
15 | <view class='item_list' wx:for='{{[1,2,3]}}' wx:key=''> | 15 | <view class='item_list' wx:for='{{[1,2,3]}}' wx:key=''> |
16 | - <view class='list_title_box'> | 16 | + <view class='list_title_box' bindtap='listDetail'> |
17 | <view>查看详情</view> | 17 | <view>查看详情</view> |
18 | <view class='iconfont icon-fanhui'></view> | 18 | <view class='iconfont icon-fanhui'></view> |
19 | </view> | 19 | </view> |
@@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
94 | <view class='list_tab list_content' wx:for='{{[1,2,3]}}' wx:key=''> | 94 | <view class='list_tab list_content' wx:for='{{[1,2,3]}}' wx:key=''> |
95 | <view class='list_tab_item'>2018.10.10</view> | 95 | <view class='list_tab_item'>2018.10.10</view> |
96 | <view class='list_tab_item'>未兑换</view> | 96 | <view class='list_tab_item'>未兑换</view> |
97 | - <view class='list_tab_item'>2059788797</view> | 97 | + <view class='list_tab_item'><text selectable='true' bindlongtap='copy'>{{chargenum}}</text></view> |
98 | </view> | 98 | </view> |
99 | </view> | 99 | </view> |
100 | </view> | 100 | </view> |
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | 2 | ||
3 | page { | 3 | page { |
4 | background: #f5f5f5; | 4 | background: #f5f5f5; |
5 | + overflow: hidden; | ||
5 | } | 6 | } |
6 | 7 | ||
7 | .banner_img { | 8 | .banner_img { |
@@ -22,6 +23,7 @@ page { | @@ -22,6 +23,7 @@ page { | ||
22 | height: 80rpx; | 23 | height: 80rpx; |
23 | background: #fff; | 24 | background: #fff; |
24 | padding: 0 40rpx; | 25 | padding: 0 40rpx; |
26 | + box-sizing: border-box; | ||
25 | font-size: 32rpx; | 27 | font-size: 32rpx; |
26 | color: #464646; | 28 | color: #464646; |
27 | display: flex; | 29 | display: flex; |
@@ -50,10 +52,10 @@ page { | @@ -50,10 +52,10 @@ page { | ||
50 | align-items: center; | 52 | align-items: center; |
51 | justify-content: space-between; | 53 | justify-content: space-between; |
52 | padding: 0 22rpx; | 54 | padding: 0 22rpx; |
55 | + box-sizing: border-box; | ||
53 | font-size: 30rpx; | 56 | font-size: 30rpx; |
54 | color: #464646; | 57 | color: #464646; |
55 | text-align: center; | 58 | text-align: center; |
56 | - box-sizing: border-box; | ||
57 | } | 59 | } |
58 | 60 | ||
59 | .tab_item { | 61 | .tab_item { |
@@ -77,7 +79,6 @@ page { | @@ -77,7 +79,6 @@ page { | ||
77 | 79 | ||
78 | .content_box { | 80 | .content_box { |
79 | margin-top: 20rpx; | 81 | margin-top: 20rpx; |
80 | - /* padding-bottom: 100rpx; */ | ||
81 | } | 82 | } |
82 | 83 | ||
83 | .null_box { | 84 | .null_box { |
@@ -89,6 +90,7 @@ page { | @@ -89,6 +90,7 @@ page { | ||
89 | margin-bottom: 20rpx; | 90 | margin-bottom: 20rpx; |
90 | background: #fff; | 91 | background: #fff; |
91 | padding: 0 20rpx; | 92 | padding: 0 20rpx; |
93 | + box-sizing: border-box; | ||
92 | } | 94 | } |
93 | 95 | ||
94 | .list_title_box { | 96 | .list_title_box { |
@@ -98,6 +100,7 @@ page { | @@ -98,6 +100,7 @@ page { | ||
98 | font-size: 28rpx; | 100 | font-size: 28rpx; |
99 | color: #464646; | 101 | color: #464646; |
100 | padding: 10rpx 0; | 102 | padding: 10rpx 0; |
103 | + box-sizing: border-box; | ||
101 | border-bottom: 1rpx solid rgba(0, 0, 0, 0.1); | 104 | border-bottom: 1rpx solid rgba(0, 0, 0, 0.1); |
102 | } | 105 | } |
103 | 106 | ||
@@ -109,6 +112,7 @@ page { | @@ -109,6 +112,7 @@ page { | ||
109 | display: flex; | 112 | display: flex; |
110 | align-items: flex-start; | 113 | align-items: flex-start; |
111 | padding: 20rpx 20rpx; | 114 | padding: 20rpx 20rpx; |
115 | + box-sizing: border-box; | ||
112 | } | 116 | } |
113 | 117 | ||
114 | .info_item { | 118 | .info_item { |
@@ -208,6 +212,7 @@ page { | @@ -208,6 +212,7 @@ page { | ||
208 | align-items: flex-start; | 212 | align-items: flex-start; |
209 | justify-content: space-between; | 213 | justify-content: space-between; |
210 | padding-bottom: 20rpx; | 214 | padding-bottom: 20rpx; |
215 | + box-sizing: border-box; | ||
211 | } | 216 | } |
212 | 217 | ||
213 | .user_info { | 218 | .user_info { |
@@ -227,8 +232,9 @@ page { | @@ -227,8 +232,9 @@ page { | ||
227 | } | 232 | } |
228 | 233 | ||
229 | .state_box { | 234 | .state_box { |
230 | - padding-top:35rpx; | 235 | + padding-top: 35rpx; |
231 | text-align: right; | 236 | text-align: right; |
237 | + box-sizing: border-box; | ||
232 | } | 238 | } |
233 | 239 | ||
234 | .bottom_box { | 240 | .bottom_box { |
@@ -270,8 +276,6 @@ page { | @@ -270,8 +276,6 @@ page { | ||
270 | bottom: -28rpx; | 276 | bottom: -28rpx; |
271 | left: 50%; | 277 | left: 50%; |
272 | transform: translateX(-50%); | 278 | transform: translateX(-50%); |
273 | - /* padding: 2rpx 8rpx; | ||
274 | - box-sizing: border-box; */ | ||
275 | background: rgba(252, 91, 99, 1); | 279 | background: rgba(252, 91, 99, 1); |
276 | border-radius: 10rpx; | 280 | border-radius: 10rpx; |
277 | font-size: 18rpx; | 281 | font-size: 18rpx; |
@@ -284,6 +288,7 @@ page { | @@ -284,6 +288,7 @@ page { | ||
284 | .list_content { | 288 | .list_content { |
285 | border: 0 !important; | 289 | border: 0 !important; |
286 | padding: 15rpx 0 !important; | 290 | padding: 15rpx 0 !important; |
291 | + box-sizing: border-box; | ||
287 | } | 292 | } |
288 | 293 | ||
289 | .list_content .list_tab_item { | 294 | .list_content .list_tab_item { |
@@ -340,6 +345,7 @@ page { | @@ -340,6 +345,7 @@ page { | ||
340 | font-size: 30rpx !important; | 345 | font-size: 30rpx !important; |
341 | color: #464646 !important; | 346 | color: #464646 !important; |
342 | padding-left: 20rpx !important; | 347 | padding-left: 20rpx !important; |
348 | + box-sizing: border-box; | ||
343 | background: #fff !important; | 349 | background: #fff !important; |
344 | } | 350 | } |
345 | 351 |
@@ -5,62 +5,70 @@ Page({ | @@ -5,62 +5,70 @@ Page({ | ||
5 | * 页面的初始数据 | 5 | * 页面的初始数据 |
6 | */ | 6 | */ |
7 | data: { | 7 | data: { |
8 | + isFolded: true, | ||
9 | + }, | ||
10 | + //查看全部 | ||
11 | + listMore(e) { | ||
12 | + console.log(e) | ||
13 | + this.setData({ | ||
14 | + isFolded: !this.data.isFolded, | ||
15 | + }) | ||
8 | 16 | ||
9 | }, | 17 | }, |
10 | 18 | ||
11 | /** | 19 | /** |
12 | * 生命周期函数--监听页面加载 | 20 | * 生命周期函数--监听页面加载 |
13 | */ | 21 | */ |
14 | - onLoad: function (options) { | 22 | + onLoad: function(options) { |
15 | 23 | ||
16 | }, | 24 | }, |
17 | 25 | ||
18 | /** | 26 | /** |
19 | * 生命周期函数--监听页面初次渲染完成 | 27 | * 生命周期函数--监听页面初次渲染完成 |
20 | */ | 28 | */ |
21 | - onReady: function () { | 29 | + onReady: function() { |
22 | 30 | ||
23 | }, | 31 | }, |
24 | 32 | ||
25 | /** | 33 | /** |
26 | * 生命周期函数--监听页面显示 | 34 | * 生命周期函数--监听页面显示 |
27 | */ | 35 | */ |
28 | - onShow: function () { | 36 | + onShow: function() { |
29 | 37 | ||
30 | }, | 38 | }, |
31 | 39 | ||
32 | /** | 40 | /** |
33 | * 生命周期函数--监听页面隐藏 | 41 | * 生命周期函数--监听页面隐藏 |
34 | */ | 42 | */ |
35 | - onHide: function () { | 43 | + onHide: function() { |
36 | 44 | ||
37 | }, | 45 | }, |
38 | 46 | ||
39 | /** | 47 | /** |
40 | * 生命周期函数--监听页面卸载 | 48 | * 生命周期函数--监听页面卸载 |
41 | */ | 49 | */ |
42 | - onUnload: function () { | 50 | + onUnload: function() { |
43 | 51 | ||
44 | }, | 52 | }, |
45 | 53 | ||
46 | /** | 54 | /** |
47 | * 页面相关事件处理函数--监听用户下拉动作 | 55 | * 页面相关事件处理函数--监听用户下拉动作 |
48 | */ | 56 | */ |
49 | - onPullDownRefresh: function () { | 57 | + onPullDownRefresh: function() { |
50 | 58 | ||
51 | }, | 59 | }, |
52 | 60 | ||
53 | /** | 61 | /** |
54 | * 页面上拉触底事件的处理函数 | 62 | * 页面上拉触底事件的处理函数 |
55 | */ | 63 | */ |
56 | - onReachBottom: function () { | 64 | + onReachBottom: function() { |
57 | 65 | ||
58 | }, | 66 | }, |
59 | 67 | ||
60 | /** | 68 | /** |
61 | * 用户点击右上角分享 | 69 | * 用户点击右上角分享 |
62 | */ | 70 | */ |
63 | - onShareAppMessage: function () { | 71 | + onShareAppMessage: function() { |
64 | 72 | ||
65 | } | 73 | } |
66 | }) | 74 | }) |
1 | <!--pages/groupBuyDetail/groupBuyDetail.wxml--> | 1 | <!--pages/groupBuyDetail/groupBuyDetail.wxml--> |
2 | 2 | ||
3 | <view class='banner_img'> | 3 | <view class='banner_img'> |
4 | - <image src='../../images/banner.jpg'></image> | 4 | + <image src='../../../images/banner.jpg'></image> |
5 | </view> | 5 | </view> |
6 | <view class='content_box'> | 6 | <view class='content_box'> |
7 | <view class='item_list' wx:for='{{[1]}}' wx:key=''> | 7 | <view class='item_list' wx:for='{{[1]}}' wx:key=''> |
8 | - <view class='list_title_box'> | ||
9 | - <view>查看详情</view> | 8 | + <view class='list_title_box' bindtap='listMore'> |
9 | + <view>查看全部</view> | ||
10 | <view class='iconfont icon-fanhui'></view> | 10 | <view class='iconfont icon-fanhui'></view> |
11 | </view> | 11 | </view> |
12 | - <view class='list_info_box'> | ||
13 | - <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=''> | 12 | + <view class="list_info_box {{isFolded?'hide':'show'}}" > |
13 | + <view class='info_item' wx:for='{{[1,1,1,1,1]}}' wx:key=''> | ||
14 | <view class='info_box'> | 14 | <view class='info_box'> |
15 | - <image src='../../images/start-logo.png'></image> | 15 | + <image src='../../../images/img1.png'></image> |
16 | <view class='info_label'>发起人</view> | 16 | <view class='info_label'>发起人</view> |
17 | </view> | 17 | </view> |
18 | <view class='info_time'> | 18 | <view class='info_time'> |
@@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
32 | <view class='user_info_box'> | 32 | <view class='user_info_box'> |
33 | <view class='user_info'> | 33 | <view class='user_info'> |
34 | <view class='info_box'> | 34 | <view class='info_box'> |
35 | - <image src='../../images/start-logo.png'></image> | 35 | + <image src='../../../images/img1.png'></image> |
36 | <view class='info_label'>发起人</view> | 36 | <view class='info_label'>发起人</view> |
37 | </view> | 37 | </view> |
38 | <view>发起人姓名</view> | 38 | <view>发起人姓名</view> |
@@ -6,13 +6,13 @@ | @@ -6,13 +6,13 @@ | ||
6 | } | 6 | } |
7 | 7 | ||
8 | .service_btn_box { | 8 | .service_btn_box { |
9 | - background: linear-gradient(-78deg, rgba(255, 83, 2, 1), rgba(252, 116, 0, 1)); | ||
10 | - display: flex; | ||
11 | - align-items: center; | ||
12 | - justify-content: center; | ||
13 | - font-size: 36rpx; | ||
14 | - color: #fff; | ||
15 | - position: fixed; | 9 | + background: linear-gradient(-78deg, rgba(255, 83, 2, 1), rgba(252, 116, 0, 1)) !important; |
10 | + display: flex !important; | ||
11 | + align-items: center !important; | ||
12 | + justify-content: center !important; | ||
13 | + font-size: 36rpx !important; | ||
14 | + color: #fff !important; | ||
15 | + position: fixed !important; | ||
16 | bottom: 0; | 16 | bottom: 0; |
17 | left: 0; | 17 | left: 0; |
18 | } | 18 | } |
@@ -28,3 +28,15 @@ | @@ -28,3 +28,15 @@ | ||
28 | color: #6f6f6f; | 28 | color: #6f6f6f; |
29 | padding: 0 100rpx; | 29 | padding: 0 100rpx; |
30 | } | 30 | } |
31 | +.bottom_btn{ | ||
32 | + width: 500rpx; | ||
33 | + height: 88rpx; | ||
34 | + border-radius: 16rpx; | ||
35 | + background: #3FA9F5; | ||
36 | + font-size: 36rpx; | ||
37 | + color: #fff; | ||
38 | + display: flex; | ||
39 | + align-items: center; | ||
40 | + justify-content: center; | ||
41 | + margin: 40rpx auto 0 auto; | ||
42 | +} |
-
请 注册 或 登录 后发表评论