3e7fe8a2 by simon

默认提交

1 parent 059ca058
...@@ -77,6 +77,7 @@ var lazyspriteConfig = { ...@@ -77,6 +77,7 @@ var lazyspriteConfig = {
77 77
78 // Log for output msg. 78 // Log for output msg.
79 function log() { 79 function log() {
80 return;
80 var data = Array.prototype.slice.call(arguments); 81 var data = Array.prototype.slice.call(arguments);
81 gutil.log.apply(false, data); 82 gutil.log.apply(false, data);
82 } 83 }
...@@ -209,10 +210,10 @@ var watchHandler = function (type, file) { ...@@ -209,10 +210,10 @@ var watchHandler = function (type, file) {
209 del([file.replace('src/', 'dist/')]); 210 del([file.replace('src/', 'dist/')]);
210 } 211 }
211 } else { 212 } else {
212 imageMin(); 213 // imageMin();
213 assetsImgMin(); 214 // assetsImgMin();
214 qcloudCDN(); 215 // qcloudCDN();
215 wxmlImgRewrite(); 216 // wxmlImgRewrite();
216 } 217 }
217 } 218 }
218 219
...@@ -223,7 +224,7 @@ var watchHandler = function (type, file) { ...@@ -223,7 +224,7 @@ var watchHandler = function (type, file) {
223 del([tmp]); 224 del([tmp]);
224 } else { 225 } else {
225 copyWXML(); 226 copyWXML();
226 wxmlImgRewrite(); 227 // wxmlImgRewrite();
227 } 228 }
228 } 229 }
229 230
...@@ -250,15 +251,15 @@ function watch(cb) { ...@@ -250,15 +251,15 @@ function watch(cb) {
250 }); 251 });
251 watcher 252 watcher
252 .on('change', function (file) { 253 .on('change', function (file) {
253 log(gutil.colors.yellow(file) + ' is changed'); 254 // log(gutil.colors.yellow(file) + ' is changed');
254 watchHandler('changed', file); 255 watchHandler('changed', file);
255 }) 256 })
256 .on('add', function (file) { 257 .on('add', function (file) {
257 log(gutil.colors.yellow(file) + ' is added'); 258 // log(gutil.colors.yellow(file) + ' is added');
258 watchHandler('add', file); 259 watchHandler('add', file);
259 }) 260 })
260 .on('unlink', function (file) { 261 .on('unlink', function (file) {
261 log(gutil.colors.yellow(file) + ' is deleted'); 262 // log(gutil.colors.yellow(file) + ' is deleted');
262 watchHandler('removed', file); 263 watchHandler('removed', file);
263 }); 264 });
264 265
...@@ -271,12 +272,12 @@ gulp.task('default', gulp.series( ...@@ -271,12 +272,12 @@ gulp.task('default', gulp.series(
271 copyBasicFiles, 272 copyBasicFiles,
272 gulp.parallel( 273 gulp.parallel(
273 sassCompile, 274 sassCompile,
274 imageMin, 275 // imageMin,
275 copyWXML 276 copyWXML
276 ), 277 ),
277 wxmlImgRewrite, 278 // wxmlImgRewrite,
278 assetsImgMin, 279 // assetsImgMin,
279 qcloudCDN, 280 // qcloudCDN,
280 watch 281 watch
281 )); 282 ));
282 283
...@@ -286,12 +287,12 @@ gulp.task('test', gulp.series( ...@@ -286,12 +287,12 @@ gulp.task('test', gulp.series(
286 copyBasicFiles, 287 copyBasicFiles,
287 gulp.parallel( 288 gulp.parallel(
288 sassCompile, 289 sassCompile,
289 imageMin, 290 // imageMin,
290 copyWXML 291 copyWXML
291 ), 292 ),
292 wxmlImgRewrite, 293 // wxmlImgRewrite,
293 assetsImgMin, 294 // assetsImgMin,
294 qcloudCDN 295 // qcloudCDN
295 )); 296 ));
296 297
297 // 删除任务 298 // 删除任务
......
...@@ -18,7 +18,7 @@ App({ ...@@ -18,7 +18,7 @@ App({
18 router: router, 18 router: router,
19 store: store, 19 store: store,
20 onLaunch(options) { 20 onLaunch(options) {
21 console.log("options:", options); 21 // console.log("options:", options);
22 this.share() 22 this.share()
23 }, 23 },
24 globalData: { 24 globalData: {
......
1 { 1 {
2 "pages": [ 2 "pages": [
3 "pages/index/index", 3 "pages/auction-list/auction-list",
4 "pages/auction-mine/auction-mine",
5 "pages/auction-detail/auction-detail",
6 "pages/auction-bid-detail/auction-bid-detail",
4 "pages/user-center/user-center", 7 "pages/user-center/user-center",
8 "pages/index/index",
5 "pages/scan-result/scan-result", 9 "pages/scan-result/scan-result",
6 "pages/gift-shop/gift-shop", 10 "pages/gift-shop/gift-shop",
7 "pages/gift-detail/gift-detail", 11 "pages/gift-detail/gift-detail",
......
...@@ -7,200 +7,200 @@ ...@@ -7,200 +7,200 @@
7 */ 7 */
8 @import "support"; 8 @import "support";
9 9
10 // Margin 10 // // Margin
11 .u-mt-smaller { 11 // .u-mt-smaller {
12 margin-top: $marginTopSmaller; 12 // margin-top: $marginTopSmaller;
13 } 13 // }
14 14
15 .u-mt-small { 15 // .u-mt-small {
16 margin-top: $marginTopSmall; 16 // margin-top: $marginTopSmall;
17 } 17 // }
18 18
19 .u-mt-medium { 19 // .u-mt-medium {
20 margin-top: $marginTopMedium; 20 // margin-top: $marginTopMedium;
21 } 21 // }
22 22
23 .u-mt-large { 23 // .u-mt-large {
24 margin-top: $marginTopLarge; 24 // margin-top: $marginTopLarge;
25 } 25 // }
26 26
27 .u-mt-larger { 27 // .u-mt-larger {
28 margin-top: $marginTopLarger; 28 // margin-top: $marginTopLarger;
29 } 29 // }
30 30
31 .u-mb-smaller { 31 // .u-mb-smaller {
32 margin-bottom: $marginTopSmaller; 32 // margin-bottom: $marginTopSmaller;
33 } 33 // }
34 34
35 .u-mb-small { 35 // .u-mb-small {
36 margin-bottom: $marginTopSmall; 36 // margin-bottom: $marginTopSmall;
37 } 37 // }
38 38
39 .u-mb-medium { 39 // .u-mb-medium {
40 margin-bottom: $marginTopMedium; 40 // margin-bottom: $marginTopMedium;
41 } 41 // }
42 42
43 .u-mb-large { 43 // .u-mb-large {
44 margin-bottom: $marginTopLarge; 44 // margin-bottom: $marginTopLarge;
45 } 45 // }
46 46
47 .u-mb-larger { 47 // .u-mb-larger {
48 margin-bottom: $marginTopLarger; 48 // margin-bottom: $marginTopLarger;
49 } 49 // }
50 50
51 // Padding 51 // // Padding
52 .u-pt-smaller { 52 // .u-pt-smaller {
53 padding-top: $paddingTopSmaller; 53 // padding-top: $paddingTopSmaller;
54 } 54 // }
55 55
56 .u-pt-small { 56 // .u-pt-small {
57 padding-top: $paddingTopSmall; 57 // padding-top: $paddingTopSmall;
58 } 58 // }
59 59
60 .u-pt-medium { 60 // .u-pt-medium {
61 padding-top: $paddingTopMedium; 61 // padding-top: $paddingTopMedium;
62 } 62 // }
63 63
64 .u-pt-large { 64 // .u-pt-large {
65 padding-top: $paddingTopLarge; 65 // padding-top: $paddingTopLarge;
66 } 66 // }
67 67
68 .u-pt-larger { 68 // .u-pt-larger {
69 padding-top: $paddingTopLarger; 69 // padding-top: $paddingTopLarger;
70 } 70 // }
71 71
72 .u-pb-smaller { 72 // .u-pb-smaller {
73 padding-bottom: $paddingTopSmaller; 73 // padding-bottom: $paddingTopSmaller;
74 } 74 // }
75 75
76 .u-pb-small { 76 // .u-pb-small {
77 padding-bottom: $paddingTopSmall; 77 // padding-bottom: $paddingTopSmall;
78 } 78 // }
79 79
80 .u-pb-medium { 80 // .u-pb-medium {
81 padding-bottom: $paddingTopMedium; 81 // padding-bottom: $paddingTopMedium;
82 } 82 // }
83 83
84 .u-pb-large { 84 // .u-pb-large {
85 padding-bottom: $paddingTopLarge; 85 // padding-bottom: $paddingTopLarge;
86 } 86 // }
87 87
88 .u-pb-larger { 88 // .u-pb-larger {
89 padding-bottom: $paddingTopLarger; 89 // padding-bottom: $paddingTopLarger;
90 } 90 // }
91 91
92 // 布局方位 92 // // 布局方位
93 .u-ta-c { 93 // .u-ta-c {
94 text-align: center !important; 94 // text-align: center !important;
95 } 95 // }
96 96
97 .u-ta-l { 97 // .u-ta-l {
98 text-align: left !important; 98 // text-align: left !important;
99 } 99 // }
100 100
101 .u-ta-r { 101 // .u-ta-r {
102 text-align: right !important; 102 // text-align: right !important;
103 } 103 // }
104 104
105 .u-fl-l { 105 // .u-fl-l {
106 float: left; 106 // float: left;
107 } 107 // }
108 108
109 .u-fl-n { 109 // .u-fl-n {
110 float: none; 110 // float: none;
111 } 111 // }
112 112
113 .u-fl-r { 113 // .u-fl-r {
114 float: right; 114 // float: right;
115 } 115 // }
116 116
117 .u-d-b { 117 // .u-d-b {
118 display: block; 118 // display: block;
119 } 119 // }
120 120
121 .u-d-i { 121 // .u-d-i {
122 display: inline !important; 122 // display: inline !important;
123 } 123 // }
124 124
125 .u-d-ib { 125 // .u-d-ib {
126 display: inline-block !important; 126 // display: inline-block !important;
127 } 127 // }
128 128
129 .u-d-n { 129 // .u-d-n {
130 display: none !important; 130 // display: none !important;
131 } 131 // }
132 132
133 .u-d-t { 133 // .u-d-t {
134 display: table; 134 // display: table;
135 table-layout: fixed; 135 // table-layout: fixed;
136 } 136 // }
137 137
138 .u-d-tc { 138 // .u-d-tc {
139 display: table-cell; 139 // display: table-cell;
140 } 140 // }
141 141
142 .u-va-b { 142 // .u-va-b {
143 vertical-align: bottom; 143 // vertical-align: bottom;
144 } 144 // }
145 145
146 .u-va-m { 146 // .u-va-m {
147 vertical-align: middle; 147 // vertical-align: middle;
148 } 148 // }
149 149
150 .u-va-t { 150 // .u-va-t {
151 vertical-align: top; 151 // vertical-align: top;
152 } 152 // }
153 153
154 // clearfix 154 // // clearfix
155 .u-clearfix { 155 // .u-clearfix {
156 @include clearfix; 156 // @include clearfix;
157 } 157 // }
158 158
159 // 虚拟格式 159 // // 虚拟格式
160 .u-cur-d { 160 // .u-cur-d {
161 cursor: default; 161 // cursor: default;
162 } 162 // }
163 163
164 .u-cur-p { 164 // .u-cur-p {
165 cursor: pointer; 165 // cursor: pointer;
166 } 166 // }
167 167
168 // flex 168 // // flex
169 .u-flex { 169 // .u-flex {
170 display: -webkit-box; 170 // display: -webkit-box;
171 display: -webkit-flex; 171 // display: -webkit-flex;
172 display: flex; 172 // display: flex;
173 } 173 // }
174 174
175 .u-flex-item { 175 // .u-flex-item {
176 -webkit-box-flex: 1; 176 // -webkit-box-flex: 1;
177 -webkit-flex: 1; 177 // -webkit-flex: 1;
178 flex: 1; 178 // flex: 1;
179 } 179 // }
180 180
181 // 小程序中模拟ul、li 181 // // 小程序中模拟ul、li
182 .u-ul { 182 // .u-ul {
183 padding-left: 30px; 183 // padding-left: 30px;
184 text-align: left; 184 // text-align: left;
185 display: block; 185 // display: block;
186 } 186 // }
187 187
188 .u-li { 188 // .u-li {
189 position: relative; 189 // position: relative;
190 font-size: $fontSizeSmall; 190 // font-size: $fontSizeSmall;
191 line-height: $fontSizeSmall + 4px; 191 // line-height: $fontSizeSmall + 4px;
192 margin-bottom: $marginTopSmall; 192 // margin-bottom: $marginTopSmall;
193 &:before { 193 // &:before {
194 position: absolute; 194 // position: absolute;
195 content: " "; 195 // content: " ";
196 top: 14px; 196 // top: 14px;
197 left: -20px; 197 // left: -20px;
198 width: 8px; 198 // width: 8px;
199 height: 8px; 199 // height: 8px;
200 border-radius: 8px; 200 // border-radius: 8px;
201 background-color: $colorBlack; 201 // background-color: $colorBlack;
202 } 202 // }
203 } 203 // }
204 204
205 205
206 206
......
...@@ -6,21 +6,21 @@ ...@@ -6,21 +6,21 @@
6 * 6 *
7 */ 7 */
8 8
9 // Margin 9 // // Margin
10 $marginTopSmaller: 20px; 10 // $marginTopSmaller: 20px;
11 $marginTopSmall: 30px; 11 // $marginTopSmall: 30px;
12 $marginTopMedium: 40px; 12 // $marginTopMedium: 40px;
13 $marginTopLarge: 60px; 13 // $marginTopLarge: 60px;
14 $marginTopLarger: 80px; 14 // $marginTopLarger: 80px;
15 15
16 // Padding 16 // // Padding
17 $paddingTopSmaller: 20px; 17 // $paddingTopSmaller: 20px;
18 $paddingTopSmall: 30px; 18 // $paddingTopSmall: 30px;
19 $paddingTopMedium: 40px; 19 // $paddingTopMedium: 40px;
20 $paddingTopLarge: 60px; 20 // $paddingTopLarge: 60px;
21 $paddingTopLarger: 80px; 21 // $paddingTopLarger: 80px;
22 22
23 // Color 23 // // Color
24 $colorBlue: #20A0FF; 24 $colorBlue: #20A0FF;
25 $colorGreen: #13CE66; 25 $colorGreen: #13CE66;
26 $colorGray: #475669; 26 $colorGray: #475669;
...@@ -29,11 +29,11 @@ $colorRed: #FF4949; ...@@ -29,11 +29,11 @@ $colorRed: #FF4949;
29 $colorYellow: #F7BA2A; 29 $colorYellow: #F7BA2A;
30 30
31 $color: #787878; 31 $color: #787878;
32 $colorLink: #1D8CE0; 32 // $colorLink: #1D8CE0;
33 33
34 $backGroundColor: #fff; 34 // $backGroundColor: #fff;
35 35
36 // Font 36 // // Font
37 $fontSize: 32px; 37 $fontSize: 32px;
38 $fontSizeSmall: 28px; 38 $fontSizeSmall: 28px;
39 $fontSizeSmaller: 24px; 39 $fontSizeSmaller: 24px;
...@@ -41,7 +41,7 @@ $fontSizeLarge: 36px; ...@@ -41,7 +41,7 @@ $fontSizeLarge: 36px;
41 $fontSizeLarger: 44px; 41 $fontSizeLarger: 44px;
42 42
43 43
44 // 主题颜色 44 // // 主题颜色
45 $colorMain:#3680EB; 45 $colorMain:#3680EB;
46 46
47 $pageBottom:80px; 47 $pageBottom:80px;
......
1 import {
2 getBindtapData
3 } from '../../utils/util';
4
5 let app = getApp();
6 Page({
7 data: {},
8 onShareAppMessage() {},
9 showAuth() {
10 this.setData({
11 authorizeVisible: true
12 })
13 },
14 onLoad(options) {},
15 // 隐藏蒙层
16 hideMask() {
17 this.setData({
18 authorizeVisible: false,
19 })
20 },
21 // 子组件事件
22 evtcomp(evt) {
23 let {
24 name,
25 data
26 } = evt.detail;
27 switch (name) {
28
29 // 隐藏弹窗
30 case "_evt_hide_mask":
31 this.hideMask();
32 break;
33
34 default:
35 break;
36 }
37 },
38 })
1 {
2 "navigationBarTitleText": "拍卖活动列表"
3 }
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4 .page {
5 .bgc {}
6
7 .bg {}
8
9 .main {
10 .top-space {
11 height: 0px;
12 }
13
14 .content {
15 position: relative;
16 }
17 }
18 }
1 <view class="page">
2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view>
4 <!-- <view class="app__top-shadow"></view> -->
5 <view class="app__content main">
6 <view class="top-space"></view>
7 <view class="content">auction-list</view>
8 </view>
9 </view>
10 <van-popup show="{{ authorizeVisible }}">
11 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
12 </van-popup>
1 import {
2 getBindtapData
3 } from '../../utils/util';
4
5 let app = getApp();
6 Page({
7 data: {},
8 onShareAppMessage() {},
9 showAuth() {
10 this.setData({
11 authorizeVisible: true
12 })
13 },
14 onLoad(options) {},
15 // 隐藏蒙层
16 hideMask() {
17 this.setData({
18 authorizeVisible: false,
19 })
20 },
21 // 子组件事件
22 evtcomp(evt) {
23 let {
24 name,
25 data
26 } = evt.detail;
27 switch (name) {
28
29 // 隐藏弹窗
30 case "_evt_hide_mask":
31 this.hideMask();
32 break;
33
34 default:
35 break;
36 }
37 },
38 })
1 {
2 "navigationBarTitleText": "拍卖活动列表"
3 }
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4 .page {
5 .bgc {}
6
7 .bg {}
8
9 .main {
10 .top-space {
11 height: 0px;
12 }
13
14 .content {
15 position: relative;
16 }
17 }
18 }
1 <view class="page">
2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view>
4 <!-- <view class="app__top-shadow"></view> -->
5 <view class="app__content main">
6 <view class="top-space"></view>
7 <view class="content">auction-list</view>
8 </view>
9 </view>
10 <van-popup show="{{ authorizeVisible }}">
11 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
12 </van-popup>
1 import {
2 getBindtapData
3 } from '../../utils/util';
4
5 let app = getApp();
6 Page({
7 data: {},
8 onShareAppMessage() {},
9 showAuth() {
10 this.setData({
11 authorizeVisible: true
12 })
13 },
14 onLoad(options) {},
15 // 隐藏蒙层
16 hideMask() {
17 this.setData({
18 authorizeVisible: false,
19 })
20 },
21 // 子组件事件
22 evtcomp(evt) {
23 let {
24 name,
25 data
26 } = evt.detail;
27 switch (name) {
28
29 // 隐藏弹窗
30 case "_evt_hide_mask":
31 this.hideMask();
32 break;
33
34 default:
35 break;
36 }
37 },
38 })
1 {
2 "navigationBarTitleText": "拍卖活动列表"
3 }
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4 .page {
5 .bgc {}
6
7 .bg {}
8
9 .main {
10 .top-space {
11 height: 0px;
12 }
13
14 .content {
15 position: relative;
16 }
17 }
18 }
1 <view class="page">
2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view>
4 <!-- <view class="app__top-shadow"></view> -->
5 <view class="app__content main">
6 <view class="top-space"></view>
7 <view class="content">auction-list21</view>
8 </view>
9 </view>
10 <van-popup show="{{ authorizeVisible }}">
11 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
12 </van-popup>
1 import {
2 getBindtapData
3 } from '../../utils/util';
4
5 let app = getApp();
6 Page({
7 data: {},
8 onShareAppMessage() {},
9 showAuth() {
10 this.setData({
11 authorizeVisible: true
12 })
13 },
14 onLoad(options) {},
15 // 隐藏蒙层
16 hideMask() {
17 this.setData({
18 authorizeVisible: false,
19 })
20 },
21 // 子组件事件
22 evtcomp(evt) {
23 let {
24 name,
25 data
26 } = evt.detail;
27 switch (name) {
28
29 // 隐藏弹窗
30 case "_evt_hide_mask":
31 this.hideMask();
32 break;
33
34 default:
35 break;
36 }
37 },
38 })
1 {
2 "navigationBarTitleText": "拍卖活动列表"
3 }
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4 .page {
5 .bgc {}
6
7 .bg {}
8
9 .main {
10 .top-space {
11 height: 0px;
12 }
13
14 .content {
15 position: relative;
16 }
17 }
18 }
1 <view class="page">
2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view>
4 <!-- <view class="app__top-shadow"></view> -->
5 <view class="app__content main">
6 <view class="top-space"></view>
7 <view class="content">auction-list</view>
8 </view>
9 </view>
10 <van-popup show="{{ authorizeVisible }}">
11 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
12 </van-popup>
1 import {
2 getBindtapData
3 } from '../../utils/util';
4
1 let app = getApp(); 5 let app = getApp();
2 Page({ 6 Page({
3 data: {}, 7 data: {},
4 onLoad(options) {} 8 onShareAppMessage() {},
9 showAuth() {
10 this.setData({
11 authorizeVisible: true
12 })
13 },
14 onLoad(options) {},
15 // 隐藏蒙层
16 hideMask() {
17 this.setData({
18 authorizeVisible: false,
19 })
20 },
21 // 子组件事件
22 evtcomp(evt) {
23 let {
24 name,
25 data
26 } = evt.detail;
27 switch (name) {
28
29 // 隐藏弹窗
30 case "_evt_hide_mask":
31 this.hideMask();
32 break;
33
34 default:
35 break;
36 }
37 },
5 }) 38 })
......
1 <view class="page">
2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view>
4 <!-- <view class="app__top-shadow"></view> -->
5 <view class="app__content main">
6 <view class="top-space"></view>
7 <view class="content"></view>
8 </view>
9 </view>
10 <van-popup show="{{ authorizeVisible }}">
11 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
12 </van-popup>
......
...@@ -6,7 +6,9 @@ $contentWidth: 690px; ...@@ -6,7 +6,9 @@ $contentWidth: 690px;
6 .page { 6 .page {
7 padding-bottom: $pageBottom; 7 padding-bottom: $pageBottom;
8 8
9 .bgc {} 9 .bgc {
10 background-color: #131413;
11 }
10 12
11 .bg {} 13 .bg {}
12 14
......
...@@ -19,6 +19,13 @@ const routerPath = { ...@@ -19,6 +19,13 @@ const routerPath = {
19 signInRecord: '/pages/sign-in-record/sign-in-record', // 签到记录 19 signInRecord: '/pages/sign-in-record/sign-in-record', // 签到记录
20 rank: '/pages/rank/rank', // 排行榜 20 rank: '/pages/rank/rank', // 排行榜
21 rankGift: '/pages/rank-gift/rank-gift', // 排行榜奖励 21 rankGift: '/pages/rank-gift/rank-gift', // 排行榜奖励
22
23 // 拍卖
24 auctionList: '/pages/auction-list/auction-list', // 拍卖活动列表
25 auctionMine: '/pages/auction-mine/auction-mine', // 我的拍卖订单
26 auctionDetail: '/pages/auction-detail/auction-detail', // 拍卖活动详情
27 auctionBidDetail: '/pages/auction-bid-detail/auction-bid-detail', // 拍卖出价详情
28
22 webview: '/pages/webview/webview', 29 webview: '/pages/webview/webview',
23 example: '/pages/example/example', 30 example: '/pages/example/example',
24 more: '/pages/more/more', 31 more: '/pages/more/more',
......