Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
xman
commit
f05b93c678
|
|
@ -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,11 +12,6 @@ class OrderAbnormalService extends BaseService
|
|||
*/
|
||||
public function create(int $workerId, array $params)
|
||||
{
|
||||
$data = $this->getOrderAbnormal($workerId, $params['order_id']);
|
||||
if ($data) {
|
||||
$this->apiError('您已上报过异常，请勿重复提交');
|
||||
}
|
||||
|
||||
$abnormal = $this->getAbnormalModel()->find($params['abnormal_id']);
|
||||
if (!$abnormal) {
|
||||
$this->apiError('异常原因不存在，请重新选择');
|
||||
|
|
|
|||
|
|
@ -329,9 +329,11 @@ class OrderDispatchService extends BaseService
|
|||
$orderDispatch = $this->getOrderDispatchInfo($workerId, $params['order_dispatch_id']);
|
||||
$orderDispatch->status = OrderDispatch::STATUS_FINISH;
|
||||
$orderDispatch->images = $this->removeStrCdnUrl($params['complete_images']);
|
||||
$orderDispatch->finish_time = $time;
|
||||
|
||||
if ($params['receive_type'] === 1) {
|
||||
$orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']);
|
||||
$orderDispatch->offline_total_type = $params['offline_total_type'];
|
||||
$orderDispatch->finish_time = $time;
|
||||
|
||||
//线下尾款
|
||||
if ($params['final_payment_method'] == 1) {
|
||||
|
|
@ -342,6 +344,7 @@ class OrderDispatchService extends BaseService
|
|||
if ($params['final_payment_method'] == 2) {
|
||||
$orderDispatch->online_total = $params['amount'];
|
||||
}
|
||||
}
|
||||
|
||||
$orderDispatch->save();
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,12 @@ class OrderDispatch extends Validate
|
|||
'images|上门图片' => 'require|max:3000',
|
||||
|
||||
'complete_images|完成图片' => 'require|max:3000',
|
||||
'final_payment_method|收款方式' => 'require|in:1,2',
|
||||
'amount|收款金额' => 'require|number|between:0,10000000',
|
||||
'payment_image|收款图片' => 'require|max:255',
|
||||
'final_payment_method|收款方式' => 'requireIf:receive_type,1|in:1,2',
|
||||
'amount|收款金额' => 'requireIf:receive_type,1|number|between:0,10000000',
|
||||
'payment_image|收款图片' => 'requireIf:receive_type,1|max:255',
|
||||
'offline_total_type|尾款收款方' => 'in:0,1,2',
|
||||
'receive_type' => 'require|in:1,2',
|
||||
|
||||
'reject_reason|拒接原因' => 'max:100',
|
||||
'worker_remark|备注信息' => 'max:500',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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