Merge branch 'dev/v4.9.57_yf' of qmx/jy into release/v4.9.57

src/jfw/modules/app/src/web/templates/areaPack/page_set_area.html

@@ -218,11 +218,15 @@
             mounted: function () {
                 var type = utils.getParam('type')
                 var url = utils.getParam('url')
-                this.keywords = utils.getParam('keywords')
+
+                var keywords = utils.getParam('keywords')
                 this.wordsMode = utils.getParam('wordsMode')
                 if (url) {
                   this.params.url = decodeURIComponent(url)
                 }
+                if(keywords) {
+                  this.keywords = decodeURIComponent(keywords)
+                }
                 var restore = this.restoreState()
 
                 if (restore) {

src/web/templates/areaPack/wx/page_set_area.html

@@ -218,11 +218,14 @@
             mounted: function () {
                 var type = utils.getParam('type')
                 var url = utils.getParam('url')
-                this.keywords = utils.getParam('keywords')
+                var keywords = utils.getParam('keywords')
                 this.wordsMode = utils.getParam('wordsMode')
                 if (url) {
                   this.params.url = decodeURIComponent(url)
                 }
+                if(keywords) {
+                  this.keywords = decodeURIComponent(keywords)
+                }
                 var restore = this.restoreState()
 
                 if (restore) {