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

EheMall.Business/EheMall.Business.csproj

@@ -39,13 +39,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="aliyun-net-sdk-core">
-      <HintPath>C:\Users\Administrator\Desktop\新建文件夹 (4)\aliyun-net-sdk-core.dll</HintPath>
+      <HintPath>..\packages\aliyun-net-sdk-core.dll</HintPath>
     </Reference>
     <Reference Include="aliyun-net-sdk-dysmsapi">
-      <HintPath>C:\Users\Administrator\Desktop\新建文件夹 (4)\aliyun-net-sdk-dysmsapi.dll</HintPath>
+      <HintPath>..\packages\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>
+      <HintPath>..\packages\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>

EheMall.Business/Handlers/PhoneMsgHandler.cs

@@ -206,7 +206,7 @@ namespace EheMall.Business.Handlers
                   
                     try
                     {
-                       // Business.Services.SMSService.SendCode(eventData.sPhone, sCode, TypeStr);
+                        Business.Services.SMSService.SendCode(eventData.sPhone, eventData.sCode, TypeStr);
                         var entity = eventData.Map<EHECD_PhoneMsg>();
                         //entity.sCode = sCode;
                         entity.dAddTime = DateTime.Now;

EheMall.Web/Areas/Admin/Views/Home/Index.cshtml

@@ -4,6 +4,9 @@
 }
 
 <div style="text-align: center; height:300px; line-height:300px;margin-top:15%;">
+    <a href="/TicketMall/SaleTheater/ExchangeTicket" target="_blank">
+        <img alt="" src="~/Areas/Mobile/Content/images/qupiao.png" style="display: inline-block; vertical-align: middle;" />
+    </a>
     <a href="/TicketMall/SaleTheater/Index" target="_blank">
         <img alt="" src="~/Areas/Mobile/Content/images/people1.png" style="display: inline-block; vertical-align: middle;" />
     </a>

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

@@ -122,8 +122,8 @@
     <div id=banner class="banner hidden-md hidden-sm hidden-xs">
 
         <img alt="" src="/Areas/Mobile/Content/images/img1.jpg" />
-        <img alt="" src="/Areas/Mobile/Content/images/201811390809.jpg" />
-        <img alt="" src="/Areas/Mobile/Content/images/201814180809.jpg" />
+        <img alt="" src="/Areas/Mobile/Content/images/img1.jpg" />
+        <img alt="" src="/Areas/Mobile/Content/images/img1.jpg" />
 
         <div id="bannerNav" class="bannerNav">
 

EheMall.Web/Areas/TicketMall/Controllers/HomeController.cs

@@ -260,7 +260,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
             inputs["iPageIndex"] = (PageIndex + 1).ToString();
             inputs["iPageSize"] = iPageSize.ToString();
             inputs["iBuyID"] = CurrentClient.ID.ToString();
-            inputs["sOrderBy"] = "ScreeningDate desc";
+            inputs["sOrderBy"] = "CreateDate desc";
             inputs["OrderState"] = OrderState;
             long icount = 0;
             IEnumerable<TheaterOrder> list = _TheaterOrderServices.GetMemberOrderList(inputs, out icount);

EheMall.Web/Areas/TicketMall/Views/SaleTheater/ExchangeTicket.cshtml

@@ -96,11 +96,19 @@
     <div class="w100 clearfix" style="width:100%;border-top:1px solid #EEEEEE;">
         <div class="w1240">
             <div class="CollectTitle">当前可取票</div>
+            <div class="releasbox mb10">
+
+                <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;"> 查询</span>
+                </div>
+            </div>
             <table class="collTable">
                 <tr>
                     @*<th width="60">
-                            <input id="selectAll" type="checkbox" />
-                        </th>*@
+                    <input id="selectAll" type="checkbox" />
+                </th>*@
                     <th width="580">名称</th>
                     <th>时长</th>
                     <th>剧场</th>
@@ -109,23 +117,6 @@
                 </tr>
 
                 <tbody id="hotcont"></tbody>
-                @*<div class="hotcont w1240" id="hotcont">
-                </div>*@
-
-
-
-                @*<tr>
-                        <td>
-                            <input type="checkbox" class="SelectSingle" />
-                        </td>
-                        <td>长安大戏院2月17日 李林晓京剧专场演出——京剧《战马超》《春闺梦》</td>
-                        <td>30分钟</td>
-                        <td>3号厅</td>
-                        <td>1月11日 15:30</td>
-                        <td>
-                            <input type="button" class="collTicket" value="取票" />
-                        </td>
-                    </tr>*@
             </table>
             <div class="pagination" id="Pagination">
 
@@ -211,7 +202,7 @@
                 type: "post",
                 url: '@Url.Action("GetTotalCount")',
                 async: false,
-                    data: { "StartTime": '@System.DateTime.Now.ToString("yyyy-MM-dd")', "EndTime": '@System.DateTime.Now.ToString("yyyy-MM-dd")', "Name": ""},
+                data: { "StartTime": $("#StartTime").val(), "EndTime": $("#StartTime").val(), "Name": ""},
                 dataType: "json",
                  success: function (data) {
                      total = data.TotalCount;
@@ -237,7 +228,7 @@
                 type: "post",
                 url: '@Url.Action("ExchangeTicketBind")',
                 async: false,
-                data: { "StartTime": '@System.DateTime.Now.ToString("yyyy-MM-dd")', "EndTime": '@System.DateTime.Now.ToString("yyyy-MM-dd")', "Name": "", "PageIndex": pageIndex, "iPageSize": pageSize},
+                data: { "StartTime": $("#StartTime").val(), "EndTime": $("#StartTime").val(), "Name": "", "PageIndex": pageIndex, "iPageSize": pageSize},
                 dataType: "html",
                 success: function (data) {
                     $("#hotcont").html(data ? data : "");

EheMall.Web/EheMall.Web.csproj

@@ -222,7 +222,12 @@
     <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" />
+    <Content Include="Areas\Mobile\Content\images\bkfk_hover.png" />
+    <Content Include="Areas\Mobile\Content\images\bk_02.jpg" />
+    <Content Include="Areas\Mobile\Content\images\bk_fk.png" />
     <Content Include="Areas\Mobile\Content\images\dianhua.png" />
+    <Content Include="Areas\Mobile\Content\images\fitting_btn1.png" />
+    <Content Include="Areas\Mobile\Content\images\fitting_btn3.png" />
     <Content Include="Areas\Mobile\Content\images\footer_bg.jpg" />
     <Content Include="Areas\Mobile\Content\images\huawen.jpg" />
     <Content Include="Areas\Mobile\Content\images\icon.png" />
@@ -231,6 +236,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.png" />
     <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" />
@@ -241,7 +247,11 @@
     <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\qupiao.png" />
+    <Content Include="Areas\Mobile\Content\images\set_bg.jpg" />
+    <Content Include="Areas\Mobile\Content\images\time.png" />
     <Content Include="Areas\Mobile\Content\images\videox.png" />
     <Content Include="Areas\Mobile\Content\js\bootstrap.min.js" />
     <Content Include="Areas\Mobile\Content\js\html5shiv.min.js" />

EheMall.Web/EheMall.Web.csproj.user

@@ -10,7 +10,7 @@
     </WebStackScaffolding_LayoutPageFile>
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <UseIISExpress>true</UseIISExpress>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />