diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php
index 518156ed..e7105f0c 100644
--- a/application/controllers/infofix.php
+++ b/application/controllers/infofix.php
@@ -245,14 +245,14 @@ class infofix extends CI_Controller
      * 转化旧版构建工具数据（上线前的准备）
      * @param mixed $ic_id
      */
-    public function migrate_hb($ic_id, $dev = 'prod')
+    public function migrate_hb($dev = 'prod')
     {
-
+        $ic_id = $this->input->get('ic_id');
         // 本地测试参数
         $api = 'https://hmk.arachina.com/beta/3733/server_render2';
         if ($dev == 'dev') {
             $api = 'http://127.0.0.1:3733/server_render2';
-            sleep(1);
+            // sleep(1);
         }
 
         // 请求api
@@ -271,10 +271,12 @@ class infofix extends CI_Controller
             $curl_rs = curl_exec($ch);
             $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
             if ($curl_rs && ($httpCode == 200 || $httpCode == 201)) {
-                // 先备份
-                $is = $this->infoContents_model->get_isid_by_icid($ic_id);
-                $ic = $this->infoContents_model->get_ic_contents2($ic_id);
-                $this->logs_model->backup($is->is_id, $ic->ic_content);
+                // 先备份 - 测试时不备份
+                if ($dev != 'dev') {
+                    $is = $this->infoContents_model->get_isid_by_icid($ic_id);
+                    $ic = $this->infoContents_model->get_ic_contents2($ic_id);
+                    $this->logs_model->backup($is->is_id, $ic->ic_content);
+                }
                 // 移除外部包裹标签
                 $curl_rs = str_replace(array('<my_lmr_tpl>', '</my_lmr_tpl>'), '', $curl_rs);
                 // 强制更新信息内容
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index a2fae644..197a57c4 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -584,15 +584,15 @@
           <ul id="treeDemo" name="treeDemo" class="ztree" style="height:600px;overflow-x:auto;"></ul>
           <ul class="nav nav-list">
             <li class="nav-header">
-              <?php if (!is_mobile_first()) { ?>
+              <?php if (!is_mobile_first()) {?>
                 <a href="<?php echo site_url('welcome/create_infomation_urls/' . $information->is_id); ?>" target="_blank"
                   class="col-sm-5" title="批量更新静态化页面"><i class="text-muted glyphicon glyphicon-retweet"></i></a>
                 <a href="<?php echo site_url('welcome/create_infomation_urls/' . $information->is_id . '/amp'); ?>"
                   target="_blank" class="col-sm-5" title="批量更新AMP页面"><i class="glyphicon glyphicon-flash"></i></a>
-              <?php } else { ?>
+              <?php } else {?>
                 <a href="<?php echo site_url('welcome/create_infomation_urls/' . $information->is_id . '/mobile-first'); ?>"
                   target="_blank" class="col-sm-5" title="批量更新静态页面"><i class="glyphicon glyphicon-flash"></i></a>
-              <?php } ?>
+              <?php }?>
             </li>
           </ul>
         </div>
@@ -621,20 +621,20 @@
               </div>
               <div class="col-xs-17 text-right">
                 <?php
-                $amp_user = $this->session->userdata('session_admin');
-                $show_photo_meta = get_meta($information->ic_id, 'meta_use_list_picture');
-                $amp_photo = '';
-                if ($information->ic_photo && $show_photo_meta !== 'no') {
-                  $amp_photo = $this->config->item('site_image_url') . $information->ic_photo;
-                }
-                $amp_build_url = "/amp_app/?icid=" . $information->ic_id . "&is_path=" . $information->is_path . "&usr=" . urlencode($amp_user['OPI_Name']) . "&url=" . urlencode($information->ic_url) . "&photo=" . urlencode($amp_photo) . "&site=" . urlencode($this->config->item('site_url')) . "&imgurl=" . urlencode($this->config->item('site_image_url'));
-                ?>
+$amp_user = $this->session->userdata('session_admin');
+$show_photo_meta = get_meta($information->ic_id, 'meta_use_list_picture');
+$amp_photo = '';
+if ($information->ic_photo && $show_photo_meta !== 'no') {
+    $amp_photo = $this->config->item('site_image_url') . $information->ic_photo;
+}
+$amp_build_url = "/amp_app/?icid=" . $information->ic_id . "&is_path=" . $information->is_path . "&usr=" . urlencode($amp_user['OPI_Name']) . "&url=" . urlencode($information->ic_url) . "&photo=" . urlencode($amp_photo) . "&site=" . urlencode($this->config->item('site_url')) . "&imgurl=" . urlencode($this->config->item('site_image_url'));
+?>
                 <?php if (is_series_site()) {
-                  if (get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') == 'yes') {
-                    $PcAmpChecked = 'checked';
-                  } else {
-                    $PcAmpChecked = '';
-                  } ?>
+    if (get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') == 'yes') {
+        $PcAmpChecked = 'checked';
+    } else {
+        $PcAmpChecked = '';
+    }?>
                   <style type="text/css">
                     #PcAmp {
                       color: #069;
@@ -667,26 +667,26 @@
                     });
                   </script>
                   <?php
-                } ?>
-                <?php if ($information->amp_status === '1') { ?>
+}?>
+                <?php if ($information->amp_status === '1') {?>
                   <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>"
                       target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label>
-                <?php } ?>
-                <?php if ($information->amp_status === '2') { ?>
+                <?php }?>
+                <?php if ($information->amp_status === '2') {?>
                   <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>"
                       target="_blank"><i class="glyphicon glyphicon-hand-up"></i></a></label>
-                <?php } ?>
-                <?php if ($information->amp_status === '0') { ?>
+                <?php }?>
+                <?php if ($information->amp_status === '0') {?>
                   <label title="创建AMP页面"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>"
                       target="_blank"><i class="glyphicon glyphicon-plus"></i></a></label>
-                <?php } ?>
+                <?php }?>
               </div>
               <div class="col-xs-24">
                 <input class="form-control" type="text" id="ic_title" style="<?php
