소스 검색

Merge branch 'dev/v4.9.69_tsz' of qmx/jy into feature/v4.9.69

汤世哲 8 달 전
부모
커밋
5fafb052cb
2개의 변경된 파일4개의 추가작업 그리고 24개의 파일을 삭제
  1. 2 12
      src/jfw/modules/app/src/web/templates/areaPack/page_set_area.html
  2. 2 12
      src/web/templates/areaPack/wx/page_set_area.html

+ 2 - 12
src/jfw/modules/app/src/web/templates/areaPack/page_set_area.html

@@ -160,8 +160,7 @@
                 backTipShowCount: 0, // 离开页面展示弹窗次数
                 successBack: false,
                 keywords: '',
-                wordsMode: '',
-                isNeedApi: true
+                wordsMode: ''
             },
             computed: {
                 moreThanSubCount: function () {
@@ -219,12 +218,8 @@
             mounted: function () {
                 var type = utils.getParam('type')
                 var url = utils.getParam('url')
-                var sub = utils.getParam('sub')
                 var keywords = utils.getParam('keywords')
                 this.wordsMode = utils.getParam('wordsMode')
-                if (sub === 'simple') {
-                  this.isNeedApi = false
-                }
                 if (url) {
                   this.params.url = decodeURIComponent(url)
                 }
@@ -311,9 +306,7 @@
                                 if (res.data) {
                                     if (res.data.area === null || res.data.area === undefined) {
                                         _this.setAreaAllNotSelected()
-                                        if(_this.isNeedApi) {
-                                          _this.addBackTip()
-                                        }
+                                        _this.addBackTip()
                                     } else {
                                         if (res.data.area) {
                                             // 赋值默认已选
@@ -372,9 +365,6 @@
                     this.setAreaSelected(area)
                     if (this.moreThanSubCount) {
                         this.popupTip = true
-                    } else if(!this.isNeedApi) {
-                        sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
-                        history.back()
                     } else {
                         this.userUpdate(area)
                     }

+ 2 - 12
src/web/templates/areaPack/wx/page_set_area.html

@@ -160,8 +160,7 @@
                 backTipShowCount: 0, // 离开页面展示弹窗次数
                 successBack: false,
                 keywords: '',
-                wordsMode: '',
-                isNeedApi: true
+                wordsMode: ''
             },
             computed: {
                 moreThanSubCount: function () {
@@ -219,12 +218,8 @@
             mounted: function () {
                 var type = utils.getParam('type')
                 var url = utils.getParam('url')
-                var sub = utils.getParam('sub')
                 var keywords = utils.getParam('keywords')
                 this.wordsMode = utils.getParam('wordsMode')
-                if (sub === 'simple') {
-                  this.isNeedApi = false
-                }
                 if (url) {
                   this.params.url = decodeURIComponent(url)
                 }
@@ -311,9 +306,7 @@
                                 if (res.data) {
                                     if (res.data.area === null || res.data.area === undefined) {
                                         _this.setAreaAllNotSelected()
-                                        if(_this.isNeedApi) {
-                                          _this.addBackTip()
-                                        }
+                                        _this.addBackTip()
                                     } else {
                                         if (res.data.area) {
                                             // 赋值默认已选
@@ -378,9 +371,6 @@
                     this.setAreaSelected(area)
                     if (this.moreThanSubCount) {
                         this.popupTip = true
-                    } else if(!this.isNeedApi) {
-                        sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
-                        history.back()
                     } else {
                         this.userUpdate(area)
                     }