hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #141: (feature/hant -> develop)

Browse Source 
Merge Request: 订单优化

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/141?initial=true
This commit is contained in:
todayswind 2025-06-11 18:31:41 +08:00 committed by Coding
commit 2006a78165
5 changed files with 25 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/view/order/add.html
View File

@ -113,8 +113,8 @@
id="time"
data-date-format="YYYY-MM-DD HH:mm"
autocomplete="off"
data-date-min-view="0"
data-date-minute-step="30"
data-date-stepping="30"
data-date-side-by-side="true"
data-date-autoclose="true"
class="form-input form-control datetimepicker">
</div>

7
application/admin/view/order/copy.html
View File

@ -110,7 +110,12 @@
<div class="item flex-sb" id="set-time" >
<div class="title flex-c"><span class="required">*</span>设置时间：</div>
<div class="value flex-c">
<input name="row[plan_time]" value="{$row['plan_time']}" data-date-format="YYYY-MM-DD HH:mm" placeholder="请选择上门时间" class="form-input form-control datetimepicker">
<input name="row[plan_time]" value="{$row['plan_time']}"
autocomplete="off"
data-date-stepping="30"
data-date-side-by-side="true"
data-date-autoclose="true"
data-date-format="YYYY-MM-DD HH:mm" placeholder="请选择上门时间" class="form-input form-control datetimepicker">
</div>
</div>
</div>

7
application/admin/view/order/edit.html
View File

@ -109,7 +109,12 @@
<div class="item flex-sb" id="set-time" >
<div class="title flex-c"><span class="required">*</span>设置时间：</div>
<div class="value flex-c">
<input name="row[plan_time]" value="{$row['plan_time']}" data-date-format="YYYY-MM-DD HH:mm" placeholder="请选择上门时间" class="form-input form-control datetimepicker">
<input name="row[plan_time]" value="{$row['plan_time']}"
autocomplete="off"
data-date-stepping="30"
data-date-side-by-side="true"
data-date-autoclose="true"
data-date-format="YYYY-MM-DD HH:mm" placeholder="请选择上门时间" class="form-input form-control datetimepicker">
</div>
</div>
</div>

46
application/extra/site.php
View File

@ -1,46 +0,0 @@
<?php
return array (
'name' => '神帝',
'beian' => '2',
'cdnurl' => '',
'version' => '1.0.2',
'timezone' => 'Asia/Shanghai',
'forbiddenip' => '',
'languages' =>
array (
'backend' => 'zh-cn',
'frontend' => 'zh-cn',
),
'fixedpage' => 'dashboard',
'categorytype' =>
array (
'default' => 'Default',
'page' => 'Page',
'article' => 'Article',
'test' => 'Test',
),
'configgroup' =>
array (
'basic' => 'Basic',
'email' => 'Email',
'dictionary' => 'Dictionary',
'user' => 'User',
'example' => 'Example',
),
'mail_type' => '1',
'mail_smtp_host' => 'smtp.qq.com',
'mail_smtp_port' => '465',
'mail_smtp_user' => '',
'mail_smtp_pass' => '',
'mail_verify_type' => '2',
'mail_from' => '',
'attachmentcategory' =>
array (
'category1' => 'Category1',
'category2' => 'Category2',
'custom' => 'Custom',
),
'ip_check' => '0',
'allowip' => '',
);

17
public/assets/js/backend/order.js
View File

@ -647,10 +647,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
if (!isComposing) handleInput(e);
}, 300))
.on('blur', function () {
// 如果还没有选择地址，且列表中有内容，则默认选择第一个
if (!addressSelected) {
// 如果还没有选择地址，且列表中有内容，则默认选择第一个
// 如果还没有选择地址，且列表中有内容，则默认选择第一个
if (!addressSelected && $('#suggestionList li').length > 0) {
$('#suggestionList li').first().trigger('mousedown');
}
$('#suggestionList').hide();
}})
})
.on('focus', function () {
// 如果还没有选择地址，且列表中有内容，则默认选择第一个
$('#suggestionList').show();
@ -744,12 +749,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
const name = $(this).data('name');
const location = $(this).data('location'); // "经度,纬度"
const [lng, lat] = location.split(',');
// console.log('click');
$('#c-address').val(name);
console.log('click');
// $('#c-address').val(name);
$('#lng').val(lng);
$('#lat').val(lat);
// 隐藏提示列表
$('#suggestionList').empty().hide();
$('#suggestionList').hide();
selectedIndex = -1;
addressSelected = true;
});