yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

This commit is contained in:
kbing1981 2024-07-30 09:57:30 +08:00
parent 73d3f4a4db c42a8dae96
commit cd270c2a3a
20 changed files with 874 additions and 758 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
my/hongbao/xinrenhongbao.vue
View File

@ -33,9 +33,12 @@
</checkbox-group> </checkbox-group>
</template> </template>
</t-refresh> </t-refresh>
<view class="push-button" @tap="shiYong()"> <view class="push-button" @tap="shiYong()" v-if="isCoupon==null">
<span class="que-btn">立即使用</span> <span class="que-btn">立即领取</span>
</view> </view>
<view class="push-button" v-else>
<span class="que-btn2">已经领取</span>
</view>
<empty v-if="hongbao.length==0"></empty> <empty v-if="hongbao.length==0"></empty>
</view> </view>
</template> </template>
@ -70,11 +73,13 @@
contentdown: '上拉显示更多', contentdown: '上拉显示更多',
contentrefresh: '正在加载...', contentrefresh: '正在加载...',
contentnomore: '没有更多数据了' contentnomore: '没有更多数据了'
} },
isCoupon: 0
} }
}, },
onLoad() { onLoad() {
this.getMyList(); this.getMyList();
this.getUserInfo();
}, },
methods: { methods: {
shiYong(){ shiYong(){
@ -82,11 +87,11 @@
that.$Request.get('/app/coupon/insertNewUserCoupon').then(res => { that.$Request.get('/app/coupon/insertNewUserCoupon').then(res => {
if (res.code == 0) { if (res.code == 0) {
uni.showToast({ uni.showToast({
title:'抢购成功！' // title:'领取成功！'
}) icon:'success',
uni.switchTab({ title:"领取成功"
url:'/pages/index/index'
}) })
setTimeout(()=>{this.goHome()},1500)
}else{ }else{
uni.showToast({ uni.showToast({
icon:'error', icon:'error',
@ -95,6 +100,11 @@
} }
}) })
}, },
goHome(){
uni.switchTab({
url:'/pages/index/index'
})
},
// 加载更多 // 加载更多
loadMore: async function() { loadMore: async function() {
//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中 //loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
@ -108,7 +118,14 @@
},1000) },1000)
} }
}, },
getUserInfo() {
this.$Request.getT('/app/user/selectUserById').then(res => {
if (res.code == 0) {
this.isCoupon = res.data.isCoupon;
console.log(this.isCoupon);
}
})
},
getMyList() { getMyList() {
this.loadingType = 1; this.loadingType = 1;
uni.showLoading({ uni.showLoading({
@ -172,6 +189,20 @@
margin-top: 4px; margin-top: 4px;
font-size: 34rpx; font-size: 34rpx;
} }
.que-btn2{
display: inline-block;
width: 90%;
text-align: center;
background: linear-gradient(90deg, #949494, #b4b4b4, #c5c5c5);
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
/deep/.page-box{ /deep/.page-box{
width: 100%; width: 100%;
} }

47
my/hongbao/youhuijuan.vue
View File

@ -22,11 +22,13 @@
</view> </view>
</view> </view>
<view class="youhui-view-right"> <view class="youhui-view-right">
<view class="youhui-view-right-top"> <view class="youhui-view-right-top">
<view class="youhui-view-right-title">{{item.couponName}}</view> <view class="youhui-view-right-title">{{item.couponName}}</view>
<view class="youhui-view-right-time">{{item.endDate}}</view> <view class="time-money" style="margin-top: 10px;">
</view> <view class="youhui-view-right-time">{{item.createTime.substring(0,10)}} ~ </view>
<view class="youhui-view-right-btn" @tap="shiYong()">立即使用</view> <view class="youhui-view-right-time" style="margin-left: 3px;"> {{item.expirationTime.substring(0,10)}}</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -42,10 +44,13 @@
</view> </view>
</view> </view>
<view class="youhui-view-right" style="justify-content: space-around;"> <view class="youhui-view-right" style="justify-content: space-around;">
<view class="youhui-view-right-top"> <view class="youhui-view-right-top">
<view class="youhui-view-right-title">{{item.couponName}}</view> <view class="youhui-view-right-title">{{item.couponName}}</view>
<view class="youhui-view-right-time">{{item.endDate}}</view> <view class="time-money" style="margin-top: 10px;">
</view> <view class="youhui-view-right-time">{{item.createTime.substring(0,10)}} ~ </view>
<view class="youhui-view-right-time" style="margin-left: 3px;"> {{item.expirationTime.substring(0,10)}}</view>
</view>
</view>
<image class="youhui-img" src="../../static/youhuijuan/chapter.png"></image> <image class="youhui-img" src="../../static/youhuijuan/chapter.png"></image>
</view> </view>
</view> </view>
@ -62,10 +67,13 @@
</view> </view>
</view> </view>
<view class="youhui-view-right" style="justify-content: space-around;"> <view class="youhui-view-right" style="justify-content: space-around;">
<view class="youhui-view-right-top"> <view class="youhui-view-right-top">
<view class="youhui-view-right-title">{{item.couponName}}</view> <view class="youhui-view-right-title">{{item.couponName}}</view>
<view class="youhui-view-right-time">{{item.endDate}}</view> <view class="time-money" style="margin-top: 10px;">
</view> <view class="youhui-view-right-time">{{item.createTime.substring(0,10)}} ~ </view>
<view class="youhui-view-right-time" style="margin-left: 3px;"> {{item.expirationTime.substring(0,10)}}</view>
</view>
</view>
<image class="youhui-img" src="../../static/youhuijuan/chapter1.png"></image> <image class="youhui-img" src="../../static/youhuijuan/chapter1.png"></image>
</view> </view>
</view> </view>
@ -137,7 +145,6 @@
}) })
}, },
getMyList() { getMyList() {
this.$Request.getT('/app/coupon/selectCouponUserList?page='+this.page+'&limit='+this.size+'&status=' + this.tabIndex).then(res => { this.$Request.getT('/app/coupon/selectCouponUserList?page='+this.page+'&limit='+this.size+'&status=' + this.tabIndex).then(res => {
if (res.code == 0) { if (res.code == 0) {
if (this.page == 1) this.hongbao = []; //如果是第一页需手动制空列表 if (this.page == 1) this.hongbao = []; //如果是第一页需手动制空列表
@ -234,15 +241,21 @@
text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44); text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
margin-left: 10px; margin-left: 10px;
} }
.time-money{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.youhui-view-right-time{ .youhui-view-right-time{
font-weight: 400; /*font-weight: 400;*/
font-size: 22rpx; font-size: 30rpx;
color: #999999; color: #999999;
} }
.youhui-view-right-title{ .youhui-view-right-title{
width: 260rpx; width: 260rpx;
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 30rpx;
color: #333333; color: #333333;
} }
.youhui-view-right-top{ .youhui-view-right-top{

6
my/hongbao/youhuijuanList.vue
View File

@ -266,14 +266,14 @@
margin-left: 10px; margin-left: 10px;
} }
.youhui-view-right-time{ .youhui-view-right-time{
font-weight: 400; /*font-weight: 400;*/
font-size: 22rpx; font-size: 30rpx;
color: #999999; color: #999999;
} }
.youhui-view-right-title{ .youhui-view-right-title{
width: 260rpx; width: 260rpx;
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 30rpx;
color: #333333; color: #333333;
} }
.youhui-view-right-top{ .youhui-view-right-top{

5
pages/msg/im.vue
View File

@ -144,8 +144,9 @@
}, },
onLoad(d) { onLoad(d) {
this.userId = this.$queue.getData('userId'); this.userId = this.$queue.getData('userId');
this.byUserId = d.byUserId let scoket = uni.getStorageSync('wbescokt')
this.chatConversationId = d.chatConversationId; this.byUserId = scoket.byUserId
this.chatConversationId = scoket.chatConversationId;
this.connect(); this.connect();
}, },
computed: { computed: {

148
pages/my/cika.vue
View File

@ -53,18 +53,19 @@
<span class="xiaoer item-view-biao">{{item.classifyName}}</span> <span class="xiaoer item-view-biao">{{item.classifyName}}</span>
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span></span>
<span>{{item.price}}</span> <span>￥{{item.price}}</span>
<span>/{{item.serviceCount}}次</span> <span>/{{item.serviceCount}}次</span>
<span>￥</span> <span>￥{{item.oldPrice}}/{{item.serviceCount}}次</span>
<span>{{item.oldPrice}}/{{item.serviceCount}}次</span>
</view>
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view> </view>
<view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
@ -194,9 +195,7 @@
margin-bottom: 8rpx; margin-bottom: 8rpx;
color: #f68607; color: #f68607;
} }
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom-btn{ .item-view-bottom-btn{
text-align: center; text-align: center;
width: 131rpx; width: 131rpx;
@ -208,36 +207,43 @@
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(4){
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
margin-left: 5px;
}
.item-view-bottom-qian span:nth-child(5){ .item-view-bottom-qian span:nth-child(5){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
} }
.item-view-bottom-qian span:nth-child(1){ .item-view-bottom-qian span:nth-child(4){
font-weight: 400; font-size: 28rpx;
font-size: 26rpx; color: #848484;
color: #F95900; text-decoration-line: line-through;
} margin-left: 5px;
.item-view-bottom-qian span:nth-child(2){ }
font-weight: bold;
font-size: 36.81rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(3){
font-size: 26rpx; font-weight: 400;
color: #F95900; font-size: 28rpx;
color: #FF1200;
} }
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 28rpx;
color: #FF1200;
}
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
@ -271,21 +277,23 @@
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 30rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
align-items: flex-end; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
width: 76%; width: 76%;
@ -297,19 +305,19 @@
white-space: nowrap; white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
justify-content: space-between; justify-content: space-between;
padding: 10rpx 0; padding:5rpx 0;
} }
.item-img{ .item-img{
width: 285rpx; width: 246rpx;
height: 120px; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.item-img img{ .item-img img{
border-radius: 14rpx; border-radius: 14rpx;
@ -333,17 +341,17 @@
border-radius: 14rpx; border-radius: 14rpx;
} }
.item { .item {
width:96%; width: 96%;
margin:0 auto ; margin: 0 auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
height: 140px; height: 140px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 21rpx;
margin-top:10px; margin-top:10px;
align-items: center; align-items: center;
padding:12px; padding: 12px;
} }
.item-detail { .item-detail {

20
pages/my/cikarDrtail.vue
View File

@ -23,8 +23,8 @@
<view class="header-bottom-money-view"> <view class="header-bottom-money-view">
<view class="header-bottom-money1"> <view class="header-bottom-money1">
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span>￥</span> <span></span>
<span>{{mainData.price}}</span> <span>￥{{mainData.price}}</span>
<span v-if="dataList.name=='index'">/{{serviceCount}}次</span> <span v-if="dataList.name=='index'">/{{serviceCount}}次</span>
<span v-else>/{{mainData.serviceCount}}次</span> <span v-else>/{{mainData.serviceCount}}次</span>
</view> </view>
@ -1173,24 +1173,24 @@
align-items: center; align-items: center;
} }
.header-bottom-money-jia{ .header-bottom-money-jia{
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
line-height: 37rpx; line-height: 37rpx;
margin-left: 5px; text-decoration-line: line-through;
text-decoration: line-through; margin-left: 5px;
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #FF1200; color: #FF1200;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 25rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:40rpx; font-size:38rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
font-size: 25rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;

120
pages/my/fuwuGengduo.vue
View File

@ -34,26 +34,24 @@
<span class="xiaoer item-view-biao">{{item.classifyName}}</span> <span class="xiaoer item-view-biao">{{item.classifyName}}</span>
<span>已售{{item.sales}} | 好评{{item.esteemRate}}%</span> <span>已售{{item.sales}} | 好评{{item.esteemRate}}%</span>
</view> --> </view> -->
<view class="item-view-bottom-qian">
<view class="item-view-bottom"> <span></span>
<view class="item-view-bottom-qian"> <span>￥{{item.price}}</span>
<span>￥</span> <span v-if="item.type!='104' && item.type!='105' && item.type!='106'"></span>
<span>{{item.price}}</span> <span v-else-if="item.type=='104'">/套</span>
<span v-if="item.type!='104'"> <span v-else>/{{item.serviceCount?item.serviceCount:''}}次</span>
/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}} <span>￥{{item.oldPrice}}</span>
</span> <span v-if="item.type!='104' && item.type!='105' && item.type!='106'"></span>
<span v-if="item.type=='104'">/套 <span v-else-if="item.type=='104'">/套</span>
</span> <span v-else>/{{item.serviceCount?item.serviceCount:''}}次</span>
<span v-if="item.type!='104'">￥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}</span> </view>
<span v-if="item.type=='104'">￥{{item.oldPrice}}/套</span> <view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view> </view>
</view>
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
@ -232,33 +230,41 @@
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(5){
font-size: 28rpx;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(4){ .item-view-bottom-qian span:nth-child(4){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(1){ .item-view-bottom-qian span:nth-child(3){
font-weight: 400; font-size: 28rpx;
font-size: 26rpx; color: #FF1200;
color: #F95900; }
}
.item-view-bottom-qian span:nth-child(2){ .item-view-bottom-qian span:nth-child(2){
font-weight: bold; font-weight: bold;
font-size: 36.81rpx; font-size: 36.81rpx;
color: #FF1200; color: #FF1200;
} }
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(1){
font-size: 26rpx; font-weight: 400;
color: #FF1200; font-size: 28rpx;
} color: #F95900;
}
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 12rpx;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
@ -292,21 +298,23 @@
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 30rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
align-items: flex-end; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
font-weight: bold; font-weight: bold;
@ -314,17 +322,19 @@
color: #333333; color: #333333;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
justify-content: space-between;
padding:5rpx 0;
} }
.item-img{ .item-img{
width: 285rpx; width: 246rpx;
height: 120px; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;

133
pages/my/fuwuliaocheng.vue
View File

@ -53,17 +53,19 @@
<span class="xiaoer item-view-biao">{{item.classifyName}}</span> <span class="xiaoer item-view-biao">{{item.classifyName}}</span>
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span></span>
<span>{{item.price}}</span> <span>￥{{item.price}}</span>
<span>/{{item.serviceCount}}次</span> <span>/{{item.serviceCount}}次</span>
<span style="text-decoration: line-through;">￥{{item.oldPrice}}/{{item.serviceCount}}次</span> <span>￥{{item.oldPrice}}/{{item.serviceCount}}次</span>
</view>
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view> </view>
<view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
@ -195,9 +197,7 @@
margin-bottom: 8rpx; margin-bottom: 8rpx;
color: #f68607; color: #f68607;
} }
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom-btn{ .item-view-bottom-btn{
text-align: center; text-align: center;
width: 131rpx; width: 131rpx;
@ -209,36 +209,40 @@
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(5){ .item-view-bottom-qian span:nth-child(5){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
} }
.item-view-bottom-qian span:nth-child(4){ .item-view-bottom-qian span:nth-child(4){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(3){
font-weight: 400; font-weight: 400;
font-size: 26rpx; font-size: 28rpx;
color: #F95900; color: #FF1200;
} }
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 28rpx;
color: #FF1200;
}
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
@ -271,22 +275,24 @@
background-color:#fcf3da; background-color:#fcf3da;
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 30rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
align-items: flex-end; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
width: 76%; width: 76%;
@ -298,18 +304,19 @@
white-space: nowrap; white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: center;
padding: 10rpx 0; justify-content: space-between;
padding:5rpx 0;
} }
.item-img{ .item-img{
width: 285rpx; width: 246rpx;
height: 120px; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;
@ -330,17 +337,17 @@
border-radius: 14rpx; border-radius: 14rpx;
} }
.item { .item {
width: 96%; width: 96%;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
height: 140px; height: 140px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 21rpx;
margin-top:10px; margin-top:10px;
align-items: center; align-items: center;
padding: 12px; padding: 12px;
} }
.item-detail { .item-detail {

19
pages/my/fuwuliaochengDetail.vue
View File

@ -23,8 +23,8 @@
<view class="header-bottom-money-view"> <view class="header-bottom-money-view">
<view class="header-bottom-money1"> <view class="header-bottom-money1">
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span>￥</span> <span></span>
<span>{{mainData.price}}</span> <span>￥{{mainData.price}}</span>
<span v-if="dataList.name=='index'">/{{serviceCount}}次</span> <span v-if="dataList.name=='index'">/{{serviceCount}}次</span>
<span v-else>/{{mainData.serviceCount}}次</span> <span v-else>/{{mainData.serviceCount}}次</span>
</view> </view>
@ -1206,23 +1206,24 @@
align-items: center; align-items: center;
} }
.header-bottom-money-jia{ .header-bottom-money-jia{
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
margin-left: 5px; line-height: 37rpx;
text-decoration: line-through; text-decoration-line: line-through;
margin-left: 5px;
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #FF1200; color: #FF1200;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 25rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:46rpx; font-size:38rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
font-size: 25rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;

150
pages/my/fuwuxiangm.vue
View File

@ -33,25 +33,22 @@
<span class="item-view-title">{{item.title}}</span> <span class="item-view-title">{{item.title}}</span>
<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> --> <!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
</view> </view>
<view class="item-view-xiangmu"> <view class="item-view-bottom-qian">
<span></span>
<view class="item-view-bottom-qian"> <span>￥{{item.price}}</span>
<span>￥</span> <span>￥{{item.oldPrice}}</span>
<span>{{item.price}}</span> </view>
<span></span> <view class="flex" style="margin-top: 10rpx;">
<span>￥</span> <view class="shop_label" v-if="item.tagsData!=''">
<span>{{item.oldPrice}}</span> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view> </view>
</view> </view>
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu" style="align-items: flex-end; "> <view class="item-view-xiangmu">
<span style="font-size: 26rpx; color: #999; margin-right: 8rpx;">已售</span><span style="font-size: 26rpx; color: #333;">{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
</view> </view>
<view class="item-view-bottom-btn"> <view class="item-view-bottom-btn">
查看 查看
@ -245,37 +242,42 @@
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(4){
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(5){ .item-view-bottom-qian span:nth-child(5){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
} }
.item-view-bottom-qian span:nth-child(1){ .item-view-bottom-qian span:nth-child(4){
font-weight: 400; font-size: 28rpx;
font-size: 25rpx; color: #848484;
color: #FF1200; text-decoration-line: line-through;
} }
.item-view-bottom-qian span:nth-child(3){
font-size: 28rpx;
color: #848484;
text-decoration-line: line-through;
margin-left: 5px;
}
.item-view-bottom-qian span:nth-child(2){ .item-view-bottom-qian span:nth-child(2){
font-weight: bold !important; font-weight: bold !important;
font-size: 36.81rpx !important; font-size: 36.81rpx !important;
color: #FF1200 !important; color: #FF1200 !important;
} }
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(1){
font-weight: 400; font-weight: 400;
font-size: 26rpx; font-size: 28rpx;
color: #F95900; color: #FF1200;
} }
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
@ -311,17 +313,25 @@
background-color:#fcf3da; background-color:#fcf3da;
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){
font-weight: normal;
color: #666666;
margin-right: 5rpx;
font-size: 30rpx;
}
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 21rpx; font-size: 25rpx;
margin-top: 5px; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
width: 76%; width: 76%;
@ -333,17 +343,19 @@
white-space: nowrap; white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
justify-content: space-between;
padding:5rpx 0;
} }
.item-img{ .item-img{
width: 285rpx; width: 246rpx;
height: 120px; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;
@ -363,17 +375,17 @@
height: 100%; height: 100%;
} }
.item { .item {
width: 96%; width: 96%;
margin: 2% auto; margin: 0 auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
height: 140px; height: 140px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 21rpx;
margin-top:10px; margin-top:10px;
align-items: center; align-items: center;
padding: 12px; padding: 12px;
} }
.item-detail { .item-detail {
@ -397,7 +409,7 @@
width:100%; width:100%;
} }
/deep/.zp-paging-container-content{ /deep/.zp-paging-container-content{
width: 95%; width: 100%;
margin: 0 auto; margin: 0 auto;
} }
.fenlei{ .fenlei{

170
pages/my/index.vue
View File

@ -167,6 +167,7 @@
<view class="prompt-text">-当你累了 想起盛安到家-</view> <view class="prompt-text">-当你累了 想起盛安到家-</view>
<view class="kefu" @click="goMsg"> <view class="kefu" @click="goMsg">
<image src="../../static/kefu.png" mode=""></image> <image src="../../static/kefu.png" mode=""></image>
<span>联系客服</span>
</view> </view>
</view> </view>
@ -230,11 +231,8 @@
if (this.userId) { if (this.userId) {
this.isLogin = false this.isLogin = false
this.getUserInfo() this.getUserInfo()
this.getAmount() this.getAmount()
this.getIsVip() this.getIsVip()
} else { } else {
this.isShop = 0; this.isShop = 0;
this.isAgency = 0; this.isAgency = 0;
@ -247,26 +245,25 @@
this.avatar = '../../static/logo.png' this.avatar = '../../static/logo.png'
this.isVip = 0 this.isVip = 0
} }
}, },
methods:{ methods:{
goMsg() {//客服聊天 goMsg() {//客服聊天
let data = { let data = {
userId: uni.getStorageSync('userId'), userId: uni.getStorageSync('userId'),
focusedUserId: '0', focusedUserId: '0',
// userName:this.order.userName // userName:this.order.userName
} }
// app/chat/insertChatConversation // app/chat/insertChatConversation
this.$Request.postJson('/app/chat/insertChatConversation', data).then(res => { this.$Request.postJson('/app/chat/insertChatConversation', data).then(res => {
if (res.data) { if (res.data) {
let id = this.ordersId == res.data.userId ? res.data.focusedUserId : this.ordersId let id = this.ordersId == res.data.userId ? res.data.focusedUserId : this.ordersId
uni.navigateTo({ uni.navigateTo({
url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId + url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
'&byUserId=' + res.data.userId '&byUserId=' + res.data.userId
}) })
} }
}) })
}, },
getDataX(){ getDataX(){
this.$Request.get("/app/massage/package/findPackageAndMassagePage",{ this.$Request.get("/app/massage/package/findPackageAndMassagePage",{
city:'', city:'',
@ -698,8 +695,9 @@
position: fixed; position: fixed;
right: 0; right: 0;
bottom: 0; bottom: 0;
margin-bottom:100rpx; margin-bottom: 20%;
margin-right: 20px; margin-right: 20px;
background-color: #fff;
border-radius: 5px; border-radius: 5px;
} }
.shop_label{ .shop_label{
@ -718,22 +716,24 @@
margin-bottom: 8rpx; margin-bottom: 8rpx;
color: #f68607; color: #f68607;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 30rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
align-items: flex-end; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
font-weight: bold; font-weight: bold;
@ -741,17 +741,19 @@
color: #333333; color: #333333;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
justify-content: space-between;
padding:5rpx 0;
} }
.item-img{ .item-img{
width: 285rpx; width: 246rpx;
height: 120px; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;
@ -771,17 +773,17 @@
height: 100%; height: 100%;
} }
.item { .item {
width: 96%; width: 96%;
margin: 0 2% ; margin: 0 auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
height: 140px; height: 140px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 21rpx;
margin-top:12px; margin-top:10px;
align-items: center; align-items: center;
padding: 0px 10px; padding: 12px;
} }
.item-detail { .item-detail {
@ -812,34 +814,40 @@
color: #FFFFFF; color: #FFFFFF;
margin-top: 8rpx; margin-top: 8rpx;
} }
.item-view-bottom-qian span:nth-child(4){ .item-view-bottom-qian span:nth-child(5){
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; }
} .item-view-bottom-qian span:nth-child(4){
.item-view-bottom-qian span:nth-child(1){ font-size: 28rpx;
font-weight: 400; color: #848484;
font-size: 25rpx; text-decoration-line: line-through;
color: #F95900; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(2){ .item-view-bottom-qian span:nth-child(3){
font-weight: bold; font-size: 28rpx;
font-size: 36.81rpx; color: #FF1200;
color: #F95900; }
} .item-view-bottom-qian span:nth-child(2){
.item-view-bottom-qian span:nth-child(3){ font-weight: bold;
font-weight: 400; font-size: 36.81rpx;
font-size: 25rpx; color: #FF1200;
color: #F95900; }
} .item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 28rpx;
color: #F95900;
}
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 12rpx;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;

95
pages/my/indextaociliaoList.vue
View File

@ -33,17 +33,19 @@
<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> --> <!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span></span>
<span>{{item.price}}</span> <span>￥{{item.price}}</span>
<span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text> {{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span> <span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text> {{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
<span>￥</span> <span></span>
<span>{{item.oldPrice}}<text v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span> <span>￥{{item.oldPrice}}<text v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
</view> </view>
<view class="shop_label" v-if="item.tagsData!=''"> <view class="flex" style="margin-top: 10rpx;">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span> <view class="shop_label" v-if="item.tagsData!=''">
</view> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
<view class="shop_label" v-else> </view>
<span>助眠解压</span> <view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
@ -236,9 +238,7 @@
margin-bottom: 8rpx; margin-bottom: 8rpx;
color: #f68607; color: #f68607;
} }
.item-view-bottom-qian{
margin-top: 5px;
}
/deep/.refresh-body .content{ /deep/.refresh-body .content{
} }
/deep/.refresh-body{ /deep/.refresh-body{
@ -264,36 +264,40 @@
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(4){ .item-view-bottom-qian span:nth-child(5){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; }
} .item-view-bottom-qian span:nth-child(4){
.item-view-bottom-qian span:nth-child(5){ font-size: 26rpx;
font-size: 26rpx; color: #848484;
color: #848484; text-decoration-line: line-through;
text-decoration-line: line-through; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 26rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(3){
font-size: 26rpx; font-size: 28rpx;
color: #F95900; color: #F95900;
} }
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 26rpx;
color: #FF1200;
}
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: space-between;
align-items: center;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
@ -327,15 +331,15 @@
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-size: 26rpx; font-weight: normal;
font-weight: normal; color: #333333;
color: #666666; font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 26rpx; font-size: 30rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
@ -346,7 +350,6 @@
align-items: flex-end; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
width: 76%;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;

8
pages/my/miaoShaOderDrtail.vue
View File

@ -19,8 +19,8 @@
<view class="header-bottom-money-view"> <view class="header-bottom-money-view">
<view class="header-bottom-money"> <view class="header-bottom-money">
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span>￥</span> <span></span>
<span>{{mainData.price}}</span> <span>￥{{mainData.price}}</span>
<span>/次</span> <span>/次</span>
</view> </view>
<view class="header-bottom-money-jia"> <view class="header-bottom-money-jia">
@ -600,14 +600,14 @@
color: #FF1200; color: #FF1200;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 26rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:38rpx; font-size:38rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
font-size: 26rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;

10
pages/my/myMsOderDrtail.vue
View File

@ -38,8 +38,8 @@
<view class="header-bottom-money-view"> <view class="header-bottom-money-view">
<view class="header-bottom-money"> <view class="header-bottom-money">
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span>￥</span> <span></span>
<span>{{getList.packagePrice}}</span> <span>￥{{getList.packagePrice}}</span>
</view> </view>
<view class="header-bottom-money-jia"> <view class="header-bottom-money-jia">
￥{{getList.oldPrice}} ￥{{getList.oldPrice}}
@ -509,14 +509,14 @@
color: #F95900; color: #F95900;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 25rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:45.81rpx; font-size:38rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
font-size: 25rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;

89
pages/my/newTeaml.vue
View File

@ -49,14 +49,16 @@
</view> </view>
<view class="item-view" v-if="text=='index'"> <view class="item-view" v-if="text=='index'">
<view class="view-cata"> <view class="view-cata">
<view class="item-view-title">{{item.title}}1111</view> <view class="item-view-title">{{item.title}}</view>
</view>
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view> </view>
<view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view>
<view class="pace-plan"> <view class="pace-plan">
<view class="pace-text"><span>{{item.duration}}</span><span>分钟</span></view> <view class="pace-text"><span>{{item.duration}}</span><span>分钟</span></view>
</view> </view>
@ -77,17 +79,17 @@
<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> --> <!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span></span>
<span>{{item.price}}</span> <span>￥{{item.price}}</span>
<!-- <span>/{{item.serviceCount}}次</span> --> <span>￥{{item.oldPrice}}</span>
<span>￥</span>
<span>{{item.oldPrice}}</span>
</view> </view>
<view class="shop_label" v-if="item.tagsData!=''"> <view class="flex" style="margin-top: 10rpx;">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span> <view class="shop_label" v-if="item.tagsData!=''">
</view> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
<view class="shop_label" v-else> </view>
<span>助眠解压</span> <view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
@ -406,13 +408,15 @@
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 30rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
@ -431,17 +435,19 @@
white-space: nowrap; white-space: nowrap;
} }
.item-view{ .item-view{
width: 66%; width:59%;
height: 100%; /*height: 100%;*/
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
justify-content: space-between;
padding:5rpx 0;
} }
.item-img{ .item-img{
width: 200rpx; width: 246rpx;
height: 200rpx; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;
@ -462,16 +468,17 @@
border-radius: 14rpx; border-radius: 14rpx;
} }
.item { .item {
width: 100%; width: 100%;
display: flex; margin: 0 auto;
flex-direction: row; display: flex;
justify-content: space-between; flex-direction: row;
height: 140px; justify-content: space-between;
background: #FFFFFF; height: 140px;
border-radius: 21rpx; background: #FFFFFF;
margin-top:10px; border-radius: 21rpx;
align-items: center; margin-top:10px;
padding: 0px 10px; align-items: center;
padding: 12px;
} }
.item-detail { .item-detail {

54
pages/my/newseckill.vue
View File

@ -52,6 +52,12 @@
<view class="item-view-title">{{item.title}}</view> <view class="item-view-title">{{item.title}}</view>
<!-- <view class="xiaoer item-view-biao">{{item.classifyName}}</view> --> <!-- <view class="xiaoer item-view-biao">{{item.classifyName}}</view> -->
</view> </view>
<view class="item-view-bottom-qian">
<span></span>
<span>￥{{item.price}}</span>
<!-- <span>/{{item.serviceCount}}次</span> -->
<span>￥{{item.oldPrice}}</span>
</view>
<view class="flex" style="margin-top: 10rpx;"> <view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''"> <view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
@ -60,12 +66,6 @@
<span>助眠解压</span> <span>助眠解压</span>
</view> </view>
</view> </view>
<view class="item-view-bottom-qian">
<span>￥</span>
<span>{{item.price}}</span>
<!-- <span>/{{item.serviceCount}}次</span> -->
<span>￥{{item.oldPrice}}</span>
</view>
<view class="item-view-bottom" v-if="text=='index'"> <view class="item-view-bottom" v-if="text=='index'">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
@ -303,10 +303,7 @@
font-weight: bold; font-weight: bold;
font-style:italic; font-style:italic;
} }
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom-btn{ .item-view-bottom-btn{
text-align: center; text-align: center;
width: 131rpx; width: 131rpx;
@ -340,17 +337,19 @@
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(2){ .item-view-bottom-qian span:nth-child(2){
font-weight: bold; font-weight: bold;
font-size: 36.81rpx; font-size: 36.81rpx;
color: #FF1200; color: #FF1200;
} }
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
color: #FF1200;
}
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
@ -397,7 +396,6 @@
font-weight: normal; font-weight: normal;
color: #333333; color: #333333;
font-size: 30rpx; font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
@ -438,18 +436,20 @@
white-space: nowrap; white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
} justify-content: space-between;
.item-img{ padding:5rpx 0;
width: 285rpx;
height: 120px;
border-radius: 14rpx;
position: relative;
} }
.item-img{
width: 246rpx;
height: 206rpx;
border-radius: 14rpx;
position: relative;
}
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;
font-weight: 400; font-weight: 400;

8
pages/my/pinTuanOderDrtail.vue
View File

@ -72,8 +72,8 @@
<view class="header-bottom-money" style="margin: 7px 0px;display: flex;justify-content: space-between; "> <view class="header-bottom-money" style="margin: 7px 0px;display: flex;justify-content: space-between; ">
<view style="display: flex; align-items: flex-end;"> <view style="display: flex; align-items: flex-end;">
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span>￥</span> <span></span>
<span>{{item.packagePrice}}</span> <span>￥{{item.packagePrice}}</span>
</view> </view>
<view class="header-bottom-money-jia" > <view class="header-bottom-money-jia" >
￥{{item.oldPrice}} ￥{{item.oldPrice}}
@ -599,14 +599,14 @@
color: #FF1200; color: #FF1200;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 26rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:38rpx; font-size:38rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
font-size: 26rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;

12
pages/my/serviceOderDrtail.vue
View File

@ -19,8 +19,8 @@
<view class="header-bottom-money-view"> <view class="header-bottom-money-view">
<view class="header-bottom-money"> <view class="header-bottom-money">
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span>￥</span> <span></span>
<span>{{mainData.price}}</span> <span>￥{{mainData.price}}</span>
<span>/套</span> <span>/套</span>
</view> </view>
<view class="header-bottom-money-jia"> <view class="header-bottom-money-jia">
@ -73,8 +73,8 @@
<view class="header-bottom-money" style="margin: 7px 0px;display: flex;justify-content: space-between; "> <view class="header-bottom-money" style="margin: 7px 0px;display: flex;justify-content: space-between; ">
<view style="display: flex; align-items: flex-end;"> <view style="display: flex; align-items: flex-end;">
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span>￥</span> <span></span>
<span>{{item.price}}</span> <span>￥{{item.price}}</span>
</view> </view>
<view class="header-bottom-money-jia" > <view class="header-bottom-money-jia" >
￥{{item.oldPrice}} ￥{{item.oldPrice}}
@ -1054,14 +1054,14 @@
color: #FF1200; color: #FF1200;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 26rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen span:nth-child(2){ .header-bottom-money-zhen span:nth-child(2){
font-size:38rpx; font-size:38rpx;
font-weight: bold; font-weight: bold;
} }
.header-bottom-money-zhen span:nth-child(3){ .header-bottom-money-zhen span:nth-child(3){
font-size: 26rpx; font-size: 28rpx;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;

130
pages/my/servicePackage.vue
View File

@ -52,19 +52,20 @@
<view class="item-view-title">{{item.title}}</view> <view class="item-view-title">{{item.title}}</view>
<span class="xiaoer item-view-biao">{{item.classifyName}}</span> <span class="xiaoer item-view-biao">{{item.classifyName}}</span>
</view> </view>
<view class="item-view-bottom-qian" style="margin-top: 5px;"> <view class="item-view-bottom-qian">
<span>￥</span> <span></span>
<span>{{item.price}}</span> <span>￥{{item.price}}</span>
<span>/套</span> <span>/套</span>
<span>￥</span> <span>￥{{item.oldPrice}}/套</span>
<span>{{item.oldPrice}}/套</span>
</view>
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view> </view>
<view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
@ -221,36 +222,37 @@
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(5){ .item-view-bottom-qian span:nth-child(5){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
} }
.item-view-bottom-qian span:nth-child(4){ .item-view-bottom-qian span:nth-child(4){
font-size: 26rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(3){
font-weight: 400; font-weight: 400;
font-size: 26rpx; font-size: 28rpx;
color: #F95900; color: #FF1200;
} }
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 28rpx;
color: #FF1200;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
@ -283,22 +285,24 @@
background-color:#fcf3da; background-color:#fcf3da;
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 30rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
align-items: flex-end; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
width: 76%; width: 76%;
@ -310,19 +314,19 @@
white-space: nowrap; white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
justify-content: space-between; justify-content: space-between;
padding: 10rpx 0; padding:5rpx 0;
} }
.item-img{ .item-img{
width: 285rpx; width: 246rpx;
height: 120px; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.item-img image{ .item-img image{
width: 100%; width: 100%;
@ -330,17 +334,17 @@
border-radius: 14rpx; border-radius: 14rpx;
} }
.item { .item {
width: 96%; width: 96%;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
height: 140px; height: 140px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 21rpx;
margin-top:10px; margin-top:10px;
align-items: center; align-items: center;
padding: 12px; padding: 12px;
} }
.item-detail { .item-detail {

169
pages/shop/index.vue
View File

@ -33,15 +33,17 @@
<span class="xiaoer">{{item.classifyName}}</span> <span class="xiaoer">{{item.classifyName}}</span>
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span></span>
<span>{{item.price}}</span> <span>￥{{item.price}}</span>
<span style="color: #999;text-decoration: line-through;margin-left: 5px;">￥{{item.oldPrice}}</span> <span>￥{{item.oldPrice}}</span>
</view> </view>
<view class="shop_label" v-if="item.tagsData"> <view class="flex" style="margin-top: 10rpx;">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span> <view class="shop_label" v-if="item.tagsData!=''">
</view> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
<view class="shop_label" v-else> </view>
<span>助眠解压</span> <view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
@ -64,11 +66,13 @@
<view class="item-view-jianjie"> <view class="item-view-jianjie">
{{item.consortiaContent}} {{item.consortiaContent}}
</view> </view>
<view class="shop_label" v-if="item.tagsData"> <view class="flex" style="margin-top: 10rpx;">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span> <view class="shop_label" v-if="item.tagsData!=''">
</view> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
<view class="shop_label" v-else> </view>
<span>助眠解压</span> <view class="shop_label" v-else>
<span>助眠解压</span>
</view>
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
@ -241,9 +245,7 @@
</script> </script>
<style scoped> <style scoped>
.item-view-bottom-qian{
margin-top: 5px;
}
/deep/.refresh-body .content{ /deep/.refresh-body .content{
background-color: #f7f7f7; background-color: #f7f7f7;
} }
@ -269,37 +271,42 @@
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(4){ .item-view-bottom-qian span:nth-child(5){
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; }
} .item-view-bottom-qian span:nth-child(4){
.item-view-bottom-qian span:nth-child(5){ font-size: 26rpx;
font-size: 28rpx; color: #848484;
color: #848484; text-decoration-line: line-through;
text-decoration-line: line-through; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(3){
font-size: 25rpx; font-size: 28rpx;
color: #FF1200; color: #848484;
text-decoration-line: line-through;
margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(2){
font-weight: bold;
font-size: 36.81rpx;
color: #FF1200;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 26rpx;
color: #FF1200;
}
.item-view-bottom-qian{
margin-top: 5px;
}
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
@ -335,22 +342,24 @@
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
} font-size: 30rpx;
.item-view-xiangmu{
width: 100%;
display: flex;
flex-direction: row;
font-weight: 400;
font-size: 25rpx;
align-items: flex-end;
} }
.item-view-xiangmu{
width: 100%;
display: flex;
flex-direction: row;
font-weight: 400;
font-size: 25rpx;
align-items: flex-end;
}
.item-view-title{ .item-view-title{
width: 75%; width: 75%;
font-weight: bold; font-weight: bold;
@ -361,17 +370,19 @@
white-space: nowrap; white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width:59%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
justify-content: space-between;
padding:5rpx 0;
} }
.item-img{ .item-img{
width: 285rpx; width: 246rpx;
height: 120px; height: 206rpx;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.item-img img{ .item-img img{
border-radius: 14rpx; border-radius: 14rpx;
@ -393,19 +404,19 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.item { .item {
width: 96%; width: 96%;
margin: 0 2% ; margin: 0 auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
height: 140px; height: 140px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 21rpx;
margin-top:10px; margin-top:10px;
align-items: center; align-items: center;
padding: 0px 10px; padding: 12px;
} }
.item-detail { .item-detail {
padding: 5rpx 15rpx; padding: 5rpx 15rpx;