- 
-
-
-
- 名称：{{if empty($data['user']['username'])}}无{{else /}}{{$data.user.username}}{{/if}} -
- 昵称：{{if empty($data['user']['nickname'])}}无{{else /}}{{$data.user.nickname}}{{/if}} -
- 手机：{{if empty($data['user']['mobile'])}}无{{else /}}{{$data.user.mobile}}{{/if}} -
- 邮箱：{{if empty($data['user']['email'])}}无{{else /}}{{$data.user.email}}{{/if}} -
+
+
+ {{/if}}
+
+ -
+
- 名称：{{if empty($data['user']['username'])}}无{{else /}}{{$data.user.username}}{{/if}} +
- 昵称：{{if empty($data['user']['nickname'])}}无{{else /}}{{$data.user.nickname}}{{/if}} +
- 手机：{{if empty($data['user']['mobile'])}}无{{else /}}{{$data.user.mobile}}{{/if}} +
- 邮箱：{{if empty($data['user']['email'])}}无{{else /}}{{$data.user.email}}{{/if}} +
+
+
@@ -90,7 +97,6 @@
-
diff --git a/application/api/controller/Useraddress.php b/application/api/controller/Useraddress.php
index 149aeda88..59e99e6cf 100755
--- a/application/api/controller/Useraddress.php
+++ b/application/api/controller/Useraddress.php
@@ -134,7 +134,9 @@ class UserAddress extends Common
*/
public function Extraction()
{
- return ConfigService::SiteTypeExtractionAddressList();
+ $params = $this->data_post;
+ $params['user'] = $this->user;
+ return ConfigService::SiteTypeExtractionAddressList(null, $params);
}
/**
diff --git a/application/common.php b/application/common.php
index 16266ad0f..99b2ea9fa 100755
--- a/application/common.php
+++ b/application/common.php
@@ -11,6 +11,43 @@
// 应用公共文件
+/**
+ * 文件快速排序
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2021-03-09
+ * @desc description
+ * @param [array] $data [需要排序的数据（选择一个基准元素，将待排序分成小和打两罐部分，以此类推递归的排序划分两罐部分）]
+ * @param [array] [数组字段]
+ * @return [array] [排序好的数据，从小到大排序]
+ */
+function ArrayQuickSort($data, $field)
+{
+ if(!empty($data) && is_array($data))
+ {
+ $len = count($data);
+ if($len <= 1) return $data;
+
+ $base = $data[0];
+ $left_array = array();
+ $right_array = array();
+ for($i=1; $i<$len; $i++)
+ {
+ if($base[$field] > $data[$i][$field])
+ {
+ $left_array[] = $data[$i];
+ } else {
+ $right_array[] = $data[$i];
+ }
+ }
+ if(!empty($left_array)) $left_array = ArrayQuickSort($left_array, $field);
+ if(!empty($right_array)) $right_array = ArrayQuickSort($right_array, $field);
+
+ return array_merge($left_array, array($base), $right_array);
+ }
+}
+
/**
* 是否base64加密的字符串
* @author Devil
diff --git a/application/index/view/default/public/quick.html b/application/index/view/default/public/quick.html
index 90b3d249a..90f7bbb32 100644
--- a/application/index/view/default/public/quick.html
+++ b/application/index/view/default/public/quick.html
@@ -7,7 +7,7 @@
-
{{foreach $nav_quick as $nav}}
{{if !empty($nav['images_url']) and !empty($nav['name'])}}
-
- +
-
{{if isset($nav['event_type']) and isset($nav['event_value']) and in_array($nav['event_type'], [3,4])}}
{{switch nav.event_type}}
{{case 3}}
diff --git a/application/service/BaseService.php b/application/service/BaseService.php
index cce228d88..4b9782c44 100644
--- a/application/service/BaseService.php
+++ b/application/service/BaseService.php
@@ -65,6 +65,7 @@ class BaseService
// 订单相关
'home_is_enable_order_bulk_pay' => (int) MyC('home_is_enable_order_bulk_pay', 0),
+ 'home_buy_extraction_address_position'=> (int) MyC('home_buy_extraction_address_position', 0),
// 用户中心相关
'common_user_center_notice' => MyC('common_user_center_notice', null, true),
diff --git a/application/service/ConfigService.php b/application/service/ConfigService.php
index 3d9bd9fa5..b833c48fc 100755
--- a/application/service/ConfigService.php
+++ b/application/service/ConfigService.php
@@ -339,9 +339,10 @@ class ConfigService
* @version 1.0.0
* @date 2019-11-13
* @desc description
- * @param [string] $value [自提的配置数据]
+ * @param [string] $value [自提的配置数据]
+ * @param [array] $params [输入参数]
*/
- public static function SiteTypeExtractionAddressList($value = null)
+ public static function SiteTypeExtractionAddressList($value = null, $params = [])
{
// 未指定内容则从缓存读取
if(empty($value))
@@ -363,7 +364,10 @@ class ConfigService
{
foreach($data as &$v)
{
- $v['logo'] = ResourcesService::AttachmentPathViewHandle($v['logo']);
+ if(array_key_exists('logo', $v))
+ {
+ $v['logo'] = ResourcesService::AttachmentPathViewHandle($v['logo']);
+ }
}
}
@@ -375,6 +379,27 @@ class ConfigService
'data' => &$data,
]);
+ // 数据距离处理
+ if(!empty($data) && is_array($data) && !empty($params) && !empty($params['lng']) && !empty($params['lat']))
+ {
+ $unit = 'km';
+ foreach($data as &$v)
+ {
+ if(!empty($v) && is_array($v))
+ {
+ // 计算距离
+ $v['distance_value'] = \base\GeoTransUtil::GetDistance($v['lng'], $v['lat'], $params['lng'], $params['lat'], 2);
+ $v['distance_unit'] = $unit;
+ }
+ }
+
+ // 根据距离排序
+ if(count($data) > 1)
+ {
+ $data = ArrayQuickSort($data, 'distance_value');
+ }
+ }
+
return DataReturn('操作成功', 0, $data);
}
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index f4fba6e46..8239d7630 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -2094,17 +2094,12 @@ class GoodsService
// 有规格值
if(!empty($params['spec']))
{
- $value = [];
// 规格不为数组则为json字符串
if(!is_array($params['spec']))
{
$params['spec'] = json_decode(htmlspecialchars_decode($params['spec']), true);
}
- foreach($params['spec'] as $v)
- {
- $value[] = $v['value'];
- }
- $where['value'] = $value;
+ $where['value'] = array_column($params['spec'], 'value');
// 获取规格值基础值id
$ids = Db::name('GoodsSpecValue')->where($where)->column('goods_spec_base_id');
@@ -2217,16 +2212,11 @@ class GoodsService
];
// 规格不为数组则为json字符串
- $value = [];
if(!is_array($params['spec']))
{
$params['spec'] = json_decode(htmlspecialchars_decode($params['spec']), true);
}
- foreach($params['spec'] as $v)
- {
- $value[] = $v['value'];
- }
- $where['value'] = $value;
+ $where['value'] = array_column($params['spec'], 'value');
// 获取规格值基础值id
$ids = Db::name('GoodsSpecValue')->where($where)->column('goods_spec_base_id');
diff --git a/application/service/QuickNavService.php b/application/service/QuickNavService.php
index 31a8d9c65..c97e9189c 100755
--- a/application/service/QuickNavService.php
+++ b/application/service/QuickNavService.php
@@ -312,6 +312,7 @@ class QuickNavService
// 快捷导航钩子
// web端数据参数可以自定义新增 class_name 名称、方便非url事件使用js控制点击事件
+ // 支持标签自定义数据值 data_value 名称、方便自定义事件响应需要依赖的数据
$hook_name = 'plugins_service_quick_navigation_'.$platform;
Hook::listen($hook_name, [
'hook_name' => $hook_name,
diff --git a/application/tags.php b/application/tags.php
index 22fa9ecf0..55bcc8622 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -47,6 +47,7 @@ return array (
0 => 'app\\plugins\\store\\Hook',
1 => 'app\\plugins\\share\\Hook',
2 => 'app\\plugins\\points\\Hook',
+ 3 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_navigation_header_handle' =>
array (
@@ -56,10 +57,12 @@ return array (
'plugins_service_users_center_left_menu_handle' =>
array (
0 => 'app\\plugins\\store\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_header_navigation_top_right_handle' =>
array (
0 => 'app\\plugins\\store\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_warehouse_goods_inventory_deduct' =>
array (
@@ -113,10 +116,12 @@ return array (
array (
0 => 'app\\plugins\\store\\Hook',
1 => 'app\\plugins\\points\\Hook',
+ 2 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_system_begin' =>
array (
0 => 'app\\plugins\\store\\Hook',
+ 1 => 'app\\plugins\\themeswitch\\Hook',
),
'plugins_view_buy_form_inside' =>
array (
@@ -136,10 +141,12 @@ return array (
array (
0 => 'app\\plugins\\store\\Hook',
1 => 'app\\plugins\\points\\Hook',
+ 2 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_order_aftersale_audit_handle_end' =>
array (
0 => 'app\\plugins\\store\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_goods_buy_nav_button_handle' =>
array (
@@ -161,34 +168,42 @@ return array (
'plugins_service_quick_navigation_pc' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_quick_navigation_h5' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_quick_navigation_weixin' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_quick_navigation_alipay' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_quick_navigation_baidu' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_quick_navigation_qq' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_quick_navigation_toutiao' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_goods_handle_end' =>
array (
0 => 'app\\plugins\\points\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
),
'plugins_service_buy_group_goods_handle' =>
array (
@@ -198,5 +213,37 @@ return array (
array (
0 => 'app\\plugins\\points\\Hook',
),
+ 'plugins_service_site_extraction_address_list' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_service_goods_spec_extends_handle' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_view_admin_user_save' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_service_user_save_handle' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_service_goods_spec_base' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_view_goods_detail_panel_price_top' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_module_form_admin_user_index' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
+ 'plugins_module_form_admin_user_detail' =>
+ array (
+ 0 => 'app\\plugins\\distribution\\Hook',
+ ),
);
?>
\ No newline at end of file
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index d4597d879..ead49a14c 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -569,7 +569,7 @@ button.colorpicker-submit img {
background: #e8e6e6;
min-width: 100px;
position: sticky;
- z-index: 1;
+ z-index: 1011;
top: 0;
}
.am-table-scrollable-horizontal .am-table tr .am-grid-xxxl {
@@ -605,11 +605,11 @@ button.colorpicker-submit img {
.am-table-scrollable-horizontal .am-table tr td.am-grid-fixed-left,
.am-table-scrollable-horizontal .am-table tr td.am-grid-fixed-right {
background: #fff;
- z-index: 2;
+ z-index: 1011;
}
.am-table-scrollable-horizontal .am-table tr th.am-grid-fixed-left,
.am-table-scrollable-horizontal .am-table tr th.am-grid-fixed-right {
- z-index: 3;
+ z-index: 1012;
}
.am-table-scrollable-horizontal .am-table tr .am-grid-fixed-left {
-webkit-box-shadow: 1px 0px 1px #ddd;
diff --git a/public/static/common/lib/amazeui-chosen/amazeui.chosen.min.js b/public/static/common/lib/amazeui-chosen/amazeui.chosen.min.js
index 46324d63f..0634e33ff 100755
--- a/public/static/common/lib/amazeui-chosen/amazeui.chosen.min.js
+++ b/public/static/common/lib/amazeui-chosen/amazeui.chosen.min.js
@@ -1,2 +1,2 @@
/* Chosen v1.3.0 | (c) 2011-2014 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */
-(function(){var $,AbstractChosen,Chosen,SelectParser,_ref,__hasProp={}.hasOwnProperty,__extends=function(child,parent){for(var key in parent){if(__hasProp.call(parent,key))child[key]=parent[key]}function ctor(){this.constructor=child}ctor.prototype=parent.prototype;child.prototype=new ctor();child.__super__=parent.prototype;return child};SelectParser=(function(){function SelectParser(){this.options_index=0;this.parsed=[]}SelectParser.prototype.add_node=function(child){if(child.nodeName.toUpperCase()==="OPTGROUP"){return this.add_group(child)}else{return this.add_option(child)}};SelectParser.prototype.add_group=function(group){var group_position,option,_i,_len,_ref,_results;group_position=this.parsed.length;this.parsed.push({array_index:group_position,group:true,label:this.escapeExpression(group.label),children:0,disabled:group.disabled,classes:group.className});_ref=group.childNodes;_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];_results.push(this.add_option(option,group_position,group.disabled))}return _results};SelectParser.prototype.add_option=function(option,group_position,group_disabled){if(option.nodeName.toUpperCase()==="OPTION"){if(option.text!==""){if(group_position!=null){this.parsed[group_position].children+=1}this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:option.value,text:option.text,html:option.innerHTML,selected:option.selected,disabled:group_disabled===true?group_disabled:option.disabled,group_array_index:group_position,classes:option.className,style:option.style.cssText})}else{this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:true})}return this.options_index+=1}};SelectParser.prototype.escapeExpression=function(text){var map,unsafe_chars;if((text==null)||text===false){return""}if(!/[\&\<\>\"\'\`]/.test(text)){return text}map={"<":"<",">":">",'"':""","'":"'","`":"`"};unsafe_chars=/&(?!\w+;)|[\<\>\"\'\`]/g;return text.replace(unsafe_chars,function(chr){return map[chr]||"&"})};return SelectParser})();SelectParser.select_to_array=function(select){var child,parser,_i,_len,_ref;parser=new SelectParser();_ref=select.childNodes;for(_i=0,_len=_ref.length;_i<_len;_i++){child=_ref[_i];parser.add_node(child)}return parser.parsed};AbstractChosen=(function(){function AbstractChosen(form_field,options){this.form_field=form_field;this.options=options!=null?options:{};if(!AbstractChosen.browser_is_supported()){return}this.is_multiple=this.form_field.multiple;this.set_default_text();this.set_default_values();this.setup();this.set_up_html();this.register_observers();this.on_ready()}AbstractChosen.prototype.set_default_values=function(){var _this=this;this.click_test_action=function(evt){return _this.test_active_click(evt)};this.activate_action=function(evt){return _this.activate_field(evt)};this.active_field=false;this.mouse_on_container=false;this.results_showing=false;this.result_highlighted=null;this.allow_single_deselect=(this.options.allow_single_deselect!=null)&&(this.form_field.options[0]!=null)&&this.form_field.options[0].text===""?this.options.allow_single_deselect:false;this.disable_search_threshold=this.options.disable_search_threshold||0;this.disable_search=this.options.disable_search||false;this.enable_split_word_search=this.options.enable_split_word_search!=null?this.options.enable_split_word_search:true;this.group_search=this.options.group_search!=null?this.options.group_search:true;this.search_contains=this.options.search_contains||false;this.single_backstroke_delete=this.options.single_backstroke_delete!=null?this.options.single_backstroke_delete:true;this.max_selected_options=this.options.max_selected_options||Infinity;this.inherit_select_classes=this.options.inherit_select_classes||false;this.display_selected_options=this.options.display_selected_options!=null?this.options.display_selected_options:true;return this.display_disabled_options=this.options.display_disabled_options!=null?this.options.display_disabled_options:true};AbstractChosen.prototype.set_default_text=function(){if(this.form_field.getAttribute("data-placeholder")){this.default_text=this.form_field.getAttribute("data-placeholder")}else if(this.is_multiple){this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text}else{this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text}return this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text};AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=true};AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=false};AbstractChosen.prototype.input_focus=function(evt){var _this=this;if(this.is_multiple){if(!this.active_field){return setTimeout((function(){return _this.container_mousedown()}),50)}}else{if(!this.active_field){return this.activate_field()}}};AbstractChosen.prototype.input_blur=function(evt){var _this=this;if(!this.mouse_on_container){this.active_field=false;return setTimeout((function(){return _this.blur_test()}),100)}};AbstractChosen.prototype.results_option_build=function(options){var content,data,_i,_len,_ref;content='';_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){data=_ref[_i];if(data.group){content+=this.result_add_group(data)}else{content+=this.result_add_option(data)}if(options!=null?options.first:void 0){if(data.selected&&this.is_multiple){this.choice_build(data)}else if(data.selected&&!this.is_multiple){this.single_set_selected_text(data.text)}}}return content};AbstractChosen.prototype.result_add_option=function(option){var classes,option_el;if(!option.search_match){return''}if(!this.include_option_in_results(option)){return''}classes=[];if(!option.disabled&&!(option.selected&&this.is_multiple)){classes.push("active-result")}if(option.disabled&&!(option.selected&&this.is_multiple)){classes.push("disabled-result")}if(option.selected){classes.push("result-selected")}if(option.group_array_index!=null){classes.push("group-option")}if(option.classes!==""){classes.push(option.classes)}option_el=document.createElement("li");option_el.className=classes.join(" ");option_el.style.cssText=option.style;option_el.setAttribute("data-option-array-index",option.array_index);option_el.innerHTML=option.search_text;return this.outerHTML(option_el)};AbstractChosen.prototype.result_add_group=function(group){var classes,group_el;if(!(group.search_match||group.group_match)){return''}if(!(group.active_options>0)){return''}classes=[];classes.push("group-result");if(group.classes){classes.push(group.classes)}group_el=document.createElement("li");group_el.className=classes.join(" ");group_el.innerHTML=group.search_text;return this.outerHTML(group_el)};AbstractChosen.prototype.results_update_field=function(){this.set_default_text();if(!this.is_multiple){this.results_reset_cleanup()}this.result_clear_highlight();this.results_build();if(this.results_showing){return this.winnow_results()}};AbstractChosen.prototype.reset_single_select_options=function(){var result,_i,_len,_ref,_results;_ref=this.results_data;_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++){result=_ref[_i];if(result.selected){_results.push(result.selected=false)}else{_results.push(void 0)}}return _results};AbstractChosen.prototype.results_toggle=function(){if(this.results_showing){return this.results_hide()}else{return this.results_show()}};AbstractChosen.prototype.results_search=function(evt){if(this.results_showing){return this.winnow_results()}else{return this.results_show()}};AbstractChosen.prototype.winnow_results=function(){var escapedSearchText,option,regex,results,results_group,searchText,startpos,text,zregex,_i,_len,_ref;this.no_results_clear();results=0;searchText=this.get_search_text();escapedSearchText=searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&");zregex=new RegExp(escapedSearchText,'i');regex=this.get_search_regex(escapedSearchText);_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];option.search_match=false;results_group=null;if(this.include_option_in_results(option)){if(option.group){option.group_match=false;option.active_options=0}if((option.group_array_index!=null)&&this.results_data[option.group_array_index]){results_group=this.results_data[option.group_array_index];if(results_group.active_options===0&&results_group.search_match){results+=1}results_group.active_options+=1}if(!(option.group&&!this.group_search)){option.search_text=option.group?option.label:option.text;option.search_match=this.search_string_match(option.search_text,regex);if(option.search_match&&!option.group){results+=1}if(option.search_match){if(searchText.length){startpos=option.search_text.search(zregex);text=option.search_text.substr(0,startpos+searchText.length)+''+option.search_text.substr(startpos+searchText.length);option.search_text=text.substr(0,startpos)+''+text.substr(startpos)}if(results_group!=null){results_group.group_match=true}}else if((option.group_array_index!=null)&&this.results_data[option.group_array_index].search_match){option.search_match=true}}}}this.result_clear_highlight();if(results<1&&searchText.length){this.update_results_content("");return this.no_results(searchText)}else{this.update_results_content(this.results_option_build());return this.winnow_results_set_highlight()}};AbstractChosen.prototype.get_search_regex=function(escaped_search_string){var regex_anchor;regex_anchor=this.search_contains?"":"^";return new RegExp(regex_anchor+escaped_search_string,'i')};AbstractChosen.prototype.search_string_match=function(search_string,regex){var part,parts,_i,_len;if(regex.test(search_string)){return true}else if(this.enable_split_word_search&&(search_string.indexOf(" ")>=0||search_string.indexOf("[")===0)){parts=search_string.replace(/\[|\]/g,"").split(" ");if(parts.length){for(_i=0,_len=parts.length;_i<_len;_i++){part=parts[_i];if(regex.test(part)){return true}}}}};AbstractChosen.prototype.choices_count=function(){var option,_i,_len,_ref;if(this.selected_option_count!=null){return this.selected_option_count}this.selected_option_count=0;_ref=this.form_field.options;for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];if(option.selected){this.selected_option_count+=1}}return this.selected_option_count};AbstractChosen.prototype.choices_click=function(evt){evt.preventDefault();if(!(this.results_showing||this.is_disabled)){return this.results_show()}};AbstractChosen.prototype.keyup_checker=function(evt){var stroke,_ref;stroke=(_ref=evt.which)!=null?_ref:evt.keyCode;this.search_field_scale();switch(stroke){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0){return this.keydown_backstroke()}else if(!this.pending_backstroke){this.result_clear_highlight();return this.results_search()}break;case 13:evt.preventDefault();if(this.results_showing){return this.result_select(evt)}break;case 27:if(this.results_showing){this.results_hide()}return true;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}};AbstractChosen.prototype.clipboard_event_checker=function(evt){var _this=this;return setTimeout((function(){return _this.results_search()}),50)};AbstractChosen.prototype.container_width=function(){if(this.options.width!=null){return this.options.width}else{return""+this.form_field.offsetWidth+"px"}};AbstractChosen.prototype.include_option_in_results=function(option){if(this.is_multiple&&(!this.display_selected_options&&option.selected)){return false}if(!this.display_disabled_options&&option.disabled){return false}if(option.empty){return false}return true};AbstractChosen.prototype.search_results_touchstart=function(evt){this.touch_started=true;return this.search_results_mouseover(evt)};AbstractChosen.prototype.search_results_touchmove=function(evt){this.touch_started=false;return this.search_results_mouseout(evt)};AbstractChosen.prototype.search_results_touchend=function(evt){if(this.touch_started){return this.search_results_mouseup(evt)}};AbstractChosen.prototype.outerHTML=function(element){var tmp;if(element.outerHTML){return element.outerHTML}tmp=document.createElement("div");tmp.appendChild(element);return tmp.innerHTML};AbstractChosen.browser_is_supported=function(){return true};AbstractChosen.default_multiple_text="Select Some Options";AbstractChosen.default_single_text="Select an Option";AbstractChosen.default_no_result_text="No results match";return AbstractChosen})();$=jQuery;$.fn.extend({chosen:function(options){if(!AbstractChosen.browser_is_supported()){return this}return this.each(function(input_field){var $this,chosen;$this=$(this);chosen=$this.data('chosen');if(options==='destroy'&&chosen instanceof Chosen){chosen.destroy()}else if(!(chosen instanceof Chosen)){$this.data('chosen',new Chosen(this,options))}})}});Chosen=(function(_super){__extends(Chosen,_super);function Chosen(){_ref=Chosen.__super__.constructor.apply(this,arguments);return _ref}Chosen.prototype.setup=function(){this.form_field_jq=$(this.form_field);this.current_selectedIndex=this.form_field.selectedIndex;return this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")};Chosen.prototype.set_up_html=function(){var container_classes,container_props;container_classes=["chosen-container"];container_classes.push("chosen-container-"+(this.is_multiple?"multi":"single"));if(this.inherit_select_classes&&this.form_field.className){container_classes.push(this.form_field.className)}if(this.is_rtl){container_classes.push("chosen-rtl")}container_props={'class':container_classes.join(' '),'style':"width: "+(this.container_width())+";",'title':this.form_field.title};if(this.form_field.id.length){container_props.id=this.form_field.id.replace(/[^\w]/g,'_')+"_chosen"}this.container=$("",container_props);if(this.is_multiple){this.container.html('')}else{this.container.html(''+this.default_text+'')}this.form_field_jq.hide().after(this.container);this.dropdown=this.container.find('div.chosen-drop').first();this.search_field=this.container.find('input').first();this.search_results=this.container.find('ul.chosen-results').first();this.search_field_scale();this.search_no_results=this.container.find('li.no-results').first();if(this.is_multiple){this.search_choices=this.container.find('ul.chosen-choices').first();this.search_container=this.container.find('li.search-field').first()}else{this.search_container=this.container.find('div.chosen-search').first();this.selected_item=this.container.find('.chosen-single').first()}this.results_build();this.set_tab_index();return this.set_label_behavior()};Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("chosen:ready",{chosen:this})};Chosen.prototype.register_observers=function(){var _this=this;this.container.bind('touchstart.chosen',function(evt){_this.container_mousedown(evt)});this.container.bind('touchend.chosen',function(evt){_this.container_mouseup(evt)});this.container.bind('mousedown.chosen',function(evt){_this.container_mousedown(evt)});this.container.bind('mouseup.chosen',function(evt){_this.container_mouseup(evt)});this.container.bind('mouseenter.chosen',function(evt){_this.mouse_enter(evt)});this.container.bind('mouseleave.chosen',function(evt){_this.mouse_leave(evt)});this.search_results.bind('mouseup.chosen',function(evt){_this.search_results_mouseup(evt)});this.search_results.bind('mouseover.chosen',function(evt){_this.search_results_mouseover(evt)});this.search_results.bind('mouseout.chosen',function(evt){_this.search_results_mouseout(evt)});this.search_results.bind('mousewheel.chosen DOMMouseScroll.chosen',function(evt){_this.search_results_mousewheel(evt)});this.search_results.bind('touchstart.chosen',function(evt){_this.search_results_touchstart(evt)});this.search_results.bind('touchmove.chosen',function(evt){_this.search_results_touchmove(evt)});this.search_results.bind('touchend.chosen',function(evt){_this.search_results_touchend(evt)});this.form_field_jq.bind("chosen:updated.chosen",function(evt){_this.results_update_field(evt)});this.form_field_jq.bind("chosen:activate.chosen",function(evt){_this.activate_field(evt)});this.form_field_jq.bind("chosen:open.chosen",function(evt){_this.container_mousedown(evt)});this.form_field_jq.bind("chosen:close.chosen",function(evt){_this.input_blur(evt)});this.search_field.bind('blur.chosen',function(evt){_this.input_blur(evt)});this.search_field.bind('keyup.chosen',function(evt){_this.keyup_checker(evt)});this.search_field.bind('keydown.chosen',function(evt){_this.keydown_checker(evt)});this.search_field.bind('focus.chosen',function(evt){_this.input_focus(evt)});this.search_field.bind('cut.chosen',function(evt){_this.clipboard_event_checker(evt)});this.search_field.bind('paste.chosen',function(evt){_this.clipboard_event_checker(evt)});if(this.is_multiple){return this.search_choices.bind('click.chosen',function(evt){_this.choices_click(evt)})}else{return this.container.bind('click.chosen',function(evt){evt.preventDefault()})}};Chosen.prototype.destroy=function(){$(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action);if(this.search_field[0].tabIndex){this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex}this.container.remove();this.form_field_jq.removeData('chosen');return this.form_field_jq.show()};Chosen.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled){this.container.addClass('chosen-disabled');this.search_field[0].disabled=true;if(!this.is_multiple){this.selected_item.unbind("focus.chosen",this.activate_action)}return this.close_field()}else{this.container.removeClass('chosen-disabled');this.search_field[0].disabled=false;if(!this.is_multiple){return this.selected_item.bind("focus.chosen",this.activate_action)}}};Chosen.prototype.container_mousedown=function(evt){if(!this.is_disabled){if(evt&&evt.type==="mousedown"&&!this.results_showing){evt.preventDefault()}if(!((evt!=null)&&($(evt.target)).hasClass("search-choice-close"))){if(!this.active_field){if(this.is_multiple){this.search_field.val("")}$(this.container[0].ownerDocument).bind('click.chosen',this.click_test_action);this.results_show()}else if(!this.is_multiple&&evt&&(($(evt.target)[0]===this.selected_item[0])||$(evt.target).parents("a.chosen-single").length)){evt.preventDefault();this.results_toggle()}return this.activate_field()}}};Chosen.prototype.container_mouseup=function(evt){if(evt.target.nodeName==="ABBR"&&!this.is_disabled){return this.results_reset(evt)}};Chosen.prototype.search_results_mousewheel=function(evt){var delta;if(evt.originalEvent){delta=evt.originalEvent.deltaY||-evt.originalEvent.wheelDelta||evt.originalEvent.detail}if(delta!=null){evt.preventDefault();if(evt.type==='DOMMouseScroll'){delta=delta*40}return this.search_results.scrollTop(delta+this.search_results.scrollTop())}};Chosen.prototype.blur_test=function(evt){if(!this.active_field&&this.container.hasClass("chosen-container-active")){return this.close_field()}};Chosen.prototype.close_field=function(){$(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action);this.active_field=false;this.results_hide();this.container.removeClass("chosen-container-active");this.clear_backstroke();this.show_search_field_default();return this.search_field_scale()};Chosen.prototype.activate_field=function(){this.container.addClass("chosen-container-active");this.active_field=true;this.search_field.val(this.search_field.val());return this.search_field.focus()};Chosen.prototype.test_active_click=function(evt){var active_container;active_container=$(evt.target).closest('.chosen-container');if(active_container.length&&this.container[0]===active_container[0]){return this.active_field=true}else{return this.close_field()}};Chosen.prototype.results_build=function(){this.parsing=true;this.selected_option_count=null;this.results_data=SelectParser.select_to_array(this.form_field);if(this.is_multiple){this.search_choices.find("li.search-choice").remove()}else if(!this.is_multiple){this.single_set_selected_text();if(this.disable_search||this.form_field.options.length<=this.disable_search_threshold){this.search_field[0].readOnly=true;this.container.addClass("chosen-container-single-nosearch")}else{this.search_field[0].readOnly=false;this.container.removeClass("chosen-container-single-nosearch")}}this.update_results_content(this.results_option_build({first:true}));this.search_field_disabled();this.show_search_field_default();this.search_field_scale();return this.parsing=false};Chosen.prototype.result_do_highlight=function(el){var high_bottom,high_top,maxHeight,visible_bottom,visible_top;if(el.length){this.result_clear_highlight();this.result_highlight=el;this.result_highlight.addClass("highlighted");maxHeight=parseInt(this.search_results.css("maxHeight"),10);visible_top=this.search_results.scrollTop();visible_bottom=maxHeight+visible_top;high_top=this.result_highlight.position().top+this.search_results.scrollTop();high_bottom=high_top+this.result_highlight.outerHeight();if(high_bottom>=visible_bottom){return this.search_results.scrollTop((high_bottom-maxHeight)>0?high_bottom-maxHeight:0)}else if(high_top
- '+this.results_none_found+' ""
');no_results_html.find("span").first().html(terms);this.search_results.append(no_results_html);return this.form_field_jq.trigger("chosen:no_results",{chosen:this})};Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()};Chosen.prototype.keydown_arrow=function(){var next_sib;if(this.results_showing&&this.result_highlight){next_sib=this.result_highlight.nextAll("li.active-result").first();if(next_sib){return this.result_do_highlight(next_sib)}}else{return this.results_show()}};Chosen.prototype.keyup_arrow=function(){var prev_sibs;if(!this.results_showing&&!this.is_multiple){return this.results_show()}else if(this.result_highlight){prev_sibs=this.result_highlight.prevAll("li.active-result");if(prev_sibs.length){return this.result_do_highlight(prev_sibs.first())}else{if(this.choices_count()>0){this.results_hide()}return this.result_clear_highlight()}}};Chosen.prototype.keydown_backstroke=function(){var next_available_destroy;if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}else{next_available_destroy=this.search_container.siblings("li.search-choice").last();if(next_available_destroy.length&&!next_available_destroy.hasClass("search-choice-disabled")){this.pending_backstroke=next_available_destroy;if(this.single_backstroke_delete){return this.keydown_backstroke()}else{return this.pending_backstroke.addClass("search-choice-focus")}}}};Chosen.prototype.clear_backstroke=function(){if(this.pending_backstroke){this.pending_backstroke.removeClass("search-choice-focus")}return this.pending_backstroke=null};Chosen.prototype.keydown_checker=function(evt){var stroke,_ref1;stroke=(_ref1=evt.which)!=null?_ref1:evt.keyCode;this.search_field_scale();if(stroke!==8&&this.pending_backstroke){this.clear_backstroke()}switch(stroke){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:if(this.results_showing&&!this.is_multiple){this.result_select(evt)}this.mouse_on_container=false;break;case 13:if(this.results_showing){evt.preventDefault()}break;case 32:if(this.disable_search){evt.preventDefault()}break;case 38:evt.preventDefault();this.keyup_arrow();break;case 40:evt.preventDefault();this.keydown_arrow();break}};Chosen.prototype.search_field_scale=function(){var div,f_width,h,style,style_block,styles,w,_i,_len;if(this.is_multiple){h=0;w=0;style_block="position:absolute; left: -1000px; top: -1000px; display:none;";styles=['font-size','font-style','font-weight','font-family','line-height','text-transform','letter-spacing'];for(_i=0,_len=styles.length;_i<_len;_i++){style=styles[_i];style_block+=style+":"+this.search_field.css(style)+";"}div=$('',{'style':style_block});div.text(this.search_field.val());$('body').append(div);w=div.width()+25;div.remove();f_width=this.container.outerWidth();if(w>f_width-10){w=f_width-10}return this.search_field.css({'width':w+'px'})}};return Chosen})(AbstractChosen)}).call(this); \ No newline at end of file +(function(){var $,AbstractChosen,Chosen,SelectParser,_ref,__hasProp={}.hasOwnProperty,__extends=function(child,parent){for(var key in parent){if(__hasProp.call(parent,key))child[key]=parent[key]}function ctor(){this.constructor=child}ctor.prototype=parent.prototype;child.prototype=new ctor();child.__super__=parent.prototype;return child};SelectParser=(function(){function SelectParser(){this.options_index=0;this.parsed=[]}SelectParser.prototype.add_node=function(child){if(child.nodeName.toUpperCase()==="OPTGROUP"){return this.add_group(child)}else{return this.add_option(child)}};SelectParser.prototype.add_group=function(group){var group_position,option,_i,_len,_ref,_results;group_position=this.parsed.length;this.parsed.push({array_index:group_position,group:true,label:this.escapeExpression(group.label),children:0,disabled:group.disabled,classes:group.className});_ref=group.childNodes;_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];_results.push(this.add_option(option,group_position,group.disabled))}return _results};SelectParser.prototype.add_option=function(option,group_position,group_disabled){if(option.nodeName.toUpperCase()==="OPTION"){if(option.text!==""){if(group_position!=null){this.parsed[group_position].children+=1}this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:option.value,text:option.text,html:option.innerHTML,selected:option.selected,disabled:group_disabled===true?group_disabled:option.disabled,group_array_index:group_position,classes:option.className,style:option.style.cssText})}else{this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:true})}return this.options_index+=1}};SelectParser.prototype.escapeExpression=function(text){var map,unsafe_chars;if((text==null)||text===false){return""}if(!/[\&\<\>\"\'\`]/.test(text)){return text}map={"<":"<",">":">",'"':""","'":"'","`":"`"};unsafe_chars=/&(?!\w+;)|[\<\>\"\'\`]/g;return text.replace(unsafe_chars,function(chr){return map[chr]||"&"})};return SelectParser})();SelectParser.select_to_array=function(select){var child,parser,_i,_len,_ref;parser=new SelectParser();_ref=select.childNodes;for(_i=0,_len=_ref.length;_i<_len;_i++){child=_ref[_i];parser.add_node(child)}return parser.parsed};AbstractChosen=(function(){function AbstractChosen(form_field,options){this.form_field=form_field;this.options=options!=null?options:{};if(!AbstractChosen.browser_is_supported()){return}this.is_multiple=this.form_field.multiple;this.set_default_text();this.set_default_values();this.setup();this.set_up_html();this.register_observers();this.on_ready()}AbstractChosen.prototype.set_default_values=function(){var _this=this;this.click_test_action=function(evt){return _this.test_active_click(evt)};this.activate_action=function(evt){return _this.activate_field(evt)};this.active_field=false;this.mouse_on_container=false;this.results_showing=false;this.result_highlighted=null;this.allow_single_deselect=(this.options.allow_single_deselect!=null)&&(this.form_field.options[0]!=null)&&this.form_field.options[0].text===""?this.options.allow_single_deselect:false;this.disable_search_threshold=this.options.disable_search_threshold||0;this.disable_search=this.options.disable_search||false;this.enable_split_word_search=this.options.enable_split_word_search!=null?this.options.enable_split_word_search:true;this.group_search=this.options.group_search!=null?this.options.group_search:true;this.search_contains=this.options.search_contains||false;this.single_backstroke_delete=this.options.single_backstroke_delete!=null?this.options.single_backstroke_delete:true;this.max_selected_options=this.options.max_selected_options||Infinity;this.inherit_select_classes=this.options.inherit_select_classes||false;this.display_selected_options=this.options.display_selected_options!=null?this.options.display_selected_options:true;return this.display_disabled_options=this.options.display_disabled_options!=null?this.options.display_disabled_options:true};AbstractChosen.prototype.set_default_text=function(){if(this.form_field.getAttribute("data-placeholder")){this.default_text=this.form_field.getAttribute("data-placeholder")}else if(this.is_multiple){this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text}else{this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text}return this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text};AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=true};AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=false};AbstractChosen.prototype.input_focus=function(evt){var _this=this;if(this.is_multiple){if(!this.active_field){return setTimeout((function(){return _this.container_mousedown()}),50)}}else{if(!this.active_field){return this.activate_field()}}};AbstractChosen.prototype.input_blur=function(evt){var _this=this;if(!this.mouse_on_container){this.active_field=false;return setTimeout((function(){return _this.blur_test()}),100)}};AbstractChosen.prototype.results_option_build=function(options){var content,data,_i,_len,_ref;content='';_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){data=_ref[_i];if(data.group){content+=this.result_add_group(data)}else{content+=this.result_add_option(data)}if(options!=null?options.first:void 0){if(data.selected&&this.is_multiple){this.choice_build(data)}else if(data.selected&&!this.is_multiple){this.single_set_selected_text(data.text)}}}return content};AbstractChosen.prototype.result_add_option=function(option){var classes,option_el;if(!option.search_match){return''}if(!this.include_option_in_results(option)){return''}classes=[];if(!option.disabled&&!(option.selected&&this.is_multiple)){classes.push("active-result")}if(option.disabled&&!(option.selected&&this.is_multiple)){classes.push("disabled-result")}if(option.selected){classes.push("result-selected")}if(option.group_array_index!=null){classes.push("group-option")}if(option.classes!==""){classes.push(option.classes)}option_el=document.createElement("li");option_el.className=classes.join(" ");option_el.style.cssText=option.style;option_el.setAttribute("data-option-array-index",option.array_index);option_el.innerHTML=option.search_text;return this.outerHTML(option_el)};AbstractChosen.prototype.result_add_group=function(group){var classes,group_el;if(!(group.search_match||group.group_match)){return''}if(!(group.active_options>0)){return''}classes=[];classes.push("group-result");if(group.classes){classes.push(group.classes)}group_el=document.createElement("li");group_el.className=classes.join(" ");group_el.innerHTML=group.search_text;return this.outerHTML(group_el)};AbstractChosen.prototype.results_update_field=function(){this.set_default_text();if(!this.is_multiple){this.results_reset_cleanup()}this.result_clear_highlight();this.results_build();if(this.results_showing){return this.winnow_results()}};AbstractChosen.prototype.reset_single_select_options=function(){var result,_i,_len,_ref,_results;_ref=this.results_data;_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++){result=_ref[_i];if(result.selected){_results.push(result.selected=false)}else{_results.push(void 0)}}return _results};AbstractChosen.prototype.results_toggle=function(){if(this.results_showing){if(!AbstractChosen.is_mobile()){return this.results_hide()}}else{return this.results_show()}};AbstractChosen.prototype.results_search=function(evt){if(this.results_showing){return this.winnow_results()}else{return this.results_show()}};AbstractChosen.prototype.winnow_results=function(){var escapedSearchText,option,regex,results,results_group,searchText,startpos,text,zregex,_i,_len,_ref;this.no_results_clear();results=0;searchText=this.get_search_text();escapedSearchText=searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&");zregex=new RegExp(escapedSearchText,'i');regex=this.get_search_regex(escapedSearchText);_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];option.search_match=false;results_group=null;if(this.include_option_in_results(option)){if(option.group){option.group_match=false;option.active_options=0}if((option.group_array_index!=null)&&this.results_data[option.group_array_index]){results_group=this.results_data[option.group_array_index];if(results_group.active_options===0&&results_group.search_match){results+=1}results_group.active_options+=1}if(!(option.group&&!this.group_search)){option.search_text=option.group?option.label:option.text;option.search_match=this.search_string_match(option.search_text,regex);if(option.search_match&&!option.group){results+=1}if(option.search_match){if(searchText.length){startpos=option.search_text.search(zregex);text=option.search_text.substr(0,startpos+searchText.length)+'')}else{this.container.html(''+this.default_text+'')}this.form_field_jq.hide().after(this.container);this.dropdown=this.container.find('div.chosen-drop').first();this.search_field=this.container.find('input').first();this.search_results=this.container.find('ul.chosen-results').first();this.search_field_scale();this.search_no_results=this.container.find('li.no-results').first();if(this.is_multiple){this.search_choices=this.container.find('ul.chosen-choices').first();this.search_container=this.container.find('li.search-field').first()}else{this.search_container=this.container.find('div.chosen-search').first();this.selected_item=this.container.find('.chosen-single').first()}this.results_build();this.set_tab_index();return this.set_label_behavior()};Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("chosen:ready",{chosen:this})};Chosen.prototype.register_observers=function(){var _this=this;this.container.bind('touchstart.chosen',function(evt){_this.container_mousedown(evt)});this.container.bind('touchend.chosen',function(evt){_this.container_mouseup(evt)});this.container.bind('mousedown.chosen',function(evt){_this.container_mousedown(evt)});this.container.bind('mouseup.chosen',function(evt){_this.container_mouseup(evt)});this.container.bind('mouseenter.chosen',function(evt){_this.mouse_enter(evt)});this.container.bind('mouseleave.chosen',function(evt){_this.mouse_leave(evt)});this.search_results.bind('mouseup.chosen',function(evt){_this.search_results_mouseup(evt)});this.search_results.bind('mouseover.chosen',function(evt){_this.search_results_mouseover(evt)});this.search_results.bind('mouseout.chosen',function(evt){_this.search_results_mouseout(evt)});this.search_results.bind('mousewheel.chosen DOMMouseScroll.chosen',function(evt){_this.search_results_mousewheel(evt)});this.search_results.bind('touchstart.chosen',function(evt){_this.search_results_touchstart(evt)});this.search_results.bind('touchmove.chosen',function(evt){_this.search_results_touchmove(evt)});this.search_results.bind('touchend.chosen',function(evt){_this.search_results_touchend(evt)});this.form_field_jq.bind("chosen:updated.chosen",function(evt){_this.results_update_field(evt)});this.form_field_jq.bind("chosen:activate.chosen",function(evt){_this.activate_field(evt)});this.form_field_jq.bind("chosen:open.chosen",function(evt){_this.container_mousedown(evt)});this.form_field_jq.bind("chosen:close.chosen",function(evt){_this.input_blur(evt)});this.search_field.bind('blur.chosen',function(evt){_this.input_blur(evt)});this.search_field.bind('keyup.chosen',function(evt){_this.keyup_checker(evt)});this.search_field.bind('keydown.chosen',function(evt){_this.keydown_checker(evt)});this.search_field.bind('focus.chosen',function(evt){_this.input_focus(evt)});this.search_field.bind('cut.chosen',function(evt){_this.clipboard_event_checker(evt)});this.search_field.bind('paste.chosen',function(evt){_this.clipboard_event_checker(evt)});if(this.is_multiple){return this.search_choices.bind('click.chosen',function(evt){_this.choices_click(evt)})}else{return this.container.bind('click.chosen',function(evt){evt.preventDefault()})}};Chosen.prototype.destroy=function(){$(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action);if(this.search_field[0].tabIndex){this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex}this.container.remove();this.form_field_jq.removeData('chosen');return this.form_field_jq.show()};Chosen.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled){this.container.addClass('chosen-disabled');this.search_field[0].disabled=true;if(!this.is_multiple){this.selected_item.unbind("focus.chosen",this.activate_action)}return this.close_field()}else{this.container.removeClass('chosen-disabled');this.search_field[0].disabled=false;if(!this.is_multiple){return this.selected_item.bind("focus.chosen",this.activate_action)}}};Chosen.prototype.container_mousedown=function(evt){if(!this.is_disabled){if(evt&&evt.type==="mousedown"&&!this.results_showing){evt.preventDefault()}if(!((evt!=null)&&($(evt.target)).hasClass("search-choice-close"))){if(!this.active_field){if(this.is_multiple){this.search_field.val("")}$(this.container[0].ownerDocument).bind('click.chosen',this.click_test_action);this.results_show()}else if(!this.is_multiple&&evt&&(($(evt.target)[0]===this.selected_item[0])||$(evt.target).parents("a.chosen-single").length)){evt.preventDefault();this.results_toggle()}return this.activate_field()}}};Chosen.prototype.container_mouseup=function(evt){if(evt.target.nodeName==="ABBR"&&!this.is_disabled){return this.results_reset(evt)}};Chosen.prototype.search_results_mousewheel=function(evt){var delta;if(evt.originalEvent){delta=evt.originalEvent.deltaY||-evt.originalEvent.wheelDelta||evt.originalEvent.detail}if(delta!=null){evt.preventDefault();if(evt.type==='DOMMouseScroll'){delta=delta*40}return this.search_results.scrollTop(delta+this.search_results.scrollTop())}};Chosen.prototype.blur_test=function(evt){if(!this.active_field&&this.container.hasClass("chosen-container-active")){return this.close_field()}};Chosen.prototype.close_field=function(){$(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action);this.active_field=false;this.results_hide();this.container.removeClass("chosen-container-active");this.clear_backstroke();this.show_search_field_default();return this.search_field_scale()};Chosen.prototype.activate_field=function(){this.container.addClass("chosen-container-active");this.active_field=true;this.search_field.val(this.search_field.val())};Chosen.prototype.test_active_click=function(evt){var active_container;active_container=$(evt.target).closest('.chosen-container');if(active_container.length&&this.container[0]===active_container[0]){return this.active_field=true}else{return this.close_field()}};Chosen.prototype.results_build=function(){this.parsing=true;this.selected_option_count=null;this.results_data=SelectParser.select_to_array(this.form_field);if(this.is_multiple){this.search_choices.find("li.search-choice").remove()}else if(!this.is_multiple){this.single_set_selected_text();if(this.disable_search||this.form_field.options.length<=this.disable_search_threshold){this.search_field[0].readOnly=true;this.container.addClass("chosen-container-single-nosearch")}else{this.search_field[0].readOnly=false;this.container.removeClass("chosen-container-single-nosearch")}}this.update_results_content(this.results_option_build({first:true}));this.search_field_disabled();this.show_search_field_default();this.search_field_scale();return this.parsing=false};Chosen.prototype.result_do_highlight=function(el){var high_bottom,high_top,maxHeight,visible_bottom,visible_top;if(el.length){this.result_clear_highlight();this.result_highlight=el;this.result_highlight.addClass("highlighted");maxHeight=parseInt(this.search_results.css("maxHeight"),10);visible_top=this.search_results.scrollTop();visible_bottom=maxHeight+visible_top;high_top=this.result_highlight.position().top+this.search_results.scrollTop();high_bottom=high_top+this.result_highlight.outerHeight();if(high_bottom>=visible_bottom){return this.search_results.scrollTop((high_bottom-maxHeight)>0?high_bottom-maxHeight:0)}else if(high_top- '+this.results_none_found+' ""
');no_results_html.find("span").first().html(terms);this.search_results.append(no_results_html);return this.form_field_jq.trigger("chosen:no_results",{chosen:this})};Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()};Chosen.prototype.keydown_arrow=function(){var next_sib;if(this.results_showing&&this.result_highlight){next_sib=this.result_highlight.nextAll("li.active-result").first();if(next_sib){return this.result_do_highlight(next_sib)}}else{return this.results_show()}};Chosen.prototype.keyup_arrow=function(){var prev_sibs;if(!this.results_showing&&!this.is_multiple){return this.results_show()}else if(this.result_highlight){prev_sibs=this.result_highlight.prevAll("li.active-result");if(prev_sibs.length){return this.result_do_highlight(prev_sibs.first())}else{if(this.choices_count()>0){this.results_hide()}return this.result_clear_highlight()}}};Chosen.prototype.keydown_backstroke=function(){var next_available_destroy;if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}else{next_available_destroy=this.search_container.siblings("li.search-choice").last();if(next_available_destroy.length&&!next_available_destroy.hasClass("search-choice-disabled")){this.pending_backstroke=next_available_destroy;if(this.single_backstroke_delete){return this.keydown_backstroke()}else{return this.pending_backstroke.addClass("search-choice-focus")}}}};Chosen.prototype.clear_backstroke=function(){if(this.pending_backstroke){this.pending_backstroke.removeClass("search-choice-focus")}return this.pending_backstroke=null};Chosen.prototype.keydown_checker=function(evt){var stroke,_ref1;stroke=(_ref1=evt.which)!=null?_ref1:evt.keyCode;this.search_field_scale();if(stroke!==8&&this.pending_backstroke){this.clear_backstroke()}switch(stroke){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:if(this.results_showing&&!this.is_multiple){this.result_select(evt)}this.mouse_on_container=false;break;case 13:if(this.results_showing){evt.preventDefault()}break;case 32:if(this.disable_search){evt.preventDefault()}break;case 38:evt.preventDefault();this.keyup_arrow();break;case 40:evt.preventDefault();this.keydown_arrow();break}};Chosen.prototype.search_field_scale=function(){var div,f_width,h,style,style_block,styles,w,_i,_len;if(this.is_multiple){h=0;w=0;style_block="position:absolute; left: -1000px; top: -1000px; display:none;";styles=['font-size','font-style','font-weight','font-family','line-height','text-transform','letter-spacing'];for(_i=0,_len=styles.length;_i<_len;_i++){style=styles[_i];style_block+=style+":"+this.search_field.css(style)+";"}div=$('',{'style':style_block});div.text(this.search_field.val());$('body').append(div);w=div.width()+25;div.remove();f_width=this.container.outerWidth();if(w>f_width-10){w=f_width-10}return this.search_field.css({'width':w+'px'})}};return Chosen})(AbstractChosen)}).call(this); \ No newline at end of file diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 53257e693..24cf1cc36 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -458,7 +458,7 @@ ul.am-dropdown-content > .am-active > a:focus, @media only screen and (max-width: 641px) { .common-login-modal { height: 410px; - top: calc(100% - 410px); + top: calc(50% - 210px); } } diff --git a/sourcecode/alipay/default/app.acss b/sourcecode/alipay/default/app.acss index 0e9658d9b..bd7e10034 100644 --- a/sourcecode/alipay/default/app.acss +++ b/sourcecode/alipay/default/app.acss @@ -432,4 +432,159 @@ textarea { */ .common-online-service { bottom: 35%; +} + +/** + * 公共样式 + */ +.margin-top-xs { + margin-top: 5rpx; +} +.margin-top-sm { + margin-top: 10rpx; +} +.margin-top, .margin-top-default { + margin-top: 15rpx; +} +.margin-top-lg { + margin-top: 20rpx; +} +.margin-top-xl { + margin-top: 25rpx; +} +.margin-top-xxl { + margin-top: 30rpx; +} + +.margin-right-xs { + margin-right: 5rpx; +} +.margin-right-sm { + margin-right: 10rpx; +} +.margin-right, .margin-right-default { + margin-right: 15rpx; +} +.margin-right-lg { + margin-right: 20rpx; +} +.margin-right-xl { + margin-right: 25rpx; +} +.margin-right-xxl { + margin-right: 30rpx; +} + +.margin-left-xs { + margin-left: 5rpx; +} +.margin-left-sm { + margin-left: 10rpx; +} +.margin-left, .margin-left-default { + margin-left: 15rpx; +} +.margin-left-lg { + margin-left: 20rpx; +} +.margin-left-xl { + margin-left: 25rpx; +} +.margin-left-xxl { + margin-left: 30rpx; +} + +.margin-bottom-xs { + margin-bottom: 5rpx; +} +.margin-bottom-sm { + margin-bottom: 10rpx; +} +.margin-bottom, .margin-bottom-default { + margin-bottom: 15rpx; +} +.margin-bottom-lg { + margin-bottom: 20rpx; +} +.margin-bottom-xl { + margin-bottom: 25rpx; +} +.margin-bottom-xxl { + margin-bottom: 30rpx; +} + +.padding-top-xs { + padding-top: 5rpx; +} +.padding-top-sm { + padding-top: 10rpx; +} +.padding-top, .padding-top-default { + padding-top: 15rpx; +} +.padding-top-lg { + padding-top: 20rpx; +} +.padding-top-xl { + padding-top: 25rpx; +} +.padding-top-xxl { + padding-top: 30rpx; +} + +.padding-right-xs { + padding-right: 5rpx; +} +.padding-right-sm { + padding-right: 10rpx; +} +.padding-right, .padding-right-default { + padding-right: 15rpx; +} +.padding-right-lg { + padding-right: 20rpx; +} +.padding-right-xl { + padding-right: 25rpx; +} +.padding-right-xxl { + padding-right: 30rpx; +} + +.padding-left-xs { + padding-left: 5rpx; +} +.padding-left-sm { + padding-left: 10rpx; +} +.padding-left, .padding-left-default { + padding-left: 15rpx; +} +.padding-left-lg { + padding-left: 20rpx; +} +.padding-left-xl { + padding-left: 25rpx; +} +.padding-left-xxl { + padding-left: 30rpx; +} + +.padding-bottom-xs { + padding-bottom: 5rpx; +} +.padding-bottom-sm { + padding-bottom: 10rpx; +} +.padding-bottom, .padding-bottom-default { + padding-bottom: 15rpx; +} +.padding-bottom-lg { + padding-bottom: 20rpx; +} +.padding-bottom-xl { + padding-bottom: 25rpx; +} +.padding-bottom-xxl { + padding-bottom: 30rpx; } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/buy/buy.js b/sourcecode/alipay/default/pages/buy/buy.js index b24e475f4..89bfd50e5 100644 --- a/sourcecode/alipay/default/pages/buy/buy.js +++ b/sourcecode/alipay/default/pages/buy/buy.js @@ -355,7 +355,7 @@ Page({ } else if (this.data.common_site_type == 2 || (this.data.common_site_type == 4 && this.data.site_model == 2)) { my.navigateTo({ - url: '/pages/extraction-address/extraction-address?is_back=1' + url: '/pages/extraction-address/extraction-address?is_back=1&is_buy=1' }); } else { app.showToast('当前模式不允许使用地址'); diff --git a/sourcecode/alipay/default/pages/extraction-address/extraction-address.acss b/sourcecode/alipay/default/pages/extraction-address/extraction-address.acss index 1bad1b348..02572878f 100644 --- a/sourcecode/alipay/default/pages/extraction-address/extraction-address.acss +++ b/sourcecode/alipay/default/pages/extraction-address/extraction-address.acss @@ -1,12 +1,16 @@ .item { - padding: 10rpx 10rpx 0 10rpx; + padding: 10rpx 10rpx 0 10rpx; +} +.address-logo { + width: 140rpx; + height: 140rpx !important; } .base, .address, .operation { - padding: 20rpx 0; + padding: 20rpx 0; } .address .item-icon { - width: 30rpx; - height: 35rpx !important; + width: 30rpx; + height: 35rpx !important; } .address-alias { border: 1px solid #d2364c; @@ -16,9 +20,9 @@ margin-right: 10rpx; } .address .text { - line-height: 44rpx; - width: calc(100% - 40rpx); + line-height: 44rpx; + width: calc(100% - 40rpx); } .operation .map-submit { - margin-left: 20rpx; + margin-left: 20rpx; } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/extraction-address/extraction-address.axml b/sourcecode/alipay/default/pages/extraction-address/extraction-address.axml index 034eb9ac7..5c63ad6e0 100644 --- a/sourcecode/alipay/default/pages/extraction-address/extraction-address.axml +++ b/sourcecode/alipay/default/pages/extraction-address/extraction-address.axml @@ -2,17 +2,27 @@- - diff --git a/sourcecode/alipay/default/pages/extraction-address/extraction-address.js b/sourcecode/alipay/default/pages/extraction-address/extraction-address.js index 5782708f7..8d5a03871 100644 --- a/sourcecode/alipay/default/pages/extraction-address/extraction-address.js +++ b/sourcecode/alipay/default/pages/extraction-address/extraction-address.js @@ -6,15 +6,50 @@ Page({ data_list: [], params: null, is_default: 0, + + user_location_cache_key: app.data.cache_userlocation_key, + user_location: null, + is_first: 1, + home_buy_extraction_address_position: 0, }, onLoad(params) { - this.setData({ params: params }); + this.setData({ + params: params, + home_buy_extraction_address_position: app.get_config('config.home_buy_extraction_address_position', 0), + }); + }, + + onReady: function () { + // 清除位置缓存信息 + my.removeStorage({key: this.data.user_location_cache_key}); + + // 是否获取位置 + if((this.data.params.is_buy || 0) == 1 && this.data.home_buy_extraction_address_position == 1) + { + my.navigateTo({ + url: '/pages/common/open-setting-location/open-setting-location' + }); + } }, onShow() { my.setNavigationBar({ title: app.data.common_pages_title.extraction_address }); - this.init(); + + // 是否需要选择地理位置 + if(this.data.home_buy_extraction_address_position == 1) + { + // 首次不请求数据 + if(this.data.is_first == 0) + { + this.user_location_init(); + this.init(); + } + } else { + this.init(); + } + + this.setData({ is_first: 0 }); }, // 初始化 @@ -39,6 +74,22 @@ Page({ } }, + // 地址信息初始化 + user_location_init() { + var result = my.getStorageSync(this.data.user_location_cache_key) || null; + var data = null; + if (result != null && (result.data || null) != null) + { + data = { + name: result.data.name || null, + address: result.data.address || null, + lat: result.data.latitude || null, + lng: result.data.longitude || null + } + } + this.setData({user_location: data}); + }, + // 获取数据列表 get_data_list() { // 加载loding @@ -47,11 +98,21 @@ Page({ data_list_loding_status: 1 }); + // 获取数据 + var data = {}; + + // 是否有坐标 + if((this.data.user_location || null) != null) + { + data['lng'] = this.data.user_location.lng; + data['lat'] = this.data.user_location.lat; + } + // 获取数据 my.request({ url: app.get_request_url("extraction", "useraddress"), method: "POST", - data: {}, + data: data, dataType: "json", success: res => { my.hideLoading(); diff --git a/sourcecode/alipay/default/pages/plugins/distribution/extraction-apply/extraction-apply.axml b/sourcecode/alipay/default/pages/plugins/distribution/extraction-apply/extraction-apply.axml index 3b5c882f3..3d301c342 100644 --- a/sourcecode/alipay/default/pages/plugins/distribution/extraction-apply/extraction-apply.axml +++ b/sourcecode/alipay/default/pages/plugins/distribution/extraction-apply/extraction-apply.axml @@ -1,4 +1,17 @@{{item.alias}} -{{item.name}} -{{item.tel}} ++ -- - {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}} ++ + +{{item.alias}} +{{item.name}} +{{item.tel}} ++ + {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}} ++ + 距离 +{{item.distance_value}} +{{item.distance_unit}} +