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

application/views/bootstrap3/footer.php

@@ -43,7 +43,7 @@
                 <h3 style="margin:0;">静态化更新</h3>
             </div>
             <div class="modal-body">
-                <label class="text-info">信息保存成功。</label>
+                <!--label class="text-info">信息保存成功。</label-->
                 <div id="icht_async_msg_waiting">
                     <p class="text-danger">正在更新静态页面，请稍等8~12秒。</p>
                     <img src="http://img10.cache.hxsd.com/news/2015/11/12/691442_1447295058_5.gif" width="100%">

application/views/bootstrap3/refresh_amp_urls.php

@@ -11,6 +11,13 @@
             dataType: "json",
             url: "<?php echo site_url('amp/auto_create/') ?>/" + ic_id,
             success: function (result, textStatus) {
+				//当result为空的时候跳过
+				if(result.length == 0 || result =='' || undefined || null){
+					$(msg_obj).html("<a href='javascript:void(0);' onclick='create_amp_data(" + index + ");' >发生错误，请重试</a>");
+					create_amp_data(++index);
+					return;
+				}
+				
                 $.each(result, function (i, field) {
                     if (i === 'data') {
                         amp_code = field.amp;