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

53
my/hongbao/xinrenhongbao.vue
View File

@ -28,14 +28,17 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</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%;
} }
@ -194,7 +225,7 @@
.youhui-view-right-top{ .youhui-view-right-top{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.youhui-view-right{ .youhui-view-right{
width: 502.08rpx; width: 502.08rpx;

55
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,18 +67,21 @@
</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>
</view> </view>
</checkbox-group> </checkbox-group>
</template> </template>
</t-refresh> </t-refresh>
<empty v-if="hongbao.length==0"></empty> <empty v-if="hongbao.length==0"></empty>
</view> </view>
</template> </template>
@ -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 = []; //如果是第一页需手动制空列表
@ -199,7 +206,7 @@
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.you-nav{ .you-nav{
background: #FFFFFF; background: #FFFFFF;
padding: 14px 25px 0px 25px; padding: 14px 25px 0px 25px;
@ -234,21 +241,27 @@
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{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.youhui-view-right{ .youhui-view-right{
width: 502.08rpx; width: 502.08rpx;

30
my/hongbao/youhuijuanList.vue
View File

@ -27,7 +27,7 @@
</view> </view>
</view> </view>
</checkbox-group> </checkbox-group>
</template> </template>
</t-refresh> </t-refresh>
<view @tap="queding()" class="queding"> <view @tap="queding()" class="queding">
<span class="que-btn">确定</span> <span class="que-btn">确定</span>
@ -136,7 +136,7 @@
url:'/my/order/payModifyPt' url:'/my/order/payModifyPt'
}) })
} }
}, },
checkboxChange(e){ checkboxChange(e){
this.couponId=e.detail.value.join(",") this.couponId=e.detail.value.join(",")
@ -147,7 +147,7 @@
}) })
}, },
getMyList() { getMyList() {
var data={ var data={
page:this.page, page:this.page,
limit:this.limit, limit:this.limit,
@ -172,7 +172,7 @@
this.getMyList(); this.getMyList();
} }
}, },
} }
</script> </script>
@ -207,7 +207,7 @@
align-items: center; align-items: center;
} }
/deep/uni-page-refresh{ /deep/uni-page-refresh{
display: none !important; display: none !important;
} }
/deep/.uni-checkbox-input{ /deep/.uni-checkbox-input{
border-radius: 50%; border-radius: 50%;
@ -230,7 +230,7 @@
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.you-nav{ .you-nav{
background: #FFFFFF; background: #FFFFFF;
padding: 14px 25px 0px 25px; padding: 14px 25px 0px 25px;
@ -266,20 +266,20 @@
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{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.youhui-view-right{ .youhui-view-right{
width: 502.08rpx; width: 502.08rpx;
@ -339,11 +339,11 @@
page { page {
background: #F5F5F5; background: #F5F5F5;
} }
.bg { .bg {
background: #FFFFFF; background: #FFFFFF;
} }
.box { .box {
width: 128upx; width: 128upx;
height: 60upx; height: 60upx;
@ -353,7 +353,7 @@
font-size: 30rpx; font-size: 30rpx;
z-index: 1; z-index: 1;
} }
.line { .line {
width: 48px; width: 48px;
height: 14rpx; height: 14rpx;
@ -366,12 +366,12 @@
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
.tanColor { .tanColor {
color: #019C88; color: #019C88;
font-weight: bold; font-weight: bold;
} }
.btn { .btn {
width: 140upx; width: 140upx;
height: 55upx; height: 55upx;

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 {

84
pages/my/cikarDrtail.vue
View File

@ -18,13 +18,13 @@
<span>{{mainData.sales}}</span> <span>{{mainData.sales}}</span>
<span> 人选择</span> <span> 人选择</span>
</view> </view>
</view> </view>
<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>
@ -52,7 +52,7 @@
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image> <image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
<span>最快30分钟上门</span> <span>最快30分钟上门</span>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -96,7 +96,7 @@
<span class="detail-foot-nav-bor"></span> <span class="detail-foot-nav-bor"></span>
</view> </view>
<view class="detail-foot-mian detail-pad"> <view class="detail-foot-mian detail-pad">
<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image> <image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>
<!-- <view class="lab-view"> <!-- <view class="lab-view">
<view class="detail-foot-mian-txet" v-for="item in labels" :key="item"> <view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
<span class="detail-foot-mian-txetList">{{item}}</span> <span class="detail-foot-mian-txetList">{{item}}</span>
@ -104,8 +104,8 @@
</view> --> </view> -->
</view> </view>
</view> </view>
<view class="detail-btn btn" v-if="dataList.name=='index'" @click="openpay(mainData)"> <view class="detail-btn btn" v-if="dataList.name=='index'" @click="openpay(mainData)">
立即购买 立即购买
</view> </view>
@ -191,7 +191,7 @@
}], }],
this.openWay = 2; this.openWay = 2;
// #endif // #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
this.openLists = [{ this.openLists = [{
image: '../../static/images/icon_weixin.png', image: '../../static/images/icon_weixin.png',
@ -293,7 +293,7 @@
}) })
that.getData() that.getData()
// this.$queue.showToast('支付成功'); // this.$queue.showToast('支付成功');
// uni.switchTab({ // uni.switchTab({
// url: '/pages/my/index' // url: '/pages/my/index'
// }) // })
@ -309,7 +309,7 @@
} }
}); });
// #endif // #endif
// #ifdef H5 // #ifdef H5
let ua = navigator.userAgent.toLowerCase(); let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) { if (ua.indexOf('micromessenger') != -1) {
@ -351,9 +351,9 @@
} }
}); });
} }
// #endif // #endif
// #ifdef APP // #ifdef APP
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -383,7 +383,7 @@
that.getData() that.getData()
}); });
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
let data = { let data = {
ordersId: that.tordersId, ordersId: that.tordersId,
@ -397,7 +397,7 @@
}); });
// #endif // #endif
} }
}, },
// 支付订单 // 支付订单
pay() { pay() {
@ -436,7 +436,7 @@
console.log('用户点击取消'); console.log('用户点击取消');
} }
} }
}) })
} else if (that.openWay == 2) { //微信支付 } else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...') that.$queue.showLoading('支付中...')
@ -464,7 +464,7 @@
}) })
that.getData() that.getData()
// this.$queue.showToast('支付成功'); // this.$queue.showToast('支付成功');
// uni.switchTab({ // uni.switchTab({
// url: '/pages/my/index' // url: '/pages/my/index'
// }) // })
@ -480,7 +480,7 @@
} }
}); });
// #endif // #endif
// #ifdef H5 // #ifdef H5
let ua = navigator.userAgent.toLowerCase(); let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) { if (ua.indexOf('micromessenger') != -1) {
@ -528,9 +528,9 @@
} }
}); });
} }
// #endif // #endif
// #ifdef APP // #ifdef APP
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -561,7 +561,7 @@
that.getData() that.getData()
}); });
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -614,7 +614,7 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
checkboxChange(e){ checkboxChange(e){
@ -633,7 +633,7 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
getData(){ getData(){
@ -671,9 +671,9 @@
} }
}) })
} }
}, },
} }
} }
</script> </script>
@ -793,7 +793,7 @@
/* #ifndef MP-WEIXIN */ /* #ifndef MP-WEIXIN */
/* height: 130px; */ /* height: 130px; */
/* #endif */ /* #endif */
} }
.pay_btn { .pay_btn {
width: 90%; width: 90%;
@ -805,7 +805,7 @@
color: #ffffff; color: #ffffff;
line-height: 80rpx; line-height: 80rpx;
} }
.dingdan-btn{ .dingdan-btn{
text-align: center; text-align: center;
width: 80px; width: 80px;
@ -984,7 +984,7 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
} }
.detail-foot-mian-img{ .detail-foot-mian-img{
width: 100%; width: 100%;
height:auto; height:auto;
@ -1003,7 +1003,7 @@
.detail-foot-mian-top,.detail-foot-mian-top-bottom{ .detail-foot-mian-top,.detail-foot-mian-top-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-size: 26rpx; font-size: 26rpx;
} }
.header-bottom-title-bottom span{ .header-bottom-title-bottom span{
@ -1027,7 +1027,7 @@
width: 34.03rpx; width: 34.03rpx;
height: 32.64rpx; height: 32.64rpx;
} }
.shouc{ .shouc{
display: flex; display: flex;
align-items: center; align-items: center;
@ -1087,8 +1087,8 @@
font-size: 22rpx; font-size: 22rpx;
color: #777777; color: #777777;
} }
.jianjie{ .jianjie{
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 22rpx;
@ -1173,31 +1173,31 @@
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;
flex-direction: row; flex-direction: row;
align-items: baseline; align-items: baseline;
} }
.header-bottom-money-view{ .header-bottom-money-view{
width: 100%; width: 100%;
display: flex; display: flex;
@ -1226,7 +1226,7 @@
font-size: 30rpx; font-size: 30rpx;
} }
.header-bottom-title-num span:nth-child(1){ .header-bottom-title-num span:nth-child(1){
font-weight: bold; font-weight: bold;
color: #08A28A; color: #08A28A;
} }
.header-bottom-title-num span:nth-child(2){ .header-bottom-title-num span:nth-child(2){
@ -1294,4 +1294,4 @@
font-size: 17px; font-size: 17px;
text-align: center; text-align: center;
} }
</style> </style>

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 {

83
pages/my/fuwuliaochengDetail.vue
View File

@ -18,13 +18,13 @@
<span>{{mainData.sales}}</span> <span>{{mainData.sales}}</span>
<span> 人选择</span> <span> 人选择</span>
</view> </view>
</view> </view>
<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>
@ -42,7 +42,7 @@
<span>{{liaoTime}}</span> <span>{{liaoTime}}</span>
</view> </view>
<view class="header-bottom-foot"> <view class="header-bottom-foot">
<view class="header-bottom-foot-cont"> <view class="header-bottom-foot-cont">
<!--<view class="header-bottom-foot-title">保障</view>--> <!--<view class="header-bottom-foot-title">保障</view>-->
<view class="header-bottom-foot-view"> <view class="header-bottom-foot-view">
@ -57,7 +57,7 @@
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image> <image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
<span>最快30分钟上门</span> <span>最快30分钟上门</span>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -101,7 +101,7 @@
<span class="detail-foot-nav-bor"></span> <span class="detail-foot-nav-bor"></span>
</view> </view>
<view class="detail-foot-mian"> <view class="detail-foot-mian">
<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image> <image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>
<!-- <view class="lab-view"> <!-- <view class="lab-view">
<view class="detail-foot-mian-txet" v-for="item in labels" :key="item"> <view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
<span class="detail-foot-mian-txetList">{{item}}</span> <span class="detail-foot-mian-txetList">{{item}}</span>
@ -109,7 +109,7 @@
</view> --> </view> -->
</view> </view>
</view> </view>
<view class="push-button"> <view class="push-button">
<view class="detail-btn" v-if="dataList.name=='index'" @click="openpay(mainData)"> <view class="detail-btn" v-if="dataList.name=='index'" @click="openpay(mainData)">
立即预约 立即预约
@ -184,7 +184,7 @@
that.getData() that.getData()
}, },
onShow() { onShow() {
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
this.openLists = [{ this.openLists = [{
image: '../../static/images/icon_weixin.png', image: '../../static/images/icon_weixin.png',
@ -201,7 +201,7 @@
}], }],
this.openWay = 2; this.openWay = 2;
// #endif // #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
this.openLists = [{ this.openLists = [{
image: '../../static/images/icon_weixin.png', image: '../../static/images/icon_weixin.png',
@ -302,7 +302,7 @@
}) })
that.getData() that.getData()
// this.$queue.showToast('支付成功'); // this.$queue.showToast('支付成功');
// uni.switchTab({ // uni.switchTab({
// url: '/pages/my/index' // url: '/pages/my/index'
// }) // })
@ -318,7 +318,7 @@
} }
}); });
// #endif // #endif
// #ifdef H5 // #ifdef H5
let ua = navigator.userAgent.toLowerCase(); let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) { if (ua.indexOf('micromessenger') != -1) {
@ -360,9 +360,9 @@
} }
}); });
} }
// #endif // #endif
// #ifdef APP // #ifdef APP
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -392,7 +392,7 @@
that.getData() that.getData()
}); });
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
let data = { let data = {
ordersId: that.tordersId, ordersId: that.tordersId,
@ -406,7 +406,7 @@
}); });
// #endif // #endif
} }
}, },
// 支付订单 // 支付订单
pay() { pay() {
@ -445,7 +445,7 @@
console.log('用户点击取消'); console.log('用户点击取消');
} }
} }
}) })
} else if (that.openWay == 2) { //微信支付 } else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...') that.$queue.showLoading('支付中...')
@ -473,7 +473,7 @@
}) })
that.getData() that.getData()
// this.$queue.showToast('支付成功'); // this.$queue.showToast('支付成功');
// uni.switchTab({ // uni.switchTab({
// url: '/pages/my/index' // url: '/pages/my/index'
// }) // })
@ -489,7 +489,7 @@
} }
}); });
// #endif // #endif
// #ifdef H5 // #ifdef H5
let ua = navigator.userAgent.toLowerCase(); let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) { if (ua.indexOf('micromessenger') != -1) {
@ -537,9 +537,9 @@
} }
}); });
} }
// #endif // #endif
// #ifdef APP // #ifdef APP
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -570,7 +570,7 @@
that.getData() that.getData()
}); });
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -623,7 +623,7 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
checkboxChange(e){ checkboxChange(e){
@ -642,11 +642,11 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
getData(){ getData(){
var that=this; var that=this;
if(that.dataList.name=='index'){ if(that.dataList.name=='index'){
@ -809,7 +809,7 @@
/* #ifndef MP-WEIXIN */ /* #ifndef MP-WEIXIN */
/* height: 130px; */ /* height: 130px; */
/* #endif */ /* #endif */
} }
.pay_btn { .pay_btn {
width: 90%; width: 90%;
@ -821,7 +821,7 @@
color: #ffffff; color: #ffffff;
line-height: 80rpx; line-height: 80rpx;
} }
.dingdan-btn{ .dingdan-btn{
text-align: center; text-align: center;
width: 80px; width: 80px;
@ -949,7 +949,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.header-bottom-title-liao{ .header-bottom-title-liao{
padding: 3px 8px; padding: 3px 8px;
height: 16px; height: 16px;
@ -992,7 +992,7 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
} }
.detail-foot-mian-img{ .detail-foot-mian-img{
width: 100%; width: 100%;
height:auto; height:auto;
@ -1040,7 +1040,7 @@
width: 34.03rpx; width: 34.03rpx;
height: 32.64rpx; height: 32.64rpx;
} }
.shouc{ .shouc{
display: flex; display: flex;
align-items: center; align-items: center;
@ -1072,7 +1072,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.tese span:nth-child(1){ .tese span:nth-child(1){
font-weight: bold; font-weight: bold;
font-size: 22rpx; font-size: 22rpx;
@ -1113,7 +1113,7 @@
font-size: 22rpx; font-size: 22rpx;
color: #777777; color: #777777;
} }
.detail-foot-mian{ .detail-foot-mian{
width: 95%; width: 95%;
display: flex; display: flex;
@ -1206,30 +1206,31 @@
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;
flex-direction: row; flex-direction: row;
align-items: baseline; align-items: baseline;
} }
.header-bottom-money-view{ .header-bottom-money-view{
width: 100%; width: 100%;
display: flex; display: flex;
@ -1327,4 +1328,4 @@
font-size: 17px; font-size: 17px;
text-align: center; text-align: center;
} }
</style> </style>

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;

36
pages/my/myMsOderDrtail.vue
View File

@ -21,7 +21,7 @@
</view> </view>
<view class="header-bottom"> <view class="header-bottom">
<view class="header-bottom-top"> <view class="header-bottom-top">
<view class="header-bottom-title"> <view class="header-bottom-title">
<view class="header-bottom-title-text"> <view class="header-bottom-title-text">
<span>{{getList.title}}</span> <span>{{getList.title}}</span>
@ -33,13 +33,13 @@
<span>{{getList.sales}}</span> <span>{{getList.sales}}</span>
<span> 人选择</span> <span> 人选择</span>
</view> </view>
</view> </view>
<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}}
@ -62,7 +62,7 @@
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image> <image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
<span>最快30分钟上门</span> <span>最快30分钟上门</span>
</view> </view>
</view> </view>
</view> </view>
<!--<view class="header-bottom-foot"> <!--<view class="header-bottom-foot">
<view class="header-bottom-foot-title">服务保障</view> <view class="header-bottom-foot-title">服务保障</view>
@ -79,7 +79,7 @@
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image> <image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
<span>最快30分钟上门</span> <span>最快30分钟上门</span>
</view> </view>
</view> </view>
</view>--> </view>-->
</view> </view>
</view> </view>
@ -92,7 +92,7 @@
<view class="detail-foot-mian-top"> <view class="detail-foot-mian-top">
<span class="detail-foot-mian-top-title">性别限制: </span> <span class="detail-foot-mian-top-title">性别限制: </span>
<span class="detail-foot-mian-top-text">不限性别</span> <span class="detail-foot-mian-top-text">不限性别</span>
</view> </view>
<view class="detail-foot-mian-top-bottom"> <view class="detail-foot-mian-top-bottom">
<span class="detail-foot-mian-top-title">适应人群: </span> <span class="detail-foot-mian-top-title">适应人群: </span>
<span class="detail-foot-mian-top-text"> <span class="detail-foot-mian-top-text">
@ -107,7 +107,7 @@
<span class="detail-foot-nav-bor"></span> <span class="detail-foot-nav-bor"></span>
</view> </view>
<view class="detail-foot-mian"> <view class="detail-foot-mian">
<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image> <image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>
</view> </view>
</view> </view>
<view class="detail-btn" v-if="dataList.status=='0'" @click="goumai(getList)"> <view class="detail-btn" v-if="dataList.status=='0'" @click="goumai(getList)">
@ -205,7 +205,7 @@
text-align: center; text-align: center;
background: linear-gradient(-90deg, #FF6F48, #FF9E69); background: linear-gradient(-90deg, #FF6F48, #FF9E69);
border-radius: 7px; border-radius: 7px;
margin-left: 5px; margin-left: 5px;
font-size: 10px; font-size: 10px;
border-top-left-radius: 20px; border-top-left-radius: 20px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
@ -292,7 +292,7 @@
width: 34.03rpx; width: 34.03rpx;
height: 32.64rpx; height: 32.64rpx;
} }
.shouc{ .shouc{
display: flex; display: flex;
align-items: center; align-items: center;
@ -324,9 +324,9 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 5rpx 0rpx; padding: 5rpx 0rpx;
} }
.tese span:nth-child(1){ .tese span:nth-child(1){
font-weight: bold; font-weight: bold;
font-size: 22rpx; font-size: 22rpx;
@ -367,7 +367,7 @@
font-size: 22rpx; font-size: 22rpx;
color: #777777; color: #777777;
} }
.detail-foot-mian{ .detail-foot-mian{
width: 95%; width: 95%;
display: flex; display: flex;
@ -509,21 +509,21 @@
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;
flex-direction: row; flex-direction: row;
align-items: baseline; align-items: baseline;
} }
.header-bottom-money-view{ .header-bottom-money-view{
width: 100%; width: 100%;
display: flex; display: flex;
@ -603,4 +603,4 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
</style> </style>

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;