Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-03-28 4b9f617a1dc1409340b4dc59274cba2d96f32efc

 System/Auction/AuctionInquiryModel.cs

@@ -394,6 +394,7 @@
                    {

                        FamilyAuctionItem.TimeStr = RefreshAuctionItem.AddTime;

                        FamilyAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);

                        FamilyAuctionItem.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);

                        var str = UIHelper.ServerStringTrim(RefreshAuctionItem.BiddingTime);

                        if (!str.Equals(string.Empty))

                        {

@@ -425,6 +426,7 @@
                    var PlayerAuctionItemInfo = PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID];

                    PlayerAuctionItemInfo.TimeStr = RefreshAuctionItem.AddTime;

                    PlayerAuctionItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime);

                    PlayerAuctionItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);

                    PlayerAuctionItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;

                    PlayerAuctionItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID] = PlayerAuctionItemInfo;

@@ -434,10 +436,21 @@
                    var biddingItemInfo = BiddingItemInfoDic[RefreshAuctionItem.ItemGUID];

                    biddingItemInfo.TimeStr = RefreshAuctionItem.AddTime;

                    biddingItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime);

                    biddingItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);

                    biddingItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;

                    biddingItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    BiddingItemInfoDic[RefreshAuctionItem.ItemGUID] = biddingItemInfo;

                }

                if (AttentionAuctionItemDic.ContainsKey(RefreshAuctionItem.ItemGUID))//我关注中的拍品

                {

                    var attentionAuctionItem = AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID];

                    attentionAuctionItem.TimeStr = RefreshAuctionItem.AddTime;

                    attentionAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);

                    attentionAuctionItem.TimeEnd = DateTime.Parse(RefreshAuctionItem.BiddingTime);

                    attentionAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;

                    attentionAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID] = attentionAuctionItem;

                }

                if (RefreshAuctionItemUpdate != null)

                {

                    RefreshAuctionItemUpdate();