diff --git a/components/store/index.wxss b/components/store/index.wxss
index 06b7703..bc5655c 100644
--- a/components/store/index.wxss
+++ b/components/store/index.wxss
@@ -1,5 +1,3 @@
-
-
.applyshop {
font-size: 30rpx;
height: 70rpx;
@@ -25,9 +23,7 @@
}
.posi_logo view:nth-child(1) {
- /* width: 100rpx; *//* margin-right: 16rpx; */
border-radius: 16rpx;
- /* height: 100rpx; */
}
.posi_logo view:nth-child(1) image {
@@ -70,3 +66,13 @@
padding: 20rpx 0;
font-size: 32rpx;
}
+.tel {
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+ width: 50rpx;
+ height: 50rpx;
+ z-index: 10;
+}
\ No newline at end of file
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 679b8ff..34759bd 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -90,7 +90,7 @@
-
+
购买须知
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 8d4f20e..ffcd3c6 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -8,9 +8,6 @@ const QR = require("../../../utils/memberqrcode.js");
//券详情页面
Page({
data: {
- showMore: true,
- more: "点击查看更多",
- hidden: "hidden",
navigationBarHeight,
code: "",
topLine: imgurl.topLine.url,
@@ -37,25 +34,6 @@ Page({
staticGamedata: {},
showIf: false,
},
- // 点击查看更多
- more: function () {
- let that = this;
- if (that.data.more == '点击查看更多') {
- this.setData({
- hidden: "",
- height: that.data.data.merchantVoList.length * 140 + 'rpx',
- more: "点击收起",
- showMore: true
- })
- } else {
- this.setData({
- hidden: "hidden",
- height: 4 * 140 + 'rpx',
- more: "点击查看更多",
- showMore: true
- })
- }
- },
onUnload:function(){
let that = this;
clearInterval(that.data.setInter);
@@ -70,14 +48,6 @@ Page({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
- /**
- * 跳转到门店列表的详情页面
- */
- gotoDetail(e) {
- wx.navigateTo({
- url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
- })
- },
// 获取游戏
getStaticGame(token) {
let _this = this;
@@ -130,10 +100,9 @@ Page({
couponOrderId: options.quancode
}
}).then(res => {
- console.log(res);
that.setData({
couponorderstatus: res.data.couponOrderStatus,
- data: res.data
+ data: res.data,
});
if (res.data.couponOrderStatus == 1) {
/**
@@ -195,16 +164,6 @@ Page({
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss")
})
}
- if (that.data.data.merchantVoList && that.data.data.merchantVoList.length <= 4) {
- that.setData({
- height: that.data.data.merchantVoList.length * 140 + 'rpx',
- showMore: false
- })
- } else if (that.data.data.merchantVoList && that.data.data.merchantVoList.length > 4) {
- that.setData({
- height: 4 * 140 + 'rpx'
- })
- }
let url = JSON.stringify({
END:"C",
TYPE:"couponorder",
diff --git a/pages/couponorder/detail/index.json b/pages/couponorder/detail/index.json
index 96e97c5..bd9dfaf 100644
--- a/pages/couponorder/detail/index.json
+++ b/pages/couponorder/detail/index.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
- "navbar": "../../../components/navbar/navbar"
+ "navbar": "../../../components/navbar/navbar",
+ "store": "../../../components/store/index"
}
}
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 11fd3dc..0961f64 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -49,8 +49,9 @@
优惠券码:{{code}}
-
- 适用门店
+
+
+
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index 1fd4374..0cb4af8 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -10,10 +10,8 @@
border-radius: 16rpx;
}
page {
- /* background: #02c0ff; */
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
height: auto !important;
- /* padding-bottom: 20rpx; */
}
.panel, .zhuangtai image {
@@ -197,70 +195,6 @@ page {
letter-spacing: 0;
text-align: left;
}
-.applyshop {
- font-size: 30rpx;
- height: 70rpx;
- line-height: 70rpx;
- color: #333;
- text-indent: 1em;
- padding-top: 20rpx;
-}
-.posi {
- position: relative;
- width: 100%;
- background: #FFF;
- /* margin: 18rpx 0 0; */
-}
-
-.posi_logo {
- position: relative;
- width: 92%;
- display: flex;
- padding: 20rpx 0;
- background: #fff;
- z-index: 10;
- margin: 0 auto;
-}
-
-.posi_logo view:nth-child(1) {
- /* width: 100rpx; *//* margin-right: 16rpx; */
- border-radius: 16rpx;
- /* height: 100rpx; */
-}
-
-.posi_logo view:nth-child(1) image {
- display: block;
- width: 100rpx;
- height: 100rpx;
- border-radius: 16rpx;
- margin-right: 16rpx;
- border: 1px solid #e5e5e5;
-}
-.name{
- font-size: 32rpx;
- color: #333;
- letter-spacing: 0;
- width: 500rpx;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
-}
-.posi_logo view:nth-child(2) view:nth-child(1) {
- font-size: 32rpx;
- color: #333;
- letter-spacing: 0;
-}
-
-.shopVoList {
- display: flex !important;
- padding-left: 0 !important;
- flex-direction: row !important;
-}
-
-.shopVoList text {
- font-size: 20rpx !important;
- color: #b8b8b8 !important;
-}
.tit {
padding: 53rpx 0 0;
@@ -270,17 +204,6 @@ page {
letter-spacing: 0;
}
-.tel {
- position: absolute;
- right: 30rpx;
- top: 0;
- bottom: 0;
- margin: auto;
- width: 50rpx;
- height: 50rpx;
- z-index: 10;
-}
-
.notes view:nth-child(1) {
width: 92%;
height: 87rpx;
@@ -374,12 +297,3 @@ page {
border: 1px solid red;
padding: 3rpx;
}
-.bottom {
- text-align: center;
- height: 70rpx;
- line-height: 70rpx;
- color: #999;
- font-size: 32rpx;
- background: #fff;
- margin-top: 20rpx;
-}
\ No newline at end of file