From dca866d9002d70ff8ba10b2742052561510f7bf8 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 26 Jul 2024 16:25:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/msg/im.vue | 5 +++--
pages/my/index.vue | 10 +++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/pages/msg/im.vue b/pages/msg/im.vue
index c2b5600..f611134 100644
--- a/pages/msg/im.vue
+++ b/pages/msg/im.vue
@@ -144,8 +144,9 @@
},
onLoad(d) {
this.userId = this.$queue.getData('userId');
- this.byUserId = d.byUserId
- this.chatConversationId = d.chatConversationId;
+ let scoket = uni.getStorageSync('wbescokt')
+ this.byUserId = scoket.byUserId
+ this.chatConversationId = scoket.chatConversationId;
this.connect();
},
computed: {
diff --git a/pages/my/index.vue b/pages/my/index.vue
index a131e57..59b81db 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -262,9 +262,13 @@
if (res.data) {
let id = this.ordersId == res.data.userId ? res.data.focusedUserId : this.ordersId
uni.navigateTo({
- url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
- '&byUserId=' + res.data.userId
- })
+ url: '/pages/msg/im'
+ });
+ var list={
+ chatConversationId:res.data.chatConversationId,
+ byUserId:res.data.userId
+ }
+ uni.setStorageSync('wbescokt',list)
}
})
},
From 91fdcf3c1daa1968e8098b45b8538167094df543 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 26 Jul 2024 16:26:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/my/index.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pages/my/index.vue b/pages/my/index.vue
index c8fc9f3..bfa1323 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -260,14 +260,15 @@
this.$Request.postJson('/app/chat/insertChatConversation', data).then(res => {
if (res.data) {
let id = this.ordersId == res.data.userId ? res.data.focusedUserId : this.ordersId
- uni.navigateTo({
- url: '/pages/msg/im'
- });
+
var list={
chatConversationId:res.data.chatConversationId,
byUserId:res.data.userId
}
uni.setStorageSync('wbescokt',list)
+ uni.navigateTo({
+ url: '/pages/msg/im'
+ });
}
})
},
From bb3f7d341d0c45be98a0ab2c57f7e99157db2b8d Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 26 Jul 2024 17:19:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/my/index.vue | 88 ++++++++++++++++++++++------------------------
1 file changed, 42 insertions(+), 46 deletions(-)
diff --git a/pages/my/index.vue b/pages/my/index.vue
index bfa1323..a131e57 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -15,7 +15,7 @@
{{vipNameType=='0'?'':vipNameType=='1'?'':''}}
-
+
{{phone}}
@@ -38,9 +38,9 @@
钱包金额(元)
{{money}}
-
+
-
+
充值
@@ -106,11 +106,11 @@
- 拼团
+ 新人拼团
- 限时秒杀
+ 秒杀
@@ -133,7 +133,7 @@
{{item.classifyName}}
已售{{item.sales}} | 好评{{item.esteemRate}}%
-->
-
+
¥
@@ -146,7 +146,7 @@
¥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
¥{{item.oldPrice}}/套
-
+
{{tag}}
@@ -162,14 +162,15 @@
查看
-
+
-当你累了 想起盛安到家-
+ 联系客服
-
+
@@ -207,7 +207,7 @@
align-items: center;
}
/deep/uni-page-refresh{
- display: none !important;
+ display: none !important;
}
/deep/.uni-checkbox-input{
border-radius: 50%;
@@ -230,7 +230,7 @@
width: 100%;
overflow: hidden;
}
-
+
.you-nav{
background: #FFFFFF;
padding: 14px 25px 0px 25px;
@@ -266,20 +266,20 @@
margin-left: 10px;
}
.youhui-view-right-time{
- font-weight: 400;
- font-size: 22rpx;
+ /*font-weight: 400;*/
+ font-size: 30rpx;
color: #999999;
}
.youhui-view-right-title{
width: 260rpx;
font-weight: 400;
- font-size: 28rpx;
+ font-size: 30rpx;
color: #333333;
}
.youhui-view-right-top{
display: flex;
flex-direction: column;
- align-items: center;
+ align-items: center;
}
.youhui-view-right{
width: 502.08rpx;
@@ -339,11 +339,11 @@
page {
background: #F5F5F5;
}
-
+
.bg {
background: #FFFFFF;
}
-
+
.box {
width: 128upx;
height: 60upx;
@@ -353,7 +353,7 @@
font-size: 30rpx;
z-index: 1;
}
-
+
.line {
width: 48px;
height: 14rpx;
@@ -366,12 +366,12 @@
left: 50%;
transform: translateX(-50%);
}
-
+
.tanColor {
color: #019C88;
font-weight: bold;
}
-
+
.btn {
width: 140upx;
height: 55upx;
diff --git a/pages/my/cika.vue b/pages/my/cika.vue
index fb9eb22..878cbfc 100644
--- a/pages/my/cika.vue
+++ b/pages/my/cika.vue
@@ -53,18 +53,19 @@
{{item.classifyName}}
- ¥
- {{item.price}}
+
+ ¥{{item.price}}
/{{item.serviceCount}}次
- ¥
- {{item.oldPrice}}/{{item.serviceCount}}次
-
-
- {{tag}}
-
-
- 助眠解压
+ ¥{{item.oldPrice}}/{{item.serviceCount}}次
+
+
+ {{tag}}
+
+
+ 助眠解压
+
+
已售{{item.sales}}
@@ -194,9 +195,7 @@
margin-bottom: 8rpx;
color: #f68607;
}
- .item-view-bottom-qian{
- margin-top: 5px;
- }
+
.item-view-bottom-btn{
text-align: center;
width: 131rpx;
@@ -208,36 +207,43 @@
font-size: 28rpx;
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){
- font-size: 26rpx;
+ font-size: 28rpx;
color: #848484;
text-decoration-line: line-through;
- }
- .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(4){
+ font-size: 28rpx;
+ color: #848484;
+ text-decoration-line: line-through;
+ margin-left: 5px;
+ }
.item-view-bottom-qian span:nth-child(3){
- font-size: 26rpx;
- color: #F95900;
+ font-weight: 400;
+ 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{
- width: 100%;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
}
.item-view-jianjie{
font-weight: 400;
@@ -271,21 +277,23 @@
color: #ff8600;
}
.item-view-xiangmu span:nth-child(2){
- font-weight: normal;
- color: #666666;
+ font-weight: normal;
+ color: #333333;
+ font-size: 30rpx;
}
.item-view-xiangmu span:nth-child(1){
- font-weight: normal;
- color: #999;
- margin-right: 5rpx;
+ font-weight: normal;
+ color: #666666;
+ 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;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ font-weight: 400;
+ font-size: 25rpx;
+ align-items: flex-end;
}
.item-view-title{
width: 76%;
@@ -297,19 +305,19 @@
white-space: nowrap;
}
.item-view{
- width: 55%;
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: center;
- justify-content: space-between;
- padding: 10rpx 0;
+ width:59%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ justify-content: space-between;
+ padding:5rpx 0;
}
.item-img{
- width: 285rpx;
- height: 120px;
- border-radius: 14rpx;
- position: relative;
+ width: 246rpx;
+ height: 206rpx;
+ border-radius: 14rpx;
+ position: relative;
}
.item-img img{
border-radius: 14rpx;
@@ -333,17 +341,17 @@
border-radius: 14rpx;
}
.item {
- width:96%;
- margin:0 auto ;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- height: 140px;
- background: #FFFFFF;
- border-radius: 21rpx;
- margin-top:10px;
- align-items: center;
- padding:12px;
+ width: 96%;
+ margin: 0 auto;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ height: 140px;
+ background: #FFFFFF;
+ border-radius: 21rpx;
+ margin-top:10px;
+ align-items: center;
+ padding: 12px;
}
.item-detail {
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index 475d6c6..53bf9c7 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -18,13 +18,13 @@
{{mainData.sales}}
人选择
-
+
+
@@ -96,7 +96,7 @@
-
-
+
+
立即购买
@@ -191,7 +191,7 @@
}],
this.openWay = 2;
// #endif
-
+
// #ifdef MP-WEIXIN
this.openLists = [{
image: '../../static/images/icon_weixin.png',
@@ -293,7 +293,7 @@
})
that.getData()
// this.$queue.showToast('支付成功');
-
+
// uni.switchTab({
// url: '/pages/my/index'
// })
@@ -309,7 +309,7 @@
}
});
// #endif
-
+
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@@ -351,9 +351,9 @@
}
});
}
-
+
// #endif
-
+
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@@ -383,7 +383,7 @@
that.getData()
});
// #endif
-
+
// #ifdef APP-PLUS
let data = {
ordersId: that.tordersId,
@@ -397,7 +397,7 @@
});
// #endif
}
-
+
},
// 支付订单
pay() {
@@ -436,7 +436,7 @@
console.log('用户点击取消');
}
}
-
+
})
} else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...')
@@ -464,7 +464,7 @@
})
that.getData()
// this.$queue.showToast('支付成功');
-
+
// uni.switchTab({
// url: '/pages/my/index'
// })
@@ -480,7 +480,7 @@
}
});
// #endif
-
+
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@@ -528,9 +528,9 @@
}
});
}
-
+
// #endif
-
+
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@@ -561,7 +561,7 @@
that.getData()
});
// #endif
-
+
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@@ -614,7 +614,7 @@
} else {
that.$queue.showToast(res.msg)
}
-
+
});
},
checkboxChange(e){
@@ -633,7 +633,7 @@
} else {
that.$queue.showToast(res.msg)
}
-
+
});
},
getData(){
@@ -671,9 +671,9 @@
}
})
}
-
+
},
-
+
}
}
@@ -793,7 +793,7 @@
/* #ifndef MP-WEIXIN */
/* height: 130px; */
/* #endif */
-
+
}
.pay_btn {
width: 90%;
@@ -805,7 +805,7 @@
color: #ffffff;
line-height: 80rpx;
}
-
+
.dingdan-btn{
text-align: center;
width: 80px;
@@ -984,7 +984,7 @@
font-size: 14px;
font-weight: bold;
}
-
+
.detail-foot-mian-img{
width: 100%;
height:auto;
@@ -1003,7 +1003,7 @@
.detail-foot-mian-top,.detail-foot-mian-top-bottom{
width: 100%;
display: flex;
- flex-direction: row;
+ flex-direction: row;
font-size: 26rpx;
}
.header-bottom-title-bottom span{
@@ -1027,7 +1027,7 @@
width: 34.03rpx;
height: 32.64rpx;
}
-
+
.shouc{
display: flex;
align-items: center;
@@ -1087,8 +1087,8 @@
font-size: 22rpx;
color: #777777;
}
-
-
+
+
.jianjie{
font-weight: 400;
font-size: 22rpx;
@@ -1173,31 +1173,31 @@
align-items: center;
}
.header-bottom-money-jia{
- font-size: 28rpx;
- color: #848484;
- line-height: 37rpx;
- margin-left: 5px;
- text-decoration: line-through;
+ font-size: 28rpx;
+ color: #848484;
+ line-height: 37rpx;
+ text-decoration-line: line-through;
+ margin-left: 5px;
}
.header-bottom-money-zhen span{
color: #FF1200;
}
.header-bottom-money-zhen span:nth-child(1){
- font-size: 25rpx;
+ font-size: 28rpx;
}
.header-bottom-money-zhen span:nth-child(2){
- font-size:40rpx;
+ font-size:38rpx;
font-weight: bold;
}
.header-bottom-money-zhen span:nth-child(3){
- font-size: 25rpx;
+ font-size: 28rpx;
}
.header-bottom-money-zhen{
display: flex;
flex-direction: row;
align-items: baseline;
}
-
+
.header-bottom-money-view{
width: 100%;
display: flex;
@@ -1226,7 +1226,7 @@
font-size: 30rpx;
}
.header-bottom-title-num span:nth-child(1){
- font-weight: bold;
+ font-weight: bold;
color: #08A28A;
}
.header-bottom-title-num span:nth-child(2){
@@ -1294,4 +1294,4 @@
font-size: 17px;
text-align: center;
}
-
\ No newline at end of file
+
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index defa7d7..514f380 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -34,26 +34,24 @@
{{item.classifyName}}
已售{{item.sales}} | 好评{{item.esteemRate}}%
-->
-
-
-
- ¥
- {{item.price}}
-
- /{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
-
- /套
-
- ¥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
- ¥{{item.oldPrice}}/套
+
+
+ ¥{{item.price}}
+
+ /套
+ /{{item.serviceCount?item.serviceCount:''}}次
+ ¥{{item.oldPrice}}
+
+ /套
+ /{{item.serviceCount?item.serviceCount:''}}次
+
+
+
+ {{tag}}
+
+
+ 助眠解压
-
-
-
- {{tag}}
-
-
- 助眠解压
@@ -232,33 +230,41 @@
font-size: 28rpx;
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){
- font-size: 26rpx;
+ font-size: 28rpx;
color: #848484;
text-decoration-line: line-through;
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(3){
+ 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(3){
- font-size: 26rpx;
- color: #FF1200;
- }
+ .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{
- width: 100%;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- align-items: center;
- margin-top: 12rpx;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
}
.item-view-jianjie{
font-weight: 400;
@@ -292,21 +298,23 @@
color: #ff8600;
}
.item-view-xiangmu span:nth-child(2){
- font-weight: normal;
- color: #666666;
+ font-weight: normal;
+ color: #333333;
+ font-size: 30rpx;
}
.item-view-xiangmu span:nth-child(1){
- font-weight: normal;
- color: #999;
- margin-right: 5rpx;
+ font-weight: normal;
+ color: #666666;
+ 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;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ font-weight: 400;
+ font-size: 25rpx;
+ align-items: flex-end;
}
.item-view-title{
font-weight: bold;
@@ -314,17 +322,19 @@
color: #333333;
}
.item-view{
- width: 55%;
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: center;
+ width:59%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ justify-content: space-between;
+ padding:5rpx 0;
}
.item-img{
- width: 285rpx;
- height: 120px;
- border-radius: 14rpx;
- position: relative;
+ width: 246rpx;
+ height: 206rpx;
+ border-radius: 14rpx;
+ position: relative;
}
.img-span{
padding: 2px 5px;
diff --git a/pages/my/fuwuliaocheng.vue b/pages/my/fuwuliaocheng.vue
index 8641e2d..ee55618 100644
--- a/pages/my/fuwuliaocheng.vue
+++ b/pages/my/fuwuliaocheng.vue
@@ -53,17 +53,19 @@
{{item.classifyName}}
- ¥
- {{item.price}}
+
+ ¥{{item.price}}
/{{item.serviceCount}}次
- ¥{{item.oldPrice}}/{{item.serviceCount}}次
-
-
- {{tag}}
-
-
- 助眠解压
+ ¥{{item.oldPrice}}/{{item.serviceCount}}次
+
+
+ {{tag}}
+
+
+ 助眠解压
+
+
已售{{item.sales}}
@@ -195,9 +197,7 @@
margin-bottom: 8rpx;
color: #f68607;
}
- .item-view-bottom-qian{
- margin-top: 5px;
- }
+
.item-view-bottom-btn{
text-align: center;
width: 131rpx;
@@ -209,36 +209,40 @@
color: #FFFFFF;
}
.item-view-bottom-qian span:nth-child(5){
- font-size: 26rpx;
+ font-size: 28rpx;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(4){
- font-size: 26rpx;
+ font-size: 28rpx;
color: #848484;
text-decoration-line: line-through;
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){
font-weight: 400;
- font-size: 26rpx;
- 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{
- width: 100%;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
}
.item-view-jianjie{
font-weight: 400;
@@ -271,22 +275,24 @@
background-color:#fcf3da;
color: #ff8600;
}
-.item-view-xiangmu span:nth-child(2){
- font-weight: normal;
- color: #666666;
+ .item-view-xiangmu span:nth-child(2){
+ font-weight: normal;
+ color: #333333;
+ font-size: 30rpx;
}
.item-view-xiangmu span:nth-child(1){
- font-weight: normal;
- color: #999;
- margin-right: 5rpx;
+ font-weight: normal;
+ color: #666666;
+ 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;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ font-weight: 400;
+ font-size: 25rpx;
+ align-items: flex-end;
}
.item-view-title{
width: 76%;
@@ -298,18 +304,19 @@
white-space: nowrap;
}
.item-view{
- width: 55%;
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- padding: 10rpx 0;
+ width:59%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ justify-content: space-between;
+ padding:5rpx 0;
}
.item-img{
- width: 285rpx;
- height: 120px;
- border-radius: 14rpx;
- position: relative;
+ width: 246rpx;
+ height: 206rpx;
+ border-radius: 14rpx;
+ position: relative;
}
.img-span{
padding: 2px 5px;
@@ -330,17 +337,17 @@
border-radius: 14rpx;
}
.item {
- width: 96%;
- margin: 0 auto;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- height: 140px;
- background: #FFFFFF;
- border-radius: 21rpx;
- margin-top:10px;
- align-items: center;
- padding: 12px;
+ width: 96%;
+ margin: 0 auto;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ height: 140px;
+ background: #FFFFFF;
+ border-radius: 21rpx;
+ margin-top:10px;
+ align-items: center;
+ padding: 12px;
}
.item-detail {
diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue
index 5b28b98..77af9d7 100644
--- a/pages/my/fuwuliaochengDetail.vue
+++ b/pages/my/fuwuliaochengDetail.vue
@@ -18,13 +18,13 @@
{{mainData.sales}}
人选择
-
+
@@ -101,7 +101,7 @@
-
+
立即预约
@@ -184,7 +184,7 @@
that.getData()
},
onShow() {
-
+
// #ifndef MP-WEIXIN
this.openLists = [{
image: '../../static/images/icon_weixin.png',
@@ -201,7 +201,7 @@
}],
this.openWay = 2;
// #endif
-
+
// #ifdef MP-WEIXIN
this.openLists = [{
image: '../../static/images/icon_weixin.png',
@@ -302,7 +302,7 @@
})
that.getData()
// this.$queue.showToast('支付成功');
-
+
// uni.switchTab({
// url: '/pages/my/index'
// })
@@ -318,7 +318,7 @@
}
});
// #endif
-
+
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@@ -360,9 +360,9 @@
}
});
}
-
+
// #endif
-
+
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@@ -392,7 +392,7 @@
that.getData()
});
// #endif
-
+
// #ifdef APP-PLUS
let data = {
ordersId: that.tordersId,
@@ -406,7 +406,7 @@
});
// #endif
}
-
+
},
// 支付订单
pay() {
@@ -445,7 +445,7 @@
console.log('用户点击取消');
}
}
-
+
})
} else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...')
@@ -473,7 +473,7 @@
})
that.getData()
// this.$queue.showToast('支付成功');
-
+
// uni.switchTab({
// url: '/pages/my/index'
// })
@@ -489,7 +489,7 @@
}
});
// #endif
-
+
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@@ -537,9 +537,9 @@
}
});
}
-
+
// #endif
-
+
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@@ -570,7 +570,7 @@
that.getData()
});
// #endif
-
+
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@@ -623,7 +623,7 @@
} else {
that.$queue.showToast(res.msg)
}
-
+
});
},
checkboxChange(e){
@@ -642,11 +642,11 @@
} else {
that.$queue.showToast(res.msg)
}
-
+
});
},
-
-
+
+
getData(){
var that=this;
if(that.dataList.name=='index'){
@@ -809,7 +809,7 @@
/* #ifndef MP-WEIXIN */
/* height: 130px; */
/* #endif */
-
+
}
.pay_btn {
width: 90%;
@@ -821,7 +821,7 @@
color: #ffffff;
line-height: 80rpx;
}
-
+
.dingdan-btn{
text-align: center;
width: 80px;
@@ -949,7 +949,7 @@
justify-content: center;
align-items: center;
}
-
+
.header-bottom-title-liao{
padding: 3px 8px;
height: 16px;
@@ -992,7 +992,7 @@
font-size: 14px;
font-weight: bold;
}
-
+
.detail-foot-mian-img{
width: 100%;
height:auto;
@@ -1040,7 +1040,7 @@
width: 34.03rpx;
height: 32.64rpx;
}
-
+
.shouc{
display: flex;
align-items: center;
@@ -1072,7 +1072,7 @@
flex-direction: column;
align-items: center;
}
-
+
.tese span:nth-child(1){
font-weight: bold;
font-size: 22rpx;
@@ -1113,7 +1113,7 @@
font-size: 22rpx;
color: #777777;
}
-
+
.detail-foot-mian{
width: 95%;
display: flex;
@@ -1206,30 +1206,31 @@
align-items: center;
}
.header-bottom-money-jia{
- font-size: 28rpx;
- color: #848484;
- margin-left: 5px;
- text-decoration: line-through;
+ font-size: 28rpx;
+ color: #848484;
+ line-height: 37rpx;
+ text-decoration-line: line-through;
+ margin-left: 5px;
}
.header-bottom-money-zhen span{
color: #FF1200;
}
.header-bottom-money-zhen span:nth-child(1){
- font-size: 25rpx;
+ font-size: 28rpx;
}
.header-bottom-money-zhen span:nth-child(2){
- font-size:46rpx;
+ font-size:38rpx;
font-weight: bold;
}
.header-bottom-money-zhen span:nth-child(3){
- font-size: 25rpx;
+ font-size: 28rpx;
}
.header-bottom-money-zhen{
display: flex;
flex-direction: row;
align-items: baseline;
}
-
+
.header-bottom-money-view{
width: 100%;
display: flex;
@@ -1327,4 +1328,4 @@
font-size: 17px;
text-align: center;
}
-
\ No newline at end of file
+
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index a75232b..0ce3f41 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -33,25 +33,22 @@
{{item.title}}
-
-
-
- ¥
- {{item.price}}
-
- ¥
- {{item.oldPrice}}
+
+
+ ¥{{item.price}}
+ ¥{{item.oldPrice}}
+
+
+
+ {{tag}}
+
+
+ 助眠解压
-
- {{tag}}
-
-
- 助眠解压
-
-
- 已售{{item.sales}}
+
+ 已售{{item.sales}}
查看
@@ -245,37 +242,42 @@
font-size: 28rpx;
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){
- font-size: 26rpx;
- color: #848484;
- text-decoration-line: line-through;
- }
- .item-view-bottom-qian span:nth-child(1){
- font-weight: 400;
- font-size: 25rpx;
- color: #FF1200;
- }
+ font-size: 28rpx;
+ color: #848484;
+ text-decoration-line: line-through;
+ }
+ .item-view-bottom-qian span:nth-child(4){
+ font-size: 28rpx;
+ color: #848484;
+ 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){
font-weight: bold !important;
font-size: 36.81rpx !important;
color: #FF1200 !important;
}
- .item-view-bottom-qian span:nth-child(3){
- font-weight: 400;
- font-size: 26rpx;
- color: #F95900;
- }
+ .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{
- width: 100%;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- align-items: center;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
}
.item-view-jianjie{
font-weight: 400;
@@ -311,17 +313,25 @@
background-color:#fcf3da;
color: #ff8600;
}
+
.item-view-xiangmu span:nth-child(2){
- font-weight: normal;
- color: #666666;
+ font-weight: normal;
+ 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{
- width: 100%;
- display: flex;
- flex-direction: row;
- font-weight: 400;
- font-size: 21rpx;
- margin-top: 5px;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ font-weight: 400;
+ font-size: 25rpx;
+ align-items: flex-end;
}
.item-view-title{
width: 76%;
@@ -333,17 +343,19 @@
white-space: nowrap;
}
.item-view{
- width: 55%;
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: center;
+ width:59%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ justify-content: space-between;
+ padding:5rpx 0;
}
.item-img{
- width: 285rpx;
- height: 120px;
- border-radius: 14rpx;
- position: relative;
+ width: 246rpx;
+ height: 206rpx;
+ border-radius: 14rpx;
+ position: relative;
}
.img-span{
padding: 2px 5px;
@@ -363,17 +375,17 @@
height: 100%;
}
.item {
- width: 96%;
- margin: 2% auto;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- height: 140px;
- background: #FFFFFF;
- border-radius: 21rpx;
- margin-top:10px;
- align-items: center;
- padding: 12px;
+ width: 96%;
+ margin: 0 auto;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ height: 140px;
+ background: #FFFFFF;
+ border-radius: 21rpx;
+ margin-top:10px;
+ align-items: center;
+ padding: 12px;
}
.item-detail {
@@ -397,7 +409,7 @@
width:100%;
}
/deep/.zp-paging-container-content{
- width: 95%;
+ width: 100%;
margin: 0 auto;
}
.fenlei{
diff --git a/pages/my/index.vue b/pages/my/index.vue
index a131e57..e047752 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -15,7 +15,7 @@
{{vipNameType=='0'?'':vipNameType=='1'?'':''}}
-
+
{{phone}}
@@ -38,9 +38,9 @@
钱包金额(元)
{{money}}
-
+
-
+
充值
@@ -106,11 +106,11 @@
- 新人拼团
+ 拼团
- 秒杀
+ 限时秒杀
@@ -133,7 +133,7 @@
{{item.classifyName}}
已售{{item.sales}} | 好评{{item.esteemRate}}%
-->
-
+
¥
@@ -146,7 +146,7 @@
¥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
¥{{item.oldPrice}}/套
-
+
{{tag}}
@@ -162,7 +162,7 @@
查看
-
+
-当你累了 想起盛安到家-
@@ -170,7 +170,7 @@
联系客服
-
+