diff --git a/my/hongbao/xinrenhongbao.vue b/my/hongbao/xinrenhongbao.vue index 18ec365..0bb4c97 100644 --- a/my/hongbao/xinrenhongbao.vue +++ b/my/hongbao/xinrenhongbao.vue @@ -28,14 +28,17 @@ - + - + - - 立即使用 + + 立即领取 + + 已经领取 + @@ -70,11 +73,13 @@ contentdown: '上拉显示更多', contentrefresh: '正在加载...', contentnomore: '没有更多数据了' - } + }, + isCoupon: 0 } }, onLoad() { this.getMyList(); + this.getUserInfo(); }, methods: { shiYong(){ @@ -82,11 +87,11 @@ that.$Request.get('/app/coupon/insertNewUserCoupon').then(res => { if (res.code == 0) { uni.showToast({ - title:'抢购成功！' - }) - uni.switchTab({ - url:'/pages/index/index' + // title:'领取成功！' + icon:'success', + title:"领取成功" }) + setTimeout(()=>{this.goHome()},1500) }else{ uni.showToast({ icon:'error', @@ -95,6 +100,11 @@ } }) }, + goHome(){ + uni.switchTab({ + url:'/pages/index/index' + }) + }, // 加载更多 loadMore: async function() { //loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中 @@ -108,7 +118,14 @@ },1000) } }, - + getUserInfo() { + this.$Request.getT('/app/user/selectUserById').then(res => { + if (res.code == 0) { + this.isCoupon = res.data.isCoupon; + console.log(this.isCoupon); + } + }) + }, getMyList() { this.loadingType = 1; uni.showLoading({ @@ -172,6 +189,20 @@ margin-top: 4px; 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{ width: 100%; } @@ -194,7 +225,7 @@ .youhui-view-right-top{ display: flex; flex-direction: column; - align-items: center; + align-items: center; } .youhui-view-right{ width: 502.08rpx; diff --git a/my/hongbao/youhuijuan.vue b/my/hongbao/youhuijuan.vue index 112adc6..863aac6 100644 --- a/my/hongbao/youhuijuan.vue +++ b/my/hongbao/youhuijuan.vue @@ -22,11 +22,13 @@ - - {{item.couponName}} - {{item.endDate}} - - 立即使用 + + {{item.couponName}} + + {{item.createTime.substring(0,10)}} ~ + {{item.expirationTime.substring(0,10)}} + + @@ -42,10 +44,13 @@ - - {{item.couponName}} - {{item.endDate}} - + + {{item.couponName}} + + {{item.createTime.substring(0,10)}} ~ + {{item.expirationTime.substring(0,10)}} + + @@ -62,18 +67,21 @@ - - {{item.couponName}} - {{item.endDate}} - + + {{item.couponName}} + + {{item.createTime.substring(0,10)}} ~ + {{item.expirationTime.substring(0,10)}} + + - + - + @@ -137,7 +145,6 @@ }) }, getMyList() { - this.$Request.getT('/app/coupon/selectCouponUserList?page='+this.page+'&limit='+this.size+'&status=' + this.tabIndex).then(res => { if (res.code == 0) { if (this.page == 1) this.hongbao = []; //如果是第一页需手动制空列表 @@ -199,7 +206,7 @@ width: 100%; overflow: hidden; } - + .you-nav{ background: #FFFFFF; padding: 14px 25px 0px 25px; @@ -234,21 +241,27 @@ text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44); margin-left: 10px; } + .time-money{ + width: 100%; + display: flex; + flex-direction: row; + align-items: center; + } .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; diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue index dad9471..e6169a2 100644 --- a/my/hongbao/youhuijuanList.vue +++ b/my/hongbao/youhuijuanList.vue @@ -27,7 +27,7 @@ - + 确定 @@ -136,7 +136,7 @@ url:'/my/order/payModifyPt' }) } - + }, checkboxChange(e){ this.couponId=e.detail.value.join(",") @@ -147,7 +147,7 @@ }) }, getMyList() { - + var data={ page:this.page, limit:this.limit, @@ -172,7 +172,7 @@ this.getMyList(); } }, - + } @@ -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/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/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}} 人选择 - + - ￥ - {{mainData.price}} + + ￥{{mainData.price}} /{{serviceCount}}次 /{{mainData.serviceCount}}次 @@ -52,7 +52,7 @@ 最快30分钟上门 - + @@ -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}} 人选择 - + - ￥ - {{mainData.price}} + + ￥{{mainData.price}} /{{serviceCount}}次 /{{mainData.serviceCount}}次 @@ -42,7 +42,7 @@ {{liaoTime}} - + @@ -57,7 +57,7 @@ 最快30分钟上门 - + @@ -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 4428d9b..e047752 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -167,6 +167,7 @@ -当你累了 想起盛安到家- + 联系客服 @@ -230,11 +231,8 @@ if (this.userId) { this.isLogin = false this.getUserInfo() - this.getAmount() this.getIsVip() - - } else { this.isShop = 0; this.isAgency = 0; @@ -247,26 +245,25 @@ this.avatar = '../../static/logo.png' this.isVip = 0 } - }, methods:{ - goMsg() {//客服聊天 - let data = { - userId: uni.getStorageSync('userId'), - focusedUserId: '0', - // userName:this.order.userName - } - // app/chat/insertChatConversation - 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?chatConversationId=' + res.data.chatConversationId + - '&byUserId=' + res.data.userId - }) - } - }) - }, + goMsg() {//客服聊天 + let data = { + userId: uni.getStorageSync('userId'), + focusedUserId: '0', + // userName:this.order.userName + } + // app/chat/insertChatConversation + 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?chatConversationId=' + res.data.chatConversationId + + '&byUserId=' + res.data.userId + }) + } + }) + }, getDataX(){ this.$Request.get("/app/massage/package/findPackageAndMassagePage",{ city:'', @@ -698,8 +695,9 @@ position: fixed; right: 0; bottom: 0; - margin-bottom:100rpx; + margin-bottom: 20%; margin-right: 20px; + background-color: #fff; border-radius: 5px; } .shop_label{ @@ -718,22 +716,24 @@ margin-bottom: 8rpx; color: #f68607; } - .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{ font-weight: bold; @@ -741,17 +741,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; @@ -771,17 +773,17 @@ height: 100%; } .item { - width: 96%; - margin: 0 2% ; - display: flex; - flex-direction: row; - justify-content: space-between; - height: 140px; - background: #FFFFFF; - border-radius: 21rpx; - margin-top:12px; - align-items: center; - padding: 0px 10px; + 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 { @@ -812,34 +814,40 @@ color: #FFFFFF; margin-top: 8rpx; } - .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(1){ - font-weight: 400; - font-size: 25rpx; - 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: 25rpx; - color: #F95900; - } + .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: 28rpx; + color: #848484; + text-decoration-line: line-through; + margin-left: 5px; + } + .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(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; diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue index 0ce3338..d767183 100644 --- a/pages/my/indextaociliaoList.vue +++ b/pages/my/indextaociliaoList.vue @@ -33,17 +33,19 @@ - ￥ - {{item.price}} + + ￥{{item.price}} / {{item.serviceCount}} {{typeData=='104'?'套':typeData=='105'?'次':'次'}} - ￥ - {{item.oldPrice}}/{{item.serviceCount}}{{typeData=='104'?'套':typeData=='105'?'次':'次'}} + + ￥{{item.oldPrice}}/{{item.serviceCount}}{{typeData=='104'?'套':typeData=='105'?'次':'次'}} - - {{tag}} - - - 助眠解压 + + + {{tag}} + + + 助眠解压 + @@ -236,9 +238,7 @@ margin-bottom: 8rpx; color: #f68607; } - .item-view-bottom-qian{ - margin-top: 5px; - } + /deep/.refresh-body .content{ } /deep/.refresh-body{ @@ -264,36 +264,40 @@ 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; - color: #848484; - text-decoration-line: line-through; - } - .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(5){ + font-size: 28rpx; + color: #848484; + text-decoration-line: line-through; + } + .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(3){ - font-size: 26rpx; + font-size: 28rpx; 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{ - width: 100%; - display: flex; - flex-direction: row; - justify-content: center; + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; } .item-view-jianjie{ font-weight: 400; @@ -327,15 +331,15 @@ color: #ff8600; } .item-view-xiangmu span:nth-child(2){ - font-size: 26rpx; - 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-size: 26rpx; + font-weight: normal; + color: #666666; + margin-right: 5rpx; + font-size: 30rpx; } .item-view-xiangmu{ width: 100%; @@ -346,7 +350,6 @@ align-items: flex-end; } .item-view-title{ - width: 76%; font-weight: bold; font-size: 32rpx; color: #333333; diff --git a/pages/my/miaoShaOderDrtail.vue b/pages/my/miaoShaOderDrtail.vue index 894ac4f..c0f23af 100644 --- a/pages/my/miaoShaOderDrtail.vue +++ b/pages/my/miaoShaOderDrtail.vue @@ -19,8 +19,8 @@ - ￥ - {{mainData.price}} + + ￥{{mainData.price}} /次 @@ -600,14 +600,14 @@ color: #FF1200; } .header-bottom-money-zhen span:nth-child(1){ - font-size: 26rpx; + font-size: 28rpx; } .header-bottom-money-zhen span:nth-child(2){ font-size:38rpx; font-weight: bold; } .header-bottom-money-zhen span:nth-child(3){ - font-size: 26rpx; + font-size: 28rpx; } .header-bottom-money-zhen{ display: flex; diff --git a/pages/my/myMsOderDrtail.vue b/pages/my/myMsOderDrtail.vue index d7f28f2..f8e4844 100644 --- a/pages/my/myMsOderDrtail.vue +++ b/pages/my/myMsOderDrtail.vue @@ -21,7 +21,7 @@ - + {{getList.title}} @@ -33,13 +33,13 @@ {{getList.sales}} 人选择 - + - ￥ - {{getList.packagePrice}} + + ￥{{getList.packagePrice}} ￥{{getList.oldPrice}} @@ -62,7 +62,7 @@ 最快30分钟上门 - + @@ -92,7 +92,7 @@ 性别限制: 不限性别 - + 适应人群: @@ -107,7 +107,7 @@ - + @@ -205,7 +205,7 @@ text-align: center; background: linear-gradient(-90deg, #FF6F48, #FF9E69); border-radius: 7px; - margin-left: 5px; + margin-left: 5px; font-size: 10px; border-top-left-radius: 20px; border-bottom-right-radius: 20px; @@ -292,7 +292,7 @@ width: 34.03rpx; height: 32.64rpx; } - + .shouc{ display: flex; align-items: center; @@ -324,9 +324,9 @@ flex-direction: column; align-items: center; padding: 5rpx 0rpx; - + } - + .tese span:nth-child(1){ font-weight: bold; font-size: 22rpx; @@ -367,7 +367,7 @@ font-size: 22rpx; color: #777777; } - + .detail-foot-mian{ width: 95%; display: flex; @@ -509,21 +509,21 @@ color: #F95900; } .header-bottom-money-zhen span:nth-child(1){ - font-size: 25rpx; + font-size: 28rpx; } .header-bottom-money-zhen span:nth-child(2){ - font-size:45.81rpx; + 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; @@ -603,4 +603,4 @@ flex-direction: column; align-items: center; } - \ No newline at end of file + diff --git a/pages/my/newTeaml.vue b/pages/my/newTeaml.vue index 5427733..7541850 100644 --- a/pages/my/newTeaml.vue +++ b/pages/my/newTeaml.vue @@ -49,14 +49,16 @@ - {{item.title}}1111 - - - {{tag}} - - - 助眠解压 + {{item.title}} + + + {{tag}} + + + 助眠解压 + + {{item.duration}}分钟 @@ -77,17 +79,17 @@ - ￥ - {{item.price}} - - ￥ - {{item.oldPrice}} + + ￥{{item.price}} + ￥{{item.oldPrice}} - - {{tag}} - - - 助眠解压 + + + {{tag}} + + + 助眠解压 + @@ -406,13 +408,15 @@ 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%; @@ -431,17 +435,19 @@ white-space: nowrap; } .item-view{ - width: 66%; - 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: 200rpx; - height: 200rpx; - border-radius: 14rpx; - position: relative; + width: 246rpx; + height: 206rpx; + border-radius: 14rpx; + position: relative; } .img-span{ padding: 2px 5px; @@ -462,16 +468,17 @@ border-radius: 14rpx; } .item { - width: 100%; - display: flex; - flex-direction: row; - justify-content: space-between; - height: 140px; - background: #FFFFFF; - border-radius: 21rpx; - margin-top:10px; - align-items: center; - padding: 0px 10px; + width: 100%; + 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/newseckill.vue b/pages/my/newseckill.vue index caefc9f..79bd280 100644 --- a/pages/my/newseckill.vue +++ b/pages/my/newseckill.vue @@ -52,6 +52,12 @@ {{item.title}} + + + ￥{{item.price}} + + ￥{{item.oldPrice}} + {{tag}} @@ -60,12 +66,6 @@ 助眠解压 - - ￥ - {{item.price}} - - ￥{{item.oldPrice}} - 已售{{item.sales}} @@ -303,10 +303,7 @@ font-weight: bold; font-style:italic; } - .item-view-bottom-qian{ - margin-top: 5px; - } .item-view-bottom-btn{ text-align: center; width: 131rpx; @@ -340,17 +337,19 @@ 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(1){ + font-weight: 400; + font-size: 25rpx; + color: #FF1200; + } + .item-view-bottom-qian{ + margin-top: 5px; + } .item-view-bottom{ width: 100%; display: flex; @@ -397,7 +396,6 @@ font-weight: normal; color: #333333; font-size: 30rpx; - } .item-view-xiangmu span:nth-child(1){ font-weight: normal; @@ -438,18 +436,20 @@ white-space: nowrap; } .item-view{ - width: 55%; - height: 100%; - display: flex; - flex-direction: column; - justify-content: center; - } - .item-img{ - width: 285rpx; - height: 120px; - border-radius: 14rpx; - position: relative; + width:59%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + justify-content: space-between; + padding:5rpx 0; } + .item-img{ + width: 246rpx; + height: 206rpx; + border-radius: 14rpx; + position: relative; + } .img-span{ padding: 2px 5px; font-weight: 400; diff --git a/pages/my/pinTuanOderDrtail.vue b/pages/my/pinTuanOderDrtail.vue index 4678395..be2ca53 100644 --- a/pages/my/pinTuanOderDrtail.vue +++ b/pages/my/pinTuanOderDrtail.vue @@ -72,8 +72,8 @@ - ￥ - {{item.packagePrice}} + + ￥{{item.packagePrice}} ￥{{item.oldPrice}} @@ -599,14 +599,14 @@ color: #FF1200; } .header-bottom-money-zhen span:nth-child(1){ - font-size: 26rpx; + font-size: 28rpx; } .header-bottom-money-zhen span:nth-child(2){ font-size:38rpx; font-weight: bold; } .header-bottom-money-zhen span:nth-child(3){ - font-size: 26rpx; + font-size: 28rpx; } .header-bottom-money-zhen{ display: flex; diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue index 3200ca1..70513e7 100644 --- a/pages/my/serviceOderDrtail.vue +++ b/pages/my/serviceOderDrtail.vue @@ -19,8 +19,8 @@ - ￥ - {{mainData.price}} + + ￥{{mainData.price}} /套 @@ -73,8 +73,8 @@ - ￥ - {{item.price}} + + ￥{{item.price}} ￥{{item.oldPrice}} @@ -1054,14 +1054,14 @@ color: #FF1200; } .header-bottom-money-zhen span:nth-child(1){ - font-size: 26rpx; + font-size: 28rpx; } .header-bottom-money-zhen span:nth-child(2){ font-size:38rpx; font-weight: bold; } .header-bottom-money-zhen span:nth-child(3){ - font-size: 26rpx; + font-size: 28rpx; } .header-bottom-money-zhen{ display: flex; diff --git a/pages/my/servicePackage.vue b/pages/my/servicePackage.vue index 727995c..f68c7fd 100644 --- a/pages/my/servicePackage.vue +++ b/pages/my/servicePackage.vue @@ -52,19 +52,20 @@ {{item.title}} {{item.classifyName}} - - ￥ - {{item.price}} + + + ￥{{item.price}} /套 - ￥ - {{item.oldPrice}}/套 - - - {{tag}} - - - 助眠解压 + ￥{{item.oldPrice}}/套 + + + {{tag}} + + + 助眠解压 + + 已售{{item.sales}} @@ -221,36 +222,37 @@ 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{ - 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; @@ -283,22 +285,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%; @@ -310,19 +314,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 image{ width: 100%; @@ -330,17 +334,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/shop/index.vue b/pages/shop/index.vue index 09c4b66..195e64f 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -33,15 +33,17 @@ {{item.classifyName}} - ￥ - {{item.price}} - ￥{{item.oldPrice}} + + ￥{{item.price}} + ￥{{item.oldPrice}} - - {{tag}} - - - 助眠解压 + + + {{tag}} + + + 助眠解压 + @@ -64,11 +66,13 @@ {{item.consortiaContent}} - - {{tag}} - - - 助眠解压 + + + {{tag}} + + + 助眠解压 + @@ -241,9 +245,7 @@