-                if ($embody == 1) {
-                  echo 'border-color:green;';
-                }
-                ?>" name="ic_title" value="<?php echo $information->ic_title; ?>">
+if ($embody == 1) {
+    echo 'border-color:green;';
+}
+?>" name="ic_title" value="<?php echo $information->ic_title; ?>">
               </div>
               <div class="col-xs-24 btn-sm"></div>
             </div>
@@ -722,26 +722,26 @@
                   target="_blank" title="查看"><i
                     class="glyphicon glyphtext-muted glyphicon glyphicon-eye-open text-muted"></i></a>
 
-                <?php if ($information->ic_sitecode == 'ch') { ?>
+                <?php if ($information->ic_sitecode == 'ch') {?>
                   <a href="javascript:void(0);" onclick="goto_test_page();" id="goto_test_page_button"
                     name="goto_test_page_button" target="_blank" title="查看测试页面"><i
                       class="glyphicon glyphtext-muted glyphicon glyphicon-random text-muted"></i></a>
-                <?php } ?>
-                <?php if ($information->ic_sitecode == 'gm') { ?>
+                <?php }?>
+                <?php if ($information->ic_sitecode == 'gm') {?>
                   <a href="javascript:void(0);" onclick="goto_gmtest_page();" id="goto_test_page_button"
                     name="goto_test_page_button" target="_blank" title="查看测试页面"><i
                       class="glyphicon glyphtext-muted glyphicon glyphicon-random text-muted"></i></a>
-                <?php } ?>
-                <?php if ($information->ic_sitecode == 'ah') { ?>
+                <?php }?>
+                <?php if ($information->ic_sitecode == 'ah') {?>
                   <a href="javascript:void(0);" onclick="goto_ahtest_page();" id="goto_test_page_button"
                     name="goto_test_page_button" target="_blank" title="查看测试页面"><i
                       class="glyphicon glyphtext-muted glyphicon glyphicon-random text-muted"></i></a>
-                <?php } ?>
+                <?php }?>
               </div>
               <input class="form-control col-xs-24" type="text" id="ic_url" name="ic_url"
                 value="<?php echo $information->ic_url; ?>">
             </div>
