From 877dbb24fe81e9e0735cb4f6e726140c83fc6c95 Mon Sep 17 00:00:00 2001
From: wangxinglong <2371974647@qq.com>
Date: Fri, 10 Jun 2022 10:18:24 +0800
Subject: [PATCH] setter

---
 app/controller/manager/mall/Order.php            |  15 +++++++++++++--
 .../js/lay-module/wangEditor/fonts/w-e-icon.woff | Bin 6224 -> 0 bytes
 public/static/manager/js/mall/order.js           |   5 +++++
 view/manager/mall/order/index.html               |   8 ++++++++
 view/manager/mall/order/info.html                |   5 +----
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/controller/manager/mall/Order.php b/app/controller/manager/mall/Order.php
index 5e952b6..45fcf6f 100755
--- a/app/controller/manager/mall/Order.php
+++ b/app/controller/manager/mall/Order.php
@@ -101,6 +101,7 @@ class Order extends Base
         $isScore    = $searchParams['is_score'] ?? 0;
 
         $whereMap = [];
+        $userWhereMap = [];
         $order    = ['id' => 'desc'];
 
         $whereMap[] = ['is_score', '=', $isScore];
@@ -130,9 +131,19 @@ class Order extends Base
         if (isset($searchParams['phone']) && !empty($searchParams['phone'])) {
             $whereMap[] = ['phone', 'like', "%".$searchParams['phone']."%"];
         }
+        if (isset($searchParams['nickname']) && !empty($searchParams['nickname'])) {
+            $userWhereMap[] = ['nickname', 'like', "%".$searchParams['nickname']."%"];
+        }
 
-        $res = OrderModel::findList($whereMap, [], $page, $size, function ($q) {
-            return $q->with(['account']);
+
+        $res = OrderModel::findList($whereMap, [], $page, $size, function ($q)use($userWhereMap) {
+            if (!empty($userWhereMap)) {
+                return $q->hasWhere('account', function ($query) use ($userWhereMap) {
+                    $query->where($userWhereMap);
+                });
+            } else {
+                return $q->with(['account']);
+            }
         }, $order);
 
         $res['list'] = $res['list']->each(function ($item) {
diff --git a/public/static/layuimini/js/lay-module/wangEditor/fonts/w-e-icon.woff b/public/static/layuimini/js/lay-module/wangEditor/fonts/w-e-icon.woff
index 6dc5b5a33ab856629748dba686540870da73e89f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100755
GIT binary patch
literal 0
HcmV?d00001

literal 6224
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
J$1d+${ttXOcv=7e

diff --git a/public/static/manager/js/mall/order.js b/public/static/manager/js/mall/order.js
index 8dd564c..02db3a9 100755
--- a/public/static/manager/js/mall/order.js
+++ b/public/static/manager/js/mall/order.js
@@ -135,6 +135,11 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect', 'laydate'
                 // {field: 'paid_at', title: '支付时间', width: 180, hide: true},
                 {field: 'status_text', title: '订单状态', minWidth: 100},
                 {field: 'contacts', title: '联系人',minWidth: 150},
+                {templet: function (d) {
+                        if(d.account!==undefined){
+                            return d.account.nickname;
+                        }
+                    }, title: '微信号',minWidth: 150},
                 {field: 'phone',title: '电话',minWidth: 150},
                 // {field: 'pick_self_text', title: '配送方式',minWidth: 150},
                 // {field: 'is_score_text', title: '积分订单', minWidth: 150},
diff --git a/view/manager/mall/order/index.html b/view/manager/mall/order/index.html
index 803691f..a1e4e5f 100755
--- a/view/manager/mall/order/index.html
+++ b/view/manager/mall/order/index.html
@@ -54,6 +54,14 @@
                   </div>
                 </div>
 
+                <div class="layui-inline">
+                  <label class="layui-form-label">微信昵称</label>
+                  <div class="layui-input-block">
+                    <input type="text" class="layui-input" name="nickname" value="">
+                  </div>
+                </div>
+
+
                 <div class="layui-inline">
                   <label class="layui-form-label">联系人</label>
                   <div class="layui-input-block">
diff --git a/view/manager/mall/order/info.html b/view/manager/mall/order/info.html
index 5485de3..e6d4541 100755
--- a/view/manager/mall/order/info.html
+++ b/view/manager/mall/order/info.html
@@ -16,10 +16,7 @@
                                     <td>订单状态：{$statusList[$item['status']] ?? ''}</td>
                                 </tr>
                                 <tr>
-                                    <td>应付总价（元）：
-                                        <div class="layui-input-inline">
-                                            <input id="order_original_price" type="text" class="layui-input " name="item[original_price]" value="{$item.original_price ?? ''}">
-                                        </div>
+                                    <td>应付总价（元）：{$item.original_price ?? ''}
                                     </td>
                                     <td>下单时间：{$item.created_at ?? ''}</td>
 <!--                                    <td>实付总价（元）：{$item.price ?? 0}</td>-->