wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【天天活动方案】 https://www.tapd.cn/39598945/prong/stories/view/1139598945001000093

Browse Source
This commit is contained in:
wanyongkang
2020-11-06 20:34:41 +08:00
parent 7b4cbe2e79
commit c0c3004f4c
4 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Host/Views.Mobile/Product/Index.cshtml
View File

@@ -33,7 +33,7 @@
<ul class="nav nav-tabs cpName" role="tablist">
@foreach (var item in Model)
{
@if(item.Product.Id == 5){
@if(item.Product.Id == 5||item.Product.Id == 14){
<li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
<a href="#@item.Product.Id" role="tab" data-toggle="tab">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;">活动</span></a>
@@ -82,11 +82,11 @@
}
else
{
@if(package.Id == 86){
@if(package.Id == 86||package.Id == 88){
<a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
<div class="card color_@((item.Packages.IndexOf(package)+1)%5)">
<div class="item">
<p style="font-size: 35px;color:#f64e3d;">@package.Name 送1月</p>
<p style="font-size: 35px;color:#FFFF00;">@package.Name 送1月</p>
<p>@(Math.Round(package.Price/package.DayCount,2))元/天</p>
<p>@package.Profile</p>
</div>
@@ -100,7 +100,23 @@
<a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
<div class="card color_@((item.Packages.IndexOf(package)+1)%5)">
<div class="item">
<p style="font-size: 35px;color:#f64e3d;">@package.Name 送10天</p>
<p style="font-size: 35px;color:#FFFF00;">@package.Name 送10天</p>
<p>@(Math.Round(package.Price/package.DayCount,2))元/天</p>
<p>@package.Profile</p>
</div>
<div class="item">
<p>¥<span>@package.Price</span></p>
</div>
</div>
</a>
} else if(package.Id == 71) {
<a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
<div class="card color_@((item.Packages.IndexOf(package)+1)%5)">
<div class="item">
<p style="font-size: 35px;color:#FFFF00;">@package.Name 送7天</p>
<p>@(Math.Round(package.Price/package.DayCount,2))元/天</p>
<p>@package.Profile</p>
</div>

49
Host/Views/Product/Index.cshtml
View File

@@ -180,6 +180,35 @@
border-bottom-color: transparent;
}
.packageitem71{
position: relative;
}
.packageitem71::before {
position: absolute;
top: 0.3rem;
left: -0.5rem;
z-index: 1;
padding-right: 0.625rem;
font-weight: bold;
line-height: 0px;
color: white;
height: 0px;
border: 1.0rem solid #f64e3d;
border-right-color: transparent;
content: "免费送七天";
box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
}
.packageitem71::after {
content: "";
position: absolute;
top: 2.1875rem;
left: -0.5rem;
border: 0.25rem solid #f64e3d;
border-left-color: transparent;
border-bottom-color: transparent;
}
</style>
<!-- ad -->
<div class="container-fluid ad">
@@ -193,7 +222,7 @@
<div class="nav">
@foreach (var item in Model)
{
@if(item.Product.Id == 5){
@if(item.Product.Id == 5 || item.Product.Id == 14){
<div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id" a-pkg-id="@(item.Packages.FirstOrDefault(m=>m.Status==1).Id)">@item.Product.Name <span style="color: #f64e3d;font-weight:bold;">活动</span></div>
} else {
<div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id" a-pkg-id="@(item.Packages.FirstOrDefault(m=>m.Status==1).Id)">@item.Product.Name</div>
@@ -242,12 +271,15 @@
@if(item.Product.Id == 5){
<p class="youhuiNew">新开账号或续费，1个月赠送10天，2个月赠送1个月，（每个账号限参加一次，活动截止时间2020年11月25日）</p>
}
@if(item.Product.Id == 14){
<p class="youhuiNew">新开账号，1个月赠送7天，2个月赠送1个月，（仅限新开账号，续费帐号不赠送，同一用户不限制参加活动的账号数量，活动截止时间2020年12月1日）</p>
}
@*<p class="text-center nameSmall">—<span>@item.Product.Name</span>—</p>*@
<div class="card" style="margin-top:30px;">
@foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1))
{
@if(package.Id == 86){
@if(package.Id == 86||package.Id == 88){
<div class="item packageitem packageitem86" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
@@ -273,6 +305,19 @@
<img src="~/img/check.png" class="cardCheck">
</div>
} else if(package.Id == 71) {
<div class="item packageitem packageitem71" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
<p><span class="price">@package.Price</span>元</p>
<p class="yuanjia">原价：<span>@package.LinePrice</span>元</p>
<p>@(Math.Round(package.Price/package.DayCount,2))元/天</p>
<div class="pkgNameCard" style="background-color:#f64e3d">
<p class="tianka">@package.Name</p>
<p class="qixian">@package.Profile</p>
</div>
<img src="~/img/check.png" class="cardCheck">
</div>
} else {
<div class="item packageitem" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">

2
Services/Hncore.Pass.Vpn/Service/AgentClient7Service.cs
View File

@@ -187,7 +187,7 @@ namespace Hncore.Pass.Vpn.Service
{"conn_max",connCount.ToString() },
{"test",packageKey=="test"?"1":"0" },
{"type",packageKey=="test"?"d":packageKey },
{"paynum","1" },
{"paynum",payCount.ToString() },
};
var title = GetOpTitle("NewAccount", account);
LogHelper.Info(title, map.ToJson());

2
Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
View File

@@ -530,7 +530,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
await accountEntitys.ForEachAsync(async accountEntity =>
{
var ret = new ApiResult();
if(accountEntity.PackageId.Value == 86){
if(accountEntity.PackageId.Value == 86 || accountEntity.PackageId.Value == 88){
ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount,1,2);
} else {
ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount);