Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi
This commit is contained in:
commit
a102824869
|
@ -71,6 +71,7 @@
|
|||
}
|
||||
.totalIntegral {
|
||||
padding-left: 20px;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.innerBottomOfBottom {
|
||||
|
@ -116,7 +117,7 @@
|
|||
.isbOptions {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
font-size: 18px;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.optionsDetail {
|
||||
|
@ -246,8 +247,8 @@
|
|||
.withdrawalMoneyBtn {
|
||||
width: 92%;
|
||||
height: 45px;
|
||||
border-radius: 20px;
|
||||
font-size: 20px;
|
||||
border-radius: 30px;
|
||||
font-size: 18px;
|
||||
color: #FFFFFF;
|
||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||
display: flex;
|
||||
|
|
|
@ -3,11 +3,12 @@
|
|||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text" style="margin-right: 5px;">
|
||||
当前周期
|
||||
</span>
|
||||
<span class="header-text">{{startTime}}~{{endTime}}</span>
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
|
||||
</view>
|
||||
|
@ -26,7 +27,7 @@
|
|||
</view>
|
||||
<t-refresh class="mian" ref="refresh" v-if="listData.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
|
||||
<template slot="content">
|
||||
<view class="view-title">
|
||||
<view class="view-title tap-padding">
|
||||
<view class="view-title-left">
|
||||
<span class="view-title-left-shuxian"></span>
|
||||
<span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
|
||||
|
@ -35,7 +36,7 @@
|
|||
<view class="view-title-right">订单数量: {{totalCount}}</view>
|
||||
</view>
|
||||
<!--本期加钟 充值 订单-->
|
||||
<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
|
||||
<view class="mina-view tap-padding" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
|
||||
|
||||
<view class="mian-list">
|
||||
<view class="mian-list-top">
|
||||
|
@ -75,7 +76,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<!--本期未加钟 未充值 订单-->
|
||||
<view class="mina-view" v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
|
||||
<view class="mina-view tap-padding" v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
|
||||
<view class="mian-list">
|
||||
<view class="mian-list-top">
|
||||
<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
|
||||
|
@ -287,7 +288,9 @@
|
|||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.tap-padding{
|
||||
padding: 0 22rpx;
|
||||
}
|
||||
.tapNav-bor{
|
||||
width: 100px;
|
||||
height: 14rpx;
|
||||
|
@ -502,10 +505,18 @@
|
|||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
margin-top: 2px;
|
||||
margin-bottom: 20rpx;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
@ -516,7 +527,7 @@
|
|||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
|
|
|
@ -2,10 +2,13 @@
|
|||
<view class="content">
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left" style="margin-top: -10px;">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text">当前周期</span>
|
||||
<span class="header-text">{{startTime}}~{{endTime}}</span>
|
||||
<view class="header-top-left">
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期收益</view>
|
||||
</view>
|
||||
|
@ -330,21 +333,24 @@
|
|||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
height:22.92rpx;
|
||||
margin-right: 2px;
|
||||
margin-top: 3px;
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
align-items: flex-end;
|
||||
justify-content: space-between;
|
||||
margin-top: -10rpx;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
|
@ -356,7 +362,7 @@
|
|||
width: 100%;
|
||||
height: 300rpx;
|
||||
padding: 15px;
|
||||
background:#ffffff url('../../static/index/fun_banner4.png');
|
||||
background:#f7f7f7 url('../../static/index/fun_banner4.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
display: flex;
|
||||
|
|
|
@ -3,15 +3,16 @@
|
|||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text" style="margin-right: 5px;">
|
||||
当前周期
|
||||
</span>
|
||||
<span class="header-text">{{startTime}}~{{endTime}}</span>
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期积分</view>
|
||||
</view>
|
||||
<view class="header-bottom" style="margin-bottom: 50rpx;">
|
||||
<view class="header-bottom" style="margin-bottom: 56rpx;">
|
||||
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
|
||||
<view class="header-text">当前积分</view>
|
||||
</view>
|
||||
|
@ -630,6 +631,16 @@
|
|||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
|
|
@ -2,10 +2,13 @@
|
|||
<view class="content">
|
||||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left" style="margin-top: -10px;">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text">当前周期</span>
|
||||
<span class="header-text" style="font-size: 16px;">{{startTime}}~{{endTime}}</span>
|
||||
<view class="header-top-left">
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期业绩</view>
|
||||
</view>
|
||||
|
@ -336,10 +339,19 @@
|
|||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
height:22.92rpx;
|
||||
|
@ -347,9 +359,10 @@
|
|||
margin-top: 3px;
|
||||
}
|
||||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-top: -10rpx;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
|
|
|
@ -3,11 +3,12 @@
|
|||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text" style="margin-right: 5px;">
|
||||
当前周期
|
||||
</span>
|
||||
<span class="header-text">{{startTime}}~{{endTime}}</span>
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
|
||||
</view>
|
||||
|
@ -290,7 +291,7 @@
|
|||
}
|
||||
.tapNav-name{
|
||||
font-weight: bold;
|
||||
font-size: 31rpx;
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
|
@ -509,9 +510,18 @@
|
|||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
margin-top: 2px;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
|
|
@ -3,13 +3,16 @@
|
|||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text" style="margin-right: 5px;">当前周期</span>
|
||||
<span class="header-text">{{startTime}}~{{endTime}}</span>
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期收益</view>
|
||||
</view>
|
||||
<view class="header-bottom">
|
||||
<view class="header-bottom" style="margin-bottom: 40rpx;">
|
||||
<view class="header-bottom-money">{{shouyiMoeny}}</view>
|
||||
<view class="header-text">当前收益</view>
|
||||
</view>
|
||||
|
@ -305,9 +308,18 @@
|
|||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
margin-top: 2px;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
@ -318,7 +330,7 @@
|
|||
.header-top-left{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.header-top{
|
||||
width: 100%;
|
||||
|
|
|
@ -3,15 +3,16 @@
|
|||
<view class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text" style="margin-right: 5px;">
|
||||
当前周期
|
||||
</span>
|
||||
<span class="header-text">{{startTime}}~{{endTime}}</span>
|
||||
<view>
|
||||
<span class="header-text"></image>当前周期</span>
|
||||
</view>
|
||||
<view>
|
||||
<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期积分</view>
|
||||
</view>
|
||||
<view class="header-bottom">
|
||||
<view class="header-bottom" style="margin-bottom: 56rpx;">
|
||||
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
|
||||
<view class="header-text">当前积分</view>
|
||||
</view>
|
||||
|
@ -369,7 +370,7 @@
|
|||
<style scoped>
|
||||
.tapNav-name{
|
||||
font-weight: bold;
|
||||
font-size: 31rpx;
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
|
@ -383,13 +384,16 @@
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
.tapNav-list{
|
||||
width: 100%;
|
||||
width: 96%;
|
||||
margin: 0 auto;
|
||||
display: flex;
|
||||
flex-direction:row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background-color: #fff;
|
||||
border-radius: 15rpx;
|
||||
margin-top: -30px;
|
||||
padding: 10rpx 0;
|
||||
}
|
||||
.tapNav-view{
|
||||
height: 40px;
|
||||
|
@ -670,15 +674,25 @@
|
|||
height: 49rpx;
|
||||
line-height: 49rpx;
|
||||
text-align: center;
|
||||
font-size: 21rpx;
|
||||
font-size: 26rpx;
|
||||
color: #333333;
|
||||
background: #FFFFFF;
|
||||
border-radius: 24rpx;
|
||||
}
|
||||
.header-text{
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.header-text1{
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #019c88;
|
||||
margin-right: 8rpx;
|
||||
border-radius: 30rpx;
|
||||
background: #fff;
|
||||
padding: 1rpx 10rpx;
|
||||
}
|
||||
.header-top-left image{
|
||||
width: 24.31rpx;
|
||||
|
@ -700,9 +714,9 @@
|
|||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 200rpx;
|
||||
padding: 15px;
|
||||
background-image: url('../../static/index/fun_banner4.png');
|
||||
height: 300rpx;
|
||||
padding: 5px 20px;
|
||||
background:#f7f7f7f7 url('../../static/index/fun_banner4.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
display: flex;
|
||||
|
|
Loading…
Reference in New Issue