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 @@
-