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({ @@ -487,6 +487,9 @@ Page({
487 case 'moroccanBlue': 487 case 'moroccanBlue':
488 themeSixteen = '#19516A' 488 themeSixteen = '#19516A'
489 break; 489 break;
  490 + case 'crimson':
  491 + themeSixteen = '#86201B'
  492 + break;
490 } 493 }
491 this.setData({ 494 this.setData({
492 chef, 495 chef,
@@ -3,11 +3,14 @@ @@ -3,11 +3,14 @@
3 <nav hasHome backgroundColor="{{themeSixteen}}" color="#fff" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 3 <nav hasHome backgroundColor="{{themeSixteen}}" color="#fff" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <view class="positioningBox"> 5 <view class="positioningBox">
6 - <view class="positioning" bindtap="looklocation"> 6 + <view class="positioning">
7 <text class="font48r">{{seller.name || reserve.seller_name}}</text> 7 <text class="font48r">{{seller.name || reserve.seller_name}}</text>
8 <view class="name"> 8 <view class="name">
9 - <image src="https://qn.colorcun.com/mapIcon.png" mode="" />  
10 <text class="font28r">{{seller.addr|| reserev.seller.map_address}}</text> 9 <text class="font28r">{{seller.addr|| reserev.seller.map_address}}</text>
  10 + <button bindtap="looklocation" class="flex-cc font24r mapBtn">
  11 + <image src="https://qn.colorcun.com/address.png" mode="" />
  12 + 查看定位
  13 + </button>
11 </view> 14 </view>
12 </view> 15 </view>
13 </view> 16 </view>
@@ -140,19 +140,31 @@ @@ -140,19 +140,31 @@
140 } 140 }
141 141
142 .positioning image { 142 .positioning image {
143 - width: 32rpx;  
144 - height: 38rpx;  
145 - margin-right: 20rpx; 143 + width: 25rpx;
  144 + height: 25rpx;
  145 + margin-right: 4rpx;
146 } 146 }
147 147
148 .positioning .name { 148 .positioning .name {
149 - width: 95%; 149 + width: 100%;
150 display: flex; 150 display: flex;
151 align-items: center; 151 align-items: center;
152 font-family: PingFang SC; 152 font-family: PingFang SC;
153 margin-top: 10rpx; 153 margin-top: 10rpx;
154 } 154 }
155 155
  156 +.mapBtn {
  157 + width: 33%;
  158 + padding: 8rpx;
  159 + margin-left: 10rpx;
  160 + height: 54rpx !important;
  161 + border: 2rpx solid #0143A3;
  162 + color: #0143A3;
  163 + height: 54rpx !important;
  164 + border-radius: 42rpx;
  165 + font-weight: 600;
  166 +}
  167 +
156 .positioning .name text { 168 .positioning .name text {
157 width: 100%; 169 width: 100%;
158 line-height: 50rpx; 170 line-height: 50rpx;
@@ -60,10 +60,13 @@ @@ -60,10 +60,13 @@
60 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r"> 60 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r">
61 {{marketing.wecomle}} 61 {{marketing.wecomle}}
62 </view> 62 </view>
63 - <view class="positioning" bindtap="looklocation"> 63 + <view class="positioning">
64 <view class="name"> 64 <view class="name">
65 - <image src="{{themeColor=='pearlWhite'?'https://qn.colorcun.com/whiteAddress.png':'https://qn.colorcun.com/mapIcon.png'}}" mode="" />  
66 <text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text> 65 <text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text>
  66 + <button bindtap="looklocation" class="flex-cc font24r mapBtn">
  67 + <image src="https://qn.colorcun.com/address.png" mode="" />
  68 + 查看定位
  69 + </button>
67 </view> 70 </view>
68 </view> 71 </view>
69 </view> 72 </view>
@@ -180,13 +180,13 @@ @@ -180,13 +180,13 @@
180 } 180 }
181 181
182 .positioning image { 182 .positioning image {
183 - width: 32rpx;  
184 - height: 38rpx;  
185 - margin-right: 20rpx; 183 + width: 25rpx;
  184 + height: 25rpx;
  185 + margin-right: 4rpx;
186 } 186 }
187 187
188 .positioning .name { 188 .positioning .name {
189 - width: 80%; 189 + width: 100%;
190 display: flex; 190 display: flex;
191 align-items: center; 191 align-items: center;
192 font-family: PingFang SC; 192 font-family: PingFang SC;
@@ -194,6 +194,18 @@ @@ -194,6 +194,18 @@
194 margin-top: 10rpx; 194 margin-top: 10rpx;
195 } 195 }
196 196
  197 +.mapBtn {
  198 + width: 33%;
  199 + padding: 8rpx;
  200 + margin-left: 10rpx;
  201 + height: 54rpx !important;
  202 + border: 2rpx solid #0143A3;
  203 + color: #0143A3;
  204 + height: 54rpx !important;
  205 + border-radius: 42rpx;
  206 + font-weight: 600;
  207 +}
  208 +
197 .positioning .name text { 209 .positioning .name text {
198 width: 100%; 210 width: 100%;
199 line-height: 50rpx; 211 line-height: 50rpx;
@@ -27,9 +27,10 @@ @@ -27,9 +27,10 @@
27 </view> 27 </view>
28 <view class="positioning"> 28 <view class="positioning">
29 <text class="font28r">地址：{{seller.addr?seller.addr:reserev.seller.map_address}}</text> 29 <text class="font28r">地址：{{seller.addr?seller.addr:reserev.seller.map_address}}</text>
30 - <view class="font24r orderingFood" bindtap="looklocation">  
31 - 导航  
32 - </view> 30 + <button bindtap="looklocation" class="flex-cc font24r mapBtn">
  31 + <image src="https://qn.colorcun.com/address.png" mode="" />
  32 + 查看定位
  33 + </button>
33 </view> 34 </view>
34 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 35 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
35 <view class="handleInfo"> 36 <view class="handleInfo">
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 161
162 162
163 .positioning { 163 .positioning {
164 - margin: 22rpx 70rpx 40rpx 70rpx; 164 + margin: 22rpx 40rpx 40rpx 40rpx;
165 display: flex; 165 display: flex;
166 justify-content: space-between; 166 justify-content: space-between;
167 border-radius: 10rpx; 167 border-radius: 10rpx;
@@ -169,10 +169,26 @@ @@ -169,10 +169,26 @@
169 color: #999999; 169 color: #999999;
170 } 170 }
171 171
  172 +.positioning text{
  173 + flex: 1;
  174 +}
  175 +
172 .positioning image { 176 .positioning image {
173 - width: 32rpx;  
174 - height: 38rpx;  
175 - margin-right: 16rpx; 177 + width: 25rpx;
  178 + height: 25rpx;
  179 + margin-right: 4rpx;
  180 +}
  181 +
  182 +.mapBtn {
  183 + width: 33%;
  184 + padding: 8rpx;
  185 + margin-left: 10rpx;
  186 + height: 54rpx !important;
  187 + border: 2rpx solid #0143A3;
  188 + color: #0143A3;
  189 + height: 54rpx !important;
  190 + border-radius: 42rpx;
  191 + font-weight: 600;
176 } 192 }
177 193
178 .introduce { 194 .introduce {
@@ -13,9 +13,12 @@ @@ -13,9 +13,12 @@
13 <view class="leftInfo font32r">{{seller.time}}</view> 13 <view class="leftInfo font32r">{{seller.time}}</view>
14 <view class="leftInfo font32r over">{{seller.tablesText}}</view> 14 <view class="leftInfo font32r over">{{seller.tablesText}}</view>
15 <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view> 15 <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view>
16 - <view class="font32r addressInfo" bindtap="looklocation" wx:if="{{seller.addr|| reserev.seller.map_address}}">  
17 - <image src="{{themeColor=='pearlWhite'?'https://qn.colorcun.com/mapIcon.png':'https://qn.colorcun.com/whiteAddress.png'}}" mode="" /> 16 + <view class="font32r addressInfo" wx:if="{{seller.addr|| reserev.seller.map_address}}">
18 <text>{{seller.addr|| reserev.seller.map_address}}</text> 17 <text>{{seller.addr|| reserev.seller.map_address}}</text>
  18 + <button bindtap="looklocation" class="flex-cc font24r mapBtn">
  19 + <image src="https://qn.colorcun.com/address.png" mode="" />
  20 + 查看定位
  21 + </button>
19 </view> 22 </view>
20 </view> 23 </view>
21 </view> 24 </view>
@@ -87,10 +87,22 @@ @@ -87,10 +87,22 @@
87 overflow-y: scroll; 87 overflow-y: scroll;
88 } 88 }
89 89
  90 +.mapBtn {
  91 + width: 30%;
  92 + padding: 8rpx;
  93 + margin: 0 40rpx 0 10rpx;
  94 + height: 54rpx !important;
  95 + border: 2rpx solid #0143A3;
  96 + color: #0143A3;
  97 + height: 54rpx !important;
  98 + border-radius: 42rpx;
  99 + font-weight: 600;
  100 +}
  101 +
90 .addressInfo image { 102 .addressInfo image {
91 - width: 32rpx;  
92 - height: 38rpx;  
93 - margin: 2% 20rpx 0 0; 103 + width: 25rpx;
  104 + height: 25rpx;
  105 + margin-right: 4rpx;
94 } 106 }
95 107
96 .addressInfo text { 108 .addressInfo text {
@@ -99,7 +111,7 @@ @@ -99,7 +111,7 @@
99 111
100 .line { 112 .line {
101 width: 2rpx; 113 width: 2rpx;
102 - height: 450rpx; 114 + height: 500rpx;
103 background: #FFD200; 115 background: #FFD200;
104 margin: 10rpx 20rpx 0 20rpx; 116 margin: 10rpx 20rpx 0 20rpx;
105 } 117 }
@@ -109,6 +121,7 @@ @@ -109,6 +121,7 @@
109 display: flex; 121 display: flex;
110 justify-content: space-between; 122 justify-content: space-between;
111 align-items: center; 123 align-items: center;
  124 + padding-bottom: 20rpx;
112 } 125 }
113 126
114 .chefText { 127 .chefText {
@@ -58,11 +58,14 @@ @@ -58,11 +58,14 @@
58 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r"> 58 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r">
59 {{marketing.wecomle}} 59 {{marketing.wecomle}}
60 </view> 60 </view>
61 - <view class="positioning" bindtap="looklocation">  
62 - <image src="https://qn.colorcun.com/address.png" mode="" /> 61 + <view class="positioning">
63 <view class="name"> 62 <view class="name">
64 <text>{{seller.addr?seller.addr:reserev.seller.map_address}}</text> 63 <text>{{seller.addr?seller.addr:reserev.seller.map_address}}</text>
65 </view> 64 </view>
  65 + <button bindtap="looklocation" class="flex-cc font24r mapBtn">
  66 + <image src="https://qn.colorcun.com/address.png" mode="" />
  67 + 查看定位
  68 + </button>
66 </view> 69 </view>
67 </view> 70 </view>
68 </view> 71 </view>
@@ -184,13 +184,13 @@ @@ -184,13 +184,13 @@
184 } 184 }
185 185
186 .positioning image { 186 .positioning image {
187 - width: 32rpx;  
188 - height: 38rpx;  
189 - margin-right: 16rpx; 187 + width: 25rpx;
  188 + height: 25rpx;
  189 + margin-right: 4rpx;
190 } 190 }
191 191
192 .positioning .name { 192 .positioning .name {
193 - width: 80%; 193 + width: 100%;
194 display: flex; 194 display: flex;
195 flex-direction: column; 195 flex-direction: column;
196 color: #000000; 196 color: #000000;
@@ -198,6 +198,18 @@ @@ -198,6 +198,18 @@
198 font-size: 28rpx; 198 font-size: 28rpx;
199 } 199 }
200 200
  201 +.mapBtn {
  202 + width: 33%;
  203 + padding: 8rpx;
  204 + margin-left: 10rpx;
  205 + height: 54rpx !important;
  206 + border: 2rpx solid #0143A3;
  207 + color: #0143A3;
  208 + height: 54rpx !important;
  209 + border-radius: 42rpx;
  210 + font-weight: 600;
  211 +}
  212 +
201 .positioning .name text { 213 .positioning .name text {
202 line-height: 50rpx; 214 line-height: 50rpx;
203 } 215 }
@@ -54,10 +54,13 @@ @@ -54,10 +54,13 @@
54 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r"> 54 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r">
55 {{marketing.wecomle}} 55 {{marketing.wecomle}}
56 </view> 56 </view>
57 - <view class="positioning" bindtap="looklocation"> 57 + <view class="positioning">
58 <view class="name"> 58 <view class="name">
59 - <image src="https://qn.colorcun.com/address.png" mode="" />  
60 <text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text> 59 <text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text>
  60 + <button bindtap="looklocation" class="flex-cc font24r mapBtn">
  61 + <image src="https://qn.colorcun.com/address.png" mode="" />
  62 + 查看定位
  63 + </button>
61 </view> 64 </view>
62 </view> 65 </view>
63 </view> 66 </view>
@@ -144,13 +144,13 @@ @@ -144,13 +144,13 @@
144 } 144 }
145 145
146 .positioning image { 146 .positioning image {
147 - width: 32rpx;  
148 - height: 38rpx;  
149 - margin-right: 20rpx; 147 + width: 25rpx;
  148 + height: 25rpx;
  149 + margin-right: 4rpx;
150 } 150 }
151 151
152 .positioning .name { 152 .positioning .name {
153 - width: 95%; 153 + width: 100%;
154 display: flex; 154 display: flex;
155 align-items: center; 155 align-items: center;
156 font-family: PingFang SC; 156 font-family: PingFang SC;
@@ -158,6 +158,18 @@ @@ -158,6 +158,18 @@
158 margin-top: 10rpx; 158 margin-top: 10rpx;
159 } 159 }
160 160
  161 +.mapBtn {
  162 + width: 33%;
  163 + padding: 8rpx;
  164 + margin-left: 10rpx;
  165 + height: 54rpx !important;
  166 + border: 2rpx solid #0143A3;
  167 + color: #0143A3;
  168 + height: 54rpx !important;
  169 + border-radius: 42rpx;
  170 + font-weight: 600;
  171 +}
  172 +
161 .positioning .name text { 173 .positioning .name text {
162 line-height: 50rpx; 174 line-height: 50rpx;
163 width: 100%; 175 width: 100%;
@@ -41,10 +41,13 @@ @@ -41,10 +41,13 @@
41 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r"> 41 <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r">
42 {{marketing.wecomle}} 42 {{marketing.wecomle}}
43 </view> 43 </view>
44 - <view class="positioning" bindtap="looklocation"> 44 + <view class="positioning">
45 <view class="name"> 45 <view class="name">
46 - <image src="https://qn.colorcun.com/address.png" mode="" />  
47 <text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text> 46 <text class="font36r">{{seller.addr|| reserev.seller.map_address}}</text>
  47 + <button bindtap="looklocation" class="flex-cc font24r mapBtn">
  48 + <image src="https://qn.colorcun.com/address.png" mode="" />
  49 + 查看定位
  50 + </button>
48 </view> 51 </view>
49 </view> 52 </view>
50 </view> 53 </view>
@@ -167,13 +167,13 @@ @@ -167,13 +167,13 @@
167 } 167 }
168 168
169 .positioning image { 169 .positioning image {
170 - width: 32rpx;  
171 - height: 38rpx;  
172 - margin-right: 20rpx; 170 + width: 25rpx;
  171 + height: 25rpx;
  172 + margin-right: 4rpx;
173 } 173 }
174 174
175 .positioning .name { 175 .positioning .name {
176 - width: 95%; 176 + width: 100%;
177 display: flex; 177 display: flex;
178 align-items: center; 178 align-items: center;
179 font-family: PingFang SC; 179 font-family: PingFang SC;
@@ -181,6 +181,18 @@ @@ -181,6 +181,18 @@
181 margin-top: 10rpx; 181 margin-top: 10rpx;
182 } 182 }
183 183
  184 +.mapBtn {
  185 + width: 33%;
  186 + padding: 8rpx;
  187 + margin-left: 10rpx;
  188 + height: 54rpx !important;
  189 + border: 2rpx solid #0143A3;
  190 + color: #0143A3;
  191 + height: 54rpx !important;
  192 + border-radius: 42rpx;
  193 + font-weight: 600;
  194 +}
  195 +
184 .positioning .name text { 196 .positioning .name text {
185 line-height: 50rpx; 197 line-height: 50rpx;
186 width: 100%; 198 width: 100%;