Commit 632be137 by songbingqi

修复部分bug

parent 385e24d2
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
</view> </view>
<view v-else> <view v-else>
<view v-if="info.status===0"> <view v-if="info.status===0">
<button class="gouse" @click="goMenu">去使用</button> <view class="gouse" @click="goMenu">去使用</view>
</view> </view>
<view v-if="info.status===4"> <view v-if="info.status===4">
<button class="gouse_dis">去使用</button> <view class="gouse_dis">去使用</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -291,6 +291,7 @@ export default { ...@@ -291,6 +291,7 @@ export default {
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 52rpx; line-height: 52rpx;
text-align: center;
} }
.gouse_dis { .gouse_dis {
width: 128rpx; width: 128rpx;
...@@ -303,6 +304,7 @@ export default { ...@@ -303,6 +304,7 @@ export default {
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 52rpx; line-height: 52rpx;
text-align: center;
} }
.check{ .check{
width: 40rpx; width: 40rpx;
...@@ -472,6 +474,7 @@ export default { ...@@ -472,6 +474,7 @@ export default {
} }
.partThree { .partThree {
width: 100%; width: 100%;
transform: translateZ(0);
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: radial-gradient(circle at right top, transparent 17rpx, #E9E9E9 0) top left / 182rpx 51% no-repeat, background: radial-gradient(circle at right top, transparent 17rpx, #E9E9E9 0) top left / 182rpx 51% no-repeat,
......
<template> <template>
<view> <view catchtouchmove="return">
<u-popup :show="showShopCar && goods.length" mode="bottom" :round="5" :overlay="true" <u-popup :show="showShopCar && goods.length" mode="bottom" :round="5" :overlay="true"
:closeOnClickOverlay="true" @close="closeT" zIndex="10071"> :closeOnClickOverlay="true" @close="closeT" zIndex="10071">
<view class="shop-car" :style="{'padding-bottom':bottomPadding+'rpx'}"> <view class="shop-car" :style="{'padding-bottom':bottomPadding+'rpx'}">
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<text class="left">购物袋</text> <text class="left">购物袋</text>
<text class="right" @click="clearCar"><text class="delete-icon"></text>清空购物车</text> <text class="right" @click="clearCar"><text class="delete-icon"></text>清空购物车</text>
</view> </view>
<scroll-view scroll-y="true" class="scroll-Y">
<view class="container"> <view class="container">
<view> <view>
<view class="empty" v-if="show == false"> <view class="empty" v-if="show == false">
...@@ -60,6 +61,8 @@ ...@@ -60,6 +61,8 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
</view> </view>
</u-popup> </u-popup>
...@@ -120,7 +123,8 @@ export default { ...@@ -120,7 +123,8 @@ export default {
mounted() { mounted() {
this.animation = uni.createAnimation() this.animation = uni.createAnimation()
this.BottomSafeHeight = uni.getStorageSync('BottomSafeHeight')||10 this.BottomSafeHeight = uni.getStorageSync('BottomSafeHeight')||10
this.bottomPadding = this.BottomSafeHeight+132+92 this.bottomPadding = this.BottomSafeHeight+132
this.shopCar = uni.getStorageSync('shopCar') this.shopCar = uni.getStorageSync('shopCar')
console.log(this.shopCar) console.log(this.shopCar)
if(!this.userms){ if(!this.userms){
...@@ -302,7 +306,6 @@ export default { ...@@ -302,7 +306,6 @@ export default {
.shop-car { .shop-car {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
max-height: 715rpx;
.header { .header {
padding:24.87rpx 31.78rpx 22.3rpx 31.54rpx; padding:24.87rpx 31.78rpx 22.3rpx 31.54rpx;
...@@ -340,10 +343,14 @@ export default { ...@@ -340,10 +343,14 @@ export default {
} }
} }
.scroll-Y {
max-height: 565rpx;
.container { .container {
flex: 1; flex: 1;
overflow: auto;
} }
}
} }
.goods { .goods {
......
...@@ -52,12 +52,14 @@ export default { ...@@ -52,12 +52,14 @@ export default {
}; };
}, },
mounted(){ mounted(){
console.log(12)
this.getTickList(true) this.getTickList(true)
this.getTickList(false) this.getTickList(false)
}, },
methods: { methods: {
async getTickList(val) { getTickList(val) {
const {data} = await Mine.getUserList(val) Mine.getUserList(val).then(res=>{
const { data } = res
const {rows} = data const {rows} = data
const canuse = rows.map(item=>{ const canuse = rows.map(item=>{
let timeStart = '' let timeStart = ''
...@@ -100,6 +102,8 @@ export default { ...@@ -100,6 +102,8 @@ export default {
}else{ }else{
this.cantuse = canuse this.cantuse = canuse
} }
})
}, },
changeTab(current) { changeTab(current) {
this.current = current; this.current = current;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment