xt / xcx-book · Commits

Go to a project

Commit 5d7c84ee41ccb4ad99dd3a383a46101ae02a9fe7

Authored by pengye
1 parent 0f601a09
build: skipped

邀请函导航地址修改样式

Inline Side-by-side
Showing 15 changed files with 154 additions and 43 deletions
... ... @@ -487,6 +487,9 @@ Page({
case 'moroccanBlue':
themeSixteen = '#19516A'
break;
case 'crimson':
themeSixteen = '#86201B'
break;
}
this.setData({
chef,
... ...
... ... @@ -3,11 +3,14 @@
<nav hasHome backgroundColor="{{themeSixteen}}" color="#fff" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
<scroll-view scroll-y class="{{themeColor}}">
<view class="positioningBox">
<view class="positioning" bindtap="looklocation">
<view class="positioning">
<text class="font48r">{{seller.name || reserve.seller_name}}</text>
<view class="name">
<image src="https://qn.colorcun.com/mapIcon.png" mode="" />
<text class="font28r">{{seller.addr|| reserev.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
查看定位
</button>
</view>
</view>
</view>
... ...
... ... @@ -140,19 +140,31 @@
}
.positioning image {
width: 32rpx;
height: 38rpx;
margin-right: 20rpx;
width: 25rpx;
height: 25rpx;
margin-right: 4rpx;
}
.positioning .name {
width: 95%;
width: 100%;
display: flex;
align-items: center;
font-family: PingFang SC;
margin-top: 10rpx;
}
.mapBtn {
width: 33%;
padding: 8rpx;
margin-left: 10rpx;
height: 54rpx !important;
border: 2rpx solid #0143A3;
color: #0143A3;
height: 54rpx !important;
border-radius: 42rpx;
font-weight: 600;
}
.positioning .name text {
width: 100%;
line-height: 50rpx;
... ...
... ... @@ -60,10 +60,13 @@
<view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r">
{{marketing.wecomle}}
</view>
<view class="positioning" bindtap="looklocation">
<view class="positioning">
<view class="name">
<image src="{{themeColor=='pearlWhite'?'https://qn.colorcun.com/whiteAddress.png':'https://qn.colorcun.com/mapIcon.png'}}" mode="" />
<text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
查看定位
</button>
</view>
</view>
</view>
... ...
... ... @@ -180,13 +180,13 @@
}
.positioning image {
width: 32rpx;
height: 38rpx;
margin-right: 20rpx;
width: 25rpx;
height: 25rpx;
margin-right: 4rpx;
}
.positioning .name {
width: 80%;
width: 100%;
display: flex;
align-items: center;
font-family: PingFang SC;
... ... @@ -194,6 +194,18 @@
margin-top: 10rpx;
}
.mapBtn {
width: 33%;
padding: 8rpx;
margin-left: 10rpx;
height: 54rpx !important;
border: 2rpx solid #0143A3;
color: #0143A3;
height: 54rpx !important;
border-radius: 42rpx;
font-weight: 600;
}
.positioning .name text {
width: 100%;
line-height: 50rpx;
... ...
... ... @@ -27,9 +27,10 @@
</view>
<view class="positioning">
<text class="font28r">地址：{{seller.addr?seller.addr:reserev.seller.map_address}}</text>
<view class="font24r orderingFood" bindtap="looklocation">
导航
</view>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
查看定位
</button>
</view>
<block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
<view class="handleInfo">
... ...
... ... @@ -161,7 +161,7 @@
.positioning {
margin: 22rpx 70rpx 40rpx 70rpx;
margin: 22rpx 40rpx 40rpx 40rpx;
display: flex;
justify-content: space-between;
border-radius: 10rpx;
... ... @@ -169,10 +169,26 @@
color: #999999;
}
.positioning text{
flex: 1;
}
.positioning image {
width: 32rpx;
height: 38rpx;
margin-right: 16rpx;
width: 25rpx;
height: 25rpx;
margin-right: 4rpx;
}
.mapBtn {
width: 33%;
padding: 8rpx;
margin-left: 10rpx;
height: 54rpx !important;
border: 2rpx solid #0143A3;
color: #0143A3;
height: 54rpx !important;
border-radius: 42rpx;
font-weight: 600;
}
.introduce {
... ...
... ... @@ -13,9 +13,12 @@
<view class="leftInfo font32r">{{seller.time}}</view>
<view class="leftInfo font32r over">{{seller.tablesText}}</view>
<view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view>
<view class="font32r addressInfo" bindtap="looklocation" wx:if="{{seller.addr|| reserev.seller.map_address}}">
<image src="{{themeColor=='pearlWhite'?'https://qn.colorcun.com/mapIcon.png':'https://qn.colorcun.com/whiteAddress.png'}}" mode="" />
<view class="font32r addressInfo" wx:if="{{seller.addr|| reserev.seller.map_address}}">
<text>{{seller.addr|| reserev.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
查看定位
</button>
</view>
</view>
</view>
... ...
... ... @@ -87,10 +87,22 @@
overflow-y: scroll;
}
.mapBtn {
width: 30%;
padding: 8rpx;
margin: 0 40rpx 0 10rpx;
height: 54rpx !important;
border: 2rpx solid #0143A3;
color: #0143A3;
height: 54rpx !important;
border-radius: 42rpx;
font-weight: 600;
}
.addressInfo image {
width: 32rpx;
height: 38rpx;
margin: 2% 20rpx 0 0;
width: 25rpx;
height: 25rpx;
margin-right: 4rpx;
}
.addressInfo text {
... ... @@ -99,7 +111,7 @@
.line {
width: 2rpx;
height: 450rpx;
height: 500rpx;
background: #FFD200;
margin: 10rpx 20rpx 0 20rpx;
}
... ... @@ -109,6 +121,7 @@
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 20rpx;
}
.chefText {
... ...
... ... @@ -58,11 +58,14 @@
<view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r">
{{marketing.wecomle}}
</view>
<view class="positioning" bindtap="looklocation">
<image src="https://qn.colorcun.com/address.png" mode="" />
<view class="positioning">
<view class="name">
<text>{{seller.addr?seller.addr:reserev.seller.map_address}}</text>
</view>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
查看定位
</button>
</view>
</view>
</view>
... ...
... ... @@ -184,13 +184,13 @@
}
.positioning image {
width: 32rpx;
height: 38rpx;
margin-right: 16rpx;
width: 25rpx;
height: 25rpx;
margin-right: 4rpx;
}
.positioning .name {
width: 80%;
width: 100%;
display: flex;
flex-direction: column;
color: #000000;
... ... @@ -198,6 +198,18 @@
font-size: 28rpx;
}
.mapBtn {
width: 33%;
padding: 8rpx;
margin-left: 10rpx;
height: 54rpx !important;
border: 2rpx solid #0143A3;
color: #0143A3;
height: 54rpx !important;
border-radius: 42rpx;
font-weight: 600;
}
.positioning .name text {
line-height: 50rpx;
}
... ...
... ... @@ -54,10 +54,13 @@
<view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r">
{{marketing.wecomle}}
</view>
<view class="positioning" bindtap="looklocation">
<view class="positioning">
<view class="name">
<image src="https://qn.colorcun.com/address.png" mode="" />
<text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
查看定位
</button>
</view>
</view>
</view>
... ...
... ... @@ -144,13 +144,13 @@
}
.positioning image {
width: 32rpx;
height: 38rpx;
margin-right: 20rpx;
width: 25rpx;
height: 25rpx;
margin-right: 4rpx;
}
.positioning .name {
width: 95%;
width: 100%;
display: flex;
align-items: center;
font-family: PingFang SC;
... ... @@ -158,6 +158,18 @@
margin-top: 10rpx;
}
.mapBtn {
width: 33%;
padding: 8rpx;
margin-left: 10rpx;
height: 54rpx !important;
border: 2rpx solid #0143A3;
color: #0143A3;
height: 54rpx !important;
border-radius: 42rpx;
font-weight: 600;
}
.positioning .name text {
line-height: 50rpx;
width: 100%;
... ...
... ... @@ -41,10 +41,13 @@
<view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r">
{{marketing.wecomle}}
</view>
<view class="positioning" bindtap="looklocation">
<view class="positioning">
<view class="name">
<image src="https://qn.colorcun.com/address.png" mode="" />
<text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
查看定位
</button>
</view>
</view>
</view>
... ...
... ... @@ -167,13 +167,13 @@
}
.positioning image {
width: 32rpx;
height: 38rpx;
margin-right: 20rpx;
width: 25rpx;
height: 25rpx;
margin-right: 4rpx;
}
.positioning .name {
width: 95%;
width: 100%;
display: flex;
align-items: center;
font-family: PingFang SC;
... ... @@ -181,6 +181,18 @@
margin-top: 10rpx;
}
.mapBtn {
width: 33%;
padding: 8rpx;
margin-left: 10rpx;
height: 54rpx !important;
border: 2rpx solid #0143A3;
color: #0143A3;
height: 54rpx !important;
border-radius: 42rpx;
font-weight: 600;
}
.positioning .name text {
line-height: 50rpx;
width: 100%;
... ...