Преглед на файлове

fix: 免费用户跳转

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe преди 8 месеца
родител
ревизия
0e420836f4
променени са 2 файла, в които са добавени 12 реда и са изтрити 12 реда
  1. 6 6
      src/jfw/modules/app/src/web/templates/areaPack/page_set_area.html
  2. 6 6
      src/web/templates/areaPack/wx/page_set_area.html

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

@@ -311,7 +311,9 @@
                                 if (res.data) {
                                     if (res.data.area === null || res.data.area === undefined) {
                                         _this.setAreaAllNotSelected()
-                                        _this.addBackTip()
+                                        if(_this.isNeedApi) {
+                                          _this.addBackTip()
+                                        }
                                     } else {
                                         if (res.data.area) {
                                             // 赋值默认已选
@@ -368,13 +370,11 @@
                 },
                 confirmed: function (area) {
                     this.setAreaSelected(area)
-                    if(!this.isNeedApi) {
-                      sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
-                      history.back()
-                      return
-                    }
                     if (this.moreThanSubCount) {
                         this.popupTip = true
+                    } else if(!this.isNeedApi) {
+                        sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
+                        history.back()
                     } else {
                         this.userUpdate(area)
                     }

+ 6 - 6
src/web/templates/areaPack/wx/page_set_area.html

@@ -311,7 +311,9 @@
                                 if (res.data) {
                                     if (res.data.area === null || res.data.area === undefined) {
                                         _this.setAreaAllNotSelected()
-                                        _this.addBackTip()
+                                        if(_this.isNeedApi) {
+                                          _this.addBackTip()
+                                        }
                                     } else {
                                         if (res.data.area) {
                                             // 赋值默认已选
@@ -374,13 +376,11 @@
                 },
                 confirmed: function (area) {
                     this.setAreaSelected(area)
-                    if(!this.isNeedApi) {
-                      sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
-                      history.back()
-                      return
-                    }
                     if (this.moreThanSubCount) {
                         this.popupTip = true
+                    } else if(!this.isNeedApi) {
+                        sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
+                        history.back()
                     } else {
                         this.userUpdate(area)
                     }