Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
This commit is contained in:
commit
15cb892cb6
|
@ -146,7 +146,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<view class="pay_btn" style="margin-top: 20px;" @click="openpay()">去支付</view>
|
<view class="pay_btn" @click="openpay()"><span class="pay-btns">去支付</span></view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
|
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
|
||||||
|
@ -1984,19 +1984,27 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.pay_btn {
|
.pay_btn {
|
||||||
width: 96%;
|
width: 100%;
|
||||||
// margin-left: 2%;
|
height: 50px;
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
z-index: 666;
|
||||||
|
}
|
||||||
|
.pay-btns{
|
||||||
|
display: inline-block;
|
||||||
|
width: 94%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||||
height: 40px;
|
height: 40px;
|
||||||
border-radius: 40px;
|
border-radius: 28px;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
font-size: 16px;
|
margin-top: 5px;
|
||||||
// position: fixed;
|
font-size: 17px;
|
||||||
justify-content: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.serverAddress {
|
.serverAddress {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="padding-bottom u-skeleton">
|
<view class="padding-bottom u-skeleton">
|
||||||
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
|
<view class="bgImg u-skeleton-fillet">
|
||||||
<view class="head-top">
|
<view class="head-top">
|
||||||
<view class="pay-title" style="">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>
|
<view class="pay-title" style="">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>
|
||||||
<view class="flex">
|
<view class="flex">
|
||||||
|
@ -84,7 +84,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
|
<view class="pay_btn" @click="openpay()"><span class="pay-btns">去支付</span></view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
|
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
|
||||||
|
@ -1369,6 +1369,8 @@
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
.head-top{
|
.head-top{
|
||||||
|
width: 95%;
|
||||||
|
margin: 0 auto;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
border-radius: 24rpx;
|
border-radius: 24rpx;
|
||||||
padding: 29rpx;
|
padding: 29rpx;
|
||||||
|
@ -1447,7 +1449,7 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 15px 0px;
|
padding: 15rpx 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tese span:nth-child(1){
|
.tese span:nth-child(1){
|
||||||
|
@ -1761,12 +1763,6 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
.head-top{
|
|
||||||
width: 100%;
|
|
||||||
background-color: #ffffff;
|
|
||||||
border-radius: 24rpx;
|
|
||||||
padding: 29rpx;
|
|
||||||
}
|
|
||||||
.d-title{
|
.d-title{
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 29rpx;
|
font-size: 29rpx;
|
||||||
|
@ -2079,15 +2075,26 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.pay_btn {
|
.pay_btn {
|
||||||
width: 90%;
|
width: 100%;
|
||||||
margin: 0 auto;
|
height: 50px;
|
||||||
text-align: center;
|
position: fixed;
|
||||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
bottom: 0px;
|
||||||
height:80rpx;
|
display: flex;
|
||||||
border-radius: 80rpx;
|
flex-direction: column;
|
||||||
color: #ffffff;
|
align-items: center;
|
||||||
line-height: 80rpx;
|
z-index: 666;
|
||||||
font-size: 32rpx;
|
}
|
||||||
|
.pay-btns{
|
||||||
|
display: inline-block;
|
||||||
|
width: 94%;
|
||||||
|
text-align: center;
|
||||||
|
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||||
|
height: 40px;
|
||||||
|
border-radius: 28px;
|
||||||
|
color: #ffffff;
|
||||||
|
line-height: 40px;
|
||||||
|
margin-top: 5px;
|
||||||
|
font-size: 17px;
|
||||||
}
|
}
|
||||||
.serverAddress {
|
.serverAddress {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
Loading…
Reference in New Issue