CZKJ.GBRS2.WebMVC/CZKJ.GBRS2.WebMVC.csproj

@@ -23,6 +23,12 @@
     <ProjectReference Include="..\CZKJ.GBRS2\CZKJ.GBRS2.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="Views\PriceAnnouncement\Detail.cshtml">
+      <Pack>$(IncludeRazorContentInPack)</Pack>
+    </Content>
+  </ItemGroup>
+
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JSONSchema="http://json.schemastore.org/chrome-manifest" /></VisualStudio></ProjectExtensions>
 
 </Project>

CZKJ.GBRS2.WebMVC/Controllers/PriceAnnouncementController.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using CZFW.Framework.Interface;
 using CZKJ.GBRS2.Interface;
 using CZKJ.GBRS2.WebMVC.Models;
@@ -14,11 +11,13 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
         private readonly IPriceAnnouncement _priceAnnouncementLgoic;
         private readonly IGallery _galleryLogic;
         private readonly IType _typeLogic;
-        public PriceAnnouncementController(IPriceAnnouncement priceAnnouncementLogic, IGallery galleryLogic, IType typeLogic)
+        private readonly IArticle _articleArticle;
+        public PriceAnnouncementController(IPriceAnnouncement priceAnnouncementLogic, IGallery galleryLogic, IType typeLogic, IArticle articleLogic)
         {
             _priceAnnouncementLgoic = priceAnnouncementLogic;
             _galleryLogic = galleryLogic;
             _typeLogic = typeLogic;
+            _articleArticle = articleLogic;
         }
         public IActionResult Index(int typeId, DateTime? startTime, DateTime? endTime, int pageIndex = 1, int pageSize = 20)
         {
@@ -35,6 +34,14 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
             model.RowsCount = rowsCount;
             model.MaxYear = _priceAnnouncementLgoic.GetMaxYear();
             model.MinYear = _priceAnnouncementLgoic.GetMinYear();
+            model.ArticleList = _articleArticle.GetEntities(x => x.TypeId == 176);
+            return View(model);
+        }
+        public IActionResult Detail(int id)
+        {
+            var model = new PriceAnnouncementIndexModel();
+            model.ArticleList = _articleArticle.GetEntities(x => x.TypeId == 176);
+            model.Detail = _articleArticle.GetEntity(id);
             return View(model);
         }
     }

CZKJ.GBRS2.WebMVC/Models/PriceAnnouncementIndexModel.cs

@@ -26,5 +26,8 @@ namespace CZKJ.GBRS2.WebMVC.Models
         public int PageIndex { get; set; }
         public int PageSize { get; set; }
         public int RowsCount { get; set; }
+
+        public IList<ArticleEntity> ArticleList { get; set; }
+        public ArticleEntity Detail { get; set; }
     }
 }

CZKJ.GBRS2.WebMVC/Views/PriceAnnouncement/Detail.cshtml

