|
|
@@ -57,7 +57,7 @@
|
|
|
|
|
|
<!-- 卡制度 -->
|
|
|
<view v-for="(item,index) in vipData.f2ccard" class="ftwoccard">
|
|
|
- <view class="itemBox" v-if="AmountQtyJsFcard(item.detail)">
|
|
|
+ <view class="itemBox" ><!-- v-if="AmountQtyJsFcard(item.detail)" -->
|
|
|
<view class="itemTop">
|
|
|
<view class="itemName">
|
|
|
<span class="titleType2" >卡</span>
|
|
|
@@ -72,13 +72,13 @@
|
|
|
</view>
|
|
|
<view class="fcardBottom" :class="{fcardBottomactive:item.open}">
|
|
|
<view class="fcardCardCode">{{item.card.cardCode}}</view>
|
|
|
- <view class="fcardCardCode">{{item.card.expireTime.slice(0,10)}}</view>
|
|
|
+ <view class="fcardCardCode" v-if="item.card.expireTime">{{item.card.expireTime.slice(0,10)}}</view>
|
|
|
</view>
|
|
|
|
|
|
|
|
|
<view v-if="item.open">
|
|
|
<!-- 不展示剩余为0项 -->
|
|
|
- <view class="itemBg " v-if="dis&&v.lastCount!=0" v-for="(v,index2) in item.detail" :key="index2">
|
|
|
+ <!-- <view class="itemBg " v-if="dis&&v.lastCount!=0" v-for="(v,index2) in item.detail" :key="index2">
|
|
|
<view class="nameTop" v-if="v.type==2"><span class="type">项目</span> {{v.bizName}}</view>
|
|
|
<view class="nameTop" v-if="v.type==1"><span class="type">商品</span> {{v.bizName}}</view>
|
|
|
<view class="itemBgFcard">
|
|
|
@@ -95,10 +95,10 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
|
|
|
<!-- 展示所有 -->
|
|
|
- <view class="itemBg " v-if="!dis" v-for="(v,index2) in item.detail" :key="index2">
|
|
|
+ <view class="itemBg " v-for="(v,index2) in item.detail" :key="index2"><!-- v-if="!dis" -->
|
|
|
<view class="nameTop" v-if="v.type==2"><span class="type">项目</span> {{v.bizName}}</view>
|
|
|
<view class="nameTop" v-if="v.type==1"><span class="type">商品</span> {{v.bizName}}</view>
|
|
|
<view class="itemBgFcard">
|
|
|
@@ -133,11 +133,11 @@
|
|
|
</view>
|
|
|
<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
|
|
|
</view>
|
|
|
- <view class="itemBottom" :class="{active:item.open}" @click="changeState(item)">
|
|
|
+ <view class="itemBottom" :class="{active:item.open&&item.list.length>0}" @click="changeState(item)">
|
|
|
<view class="shopName">{{item.shopName}}</view>
|
|
|
- <image v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
|
|
|
+ <image v-if="item.open==false&&item.list.length>0" src="../../static/img/icon_arrow_down.png"
|
|
|
mode="" style="width: 34rpx;height: 22rpx;"></image>
|
|
|
- <image v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
|
|
|
+ <image v-if="item.open==true&&item.list.length>0" src="../../static/img/icon_arrow_up.png"
|
|
|
mode="" style="width: 34rpx;height: 22rpx;"></image>
|
|
|
</view>
|
|
|
|
|
|
@@ -149,7 +149,7 @@
|
|
|
<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
|
|
|
|
|
|
<view class="timeBottom">
|
|
|
- <view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
|
|
|
+ <view class="time" v-if="v.ExpireTime&&v.ExpireTime!=null&&v.ExpireTime!='null'">有效期：{{v.ExpireTime.slice(0,10)}}</view>
|
|
|
<view class="time" v-else>有效期：永久</view>
|
|
|
<view>剩余/总：<span
|
|
|
style="color: #FF3B30;">{{v.AmountQty}}</span>/{{v.TotalQty}}
|
|
|
@@ -165,7 +165,7 @@
|
|
|
<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
|
|
|
|
|
|
<view class="timeBottom">
|
|
|
- <view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
|
|
|
+ <view class="time" v-if="v.ExpireTime&&v.ExpireTime!=null&&v.ExpireTime!='null'">有效期：{{v.ExpireTime.slice(0,10)}}</view>
|
|
|
<view class="time" v-else>有效期：永久</view>
|
|
|
<view>剩余/总：<span
|
|
|
style="color: #FF3B30;">{{v.AmountQty}}</span>/{{v.TotalQty}}
|
|
|
@@ -218,9 +218,9 @@
|
|
|
<view class="shopName">{{item.ShopName}}</view>
|
|
|
|
|
|
|
|
|
- <image v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
|
|
|
+ <image v-if="item.open==false&&item.payList.length>0" src="../../static/img/icon_arrow_down.png"
|
|
|
mode="" style="width: 34rpx;height: 22rpx;"></image>
|
|
|
- <image v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
|
|
|
+ <image v-if="item.open==true&&item.payList.length>0" src="../../static/img/icon_arrow_up.png"
|
|
|
mode="" style="width: 34rpx;height: 22rpx;"></image>
|
|
|
</view>
|
|
|
|
|
|
@@ -349,6 +349,7 @@
|
|
|
wxOpenData:'',
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
onLoad() {
|
|
|
//this.userInfo = uni.getStorageSync("userInfo");
|
|
|
this.userInfo=this.$store.state.userInfo;
|
|
|
@@ -368,7 +369,12 @@
|
|
|
}
|
|
|
|
|
|
},
|
|
|
-
|
|
|
+ filter:{
|
|
|
+ filter_formatId(value) {
|
|
|
+ console.log(value)
|
|
|
+ return value//.slice(0,10);
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
shiyongShowHlde(){
|
|
|
this.shiyongShow=false;
|
|
|
@@ -435,7 +441,7 @@
|
|
|
})
|
|
|
|
|
|
this.vipData = list
|
|
|
-
|
|
|
+ console.log(this.vipData)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -533,6 +539,7 @@ border-radius: 4rpx;margin-right: 8rpx;
|
|
|
.fcardBottom{
|
|
|
display: flex;justify-content: space-between;color: #999999;font-size: 24rpx;
|
|
|
padding-top: 12rpx;
|
|
|
+ padding-right: 20rpx;
|
|
|
}
|
|
|
.topVipIcon{
|
|
|
width: 41rpx;height: 40rpx;
|
|
|
@@ -681,12 +688,14 @@ border-radius: 4rpx;margin-right: 8rpx;
|
|
|
border-radius: 10rpx;
|
|
|
padding: 24rpx 20rpx;
|
|
|
margin-top: 20rpx;
|
|
|
+ padding-right: 0px;
|
|
|
}
|
|
|
|
|
|
.itemTop {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: baseline;
|
|
|
+ padding-right: 20rpx;
|
|
|
}
|
|
|
|
|
|
.itemBottom {
|
|
|
@@ -694,7 +703,7 @@ border-radius: 4rpx;margin-right: 8rpx;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
margin-top: 15rpx;
|
|
|
-
|
|
|
+ padding-right: 20rpx;
|
|
|
}
|
|
|
|
|
|
.active {
|
|
|
@@ -737,6 +746,7 @@ border-radius: 4rpx;margin-right: 8rpx;
|
|
|
.itemBg {
|
|
|
padding: 30rpx 0rpx;
|
|
|
border-top: 1rpx solid #EEEEEE;
|
|
|
+ padding-right: 20rpx;
|
|
|
}
|
|
|
.itemBgFcard{
|
|
|
display: flex;
|
