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

57bc5cf9 · 吴春 · 469a3338 · b1034d27 · 57bc5cf9 · 57bc5cf9
Commit 57bc5cf9 authored Feb 26, 2019 by 吴春
9 changed files
--- a/EheMall.Business/EheMall.Business.csproj
+++ b/EheMall.Business/EheMall.Business.csproj
@@ -39,10 +39,13 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="aliyun-net-sdk-core">
-      <HintPath>..\packages\aliyun-net-sdk-core.dll</HintPath>
+      <HintPath>C:\Users\Administrator\Desktop\新建文件夹 (4)\aliyun-net-sdk-core.dll</HintPath>
    </Reference>
    <Reference Include="aliyun-net-sdk-dysmsapi">
-      <HintPath>..\packages\aliyun-net-sdk-dysmsapi.dll</HintPath>
+      <HintPath>C:\Users\Administrator\Desktop\新建文件夹 (4)\aliyun-net-sdk-dysmsapi.dll</HintPath>
+    </Reference>
+    <Reference Include="Aliyun.Net.SDK.Core">
+      <HintPath>C:\Users\Administrator\Desktop\新建文件夹 (4)\Aliyun.Net.SDK.Core.dll</HintPath>
    </Reference>
    <Reference Include="Aliyun.OSS, Version=2.9.0.0, Culture=neutral, PublicKeyToken=0ad4175f0dac0b9b, processorArchitecture=MSIL">
      <HintPath>..\packages\Aliyun.OSS.SDK.2.9.0\lib\Aliyun.OSS.dll</HintPath>

--- a/EheMall.Web/Areas/Mobile/Content/Home/index.html
+++ b/EheMall.Web/Areas/Mobile/Content/Home/index.html
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="zh-CN">
 <head>
    <meta charset="utf-8">
@@ -300,7 +300,7 @@
            <div class="mr_frUl">
                <ul id="mr_fu">
                    <li><a href="28.html">
-                        <img src="../upload/201808240944127555.jpg" alt=""/>
+                        <img src="../images/201808240944127555.jpg" alt=""/>

                        <div class="mr_zhe text-center">
                            <div class="mr_zhe_i">
@@ -318,7 +318,7 @@
                    </a>
                    </li>
                    <li><a href="28.html">
-                        <img src="../upload/201808240944127555.jpg" alt=""/>
+                        <img src="../images/201808240944127555.jpg" alt=""/>

                        <div class="mr_zhe text-center">
                            <div class="mr_zhe_i">
@@ -336,7 +336,7 @@
                    </a>
                    </li>
                    <li><a href="28.html">
-                        <img src="../upload/201808240944127555.jpg" alt=""/>
+                        <img src="../images/201808240944127555.jpg" alt=""/>

                        <div class="mr_zhe text-center">
                            <div class="mr_zhe_i">
@@ -354,7 +354,7 @@
                    </a>
                    </li>
                    <li><a href="28.html">
-                        <img src="../upload/201808240944127555.jpg" alt=""/>
+                        <img src="../images/201808240944127555.jpg" alt=""/>

                        <div class="mr_zhe text-center">
                            <div class="mr_zhe_i">
@@ -372,7 +372,7 @@
                    </a>
                    </li>
                    <li><a href="28.html">
-                        <img src="../upload/201808240944127555.jpg" alt=""/>
+                        <img src="../images/201808240944127555.jpg" alt=""/>

                        <div class="mr_zhe text-center">
                            <div class="mr_zhe_i">
@@ -408,12 +408,10 @@
        </p>
    </div>
    <div class="swiper-wrapper pt40 ">
-        <div class="swiper-slide"> <img src="../upload/201808240944127555.jpg" alt="" /></div>
-        <div class="swiper-slide"> <img src="../upload/201808240944127555.jpg" alt="" /></div>
-        <div class="swiper-slide"> <img src="../upload/201808240944127555.jpg" alt="" /></div>
-        <div class="swiper-slide"> <img src="../upload/201808240944127555.jpg" alt="" /></div>
-        <div class="swiper-slide"> <img src="../upload/201808240944127555.jpg" alt="" /></div>
-
+        <div class="swiper-slide"> <img src="../images/201814180809.jpg" alt="" /></div>
+        <div class="swiper-slide"> <img src="../images/201814180809.jpg" alt="" /></div>
+        <div class="swiper-slide"> <img src="../images/201814180809.jpg" alt="" /></div>
+        <div class="swiper-slide"> <img src="../images/201814180809.jpg" alt="" /></div>
    </div>
    <!-- Add Pagination -->
    <div class="swiper-pagination"></div>
@@ -663,7 +661,6 @@
 </footer>


-<!--<script src="js/jquery.min.js"></script>-->
 <script src="../js/bootstrap.min.js"></script>
 <script src="../js/swiper.min.js"></script>
 <script>