-            <?php if ($information->ic_sitecode == 'ct' || $information->ic_sitecode == 'chinatravel') { ?>
+            <?php if ($information->ic_sitecode == 'ct' || $information->ic_sitecode == 'chinatravel') {?>
               <div class="col-sm-24 col-xs-24 nopadding">
                 <label>CT信息旧URL
                   <a href="javascript:void(0);"
@@ -759,7 +759,7 @@
                 <input type="text" name="meta_ct_oldurl" class="form-control"
                   value="<?php echo get_meta($information->ic_id, 'meta_ct_oldurl'); ?>" id="meta_ct_oldurl" />
               </div>
-            <?php } ?>
+            <?php }?>
             <div class="col-xs-24 edit_tool nopadding" style="margin-top:5px;">
               <i class="icon-stop icon-white pull-right" id="display_count"></i>
             </div>
@@ -827,23 +827,28 @@
               <select name="meta_website_nav" id="meta_website_nav" class="form-control">
                 <option value="">不选择</option>
                 <?php
-                if (!empty($setting_website_nav)) {
-                  $setting_website_nav_active = trim(get_meta($information->ic_id, 'meta_website_nav'));
-                  foreach ($setting_website_nav as $item) {
-                    $strcasecmp_nav = strcasecmp($setting_website_nav_active, $item->im_value); ?>
+if (!empty($setting_website_nav)) {
+    $setting_website_nav_active = trim(get_meta($information->ic_id, 'meta_website_nav'));
+    foreach ($setting_website_nav as $item) {
+        $strcasecmp_nav = strcasecmp($setting_website_nav_active, $item->im_value);?>
                     <option <?php echo $strcasecmp_nav == 0 ? 'selected' : false; ?> value="<?php echo $item->im_value ?>">
                       <?php echo $item->im_value ?>
                     </option>
                     <?php
-                  }
-                }
-                ?>
+}
+}
+?>
               </select>
 
             </div>
           </div>
+<<<<<<< HEAD
           <?php if ($information->ic_sitecode == 'chinatravel' || $information->ic_sitecode == 'shanghai' || $information->ic_sitecode == 'beijing') {
             ?>
+=======
+          <?php if ($information->ic_sitecode == 'chinatravel' || $information->ic_sitecode == 'shanghai') {
+    ?>
+>>>>>>> f657130093af1eb0b39ff40bd09352823b9de5dc
             <div>
               <div class="col-sm-8">
                 <label>附加图片PC
@@ -1043,7 +1048,8 @@
                 </script>
               </div>
             </div>
-          <?php } ?>
+          <?php
+}?>
 
           <input type="hidden" name="ic_photo_width" id="ic_photo_width"
             value="<?php echo $information->ic_photo_width; ?>" />
@@ -1066,9 +1072,9 @@
           <p></p>
           <div class="col-xs-24">
             <label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a>　</label>
-            <?php if ($information->ic_sitecode == "trippest") { ?>
+            <?php if ($information->ic_sitecode == "trippest") {?>
               <label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label>
-            <?php } ?>
+            <?php }?>
           </div>
 
           <div id="customize" class="col-xs-24" style="display:none;">
@@ -1165,7 +1171,7 @@
                   <a href="javascript:void(0);" title="是否展示右侧广告"><i
                       class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-question-sign"></i></a>
                 </label>
-                
+
                 <select name="meta_show_advertise" id="meta_show_advertise" class="form-control">
                   <option value="yes">展示</option>
                   <option <?php echo get_meta($information->ic_id, 'meta_show_advertise') === 'no' ? 'selected' : false; ?> value='no'>不展示
