Accept Merge Request #37: (feature/hant -> develop)
Merge Request: ditu Created By: @todayswind Accepted By: @todayswind URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/37?initial=true
This commit is contained in:
commit
56cb02eb69
|
|
@ -469,6 +469,119 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<h4 class="mb-4">热门服务</h4>
|
||||
|
||||
<div class="service-item">
|
||||
<div class="rank-icon">🥇</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
<div class="progress">
|
||||
<div class="progress-bar bg-pink" style="width: 19%; background-color: #f06292;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon">🥈</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
<div class="progress">
|
||||
<div class="progress-bar bg-pink" style="width: 19%; background-color: #f06292;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon">🥉</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
<div class="progress">
|
||||
<div class="progress-bar bg-pink" style="width: 19%; background-color: #f06292;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="service-item">
|
||||
<div class="rank-icon-num">#4</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon-num">#5</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon-num">#6</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<h4 class="mb-4">热门服务</h4>
|
||||
|
||||
<div class="service-item">
|
||||
<div class="rank-icon">🥇</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
<div class="progress">
|
||||
<div class="progress-bar bg-pink" style="width: 19%; background-color: #f06292;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon">🥈</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
<div class="progress">
|
||||
<div class="progress-bar bg-pink" style="width: 19%; background-color: #f06292;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon">🥉</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
<div class="progress">
|
||||
<div class="progress-bar bg-pink" style="width: 19%; background-color: #f06292;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="service-item">
|
||||
<div class="rank-icon-num">#4</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon-num">#5</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="service-item">
|
||||
<div class="rank-icon-num">#6</div>
|
||||
<div class="service-content">
|
||||
<div> 日常保洁</div>
|
||||
<div class="service-content-sub">销量47 (19%)</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<style>
|
||||
|
|
@ -617,5 +730,42 @@
|
|||
font-size: 12px;
|
||||
color: #7345a5;
|
||||
}
|
||||
|
||||
.service-item {
|
||||
margin-bottom: 1.5rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.progress {
|
||||
height: 10px;
|
||||
}
|
||||
.rank-icon {
|
||||
font-size: 30px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background-color: #f3f3f3;
|
||||
border-radius: 50%;
|
||||
line-height: 40px;
|
||||
display: inline-block;
|
||||
text-align: center;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.rank-icon-num{
|
||||
font-size: 14px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background-color: #f3f3f3;
|
||||
border-radius: 50%;
|
||||
line-height: 40px;
|
||||
display: inline-block;
|
||||
text-align: center;
|
||||
color: #7a8591;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.service-content{
|
||||
flex: 1;
|
||||
}
|
||||
.service-content-sub{
|
||||
color: #ccc;
|
||||
font-size: 12px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -12,9 +12,9 @@ define([], function () {
|
|||
var zoom_id = $(that).data("zoom-id") ? $(that).data("zoom-id") : "";
|
||||
var lat = lat_id ? $("#" + lat_id).val() : '';
|
||||
var lng = lng_id ? $("#" + lng_id).val() : '';
|
||||
var city_code = $("#area_id").val();
|
||||
var city_code = $("#c-city").val();
|
||||
var zoom = zoom_id ? $("#" + zoom_id).val() : '';
|
||||
var url = "/addons/address/index/select?1=1";
|
||||
var url = "/addons/address/index/select?a=1";
|
||||
url += (lat && lng) ? 'lat=' + lat + '&lng=' + lng +
|
||||
(input_id ? "&address=" + $("#" + input_id).val() : "")
|
||||
+(zoom ? "&zoom=" + zoom : "") : ''
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user