wesmiler

public/themes/admin_simpleboot3/admin/account/index.html

@@ -137,9 +137,15 @@
      * @param status
      */
     function doConfirm(id, status){
+        var checked = false;
         var msg = status==1? '确定通过？请填写备注' : '确定驳回？请填写原因';
-        var remark = prompt(msg)
-        if (id>0 && remark) {
+        if(status!=1){
+            checked = true;
+            var remark = prompt(msg)
+        }else{
+            checked = confirm('确认审核通过？')
+        }
+        if (id>0 && remark && checked) {
             $.post('/admin/account/confirm', {id: id, status: status,remark:remark}, function (res) {
                 if (res.code == 1) {
                     showMsg(res.msg);

public/themes/admin_simpleboot3/admin/order/prints.html

@@ -33,7 +33,7 @@
                style="width: 140px;" autocomplete="off" placeholder="结束时间">
         关键字：
         <input class="form-control" type="text" name="keyword" style="width: 200px;" value="{:input('request.keyword')}"
-               placeholder="下单人名称/订单号/设备号">
+               placeholder="下单人名称/订单号/设备名称">
         <input type="submit" class="btn btn-primary" value="搜索"/>
         <a class="btn btn-default" href="{:url('order/prints')}">清空</a>
         <a class="btn btn-warning" href="{:url('order/printExport')}">导出</a>

vendor/thinkcmf/cmf-app/src/admin/controller/OrderController.php

@@ -104,7 +104,7 @@ class OrderController extends AdminBaseController
                 if (!empty($data['keyword'])) {
                     $keyword = trim($data['keyword']);
                     $query->where('o.order_sn|u.real_name', 'like', "%$keyword%")
-                        ->whereOr('o.device_code','=', $keyword);
+                        ->whereOr('d.name','=', $keyword);
                 }
 
                 $startTime = isset($data['start_time'])? $data['start_time'] : '';