cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaoxs
2020-04-07 17:31:38 +08:00
parent 4b6636ba6f
commit c6f9a6d1fe
139 changed files with 324 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/base.css
View File

@ -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 */

10
assets/css/base.less
View File

@ -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;
border: 1px solid #73CBB6 !important;
color: #00c17b !important;
border: 1px solid #00c17b !important;
}
/* padding20 */
.padding20 {

2
assets/css/style.css
View File

File diff suppressed because one or more lines are too long

90
assets/css/style.less
View File

@ -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;
border-color: #73CBB6;
background-color: #00c17b;
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 {
@ -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: -moz-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, #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;
border: 1px solid #73CBB6;
color: #00c17b;
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;
color: #73CBB6;
border: 0.02*100rpx solid #00c17b;
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;
border-bottom: 0.05*100rpx solid #73CBB6;
color: #00c17b;
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: -moz-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, #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: -moz-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, #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: -moz-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, #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;
}

4
components/CountDown.vue
View File

@ -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>

2
pages.json
View File

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

2
pages/activity/GoodsGroup/index.vue
View File

@ -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() {

129
pages/activity/GoodsSeckill/index.vue
View File

@ -1,31 +1,31 @@
<template>
<view class="flash-sale" ref="container">
<view class="header" v-if="headerImg"><image :src="headerImg" /></view>
<view class="header" v-if="headerImg">
<image :src="headerImg" />
</view>
<scroll-view scroll-y="false" scroll-x="true">
<view class="timeScroll">
<view class="" v-for="(item, index) in timeList" :key="index">
<view class="timeItem">
<view :class="{'timeItem':true,'active':active==index}" @click="changeTime(index)">
<view class="time">{{ item.time }}</view>
<view class="state">{{ item.state }}</view>
</view>
</view>
</view>
</scroll-view>
<view class="" v-for="(item, index) in timeList" :key="index">
<view v-if="active == index">
<view class="countDown font-color-red acea-row row-center-wrapper">
<view v-if="item.status === 0" class="activity">活动已结束</view>
<count-down
:is-day="false"
:tip-text="'距结束仅剩 '"
:day-text="''"
:hour-text="' : '"
:minute-text="' : '"
:second-text="''"
:datatime="datatime"
v-if="item.status === 1"
></count-down>
<count-down :is-day="false" :tip-text="'距结束仅剩 '" :day-text="''" :hour-text="' : '" :minute-text="' : '"
:second-text="''" :datatime="datatime" v-if="item.status === 1"></count-down>
<view v-if="item.status === 2" class="activity">活动即将开始</view>
</view>
<view class="list">
<view class="item acea-row row-between-wrapper" v-for="(itemSeckill, indexSeckill) in seckillList" :key="indexSeckill">
<view class="pictrue"><image :src="itemSeckill.image" /></view>
<view class="pictrue">
<image :src="itemSeckill.image" />
</view>
<view class="text acea-row row-column-around">
<view class="line1" v-text="itemSeckill.title"></view>
<view class="money">
@ -44,7 +44,9 @@
</view>
</view>
<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">
<image :src="$VUE_APP_RESOURCES_URL + '/images/noGood.png'" class="image" />
</view>
</view>
</view>
</view>
@ -57,12 +59,15 @@
</view>
</template>
<script>
import { getSeckillConfig, getSeckillList } from '@/api/activity';
import CountDown from '@/components/CountDown';
// import { Tab, Tabs } from "vant-weapp";
import Loading from '@/components/Loading';
import {
getSeckillConfig,
getSeckillList
} from '@/api/activity';
import CountDown from '@/components/CountDown';
// import { Tab, Tabs } from "vant-weapp";
import Loading from '@/components/Loading';
export default {
export default {
name: 'GoodsSeckill',
components: {
CountDown
@ -81,7 +86,7 @@ export default {
loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
page: 1, //页码
limit: 5, //数量
title: []
title: [],
};
},
mounted: function() {
@ -91,6 +96,9 @@ export default {
!this.loadingList && this.getSeckillList();
},
methods: {
changeTime: function(index) {
this.active = index
},
mountedStart: function() {
var that = this;
uni.showLoading();
@ -106,30 +114,25 @@ export default {
attrs: {
class: 'timeItem'
},
children: [
{
children: [{
name: 'div',
attrs: {
class: 'time'
},
children: [
{
children: [{
type: 'text',
text: item.time
}
]
}]
},
{
name: 'div',
attrs: {
class: 'state'
},
children: [
{
children: [{
type: 'text',
text: item.state
}
]
}]
}
]
};
@ -154,7 +157,10 @@ export default {
if (that.loadingList) return;
if (that.status) return;
var time = that.timeList[that.active].id;
getSeckillList(time, { page: that.page, limit: that.limit }).then(res => {
getSeckillList(time, {
page: that.page,
limit: that.limit
}).then(res => {
that.status = res.data.length < that.limit;
that.seckillList.push.apply(that.seckillList, res.data);
that.page++;
@ -166,36 +172,67 @@ export default {
var time = that.timeList[that.active].stop;
this.$yrouter.push({
path: '/pages/activity/SeckillDetails/index',
query: { id, time }
query: {
id,
time
}
});
}
}
};
};
</script>
<style scoped lang="less">
.timeItem {
.timeScroll {
display: flex;
align-items: center;
flex-direction: row;
}
.timeItem {
font-size: 0.22 * 100rpx;
color: #282828;
width: 100%;
width: 150rpx;
text-align: center;
padding: 0.11 * 100rpx 0;
height: 0.96 * 100rpx;
background-color: #efc58f;
}
.timeItem .time {
background-color: none;
&.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 {
}
.timeItem .state {
height: 0.37 * 100rpx;
line-height: 0.37 * 100rpx;
}
.activity {
}
.activity {
color: #333;
}
.flash-sale .list .item .grab {
}
.flash-sale .list .item .grab {
background-color: #999;
}
}
</style>

2
pages/shop/GoodsCon/index.vue
View File

@ -790,7 +790,7 @@
}
.footer .icon-shoucang1 {
color: #73cbb6;
color: #00c17b;
}
.product-con .product-intro .conter view {

4
pages/user/User/index.vue
View File

@ -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 {

BIN
static/images/404.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 KiB

BIN
static/images/accountBg.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
static/images/address.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
static/images/alter.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
static/images/angle.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
static/images/balance.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
static/images/bargain.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/brass.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
static/images/brass.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
static/images/bronze.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/images/bronze.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
static/images/calendar_all.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/close.gif Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/images/collection.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
static/images/coupon-window.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
static/images/coupon-window2.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
static/images/coupon.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/images/coupon1.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
static/images/coupon2.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
static/images/customer.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/images/del.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/images/dfh.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
static/images/dfk.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
static/images/diamonds.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
static/images/diamonds.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
static/images/down.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/dpj.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
static/images/dsh.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
static/images/enter.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/examine.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
static/images/extension.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
static/images/face.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
static/images/figure.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
static/images/gift.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
static/images/gold.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/images/gold.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
static/images/group.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
static/images/h5.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
static/images/horn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/index-bg.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
static/images/integralbg.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
static/images/keyboard.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
static/images/left.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/images/light.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

BIN
static/images/line.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
static/images/ling.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
static/images/live-logo.gif Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
static/images/lock.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
static/images/lock2.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
static/images/logo.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
static/images/logo2.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
static/images/medal01.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
static/images/medal02.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
static/images/medal03.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
static/images/member.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/images/memberCenter.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
static/images/money.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
static/images/nav1.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
static/images/nav2.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
static/images/nav3.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
static/images/nav4.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
static/images/new_logo.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
static/images/news.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
static/images/noAddress.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
static/images/noCart.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
static/images/noCollection.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
static/images/noCoupon.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
static/images/noEvaluate.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
static/images/noExpress.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
static/images/noGood.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
static/images/noNews.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
static/images/noOrder.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
static/images/noSearch.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
static/images/noShopper.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
static/images/one.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
static/images/oneT.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
static/images/open.gif Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
static/images/orderIcon.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
static/images/orderIndex.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
static/images/orderTime.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
static/images/ordinary.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
static/images/ordinary.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
static/images/plus.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
static/images/poster-close.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
static/images/posters.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
static/images/posters2.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
static/images/pricetitle.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
static/images/promotionBg.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
static/images/public.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
static/images/record1.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

Some files were not shown because too many files have changed in this diff Show More