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

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) {
                                             // 赋值默认已选
@@ -371,8 +373,8 @@
                     if (this.moreThanSubCount) {
                         this.popupTip = true
                     } else if(!this.isNeedApi) {
-                      sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
-                      history.back()
+                        sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
+                        history.back()
                     } else {
                         this.userUpdate(area)
                     }

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) {
                                             // 赋值默认已选
@@ -377,8 +379,8 @@
                     if (this.moreThanSubCount) {
                         this.popupTip = true
                     } else if(!this.isNeedApi) {
-                      sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
-                      history.back()
+                        sessionStorage.setItem('freeSelectArea', JSON.stringify(area))
+                        history.back()
                     } else {
                         this.userUpdate(area)
                     }