Skip to content

M
mallapp
Commit ffbcc2c0 authored by Mac's avatar Mac
Browse files
Options

1

parent b6320375
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 19 deletions
components/coupon/course.vue
View file @ ffbcc2c0
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<u-popup mode="bottom" border-radius="20" :popup="false" v-model="show" :maskCloseAble="true" length="auto" <u-popup mode="bottom" border-radius="20" :popup="false" v-model="show" :maskCloseAble="true" length="auto"
:safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="cross" :closeable="true"> :safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="cross" :closeable="true">
<view class="course"> <view class="course">
<scroll-view :scroll-y="true" style="max-height: 70vh;">
<view class="title">课程卡</view> <view class="title">课程卡</view>
<view class="chosentips">请选择要使用的课程卡</view> <view class="chosentips">请选择要使用的课程卡</view>
<view class="details"> <view class="details">
<view class="item" v-for="(x, i) in ts" :key="i"> <view class="item" v-for="(x, i) in ts" :key="i" :style="{'margin-bottom':ts.length==i+1?'50px':'10px'}">
<view class="ticket"> <view class="ticket">
<image mode="aspectFill" :src="x.coupon_data.couponIco" style="width: 100%; height: 100%;border-top-left-radius: 5px;border-bottom-left-radius: 5px;"></image> <image mode="aspectFill" :src="x.coupon_data.couponIco" style="width: 100%; height: 100%;border-top-left-radius: 5px;border-bottom-left-radius: 5px;"></image>
</view> </view>
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
<view class="btton-box"> <view class="btton-box">
<u-button size="80" :ripple="true" shape="circle" :custom-style="{ <u-button size="80" :ripple="true" shape="circle" :custom-style="{
backgroundColor: mc, backgroundColor: mc,
...@@ -74,11 +76,12 @@ ...@@ -74,11 +76,12 @@
.course { .course {
max-height: 70vh; max-height: 70vh;
background: #f5f5f5; background: #f5f5f5;
padding-bottom: 50px; /* padding-bottom: 50px; */
text-align: left !important; text-align: left !important;
border-top-left-radius: 20rpx; border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx; border-top-right-radius: 20rpx;
overflow: scroll; /* overflow: scroll; */
overflow: hidden;
} }
.course .title { .course .title {
......
components/coupon/index.vue
View file @ ffbcc2c0
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<u-popup mode="bottom" border-radius="20" :popup="false" v-model="show" :maskCloseAble="true" length="auto" <u-popup mode="bottom" border-radius="20" :popup="false" v-model="show" :maskCloseAble="true" length="auto"
:safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="cross" :closeable="true"> :safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="cross" :closeable="true">
<view class="coupon"> <view class="coupon">
<scroll-view :scroll-y="true" style="max-height: 70vh;">
<view class="title">优惠券</view> <view class="title">优惠券</view>
<view class="chosentips">请选择要使用的优惠券</view> <view class="chosentips">请选择要使用的优惠券</view>
<view class="details"> <view class="details">
<view class="item" v-for="(x, i) in ts" :key="i"> <view class="item" v-for="(x, i) in ts" :key="i" :style="{'margin-bottom':ts.length==i+1?'50px':'10px'}">
<view class="ticket"> <view class="ticket">
<view class="miane"> <view class="miane">
<view class="money"> <view class="money">
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
<view class="btton-box"> <view class="btton-box">
<u-button size="80" :ripple="true" shape="circle" :custom-style="{ <u-button size="80" :ripple="true" shape="circle" :custom-style="{
backgroundColor: mc, backgroundColor: mc,
...@@ -81,11 +83,12 @@ ...@@ -81,11 +83,12 @@
.coupon { .coupon {
max-height: 70vh; max-height: 70vh;
background: #f5f5f5; background: #f5f5f5;
padding-bottom: 50px; /* padding-bottom: 50px; */
text-align: left !important; text-align: left !important;
border-top-left-radius: 20rpx; border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx; border-top-right-radius: 20rpx;
overflow: scroll; /* overflow: scroll; */
overflow: hidden;
} }
.coupon .title { .coupon .title {
......
components/coupon/packagecart.vue
View file @ ffbcc2c0
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<u-popup mode="bottom" border-radius="20" :popup="false" v-model="show" :maskCloseAble="true" length="auto" <u-popup mode="bottom" border-radius="20" :popup="false" v-model="show" :maskCloseAble="true" length="auto"
:safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="cross" :closeable="true"> :safeAreaInsetBottom="true" @close="popupClose" :z-index="9999" close-icon="cross" :closeable="true">
<view class="course"> <view class="course">
<scroll-view :scroll-y="true" style="max-height: 70vh;">
<view class="title">套餐卡</view> <view class="title">套餐卡</view>
<view class="chosentips">请选择要使用的套餐卡</view> <view class="chosentips">请选择要使用的套餐卡</view>
<view class="details"> <view class="details">
<view class="item" v-for="(x, i) in ts" :key="i"> <view class="item" v-for="(x, i) in ts" :key="i" :style="{'margin-bottom':ts.length==i+1?'50px':'10px'}">
<view class="ticket"> <view class="ticket">
<image mode="aspectFill" :src="x.coupon_data.couponIco" style="width: 100%; height: 100%;border-top-left-radius: 5px;border-bottom-left-radius: 5px;"></image> <image mode="aspectFill" :src="x.coupon_data.couponIco" style="width: 100%; height: 100%;border-top-left-radius: 5px;border-bottom-left-radius: 5px;"></image>
</view> </view>
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
<view class="btton-box"> <view class="btton-box">
<u-button size="80" :ripple="true" shape="circle" :custom-style="{ <u-button size="80" :ripple="true" shape="circle" :custom-style="{
backgroundColor: mc, backgroundColor: mc,
...@@ -75,11 +77,12 @@ ...@@ -75,11 +77,12 @@
.course { .course {
max-height: 70vh; max-height: 70vh;
background: #f5f5f5; background: #f5f5f5;
padding-bottom: 50px; /* padding-bottom: 50px; */
text-align: left !important; text-align: left !important;
border-top-left-radius: 20rpx; border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx; border-top-right-radius: 20rpx;
overflow: scroll; /* overflow: scroll; */
overflow: hidden;
} }
.course .title { .course .title {
......
pages/blindDate/basicdata.vue
View file @ ffbcc2c0
...@@ -261,20 +261,20 @@ ...@@ -261,20 +261,20 @@
heightEnd: 250,//身高结束值 heightEnd: 250,//身高结束值
maginL: 5,//线间距 maginL: 5,//线间距
xuelist:[ xuelist:[
{Id:0,name:'高中及以下',img_n:require('./image/gaozhong-n.png'),img_y:require('./image/gaozhong-y.png')}, {Id:0,name:'高中及以下',img_n:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/gaozhong-n.png',img_y:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/gaozhong-y.png'},
{Id:1,name:'大专',img_n:require('./image/dazhuan-n.png'),img_y:require('./image/dazhuan-y.png')}, {Id:1,name:'大专',img_n:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/dazhuan-n.png',img_y:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/dazhuan-y.png'},
{Id:2,name:'本科',img_n:require('./image/benke-n.png'),img_y:require('./image/benke-y.png')}, {Id:2,name:'本科',img_n:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/benke-n.png',img_y:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/benke-y.png'},
{Id:3,name:'硕士及以上',img_n:require('./image/suoshi-n.png'),img_y:require('./image/suoshi-y.png')}, {Id:3,name:'硕士及以上',img_n:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/suoshi-n.png',img_y:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/suoshi-y.png'},
], ],
marriagelist:[ marriagelist:[
{Id:0,name:'未婚',img_n:require('./image/weihui-n.png'),img_y:require('./image/weihui-y.png')}, {Id:0,name:'未婚',img_n:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/weihui-n.png',img_y:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/weihui-y.png'},
{Id:1,name:'离异',img_n:require('./image/liyi-n.png'),img_y:require('./image/liyi-y.png')}, {Id:1,name:'离异',img_n:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/liyi-n.png',img_y:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/liyi-y.png'},
{Id:2,name:'丧偶',img_n:require('./image/shangou-n.png'),img_y:require('./image/shangou-y.png')}, {Id:2,name:'丧偶',img_n:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shangou-n.png',img_y:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shangou-y.png'},
], ],
xueilibg:require('./image/xueilibg.png'), xueilibg:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xueilibg.png',
zfz_z:require('./image/sfz-z.png'), zfz_z:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sfz-z.png',
zfz_f:require('./image/sfz-f.png'), zfz_f:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sfz-f.png',
data:{},//百度的返回数据 data:{},//百度的返回数据
} }
}, },
......
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