diff --git a/my/gird/shoucang.vue b/my/gird/shoucang.vue
index 881eec8..9e3a7cc 100644
--- a/my/gird/shoucang.vue
+++ b/my/gird/shoucang.vue
@@ -343,8 +343,11 @@
border-bottom-left-radius: 10rpx;
}
.byy_view {
- color: #000000;
+ color: #666;
background-color: #ebebeb;
+ border-radius: 20rpx;
+ font-size: 24rpx;
+ padding: 3rpx 20rpx;
}
.kfw_view {
diff --git a/my/order/pay.vue b/my/order/pay.vue
index f0dfc62..2bf9ca2 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -313,8 +313,7 @@
联系客服
-
+
取消订单
联系客服
-
取消订单
@@ -556,8 +555,8 @@
orderList: [],
loading: true,
customStyle: {
- // backgroundColor: '#e5e5e5',
- // color: '#FFFFFF',
+ backgroundColor: '#e5e5e5',
+ color: '#FFFFFF',
// #ifdef MP-WEIXIN
width: "310upx",
@@ -570,7 +569,7 @@
},
customStyle2: {
backgroundColor: '',
- color: '#FFFFFF',
+ color: '#fff',
// #ifdef MP-WEIXIN
width: "310upx",
// #endif
diff --git a/pages/my/cika.vue b/pages/my/cika.vue
index 0479b97..c034d2e 100644
--- a/pages/my/cika.vue
+++ b/pages/my/cika.vue
@@ -64,7 +64,7 @@
- 已售已售{{item.sales}}w+
+ 已售{{item.sales}}w+
查看
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index a657705..1fe5b46 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -25,11 +25,12 @@
-
- {{item.title}}
+
+ {{item.title}}
+ {{item.classifyName}}
- {{item.classifyName}}
+
￥
{{item.price}}
@@ -40,8 +41,11 @@
{{item.jianjie}}
+
- 已售{{item.sales}}w+
+
+ 已售{{item.sales}}w+
+
查看
@@ -216,7 +220,7 @@
}
.item-view-bottom-qian span:nth-child(3){
font-weight: 400;
- font-size: 20rpx;
+ font-size: 26rpx;
color: #F95900;
}
.item-view-bottom{
@@ -238,18 +242,19 @@
text-overflow: ellipsis;
}
.item-view-biao{
- padding: 1px 2px;
- border-radius: 6rpx;
+ border-radius: 15rpx 3rpx 15rpx 3rpx;
}
.tuina{
background-color:#d1f2df;
color: #17984d;
}
.xiaoer{
- padding: 2px 8px;
+ width: 120rpx;
+ height: 35rpx;
+ line-height: 35rpx;
+ text-align: center;
background-color:#f1f8d7;
color: #58b314;
- border-radius: 3px;
font-size: 20rpx;
}
.taishi{
@@ -273,9 +278,13 @@
margin-top: 5px;
}
.item-view-title{
+ width: 76%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.item-view{
width: 55%;
@@ -432,5 +441,9 @@
justify-content: space-between;
background-color: #fff;
}
-
+ .view-cata{
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 27c650b..8510ca0 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -72,7 +72,6 @@
titleNmae:'',
classifyId:'',
getName:'',
- scrollTop: false,
}
},
onLoad(e){
@@ -85,17 +84,6 @@
this.page = 1;
this.getData()
},
- onPageScroll: function(e) {
- this.scrollTop = e.scrollTop > 200;
- },
- onReachBottom: function() {
- this.page = this.page + 1;
- this.getData('');
- },
- onPullDownRefresh: function() {
- this.page = 1;
- this.getData('Refresh');
- },
methods: {
// 加载更多
loadMore: async function() {
@@ -174,15 +162,14 @@
background-color: #f7f7f7;
}
/deep/.refresh-body{
- border-top: 2px solid #f7f7f7;
- margin-top: 50px;
- height: 800px !important;
- overflow: scroll;
+ height: 100% !important;
+ border-top: 2px solid #f7f7f7;
+ margin: 50px 0px;
}
.content-view{
width: 100%;
height: 100vh;
- overflow: scroll;
+ overflow: auto;
background-color: #f7f7f7;
position: relative;
}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 81b5617..e9266a5 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -19,16 +19,16 @@
{{item.artificerName}}
- {{item.ordersNo}}待支付
- {{item.ordersNo}}待服务
- {{item.ordersNo}}待评价
- {{item.ordersNo}}已取消
- {{item.ordersNo}}已完成
- {{item.ordersNo}}服务中
- {{item.ordersNo}}技师出发
- {{item.ordersNo}}技师到达
- {{item.ordersNo}}待确认
- {{item.ordersNo}}待补单
+ {{item.ordersNo}}待支付
+ {{item.ordersNo}}待服务
+ {{item.ordersNo}}待评价
+ {{item.ordersNo}}已取消
+ {{item.ordersNo}}已完成
+ {{item.ordersNo}}服务中
+ {{item.ordersNo}}技师出发
+ {{item.ordersNo}}技师到达
+ {{item.ordersNo}}待确认
+ {{item.ordersNo}}待补单
@@ -48,10 +48,10 @@
{{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
-
+
预约时间：{{item.serveTime}}
-
+
实付：￥{{item.payMoneyTotal}}
@@ -127,21 +127,24 @@
更多
-
- 取消订单
-
-
- 充值
-
-
- 加钟
-
+
+
+ 取消订单
+
+
+ 充值
+
+
+ 加钟
+
+
+
@@ -804,6 +807,11 @@
\ No newline at end of file
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 30fad0c..5ef1495 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -58,39 +58,38 @@
-
-
-
+
+
评论
-
+
{{ item.commentCount ? item.commentCount : 0 }}
-
+
-
-
-
+
+
收藏
-
+
{{ item.collectCount ? item.collectCount : 0 }}
-
+
-
+
- {{item.consortiaName}}
+ {{item.consortiaName}}
+
+
+
+ 立即预约
+
+
+ 立即预约
+
-
-
-
- 立即预约
-
-
- 立即预约
@@ -163,17 +162,17 @@
getOrderByCurrentMarkerIndex().ordersScore }}.0
-->
-
-
-
+
+
评论
{{ getOrderByCurrentMarkerIndex().commentCount ? getOrderByCurrentMarkerIndex().commentCount : 0 }}
-
-
-
+
+
收藏
{{ getOrderByCurrentMarkerIndex().collectCount ? getOrderByCurrentMarkerIndex().collectCount : 0 }}
@@ -1318,7 +1317,7 @@
}
.therapist-mian-bottom-text{
font-weight: bold;
- font-size: 23rpx;
+ font-size: 30rpx;
color: #222222;
}
.therapist-mian-bottom{
@@ -1377,7 +1376,8 @@
text-overflow: ellipsis;
white-space: nowrap;
text-align: left;
- font-size: 36rpx;
+ font-weight: bold;
+ font-size: 32rpx;
color: #13141A;
}
.keyuyue{
@@ -1427,6 +1427,7 @@
display: flex;
flex-direction: row;
align-items: center;
+ justify-content: space-between;
}
.list-right-top{
width: 100%;
@@ -1846,4 +1847,24 @@
line-height: 30px;
margin-top: 5px;
}
+ .therap-pin{
+ display: flex;
+ align-items: flex-end;
+ margin-right: 10rpx;
+ }
+ .therap-pin span:nth-child(2){
+ color: #019c88;
+ }
+ .therap-pin span:nth-child(1){
+ color: #666;
+ margin-right: 10rpx;
+ }
+ .terap-button{
+ background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+ color: #ffffff;
+ width:200rpx;
+ height: 60rpx;
+ border-radius: 30upx;
+ line-height: 58rpx;
+ }
\ No newline at end of file