增加静态资源文件，修改秒杀页面样式问题

assets/css/base.css

@@ -1,2 +1,2 @@
-@charset "UTF-8";.font-color-red{color:#73CBB6 !important}.bg-color-red{background-color:#73CBB6 !important}.icon-color{color:#73CBB6}.cart-color{color:#73CBB6 !important;border:1px solid #73CBB6 !important}.padding20{padding:20rpx}.pad20{padding:0 20rpx}.padding30{padding:30rpx}.pad30{padding:0 30rpx}.acea-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.acea-row.row-middle{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.acea-row.row-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start}.acea-row.row-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.acea-row.row-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-right{-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.acea-row.row-left{-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start}.acea-row.row-between{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-around{-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column-around{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.acea-row.row-column-between{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-center-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-between-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.slider-banner{position:relative;width:100%;overflow:hidden}.slider-banner .swiper-container{height:100%}.slider-banner image{display:block;width:100%;height:100%}.start{width:122rpx;height:30rpx;background-image:url("https://h5.dayouqiantu.cn/static/images/start.png");background-repeat:no-repeat;-webkit-background-size:122rpx auto;background-size:122rpx auto}.start.star5{background-position:0 3rpx}.start.star4{background-position:0 -30rpx}.start.star3{background-position:0 -70rpx}.start.star2{background-position:0 -105rpx}.start.star1{background-position:0 -140rpx}.start.star0{background-position:0 -175rpx}.checkbox-wrapper{position:relative}.checkbox-wrapper input{display:none}.checkbox-wrapper .icon{position:absolute;left:0;top:50%;display:inline-block;width:18px;height:18px;border:1px solid #cccccc;-webkit-border-radius:50%;border-radius:50%;-webkit-transform:translate(0, -50%);-ms-transform:translate(0, -50%);transform:translate(0, -50%)}.checkbox-wrapper input:checked+.icon{background-color:#e93323;border-color:#e93323;background-image:url("https://h5.dayouqiantu.cn/static/images/enter.png");-webkit-background-size:21rpx 15rpx;background-size:21rpx 15rpx;background-repeat:no-repeat;background-position:center center}.Loads{height:80rpx;font-size:25rpx;color:#000}.Loads .iconfont{font-size:30rpx;margin-right:10rpx;height:32rpx;line-height:32rpx}@-webkit-keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.loadingpic{-webkit-animation:load 3s linear 1s infinite;animation:load 3s linear 1s infinite}.loading{-webkit-animation:load linear 1s infinite;animation:load linear 1s infinite}
+@charset "UTF-8";.font-color-red{color:#00c17b !important}.bg-color-red{background-color:#00c17b !important}.icon-color{color:#00c17b}.cart-color{color:#00c17b !important;border:1px solid #00c17b !important}.padding20{padding:20rpx}.pad20{padding:0 20rpx}.padding30{padding:30rpx}.pad30{padding:0 30rpx}.acea-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.acea-row.row-middle{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.acea-row.row-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start}.acea-row.row-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.acea-row.row-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-right{-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.acea-row.row-left{-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start}.acea-row.row-between{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-around{-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column-around{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.acea-row.row-column-between{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-center-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-between-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.slider-banner{position:relative;width:100%;overflow:hidden}.slider-banner .swiper-container{height:100%}.slider-banner image{display:block;width:100%;height:100%}.start{width:122rpx;height:30rpx;background-image:url("https://h5.dayouqiantu.cn/static/images/start.png");background-repeat:no-repeat;-webkit-background-size:122rpx auto;background-size:122rpx auto}.start.star5{background-position:0 3rpx}.start.star4{background-position:0 -30rpx}.start.star3{background-position:0 -70rpx}.start.star2{background-position:0 -105rpx}.start.star1{background-position:0 -140rpx}.start.star0{background-position:0 -175rpx}.checkbox-wrapper{position:relative}.checkbox-wrapper input{display:none}.checkbox-wrapper .icon{position:absolute;left:0;top:50%;display:inline-block;width:18px;height:18px;border:1px solid #cccccc;-webkit-border-radius:50%;border-radius:50%;-webkit-transform:translate(0, -50%);-ms-transform:translate(0, -50%);transform:translate(0, -50%)}.checkbox-wrapper input:checked+.icon{background-color:#e93323;border-color:#e93323;background-image:url("https://h5.dayouqiantu.cn/static/images/enter.png");-webkit-background-size:21rpx 15rpx;background-size:21rpx 15rpx;background-repeat:no-repeat;background-position:center center}.Loads{height:80rpx;font-size:25rpx;color:#000}.Loads .iconfont{font-size:30rpx;margin-right:10rpx;height:32rpx;line-height:32rpx}@-webkit-keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.loadingpic{-webkit-animation:load 3s linear 1s infinite;animation:load 3s linear 1s infinite}.loading{-webkit-animation:load linear 1s infinite;animation:load linear 1s infinite}
 /*# sourceMappingURL=./base.css.map */

assets/css/base.less

@@ -3,17 +3,17 @@
     *相关初始化
 */
 .font-color-red {
-  color: #73CBB6 !important;
+  color: #00c17b !important;
 }
 .bg-color-red {
-  background-color: #73CBB6 !important;
+  background-color: #00c17b !important;
 }
 .icon-color {
-  color: #73CBB6;
+  color: #00c17b;
 }
 .cart-color {
-  color: #73CBB6 !important;
+  color: #00c17b !important;
-  border: 1px solid #73CBB6 !important;
+  border: 1px solid #00c17b !important;
 }
 /* padding20 */
 .padding20 {

assets/css/style.less

@@ -51,7 +51,7 @@
 }
 
 #footer .item.on {
-  color: #73CBB6;
+  color: #00c17b;
 }
 
 #footer .item .iconfont {
@@ -186,13 +186,13 @@
 
 .promotionGood .item .text .sp-money .moneyCon {
   padding: 0 0.18*100rpx;
-  background-color: #73CBB6;
+  background-color: #00c17b;
   height: 0.46*100rpx;
   line-height: 0.46*100rpx;
-  background-image: linear-gradient(to right, #73CBB6 0%, #73CBB6 100%);
+  background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%);
   font-size: 0.2*100rpx;
   color: #fff;
-  background-image: -moz-linear-gradient(to right, #73CBB6 0%, #73CBB6 100%);
+  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
   border-radius: 0.24*100rpx 0.03*100rpx 0.24*100rpx 0.03*100rpx;
 }
 
@@ -610,8 +610,8 @@
 
 .product-window .productWinList .item .listn .itemn.on {
   color: #fff;
-  background-color: #73CBB6;
+  background-color: #00c17b;
-  border-color: #73CBB6;
+  border-color: #00c17b;
 }
 
 .product-window .cart {
@@ -1061,7 +1061,7 @@
   width: 0.18*100rpx;
   height: 0.18*100rpx;
   border-radius: 50%;
-  background-color: #73CBB6;
+  background-color: #00c17b;
   left: 25.5%;
   bottom: 0;
   margin-bottom: -0.09*100rpx;
@@ -1073,7 +1073,7 @@
   width: 0.18*100rpx;
   height: 0.18*100rpx;
   border-radius: 50%;
-  background-color: #73CBB6;
+  background-color: #00c17b;
   left: 25.5%;
   top: 0;
   margin-top: -0.09*100rpx;
@@ -1281,13 +1281,13 @@
 
 .index .news .new-banner .text .label {
   font-size: 0.2*100rpx;
-  color: #73CBB6;
+  color: #00c17b;
   width: 0.68*100rpx;
   height: 0.34*100rpx;
   border-radius: 0.2*100rpx;
   text-align: center;
   line-height: 0.34*100rpx;
-  border: 0.02*100rpx solid #73CBB6;
+  border: 0.02*100rpx solid #00c17b;
 }
 
 .index .news .new-banner .text .newsTitle {
@@ -1665,10 +1665,10 @@
 .index .wrapper .newProducts {}
 
 .index .wrapper.hot .newProducts .newProductsItem {
-  width: 2.4*100rpx;
+  width: 2.4*100rpx;
   min-width: 2.4*100rpx;
   margin-right: 0.2*100rpx;
-flex: 0 2.4*100rpx;
+flex: 0 2.4*100rpx;
 }
 
 .index .wrapper .newProducts .newProductsScroll {
@@ -1683,11 +1683,11 @@ flex: 0 2.4*100rpx;
 
 .index .wrapper .newProducts .newProductsItem {
   border: 1rpx solid #eee;
-  width: 2.4*100rpx;
+  width: 2.4*100rpx;
   min-width: 2.4*100rpx;
   border-radius: 0.12*100rpx;
   overflow: hidden;
-  margin-right: .2*100rpx;
+  margin-right: .2*100rpx;
   flex: 0  2.4*100rpx;
 }
 
@@ -2185,7 +2185,7 @@ flex: 0 2.4*100rpx;
   height: 1*100rpx;
   width: 100%;
   border-radius: 0 0 50% 50%;
-  background-color: #73CBB6;
+  background-color: #00c17b;
 }
 
 .user .header .picTxt .pictrue {
@@ -2612,13 +2612,13 @@ flex: 0 2.4*100rpx;
 .product-con .footer .bnt .joinCart {
   border-radius: 0.5*100rpx 0 0 0.5*100rpx;
   background-image: linear-gradient(to right, #fea10f 0%, #fea10f 100%);
-  background-image: -moz-linear-gradient(to right, #73CBB6 0%, #73CBB6 100%);
+  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
 }
 
 .product-con .footer .bnt .buy {
   border-radius: 0 0.5*100rpx 0.5*100rpx 0;
-  background-image: linear-gradient(to right, #73CBB6 0%, #73CBB6 100%);
+  background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%);
-  background-image: -moz-linear-gradient(to right, #73CBB6 0%, #73CBB6 100%);
+  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
 }
 
 /*订单提交*/
@@ -2764,7 +2764,7 @@ flex: 0 2.4*100rpx;
 }
 
 .order-submission .wrapper .item .list .payItem .name .iconfont.icon-yinhangqia {
-  background-color: #73CBB6;
+  background-color: #00c17b;
 }
 
 .order-submission .wrapper .item .list .payItem .tip {
@@ -2906,7 +2906,7 @@ flex: 0 2.4*100rpx;
 }
 
 .address-management .footer .addressBnt.wxbnt {
-  background-color: #73CBB6;
+  background-color: #00c17b;
 }
 
 /*添加地址*/
@@ -2980,8 +2980,8 @@ flex: 0 2.4*100rpx;
   line-height: 0.86*100rpx;
   margin: 0 auto;
   font-size: 0.32*100rpx;
-  color: #73CBB6;
+  color: #00c17b;
-  border: 1px solid #73CBB6;
+  border: 1px solid #00c17b;
 }
 
 /*我的订单*/
@@ -3034,7 +3034,7 @@ flex: 0 2.4*100rpx;
 
 .my-order .nav .item.on {
   font-weight: bold;
-  border-bottom: 0.05*100rpx solid #73CBB6;
+  border-bottom: 0.05*100rpx solid #00c17b;
 }
 
 .my-order .nav .item .num {
@@ -3196,7 +3196,7 @@ flex: 0 2.4*100rpx;
 
 .order-details .nav .navCon .on {
   font-weight: bold;
-  color: #73CBB6;
+  color: #00c17b;
 }
 
 .order-details .nav .progress {
@@ -3423,7 +3423,7 @@ flex: 0 2.4*100rpx;
 }
 
 .logistics .logisticsCon .item .circular.on {
-  background-color: #73CBB6;
+  background-color: #00c17b;
 }
 
 .logistics .logisticsCon .item .text {
@@ -3467,7 +3467,7 @@ flex: 0 2.4*100rpx;
   color: #fff;
   text-align: center;
   line-height: 1.3*100rpx;
-  text-shadow: 0 4px 0 #73CBB6;
+  text-shadow: 0 4px 0 #00c17b;
   border: 0.06*100rpx solid #f5f5f5;
   margin: -0.76*100rpx auto 0 auto;
   background-color: #999;
@@ -3861,7 +3861,7 @@ flex: 0 2.4*100rpx;
 }
 
 .member-center .wrapper .title .iconfont {
-  color: #73CBB6;
+  color: #00c17b;
   font-weight: normal;
   font-size: 0.4*100rpx;
   margin-right: 0.12*100rpx;
@@ -3874,7 +3874,7 @@ flex: 0 2.4*100rpx;
 }
 
 .member-center .wrapper .title .num .current {
-  color: #73CBB6;
+  color: #00c17b;
 }
 
 .member-center .wrapper .list .item {
@@ -3893,7 +3893,7 @@ flex: 0 2.4*100rpx;
 }
 
 .member-center .wrapper .list .item .top .name {
-  border-left: 0.06*100rpx solid #73CBB6;
+  border-left: 0.06*100rpx solid #00c17b;
   padding-left: 0.2*100rpx;
   font-size: 0.28*100rpx;
   color: #282828;
@@ -3920,7 +3920,7 @@ flex: 0 2.4*100rpx;
   width: 0;
   height: 100%;
   transition: width 0.6s ease;
-  background-color: #73CBB6;
+  background-color: #00c17b;
   border-radius: 0.2*100rpx;
 }
 
@@ -3932,7 +3932,7 @@ flex: 0 2.4*100rpx;
 }
 
 .member-center .wrapper .list .item .experience .num {
-  color: #73CBB6;
+  color: #00c17b;
 }
 
 .member-center .growthValue {
@@ -4052,7 +4052,7 @@ flex: 0 2.4*100rpx;
 /*.integral-details .wrapper .nav .item{text-align:center;width:50%;}*/
 .integral-details .wrapper .nav .item.on {
   background-color: #fff;
-  color: #73CBB6;
+  color: #00c17b;
   font-weight: bold;
   border-radius: 0.2*100rpx .2*100rpx 0 0;
 }
@@ -4193,7 +4193,7 @@ flex: 0 2.4*100rpx;
 
 .bargain-list .list {
   background-color: #fff;
-  border: 0.06*100rpx solid #73CBB6;
+  border: 0.06*100rpx solid #00c17b;
   border-radius: 0.3*100rpx;
   margin: .3*100rpx 0.3*100rpx 0.66*100rpx 0.3*100rpx;
   padding: 0 0.24*100rpx;
@@ -4346,7 +4346,7 @@ flex: 0 2.4*100rpx;
 .bargain .bargainGang,
 .bargain .goodsDetails {
   width: 6.6*100rpx;
-  border: 0.06*100rpx solid #73CBB6;
+  border: 0.06*100rpx solid #00c17b;
   background-color: #fff;
   border-radius: 0.2*100rpx;
   margin: -1.62*100rpx auto 0 auto;
@@ -4441,8 +4441,8 @@ flex: 0 2.4*100rpx;
 }
 
 .bargain .wrapper .bargainBnt.on {
-  border: 0.02*100rpx solid #73CBB6;
+  border: 0.02*100rpx solid #00c17b;
-  color: #73CBB6;
+  color: #00c17b;
   background-image: linear-gradient(to right, #fff 0%, #fff 100%);
   background-image: -moz-linear-gradient(to right, #fff 0%, #fff 100%);
   width: 5.96*100rpx;
@@ -4524,7 +4524,7 @@ flex: 0 2.4*100rpx;
   width: 100%;
   height: 100%;
   border-radius: 50%;
-  border: 0.02px solid #73CBB6;
+  border: 0.02px solid #00c17b;
 }
 
 .bargain .bargainGang .list .item .pictxt .text {
@@ -4793,7 +4793,7 @@ flex: 0 2.4*100rpx;
   width: 0.54*100rpx;
   background-color: #c6f3e8;
   text-align: center;
-  color: #73CBB6;
+  color: #00c17b;
   height: 100%;
   line-height: 0.38*100rpx;
 }
@@ -6268,8 +6268,8 @@ flex: 0 2.4*100rpx;
 }
 
 .promoter-list .nav .item.on {
-  color: #73CBB6;
+  color: #00c17b;
-  border-bottom: 0.05*100rpx solid #73CBB6;
+  border-bottom: 0.05*100rpx solid #00c17b;
 }
 
 .promoter-list .search {
@@ -6480,10 +6480,10 @@ flex: 0 2.4*100rpx;
 
 .my-promotion .list .item .iconfont {
   font-size: 0.7*100rpx;
-  /* background-image: linear-gradient(to right, #73CBB6 0%, #73CBB6 100%); */
+  /* background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%); */
-  /* background-image: -moz-linear-gradient(to right, #73CBB6 0%, #73CBB6 100%); */
+  /* background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%); */
   margin-bottom: 0.2*100rpx;
-  color: #73cbb6
+  color: #00c17b
 }
 
 /*我的账户*/
@@ -6496,8 +6496,8 @@ flex: 0 2.4*100rpx;
 .my-account .wrapper .header {
   width: 6.9*100rpx;
   height: 3.3*100rpx;
-  background-image: linear-gradient(to right, #73CBB6 0%, #73CBB6 100%);
+  background-image: linear-gradient(to right, #00c17b 0%, #00c17b 100%);
-  background-image: -moz-linear-gradient(to right, #73CBB6 0%, #73CBB6 100%);
+  background-image: -moz-linear-gradient(to right, #00c17b 0%, #00c17b 100%);
   border-radius: 0.16*100rpx;
   margin: 0 auto;
   color: rgba(255, 255, 255, 0.6);
@@ -7205,8 +7205,8 @@ flex: 0 2.4*100rpx;
 
 /*立即注册*/
 .register {
-  background-image: linear-gradient(to bottom, #73CBB6 0%, #73CBB6 100%);
+  background-image: linear-gradient(to bottom, #00c17b 0%, #00c17b 100%);
-  background-image: -moz-linear-gradient(to bottom, #73CBB6 0%, #73CBB6 100%);
+  background-image: -moz-linear-gradient(to bottom, #00c17b 0%, #00c17b 100%);
   width: 100%;
   height: 100vh;
 }
@@ -7418,10 +7418,10 @@ flex: 0 2.4*100rpx;
 
 .productSort .aside .item.on {
   background-color: #fff;
-  border-left: 0.04*100rpx solid #73CBB6;
+  border-left: 0.04*100rpx solid #00c17b;
   width: 100%;
   text-align: center;
-  color: #73CBB6;
+  color: #00c17b;
   font-weight: bold;
 }
 

components/CountDown.vue

@@ -2,13 +2,13 @@
   <view class="time">
     {{ tipText }}
     <text class="styleAll" v-if="isDay === true">{{ day }}</text>
-    <text class="timeTxt">{{ dayText }}</text>
+    <!-- <text class="timeTxt">{{ dayText }}</text> -->
     <text class="styleAll">{{ hour }}</text>
     <text class="timeTxt">{{ hourText }}</text>
     <text class="styleAll">{{ minute }}</text>
     <text class="timeTxt">{{ minuteText }}</text>
     <text class="styleAll">{{ second }}</text>
-    <text class="timeTxt">{{ secondText }}</text>
+    <!-- <text class="timeTxt">{{ secondText }}</text> -->
   </view>
 </template>
 <script>

pages.json

@@ -399,7 +399,7 @@
 	},
 	"tabBar": {
 		"color": "#282828",
-		"selectedColor": "#73CBB6",
+		"selectedColor": "#00c17b",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"height": "50px",
@@ -428,4 +428,4 @@
 			"text": "我的"
 		}]
 	}
-}
+}

pages/activity/GoodsGroup/index.vue

@@ -64,7 +64,7 @@ export default {
     };
   },
   mounted: function() {
-    // document.querySelector('body').setAttribute('style', 'background-color:#73CBB6');
+    // document.querySelector('body').setAttribute('style', 'background-color:#00c17b');
     this.getCombinationList();
   },
   onReachBottom() {

pages/activity/GoodsSeckill/index.vue

@@ -1,201 +1,238 @@
-<template>
+<template>
-	<view class="flash-sale" ref="container">
+	<view class="flash-sale" ref="container">
-		<view class="header" v-if="headerImg"><image :src="headerImg" /></view>
+		<view class="header" v-if="headerImg">
-		<view class="" v-for="(item, index) in timeList" :key="index">
+			<image :src="headerImg" />
-			<view class="timeItem">
+		</view>
-				<view class="time">{{ item.time }}</view>
+		<scroll-view scroll-y="false" scroll-x="true">
-				<view class="state">{{ item.state }}</view>
+			<view class="timeScroll">
-			</view>
+				<view class="" v-for="(item, index) in timeList" :key="index">
-		</view>
+					<view :class="{'timeItem':true,'active':active==index}" @click="changeTime(index)">
-		<view class="" v-for="(item, index) in timeList" :key="index">
+						<view class="time">{{ item.time }}</view>
-			<view v-if="active == index">
+						<view class="state">{{ item.state }}</view>
-				<view class="countDown font-color-red acea-row row-center-wrapper">
+					</view>
-					<view v-if="item.status === 0" class="activity">活动已结束</view>
+				</view>
-					<count-down
+			</view>
-						:is-day="false"
+		</scroll-view>
-						:tip-text="'距结束仅剩 '"
+		<view class="" v-for="(item, index) in timeList" :key="index">
-						:day-text="''"
+			<view v-if="active == index">
-						:hour-text="' : '"
+				<view class="countDown font-color-red acea-row row-center-wrapper">
-						:minute-text="' : '"
+					<view v-if="item.status === 0" class="activity">活动已结束</view>
-						:second-text="''"
+					<count-down :is-day="false" :tip-text="'距结束仅剩 '" :day-text="''" :hour-text="' : '" :minute-text="' : '"
-						:datatime="datatime"
+					 :second-text="''" :datatime="datatime" v-if="item.status === 1"></count-down>
-						v-if="item.status === 1"
+					<view v-if="item.status === 2" class="activity">活动即将开始</view>
-					></count-down>
+				</view>
-					<view v-if="item.status === 2" class="activity">活动即将开始</view>
+				<view class="list">
-				</view>
+					<view class="item acea-row row-between-wrapper" v-for="(itemSeckill, indexSeckill) in seckillList" :key="indexSeckill">
-				<view class="list">
+						<view class="pictrue">
-					<view class="item acea-row row-between-wrapper" v-for="(itemSeckill, indexSeckill) in seckillList" :key="indexSeckill">
+							<image :src="itemSeckill.image" />
-						<view class="pictrue"><image :src="itemSeckill.image" /></view>
+						</view>
-						<view class="text acea-row row-column-around">
+						<view class="text acea-row row-column-around">
-							<view class="line1" v-text="itemSeckill.title"></view>
+							<view class="line1" v-text="itemSeckill.title"></view>
-							<view class="money">
+							<view class="money">
-								限时价
+								限时价
-								<text class="num font-color-red" v-text="'￥' + itemSeckill.price"></text>
+								<text class="num font-color-red" v-text="'￥' + itemSeckill.price"></text>
-							</view>
+							</view>
-							<view class="progress cart-color">
+							<view class="progress cart-color">
-								<view class="bg-red" :style="{ width: loading ? itemSeckill.percent + '%' : '' }"></view>
+								<view class="bg-red" :style="{ width: loading ? itemSeckill.percent + '%' : '' }"></view>
-								<view class="piece font-color-red" v-text="'仅剩' + itemSeckill.stock + '件'"></view>
+								<view class="piece font-color-red" v-text="'仅剩' + itemSeckill.stock + '件'"></view>
-							</view>
+							</view>
-						</view>
+						</view>
-						<view class="grab bg-color-red" v-if="item.status === 1 && itemSeckill.stock > 0" @click="goDetail(itemSeckill.id)">马上抢</view>
+						<view class="grab bg-color-red" v-if="item.status === 1 && itemSeckill.stock > 0" @click="goDetail(itemSeckill.id)">马上抢</view>
-						<view class="grab" v-if="item.status === 1 && itemSeckill.stock <= 0">已售磬</view>
+						<view class="grab" v-if="item.status === 1 && itemSeckill.stock <= 0">已售磬</view>
-						<view class="grab bg-color-red" v-if="item.status === 2">即将开始</view>
+						<view class="grab bg-color-red" v-if="item.status === 2">即将开始</view>
-						<view class="grab bg-color-red" v-if="item.status === 0">已结束</view>
+						<view class="grab bg-color-red" v-if="item.status === 0">已结束</view>
-					</view>
+					</view>
-				</view>
+				</view>
-				<view class="noCommodity" style="background-color: #fff;" v-if="seckillList.length === 0 && page > 1">
+				<view class="noCommodity" style="background-color: #fff;" v-if="seckillList.length === 0 && page > 1">
-					<view class="noPictrue"><image :src="$VUE_APP_RESOURCES_URL + '/images/noGood.png'" class="image" /></view>
+					<view class="noPictrue">
-				</view>
+						<image :src="$VUE_APP_RESOURCES_URL + '/images/noGood.png'" class="image" />
-			</view>
+					</view>
-		</view>
+				</view>
-		<!-- 
+			</view>
-		<vant-tabs :active="active" @change="setTime" :sticky="sticky" animated line-height="2" :ellipsis="false">
+		</view>
-			<vant-tab :ellipsis="false" :title="[title[index]]">
+		<!-- 
-				
+		<vant-tabs :active="active" @change="setTime" :sticky="sticky" animated line-height="2" :ellipsis="false">
-			</vant-tab>
+			<vant-tab :ellipsis="false" :title="[title[index]]">
-		</vant-tabs> -->
+				
-	</view>
+			</vant-tab>
-</template>
+		</vant-tabs> -->
-<script>
+	</view>
-import { getSeckillConfig, getSeckillList } from '@/api/activity';
+</template>
-import CountDown from '@/components/CountDown';
+<script>
-// import { Tab, Tabs } from "vant-weapp";
+	import {
-import Loading from '@/components/Loading';
+		getSeckillConfig,
-
+		getSeckillList
-export default {
+	} from '@/api/activity';
-	name: 'GoodsSeckill',
+	import CountDown from '@/components/CountDown';
-	components: {
+	// import { Tab, Tabs } from "vant-weapp";
-		CountDown
+	import Loading from '@/components/Loading';
-	},
+
-	props: {},
+	export default {
-	data: function() {
+		name: 'GoodsSeckill',
-		return {
+		components: {
-			headerImg: '',
+			CountDown
-			timeList: [],
+		},
-			sticky: false,
+		props: {},
-			loading: false,
+		data: function() {
-			datatime: 0,
+			return {
-			active: 0,
+				headerImg: '',
-			seckillList: [],
+				timeList: [],
-			status: false, //砍价列表是否获取完成 false 未完成 true 完成
+				sticky: false,
-			loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
+				loading: false,
-			page: 1, //页码
+				datatime: 0,
-			limit: 5, //数量
+				active: 0,
-			title: []
+				seckillList: [],
-		};
+				status: false, //砍价列表是否获取完成 false 未完成 true 完成
-	},
+				loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
-	mounted: function() {
+				page: 1, //页码
-		this.mountedStart();
+				limit: 5, //数量
-	},
+				title: [],
-	onReachBottom() {
+			};
-		!this.loadingList && this.getSeckillList();
+		},
-	},
+		mounted: function() {
-	methods: {
+			this.mountedStart();
-		mountedStart: function() {
+		},
-			var that = this;
+		onReachBottom() {
-			uni.showLoading();
+			!this.loadingList && this.getSeckillList();
-			getSeckillConfig().then(res => {
+		},
-				that.$set(that, 'headerImg', res.data.lovely);
+		methods: {
-				that.$set(that, 'timeList', res.data.seckillTime);
+			changeTime: function(index) {
-				that.$set(that, 'active', res.data.seckillTimeIndex);
+				this.active = index
-
+			},
-				let title = [];
+			mountedStart: function() {
-				title = res.data.seckillTime.map((item, index) => {
+				var that = this;
-					return {
+				uni.showLoading();
-						name: 'div',
+				getSeckillConfig().then(res => {
-						attrs: {
+					that.$set(that, 'headerImg', res.data.lovely);
-							class: 'timeItem'
+					that.$set(that, 'timeList', res.data.seckillTime);
-						},
+					that.$set(that, 'active', res.data.seckillTimeIndex);
-						children: [
+
-							{
+					let title = [];
-								name: 'div',
+					title = res.data.seckillTime.map((item, index) => {
-								attrs: {
+						return {
-									class: 'time'
+							name: 'div',
-								},
+							attrs: {
-								children: [
+								class: 'timeItem'
-									{
+							},
-										type: 'text',
+							children: [{
-										text: item.time
+									name: 'div',
-									}
+									attrs: {
-								]
+										class: 'time'
-							},
+									},
-							{
+									children: [{
-								name: 'div',
+										type: 'text',
-								attrs: {
+										text: item.time
-									class: 'state'
+									}]
-								},
+								},
-								children: [
+								{
-									{
+									name: 'div',
-										type: 'text',
+									attrs: {
-										text: item.state
+										class: 'state'
-									}
+									},
-								]
+									children: [{
-							}
+										type: 'text',
-						]
+										text: item.state
-					};
+									}]
-				});
+								}
-				that.$set(that, 'title', title);
+							]
-				that.datatime = that.timeList[that.active].stop;
+						};
-				that.getSeckillList();
+					});
-				that.$nextTick(function() {
+					that.$set(that, 'title', title);
-					that.sticky = true;
+					that.datatime = that.timeList[that.active].stop;
-					uni.hideLoading();
+					that.getSeckillList();
-				});
+					that.$nextTick(function() {
-			});
+						that.sticky = true;
-		},
+						uni.hideLoading();
-		setTime: function(event) {
+					});
-			var that = this;
+				});
-			that.active = event.mp.detail.index;
+			},
-			that.datatime = that.timeList[that.active].stop;
+			setTime: function(event) {
-			that.getSeckillList();
+				var that = this;
-		},
+				that.active = event.mp.detail.index;
-		getSeckillList: function() {
+				that.datatime = that.timeList[that.active].stop;
-			var that = this;
+				that.getSeckillList();
-			if (that.loadingList) return;
+			},
-			if (that.status) return;
+			getSeckillList: function() {
-			var time = that.timeList[that.active].id;
+				var that = this;
-			getSeckillList(time, { page: that.page, limit: that.limit }).then(res => {
+				if (that.loadingList) return;
-				that.status = res.data.length < that.limit;
+				if (that.status) return;
-				that.seckillList.push.apply(that.seckillList, res.data);
+				var time = that.timeList[that.active].id;
-				that.page++;
+				getSeckillList(time, {
-				uni.hideLoading();
+					page: that.page,
-			});
+					limit: that.limit
-		},
+				}).then(res => {
-		goDetail: function(id) {
+					that.status = res.data.length < that.limit;
-			var that = this;
+					that.seckillList.push.apply(that.seckillList, res.data);
-			var time = that.timeList[that.active].stop;
+					that.page++;
-			this.$yrouter.push({
+					uni.hideLoading();
-				path: '/pages/activity/SeckillDetails/index',
+				});
-				query: { id, time }
+			},
-			});
+			goDetail: function(id) {
-		}
+				var that = this;
-	}
+				var time = that.timeList[that.active].stop;
-};
+				this.$yrouter.push({
-</script>
+					path: '/pages/activity/SeckillDetails/index',
-<style scoped lang="less">
+					query: {
-.timeItem {
+						id,
-	font-size: 0.22 * 100rpx;
+						time
-	color: #282828;
+					}
-	width: 100%;
+				});
-	text-align: center;
+			}
-	padding: 0.11 * 100rpx 0;
+		}
-	height: 0.96 * 100rpx;
+	};
-	background-color: #efc58f;
+</script>
-}
+<style scoped lang="less">
-.timeItem .time {
+	.timeScroll {
-	font-size: 0.32 * 100rpx;
+		display: flex;
-	font-weight: bold;
+		align-items: center;
-	height: 0.37 * 100rpx;
+		flex-direction: row;
-	line-height: 0.37 * 100rpx;
+	}
-}
+
-.timeItem .state {
+	.timeItem {
-	height: 0.37 * 100rpx;
+		font-size: 0.22 * 100rpx;
-	line-height: 0.37 * 100rpx;
+		color: #282828;
-}
+		width: 150rpx;
-.activity {
+		text-align: center;
-	color: #333;
+		padding: 0.11 * 100rpx 0;
-}
+		background-color: none;
-.flash-sale .list .item .grab {
+
-	background-color: #999;
+		&.active {
-}
+
+			.time {
+				color: #00c17b
+			}
+
+			.state {
+				background-color: #00c17b;
+				color: #fff;
+				opacity: 1;
+				border-radius: 30rpx;
+				padding: 0 .2*100rpx;
+				font-weight: 800;
+				height: .3*100rpx;
+				line-height: .3*100rpx;
+			}
+
+		}
+	}
+
+	.timeItem .time {
+		font-size: 0.32 * 100rpx;
+		font-weight: bold;
+		height: 0.37 * 100rpx;
+		line-height: 0.37 * 100rpx;
+	}
+
+	.timeItem .state {
+		height: 0.37 * 100rpx;
+		line-height: 0.37 * 100rpx;
+	}
+
+	.activity {
+		color: #333;
+	}
+
+	.flash-sale .list .item .grab {
+		background-color: #999;
+	}
 </style>

pages/shop/GoodsCon/index.vue

@@ -790,7 +790,7 @@
 	}
 
 	.footer .icon-shoucang1 {
-		color: #73cbb6;
+		color: #00c17b;
 	}
 
 	.product-con .product-intro .conter view {
@@ -844,4 +844,4 @@
 		height: 100%;
 		overflow: hidden;
 	}
-</style>
+</style>

pages/user/User/index.vue

@@ -115,17 +115,17 @@
 				<!--</!--<view>-->
 				<!-- </view>
         </view>-->
-			</view>
+			</view>
-			<view class="by">
+			<view class="by">
-				<text class="by-text">By@意象</text>
+				<text class="by-text">By@意象</text>
-			</view>
+			</view>
-			<view class="by">
+			<view class="by">
-				<view>
+				<view>
-				<text class="by-text">Copyright © 2020</text>
+				<text class="by-text">Copyright © 2020</text>
-				</view>
+				</view>
-				<view>
+				<view>
-				<text class="by-text">漯河市大有前途网络科技有限公司</text>
+				<text class="by-text">漯河市大有前途网络科技有限公司</text>
-				</view>
+				</view>
 			</view>
 			<view class="footer-line-height"></view>
 			<!-- <SwitchWindow
@@ -303,7 +303,7 @@
 				this.MenuUser();
 			}
 		},
-		onShow() {
+		onShow() {
 			console.log(this.$store.getters.token)
 			console.log(this.userInfo);
 			if (this.$store.getters.token) {
@@ -323,14 +323,14 @@
 	.order-status-num {
 		min-width: 0.33*100rpx;
 		background-color: #fff;
-		color: #73cbb6;
+		color: #00c17b;
 		border-radius: 15px;
 		position: absolute;
 		right: -0.14*100rpx;
 		top: -0.15*100rpx;
 		font-size: 0.2*100rpx;
 		padding: 0 0.08*100rpx;
-		border: 1px solid #73cbb6;
+		border: 1px solid #00c17b;
 	}
 
 	.pictrue {
@@ -351,14 +351,14 @@
 		line-height: 1.5;
 		border: 1px solid #e8695e;
 		color: #ffffff;
-	}
-	
-	.by{
-		text-align:center;
-		margin-top: 30rpx
-	}
-	.by-text{
-		text-align:center;
-		font-size: 30rpx;
 	}
-</style>
+	
+	.by{
+		text-align:center;
+		margin-top: 30rpx
+	}
+	.by-text{
+		text-align:center;
+		font-size: 30rpx;
+	}
+</style>