From 92c2fb6a8dab7a14235a217a9b1a2f8130268cd3 Mon Sep 17 00:00:00 2001 From: Devil Date: Sun, 14 Mar 2021 23:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=9C=B0=E5=9D=80=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=B7=9D=E7=A6=BB=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/default/site/siteset/order.html | 9 + .../admin/view/default/useraddress/index.html | 9 +- .../view/default/useraddress/save_info.html | 24 +- application/api/controller/Useraddress.php | 4 +- application/common.php | 37 ++++ .../index/view/default/public/quick.html | 2 +- application/service/BaseService.php | 1 + application/service/ConfigService.php | 31 ++- application/service/GoodsService.php | 14 +- application/service/QuickNavService.php | 1 + application/tags.php | 47 ++++ public/static/common/css/common.css | 6 +- .../lib/amazeui-chosen/amazeui.chosen.min.js | 2 +- public/static/index/default/css/common.css | 2 +- sourcecode/alipay/default/app.acss | 155 +++++++++++++ sourcecode/alipay/default/pages/buy/buy.js | 2 +- .../extraction-address.acss | 18 +- .../extraction-address.axml | 24 +- .../extraction-address/extraction-address.js | 67 +++++- .../extraction-apply/extraction-apply.axml | 13 ++ .../extraction-apply/extraction-apply.js | 106 ++++++++- sourcecode/baidu/default/app.css | 156 +++++++++++++ sourcecode/baidu/default/pages/buy/buy.js | 2 +- .../extraction-address/extraction-address.css | 18 +- .../extraction-address/extraction-address.js | 69 +++++- .../extraction-address.swan | 24 +- .../extraction-apply/extraction-apply.js | 131 +++++++++-- .../extraction-apply/extraction-apply.swan | 21 +- sourcecode/qq/default/app.qss | 156 +++++++++++++ sourcecode/qq/default/pages/buy/buy.js | 2 +- .../extraction-address/extraction-address.js | 67 +++++- .../extraction-address/extraction-address.qml | 24 +- .../extraction-address/extraction-address.qss | 18 +- sourcecode/toutiao/default/app.ttss | 156 +++++++++++++ sourcecode/toutiao/default/pages/buy/buy.js | 2 +- .../extraction-address/extraction-address.js | 67 +++++- .../extraction-address.ttml | 24 +- .../extraction-address.ttss | 18 +- .../extraction-apply/extraction-apply.js | 189 +++++++++++----- sourcecode/weixin/default/app.json | 1 + sourcecode/weixin/default/app.wxss | 155 +++++++++++++ sourcecode/weixin/default/pages/buy/buy.js | 2 +- .../extraction-address/extraction-address.js | 67 +++++- .../extraction-address.wxml | 26 ++- .../extraction-address.wxss | 18 +- .../extraction-apply/extraction-apply.js | 107 ++++++++- .../extraction-apply/extraction-apply.wxml | 13 ++ .../extraction-switch/extraction-switch.js | 209 ++++++++++++++++++ .../extraction-switch/extraction-switch.json | 3 + .../extraction-switch/extraction-switch.wxml | 40 ++++ .../extraction-switch/extraction-switch.wxss | 28 +++ 51 files changed, 2171 insertions(+), 216 deletions(-) create mode 100644 sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js create mode 100644 sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.json create mode 100644 sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.wxml create mode 100644 sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.wxss diff --git a/application/admin/view/default/site/siteset/order.html b/application/admin/view/default/site/siteset/order.html index ab7e38085..713ad610d 100644 --- a/application/admin/view/default/site/siteset/order.html +++ b/application/admin/view/default/site/siteset/order.html @@ -22,6 +22,15 @@ +
+ + +
+
diff --git a/application/admin/view/default/useraddress/index.html b/application/admin/view/default/useraddress/index.html index 907d6eab9..fc0392380 100644 --- a/application/admin/view/default/useraddress/index.html +++ b/application/admin/view/default/useraddress/index.html @@ -1,2 +1,9 @@ -{{extend name="public/module/form" /}} \ No newline at end of file +{{extend name="public/module/form" /}} + + +{{block name="form_operate_top"}} + 新增 + + {__block__} +{{/block}} \ No newline at end of file diff --git a/application/admin/view/default/useraddress/save_info.html b/application/admin/view/default/useraddress/save_info.html index aeaef0dc7..d4887ec29 100644 --- a/application/admin/view/default/useraddress/save_info.html +++ b/application/admin/view/default/useraddress/save_info.html @@ -9,14 +9,21 @@ 用户地址{{if empty($data['id'])}}添加{{else /}}编辑{{/if}} 返回 -
- {{$data.user.user_name_view}} -
    -
  • 名称：{{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 !empty($data) and !empty($data['user'])}} +
+ {{$data.user.user_name_view}} +
    +
  • 名称：{{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}} + +
+ +
@@ -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 @@