默认提交

@@ -77,6 +77,7 @@ var lazyspriteConfig = {
 
 // Log for output msg.
 function log() {
+  return;
 	var data = Array.prototype.slice.call(arguments);
 	gutil.log.apply(false, data);
 }
@@ -209,10 +210,10 @@ var watchHandler = function (type, file) {
 				del([file.replace('src/', 'dist/')]);
 			}
 		} else {
-			imageMin();
-			assetsImgMin();
-			qcloudCDN();
-			wxmlImgRewrite();
+			// imageMin();
+			// assetsImgMin();
+			// qcloudCDN();
+			// wxmlImgRewrite();
 		}
 	}
 
@@ -223,7 +224,7 @@ var watchHandler = function (type, file) {
 			del([tmp]);
 		} else {
 			copyWXML();
-			wxmlImgRewrite();
+			// wxmlImgRewrite();
 		}
 	}
 
@@ -250,15 +251,15 @@ function watch(cb) {
 	});
 	watcher
 		.on('change', function (file) {
-			log(gutil.colors.yellow(file) + ' is changed');
+			// log(gutil.colors.yellow(file) + ' is changed');
 			watchHandler('changed', file);
 		})
 		.on('add', function (file) {
-			log(gutil.colors.yellow(file) + ' is added');
+			// log(gutil.colors.yellow(file) + ' is added');
 			watchHandler('add', file);
 		})
 		.on('unlink', function (file) {
-			log(gutil.colors.yellow(file) + ' is deleted');
+			// log(gutil.colors.yellow(file) + ' is deleted');
 			watchHandler('removed', file);
 		});
 
@@ -271,12 +272,12 @@ gulp.task('default', gulp.series(
 	copyBasicFiles,
 	gulp.parallel(
 		sassCompile,
-		imageMin,
+		// imageMin,
 		copyWXML
 	),
-	wxmlImgRewrite,
-	assetsImgMin,
-	qcloudCDN,
+	// wxmlImgRewrite,
+	// assetsImgMin,
+	// qcloudCDN,
 	watch
 ));
 
@@ -286,12 +287,12 @@ gulp.task('test', gulp.series(
 	copyBasicFiles,
 	gulp.parallel(
 		sassCompile,
-		imageMin,
+		// imageMin,
 		copyWXML
 	),
-	wxmlImgRewrite,
-	assetsImgMin,
-	qcloudCDN
+	// wxmlImgRewrite,
+	// assetsImgMin,
+	// qcloudCDN
 ));
 
 // 删除任务

