diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss
index e2533e0..b879fdc 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxss
+++ b/pages/bargain/bargainDatail/bargainDatail.wxss
@@ -319,28 +319,32 @@ page{
margin: 20rpx auto 0;
}
.status{
+ display: flex;
+ justify-content: space-around;
width: 520rpx;
margin: 40rpx auto 0;
}
.status button{
display: block;
- width: 520rpx;
- height: 95rpx;
- line-height: 95rpx;
+ width: 250rpx;
+ height: 75rpx;
+ line-height: 75rpx;
text-align: center;
border: none;
+ font-size: 32rpx;
}
button::after{ border: none; }
.status button:nth-of-type(1){
- background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
- border:1px solid rgba(236,59,45,1);
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ /* border:1px solid rgba(236,59,45,1); */
border-radius:48rpx;
- margin-bottom: 38rpx;
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
color: #fff;
}
.status button:nth-of-type(2){
- background:#fff;
- border:1px solid rgba(190,190,190,1);
+ background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%);
+ /* border:1px solid rgba(190,190,190,1); */
border-radius:48rpx;
- color: #333;
+ color: #fff;
}
\ No newline at end of file
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index b8679c0..74896fb 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -9,6 +9,7 @@ Page({
navigationBarHeight,
homeSelectedO: imgurl.homeSelectedO.url,
isshowposter:false,//是否显示分享弹框
+ fenxiang: imgurl.fenxiang.url,
fenxiangUrl: imgurl.fenxiang.url,
clockUrl: imgurl.clock.url,
teljpgUrl: imgurl.teljpg.url,
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 063deef..591172f 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -97,7 +97,7 @@
- {{item.merchantName}}
+ {{item.merchantName}}
{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 2e0df69..3feec32 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -273,9 +273,10 @@ button::after {
/* padding-left: 30rpx; */
}
-.posi_logo view:nth-child(2) text:nth-child(1) {
+.posi_logo view:nth-child(2) view:nth-child(1) {
font-size: 32rpx;
color: #333;
+ width: 90%;
letter-spacing: 0;
white-space: nowrap;
text-overflow: ellipsis;
@@ -389,8 +390,8 @@ button::after {
top: 0;
bottom: 0;
margin: auto;
- width: 76rpx;
- height: 76rpx;
+ width: 50rpx;
+ height: 50rpx;
}
.txt {
@@ -436,7 +437,7 @@ button::after {
text-align: center;
}
.timess{
- color: #af6e34;
+ color: #FD782D;
}
.times text {
display: inline-block;
@@ -861,7 +862,7 @@ checkbox-group, radio-group {
.quan{
float: left;
- margin:28rpx 15rpx 0 0;
+ margin:18rpx 15rpx 0 0;
width: 12rpx;
height: 12rpx;
background: #E1E1E1;
diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss
index 0bfe3ea..79553de 100644
--- a/pages/index/searchbar/index.wxss
+++ b/pages/index/searchbar/index.wxss
@@ -88,8 +88,8 @@
top: 0;
bottom: 0;
margin: auto;
- width: 60rpx;
- height: 60rpx;
+ width: 50rpx;
+ height: 50rpx;
}
.merchants{
width: 90%;
@@ -119,16 +119,19 @@
padding-left: 30rpx;
}
.shopVo{
- display: flex;
+ /* display: flex; */
padding-left: 0!important;
}
.merchants view:nth-child(2) text:nth-child(1) {
display: block;
- overflow: hidden;
font-size:32rpx;
color:rgba(60,60,60,1);
line-height:44rpx;
+ width:260rpx;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
}
.merchants view:nth-child(2) text:nth-child(2) {
@@ -140,7 +143,7 @@
overflow: hidden;
}
.merchantName{
- margin-top:44rpx;
+ margin-top:30rpx;
}
page {
padding: 0 0 30rpx;
diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index 8b0fc28..e1b22ad 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -7,6 +7,7 @@ Page({
* 页面的初始数据
*/
data: {
+ erweima: imgurl.erweima.url,
bannerUrl: imgurl.banner.url,
loadingUrl: imgurl.loading.url,
nodata: imgurl.nodata.url,
@@ -28,6 +29,15 @@ Page({
score: '0',
},
+ qrcodeH: function () {
+ var that = this;
+ let memberId = that.data.memberId;
+ if (memberId) {
+ wx.navigateTo({
+ url: '/pages/specialcourtesy/specialcourtesy'
+ })
+ }
+ },
goback: function () {
wx.switchTab({
url: '/pages/main/index',
diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index 1c47d7c..f19fb86 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index ca0def3..5d6a7b2 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -13,26 +13,6 @@
{{order.title}}
-
@@ -100,7 +80,7 @@
- {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
+ {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index ab88068..7668975 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -27,8 +27,12 @@ page {
.merchantName {
color: #3C3C3C!important;
- margin-left: 160rpx;
+ /* margin-left: 160rpx; */
font-size: 28rpx;
+ float: left;
+ margin-left: 30rpx;
+ height:100%;
+ line-height: 90rpx;
}
.tips view:nth-child(2) {
@@ -171,12 +175,11 @@ page {
font-size: 28rpx;
color: #A6A6A6;
position: relative;
- height: 150rpx;
- line-height: 150rpx;
display: flex;
justify-content: space-between;
padding-left: 5%;
padding-right: 5%;
+ margin-bottom: 10rpx;
}
.classifShop >view:nth-child(1){
height: 88rpx!important;
@@ -485,17 +488,15 @@ radio {
.merchantVoList {
width: 100%;
- position: relative;
+ /* position: relative; */
}
.merchantVoList .tel {
- width: 76rpx;
- position: absolute;
- top: 0;
- bottom: 0;
- margin: auto;
- right: 14rpx;
+ width: 50rpx;
+ height: 50rpx;
+ float: right;
z-index: 10;
+ margin-top: 30rpx;
}
.btns {
@@ -510,13 +511,10 @@ radio {
}
.merchantImgUrl{
width: 120rpx;
- position: absolute;
- top: 0;
- bottom: 0;
- margin: auto;
- left: 0;
+ float: left;
border-radius: 10rpx;
z-index: 10;
+ margin: 0 auto;
}
.support-tansfer{
width: 690rpx;
diff --git a/utils/imgurl.js b/utils/imgurl.js
index db75d17..926369f 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -681,5 +681,9 @@ module.exports = {
'url': baseUrl + "next.png",
'name': ''
},
+ 'erweima': {
+ 'url': baseUrl + "erweima.png",
+ 'name': ''
+ },
}
\ No newline at end of file