From 72eb29cdf5e60b7f54c9136298e4ce507f1da18e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Sun, 18 Apr 2021 14:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E9=A2=84=E6=8A=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       | 19 +++++++++++--------
 .../views/bootstrap3/information_edit.php     |  3 +++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 424a2493..1f472334 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -910,26 +910,29 @@ class Information extends CI_Controller
 
         //额外js
         $data["ADDONJS"] = "";
-        $jscdn = "";
-        //$jscdn = "//data.chinatravel.com";
         $meta_addon_js = get_meta($information->ic_id, 'meta_addon_js');
         if (!empty($meta_addon_js)) {
             $addonJs .= '<script src="' . $meta_addon_js . '"></script>';
         }
         //价格js       
         if ($meta_ct_page_price == "yes") {
-            $addonJs .= '<script src="'.$jscdn.'/js/mobile-first/getprice.js"></script>';
+            $addonJs .= '<script src="'.$apiweb.'/js/mobile-first/getprice.js"></script>';
         }
 
         //列表js
         if (in_array($meta_ct_page_type, array('daytripindex', 'tourindex', 'attractionindex'))) {
-            $addonJs .= '<script src="'.$jscdn.'/js/mobile-first/getlist.js"></script>';
+            $addonJs .= '<script src="'.$apiweb.'/js/mobile-first/getlist.js"></script>';
+        } 
+
+        //天气
+        if (in_array($meta_ct_page_type, array('weatherpage'))) {
+            $addonJs .= '<script src="'.$apiweb.'/js/mobile-first/getweather.js"></script>';
         } 
 
 
         //页面传递参数
         $passParam = "";
-        if (in_array($meta_ct_page_type, array("daytripindex", "tourindex", "attractionindex"))) { //一日游和线路列表
+        if (in_array($meta_ct_page_type, array("daytripindex", "tourindex", "attractionindex","weatherpage"))) { //一日游和线路列表
             //产品首页
             $meta_ct_page_value = get_meta($information->ic_id, 'meta_ct_page_value');
 
@@ -960,9 +963,9 @@ class Information extends CI_Controller
             if (!empty($meta_ct_page_value)) {
                 $productCode = $meta_ct_page_value;
             }
-            $addonJs .= '<script src="'.$jscdn.'/js/mobile-first/daytripdetail.js"></script>';
-            //$addonJs .= '<script src="'.$jscdn.'/js/mobile-first/flatpickr.js"></script>';
-            $data["ADDONCSS"] .= '<link href="' . $jscdn . '/css/newcss3/flatpickr.css" rel="stylesheet" />';
+            $addonJs .= '<script src="'.$apiweb.'/js/mobile-first/daytripdetail.js"></script>';
+            //$addonJs .= '<script src="'.$apiweb.'/js/mobile-first/flatpickr.js"></script>';
+            $data["ADDONCSS"] .= '<link href="' . $apiweb . '/css/newcss3/flatpickr.css" rel="stylesheet" />';
         }
         if ($meta_ct_page_type=="tourdetail"){
             //线路
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index d945c2a8..bd273347 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -897,6 +897,9 @@
                                     <option value="attractionindex" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'attractionindex' ? 'selected' : false; ?>>
                                         城市景点首页
                                     </option>
+                                    <option value="weatherpage" <?php echo get_meta($information->ic_id, 'meta_ct_page_weather') === 'weatherpage' ? 'selected' : false; ?>>
+                                        城市天气页面
+                                    </option>
                                 </select>
                     </div> 
                     <div class="col-sm-6">