@@ -18,7 +18,7 @@ App({
   router: router,
   store: store,
   onLaunch(options) {
-    console.log("options:", options);
+    // console.log("options:", options);
     this.share()
   },
   globalData: {

 {
   "pages": [
-    "pages/index/index",
+    "pages/auction-list/auction-list",
+    "pages/auction-mine/auction-mine",
+    "pages/auction-detail/auction-detail",
+    "pages/auction-bid-detail/auction-bid-detail",
     "pages/user-center/user-center",
+    "pages/index/index",
     "pages/scan-result/scan-result",
     "pages/gift-shop/gift-shop",
     "pages/gift-detail/gift-detail",

@@ -7,200 +7,200 @@
  */
  @import "support";
 
- // Margin
- .u-mt-smaller {
-   margin-top: $marginTopSmaller;
- }
-
- .u-mt-small {
-   margin-top: $marginTopSmall;
- }
-
- .u-mt-medium {
-   margin-top: $marginTopMedium;
- }
-
- .u-mt-large {
-   margin-top: $marginTopLarge;
- }
-
- .u-mt-larger {
-   margin-top: $marginTopLarger;
- }
-
- .u-mb-smaller {
-   margin-bottom: $marginTopSmaller;
- }
-
- .u-mb-small {
-   margin-bottom: $marginTopSmall;
- }
-
- .u-mb-medium {
-   margin-bottom: $marginTopMedium;
- }
-
- .u-mb-large {
-   margin-bottom: $marginTopLarge;
- }
-
- .u-mb-larger {
-   margin-bottom: $marginTopLarger;
- }
-
- // Padding
- .u-pt-smaller {
-   padding-top: $paddingTopSmaller;
- }
-
- .u-pt-small {
-   padding-top: $paddingTopSmall;
- }
-
- .u-pt-medium {
-   padding-top: $paddingTopMedium;
- }
-
- .u-pt-large {
-   padding-top: $paddingTopLarge;
- }
-
- .u-pt-larger {
-   padding-top: $paddingTopLarger;
- }
-
- .u-pb-smaller {
-   padding-bottom: $paddingTopSmaller;
- }
-
- .u-pb-small {
-   padding-bottom: $paddingTopSmall;
- }
-
- .u-pb-medium {
-   padding-bottom: $paddingTopMedium;
- }
-
- .u-pb-large {
-   padding-bottom: $paddingTopLarge;
- }
-
- .u-pb-larger {
-   padding-bottom: $paddingTopLarger;
- }
-
- // 布局方位
- .u-ta-c {
-   text-align: center !important;
- }
-
- .u-ta-l {
-   text-align: left !important;
- }
-
- .u-ta-r {
-   text-align: right !important;
- }
-
- .u-fl-l {
-   float: left;
- }
-
- .u-fl-n {
-   float: none;
- }
-
- .u-fl-r {
-   float: right;
- }
-
- .u-d-b {
-   display: block;
- }
-
- .u-d-i {
-   display: inline !important;
- }
-
- .u-d-ib {
-   display: inline-block !important;
- }
-
- .u-d-n {
-   display: none !important;
- }
-
- .u-d-t {
-   display: table;
-   table-layout: fixed;
- }
-
- .u-d-tc {
-   display: table-cell;
- }
-
- .u-va-b {
-   vertical-align: bottom;
- }
-
- .u-va-m {
-   vertical-align: middle;
- }
-
- .u-va-t {
-   vertical-align: top;
- }
-
- // clearfix
- .u-clearfix {
-   @include clearfix;
- }
-
- // 虚拟格式
- .u-cur-d {
-   cursor: default;
- }
-
- .u-cur-p {
-   cursor: pointer;
- }
-
- // flex
- .u-flex {
-   display: -webkit-box;
-   display: -webkit-flex;
-   display: flex;
- }
-
- .u-flex-item {
-   -webkit-box-flex: 1;
-   -webkit-flex: 1;
-   flex: 1;
- }
-
- // 小程序中模拟ul、li
- .u-ul {
-   padding-left: 30px;
-   text-align: left;
-   display: block;
- }
-
- .u-li {
-   position: relative;
-   font-size: $fontSizeSmall;
-   line-height: $fontSizeSmall + 4px;
-   margin-bottom: $marginTopSmall;
-   &:before {
-     position: absolute;
-     content: " ";
-     top: 14px;
-     left: -20px;
-     width: 8px;
-     height: 8px;
-     border-radius: 8px;
-     background-color: $colorBlack;
-   }
- }
+//  // Margin
+//  .u-mt-smaller {
+//    margin-top: $marginTopSmaller;
+//  }
+
+//  .u-mt-small {
+//    margin-top: $marginTopSmall;
+//  }
+
+//  .u-mt-medium {
+//    margin-top: $marginTopMedium;
+//  }
+
+//  .u-mt-large {
+//    margin-top: $marginTopLarge;
+//  }
+
+//  .u-mt-larger {
+//    margin-top: $marginTopLarger;
+//  }
+
+//  .u-mb-smaller {
+//    margin-bottom: $marginTopSmaller;
+//  }
+
+//  .u-mb-small {
+//    margin-bottom: $marginTopSmall;
+//  }
+
+//  .u-mb-medium {
+//    margin-bottom: $marginTopMedium;
+//  }
+
+//  .u-mb-large {
+//    margin-bottom: $marginTopLarge;
+//  }
+
+//  .u-mb-larger {
+//    margin-bottom: $marginTopLarger;
+//  }
+
+//  // Padding
+//  .u-pt-smaller {
+//    padding-top: $paddingTopSmaller;
+//  }
+
+//  .u-pt-small {
+//    padding-top: $paddingTopSmall;
+//  }
+
+//  .u-pt-medium {
+//    padding-top: $paddingTopMedium;
+//  }
+
+//  .u-pt-large {
+//    padding-top: $paddingTopLarge;
+//  }
+
+//  .u-pt-larger {
+//    padding-top: $paddingTopLarger;
+//  }
+
+//  .u-pb-smaller {
+//    padding-bottom: $paddingTopSmaller;
+//  }
+
+//  .u-pb-small {
+//    padding-bottom: $paddingTopSmall;
+//  }
+
+//  .u-pb-medium {
+//    padding-bottom: $paddingTopMedium;
+//  }
+
+//  .u-pb-large {
+//    padding-bottom: $paddingTopLarge;
+//  }
+
+//  .u-pb-larger {
+//    padding-bottom: $paddingTopLarger;
+//  }
+
+//  // 布局方位
+//  .u-ta-c {
+//    text-align: center !important;
+//  }
+
+//  .u-ta-l {
+//    text-align: left !important;
+//  }
+
+//  .u-ta-r {
+//    text-align: right !important;
+//  }
+
+//  .u-fl-l {
+//    float: left;
+//  }
+
+//  .u-fl-n {
+//    float: none;
+//  }
+
+//  .u-fl-r {
+//    float: right;
+//  }
+
+//  .u-d-b {
+//    display: block;
+//  }
+
+//  .u-d-i {
+//    display: inline !important;
+//  }
+
+//  .u-d-ib {
+//    display: inline-block !important;
+//  }
+
+//  .u-d-n {
+//    display: none !important;
+//  }
+
+//  .u-d-t {
+//    display: table;
+//    table-layout: fixed;
+//  }
+
+//  .u-d-tc {
+//    display: table-cell;
+//  }
+
+//  .u-va-b {
+//    vertical-align: bottom;
+//  }
+
+//  .u-va-m {
+//    vertical-align: middle;
+//  }
+
+//  .u-va-t {
+//    vertical-align: top;
+//  }
+
+//  // clearfix
+//  .u-clearfix {
+//    @include clearfix;
+//  }
+
+//  // 虚拟格式
+//  .u-cur-d {
+//    cursor: default;
+//  }
+
+//  .u-cur-p {
+//    cursor: pointer;
+//  }
+
+//  // flex
+//  .u-flex {
+//    display: -webkit-box;
+//    display: -webkit-flex;
+//    display: flex;
+//  }
+
+//  .u-flex-item {
+//    -webkit-box-flex: 1;
+//    -webkit-flex: 1;
+//    flex: 1;
+//  }
+
+//  // 小程序中模拟ul、li
+//  .u-ul {
+//    padding-left: 30px;
+//    text-align: left;
+//    display: block;
+//  }
+
+//  .u-li {
+//    position: relative;
+//    font-size: $fontSizeSmall;
+//    line-height: $fontSizeSmall + 4px;
+//    margin-bottom: $marginTopSmall;
+//    &:before {
+//      position: absolute;
+//      content: " ";
+//      top: 14px;
+//      left: -20px;
+//      width: 8px;
+//      height: 8px;
+//      border-radius: 8px;
+//      background-color: $colorBlack;
+//    }
+//  }
 
 
 

@@ -6,21 +6,21 @@
  *
  */
 
-// Margin
-$marginTopSmaller: 20px;
-$marginTopSmall: 30px;
-$marginTopMedium: 40px;
-$marginTopLarge: 60px;
-$marginTopLarger: 80px;
-
-// Padding
-$paddingTopSmaller: 20px;
-$paddingTopSmall: 30px;
-$paddingTopMedium: 40px;
-$paddingTopLarge: 60px;
-$paddingTopLarger: 80px;
-
-// Color
+// // Margin
+// $marginTopSmaller: 20px;
+// $marginTopSmall: 30px;
+// $marginTopMedium: 40px;
+// $marginTopLarge: 60px;
+// $marginTopLarger: 80px;
+
+// // Padding
+// $paddingTopSmaller: 20px;
+// $paddingTopSmall: 30px;
+// $paddingTopMedium: 40px;
+// $paddingTopLarge: 60px;
+// $paddingTopLarger: 80px;
+
+// // Color
 $colorBlue: #20A0FF;
 $colorGreen: #13CE66;
 $colorGray: #475669;
@@ -29,11 +29,11 @@ $colorRed: #FF4949;
 $colorYellow: #F7BA2A;
 
 $color: #787878;
-$colorLink: #1D8CE0;
+// $colorLink: #1D8CE0;
 
-$backGroundColor: #fff;
+// $backGroundColor: #fff;
 
-// Font
+// // Font
 $fontSize: 32px;
 $fontSizeSmall: 28px;
 $fontSizeSmaller: 24px;
@@ -41,7 +41,7 @@ $fontSizeLarge: 36px;
 $fontSizeLarger: 44px;
 
 
-// 主题颜色
+// // 主题颜色
 $colorMain:#3680EB;
 
 $pageBottom:80px;

+import {
+  getBindtapData
+} from '../../utils/util';
+
+let app = getApp();
+Page({
+  data: {},
+  onShareAppMessage() {},
+  showAuth() {
+    this.setData({
+      authorizeVisible: true
+    })
+  },
+  onLoad(options) {},
+  // 隐藏蒙层
+  hideMask() {
+    this.setData({
+      authorizeVisible: false,
+    })
+  },
+  // 子组件事件
+  evtcomp(evt) {
+    let {
+      name,
+      data
+    } = evt.detail;
+    switch (name) {
+
+      // 隐藏弹窗
+      case "_evt_hide_mask":
+        this.hideMask();
+        break;
+
+      default:
+        break;
+    }
+  },
+})

+{
+  "navigationBarTitleText": "拍卖活动列表"
+}

+@import '../../assets/scss/mixins';
+@import '../../assets/scss/utils';
+
+.page {
+    .bgc {}
+
+    .bg {}
+
+    .main {
+        .top-space {
+            height: 0px;
+        }
+
+        .content {
+            position: relative;
+        }
+    }
+}

+<view class="page">
+  <view class="app__bgc bgc"></view>
+  <view class="app__bg bg"></view>
+  <!-- <view class="app__top-shadow"></view> -->
+  <view class="app__content main">
+    <view class="top-space"></view>
+    <view class="content">auction-list</view>
+  </view>
+</view>
+<van-popup show="{{ authorizeVisible }}">
+  <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
+</van-popup>

+import {
+  getBindtapData
+} from '../../utils/util';
+
+let app = getApp();
+Page({
+  data: {},
+  onShareAppMessage() {},
+  showAuth() {
+    this.setData({
+      authorizeVisible: true
+    })
+  },
+  onLoad(options) {},
+  // 隐藏蒙层
+  hideMask() {
+    this.setData({
+      authorizeVisible: false,
+    })
+  },
+  // 子组件事件
+  evtcomp(evt) {
+    let {
+      name,
+      data
+    } = evt.detail;
+    switch (name) {
+
+      // 隐藏弹窗
+      case "_evt_hide_mask":
+        this.hideMask();
+        break;
+
+      default:
+        break;
+    }
+  },
+})

+{
+  "navigationBarTitleText": "拍卖活动列表"
+}

+@import '../../assets/scss/mixins';
+@import '../../assets/scss/utils';
+
+.page {
+    .bgc {}
+
+    .bg {}
+
+    .main {
+        .top-space {
+            height: 0px;
+        }
+
+        .content {
+            position: relative;
+        }
+    }
+}

+<view class="page">
+  <view class="app__bgc bgc"></view>
+  <view class="app__bg bg"></view>
+  <!-- <view class="app__top-shadow"></view> -->
+  <view class="app__content main">
+    <view class="top-space"></view>
+    <view class="content">auction-list</view>
+  </view>
+</view>
+<van-popup show="{{ authorizeVisible }}">
+  <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
+</van-popup>

+import {
+  getBindtapData
+} from '../../utils/util';
+
+let app = getApp();
+Page({
+  data: {},
+  onShareAppMessage() {},
+  showAuth() {
+    this.setData({
+      authorizeVisible: true
+    })
+  },
+  onLoad(options) {},
+  // 隐藏蒙层
+  hideMask() {
+    this.setData({
+      authorizeVisible: false,
+    })
+  },
+  // 子组件事件
+  evtcomp(evt) {
+    let {
+      name,
+      data
+    } = evt.detail;
+    switch (name) {
+
+      // 隐藏弹窗
+      case "_evt_hide_mask":
+        this.hideMask();
+        break;
+
+      default:
+        break;
+    }
+  },
+})

+{
+  "navigationBarTitleText": "拍卖活动列表"
+}

+@import '../../assets/scss/mixins';
+@import '../../assets/scss/utils';
+
+.page {
+    .bgc {}
+
+    .bg {}
+
+    .main {
+        .top-space {
+            height: 0px;
+        }
+
+        .content {
+            position: relative;
+        }
+    }
+}

+<view class="page">
+  <view class="app__bgc bgc"></view>
+  <view class="app__bg bg"></view>
+  <!-- <view class="app__top-shadow"></view> -->
+  <view class="app__content main">
+    <view class="top-space"></view>
+    <view class="content">auction-list21</view>
+  </view>
+</view>
+<van-popup show="{{ authorizeVisible }}">
+  <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
+</van-popup>

+import {
+  getBindtapData
+} from '../../utils/util';
+
+let app = getApp();
+Page({
+  data: {},
+  onShareAppMessage() {},
+  showAuth() {
+    this.setData({
+      authorizeVisible: true
+    })
+  },
+  onLoad(options) {},
+  // 隐藏蒙层
+  hideMask() {
+    this.setData({
+      authorizeVisible: false,
+    })
+  },
+  // 子组件事件
+  evtcomp(evt) {
+    let {
+      name,
+      data
+    } = evt.detail;
+    switch (name) {
+
+      // 隐藏弹窗
+      case "_evt_hide_mask":
+        this.hideMask();
+        break;
+
+      default:
+        break;
+    }
+  },
+})

+{
+  "navigationBarTitleText": "拍卖活动列表"
+}

+@import '../../assets/scss/mixins';
+@import '../../assets/scss/utils';
+
+.page {
+    .bgc {}
+
+    .bg {}
+
+    .main {
+        .top-space {
+            height: 0px;
+        }
+
+        .content {
+            position: relative;
+        }
+    }
+}

+<view class="page">
+  <view class="app__bgc bgc"></view>
+  <view class="app__bg bg"></view>
+  <!-- <view class="app__top-shadow"></view> -->
+  <view class="app__content main">
+    <view class="top-space"></view>
+    <view class="content">auction-list</view>
+  </view>
+</view>
+<van-popup show="{{ authorizeVisible }}">
+  <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
+</van-popup>

+import {
+  getBindtapData
+} from '../../utils/util';
+
 let app = getApp();
 Page({
-	data: {},
-	onLoad(options) {}
+  data: {},
+  onShareAppMessage() {},
+  showAuth() {
+    this.setData({
+      authorizeVisible: true
+    })
+  },
+  onLoad(options) {},
+  // 隐藏蒙层
+  hideMask() {
+    this.setData({
+      authorizeVisible: false,
+    })
+  },
+  // 子组件事件
+  evtcomp(evt) {
+    let {
+      name,
+      data
+    } = evt.detail;
+    switch (name) {
+
+      // 隐藏弹窗
+      case "_evt_hide_mask":
+        this.hideMask();
+        break;
+
+      default:
+        break;
+    }
+  },
 })

+<view class="page">
+  <view class="app__bgc bgc"></view>
+  <view class="app__bg bg"></view>
+  <!-- <view class="app__top-shadow"></view> -->
+  <view class="app__content main">
+    <view class="top-space"></view>
+    <view class="content"></view>
+  </view>
+</view>
+<van-popup show="{{ authorizeVisible }}">
+  <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
+</van-popup>

@@ -6,7 +6,9 @@ $contentWidth: 690px;
 .page {
   padding-bottom: $pageBottom;
 
-  .bgc {}
+  .bgc {
+    background-color: #131413;
+  }
 
   .bg {}
 

@@ -19,6 +19,13 @@ const routerPath = {
   signInRecord: '/pages/sign-in-record/sign-in-record', // 签到记录
   rank: '/pages/rank/rank', // 排行榜
   rankGift: '/pages/rank-gift/rank-gift', // 排行榜奖励
+
+  // 拍卖
+  auctionList: '/pages/auction-list/auction-list', // 拍卖活动列表
+  auctionMine: '/pages/auction-mine/auction-mine', // 我的拍卖订单
+  auctionDetail: '/pages/auction-detail/auction-detail', // 拍卖活动详情
+  auctionBidDetail: '/pages/auction-bid-detail/auction-bid-detail', // 拍卖出价详情
+
   webview: '/pages/webview/webview',
   example: '/pages/example/example',
   more: '/pages/more/more',