提交 2870e38f 编写于 作者: jingqi.liu's avatar jingqi.liu

修改样式

上级 ee625d38
...@@ -10,6 +10,7 @@ wxInfo = wxInfo ? JSON.parse(wxInfo) : {}; ...@@ -10,6 +10,7 @@ wxInfo = wxInfo ? JSON.parse(wxInfo) : {};
const user = { const user = {
state: { state: {
token: localStorage.getItem('couponToken') || getCookie('couponToken') || '', token: localStorage.getItem('couponToken') || getCookie('couponToken') || '',
// token:"56659917439B44E891AF0C107E05038D",
info: {}, // 用户信息 info: {}, // 用户信息
wxInfo, // 微信信息,openid等 wxInfo, // 微信信息,openid等
wxCode: '', // 微信code wxCode: '', // 微信code
......
...@@ -49,7 +49,8 @@ export const envConfig = { ...@@ -49,7 +49,8 @@ export const envConfig = {
// tradeType: 4, // tradeType: 4,
}, },
dev: { dev: {
baseUrl: "https://dev-sc.yunqueyi.com/", // baseUrl: "https://dev-sc.yunqueyi.com/",
baseUrl: 'https://test1-sc.yunqueyi.com/',
apiUrl: "https://dev-api.yunqueyi.com/", apiUrl: "https://dev-api.yunqueyi.com/",
webPageUrl: "https://dev-phome.yunqueyi.com/", webPageUrl: "https://dev-phome.yunqueyi.com/",
hactiveUrl: "https://dev-hactive.yunqueyi.com", hactiveUrl: "https://dev-hactive.yunqueyi.com",
......
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
} }
.page-content { .page-content {
height: 100%; height: 100%;
padding: 10px 12px 24px; padding: 0 12px 24px;
} }
.list { .list {
padding-bottom: 50px; padding-bottom: 50px;
......
...@@ -53,7 +53,9 @@ ...@@ -53,7 +53,9 @@
</div> </div>
<div <div
v-if=" v-if="
couponDetail.validLeftDays && couponDetail.validTimeType == 2 couponDetail.validLeftDays > 0 &&
couponDetail.validLeftDays &&
couponDetail.validTimeType == 2
" "
:class="['right-time', hasUsed ? 'cr-c1c1c1' : '']" :class="['right-time', hasUsed ? 'cr-c1c1c1' : '']"
> >
...@@ -62,6 +64,16 @@ ...@@ -62,6 +64,16 @@
}}</span }}</span
> >
</div> </div>
<div
v-if="
couponDetail.validLeftDays < 0 &&
couponDetail.validLeftDays &&
couponDetail.validTimeType == 2
"
:class="['right-time', hasUsed ? 'cr-c1c1c1' : '']"
>
{{ createdDay(couponDetail.expireTime) }}到期
</div>
<div <div
v-if="couponDetail.validTimeType == 1" v-if="couponDetail.validTimeType == 1"
:class="['right-validity', hasUsed ? 'cr-c1c1c1' : '']" :class="['right-validity', hasUsed ? 'cr-c1c1c1' : '']"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
</CommonNavbar> </CommonNavbar>
<van-pull-refresh <van-pull-refresh
style="height: 100%;overflow:auto" style="height: 100%; overflow: auto"
v-model="refreshing" v-model="refreshing"
@refresh="onRefresh" @refresh="onRefresh"
class="refresh-list" class="refresh-list"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<coupo-item <coupo-item
v-for="(item, index) in couponList" v-for="(item, index) in couponList"
:key="index" :key="index"
class="item" :class="['item', index == couponList.length - 1 ? 'pbt-50' : '']"
:coupon-detail="item" :coupon-detail="item"
:show-tips.sync="item.showTips" :show-tips.sync="item.showTips"
@goUse="chooseCoupon" @goUse="chooseCoupon"
...@@ -253,11 +253,14 @@ export default { ...@@ -253,11 +253,14 @@ export default {
} }
.page-content { .page-content {
height: 100%; height: 100%;
padding: 10px 12px 24px; padding: 0 12px 24px;
} }
.list { .list {
padding-bottom: 50px; // padding-bottom: 50px;
height: calc(100vh); height: calc(100vh);
} }
.pbt-50 {
padding-bottom: 50px;
}
} }
</style> </style>
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册