From 4f283b0ffece43d23ddefb78aa31641ec5737174 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 24 Jan 2018 20:01:46 +0800
Subject: [PATCH] Fix Events.js Bug

---
 libs/events.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libs/events.js b/libs/events.js
index a7074d55..422bd1ff 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -568,12 +568,15 @@ events.prototype.openShop = function(shopId, needVisited) {
     var actions = [];
     if (core.isset(core.status.event.data) && core.isset(core.status.event.data.actions))
         actions=core.status.event.data.actions;
+    var fromList;
+    if (core.isset(core.status.event.data) && core.isset(core.status.event.data.fromList))
+        fromList = core.status.event.data.fromList;
 
     core.ui.closePanel();
     core.lockControl();
     // core.status.event = {'id': 'shop', 'data': {'id': shopId, 'shop': shop}};
     core.status.event.id = 'shop';
-    core.status.event.data = {'id': shopId, 'shop': shop, 'actions': actions};
+    core.status.event.data = {'id': shopId, 'shop': shop, 'actions': actions, 'fromList': fromList};
     core.status.event.selection = selection;
 
     // 拼词
@@ -1171,6 +1174,11 @@ events.prototype.keyDownShop = function (keycode) {
 ////// 商店界面时，放开某个键的操作 //////
 events.prototype.keyUpShop = function (keycode) {
     if (keycode==27 || keycode==88) {
+
+        if (core.status.event.data.actions.length>0) {
+            core.status.route.push("shop:"+core.status.event.data.id+":"+core.status.event.data.actions.join(""));
+        }
+
         if (core.status.event.data.fromList) {
             core.status.boxAnimateObjs = [];
             core.setBoxAnimate();