Skip to content

U
user
Commit 632be137 by songbingqi
Options

修复部分bug

parent 385e24d2
Showing with 72 additions and 58 deletions
components/Ticket/index.vue
......@@ -23,10 +23,10 @@
</view>
<view v-else>
<view v-if="info.status===0">
<button class="gouse" @click="goMenu">去使用</button>
<view class="gouse" @click="goMenu">去使用</view>
</view>
<view v-if="info.status===4">
<button class="gouse_dis">去使用</button>
<view class="gouse_dis">去使用</view>
</view>
</view>
</view>
......@@ -291,6 +291,7 @@ export default {
font-weight: 400;
color: #FFFFFF;
line-height: 52rpx;
text-align: center;
}
.gouse_dis {
width: 128rpx;
......@@ -303,6 +304,7 @@ export default {
font-weight: 400;
color: #FFFFFF;
line-height: 52rpx;
text-align: center;
}
.check{
width: 40rpx;
......@@ -416,7 +418,7 @@ export default {
margin: auto;
}
.partTwo {
overflow:hidden;
overflow:hidden;
transform: translateZ(0);
width: 100%;
margin-right: 30rpx;
......@@ -472,6 +474,7 @@ export default {
}
.partThree {
width: 100%;
transform: translateZ(0);
position: relative;
overflow: hidden;
background: radial-gradient(circle at right top, transparent 17rpx, #E9E9E9 0) top left / 182rpx 51% no-repeat,
......
components/shopCar/shopCar.vue
<template>
<view>
<view catchtouchmove="return">
<u-popup :show="showShopCar && goods.length" mode="bottom" :round="5" :overlay="true"
:closeOnClickOverlay="true" @close="closeT" zIndex="10071">
<view class="shop-car" :style="{'padding-bottom':bottomPadding+'rpx'}">
......@@ -7,59 +7,62 @@
<text class="left">购物袋</text>
<text class="right" @click="clearCar"><text class="delete-icon"></text>清空购物车</text>
</view>
<view class="container">
<view>
<view class="empty" v-if="show == false">
<image :src="imgPath" mode="widthFix" style="width: 400rpx;"></image>
<view class="empty-text">空空如也的购物</view>
<view class="empty-button" @click="goshopping">去选购</view>
</view>
<view v-if="show == true">
<view class="goods-detail" v-for="(item, index) in goods" :key="index">
<view class="detail-left">
<view class="goods-left">
<view class="checkBox">
<view class="check" @click="selected(item)" :class="item.flag?'checked':'nochecked'"></view>
</view>
<!-- <u-checkbox-group @change="selected(item)">
<label>
<u-checkbox shape="circle" class="selected" color="#555555"
:checked="item.flag" />
</label>
</u-checkbox-group> -->
<view>
<image :src="item.pics.thumbnailApplet || item.pics.thumbnail"
style="width: 120rpx;height: 120rpx;margin-top: 4.24rpx"></image>
</view>
</view>
<view class="size">
<view class="goods-name">{{ item.name }}</view>
<view class="goods-skus">
<text v-for="(rl, index) in item.sku.rules" :key="rl.ruleName">
{{ rl.ruleName }}
<text v-if="index != item.sku.rules.length - 1">/</text>
</text>
<scroll-view scroll-y="true" class="scroll-Y">
<view class="container">
<view>
<view class="empty" v-if="show == false">
<image :src="imgPath" mode="widthFix" style="width: 400rpx;"></image>
<view class="empty-text">空空如也的购物</view>
<view class="empty-button" @click="goshopping">去选购</view>
</view>
<view v-if="show == true">
<view class="goods-detail" v-for="(item, index) in goods" :key="index">
<view class="detail-left">
<view class="goods-left">
<view class="checkBox">
<view class="check" @click="selected(item)" :class="item.flag?'checked':'nochecked'"></view>
</view>
<!-- <u-checkbox-group @change="selected(item)">
<label>
<u-checkbox shape="circle" class="selected" color="#555555"
:checked="item.flag" />
</label>
</u-checkbox-group> -->
<view>
<image :src="item.pics.thumbnailApplet || item.pics.thumbnail"
style="width: 120rpx;height: 120rpx;margin-top: 4.24rpx"></image>
</view>
</view>
<view class="size">
<view class="goods-name">{{ item.name }}</view>
<view class="goods-skus">
<text v-for="(rl, index) in item.sku.rules" :key="rl.ruleName">
{{ rl.ruleName }}
<text v-if="index != item.sku.rules.length - 1">/</text>
</text>
</view>
<view class="goods-price">
<text class="price-discount"><text class="moneyLog">￥</text>{{ Utils.isInteger(item.sku.discount) }}</text>
<text class="price-x" v-show="item.sku.price!=item.sku.discount">￥</text>
<text class="price-xx" v-show="item.sku.price!=item.sku.discount">{{ Utils.isInteger(item.sku.price) }}</text>
</view>
</view>
</view>
<view class="goods-price">
<text class="price-discount"><text class="moneyLog">￥</text>{{ Utils.isInteger(item.sku.discount) }}</text>
<text class="price-x" v-show="item.sku.price!=item.sku.discount">￥</text>
<text class="price-xx" v-show="item.sku.price!=item.sku.discount">{{ Utils.isInteger(item.sku.price) }}</text>
<view class="detail-right">
<view class="subtract" @click="reduce(item, index)"></view>
<text class="num">{{ item.num }}</text>
<view class="add" @click="add(item)" ></view>
<!-- <text class="subtract" @click="reduce(item, index)">-</text> -->
<!-- <u-icon class="subtract" name="minus-circle" @click="reduce(item, index)" color="#2979ff" size="22"></u-icon> -->
<!-- <text @click="add(item)" class="add">+</text> -->
<!-- <u-icon class="add" name="plus-circle-fill" color="#2979ff" @click="add(item)" size="22"></u-icon> -->
</view>
</view>
</view>
<view class="detail-right">
<view class="subtract" @click="reduce(item, index)"></view>
<text class="num">{{ item.num }}</text>
<view class="add" @click="add(item)" ></view>
<!-- <text class="subtract" @click="reduce(item, index)">-</text> -->
<!-- <u-icon class="subtract" name="minus-circle" @click="reduce(item, index)" color="#2979ff" size="22"></u-icon> -->
<!-- <text @click="add(item)" class="add">+</text> -->
<!-- <u-icon class="add" name="plus-circle-fill" color="#2979ff" @click="add(item)" size="22"></u-icon> -->
</view>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
</u-popup>
......@@ -120,7 +123,8 @@ export default {
mounted() {
this.animation = uni.createAnimation()
this.BottomSafeHeight = uni.getStorageSync('BottomSafeHeight')||10
this.bottomPadding = this.BottomSafeHeight+132+92
this.bottomPadding = this.BottomSafeHeight+132
this.shopCar = uni.getStorageSync('shopCar')
console.log(this.shopCar)
if(!this.userms){
......@@ -302,7 +306,6 @@ export default {
.shop-car {
display: flex;
flex-direction: column;
max-height: 715rpx;
.header {
padding:24.87rpx 31.78rpx 22.3rpx 31.54rpx;
......@@ -340,10 +343,14 @@ export default {
}
}
.container {
flex: 1;
overflow: auto;
.scroll-Y {
max-height: 565rpx;
.container {
flex: 1;
}
}
}
.goods {
......
mineSubPackage/pages/coupon/index.vue
......@@ -52,12 +52,14 @@ export default {
};
},
mounted(){
console.log(12)
this.getTickList(true)
this.getTickList(false)
},
methods: {
async getTickList(val) {
const {data} = await Mine.getUserList(val)
getTickList(val) {
Mine.getUserList(val).then(res=>{
const { data } = res
const {rows} = data
const canuse = rows.map(item=>{
let timeStart = ''
......@@ -100,6 +102,8 @@ export default {
}else{
this.cantuse = canuse
}
})
},
changeTab(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