Commit 017b3f92 authored by Mac's avatar Mac

1

parent c1a46993
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<!-- 预约的列表 --> <!-- 预约的列表 -->
<view class="subscribeList" style="height: calc(100vh - 190px);width: calc(100vw);overflow: auto;" > <view class="subscribeList" style="height: calc(100vh - 190px);width: calc(100vw);overflow: auto;" >
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scroll='getscroll'> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scroll='getscroll' style="min-height: calc(100vh - 190px);">
<u-empty v-if="subscribeList.length == 0" text="暂无相关数据" mode="list" ></u-empty> <u-empty v-if="subscribeList.length == 0" text="暂无相关数据" mode="list" ></u-empty>
<view style="padding: 0 15px;" @touchstart="getscroll" v-if="subscribeList.length>0"> <view style="padding: 0 15px;" @touchstart="getscroll" v-if="subscribeList.length>0">
<view class="subscribe-item" v-for="(item,index) in subscribeList" :key='index' :style="{'margin-bottom':subscribeList.length==index+1?'20px':'0'}"> <view class="subscribe-item" v-for="(item,index) in subscribeList" :key='index' :style="{'margin-bottom':subscribeList.length==index+1?'20px':'0'}">
...@@ -197,10 +197,10 @@ ...@@ -197,10 +197,10 @@
</view> </view>
</view> </view>
<view style="width: 100%;height: 100px;"></view> <view style="width: 100%;height: 100px;"></view>
<view style="width: 100%;height: 100%;background: #000000;opacity: 0.3;position: absolute;left: 0;top: 0;" v-if="screenshow==true && subscribeList.length > 0" @touchstart="screenshow=false" ></view> <!-- <view style="width: 100%;height: 100%;background: #000000;opacity: 0.3;position: absolute;left: 0;top: 0;" v-if="screenshow==true && subscribeList.length > 0" @touchstart="screenshow=false" ></view> -->
</view> </view>
</scroll-view> </scroll-view>
<view style="width: 100%;height: 100%;background: #000000;opacity: 0.3;position: absolute;left: 0;top: 0;" v-if="screenshow==true && subscribeList.length == 0" @touchstart="screenshow=false" ></view> <view style="width: 100%;height: 100%;background: #000000;opacity: 0.3;position: absolute;left: 0;top: 0;" v-if="screenshow==true " @touchstart="screenshow=false" ></view>
</view> </view>
...@@ -443,7 +443,8 @@ import tabbars from '@/components/tabbar/index'; ...@@ -443,7 +443,8 @@ import tabbars from '@/components/tabbar/index';
this.subscribeList = x.PlanList; this.subscribeList = x.PlanList;
this.WeekStr = x.WeekStr this.WeekStr = x.WeekStr
} }
if(x.haveCourseCount>0){ if(x.haveCourseCount>0 ){
console.log(1)
let obj = { let obj = {
date:time date:time
} }
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
{{x.Type==1?'+'+x.PonitNum:'-'+x.PonitNum}} {{x.Type==1?'+'+x.PonitNum:'-'+x.PonitNum}}
</view> </view>
<view class="item-r" v-if='current==1' :style="{color: mainColor}"> <view class="item-r" v-if='current==1' :style="{color: mainColor}">
点数+{{x.PonitNum}} 点数+{{x.PonitNum}} <text v-if="x.GivePoint>0">(赠{{x.GivePoint}})</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -259,6 +259,7 @@ ...@@ -259,6 +259,7 @@
border-bottom: 1px solid #E2E2E2; border-bottom: 1px solid #E2E2E2;
} }
.pointBalance .item-r{ .pointBalance .item-r{
width: 100px;text-align: right; width: 130px;text-align: right;
font-size: 13px;
} }
</style> </style>
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