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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/keyWord.js

@@ -29,7 +29,8 @@ var vm = new Vue({
       ordinarykc: 0
     },
     scrollTop: 0, // 记录滚动高度
-    isenterprise:false
+    isenterprise:false,
+    toWhere: ''
   },
   computed: {
     // 关键词是否达到上限
@@ -81,6 +82,7 @@ var vm = new Vue({
   },
   created: function () {
     let identification = getParam('pagesource')
+    this.toWhere = utils.getParam('to')
     this.isenterprise = identification=='enterprise' ? true:false
     this.restoreState()
     this.getSwitchType()
@@ -699,7 +701,11 @@ var vm = new Vue({
       })
     },
     completeToEdit: function () {
-      history.back()
+      if (this.toWhere) {
+        location.replace(this.toWhere)
+      } else {
+        history.back()
+      }
     },
     // 恢复数据
     restoreState: function () {

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

@@ -344,7 +344,12 @@
                                     _this.successBack = true
                                   }
                                   if (_this.params.url) {
-                                    location.replace(_this.params.url)
+                                    // 有关键词的情况-跳到关键词页面=>完成=>回到标讯搜索页面
+                                    if (_this.keywords) {
+                                      location.replace(_this.params.url + '?to=/jy_mobile/search/result/bidding')
+                                    } else {
+                                      location.replace(_this.params.url)
+                                    }
                                   } else {
                                     history.back()
                                   }

src/web/staticres/vipsubscribe/js/keyWord.js

@@ -29,7 +29,8 @@ var vm = new Vue({
       ordinarykc: 0
     },
     scrollTop: 0, // 记录滚动高度
-    isenterprise:false
+    isenterprise:false,
+    toWhere: ''
   },
   computed: {
     // 关键词是否达到上限
@@ -81,6 +82,7 @@ var vm = new Vue({
   },
   created: function () {
     let identification = getParam('pagesource')
+    this.toWhere = utils.getParam('to')
     this.isenterprise = identification=='enterprise' ? true:false
     this.restoreState()
     this.getSwitchType()
@@ -696,7 +698,11 @@ var vm = new Vue({
       })
     },
     completeToEdit: function () {
-      history.back()
+      if(this.toWhere) {
+        location.replace(this.toWhere)
+      } else {
+        history.back()
+      }
     },
     // 恢复数据
     restoreState: function () {

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

@@ -342,12 +342,22 @@
                                 if (history.state) {
                                   _this.successBack = true
                                 }
+                                
                                 var wlh = window.location.href
                                 if (wlh.indexOf("url=")>-1){
                                   window.location.href= "/front/vipsubscribe/toSubVipSetPage?vSwitch=v";
                                   return
                                 }
-                                history.back()
+                                if (_this.params.url) {
+                                  // 有关键词的情况-跳到关键词页面=>完成=>回到标讯搜索页面
+                                  if (_this.keywords) {
+                                    location.replace(_this.params.url + '?to=/jy_mobile/search/result/bidding')
+                                  } else {
+                                    location.replace(_this.params.url)
+                                  }
+                                } else {
+                                  history.back()
+                                }
                               })
                             } else {
                                 if (res.errMsg) {