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/cooperate/hehuo.vue b/pages/cooperate/hehuo.vue index a57617f..136d6ed 100644 --- a/pages/cooperate/hehuo.vue +++ b/pages/cooperate/hehuo.vue @@ -48,22 +48,23 @@ + - - 姓名 - + + 姓名 + - + 手机号 - + - + 备注 - + - + 提交申请 @@ -297,7 +298,6 @@ bottom: 0; background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7)); margin-bottom: 80rpx; - } .adv-xian{ height: 2rpx; @@ -448,4 +448,8 @@ } } } + .line { + width: 100%; + border-bottom: 1rpx solid #f7f7f7; + } 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/cooperation.vue b/pages/my/cooperation.vue index 784e1fc..1ba7e8e 100644 --- a/pages/my/cooperation.vue +++ b/pages/my/cooperation.vue @@ -1,5 +1,7 @@ @@ -182,19 +182,38 @@ \ 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 @@ 联系客服 - +