@@ -0,0 +1,128 @@
+@model PriceAnnouncementIndexModel
+@section style{
+    <link rel="stylesheet" href="@ConfigHelper.GetCDNPrefix()/assets/css/info.css">
+    <link href="@ConfigHelper.GetCDNPrefix()/assets/css/rate.css" rel="stylesheet" />
+    <style>
+        .filterInp .d-close {
+            position: absolute;
+            right: 25px;
+            top: 0;
+            z-index: 10;
+            padding: 0 5px;
+            color: #b0b0b0;
+        }
+
+            .filterInp .d-close.d-hide {
+                display: none;
+            }
+
+        @@media(max-width:768px) {
+            .mobilemargintop {
+                margin-top: 40px !important;
+            }
+        }
+    </style>
+}
+<div class="container info mobilemargintop" style="margin-top:120px;">
+    <div class="row">
+        <h2 class="title visible-xs-inline-block open-mask">
+            价格公告
+            <i></i>
+        </h2>
+        <div class="left">
+            <h2 class="title close-mask">
+                <em class="visible-xs-inline-block">
+                    <img src="/assets/image/arrow-color-left.png" alt="">
+                </em>价格公告
+            </h2>
+            <div class="ul-box">
+                <ul>
+                    @foreach (var item in Model.ArticleList)
+                    {
+                        <li class="@(item.Id == Model.Detail.Id?"cur":"")">
+                            <a href="@(Url.Action("Detail","PriceAnnouncement",new { id = item.Id}))">@item.Title</a>
+                        </li>
+                    }
+                    <li>
+                        <a href="@Url.Action("Index","PriceAnnouncement")">万能险结算利率公告</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div class="right">
+            <h2>@Model.Detail.Title</h2>
+            <!--dd  -->
+            <div class="info-detail">
+                <div class="con">
+                    @Html.Raw(Model.Detail.Detail)
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@section script{
+    <script>
+        window.dataMark = "0$15231983314041342$$15231983721956102$";
+        $(function () {
+            $(".open-mask").click(function () {
+                $(".left").addClass("showIn")
+            })
+            $(".close-mask").click(function () {
+                $(".left").removeClass("showIn")
+            })
+            $(".ul-box a").has("i").on("click", function () {
+                if ($(this).hasClass("cur")) {
+                    $(this).removeClass("cur").siblings("ul").slideUp().find("a").removeClass("cur")
+                        .siblings(
+                            "ul").slideUp();
+                } else {
+                    $(this).addClass("cur").siblings("ul").slideDown();
+                    $(this).closest("li").siblings("li").find("a").removeClass("cur").siblings("ul")
+                        .slideUp();
+                }
+            });
+            var data = {
+                "title": "根节点",
+                "children": [{
+                    "title": "基本信息",
+                    "children": [{
+                        "title": "基本信息二级",
+                        "children": [{
+                            "title": "基本信息三级"
+                        }]
+                    }, {
+                        "title": "基本信息二级"
+                    }]
+                }, {
+                    "title": "临时信息"
+                }, {
+                    "title": "其他信息",
+                    "children": [{
+                        "title": "其他信息二级"
+                    }]
+                }]
+            };
+            var res = "";
+
+            $(".ul-test").append(dataText(data));
+
+            function dataText(item) {
+                if (item.children && item.children.length > 0) {
+                    for (var i = 0; i < item.children.length; i++) {
+                        res += "<li><a>" + item.children[i].title + "</a>";
+                        if (item.children[i].children && item.children[i].children.length > 0) {
+                            res += "<i></i><ul>"
+                        }
+                        dataText(item.children[i]);
+                        if (item.children[i].children && item.children[i].children.length > 0) {
+                            res += "</ul>"
+                        }
+                        res += "</li>"
+                    }
+                }
+                return res;
+            }
+        })
+    </script>
+
+}

CZKJ.GBRS2.WebMVC/Views/PriceAnnouncement/Index.cshtml

@@ -30,9 +30,6 @@
         }
     </style>
 }
-@*<div class="banner">
-        <img src="@Model.Banner.Image" alt="">
-    </div>*@
 <div class="container info mobilemargintop" style="margin-top:120px;">
     <div class="row">
         <h2 class="title visible-xs-inline-block open-mask">
@@ -47,9 +44,12 @@
             </h2>
             <div class="ul-box">
                 <ul>
-                    <li>
-                        <a href="/Article/Detail/123">利率查询</a>
-                    </li>
+                    @foreach (var item in Model.ArticleList)
+                    {
+                        <li>
+                            <a href="@(Url.Action("Detail","PriceAnnouncement",new { id = item.Id}))">@item.Title</a>
+                        </li>
+                    }
                     <li class="cur">
                         <a href="javascript:void(0)">万能险结算利率公告</a>
                     </li>

CZKJ.GBRS2.WebMVC/appsettings.json

@@ -26,8 +26,8 @@
     "Website": "www.guobaojinrong.com"
   },
   "ConnectionStrings": {
-    //"Development": "Data Source=sp5045a8d445fe0.mysql.rds.aliyuncs.com;user id=gbrs2_dba;password=CZKJczkj2016gbrs2;Initial Catalog=gbrs2"
-    "Development": "Data Source=10.237.55.203;user id=ow_dl;password=6hioO78*1$;Initial Catalog=ow"
+    "Development": "Data Source=sp5045a8d445fe0.mysql.rds.aliyuncs.com;user id=gbrs2_dba;password=CZKJczkj2016gbrs2;Initial Catalog=gbrs2"
+    //"Development": "Data Source=10.237.55.203;user id=ow_dl;password=6hioO78*1$;Initial Catalog=ow"
   },
   //"CoreQuery": {
   //  "CustomerType": "0",