From 021225c57f08a68208b899f7a6814fdfc8999991 Mon Sep 17 00:00:00 2001
From: hant <hant@cherrybless.com>
Date: Sat, 7 Jun 2025 19:04:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BD=95=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/order/add.html  | 2 +-
 application/admin/view/order/edit.html | 2 +-
 public/assets/js/backend/order.js      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/admin/view/order/add.html b/application/admin/view/order/add.html
index 5e8c5a3..2644c32 100644
--- a/application/admin/view/order/add.html
+++ b/application/admin/view/order/add.html
@@ -54,7 +54,7 @@
                             <div class="form-group">
                                 <label class="control-label col-xs-12 col-lg-4">{:__('Item_title')}:</label>
                                 <div class="col-xs-12 col-sm-8">
-                                    <input type="text" id="item_id"  class="zd-input__inner">
+                                    <input type="text" data-rule="required" id="item_id"  class="zd-input__inner">
                                     <input type="text" id="item_id_value" style="display: none" name="row[item_id]"  class="zd-input__inner">
 
                                 </div>
diff --git a/application/admin/view/order/edit.html b/application/admin/view/order/edit.html
index 306965f..1df3deb 100644
--- a/application/admin/view/order/edit.html
+++ b/application/admin/view/order/edit.html
@@ -54,7 +54,7 @@
                             <div class="form-group col-xs-12">
                                 <label class="control-label col-xs-12 col-sm-3">{:__('Item_title')}:</label>
                                 <div class="col-xs-12 col-sm-8">
-                                    <input type="text" id="item_id" value="{$row.item_title}" data-value="{$row.item_title}" class="zd-input__inner">
+                                    <input type="text" data-rule="required" id="item_id" value="{$row.item_title}" data-value="{$row.item_title}" class="zd-input__inner">
                                     <input type="text" id="item_id_value" value="{$row.item_id}" style="display: none" name="row[item_id]"  class="zd-input__inner">
                                 </div>
                             </div>
diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js
index 927ae9f..0122db0 100644
--- a/public/assets/js/backend/order.js
+++ b/public/assets/js/backend/order.js
@@ -3,6 +3,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
     function clearInfo() {
         $('[name^="row["]').val('');
         $("#c-city").citypicker('reset');
+        $("#item_id").val('');
+        $("#item_id_value").val('');
         $(".selectpicker").val('').selectpicker('refresh');
     }
 

From 6dc5156074de848417965644e31fbe31b30848a6 Mon Sep 17 00:00:00 2001
From: hant <hant@cherrybless.com>
Date: Sat, 7 Jun 2025 19:22:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BD=95=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Order.php | 1 +
 public/assets/js/cascader.js           | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php
index 8fe58ad..e81ec9e 100644
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -204,6 +204,7 @@ class Order extends Backend
 
     public function add()
     {
+
         if (false === $this->request->isPost()) {
             return $this->view->fetch();
         }
diff --git a/public/assets/js/cascader.js b/public/assets/js/cascader.js
index 3f9a47a..3b82dc2 100644
--- a/public/assets/js/cascader.js
+++ b/public/assets/js/cascader.js
@@ -278,14 +278,14 @@
                             datas.push({
                                 label: `${prov.label} / ${city.label} / ${area.label}`,
                                 labels: [prov.label, city.label, area.label],
-                                value: [prov.value, city.value, area.value],
+                                value: [area.value],
                             })
                         })
                     } else {
                         datas.push({
                             label: `${prov.label} / ${city.label}`,
                             labels: [prov.label, city.label],
-                            value: [prov.value, city.value],
+                            value: [ city.value],
                         })
                     }
                 })
@@ -318,6 +318,7 @@
         }).sort(function(a, b) {
             return b.num - a.num
         }).slice(0, 10)
+        console.log(data);
         this.reload(data, true)
     }
     //关键词筛选数据（暂不用）