@@ -1177,7 +1183,7 @@
             </div>
 
             <?php if ($information->ic_sitecode == 'cht' || $information->ic_sitecode == "ct") {
-              ?>
+    ?>
 
               <div class="row">
                 <div class="col-sm-5">
@@ -1200,9 +1206,9 @@
                 </div>
 
                 <div class="col-sm-5 <?php
-                if ($information->ic_ht_area_type != 'c' && $information->ic_sitecode != "ct") {
-                  echo 'hidden';
-                } ?>">
+if ($information->ic_ht_area_type != 'c' && $information->ic_sitecode != "ct") {
+        echo 'hidden';
+    }?>">
                   <label>景点评论数
                     <a href="javascript:void(0);"
                       onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_review_count', $('#meta_review_count').val())"><i
@@ -1255,11 +1261,11 @@
                 </div>
 
                 <div class="<?php
-                if ($information->ic_ht_area_type == 'c') {
-                  echo 'col-sm-4';
-                } else {
-                  echo 'col-sm-9';
-                } ?>">
+if ($information->ic_ht_area_type == 'c') {
+        echo 'col-sm-4';
+    } else {
+        echo 'col-sm-9';
+    }?>">
                   <label>显示作者
                     <a href="javascript:void(0);"
                       onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_show_author', $('#meta_show_author').val())"><i
@@ -1281,18 +1287,18 @@
               </div>
 
               <?php
-              // 有子节点时
-              $children_cnt = 0;
-              foreach ($informationList as $kin => $vin) {
-                if (
-                  in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id
-                ) {
-                  $children_cnt++;
-                }
-              }
-              echo "<!-- children_cnt $children_cnt -->";
-              if ($children_cnt > 0) {
-                ?>
+// 有子节点时
+    $children_cnt = 0;
+    foreach ($informationList as $kin => $vin) {
+        if (
+            in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id
+        ) {
+            $children_cnt++;
+        }
+    }
+    echo "<!-- children_cnt $children_cnt -->";
+    if ($children_cnt > 0) {
+        ?>
                 <div class="row">
                   <div class="col-sm-5">
                     <label>上&nbsp;/&nbsp;下篇阅读导航
@@ -1316,7 +1322,7 @@
                   </div>
                 </div>
                 <?php
-              } ?>
+}?>
               <div class="row">
                 <div class="col-xs-24">
                   <label>自定义导航
@@ -1338,7 +1344,7 @@
               </div>
 
               <?php
-            } ?>
+}?>
 
 
             <label>og:title
@@ -1509,7 +1515,7 @@
             </div>
 
 
