Merge branch 'master' of http://gitlab.oytour.com/chun/theater

EheMall.Web/Areas/Admin/Views/Screening/ScreeningSeat.cshtml

@@ -35,6 +35,7 @@
             border: 1px solid #d1d1d1;
             cursor: default;
             position: relative;
+            background: url(/Areas/TicketMall/Content/Sp_img/seat.png) no-repeat;
         }
 
             .seats-block .seat.selected {

EheMall.Web/Areas/Admin/Views/TheaterManage/TheaterSeat.cshtml

@@ -28,27 +28,25 @@
         }
 
         .seats-block .seat {
+            display: inline-block;
+            font-size: 12px;
+            width: 30px;
+            height: 27px;
+            margin: 0 5px;
+            /*border: 1px solid #d1d1d1;*/
+            background: url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
+        }
+
+        .seats-block .seat.selected {
             display: inline-block;
             font-size: 12px;
             width: 20px;
             height: 20px;
             margin: 0 5px;
             border: 1px solid #d1d1d1;
-            /*
-                        background: url(images/seat.png) 0 1px no-repeat;
-            */
+            background: url(/Scripts/Seat/images/selected.png) 0 1px no-repeat;
         }
 
-            .seats-block .seat.selected {
-                display: inline-block;
-                font-size: 12px;
-                width: 20px;
-                height: 20px;
-                margin: 0 5px;
-                border: 1px solid #d1d1d1;
-                background: url(/Scripts/Seat/images/selected.png) 0 1px no-repeat;
-            }
-
         .seats-block .row-id-container {
             width: 60px;
             float: left;
@@ -62,8 +60,8 @@
 
         .row_input {
             width: 40px;
-            height: 20px;
-            margin-bottom: 5px;
+            height: 27px;
+            margin-bottom: 6px;
         }
 
         .seats-block .row {
@@ -123,50 +121,50 @@
         }
         /*甲区样式*/
         .oneArea {
-            background-color: pink;
+            background-color: pink!important;
             display: inline-block;
             font-size: 12px;
-            width: 20px;
-            height: 20px;
+            width: 30px;
+            height: 27px;
             margin: 0 5px;
-            border: 1px solid #d1d1d1;
+            background: url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
         }
         /*乙区样式*/
         .twoArea {
-            background-color: #9cf;
+            background-color: #9cf!important;
             display: inline-block;
             font-size: 12px;
-            width: 20px;
-            height: 20px;
+            width: 30px;
+            height: 27px;
             margin: 0 5px;
-            border: 1px solid #d1d1d1;
+            background: url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
         }
         /*丙区样式*/
         .threeArea {
-            background-color: yellow;
+            background-color: yellow!important;
             display: inline-block;
             font-size: 12px;
-            width: 20px;
-            height: 20px;
+            width: 30px;
+            height: 27px;
             margin: 0 5px;
-            border: 1px solid #d1d1d1;
+            background: url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
         }
         /*特区样式*/
         .specialArea {
-            background-color: orangered;
+            background-color: orangered!important;
             display: inline-block;
             font-size: 12px;
-            width: 20px;
-            height: 20px;
+            width: 30px;
+            height: 27px;
             margin: 0 5px;
-            border: 1px solid #d1d1d1;
+            background: url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
         }
         /*过道样式*/
         .noSeat {
             display: inline-block;
             font-size: 12px;
-            width: 20px;
-            height: 20px;
+            width: 30px;
+            height: 27px;
             margin: 0 5px;
             border: 1px solid #ccc;
             visibility: hidden;
@@ -202,7 +200,7 @@
         }
 
         .SelectType {
-            height: 19px;
+            height: 27px;
             padding: 0 4px;
             margin-bottom: 6px;
         }

EheMall.Web/Areas/Mobile/Content/css/index.css

@@ -1289,7 +1289,7 @@ header .nav-a:hover {
 }
 
 .st-bg .news .news-box:hover .nleft .time {
-    background: url(../images/time_hover.png) no-repeat;
+    background: url(../images/more.png) no-repeat;
     cursor: pointer;
 }
 
@@ -1428,7 +1428,7 @@ header .nav-a:hover {
 .content .news-box .nleft .time {
     width: 105px;
     height: 105px;
-    background: url(../images/time_hover.png) no-repeat;
+    background: url(../images/more.png) no-repeat;
     left: 50%;
     top: -50px;
     margin-left: -53px;
@@ -1538,7 +1538,7 @@ header .nav-a:hover {
 }
 
 .prevnext p.next {
-    background: url(../images/fitting_btn2.png) no-repeat center left;
+    background: url(../images/fitting_btn1.png) no-repeat center left;
 }
 
 .prevnext p.back {

EheMall.Web/Areas/Mobile/Views/Home/Details.cshtml

@@ -70,7 +70,7 @@
 
     <div class="toolbar visible-md visible-sm visible-xs clearfix ">
         <div class="logo"><img src="/Areas/Mobile/Content/images/logo_sj.png"> </div>
-        <div id="open-sb" class="menu-left"><img src="../images/menu.png"> </div>
+        <div id="open-sb" class="menu-left"><img src="/Areas/Mobile/Content/images/menu.png"> </div>
     </div>
 
     <section class="sidebar">
@@ -148,12 +148,12 @@
 
     </div>
 
-    <div class="nycont visible-md visible-sm visible-xs ">
+    <div class="nycont visible-md visible-sm visible-xs " style="width:94%;margin:auto;">
         <p class="text">
 
             @if (nowModel.ID != Guid.Empty)
             {
-                <h2> @nowModel.sTitle</h2>
+                <h2 style="text-align:center;color:#844b20"> @nowModel.sTitle</h2>
             }
             else
             {
@@ -163,7 +163,7 @@
             }
             @if (nowModel.ID != Guid.Empty)
             {
-            <p>
+            <p style="width:94%;margin:auto;">
                 @Html.Raw(HttpContext.Current.Server.UrlDecode(nowModel.sContent))
             </p>
         }

EheMall.Web/Areas/Mobile/Views/Home/NewsList.cshtml

@@ -34,9 +34,9 @@
 
     <!-- Demo styles -->
     <style type="text/css">
-        html, body {
+        /*html, body {
             height: 100%;
-        }
+        }*/
     </style>
 </head>
 
@@ -72,8 +72,8 @@
 
 
     <div class="toolbar visible-sm visible-xs clearfix ">
-        <div class="logo"><img src="/images/logo_sj.png"> </div>
-        <div id="open-sb" class="menu-left"><img src="/images/menu.png"> </div>
+        <div class="logo"><img src="/Areas/Mobile/Content/images/logo_sj.png"/> </div>
+        <div id="open-sb" class="menu-left"><img src="/Areas/Mobile/Content/images/menu.png"/> </div>
     </div>
 
     <section class="sidebar">
@@ -93,7 +93,7 @@
         </a>
 
     </div>
-    <div class="st-bg newslist min650 hidden-sm hidden-xs">
+    <div class="st-bg newslist hidden-sm hidden-xs" style="height:100%;">
         <div class="left por">
             <div class="news noselect" id="nscrollBox">
                 <div class="con" id="nscrollObj">

EheMall.Web/Areas/Mobile/Views/Home/NewsProgramsList.cshtml

@@ -71,8 +71,8 @@
 
 
     <div class="toolbar visible-sm visible-xs clearfix ">
-        <div class="logo"><img src="/images/logo_sj.png"> </div>
-        <div id="open-sb" class="menu-left"><img src="/images/menu.png"> </div>
+        <div class="logo"><img src="/Areas/Mobile/Content/images/logo_sj.png"> </div>
+        <div id="open-sb" class="menu-left"><img src="/Areas/Mobile/Content/images/menu.png"> </div>
     </div>
 
     <section class="sidebar">
@@ -92,7 +92,7 @@
         </a>
 
     </div>
-    <div class="st-bg newslist min650 hidden-sm hidden-xs">
+    <div class="st-bg newslist hidden-sm hidden-xs" style="height:100%;">
         <div class="left por">
             <div class="news noselect" id="nscrollBox">
                 <div class="con" id="nscrollObj">

EheMall.Web/Areas/Mobile/Views/Home/ProgramsDetails.cshtml

@@ -70,8 +70,8 @@
 
 
     <div class="toolbar visible-md visible-sm visible-xs clearfix ">
-        <div class="logo"><img src="../images/logo_sj.png"> </div>
-        <div id="open-sb" class="menu-left"><img src="../images/menu.png"> </div>
+        <div class="logo"><img src="/Areas/Mobile/Content/images/logo_sj.png"> </div>
+        <div id="open-sb" class="menu-left"><img src="/Areas/Mobile/Content/images/menu.png"> </div>
     </div>
 
     <section class="sidebar">