diff --git a/pages/coupon/confirmation/confirmation.js b/pages/coupon/confirmation/confirmation.js index 903b204..9455904 100644 --- a/pages/coupon/confirmation/confirmation.js +++ b/pages/coupon/confirmation/confirmation.js @@ -13,7 +13,10 @@ Page({ data: {}, spuIdObj: {}, priceAndStockObj: {}, - mallTenantId: '' + mallTenantId: '', + imId: "69168503086", + goodId: "", + IMorderId: "" }, onLoad: function (options) { console.log(options, 'options!!!!!!!'); @@ -53,6 +56,14 @@ Page({ } }, + + imCallback(e) { + console.log("跳转IM客服成功", e); + }, + onimError(e) { + console.log("拉起IM客服失败", e.detail); + }, + goInstructions() { tt.navigateTo({ url: '/pages/coupon/instructions/instructions?couponChannelId=' + this.data.couponChannelId, @@ -73,7 +84,8 @@ Page({ }).then(res => { if (res.data) { this.setData({ - spuIdObj: res.data + spuIdObj: res.data, + goodId: res.data.spuId }) } }).catch(err => { diff --git a/pages/coupon/confirmation/confirmation.ttml b/pages/coupon/confirmation/confirmation.ttml index 0a4bf68..d5b8d39 100644 --- a/pages/coupon/confirmation/confirmation.ttml +++ b/pages/coupon/confirmation/confirmation.ttml @@ -14,8 +14,16 @@ 实付 {{data.type!=50?'¥':''}} + {{data.type==50?priceAndStockObj.creditPrice+'积分':priceAndStockObj.salePrice/100}} {{data.type==50?'立即换购':'提交订单'}} + + diff --git a/pages/coupon/confirmation/confirmation.ttss b/pages/coupon/confirmation/confirmation.ttss index eb8f34b..06a62f4 100644 --- a/pages/coupon/confirmation/confirmation.ttss +++ b/pages/coupon/confirmation/confirmation.ttss @@ -1,11 +1,12 @@ -.commodityBox{ +.commodityBox { background-color: #fff; width: 96%; border-radius: 12rpx; overflow: hidden; margin: 10rpx auto; } -.commodityImgBox{ + +.commodityImgBox { width: 160rpx; height: 160rpx; overflow: hidden; @@ -13,23 +14,45 @@ margin: 20rpx; border-radius: 8rpx; } -.commodityImg{ + +.commodityImg { + width: 100%; + height: 100%; +} + +.serviceBox { + float: right; + margin-top: 48rpx; + margin-right: 14rpx; + height: 40rpx; + width: 40rpx; + background-color: #fff; +} + +.fuwuLogoBox { + width: 40rpx; + height: 40rpx; + line-height: 0; +} + +.itemLogo { width: 100%; height: 100%; } -.contentBox{ +.contentBox { width: 500rpx; float: left; height: 100rpx; margin-top: 20rpx; } -.topBox{ + +.topBox { overflow: hidden; } -.title{ +.title { height: 90rpx; font-size: 32rpx; width: 400rpx; @@ -37,19 +60,23 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-box-orient: vertical; - -webkit-line-clamp: 2; /* 这里是超出几行省略 */ + -webkit-line-clamp: 2; + /* 这里是超出几行省略 */ overflow: hidden; } -.unit{ + +.unit { float: right; font-size: 30rpx; } -.subhead{ + +.subhead { margin-top: 4rpx; color: #a6a6a6; font-size: 24rpx; } -.app-border-topX{ + +.app-border-topX { width: 100%; height: 140rpx; background-color: #fff; @@ -58,39 +85,44 @@ left: 0; bottom: 0; } -.actually{ + +.actually { margin-left: 10%; font-size: 28rpx; color: #a6a6a6; line-height: 140rpx; float: left; } -.payZ{ + +.payZ { margin-left: 6rpx; font-size: 24rpx; color: #d5af67; line-height: 144rpx; float: left; } -.price{ + +.price { font-size: 30rpx; color: #d5af67; line-height: 140rpx; - float: left; + float: left; } -.buyX{ - float: right; - background: linear-gradient(270deg, #DDAB5A, #B8832D); - /* width: 80rpx; */ - color: #fff; - font-size: 30rpx; +.buyX { + float: right; + background: linear-gradient(270deg, #DDAB5A, #B8832D); + + /* width: 80rpx; */ + color: #fff; + font-size: 30rpx; - border-radius: 60rpx; - margin: 30rpx 40rpx; - padding: 20rpx 40rpx; + border-radius: 60rpx; + margin: 30rpx 40rpx; + padding: 20rpx 40rpx; } -.go{ + +.go { height: 120rpx; width: 96%; border-radius: 6px; @@ -98,14 +130,16 @@ margin: 5px auto; background-color: #fff; } -.goTitle{ + +.goTitle { float: left; line-height: 120rpx; font-size: 30rpx; /* color: #a6a6a6; */ margin-left: 20rpx; } -.goImg{ + +.goImg { float: right; width: 20rpx; height: 40rpx; diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 873c7e8..39d669c 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -97,7 +97,10 @@ Page({ showBox: false, //手机号授权框 spuIdObj: {}, mallTenantId: '', - mallList: [] + mallList: [], + imId: "69168503086", + goodId: "", + IMorderId: "" }, /** @@ -108,6 +111,14 @@ Page({ isshowposter: true, }) }, + + imCallback(e) { + console.log("跳转IM客服成功", e); + }, + onimError(e) { + console.log("拉起IM客服失败", e.detail); + }, + getCouponList: function (id) { //获取其他活动 let that = this; let data; @@ -591,7 +602,8 @@ Page({ }).then(res => { if (res.data) { this.setData({ - spuIdObj: res.data + spuIdObj: res.data, + goodId: res.data.spuId }) } }).catch(err => { diff --git a/pages/coupon/detail/index.ttml b/pages/coupon/detail/index.ttml index f9b47d8..1f3e1e1 100644 --- a/pages/coupon/detail/index.ttml +++ b/pages/coupon/detail/index.ttml @@ -255,11 +255,14 @@ - + diff --git a/pages/coupon/detail/index.ttss b/pages/coupon/detail/index.ttss index c0eca4e..74db8ad 100644 --- a/pages/coupon/detail/index.ttss +++ b/pages/coupon/detail/index.ttss @@ -6,7 +6,7 @@ page { button::after { border: none; - + } @@ -217,11 +217,13 @@ button::after { text-overflow: ellipsis; padding-top: 30rpx; } -.subTitleBox{ + +.subTitleBox { overflow: hidden; width: 100%; - margin: 10rpx 0; + margin: 10rpx 0; } + .subTitle { display: block; width: 400rpx; @@ -235,7 +237,8 @@ button::after { padding: 6rpx 0; float: left; } -.sellBox{ + +.sellBox { display: block; font-size: 26rpx; color: #a6a6a6; @@ -333,7 +336,8 @@ button::after { height: 32rpx; line-height: 45rpx; } -.qsOriginal{ + +.qsOriginal { text-decoration: line-through; color: #999 !important; margin-top: 58rpx; @@ -344,11 +348,12 @@ button::after { float: left; } -.serviceImg{ +.serviceImg { height: 100%; width: 100%; } -.timeText{ + +.timeText { color: #333; letter-spacing: 0; font-size: 14px; @@ -357,6 +362,7 @@ button::after { width: 92%; margin: 10rpx auto 0 auto; } + .fl { float: left; } @@ -364,20 +370,22 @@ button::after { .fr { float: right; } + .notes { width: 100%; background: #fff; padding-bottom: 30rpx; } -.nodesD{ +.nodesD { height: 87rpx; line-height: 87rpx; background: #fff; border-top: 1px solid #f9f9f9; font-weight: bold; } -.notesText{ + +.notesText { width: 92%; margin: 0 auto; color: #333; @@ -388,15 +396,16 @@ button::after { display: block; } -.notesH{ +.notesH { width: 92%; font-weight: bold; font-size: 32rpx; color: #3c3c3c; - margin: 10rpx auto; + margin: 10rpx auto; padding-top: 10rpx; } -.Hchild{ + +.Hchild { width: 92%; margin: 0 auto; color: #333; @@ -406,6 +415,7 @@ button::after { line-height: 21px; display: block; } + /* .notes view:nth-child(1) text { color: #333; letter-spacing: 0; @@ -441,11 +451,12 @@ button::after { -.app-border-topX{ +.app-border-topX { width: 100%; background-color: #fff; border-top: solid 1rpx rgb(204, 204, 204); } + .buy-view { /* background: #fff; */ height: 92rpx; @@ -455,18 +466,22 @@ button::after { padding-bottom: 22rpx; padding-top: 22rpx; } -.sell{ + +.sell { font-size: 24rpx; - color: #a6a6a6;; + color: #a6a6a6; + ; letter-spacing: 1px; text-align: right; float: right; margin-top: 60rpx; } -.sellP{ + +.sellP { color: #d5af67; } -.biaoz{ + +.biaoz { color: #d5af67; font-family: "PingFangSC-Medium"; font-size: 28rpx; @@ -476,7 +491,8 @@ button::after { margin-top: 55rpx; margin-left: 40rpx; } -.selling{ + +.selling { color: #d5af67; font-family: "PingFangSC-Medium"; font-size: 36rpx; @@ -485,7 +501,8 @@ button::after { margin-top: 50rpx; /* line-height: 22px; */ } -.buyX{ + +.buyX { /* position: relative; */ float: right; background: linear-gradient(270deg, #DDAB5A, #B8832D); @@ -498,6 +515,7 @@ button::after { border-radius: 61rpx; margin: 30rpx 20rpx; } + .buy { position: relative; background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%); @@ -672,7 +690,7 @@ button::after { border-bottom: 1rpx solid #eee; } -.quessss >view:last-child { +.quessss>view:last-child { border-bottom: 0; } @@ -741,7 +759,8 @@ button::after { bottom: 15rpx; } -.btns .fr, .btns .fl { +.btns .fr, +.btns .fl { width: 277rpx; height: 95rpx; border-radius: 48rpx; @@ -909,7 +928,8 @@ button::after { background: rgba(201, 201, 201, 0.1); } -checkbox-group, radio-group { +checkbox-group, +radio-group { height: 400rpx; overflow-y: scroll; } @@ -1103,10 +1123,11 @@ checkbox-group, radio-group { -.groupTitleBox{ +.groupTitleBox { background: #fff; } -.groupTitle{ + +.groupTitle { color: #333; letter-spacing: 0; font-size: 30rpx; @@ -1116,7 +1137,8 @@ checkbox-group, radio-group { margin: 0 auto; font-weight: bold; } -.groupTitleS{ + +.groupTitleS { color: #333; letter-spacing: 0; font-size: 28rpx; @@ -1126,7 +1148,8 @@ checkbox-group, radio-group { margin: 0 auto; /* font-weight: bold; */ } -.yuandian{ + +.yuandian { background-color: #333333; width: 4rpx; @@ -1135,57 +1158,68 @@ checkbox-group, radio-group { margin: 16rpx 8rpx 0 0; float: left; } -.groupDetailsBox{ + +.groupDetailsBox { width: 90%; margin: 0 auto; } -.groupTiemBox{ + +.groupTiemBox { color: #333333; overflow: hidden; } -.groupTiemName{ + +.groupTiemName { float: left; font-size: 26rpx; /* color: #a6a6a6; */ } -.groupTiemPay{ + +.groupTiemPay { float: right; font-size: 26rpx; /* color: #a6a6a6; */ } -.videoCla{ + +.videoCla { margin-top: 10rpx; width: 70rpx; height: 60rpx; } -.issue{ + +.issue { font-size: 20rpx; } -.groupTextBox{ + +.groupTextBox { background: #fff; overflow: hidden; padding-bottom: 10rpx; } -.shootBox{ + +.shootBox { position: fixed; top: 70%; right: 0; width: 120rpx; height: 100rpx; - background-color: rgba(221,171,90, 0.5) !important; - border-radius: 12rpx 0 0 12rpx; + background-color: rgba(221, 171, 90, 0.5) !important; + border-radius: 12rpx 0 0 12rpx; z-index: 1000000; } -.mount{ + +.mount { line-height: 20rpx !important; height: 100%; } -button{ + +button { color: #fff; - background-color: rgba(221,171,90, 0.5); - padding:0; + background-color: rgba(221, 171, 90, 0.5); + padding: 0; } -.serviceBox{ + +.serviceBox { float: right; margin-top: 58rpx; margin-right: 14rpx; @@ -1193,16 +1227,19 @@ button{ width: 40rpx; background-color: #fff; } -.fuwuLogoBox{ + +.fuwuLogoBox { width: 40rpx; height: 40rpx; line-height: 0; } -.itemLogo{ + +.itemLogo { width: 100%; height: 100%; } -.fuwuName{ + +.fuwuName { text-align: center; color: #000; font-size: 24rpx;