diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 25c82ba..fccfa4f 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -121,7 +121,7 @@ namespace Home.Controllers if(m.Price + .show-img:hover{ + border: 1px solid red; + } + +
+
+
+ +
+
+

ros千兆软路由一拖100矩阵抖音快手单机单多ip魔硬软改工作室试玩

+
+
+
+

商品信息：{{product_info.name}}

+

价格：￥{{product_info.lineprice}}

+

会员价：￥{{product_info.price}}

+
+
+
+ +
+
+

颜色分类

+
+
+ +
+
+ + +
+
+

数量

+
+
+
+ + + + + + + +
+
+
+ +
+
+

收货人

+
+
+ {{user_info.name}} +
+
+ +
+
+

电话号码

+
+
+ {{user_info.phone}} +
+
+
+
+

收货地址

+
+
+ {{user_info.address}} +
+
+ +
+
+ 支付方式： +
+
+ + + +
+
+ + + +
+
+ +
+
+

品牌：Mikrotik

+

售后服务: 店铺三包

+

无线传输速率: 1000Mbps

+

是否无线: 是

+

中小企业办公 专业游戏路由

+
+
+

型号: AC2

+

USB接口数量: 1个

+

无线传输速度: 1167M

+

上市时间: 2012-08-22

+
+
+

成色: 全新

+

有线传输率: 千兆端口

+

无线网络支持频率: 2.4G&5G

+

版本类型: 中国大陆

+

保修期: 1年

+
+
+
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ +
+ + + + + \ No newline at end of file diff --git a/Host/Views.Mobile/Shared/_Layout.cshtml b/Host/Views.Mobile/Shared/_Layout.cshtml index 1a29a44..89fde6f 100644 --- a/Host/Views.Mobile/Shared/_Layout.cshtml +++ b/Host/Views.Mobile/Shared/_Layout.cshtml @@ -205,6 +205,7 @@
  • 线路表
  • 软件下载
  • 教程&咨询
    • +
  • 软路由购买
  • 动态VPS
    • @*
  • 淘宝充值活动
    • *@ @if (user != null) diff --git a/Host/Views.Mobile/Shared/_UserLayout.cshtml b/Host/Views.Mobile/Shared/_UserLayout.cshtml index 178e6dd..ab86702 100644 --- a/Host/Views.Mobile/Shared/_UserLayout.cshtml +++ b/Host/Views.Mobile/Shared/_UserLayout.cshtml @@ -53,6 +53,7 @@
  • 线路表
  • 软件下载
  • 教程&咨询
    • +
  • 软路由购买
  • 动态VPS
  • @if (user != null) diff --git a/Host/Views.Mobile/User/Index.cshtml b/Host/Views.Mobile/User/Index.cshtml index eacc38f..14ee1b1 100644 --- a/Host/Views.Mobile/User/Index.cshtml +++ b/Host/Views.Mobile/User/Index.cshtml @@ -13,6 +13,7 @@
  • 个人信息
  • IP账号管理
  • 资金明细
    • +
  • 软路由订单
  • 我的订单
  • 退货订单
  • 我的优惠券 
    • diff --git a/Host/Views.Mobile/User/RosOrder.cshtml b/Host/Views.Mobile/User/RosOrder.cshtml new file mode 100644 index 0000000..b690303 --- /dev/null +++ b/Host/Views.Mobile/User/RosOrder.cshtml @@ -0,0 +1,63 @@ + +@{ + Layout = "_UserLayout"; +} +
    + + + + + + + + + + + + + + + + + + + + +
    软路由订单列表
    软路由实付收货人姓名收货人电话收货人地址
    {{info.product_name}}{{info.real_price}}{{info.user}}{{info.phone}}{{info.address}}
    +
    + \ No newline at end of file diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs index c06c2dd..1499820 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs @@ -543,6 +543,7 @@ namespace Hncore.Pass.Vpn.Controllers new ExcelTitle { Property = "ProductName", Title = "产品" }, new ExcelTitle { Property = "PackageName", Title = "套餐" }, new ExcelTitle { Property = "Account", Title = "账号" }, + new ExcelTitle { Property = "Pwd", Title = "密码" }, new ExcelTitle { Property = "AccountType", Title = "类型" , Format=(val)=>((AccountType)val).GetEnumDisplayName() }, new ExcelTitle { Property = "ConnectCount", Title = "连接数"}, new ExcelTitle { Property = "StartTime", Title = "开通时间" , Format=(val)=>((DateTime) val).ToString("yyyy-MM-dd hh:mm:ss")}, diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index 31ab1ee..c8699f0 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -309,7 +309,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, - if (ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ + if (packageEntity.ProductId != 23 &&packageEntity.ProductId != 22 && ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ price = 0.1M; userEntity.ProductAccountCount = 1; await m_UserService.Update(userEntity);