-            <?php if (is_series_site()) { ?>
+            <?php if (is_series_site()) {?>
               <div class="row">
                 <div class="col-sm-8">
                   <label>机票目的地
@@ -1527,28 +1533,28 @@
                 </div>
                 <div class="col-sm-8">
                   <?php
-                  $meta_subnavi_arr = array(
-                    'index' => '首页',
-                    'tour' => '中国线路',
-                    'asia_tour' => '亚洲线路',
-                    'dest' => '目的地',
-                    'tailormade' => 'tailormade',
-                    'train' => '火车',
-                    'ship' => '游船',
-                    'hotel' => '酒店',
-                    'flight' => '机票',
-                    'info' => '信息',
-                    'deal' => '促销',
-                    '2015' => '2015',
-                    'tour2017' => '2017',
-                    'op' => 'OP',
-                    'best' => '实用信息',
-                    'culture' => '文化',
-                    'top10' => 'TOP10',
-                    'lifestyle' => '生活方式',
-                    'aboutus' => '关于我们',
-                  );
-                  ?>
+$meta_subnavi_arr = array(
+    'index' => '首页',
+    'tour' => '中国线路',
+    'asia_tour' => '亚洲线路',
+    'dest' => '目的地',
+    'tailormade' => 'tailormade',
+    'train' => '火车',
+    'ship' => '游船',
+    'hotel' => '酒店',
+    'flight' => '机票',
+    'info' => '信息',
+    'deal' => '促销',
+    '2015' => '2015',
+    'tour2017' => '2017',
+    'op' => 'OP',
+    'best' => '实用信息',
+    'culture' => '文化',
+    'top10' => 'TOP10',
+    'lifestyle' => '生活方式',
+    'aboutus' => '关于我们',
+);
+    ?>
                   <label>匹配到一级导航
                     <a href="javascript:void(0);"
                       onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_subnavi', $('#meta_subnavi').val())"><i
@@ -1560,15 +1566,15 @@
                         class="text-muted glyphicon glyphicon-question-sign"></i></a>
                   </label>
                   <select name="meta_subnavi" id="meta_subnavi" class="form-control">
-                    <?php if ($meta_subnavi = get_meta($information->ic_id, 'meta_subnavi')) { ?>
+                    <?php if ($meta_subnavi = get_meta($information->ic_id, 'meta_subnavi')) {?>
                       <option selected="selected" value="<?php echo $meta_subnavi; ?>">
                         <?php echo $meta_subnavi_arr[$meta_subnavi]; ?>
                       </option>
-                    <?php } else { ?>
+                    <?php } else {?>
                       <option selected="selected" value="info">
                         <?php echo $meta_subnavi_arr['info']; ?>
                       </option>
-                    <?php } ?>
+                    <?php }?>
                     <option value="index">
                       <?php echo ($meta_subnavi_arr['index']); ?>
                     </option>
@@ -1640,13 +1646,13 @@
                         class="text-muted glyphicon glyphicon-question-sign"></i></a>
                   </label>
                   <select name="meta_bread_showinfo" id="meta_bread_showinfo" class="form-control">
-                    <?php if (get_meta($information->ic_id, 'meta_bread_showinfo') == 'noshow') { ?>
+                    <?php if (get_meta($information->ic_id, 'meta_bread_showinfo') == 'noshow') {?>
                       <option selected="selected" value="noshow">不显示</option>
                       <option value="show">显示</option>
-                    <?php } else { ?>
+                    <?php } else {?>
                       <option value="noshow">不显示</option>
                       <option selected="selected" value="show">显示</option>
-                    <?php } ?>
+                    <?php }?>
                   </select>
                 </div>
                 <div class="col-sm-8">
@@ -1676,11 +1682,11 @@
                         class="text-muted glyphicon glyphicon-question-sign"></i></a>
                   </label>
                   <select name="meta_haiwai" id="meta_haiwai" class="form-control">
-                    <?php $meta_haiwai = get_meta($information->ic_id, 'meta_haiwai'); ?>
-                    <option <?php if ($meta_haiwai == false) { ?>selected="selected" <?php } ?> value="">无</option>
-                    <option <?php if ($meta_haiwai == 'info') { ?>selected="selected" <?php } ?> value="info">海外信息
+                    <?php $meta_haiwai = get_meta($information->ic_id, 'meta_haiwai');?>
+                    <option <?php if ($meta_haiwai == false) {?>selected="selected" <?php }?> value="">无</option>
+                    <option <?php if ($meta_haiwai == 'info') {?>selected="selected" <?php }?> value="info">海外信息
                     </option>
-                    <option <?php if ($meta_haiwai == 'tour') { ?>selected="selected" <?php } ?> value="tour">海外线路
+                    <option <?php if ($meta_haiwai == 'tour') {?>selected="selected" <?php }?> value="tour">海外线路
                     </option>
                   </select>
                 </div>
@@ -1697,16 +1703,16 @@
                         class="text-muted glyphicon glyphicon-question-sign"></i></a>
                   </label>
                   <select name="meta_show_author" id="meta_show_author" class="form-control">
-                    <?php if (get_meta($information->ic_id, 'meta_show_author') == 'show') { ?>
+                    <?php if (get_meta($information->ic_id, 'meta_show_author') == 'show') {?>
                       <option selected="selected" value="show">显示</option>
                       <option value="hide">隐藏</option>
-                    <?php } else { ?>
+                    <?php } else {?>
                       <option value="show">显示</option>
                       <option selected="selected" value="hide">隐藏</option>
-                    <?php } ?>
+                    <?php }?>
                   </select>
                 </div>
-                <?php if ($information->ic_ht_area_type == 'err') { ?>
+                <?php if ($information->ic_ht_area_type == 'err') {?>
                   <div class="col-sm-8">
                     <label>自定义样式
                       <a href="javascript:void(0);"
@@ -1742,11 +1748,11 @@
                     <input class="form-control" type="text" name="meta_z_res"
                       value="<?php echo get_meta($information->ic_id, 'meta_z_res'); ?>" id="meta_z_res" />
                   </div>
-                <?php } ?>
+                <?php }?>
               </div>
-            <?php } ?>
+            <?php }?>
 
