外网首页数据对接

apps/Home/views.py

@@ -145,7 +145,7 @@ class Home(View):
         two_news = CKArticle.objects.filter(art_type=2)[0:10]
         video_news = Video_data.objects.all()[0:4]
         product = Product.objects.all()[0:8]
-        pick = Pick_Pub.objects.all()[0:8]
+        pick = Pick_Pub.objects.all()[0:6]
         farm = FarmList.objects.all()
         garden = GardenArea.objects.all()
         hotel = Hotel_Info.objects.all()[0:5]
@@ -173,7 +173,7 @@ class Home2(View):
         two_news = CKArticle.objects.filter(art_type=2)[0:10]
         video_news = Video_data.objects.all()[0:4]
         product = Product.objects.all()[0:8]
-        pick = Pick_Pub.objects.all()[0:8]
+        pick = Pick_Pub.objects.all()[0:6]
         garden = GardenArea.objects.all()
         hotel = Hotel_Info.objects.all()[0:5]
         article = CKArticle.objects.all()[0:12]

templates/outerNet/index2.html

@@ -282,70 +282,16 @@
                                 <div class="pickTitle">推荐</div>
                                 <div>
                                     <ul class="productList">
+                                        {% for pickItem in pick %}
                                         <li class="productItem">
                                             <div>
-                                                <a href="garden_intro" target="_blank">
-                                                    <img src="http://www.zhopera.com/uploadfile/2020/0629/thumb_264_150_20200629110152202.jpg" alt="">
+                                                <a href="garden_intro?id={{pickItem.id}}" target="_blank">
+                                                    <img src="{{pickItem.pick_img}}" alt="">
                                                 </a>
                                             </div>
-                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
-                                        </li>
-                                        <li class="productItem">
-                                            <div>
-                                                <a href="garden_intro" target="_blank">
-                                                    <img src="http://www.nzlyw.com/file/upload/202004/30/101216952031.png" alt="">
-                                                </a>
-                                            </div>
-                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
-                                        </li>
-                                        <li class="productItem">
-                                            <div>
-                                                <a href="garden_intro" target="_blank">
-                                                    <img src="http://www.nzlyw.com/file/upload/201912/11/102405641521.jpg" alt="">
-                                                </a>
-                                            </div>
-                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
-                                        </li>
-                                        <li class="productItem">
-                                            <div>
-                                                <a href="garden_intro" target="_blank">
-                                                    <img src="http://www.nzlyw.com/file/upload/201911/29/141509191527.jpg" alt="">
-                                                </a>
-                                            </div>
-                                            <p><a href="garden_intro" target="_blank">甘蔗</a></p>
-                                        </li>
-                                        <li class="productItem">
-                                            <div>
-                                                <a href="">
-                                                    <img src="http://www.zhopera.com/uploadfile/2020/0629/thumb_264_150_20200629110152202.jpg" alt="">
-                                                </a>
-                                            </div>
-                                            <p><a href="">甘蔗</a></p>
-                                        </li>
-                                        <li class="productItem">
-                                            <div>
-                                                <a href="">
-                                                    <img src="http://www.zhopera.com/uploadfile/2020/0629/thumb_264_150_20200629110152202.jpg" alt="">
-                                                </a>
-                                            </div>
-                                            <p><a href="">甘蔗</a></p>
-                                        </li>
-                                        <li class="productItem">
-                                            <div>
-                                                <a href="">
-                                                    <img src="http://www.zhopera.com/uploadfile/2020/0629/thumb_264_150_20200629110152202.jpg" alt="">
-                                                </a>
-                                            </div>
-                                            <p><a href="">甘蔗</a></p>
-                                        </li>
-                                        <li class="productItem">
-                                            <div>
-                                                <a href="">
-                                                    <img src="http://www.zhopera.com/uploadfile/2020/0629/thumb_264_150_20200629110152202.jpg" alt="">
-                                                </a>
-                                            </div>
-                                            <p><a href="">甘蔗</a></p>
+                                            <p><a href="garden_intro" target="_blank">{{pickItem.name}}</a></p>
                                         </li>
