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

application/controllers/information.php

@@ -1471,7 +1471,7 @@ class Information extends CI_Controller
         }
 
         //表单页
-        if (in_array($meta_ct_page_type, array("customize", "contactus"))) {
+        if (in_array($meta_ct_page_type, array("customize", "contactus","pagewithform"))) {
             $productType = $meta_ct_page_type;
             $addonJs .= '<script src="' . $apiweb . '/js/mobile-first/form.js" defer></script>';
             $data["ADDONCSS"] .= '<link href="' . $apiweb . '/css/newcss3/flatpickr.css" rel="preload" as="style" onload="this.rel=\'stylesheet\'" />';

application/views/bootstrap3/information_edit.php

@@ -921,6 +921,9 @@
                                     <option value="contactus" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'contactus' ? 'selected' : false; ?>>
                                         ContactUs表单
                                     </option>
+                                    <option value="contactus" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'pagewithform' ? 'selected' : false; ?>>
+                                        带表单信息页
+                                    </option>
                                 </select>
                     </div> 
                     <div class="col-sm-6">