Merge branch 'master' of github.com:hainatravel/information-system into master

application/controllers/information.php

@@ -2272,13 +2272,6 @@ class Information extends CI_Controller
       true
     );
     $information->ic_content = str_replace('<!--@LANTERN-FORM@-->', $lantern_form_content, $information->ic_content);
-    // 水灯节在信息页面表单
-    $lantern_form_info_page_content = $this->load->view(
-      'mobile_first/ah-lantern-form-info-page',
-      array('information' => $information),
-      true
-    );
-    $information->ic_content = str_replace('<!--@LANTERN-FORM-INFO-PAGE@-->', $lantern_form_info_page_content, $information->ic_content);
 
     // CAD 跨年表单
     $new_year_countdown_form_content = $this->load->view(
@@ -2775,7 +2768,7 @@ class Information extends CI_Controller
         }
       }
 
-    
+
       if ($meta_ct_page_type == "tourdetail") {
         $dataform['device'] = $device;
         $template_form_tourqi = $this->load->view($template_path . '-form-tourqi', $dataform, true);
@@ -3028,7 +3021,7 @@ class Information extends CI_Controller
       //获取cli_sn
       $tourdata = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apish/getCliSn/?param=" . $productCode));
       $data["clisn"] = $tourdata->clisn;
-      
+
       //获取price
       $tourprice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apish/getTourPrice/?param=" . $productCode));
       $dataform["tourprice"] = $tourprice->price;

application/views/mobile_first/ah-lantern-form.php

@@ -41,11 +41,11 @@
                 </label>
             </div>
             <div class="optionLable" id="ticket_type_standard_khomloy">
-                <input type="radio" value="Standard+Transfer+Dinner" id="standard_khomloy" data-price="129" name="ticket_type">
+                <input type="radio" disabled value="Standard+Transfer+Dinner" id="standard_khomloy" data-price="129" name="ticket_type">
                 <label for="standard_khomloy" style="font-size:18px;">
                 Standard+Transfer+Dinner
                     <div class="selectionMemo">
-                        US$129 (4600THB)
+                    Sold out
                     </div>
                 </label>
             </div>