+                                        {% endfor %}
                                         <li style="clear:both"></li>
                                     </ul>
                                 </div>
@@ -353,39 +299,12 @@
                             <div class="supply">
                                 <div class="pickTitle">排行榜</div>
                                 <ul >
+                                    {% for farmItem in farm %}
                                     <li>
-                                        <span class="sort-number sort-number-top">1</span>
-                                        <a href="person_farm?name=admin" target="_blank">农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一农场一</a>
+                                        <span class="sort-number sort-number-top">{{forloop.counter}}</span>
+                                        <a href="person_farm?name=admin" target="_blank">{{farmItem.name}}</a>
                                     </li>
-                                    <li>
-                                        <span class="sort-number sort-number-top">2</span>
-                                        <a href="person_farm?name=admin" target="_blank">农场二</a>
-                                    </li>
-                                    <li>
-                                        <span class="sort-number sort-number-top">3</span>
-                                        <a href="person_farm?name=admin" target="_blank">农场三</a>
-                                    </li>
-                                    <li>
-                                        <span class="sort-number">4</span>
-                                        <a href="person_farm?name=admin" target="_blank">农场四</a>
-                                    </li>
-                                    <li>
-                                        <span class="sort-number">5</span>
-                                        <a href="person_farm?name=admin" target="_blank">农场五</a>
-                                    </li>
-                                    <li>
-                                        <span class="sort-number">6</span>
-                                        <a href="person_farm?name=admin" target="_blank">农场五</a>
-                                    </li>
-                                    <li>
-                                        <span class="sort-number">7</span>
-                                        <a href="">农场五</a>
-                                    </li>
-                                    <li>
-                                        <span class="sort-number">8</span>
-                                        <a href="">农场五</a>
-                                    </li>
-
+                                    {% endfor %}
                                 </ul>
                             </div>
                         </div>

templates/outerNet/login2.html

@@ -140,32 +140,35 @@
                     <button>搜索</button>
                 </div>
             </div>
-            <!-- <div class="not_loginCover">
+            {% if not curr_user.username %}
+            <div class="not_loginCover">
                 <a href="login2" target="_blank">登录</a>
-                <a href="" target="_blank">注册</a>
-            </div> -->
+                <a href="register" target="_blank">注册</a>
+            </div>
+            {% else %}
             <div class="yet_loginCover">
-               <div class="person">
-                   <div class="userHeadImg">
-                       <img src="http://www.xbxxnyggw.cn/file/upload/201901/22/230441831.jpg" alt="">
-                   </div>
-                   <div class="userCtrl">
-                       <div class="userCtrlTop">
-                           <div class="userInfo">
-                               <div>
-                                   <span>admin</span>
-                               </div>
-                           </div>
-                       </div>
-                       <div class="userCtrlBtm"><a href="back_manage" target="_blank">进入后台管理</a></div>
+                <div class="person">
+                    <div class="userHeadImg">
+                        <img src="{{curr_user.user_picture}}" alt="">
                     </div>
-                    <div class="exit">
-                        <a href="">
-                            <i class="fa fa-power-off" aria-hidden="true"></i>
-                        </a>
-                    </div>
-               </div>
-            </div>
+                    <div class="userCtrl">
+                        <div class="userCtrlTop">
+                            <div class="userInfo">
+                                <div>
+                                    <span>{{curr_user.username}}</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="userCtrlBtm"><a href="back_manage" target="_blank">进入后台管理</a></div>
+                     </div>
+                     <div class="exit">
+                         <a href="logout">
+                             <i class="fa fa-power-off" aria-hidden="true"></i>
+                         </a>
+                     </div>
+                </div>
+             </div>
+            {% endif %}
         </div>
         <!-- 登录内容 -->
     </div>