7de4346d by simon

默认提交

1 parent 2f073b2e
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "pages/index/index", 3 "pages/index/index",
4 "pages/detail/detail", 4 "pages/detail/detail",
5 "pages/personal-list/personal-list", 5 "pages/personal-list/personal-list",
6 "pages/reward/reward",
6 "pages/reward-completed/reward-completed", 7 "pages/reward-completed/reward-completed",
7 "pages/more/more", 8 "pages/more/more",
8 "pages/poster-example/poster-example", 9 "pages/poster-example/poster-example",
......
...@@ -105,7 +105,8 @@ button { ...@@ -105,7 +105,8 @@ button {
105 .red-p { 105 .red-p {
106 .comp { 106 .comp {
107 bottom: auto; 107 bottom: auto;
108 top: 56%; 108 // top: 56%;
109 bottom: 10%;
109 } 110 }
110 } 111 }
111 112
......
...@@ -53,12 +53,16 @@ Component({ ...@@ -53,12 +53,16 @@ Component({
53 break; 53 break;
54 54
55 case "red-package": 55 case "red-package":
56 wx.showModal({ 56 // wx.showModal({
57 title: '温馨提示', 57 // title: '温馨提示',
58 content: '打赏功能尚未开放,敬请期待!', 58 // content: '打赏功能尚未开放,敬请期待!',
59 showCancel: false, 59 // showCancel: false,
60 success(res) {} 60 // success(res) {}
61 }); 61 // });
62 console.log("1111");
63 app.router.push({
64 path: "reward"
65 })
62 break; 66 break;
63 67
64 default: 68 default:
......
1 .comp { 1 .comp {
2 position: fixed; 2 position: fixed;
3 bottom: 10%; 3 bottom: 20%;
4 right: 2%; 4 left: 2%;
5 z-index: 91; 5 z-index: 91;
6 color: #ffffff; 6 color: #ffffff;
7 7
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 <view wx:for="{{types}}" wx:key="{{index}}" data-data="{{item}}" bindtap="onTapHandler" class="btn point"> 2 <view wx:for="{{types}}" wx:key="{{index}}" data-data="{{item}}" bindtap="onTapHandler" class="btn point">
3 <span class="iconfont {{typeIconMap[item+''] }}"></span> 3 <span class="iconfont {{typeIconMap[item+''] }}"></span>
4 </view> 4 </view>
5 <!-- <view wx:for="{{pics}}" wx:key="{{index}}" data-data="{{item}}" bindtap="onTapHandler" class="btn"> 5 <view wx:for="{{pics}}" wx:key="{{index}}" data-data="{{item}}" bindtap="onTapHandler" class="btn">
6 <image mode="aspectFit" src="{{'../../image/shortcut/'+item+'.png'}}" class="pics ani-tada" /> 6 <image mode="aspectFit" src="{{'../../image/shortcut/'+item+'.png'}}" class="pics ani-tada" />
7 </view> --> 7 </view>
8 <button class="btn point" wx:if="{{contact}}" open-type="contact" bindcontact="handleContact"> 8 <button class="btn point" wx:if="{{contact}}" open-type="contact" bindcontact="handleContact">
9 <span class="iconfont iconicon-test3 contact"></span> 9 <span class="iconfont iconicon-test3 contact"></span>
10 </button> 10 </button>
......
...@@ -68,10 +68,12 @@ ...@@ -68,10 +68,12 @@
68 .t2 {} 68 .t2 {}
69 } 69 }
70 70
71 .btn2{ 71 .btn2 {
72 background-color: #f67b37; 72 background-color: #f67b37;
73 border: none; 73 border: none;
74 } 74 }
75
76
75 } 77 }
76 } 78 }
77 } 79 }
...@@ -115,6 +117,8 @@ ...@@ -115,6 +117,8 @@
115 .btn2 { 117 .btn2 {
116 background-color: #ae3f48; 118 background-color: #ae3f48;
117 } 119 }
120
121
118 } 122 }
119 } 123 }
120 124
...@@ -148,10 +152,12 @@ ...@@ -148,10 +152,12 @@
148 152
149 .t1 { 153 .t1 {
150 width: 100%; 154 width: 100%;
155 font-size: 32px;
156 font-weight: normal;
151 } 157 }
152 158
153 .name { 159 .name {
154 font-size: 36px; 160 // font-size: 36px;
155 } 161 }
156 162
157 .num { 163 .num {
...@@ -197,6 +203,9 @@ ...@@ -197,6 +203,9 @@
197 color: #7f776e; 203 color: #7f776e;
198 } 204 }
199 205
206 .btn3 {
207 background-color: #8d8d8d;
208 }
200 } 209 }
201 210
202 } 211 }
...@@ -278,4 +287,6 @@ ...@@ -278,4 +287,6 @@
278 margin-right: 12px; 287 margin-right: 12px;
279 } 288 }
280 } 289 }
290
291
281 } 292 }
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
22 </view> 22 </view>
23 <view class="share"> 23 <view class="share">
24 <view class="btn-wrap"> 24 <view class="btn-wrap">
25 <button open-type="share" class=" btn btn2"> 25 <button open-type="share" class="btn ">
26 <span class="t1 iconfont iconplane"></span> 26 <span class="t1 iconfont iconplane"></span>
27 <span class="t1">分享给好友</span> 27 <span class="t1">分享给好友</span>
28 </button> 28 </button>
29 <button open-type="share" class="ani-scl btn "> 29 <button open-type="share" class="ani-scl btn btn2">
30 <span class="t1 iconfont iconplane"></span> 30 <span class="t1 iconfont iconplane"></span>
31 <span class="t1">分享到群</span> 31 <span class="t1">分享到群</span>
32 </button> 32 </button>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 </view> 44 </view>
45 </view> 45 </view>
46 <view class="btn-wrap"> 46 <view class="btn-wrap">
47 <view bindtap="toIndex" class="index-btn btn"> 47 <view bindtap="toIndex" class="index-btn btn btn3">
48 <span class="t1 iconfont iconhome"></span> 48 <span class="t1 iconfont iconhome"></span>
49 <span>回到首页</span> 49 <span>回到首页</span>
50 </view> 50 </view>
......
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
52 } 52 }
53 53
54 .tit-bg { 54 .tit-bg {
55 opacity: .5; 55 opacity: .6;
56 height: 80px; 56 height: 80px;
57 color: #ffffff; 57 color: #ffffff;
58 position: absolute; 58 position: absolute;
59 width: 100%; 59 width: 100%;
60 height: 110px; 60 height: 110px;
61 bottom: 0; 61 bottom: 0;
62 background-image: linear-gradient(to top, #000000, #666666); 62 background-image: linear-gradient(to top, #000000, #999999);
63 } 63 }
64 } 64 }
65 65
...@@ -117,14 +117,14 @@ ...@@ -117,14 +117,14 @@
117 } 117 }
118 118
119 .tit-bg { 119 .tit-bg {
120 opacity: .5; 120 opacity: .6;
121 height: 80px; 121 height: 80px;
122 color: #ffffff; 122 color: #ffffff;
123 position: absolute; 123 position: absolute;
124 width: 100%; 124 width: 100%;
125 bottom: 0; 125 bottom: 0;
126 @include border-top-radius(8px); 126 @include border-top-radius(8px);
127 background-image: linear-gradient(to top, #000000, #666666); 127 background-image: linear-gradient(to top, #000000, #999999);
128 } 128 }
129 129
130 .play { 130 .play {
...@@ -182,11 +182,12 @@ ...@@ -182,11 +182,12 @@
182 display: flex; 182 display: flex;
183 justify-content: center; 183 justify-content: center;
184 align-items: center; 184 align-items: center;
185 height: 64px; 185 height: 52px;
186 border-radius: 52px;
186 color: #ffffff; 187 color: #ffffff;
187 background-color: #3ec03c; 188 background-color: #3ec03c;
188 border-radius: 8px;
189 margin: 0; 189 margin: 0;
190 font-weight: normal;
190 191
191 .iconfont { 192 .iconfont {
192 font-size: 40px; 193 font-size: 40px;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <block wx:for="{{bannerList}}" wx:key="{{index}}"> 14 <block wx:for="{{bannerList}}" wx:key="{{index}}">
15 <swiper-item> 15 <swiper-item>
16 <image bindtap="onBannerHandler" data-data="{{item}}" data-index="{{index}}" class="swiper-image" src="{{item.imageUrl}}" mode="aspectFill" /> 16 <image bindtap="onBannerHandler" data-data="{{item}}" data-index="{{index}}" class="swiper-image" src="{{item.imageUrl}}" mode="aspectFill" />
17 <view class="tit-bg"></view> 17 <view class="tit-bg" wx:if="{{curBanner && curBanner.bannerTitle}}"></view>
18 <view wx:if="{{curBanner && curBanner.bannerTitle}}" class="tit"> 18 <view wx:if="{{curBanner && curBanner.bannerTitle}}" class="tit">
19 {{curBanner && curBanner.bannerTitle || ""}} 19 {{curBanner && curBanner.bannerTitle || ""}}
20 </view> 20 </view>
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
80 width: $contentWidth; 80 width: $contentWidth;
81 pointer-events: none; 81 pointer-events: none;
82 } 82 }
83
83 .tit { 84 .tit {
84 font-size: 40px; 85 font-size: 40px;
85 height: 80px; 86 height: 80px;
...@@ -94,14 +95,14 @@ ...@@ -94,14 +95,14 @@
94 } 95 }
95 96
96 .tit-bg { 97 .tit-bg {
97 opacity: .5; 98 opacity: .6;
98 height: 80px; 99 height: 80px;
99 color: #ffffff; 100 color: #ffffff;
100 position: absolute; 101 position: absolute;
101 width: 100%; 102 width: 100%;
102 bottom: 0; 103 bottom: 0;
103 @include border-top-radius(8px); 104 @include border-top-radius(8px);
104 background-image: linear-gradient(to top, #000000, #666666); 105 background-image: linear-gradient(to top, #000000, #999999);
105 } 106 }
106 107
107 .play { 108 .play {
......
1 import {
2 getBindtapData
3 } from '../../utils/util';
4
5 let app = getApp();
6 Page({
7 data: {
8 authorizeVisible: false,
9 total: 0,
10 page: 1,
11 size: 10,
12 productList: [], // 产品列表
13 indexInfo: {},
14 userInfo: {},
15 rewardList: [{
16 price: 6
17 },
18 {
19 price: 18
20 },
21 {
22 price: 66
23 },
24 {
25 price: 88
26 },
27 {
28 price: 168
29 },
30 {
31 price: 388
32 },
33 ]
34 },
35 onShareAppMessage() {},
36 showAuth() {
37 this.setData({
38 authorizeVisible: true
39 })
40 },
41 onLoad(options) {},
42
43 /**
44 * 基础方法
45 * 授权完毕重拉数据用
46 */
47 initData() {
48
49 },
50 /**
51 * 到达底部
52 * 做加载更多操作
53 */
54 onReachBottom() {
55 if (this.data.dataList.length < this.data.total) {
56 this.setData({
57 page: this.data.page + 1
58 });
59 this.queryDataList();
60 }
61 },
62
63 // 重置页面列表 点击搜索条件时需要
64 resetPage() {
65 this.setData({
66 page: 1,
67 dataList: []
68 })
69 },
70
71 /**
72 * 请求DataList
73 */
74 queryDataList() {
75 return;
76 return new Promise((resolve, reject) => {
77 app.post({
78 sid: false,
79 url: app.api.dataList,
80 data: {
81 page: this.data.page,
82 size: this.data.size,
83 },
84 }).then((result) => {
85 let dataList = result.list;
86 dataList = this.data.dataList.concat(dataList);
87 this.setData({
88 dataList: dataList,
89 total: result.total
90 })
91 resolve();
92 })
93 });
94 },
95
96 /**
97 * 隐藏蒙层
98 */
99 hideMask() {
100 this.setData({
101 productDetailVisible: false,
102 authorizeVisible: false,
103 })
104 },
105 /**
106 * 子组件事件
107 * @param {*} evt
108 */
109 evtcomp(evt) {
110 let {
111 name,
112 data
113 } = evt.detail;
114 switch (name) {
115
116 // 隐藏蒙层
117 case "_evt_hide_mask":
118 this.hideMask();
119 break;
120
121 /**
122 * 重拉数据已在
123 */
124 case "_evt_auth_complete":
125 // this.initData();
126 this.hideMask();
127 break;
128
129 default:
130 break;
131 }
132 },
133 })
1 {
2 "navigationBarTitleText": ""
3 }
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4 .page {
5 $contentWidth: 650px;
6
7 .bgc {
8 background-color: #af3541;
9 }
10
11 .bg {}
12
13 .main {
14 .top-space {
15 height: 140px;
16 }
17
18 .content {
19 position: relative;
20
21 .portrait {
22 text-align: center;
23
24 &-bg {
25 width: 207px;
26 }
27 }
28
29 .reward {
30 width: $contentWidth;
31 margin: 124px auto 0;
32
33
34 &-wrap {
35 display: flex;
36 justify-content: space-between;
37 flex-wrap: wrap;
38
39 &-item {
40 width: 320px;
41 margin-bottom:12px;
42 }
43 }
44 }
45
46 }
47 }
48 }
1 <view class="page">
2 <view class="app__bgc bgc"></view>
3 <image mode="widthFix" class="app__bg bg" src="../../image/reward/reward-bg.png" />
4 <!-- <view class="app__bg bg"></view> -->
5 <view class="app__content main">
6 <view class="top-space"></view>
7 <view class="content">
8 <view class="portrait">
9 <image class="portrait-bg" mode="widthFix" src="../../image/reward/reward-portrait-bg.png" />
10 </view>
11 <view class="reward">
12 <view class="reward-wrap">
13 <image class="reward-wrap-item" wx:for="{{rewardList}}" wx:key="{{index}}" mode="widthFix" src="{{'../../image/reward/m-'+item.price+'.png'}}" />
14 </view>
15 </view>
16 </view>
17 </view>
18 </view>
...@@ -2,6 +2,7 @@ const routerPath = { ...@@ -2,6 +2,7 @@ const routerPath = {
2 index: '/pages/index/index', 2 index: '/pages/index/index',
3 detail: '/pages/detail/detail', 3 detail: '/pages/detail/detail',
4 personalList: '/pages/personal-list/personal-list', 4 personalList: '/pages/personal-list/personal-list',
5 reward: '/pages/reward/reward',
5 rewardCompleted: '/pages/reward-completed/reward-completed', 6 rewardCompleted: '/pages/reward-completed/reward-completed',
6 7
7 authorize: '/pages/authorize/authorize', // 授权 8 authorize: '/pages/authorize/authorize', // 授权
......