-            <?php if ($this->config->item('site_code') == 'gm') { ?>
+            <?php if ($this->config->item('site_code') == 'gm') {?>
               <div class="col-sm-8">
                 <label>海外页面标签
                   <a href="javascript:void(0);"
@@ -1759,17 +1765,17 @@
                       class="text-muted glyphicon glyphicon-question-sign"></i></a>
                 </label>
                 <select name="meta_haiwai" id="meta_haiwai" class="form-control">
-                  <?php $meta_haiwai = get_meta($information->ic_id, 'meta_haiwai'); ?>
-                  <option <?php if ($meta_haiwai == false) { ?>selected="selected" <?php } ?> value="">无</option>
-                  <option <?php if ($meta_haiwai == 'info') { ?>selected="selected" <?php } ?> value="info">海外信息
+                  <?php $meta_haiwai = get_meta($information->ic_id, 'meta_haiwai');?>
+                  <option <?php if ($meta_haiwai == false) {?>selected="selected" <?php }?> value="">无</option>
+                  <option <?php if ($meta_haiwai == 'info') {?>selected="selected" <?php }?> value="info">海外信息
                   </option>
-                  <option <?php if ($meta_haiwai == 'tour') { ?>selected="selected" <?php } ?> value="tour">海外线路
+                  <option <?php if ($meta_haiwai == 'tour') {?>selected="selected" <?php }?> value="tour">海外线路
                   </option>
                 </select>
               </div>
-            <?php } ?>
+            <?php }?>
 
-            <?php if ($information->ic_ht_area_type == 'g') { ?>
+            <?php if ($information->ic_ht_area_type == 'g') {?>
               <div class="row">
 
 
@@ -1834,7 +1840,7 @@
                 </div>
 
               </div>
-            <?php } ?>
+            <?php }?>
             <div class="row">
               <div class="col-sm-5">
                 <label>展示打赏功能
@@ -1907,9 +1913,9 @@
 
             </div>
 
-            <?php if ($information->ic_sitecode == "ct") { ?>
+            <?php if ($information->ic_sitecode == "ct") {?>
               <div class="row">
-                <?php if ($information->SRMS_SIC_Code == "Attraction" || $information->ic_type == "c_attraction_detail") { ?>
+                <?php if ($information->SRMS_SIC_Code == "Attraction" || $information->ic_type == "c_attraction_detail") {?>
                   <div class="col-sm-6">
                     <label>景点类别
                       <a href="javascript:void(0);"
@@ -2050,7 +2056,7 @@
                       </option>
                     </select>
                   </div>
-                <?php } ?>
+                <?php }?>
                 <div class="col-sm-6">
                   <label>排序
                     <a href="javascript:void(0);"
@@ -2129,7 +2135,7 @@
 
               </div>
 
-            <?php } ?>
+            <?php }?>
 
             <!-- 目的地产品选项 -->
             <div class="row">
@@ -2334,12 +2340,12 @@
         <div class="col-sm-4 well info-right-col" style="height:1004px;padding:0 12px;border:none;">
           <!-- 右侧栏 -->
           <?php
-          if (stripos($information->ic_photo, '//') === false) {
-            $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg';
-          } else {
-            $list_picture = $information->ic_photo;
-          }
-          ?>
+if (stripos($information->ic_photo, '//') === false) {
+    $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg';
+} else {
+    $list_picture = $information->ic_photo;
+}
+?>
           <label>标题图片</label>
           <input class="form-control" type="text" name="ic_photo" id="ic_photo"
             value="<?php echo $information->ic_photo; ?>" />
@@ -2381,7 +2387,7 @@
             </div>
           </div>
 
