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

application/controllers/infofix.php

@@ -186,5 +186,39 @@ class infofix extends CI_Controller
 
   }
 
+  /**
+   * 无条件获取内容
+   * @param mixed $ic_id
+   * @return void
+   */
+  function get_by_icid($ic_id)
+  {
+    $ic = $this->infoContents_model->get_ic_contents2($ic_id);
+    $json = $this->infoMetas_model->get($ic_id, 'AMP_JSON');
+    if ($ic) {
+      echo json_encode(
+        array(
+          'state' => 0,
+          'ic_content' => $ic->ic_content,
+          'json' => $json
+        )
+      );
+    } else {
+      echo json_encode(
+        array(
+          'state' => -1,
+          'msg' => 'not content by ' . $ic_id
+        )
+      );
+    }
+  }
+
+  function update_by_icid()
+  {
+    $ic_id = $this->input->get_post('ic_id');
+    $ic_content = $this->input->get_post('ic_content');
+    $this->infoContents_model->force_update($ic_id, $ic_content);
+  }
+
 }
 //end of infofix

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

@@ -39,7 +39,7 @@
                     <div class="selectionMemo">
                         US$179
                     </div>
-                    <div id='vip_khomloy_left' class="dynamic-label" style="font-size: 18px;">93 left</div>
+                    <div id='vip_khomloy_left' class="dynamic-label" style="font-size: 18px;">65 left</div>
                 </label>
             </div>
             <div class="optionLable" id="ticket_type_standard_khomloy">
@@ -49,7 +49,7 @@
                     <div class="selectionMemo">
                        US$139
                     </div>
-                    <div id='standard_khomloy_left' class="dynamic-label" style="font-size: 18px;">Sold out</div>
+                    <div id='standard_khomloy_left' class="dynamic-label" style="font-size: 18px;">57 left</div>
                 </label>
             </div>
 
@@ -430,7 +430,7 @@
 
             premium_khomloy_input.disabled = true;
             vip_khomloy_input.disabled = false;
-            standard_khomloy_input.disabled = true;
+            standard_khomloy_input.disabled = false;
 
             ticket_date_november15th.addEventListener('click', function () {
                 premium_khomloy_left.innerText ='Sold out'
@@ -444,7 +444,7 @@
                 vip_khomloy_input.checked = true;
                 currentTicketPrice = parseInt(vip_khomloy_input.getAttribute('data-price'));
                 adultNumberValue = parseInt(adultNumberNode.value);
-                calcTotalPrice(dataPrice, adultNumberValue);
+                calcTotalPrice(currentTicketPrice, adultNumberValue);
             });
 
             ticket_date_november16th.addEventListener('click', function () {
@@ -459,7 +459,7 @@
                 premium_khomloy_input.checked = true;
                 currentTicketPrice = parseInt(premium_khomloy_input.getAttribute('data-price'));
                 adultNumberValue = parseInt(adultNumberNode.value);
-                calcTotalPrice(dataPrice, adultNumberValue);
+                calcTotalPrice(currentTicketPrice, adultNumberValue);
             });
         });