Skip to content

M
mallapp
Commit 6d0979c8 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents c81abb3c 7369df2c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 23 deletions
pages/share/buyInterest/index.vue
View file @ 6d0979c8
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<img style="width:100%;height:100%;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/viptopbg.png" alt=""/> <img style="width:100%;height:100%;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/viptopbg.png" alt=""/>
<view class="buy_Card"> <view class="buy_Card">
<view class="vip_title">VIP</view> <view class="vip_title">VIP</view>
<view class="vip_kaitong">开通此卡<text style="margin:0 5px;display:inline-block;">·</text>享八大权益</view> <view class="vip_kaitong">开通此卡<text style="margin:0 5px;display:inline-block;">·</text>享超多权益</view>
</view> </view>
<view class="left_dang"></view> <view class="left_dang"></view>
<view class="right_dang"></view> <view class="right_dang"></view>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</view> </view>
<view class="vip_ctet"> <view class="vip_ctet">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/vip_icon2.png" alt=""/> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/vip_icon2.png" alt=""/>
<view class="vip_one">收益提升{{dataList.EarningsAdd}}</view> <view class="vip_one">收益提升{{dataList.EarningsAdd}}%</view>
<view class="vip_two">自买返佣</view> <view class="vip_two">自买返佣</view>
</view> </view>
<view class="vip_ctet"> <view class="vip_ctet">
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</view> </view>
<view class="vip_bottom"> <view class="vip_bottom">
<view class="vip_detailDiv"> <view class="vip_detailDiv">
<view class="vip_disTitle">权限描述</view> <view class="vip_disTitle">权益描述</view>
<view class="vip_detail"> <view class="vip_detail">
{{dataList.Description}} {{dataList.Description}}
</view> </view>
...@@ -169,10 +169,10 @@ export default { ...@@ -169,10 +169,10 @@ export default {
<style> <style>
.vip_detail{ .vip_detail{
font-size:14px; font-size:14px;
margin-top:15px; margin:15px 0 85px 0;
height:300px;
overflow: scroll; overflow: scroll;
line-height: 25px; line-height: 25px;
max-height: 200px;
} }
.vip_disTitle{ .vip_disTitle{
color:#E2A74A; color:#E2A74A;
...@@ -182,13 +182,9 @@ export default { ...@@ -182,13 +182,9 @@ export default {
} }
.vip_detailDiv{ .vip_detailDiv{
width:90%; width:90%;
height:400px;
background-color: #fff; background-color: #fff;
border-radius:12px; border-radius:12px;
position: absolute; margin:20px auto;
top:20px;
left:50%;
margin-left:-45%;
padding:20px; padding:20px;
} }
.vip_lastdiv{ .vip_lastdiv{
...@@ -216,7 +212,7 @@ export default { ...@@ -216,7 +212,7 @@ export default {
} }
.vip_bottom{ .vip_bottom{
width:100%; width:100%;
height:500px; height:auto;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background:linear-gradient(to bottom, #EFB252 0%,#FCD7A3 100%); background:linear-gradient(to bottom, #EFB252 0%,#FCD7A3 100%);
......
pages/share/buyRecord/index.vue
View file @ 6d0979c8
...@@ -13,23 +13,25 @@ ...@@ -13,23 +13,25 @@
<view class="recordList"> <view class="recordList">
<view class="r_list_item" v-for="(x, i) in g" :key="i"> <view class="r_list_item" v-for="(x, i) in g" :key="i">
<view class="list_top"> <view class="list_top">
<text>会员名称：{{x.UserName}}</text>
<text>支付金额：{{x.Money}}</text> <text>支付金额：{{x.Money}}</text>
<text>支付时间：{{x.PayTimeStr}}</text>
</view> </view>
<view class="list_top"> <view class="list_top">
<text>过期时间：{{x.ExpiryDateStr}}</text>
<text>等级名称：{{x.GradeName}}</text> <text>等级名称：{{x.GradeName}}</text>
<text>过期时间：{{x.ExpiryDateStr}}</text>
</view> </view>
<view class="list_top"> <view class="list_top" style="border-bottom:1px dashed #d1d1d1;padding-bottom:10px;">
<text> <text>
支付状态：<text v-if="x.PayState==1">已支付</text><text v-if="x.PayState==0">未支付</text> 支付状态：<text v-if="x.PayState==1">已支付</text><text v-if="x.PayState==0">未支付</text>
</text> </text>
<text>支付时间：{{x.PayTimeStr}}</text>
</view> </view>
<view class="list_top"> <view class="list_top_last">
<text> <view style="width:13%;">
备注：<text>{{x.Remark}}</text> 备注：
</text> </view>
<view style="width:86%">
{{x.Remark}}
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -176,8 +178,16 @@ export default { ...@@ -176,8 +178,16 @@ export default {
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
-webkit-box-pack: justify; -webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between; justify-content: space-between;
margin-bottom: 6px; margin-bottom: 6px;
} }
.list_top_last{
padding-top: 3px;
justify-content: flex-start;
width: 100%;
display: flex;
flex-direction: wrap;
margin-bottom: 6px;
align-items: top;
}
</style> </style>
pages/share/buyVip/index.vue
View file @ 6d0979c8
<template> <template>
<view class="vipMain" :style="{ height: contentHeight }"> <view class="vipMain" :style="{ height: contentHeight }">
<view class="vipContent" v-if="isShow" :style="{ backgroundImage: 'url(' + dataList.fxGradeCustom.BackImage + ')', backgroundSize: 'cover' }"> <view class="vipContent" v-if="isShow" :style="{ backgroundImage: 'url(' + dataList.fxGradeCustom.BackImage + ')', backgroundSize: 'cover' }">
<view class="vipInner"> <view class="vipInner" :style="{backgroundColor:dataList.fxGradeCustom.BackColor}">
<view class="vip_yue"> <view class="vip_yue">
<view class="vipIcon"><img :src="dataList.fxGradeCustom.VipICO" alt="" /></view> <view class="vipIcon"><img :src="dataList.fxGradeCustom.VipICO" alt="" /></view>
<view> <view>
...@@ -95,7 +95,6 @@ export default { ...@@ -95,7 +95,6 @@ export default {
}, },
//跳转 //跳转
goUrl(url) { goUrl(url) {
console.log(url);
uni.navigateTo({ uni.navigateTo({
url: url url: url
}); });
...@@ -125,7 +124,6 @@ export default { ...@@ -125,7 +124,6 @@ export default {
left: 50%; left: 50%;
margin-left: -45%; margin-left: -45%;
border-radius: 4px; border-radius: 4px;
background-color: #cf65cd;
} }
.vipMain .vip_yue { .vipMain .vip_yue {
width: 78%; width: 78%;
......
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