-          <?php if (is_mobile_first()) { ?>
+          <?php if (is_mobile_first()) {?>
             <script>
               function show_ad_mate(mate_name, value) {
                 if ($('#' + mate_name).prop("checked")) {
@@ -2415,31 +2421,31 @@
                 </label>
               </div>
             </div>
-          <?php } ?>
+          <?php }?>
 
-          <?php if (!is_mobile_first()) { ?>
+          <?php if (!is_mobile_first()) {?>
             <label>信息类型</label>
             <select name="ic_type" id="ic_type" class="form-control" onselect="">
               <?php
-              foreach ($infoTypeList as $key => $value) {
-                $value == $information->ic_type ? $select_str = 'selected' : $select_str = ''; ?>
+foreach ($infoTypeList as $key => $value) {
+    $value == $information->ic_type ? $select_str = 'selected' : $select_str = '';?>
                 <option <?php echo $select_str; ?> value="<?php echo $value; ?>">
                   <?php echo $key; ?>
                 </option>
                 <?php
-              } ?>
+}?>
             </select>
 
             <label style="width:48px;">模板</label>
             <select name="ic_template" id="ic_template" class="form-control">
               <?php
-              foreach ($templateList as $key => $value) {
-                $value == $information->ic_template ? $select_str = 'selected' : $select_str = ''; ?>
+foreach ($templateList as $key => $value) {
+    $value == $information->ic_template ? $select_str = 'selected' : $select_str = '';?>
                 <option <?php echo $select_str; ?> value="<?php echo $value; ?>">
                   <?php echo $key; ?>
                 </option>
                 <?php
-              } ?>
+}?>
             </select>
 
             <label>是否作为面包屑显示</label>
@@ -2449,39 +2455,39 @@
               <option <?php echo $information->ic_show_bread_crumbs == 1 ? 'selected' : false; ?> value="1">显示
               </option>
             </select>
-          <?php } ?>
+          <?php }?>
 
           <label>作者</label>
           <select name="ic_author" id="ic_author" class="form-control">
             <option value="">-</option>
             <?php
-            $userinfo = $this->session->userdata('session_admin');
-            $hasselected = false;
-            foreach ($editor_list as $editor_item) {
-              //mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author) ? $select_str = 'selected' : $select_str = '';
-              if (mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author)) {
-                $select_str = 'selected';
-                $hasselected = true;
-              } else {
-                $select_str = '';
-                if (!$hasselected && !empty($information->ic_content) && $information->ic_url_title != 'New Information' && $editor_item->OPI_Code == 'PKL') {
-                  $select_str = 'selected';
-                }
-              } ?>
+$userinfo = $this->session->userdata('session_admin');
+$hasselected = false;
+foreach ($editor_list as $editor_item) {
+    //mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author) ? $select_str = 'selected' : $select_str = '';
+    if (mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author)) {
+        $select_str = 'selected';
+        $hasselected = true;
+    } else {
+        $select_str = '';
+        if (!$hasselected && !empty($information->ic_content) && $information->ic_url_title != 'New Information' && $editor_item->OPI_Code == 'PKL') {
+            $select_str = 'selected';
+        }
+    }?>
               <option <?php echo $select_str; ?> value="<?php echo $editor_item->OPI_Code; ?>">
                 <?php echo $editor_item->OPI_Name; ?>
               </option>
               <?php
-            } ?>
+}?>
             <option value="">-</option>
             <?php
-            foreach ($author_list as $author_item) {
-              ($author_item->a_id == $information->ic_author) ? $select_str = 'selected' : $select_str = ''; ?>
+foreach ($author_list as $author_item) {
+    ($author_item->a_id == $information->ic_author) ? $select_str = 'selected' : $select_str = '';?>
               <option <?php echo $select_str; ?> value="<?php echo $author_item->a_id; ?>">
                 <?php echo $author_item->a_name; ?>
               </option>
               <?php
-            } ?>
+}?>
           </select>
 
           <label>是否发布</label>
@@ -2501,24 +2507,28 @@
             <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
           </label>
           <div class="clearfix"></div>
