@@ -21,7 +21,7 @@ page { | |||||
.item { | .item { | ||||
color: #ffffff; | color: #ffffff; | ||||
padding: 8rpx 15rpx; | padding: 8rpx 15rpx; | ||||
background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%); | |||||
background: linear-gradient(270deg, #DDAB5A, #B8832D); | |||||
border-radius: 15rpx; | border-radius: 15rpx; | ||||
} | } | ||||
} | } | ||||
@@ -39,22 +39,28 @@ page { | |||||
justify-content: space-between; | justify-content: space-between; | ||||
width: 95%; | width: 95%; | ||||
margin: auto; | margin: auto; | ||||
color: #ffffff; | |||||
color: #000000; | |||||
margin-bottom: 30rpx; | margin-bottom: 30rpx; | ||||
padding: 20rpx 25rpx 50rpx 25rpx; | |||||
padding: 25rpx 25rpx 25rpx 25rpx; | |||||
box-sizing: border-box !important; | box-sizing: border-box !important; | ||||
background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%); | |||||
background-color: #f3f3f3; | |||||
border: 1px solid #0000002d; | |||||
border-radius: 12rpx; | border-radius: 12rpx; | ||||
// box-shadow: #00000036 0px 1px 2px 2px; | |||||
.img { | .img { | ||||
position: relative; | |||||
width: 30%; | width: 30%; | ||||
height: 170rpx; | |||||
border-radius: 15rpx; | |||||
overflow: hidden; | |||||
image { | image { | ||||
width: 100%; | |||||
height: 100%; | |||||
position: absolute; | |||||
top: 50%; | |||||
transform: translateY(-50%); | |||||
width: 170rpx; | |||||
height: 170rpx; | |||||
border-radius: 15rpx; | |||||
border: 1px solid #00000018; | |||||
} | } | ||||
} | } | ||||
@@ -68,9 +74,28 @@ page { | |||||
.infoItem { | .infoItem { | ||||
width: 100%; | width: 100%; | ||||
white-space: nowrap; | |||||
overflow: hidden; | |||||
text-overflow: ellipsis; | |||||
white-space: pre-wrap; | |||||
&.distance { | |||||
margin: 20rpx 0; | |||||
} | |||||
&.address { | |||||
font-size: 27rpx; | |||||
} | |||||
.mapBtn { | |||||
position: relative; | |||||
bottom: 2rpx; | |||||
display: inline-block; | |||||
font-size: 22rpx; | |||||
color: #ffffff; | |||||
padding: 10rpx; | |||||
border-radius: 15rpx; | |||||
background: linear-gradient(270deg, #DDAB5A, #B8832D); | |||||
margin-left: 20rpx; | |||||
} | |||||
} | } | ||||
} | } | ||||
@@ -84,20 +109,16 @@ page { | |||||
.infoItem { | .infoItem { | ||||
width: 100%; | width: 100%; | ||||
white-space: nowrap; | |||||
overflow: hidden; | |||||
text-overflow: ellipsis; | |||||
white-space: pre-wrap; | |||||
&.address { | |||||
font-size: 27rpx; | |||||
margin-top: 15rpx; | |||||
} | |||||
} | } | ||||
} | } | ||||
.mapBtn { | |||||
position: absolute; | |||||
bottom: 15rpx; | |||||
right: 15rpx; | |||||
padding: 7rpx 12rpx; | |||||
border-radius: 15rpx; | |||||
background-color: #f76767; | |||||
} | |||||
} | } | ||||
.takeingPlace { | .takeingPlace { | ||||
@@ -123,7 +144,7 @@ page { | |||||
color: #ffffff; | color: #ffffff; | ||||
text-align: center; | text-align: center; | ||||
padding: 8rpx 15rpx; | padding: 8rpx 15rpx; | ||||
background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%); | |||||
background: linear-gradient(270deg, #DDAB5A, #B8832D); | |||||
border-radius: 15rpx; | border-radius: 15rpx; | ||||
} | } | ||||
} | } | ||||
@@ -13,16 +13,16 @@ | |||||
</view> | </view> | ||||
<view tt:if="{{ item.distance_str }}" class="infoBox"> | <view tt:if="{{ item.distance_str }}" class="infoBox"> | ||||
<view class="infoItem">{{ item.merchantName }}</view> | <view class="infoItem">{{ item.merchantName }}</view> | ||||
<view class="infoItem">地址:{{ item.addr }}</view> | |||||
<view class="infoItem">距您 {{ item.distance_str }}</view> | |||||
<view class="infoItem distance">距您 {{ item.distance_str }}<view tt:if="{{ isLocation }}" id="goMap" | |||||
class="mapBtn" bindtap="goMap" data-item="{{ item }}">门店位置 | |||||
</view> | |||||
</view> | |||||
<view class="infoItem address">地址:{{ item.addr }}</view> | |||||
</view> | </view> | ||||
<view tt:if="{{ !item.distance_str }}" class="infoBox2"> | <view tt:if="{{ !item.distance_str }}" class="infoBox2"> | ||||
<view class="infoItem">{{ item.merchantName }}</view> | <view class="infoItem">{{ item.merchantName }}</view> | ||||
<view class="infoItem">地址:{{ item.addr }}</view> | |||||
</view> | |||||
<view tt:if="{{ isLocation }}" id="goMap" class="mapBtn" bindtap="goMap" data-item="{{ item }}">去这里 | |||||
<view class="infoItem address">地址:{{ item.addr }}</view> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -20,7 +20,7 @@ page .continer .selectShop .nav { | |||||
page .continer .selectShop .nav .item { | page .continer .selectShop .nav .item { | ||||
color: #ffffff; | color: #ffffff; | ||||
padding: 8rpx 15rpx; | padding: 8rpx 15rpx; | ||||
background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%); | |||||
background: linear-gradient(270deg, #DDAB5A, #B8832D); | |||||
border-radius: 15rpx; | border-radius: 15rpx; | ||||
} | } | ||||
page .continer .selectShop .shopList { | page .continer .selectShop .shopList { | ||||
@@ -36,22 +36,26 @@ page .continer .selectShop .shopList .item { | |||||
justify-content: space-between; | justify-content: space-between; | ||||
width: 95%; | width: 95%; | ||||
margin: auto; | margin: auto; | ||||
color: #ffffff; | |||||
color: #000000; | |||||
margin-bottom: 30rpx; | margin-bottom: 30rpx; | ||||
padding: 20rpx 25rpx 50rpx 25rpx; | |||||
padding: 25rpx 25rpx 25rpx 25rpx; | |||||
box-sizing: border-box !important; | box-sizing: border-box !important; | ||||
background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%); | |||||
background-color: #f3f3f3; | |||||
border: 1px solid #0000002d; | |||||
border-radius: 12rpx; | border-radius: 12rpx; | ||||
} | } | ||||
page .continer .selectShop .shopList .item .img { | page .continer .selectShop .shopList .item .img { | ||||
position: relative; | |||||
width: 30%; | width: 30%; | ||||
height: 170rpx; | |||||
border-radius: 15rpx; | |||||
overflow: hidden; | |||||
} | } | ||||
page .continer .selectShop .shopList .item .img image { | page .continer .selectShop .shopList .item .img image { | ||||
width: 100%; | |||||
height: 100%; | |||||
position: absolute; | |||||
top: 50%; | |||||
transform: translateY(-50%); | |||||
width: 170rpx; | |||||
height: 170rpx; | |||||
border-radius: 15rpx; | |||||
border: 1px solid #00000018; | |||||
} | } | ||||
page .continer .selectShop .shopList .item .infoBox { | page .continer .selectShop .shopList .item .infoBox { | ||||
display: flex; | display: flex; | ||||
@@ -63,9 +67,24 @@ page .continer .selectShop .shopList .item .infoBox { | |||||
} | } | ||||
page .continer .selectShop .shopList .item .infoBox .infoItem { | page .continer .selectShop .shopList .item .infoBox .infoItem { | ||||
width: 100%; | width: 100%; | ||||
white-space: nowrap; | |||||
overflow: hidden; | |||||
text-overflow: ellipsis; | |||||
white-space: pre-wrap; | |||||
} | |||||
page .continer .selectShop .shopList .item .infoBox .infoItem.distance { | |||||
margin: 20rpx 0; | |||||
} | |||||
page .continer .selectShop .shopList .item .infoBox .infoItem.address { | |||||
font-size: 27rpx; | |||||
} | |||||
page .continer .selectShop .shopList .item .infoBox .infoItem .mapBtn { | |||||
position: relative; | |||||
bottom: 2rpx; | |||||
display: inline-block; | |||||
font-size: 22rpx; | |||||
color: #ffffff; | |||||
padding: 10rpx; | |||||
border-radius: 15rpx; | |||||
background: linear-gradient(270deg, #DDAB5A, #B8832D); | |||||
margin-left: 20rpx; | |||||
} | } | ||||
page .continer .selectShop .shopList .item .infoBox2 { | page .continer .selectShop .shopList .item .infoBox2 { | ||||
display: flex; | display: flex; | ||||
@@ -77,17 +96,11 @@ page .continer .selectShop .shopList .item .infoBox2 { | |||||
} | } | ||||
page .continer .selectShop .shopList .item .infoBox2 .infoItem { | page .continer .selectShop .shopList .item .infoBox2 .infoItem { | ||||
width: 100%; | width: 100%; | ||||
white-space: nowrap; | |||||
overflow: hidden; | |||||
text-overflow: ellipsis; | |||||
white-space: pre-wrap; | |||||
} | } | ||||
page .continer .selectShop .shopList .item .mapBtn { | |||||
position: absolute; | |||||
bottom: 15rpx; | |||||
right: 15rpx; | |||||
padding: 7rpx 12rpx; | |||||
border-radius: 15rpx; | |||||
background-color: #f76767; | |||||
page .continer .selectShop .shopList .item .infoBox2 .infoItem.address { | |||||
font-size: 27rpx; | |||||
margin-top: 15rpx; | |||||
} | } | ||||
page .continer .selectShop .shopList .takeingPlace { | page .continer .selectShop .shopList .takeingPlace { | ||||
text-align: center; | text-align: center; | ||||
@@ -107,7 +120,7 @@ page .continer .selectCity .nav .item { | |||||
color: #ffffff; | color: #ffffff; | ||||
text-align: center; | text-align: center; | ||||
padding: 8rpx 15rpx; | padding: 8rpx 15rpx; | ||||
background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%); | |||||
background: linear-gradient(270deg, #DDAB5A, #B8832D); | |||||
border-radius: 15rpx; | border-radius: 15rpx; | ||||
} | } | ||||
page .continer .selectCity .notice { | page .continer .selectCity .notice { | ||||
@@ -58,10 +58,10 @@ | |||||
"location": "audit" | "location": "audit" | ||||
}, | }, | ||||
{ | { | ||||
"id": 1688290922168, | |||||
"id": 1688632963730, | |||||
"name": "pages2/shopSelect/shopSelect", | "name": "pages2/shopSelect/shopSelect", | ||||
"pathName": "pages2/shopSelect/shopSelect", | "pathName": "pages2/shopSelect/shopSelect", | ||||
"query": "id=835370938545004544&orderId=835370938545004544&merOrderId=835370895208669184&startTime=2023-07-02&endTime=2023-08-30", | |||||
"query": "id=836843854212816896&orderId=836843854212816896&merOrderId=836843817668763648&startTime=2023-07-06&endTime=2023-08-30", | |||||
"scene": "990001", | "scene": "990001", | ||||
"launchFrom": "scan", | "launchFrom": "scan", | ||||
"location": "qr_code" | "location": "qr_code" | ||||