zmm 6 years ago
parent
commit
0dd86a0909

+ 2 - 1
CZKJ.GBRS2.Web/appsettings.json

@@ -12,8 +12,9 @@
12 12
     "DefaultUserId": 1
13 13
   },
14 14
   "ConnectionStrings": {
15
-    "Development": "Data Source=sp5045a8d445fe0.mysql.rds.aliyuncs.com;user id=gbrs2_dba;password=CZKJczkj2016gbrs2;Initial Catalog=gbrs2"
15
+    //"Development": "Data Source=sp5045a8d445fe0.mysql.rds.aliyuncs.com;user id=gbrs2_dba;password=CZKJczkj2016gbrs2;Initial Catalog=gbrs2"
16 16
     // "Development": "Data Source=47.94.162.74;user id=root;password=CZKJ!czkj)113$659#;Initial Catalog=gbrs2"
17
+    "Development": "Data Source=10.237.55.203;user id=ow_dl;password=6hioO78*1$;Initial Catalog=ow"
17 18
   },
18 19
   "FileLogging": {
19 20
     "DefaultPath": "log",

+ 2 - 1
CZKJ.GBRS2.WebMVC/Controllers/HomeController.cs

@@ -32,6 +32,7 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
32 32
 
33 33
         public IActionResult Index()
34 34
         {
35
+
35 36
             return View();
36 37
         }
37 38
 
@@ -43,7 +44,7 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
43 44
             model.GalleryList = galleryList.Where(x => x.TypeId == 107).ToList();
44 45
             model.ProductList = galleryList.Where(x => x.TypeId == 128).ToList();
45 46
             model.FastIConList = galleryList.Where(x => x.TypeId == 109).ToList();
46
-            model.BackGalleryList = galleryList.Where(x => x.TypeId == 150).ToList();
47
+            //model.BackGalleryList = galleryList.Where(x => x.TypeId == 150).ToList();
47 48
             model.LeftServicegallery = galleryList.FirstOrDefault(x => x.TypeId == 108) ?? new GalleryEntity();
48 49
             var typeList = _typeLogic.GetEntities(x => x.ParentId == (int)DefaultDataEnum.NewsCenterParentId, x => x.SortOrder, ListSortDirection.Descending).Take(4).ToList();
49 50
             model.TypeList = typeList;

+ 14 - 4
CZKJ.GBRS2.WebMVC/Models/IndexModel.cs

@@ -16,7 +16,7 @@ namespace CZKJ.GBRS2.WebMVC.Models
16 16
         public IList<GalleryEntity> FastIConList { get; set; }
17 17
 
18 18
         /// <summary>
19
-        /// 个产品广告位
19
+        /// 个产品广告位
20 20
         /// </summary>
21 21
         public IList<GalleryEntity> ProductList { get; set; }
22 22
         /// <summary>
@@ -24,7 +24,7 @@ namespace CZKJ.GBRS2.WebMVC.Models
24 24
         /// </summary>
25 25
         public IList<GalleryEntity> ServiceList { get; set; }
26 26
         /// <summary>
27
-        /// 左侧服务广告位
27
+        /// 左侧服务广告位(捐竹子)
28 28
         /// </summary>
29 29
         public GalleryEntity LeftServicegallery { get; set; }
30 30
         /// <summary>
@@ -51,9 +51,19 @@ namespace CZKJ.GBRS2.WebMVC.Models
51 51
         /// Twitter
52 52
         /// </summary>
53 53
         public string Twitter { get; set; }
54
+
55
+        /// <summary>
56
+        /// 专题专栏
57
+        /// </summary>
58
+        public IList<ArticleEntity> ColumnList { get; set; }
59
+
60
+        /// <summary>
61
+        /// 底部Banner
62
+        /// </summary>
63
+        public GalleryEntity BottomBanner { get; set; }
54 64
         /// <summary>
55
-        /// 背景图
65
+        /// 背景图(底部)
56 66
         /// </summary>
57
-        public IList<GalleryEntity> BackGalleryList { get; set; }
67
+        public GalleryEntity BackGalleryList { get; set; }
58 68
     }
59 69
 }

+ 4 - 4
CZKJ.GBRS2.WebMVC/Views/Home/oldIndex.cshtml

@@ -194,12 +194,12 @@
194 194
     </div>
195 195
 </div>
196 196
 <!-- ad-1 -->
197
-<div class="ad-ent" style="background-image:@(Model.BackGalleryList.Count>0?Model.BackGalleryList[0].Image:"")">
197
+@*<div class="ad-ent" style="background-image:@(Model.BackGalleryList.Count>0?Model.BackGalleryList[0].Image:"")">
198 198
     <div class="txt">
199 199
         <h2 class="wow fadeInUp">为什么选择国宝</h2>
200 200
         @*<p class="wow fadeInUp">实力雄厚 · 行业领军 · 管理专业 · 服务贴心</p>*@
201 201
     </div>
202
-</div>
202
+</div>*@
203 203
 <!-- ad-num -->
204 204
 <div class="ad-num hidden-xs">
205 205
     <div class="container">
@@ -292,11 +292,11 @@
292 292
     </div>
293 293
 </div>
294 294
 <!-- map -->
295
-<div class="map-box" style="background-image:@(Model.BackGalleryList.Count>1?Model.BackGalleryList[1].Image:"")">
295
+@*<div class="map-box" style="background-image:@(Model.BackGalleryList.Count>1?Model.BackGalleryList[1].Image:"")">
296 296
     <div class="container">
297 297
         <h2 class="title wow fadeInUp">诚信 · 专业 · 忠厚 · 创新</h2>
298 298
     </div>
299
-</div>
299
+</div>*@
300 300
 
301 301
 
302 302
 

+ 2 - 2
CZKJ.GBRS2.WebMVC/appsettings.json

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