+<<<<<<< HEAD
           <?php if (in_array($this->config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai','beijing'))) { ?>
+=======
+          <?php if (in_array($this->config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai'))) {?>
+>>>>>>> f657130093af1eb0b39ff40bd09352823b9de5dc
             <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
               <input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox"
                 onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新
             </label>
-          <?php } ?>
+          <?php }?>
 
-          <?php if (in_array($this->config->item('site_code'), array('cht', 'gm'))) { ?>
+          <?php if (in_array($this->config->item('site_code'), array('cht', 'gm'))) {?>
             <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
               <input type="checkbox" name="auto_update_amp" id="auto_update_amp" <?php if ($information->amp_status === '2') {
-                echo 'disabled';
-              } ?> value="true" />AMP更新
+    echo 'disabled';
+}?> value="true" />AMP更新
               <?php if ($information->amp_status === '2') {
-                echo '<i class="glyphicon glyphicon-hand-up" title="手动管理，不会自动更新"></i>';
-              } ?>
+    echo '<i class="glyphicon glyphicon-hand-up" title="手动管理，不会自动更新"></i>';
+}?>
             </label>
 
-          <?php } ?>
+          <?php }?>
 
           <div class="clearfix"></div>
 
@@ -2527,20 +2537,20 @@
             <a href="javascript:void(0);" class="btn btn-primary col-xs-19" onclick=" editor.updateElement();
 
                                    //保存增加AMP判断 - lmr
-                           <?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') { ?>
+                           <?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') {?>
                                    if (!$('#PcAmp input').is(':checked')) {
                                      var amp_confirm = window.confirm('\n检测到页面存在AMP版本，是否需要打开AMP编辑界面？\n\r注意：如果修改了PC端版本，那么同时也需要修改AMP版本。\n');
                                      if (amp_confirm) {
                                        window.open('<?php echo ($amp_build_url); ?>', '_blank');
                                      }
                                    }
-                           <?php } ?>
-                           <?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') === 'yes') { ?>
+                           <?php }?>
+                           <?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') === 'yes') {?>
                                    // if (editor.element.getText() == '') {
                                    //   editor.setData('From HTML-Generator');
                                    //   editor.updateElement();
                                    // }
-                           <?php } ?>
+                           <?php }?>
                                    if (information_check() != false) {
                                    submitForm('form_information_edit');
                                    }">保存修改</a>
@@ -2561,7 +2571,7 @@
               <li class="dropdown-submenu pull-left">
                 <a id="history_log_toggle" tabindex="-1" href="javascript:void(0);">历史记录</a>
                 <ul class="dropdown-menu history_log" style="right: 157px;left: inherit;top: 83px;">
-                  <?php foreach ($content_backup_list as $item) { ?>
+                  <?php foreach ($content_backup_list as $item) {?>
                     <li>
                       <a href="<?php echo site_url('information/backup_content/' . $item->log_id); ?>" target="_blank">
                         <?php echo $item->log_datetime ?>
@@ -2569,17 +2579,17 @@
                         <?php echo $item->log_ht_username ?>
                       </a>
                     </li>
-                  <?php } ?>
+                  <?php }?>
                 </ul>
               </li>
             </ul>
 
-            <?php if (!empty($has_html_file)) { ?>
+            <?php if (!empty($has_html_file)) {?>
               <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:30px;padding-left: 21px;">
                 <a href="<?php echo site_url('information/html_file_helper/delete?ic_url=') . $information->ic_url; ?>"
                   target="_blank">静态文件已生成，点击删除</a>
               </label>
-            <?php } ?>
+            <?php }?>
           </div>
 
           <div class="clearfix"></div>
@@ -2600,8 +2610,8 @@
   </div>
 </div>
 <textarea id="mobile_first_template" style="display: none;"><?php if (!empty($mobile_first_template)) {
-  echo htmlentities($mobile_first_template);
-} ?></textarea>
+    echo htmlentities($mobile_first_template);
+}?></textarea>
 
 <!-- Trippest bokun窗口 -->
 <div class="modal fade" id="NoPermissionModal">