完成3.0功能升级

This commit is contained in:
Gao xiaosong
2020-07-12 22:44:37 +08:00
parent 34565e6bf4
commit e8240a54a7
58 changed files with 1916 additions and 15048 deletions

View File

@ -370,7 +370,7 @@ export default {
getBargainDetail(that.bargainId)
.then(res => {
that.bargain = res.data.bargain;
that.datatime = that.bargain.stopTime;
that.datatime = that.bargain.stopTime / 1000;
that.getBargainHelpCount();
})
.catch(res => {
@ -573,32 +573,32 @@ page {
background-color: #eb3729;
}
.bargainBnt_hui {
font-size: 0.3*100rpx;
font-size: 0.3 * 100rpx;
font-weight: bold;
color: #fff;
width: 6*100rpx;
height: 0.8*100rpx;
border-radius: 0.4*100rpx;
width: 6 * 100rpx;
height: 0.8 * 100rpx;
border-radius: 0.4 * 100rpx;
background: #bbb;
text-align: center;
line-height: 0.8*100rpx;
margin-top: 0.32*100rpx;
line-height: 0.8 * 100rpx;
margin-top: 0.32 * 100rpx;
}
.bargain_view {
left:0;
right:0;
height: 0.48*100rpx;
left: 0;
right: 0;
height: 0.48 * 100rpx;
background: rgba(0, 0, 0, 0.5);
opacity: 1;
border-radius: 0 0 0.06*100rpx 0.06*100rpx;
border-radius: 0 0 0.06 * 100rpx 0.06 * 100rpx;
position: absolute;
bottom: 0;
font-size: 0.22*100rpx;
font-size: 0.22 * 100rpx;
color: #fff;
text-align: center;
line-height: 0.48*100rpx;
line-height: 0.48 * 100rpx;
}
.iconfonts {
font-size: 0.22*100rpx;
font-size: 0.22 * 100rpx;
}
</style>

View File

@ -1,8 +1,5 @@
<template>
<view class="group-list" ref="container">
<!-- <view class="header">
<image src="@/static/images/group.png" class="image" />
</view>-->
<view class="list" v-if="combinationList.length>0">
<view
class="item acea-row row-between-wrapper"

View File

@ -27,7 +27,7 @@
:hourText="' : '"
:minuteText="' : '"
:secondText="false"
:datatime="pinkT.stopTime"
:datatime="pinkT.stopTime/1000"
></count-down>
<text>结束</text>
</view>
@ -155,7 +155,8 @@ export default {
})
.catch(err => {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
@ -239,8 +240,8 @@ export default {
</script>
<style lang="less">
.tips-warp{
text-align: center;
margin-top: 20rpx;
}
.tips-warp {
text-align: center;
margin-top: 20rpx;
}
</style>