提交

EheMall.Mvc/Controllers/BaseTicketMallController.cs

@@ -39,11 +39,13 @@ namespace EheMall.Mvc.Controllers
                 Member item = new Member();
                 if (Session["Member"] == null)
                 {
-                    string sSignID = _auth.SignID();
-                    if (string.IsNullOrEmpty(sSignID))
-                        return item;
-                    item = EngineContext.Current.Resolve<IMemberService>().Get(new Guid(sSignID));
-                    Session["Member"] = item;
+                    //string sSignID = _auth.SignID();
+                    //if (string.IsNullOrEmpty(sSignID))
+                    //    return item;
+                    //item = EngineContext.Current.Resolve<IMemberService>().Get(new Guid(sSignID));
+                    //Session["Member"] = item;
+                    //item = Session["Member"] as Member;
+                    item = null;
                     return item;
                 }
                 item = Session["Member"] as Member;

EheMall.Web/Areas/Admin/Views/TheaterManage/TheaterSeat.cshtml

@@ -263,7 +263,7 @@
         var self = this;
 
         function MyViewModel() {
-            alert();
+         
             //定义数组对象
            // self.SeatData = ko.observableArray([]);
             self.InitSeat = function () {
@@ -389,7 +389,6 @@
 
             self.reSeat = function (dataRowIndex) {
                 var dataList = SeatData();
-                alert();
                 var col_input = $("#col_input").val();
                 var newObj = self.clone(SeatData()[dataRowIndex]);
                 if (newObj.noLenth > 0)
@@ -770,7 +769,6 @@
                     if ((leftFlag || rightFlag) && (topFlag || bottomFlag)) {
                         selectedList.push(blockList[i]);
                         $(blockList[i]).removeClass('seat');
-                        reSeat();
                         if ($(blockList[i]).hasClass('seled')) {
                             $(blockList[i]).removeClass('seled');
                             $(blockList[i]).addClass('seat');
@@ -781,6 +779,20 @@
                         $(blockList[i]).removeClass('twoArea');
                         $(blockList[i]).removeClass('threeArea');
                         $(blockList[i]).removeClass('specialArea');
+
+                        if (($(blockList[i]).hasClass('seled') && $(blockList[i]).hasClass('noSeat')) || $(blockList[i]).hasClass('seat') && $(blockList[i]).hasClass('noSeat')) {
+                            $(blockList[i]).removeClass('noSeat');
+                            var rowId = parseInt($(blockList[i]).attr('data_row_id')) - 1;
+                            var newObj = self.clone(SeatData()[rowId]);
+                            var iiii = parseInt(parseInt($(blockList[i]).attr('data_column_id')));
+                            newObj.ColumnArray[iiii].SeatClassStr = "seled";
+                            newObj.noLenth = 1;
+                            console.log(newObj);
+
+                            SeatData.replace(SeatData()[rowId], newObj);
+                            reSeat(rowId);
+                        }
+                         
                     }
                 }
             }

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

@@ -87,7 +87,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
             #endregion
 
             #region 广告图
-            var AdvertisingPicList = _AdvertisingPicService.GetAllList();
+            var AdvertisingPicList = _AdvertisingPicService.GetAllList().OrderBy(x => x.Sort);
             ViewBag.AdvertisingPicList = AdvertisingPicList;
             #endregion
             return View();
@@ -126,11 +126,12 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
             return PartialView("_SearchIndex", list);
         }
 
-        public ActionResult GetTotalCount(string StartTime, string Name)
+        public ActionResult GetTotalCount(string StartTime, string EndTime, string Name)
         {
             JObject inputs = new JObject();
             inputs["sOrderBy"] = "StartTime desc";
             inputs["StartTime"] = StartTime;
+            inputs["EndTime"] = EndTime;
             inputs["Status"] = 0;
             inputs["Name"] = Name;
             IEnumerable<Screening> list = _ScreeningService.GetListBy(inputs);
@@ -309,6 +310,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
                     List<Models.Models.TheaterPrice> priceList = new List<Models.Models.TheaterPrice>();
                     var list = Helpers.EnumHelper.GetEnumList(typeof(Models.Enums.TheaterSeatTypeEnum)).OrderBy(x => x.Value).ToList();
                     TheaterPrice modelPrice = new TheaterPrice();
+                    entity.iMemberType = CurrentClient.MemberType;
                     modelPrice.iMemberType = CurrentClient.MemberType;
                     entity.OrderDetail = new OrderDetail();
                     entity.OrderDetail.iMemberType = CurrentClient.MemberType;

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

@@ -12,11 +12,11 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
         /// <summary>
         /// 用户授权判断
         /// </summary>
-        private IAuthenticate _auth { get; set; }
+        //private IAuthenticate _auth { get; set; }
         //private IMemberService _MemberService { get; set; }
         public LoginController()
         {
-            this._auth = EngineContext.Current.ResolveOptional<IAuthenticate>();
+            //this._auth = EngineContext.Current.ResolveOptional<IAuthenticate>();
             this._MemberService = EngineContext.Current.ResolveOptional<IMemberService>();
         }
         // GET: TicketMall/Login
@@ -40,7 +40,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
                     if (list[0].bIsDeleted == true)
                         return Json(new { valid = false, message = "用户被锁定，限制登录" });
                     Session["Member"] = list[0];
-                    this._auth.SignIn("MemberID", list[0].ID.ToString(), true);
+                    //this._auth.SignIn("MemberID", list[0].ID.ToString(), true);
                 }
                 return Json(new { valid = bIsExists, message = bIsExists ? "用户登录成功" : "用户名或密码错误!" });
             }

EheMall.Web/Areas/TicketMall/Views/Home/BuyTickets.cshtml

@@ -183,7 +183,7 @@
                     return false;
                 }
             }
-             $(this).prop("disable", true);
+            $(".Ticket_sureBtn").prop("disable", true);
             $.ajax({
                 type: "post",
                 url: "@Url.Action("SaveOrder")",
@@ -198,7 +198,7 @@
                             }
                         });
                     } else {
-                        $(this).prop("disable", false);
+                        $(".Ticket_sureBtn").prop("disable", false);
                         layer.msg(data.message, { icon: 2 });
                     }
                 }

EheMall.Web/EheMall.Web.csproj.user

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