Merge branch 'dev4.6.3.14' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.14

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -1148,7 +1148,6 @@
     }
     //回车事件
     document.onkeydown = function () {
-      debugger
         if(window.event && window.event.keyCode == 13) {
             window.event.returnValue = false;
             //超级搜索

src/web/staticres/common-module/keep-tags/keep-ent-tags-template.js

@@ -532,14 +532,26 @@ function checkBackSuccess () {
   var isBackSuccess = sessionStorage.getItem('salesBackStatus') || false
   if (isBackSuccess == 'true') {
     var sessionData = JSON.parse(sessionStorage.getItem('salesBackData') || '{}')
-    if (sessionData.type === 'article_collection') {
-      if (vKeepComponent) {
-        vKeepComponent.changeBid(sessionData.id, sessionData.shoucang)
+    switch (sessionData.type) {
+      case 'article_collection': {
+        if (vKeepComponent) {
+          vKeepComponent.changeBid(sessionData.id, sessionData.shoucang)
+        }
+        break
       }
-    }
-    if (sessionData.type === 'article_original') {
-      if (!utils.isWeiXinBrowser) {
-        JyObj.openExternalLink(sessionData.url,"查看原文");
+      case 'article_original': {
+        if (!utils.isWeiXinBrowser) {
+          JyObj.openExternalLink(sessionData.url,"查看原文");
+        }
+        break
+      }
+      case 'jyarticle_see3_plus_wx': {
+        location.reload()
+        break
+      }
+      case 'jyarticle_see3_plus_app': {
+        location.reload()
+        break
       }
     }
   }

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -606,14 +606,26 @@ function checkBackSuccess () {
   var isBackSuccess = sessionStorage.getItem('salesBackStatus') || false
   if (isBackSuccess == 'true') {
     var sessionData = JSON.parse(sessionStorage.getItem('salesBackData') || '{}')
-    if (sessionData.type === 'article_collection') {
-      if (vKeepComponent) {
-        vKeepComponent.changeBid(sessionData.id, sessionData.shoucang)
+    switch (sessionData.type) {
+      case 'article_collection': {
+        if (vKeepComponent) {
+          vKeepComponent.changeBid(sessionData.id, sessionData.shoucang)
+        }
+        break
       }
-    }
-    if (sessionData.type === 'article_original') {
-      if (!utils.isWeiXinBrowser) {
-        JyObj.openExternalLink(sessionData.url,"查看原文");
+      case 'article_original': {
+        if (!utils.isWeiXinBrowser) {
+          JyObj.openExternalLink(sessionData.url,"查看原文");
+        }
+        break
+      }
+      case 'jyarticle_see3_plus_wx': {
+        location.reload()
+        break
+      }
+      case 'jyarticle_see3_plus_app': {
+        location.reload()
+        break
       }
     }
   }