Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
This commit is contained in:
commit
83b25d3b04
|
@ -1563,12 +1563,11 @@
|
|||
margin-top: 5px;
|
||||
}
|
||||
.xuanzhe{
|
||||
background: #e5e7eb;
|
||||
color: #666;
|
||||
background: linear-gradient(90deg, #029d88, #2fc094);
|
||||
color: #ffffff;
|
||||
margin-left: 5px;
|
||||
border: 1px solid #cdd2db;
|
||||
border-radius: 30rpx;
|
||||
padding: 4rpx 15rpx;
|
||||
padding: 6rpx 16rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.header-view-data{
|
||||
|
|
|
@ -1564,12 +1564,11 @@
|
|||
margin-top: 5px;
|
||||
}
|
||||
.xuanzhe{
|
||||
background: #e5e7eb;
|
||||
color: #666;
|
||||
background: linear-gradient(90deg, #029d88, #2fc094);
|
||||
color: #ffffff;
|
||||
margin-left: 5px;
|
||||
border: 1px solid #cdd2db;
|
||||
border-radius: 30rpx;
|
||||
padding: 4rpx 15rpx;
|
||||
padding: 6rpx 16rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.header-view-data{
|
||||
|
|
|
@ -99,12 +99,12 @@
|
|||
<style lang="less">
|
||||
.img-span{
|
||||
display: block;
|
||||
padding: 2px 8px;
|
||||
padding: 2px 6px;
|
||||
font-weight: 400;
|
||||
font-size: 11px;
|
||||
font-size: 10px;
|
||||
color: #FFFFFF;
|
||||
background: linear-gradient(-90deg, #FF6F48, #FF9E69);
|
||||
border-radius: 10px 0px 10px 0px;
|
||||
border-radius: 10px 3px 10px 3px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
.list-top-view-title{
|
||||
|
|
|
@ -18,12 +18,10 @@
|
|||
<!-- <view class="fenlei">
|
||||
<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
|
||||
</view> -->
|
||||
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
|
||||
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" style="margin-top: 100rpx;">
|
||||
<template slot="content">
|
||||
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
|
||||
<view class="item-img">
|
||||
<image :src="item.packageImg" mode=""></image>
|
||||
</view>
|
||||
<image :src="item.packageImg" mode="" class="item-img"></image>
|
||||
<view class="item-view">
|
||||
<view class="item-view-title">
|
||||
{{item.title}}
|
||||
|
@ -293,16 +291,17 @@
|
|||
height: 100%;
|
||||
}
|
||||
.item {
|
||||
width: 100%;
|
||||
width: 96%;
|
||||
margin: 0 2% ;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
height: 140px;
|
||||
background: #FFFFFF;
|
||||
border-radius: 21rpx;
|
||||
margin-top:20px;
|
||||
margin-top:12px;
|
||||
align-items: center;
|
||||
padding: 0px 5px;
|
||||
padding: 0px 10px;
|
||||
}
|
||||
|
||||
.item-detail {
|
||||
|
@ -370,7 +369,7 @@
|
|||
height: 32px !important;
|
||||
}
|
||||
/deep/.uni-searchbar__box-icon-search,.search-btn{
|
||||
width: 101rpx;
|
||||
width: 150rpx;
|
||||
height: 60rpx;
|
||||
background: #18A689;
|
||||
border-radius: 31rpx;
|
||||
|
@ -380,7 +379,7 @@
|
|||
height: 31px;
|
||||
border-radius: 15px !important;
|
||||
background-color: #fff !important;
|
||||
border: 2px solid #E5E5E5;
|
||||
border: 1px solid #E5E5E5;
|
||||
padding: 0px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
@ -398,7 +397,7 @@
|
|||
}
|
||||
.service-head-top-left span{
|
||||
font-weight: bold;
|
||||
font-size: 44rpx;
|
||||
font-size: 34rpx;
|
||||
color: #171717;
|
||||
}
|
||||
.service-head-top-left{
|
||||
|
|
|
@ -684,7 +684,7 @@
|
|||
}
|
||||
.my-head-mian-top-yuE{
|
||||
font-weight: bold;
|
||||
font-size: 55rpx;
|
||||
font-size: 60rpx;
|
||||
color: #f95900;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
|
@ -702,8 +702,8 @@
|
|||
margin: 5px 10px;
|
||||
}
|
||||
.my-head-mian-top-view-ming{
|
||||
background: #e6f6f3;
|
||||
color: #019c88;
|
||||
background: #efefef;
|
||||
color: #333;
|
||||
}
|
||||
.my-head-mian-top-view-qian{
|
||||
font-size: 24rpx;
|
||||
|
|
|
@ -18,9 +18,8 @@
|
|||
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
|
||||
<template slot="content">
|
||||
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
|
||||
<view class="item-img">
|
||||
<image :src="item.packageImg" mode=""></image>
|
||||
</view>
|
||||
|
||||
<image :src="item.packageImg" mode="" class="item-img"></image>
|
||||
<view class="item-view">
|
||||
<view class="item-view-title">
|
||||
{{item.title}}
|
||||
|
@ -278,6 +277,9 @@
|
|||
border-radius: 14rpx;
|
||||
position: relative;
|
||||
}
|
||||
.item-img img{
|
||||
border-radius: 14rpx;
|
||||
}
|
||||
.img-span{
|
||||
padding: 2px 5px;
|
||||
font-weight: 400;
|
||||
|
|
|
@ -20,7 +20,8 @@
|
|||
<view class="header-bottom-money">
|
||||
<view class="header-bottom-money-zhen">
|
||||
<span>¥</span>
|
||||
<span>{{mainData.price}}/套</span>
|
||||
<span>{{mainData.price}}</span>
|
||||
<span>/套</span>
|
||||
</view>
|
||||
<view class="header-bottom-money-jia">
|
||||
¥{{mainData.oldPrice}}/套
|
||||
|
@ -72,6 +73,7 @@
|
|||
<view class="header-bottom-money-zhen">
|
||||
<span>¥</span>
|
||||
<span>{{item.price}}</span>
|
||||
|
||||
</view>
|
||||
<view class="header-bottom-money-jia" style="margin-left: 5px; ">
|
||||
¥{{item.oldPrice}}
|
||||
|
@ -647,7 +649,7 @@
|
|||
</script>
|
||||
<style scoped>
|
||||
.detail-view-mina{
|
||||
width: 68%;
|
||||
width: 74%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
|
@ -1002,7 +1004,7 @@
|
|||
font-size: 25rpx;
|
||||
}
|
||||
.header-bottom-money-zhen span:nth-child(2){
|
||||
font-size:40rpx;
|
||||
font-size:38rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
.header-bottom-money-zhen span:nth-child(3){
|
||||
|
|
Loading…
Reference in New Issue