From d8100905c9f013326a89a68b2ec115741910b732 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 12 May 2023 10:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=B7=E6=A0=BC=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php     | 16 +++++++++++-----
 application/models/PrimeLinePrice_model.php |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index c31eb8eb..0870a2a5 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -997,9 +997,9 @@ class Information extends CI_Controller
 
     public function test_price()
     {
-      $price_rule = '#ah-8,st,2#';//'#'.$meta_product_code.',st,2#';
-      $tag_price = $this->replace_price_tag($price_rule);
-      echo 'Price: '.$tag_price;
+      $price_rule = '<div style="color: red;">#ah-8,st,2#</div>';
+      $price_tag_list = $this->parse_price_tag($price_rule);
+      var_dump($price_tag_list);
     }
 
     /*!
@@ -1009,9 +1009,10 @@ class Information extends CI_Controller
      * @param  string     $price_content 包含价格标签的内容
      * @return string                    可读的价格字符串
      */
-    public function replace_price_tag($price_content)
+    public function parse_price_tag($price_content)
     {
         $price_item_array = $this->price_pregmatch($price_content);
+        $price_tag_list = [];
         if ( ! empty($price_item_array)) {
             foreach ($price_item_array as $price_item) {
                 $price_date = !empty($price_item->price_date) ? $price_item->price_date : date('Y-m-d', time() + 86400 * 7); //当前时间7天后的价格
@@ -1098,7 +1099,12 @@ class Information extends CI_Controller
                 //把金额格式化为带有逗号(,)方便阅读，如 12,345
                 $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number;
                 if (!empty($price_number)) {
-                    $price_content = str_replace($price_item->placeholder, $price_number, $price_content);
+                  $price_tag = [
+                    'placeholder' => $price_item->placeholder,
+                    'price_number' => $price_item->price_number,
+                  ];
+                  $price_tag_list[] = $price_tag;
+                  //$price_content = str_replace($price_item->placeholder, $price_number, $price_content);
                 }
             }
         }
diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
index b167cb2e..7408a4d7 100644
--- a/application/models/PrimeLinePrice_model.php
+++ b/application/models/PrimeLinePrice_model.php
@@ -93,7 +93,7 @@ class PrimeLinePrice_model extends CI_Model {
         $this->cli_grade ? $sql.=$this->cli_grade : false;
         $this->orderby ? $sql.=$this->orderby : false;
 
-        $query = $this->HT->query($sql,array($DEI_SN,$this->cli_no));
+        $query = $this->HT->query($sql,array($this->$DEI_SN,$this->cli_no));
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();