Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

templates/backstageNet/infoList/myPub.html

@@ -243,6 +243,7 @@
                         // , count: 30
                         , count: $('#totalPage').val()
                         , theme: '#2ca9f9'
+                        , curr:page
                         , layout: ['prev', 'page', 'next', 'skip']
                         , jump: function (obj, first) {
                             if (!first) {
@@ -323,7 +324,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('my_pub_list', $('.layui-laypage-curr em').eq(1).html(),$('.permission .active').data('type'),$('#selectType').val()) //url,page，信息类型
                         }
                     }
                 })
@@ -349,7 +351,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('my_pub_list', $('.layui-laypage-curr em').eq(1).html(),$('.permission .active').data('type'),$('#selectType').val()) //url,page，信息类型
                         }
                     }
                 })

templates/backstageNet/infoList/myPubList.html

@@ -1,46 +1,58 @@
-{% if art_list|length %} {% for msg in art_list %}
-<tr>
-    <td>{{ msg.title }}</td>
-    {% if msg.art_type == '5' %}
-        <td>新闻资讯</td>
-    {% elif msg.art_type == '6' %}
-        <td>视频资讯</td>
-    {% elif msg.art_type == '7' %}
-        <td>产品展厅</td>
-    {% elif msg.art_type == '8' %}
-        <td>四季采摘</td>
-    {% elif msg.art_type == '9' %}
-        <td>民宿导览</td>
-    {% elif msg.art_type == '10' %}
-        <td>旅游景点</td>
-    {% else %}
-        <td>{{msg.art_type}}</td>
-    {% endif %} 
-    <td>{{ msg.upl_time }}</td>
-    <td>
-        <a href="JavaScript:;" class="delBtn" onclick="delFun('{{msg.id}}')">删除</a>
-        |
-        <!-- <a href="JavaScript:;" class="lokBtn" onclick="lokFun('{{msg.id}}')">查看</a> -->
-    {% if msg.art_type == '5' %}
-        <a href="news_view?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
-    {% elif msg.art_type == '6' %}
-        <a href="video_detail?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
-    {% elif msg.art_type == '7' %}
-        <a href="equip_show_detail?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
-    {% elif msg.art_type == '8' %}
-        <a href="garden_intro?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
-    {% elif msg.art_type == '9' %}
-        <a href="dorm_detail?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
-    {% elif msg.art_type == '10' %}
-        <a href="tourist?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
-    {% else %}
-        <td> </td>
-    {% endif %} 
-    </td>
-</tr>
-{% endfor %} {% else %}
-<tr>
-    <td colspan="4" style="text-align:center;">暂无数据</td>
-</tr>
+{% if pub_list|length %} 
+    {% for msg in pub_list %}
+        <tr>
+            {% if type == '5' %}
+                <td>{{ msg.title }}</td>
+                <td>新闻资讯</td>
+                <td>{{ msg.upl_time }}</td>
+            {% elif type == '6' %}
+                <td>{{ msg.title }}</td>
+                <td>视频资讯</td>
+                <td>{{ msg.publish_date }}</td>
+            {% elif type == '7' %}
+                <td>{{ msg.title }}</td>
+                <td>产品展厅</td>
+                <td>{{ msg.publish_date }}</td>
+            {% elif type == '8' %}
+                <td>{{ msg.name }}</td>
+                <td>四季采摘</td>
+                <td>{{ msg.pub_time }}</td>
+            {% elif type == '9' %}
+                <td>{{ msg.name }}</td>
+                <td>民宿导览</td>
+                <td>{{ msg.upl_time }}</td>
+            {% elif type == '10' %}
+                <td>{{ msg.name }}</td>
+                <td>旅游景点</td>
+                <td>{{ msg.upl_time }}</td>
+            {% else %}
+                <td>空</td>
+                <td>空</td>
+                <td>空</td>
+            {% endif %} 
+            <td>
+                <a href="JavaScript:;" class="delBtn" onclick="delFun('{{msg.id}}')">删除</a>
+                |
+            {% if type == '5' %}
+                <a href="news_view?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
+            {% elif type == '6' %}
+                <a href="video_detail?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
+            {% elif type == '7' %}
+                <a href="equip_show_detail?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
+            {% elif type == '8' %}
+                <a href="garden_intro?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
+            {% elif type == '9' %}
+                <a href="dorm_detail?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
+            {% elif type == '10' %}
+                <a href="tourist?id={{msg.id}}" target="_blank" class="lokBtn">查看</a>
+            {% else %}
+            {% endif %} 
+            </td>
+        </tr>
+    {% endfor %} 
+{% else %}
+    <tr>
+        <td colspan="4" style="text-align:center;">暂无数据</td>
+    </tr>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">