--- a/EheMall.Web/Areas/Mobile/Content/css/index.css
+++ b/EheMall.Web/Areas/Mobile/Content/css/index.css
@@ -743,6 +743,7 @@ header .nav-a:hover {
    display: inline;
    float: left;
    width: 400px;
+    min-height:550px;
    overflow: hidden;
    position: relative;
    margin-right: 50px;
@@ -1102,6 +1103,8 @@ header .nav-a:hover {
    right: 0;
    top: 0;
    width: 55px;
+    height:55px;
+    z-index:999;
    cursor: pointer;
 }


--- a/EheMall.Web/Areas/Mobile/Content/images/201808240944127555.jpg
+++ b/EheMall.Web/Areas/Mobile/Content/images/201808240944127555.jpg
--- a/EheMall.Web/Areas/Mobile/Content/images/kuang.png
+++ b/EheMall.Web/Areas/Mobile/Content/images/kuang.png
--- a/EheMall.Web/Areas/Mobile/Content/images/kuang_hover.png
+++ b/EheMall.Web/Areas/Mobile/Content/images/kuang_hover.png
--- a/EheMall.Web/Areas/TicketMall/Content/TicketMall/Home.html
+++ b/EheMall.Web/Areas/TicketMall/Content/TicketMall/Home.html
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
    <meta charset="utf-8"/>
@@ -10,7 +10,6 @@
    <meta name="description" content="芙蓉国粹—抢票系统"/>
    <link href="../css/public.css" rel="stylesheet"/>
    <link href="../css/main.css" rel="stylesheet"/>
-
 </head>
 <body>


--- a/EheMall.Web/Areas/TicketMall/Views/Home/Index.cshtml
+++ b/EheMall.Web/Areas/TicketMall/Views/Home/Index.cshtml
@@ -88,7 +88,7 @@
            <div>
                <span style="margin-left:20px;font-size:14px;color:#898989;"> 上映时间： </span>
                <input type="text" readonly id="StartTime" value="@System.DateTime.Now.ToString("yyyy-MM-dd")" style="text-align: center; width: 120px; border: 1px solid #e6e6e6; height: 25px;" />
-                <span id="submitKey" style="cursor:pointer;margin-left:10px;font-size:14px;color:#898989;">  <a href="javascript:void(0)" onclick="GetTimeData()">查询</a></span>
+                <span id="submitKey" style="cursor:pointer;margin-left:10px;font-size:14px;color:#898989;">  <a href="javascript:void(0)" style="width:60px;height:26px;line-height:26px;background-color:#8C1324;color:#fff;display:inline-block;text-align:center;" onclick="GetTimeData()">查询</a></span>
            </div>
            @*<p>
                    上映时间：

--- a/EheMall.Web/EheMall.Web.csproj
+++ b/EheMall.Web/EheMall.Web.csproj
@@ -218,6 +218,7 @@
    <Content Include="Areas\Mobile\Content\Home\index.html" />
    <Content Include="Areas\Mobile\Content\Home\JmJs.html" />
    <Content Include="Areas\Mobile\Content\Home\NewList.html" />
+    <Content Include="Areas\Mobile\Content\images\201808240944127555.jpg" />
    <Content Include="Areas\Mobile\Content\images\201811390809.jpg" />
    <Content Include="Areas\Mobile\Content\images\201814180809.jpg" />
    <Content Include="Areas\Mobile\Content\images\about_tit.png" />
@@ -230,6 +231,7 @@
    <Content Include="Areas\Mobile\Content\images\icon_player.png" />
    <Content Include="Areas\Mobile\Content\images\icon_white.png" />
    <Content Include="Areas\Mobile\Content\images\img1.jpg" />
+    <Content Include="Areas\Mobile\Content\images\kuang_hover.png" />
    <Content Include="Areas\Mobile\Content\images\lace.png" />
    <Content Include="Areas\Mobile\Content\images\lace_hover.png" />
    <Content Include="Areas\Mobile\Content\images\logo.png" />
@@ -239,7 +241,6 @@
    <Content Include="Areas\Mobile\Content\images\news_bg.jpg" />
    <Content Include="Areas\Mobile\Content\images\next.png" />
    <Content Include="Areas\Mobile\Content\images\people.png" />
-    <Content Include="Areas\Mobile\Content\images\people1.png" />
    <Content Include="Areas\Mobile\Content\images\prev.png" />
    <Content Include="Areas\Mobile\Content\images\videox.png" />
    <Content Include="Areas\Mobile\Content\js\bootstrap.min.js" />
@@ -345,7 +346,6 @@
    <Content Include="Areas\TicketMall\Content\login.html" />
    <Content Include="Areas\TicketMall\Content\Sp_img\choose.png" />
    <Content Include="Areas\TicketMall\Content\Sp_img\choosed.png" />
-    <Content Include="Areas\TicketMall\Content\Sp_img\images-moren.png" />
    <Content Include="Areas\TicketMall\Content\Sp_img\no.png" />
    <Content Include="Areas\TicketMall\Content\Sp_img\201811060903.jpg" />
    <Content Include="Areas\TicketMall\Content\Sp_img\201815060905.jpg" />