Skip to content

T
Theater
Commit 00ca8e8c authored by 吴春's avatar 吴春
Browse files
Options

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

# Conflicts:
#	EheMall.Web/Areas/TicketMall/Views/SaleTheater/Index.cshtml
parents 3851a388 990f16da
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 42 deletions
EheMall.Business/EheMall.Business.csproj
View file @ 00ca8e8c
......@@ -39,13 +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>..\packages\Aliyun.Net.SDK.Core.dll</HintPath>
<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>
......
EheMall.Web/Areas/Admin/Views/TheaterManage/TheaterSeat.cshtml
View file @ 00ca8e8c
......@@ -27,14 +27,6 @@
position: relative;
}
.seats-block .seat {
display: inline-block;
font-size: 12px;
width: 30px;
height: 27px;
margin: 0 5px;
background: url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
}
.seats-block .row-id-container {
width: 60px;
......@@ -75,11 +67,6 @@
visibility: hidden;
}
.seled {
background-color: #D6DFF7!important;
visibility: visible !important;
}
.seat_menu {
width: 125px;
height: auto;
......@@ -97,11 +84,28 @@
padding: 0 15px;
height: 30px;
background: #e95252;
border: 1px solid #e95252;
border: none;
cursor: pointer;
border-radius: 15px;
margin: 0 0 10px 10px;
}
.seats-block .seat {
display: inline-block;
font-size: 12px;
width: 30px;
height: 27px;
margin: 0 5px;
background: url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
}
.seled {
visibility: visible !important;
display: inline-block;
font-size: 12px;
width: 30px;
height: 27px;
margin: 0 5px;
background: url(/Areas/TicketMall/Content/Sp_img/checked.png) 100% 100% no-repeat;
}
/*甲区样式*/
.oneArea {
display: inline-block;
......@@ -109,7 +113,7 @@
width: 30px;
height: 27px;
margin: 0 5px;
background: #FF6F77 url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
background: url(/Areas/TicketMall/Content/Sp_img/choosed.png) 100% 100% no-repeat!important;
}
/*乙区样式*/
.twoArea {
......@@ -118,7 +122,7 @@
width: 30px;
height: 27px;
margin: 0 5px;
background: #2DBBEA url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
background: url(/Areas/TicketMall/Content/Sp_img/choose.png) 100% 100% no-repeat!important;
}
/*丙区样式*/
.threeArea {
......@@ -127,7 +131,7 @@
width: 30px;
height: 27px;
margin: 0 5px;
background: #79BC44 url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
background: url(/Areas/TicketMall/Content/Sp_img/canChoose.png) 100% 100% no-repeat!important;
}
/*特区样式*/
.specialArea {
......@@ -136,7 +140,7 @@
width: 30px;
height: 27px;
margin: 0 5px;
background: #FFA35C url(/Areas/TicketMall/Content/Sp_img/seat.png) 100% 100% no-repeat;
background: url(/Areas/TicketMall/Content/Sp_img/specialArea.png) 100% 100% no-repeat!important;
}
/*过道样式*/
.noSeat {
......@@ -145,7 +149,6 @@
width: 30px;
height: 27px;
margin: 0 5px;
border: 1px solid #ccc;
visibility: hidden;
}
......@@ -214,10 +217,10 @@
</div>
</div>
<div class="seat_menu" style="position: fixed;display: none">
<button class="normalBtn" data-bind="click:function(data, event) { SetArea('A', data, event) }">设为甲区</button>
<button class="normalBtn" data-bind="click:function(data, event) { SetArea('B', data, event) }">设为乙区</button>
<button class="normalBtn" data-bind="click:function(data, event) { SetArea('C', data, event) }">设为丙区</button>
<button class="normalBtn" data-bind="click:function(data, event) { SetArea('D', data, event) }">设为特区</button>
<button class="normalBtn" style="background-color:#F08484;" data-bind="click:function(data, event) { SetArea('A', data, event) }">设为甲区</button>
<button class="normalBtn" style="background-color:#84D8F0;" data-bind="click:function(data, event) { SetArea('B', data, event) }">设为乙区</button>
<button class="normalBtn" style="background-color:#58D39D;" data-bind="click:function(data, event) { SetArea('C', data, event) }">设为丙区</button>
<button class="normalBtn" style="background-color:#F6B37F;" data-bind="click:function(data, event) { SetArea('D', data, event) }">设为特区</button>
<button class="normalBtn" data-bind="click:function(data, event) { SetArea('E', data, event),reSeat() }">设为过道</button>
</div>
</div>
......@@ -572,22 +575,20 @@
ev.preventDefault(); // 阻止默认行为
ev.stopPropagation(); // 阻止事件冒泡
$(".seat_menu").css({ "display": 'none' });
} else if (ev.buttons == 2) {
$(".seats-container").on('contextmenu', function (e) {
//-------------禁用系统的右键功能-----------
$(document).bind('contextmenu', function (e) {
return false;
});
var _left = event.pageX;
var _offTop = $(document).scrollTop();
var seledLength = $(".seled").length;
if (seledLength > 0) {
$(".seat_menu").css({ "left": _left, "top": ev.pageY - _offTop, "display": 'block' });
}
});
}
});
$(".seats-container").on('contextmenu', function (ev) {
//-------------禁用系统的右键功能-----------
$(document).bind('contextmenu', function (ev) {
return false;
});
var _left = event.pageX;
var _offTop = $(document).scrollTop();
var seledLength = $(".seled").length;
if (seledLength > 0) {
$(".seat_menu").css({ "left": _left, "top": ev.pageY - _offTop, "display": 'block' });
}
});
$(".seats-container").click(function () {
$(".seat_menu").css({ "display": "none" });
......@@ -629,6 +630,11 @@
if ((leftFlag || rightFlag) && (topFlag || bottomFlag)) {
selectedList.push(blockList[i]);
$(blockList[i]).addClass('seled');
$(blockList[i]).removeClass('seat');
$(blockList[i]).removeClass('oneArea');
$(blockList[i]).removeClass('twoArea');
$(blockList[i]).removeClass('threeArea');
$(blockList[i]).removeClass('specialArea');
}
}
}
......
EheMall.Web/Areas/TicketMall/Views/Home/Help.cshtml
View file @ 00ca8e8c
......@@ -37,7 +37,8 @@
<input name="ContactWay" id="phone" type="text" class="input-text" value="" placeholder="联系方式">
</li>
<li>
<input type="button" id="Submit" name="Submit" class="submit" onclick="Save(this)" value="提交">
<input type="button" id="Submit" name="Submit" style="width:80px;height:30px;background-color:#8C1324;text-align:center;
color:#fff;cursor:pointer;" class="submit" onclick="Save(this)" value="提交">
</li>
</ul>
</form>
......
EheMall.Web/Areas/TicketMall/Views/SaleTheater/Index.cshtml
View file @ 00ca8e8c
......@@ -58,7 +58,12 @@
<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 style="margin-left:20px;font-size:14px;color:#898989;"> 关键词：</span> <input type="text" placeholder="请输入关键词" id="strwhere" style=" height: 25px;border: 1px solid #e6e6e6;padding-left:10px;">
<span id="submitKey" style="width:60px;height:26px;line-height:26px;background-color:#8C1324;color:#fff;display:inline-block;text-align:center;"> 查询</span>
@*<span id="submitKey" style="width:60px;height:26px;line-height:26px;background-color:#8C1324;color:#fff;display:inline-block;text-align:center;"> 查询</span>*@
<span id="submitKey" style="cursor:pointer;width:60px;height:23px;background-color:#8C1324;display:inline-block;text-align:center;
color:#fff;margin:2px 0 0 10px;font-size:14px;line-height:23px;"> 查询</span>
</div>
</div>
......
EheMall.Web/EheMall.Web.csproj
View file @ 00ca8e8c
......@@ -354,6 +354,8 @@
<Content Include="Areas\TicketMall\Content\layui\lay\modules\laydate.js" />
<Content Include="Areas\TicketMall\Content\layui\modules\laydate.js" />
<Content Include="Areas\TicketMall\Content\login.html" />
<Content Include="Areas\TicketMall\Content\Sp_img\canChoose.png" />
<Content Include="Areas\TicketMall\Content\Sp_img\checked.png" />
<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\no.png" />
......@@ -394,6 +396,7 @@
<Content Include="Areas\TicketMall\Content\Sp_img\search.png" />
<Content Include="Areas\TicketMall\Content\Sp_img\seat.png" />
<Content Include="Areas\TicketMall\Content\Sp_img\speak.png" />
<Content Include="Areas\TicketMall\Content\Sp_img\specialArea.png" />
<Content Include="Areas\TicketMall\Content\Sp_img\ticket.png" />
<Content Include="Areas\TicketMall\Content\Sp_img\title.jpg" />
<Content Include="Areas\TicketMall\Content\Sp_img\tubff.png" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment