ecinc-cloud-moabase 9.5.237 → 9.5.242

package/lib/ecmoabase.common.js

@@ -984,7 +984,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".AppFieldCell[data-v-1049d23a]{padding
 
 /***/ }),
 
-/***/ 2708:
+/***/ 4412:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -998,7 +998,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".App-nav-bar[data-v-e4d402b2]{position:fixed;top:0;left:0;right:0;z-index:9999}.App-nav-bar .App-center[data-v-e4d402b2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;overflow:auto}.App-nav-bar .App-center[data-v-e4d402b2]::-webkit-scrollbar{display:none}.App-nav-bar .App-center-img[data-v-e4d402b2],.App-nav-bar .App-left-img[data-v-e4d402b2]{width:24px;margin-right:2px}.App-nav-bar .App-center-chat-status[data-v-e4d402b2]{text-align:center;display:inline-block;width:7px;height:7px;border-radius:50%;background:radial-gradient(circle,#dfdfdf,#8a8a8a);margin-left:5px}.App-nav-bar .App-center-chat-status.on-line[data-v-e4d402b2]{background:radial-gradient(circle,#26d189,#0ea04d)}.App-nav-bar[data-v-e4d402b2] .van-nav-bar__title{font-weight:600;font-size:16px}.App-nav-bar__noBottomLine[data-v-e4d402b2]:after{border-bottom-width:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".App-nav-bar[data-v-5f07166d]{position:fixed;top:0;left:0;right:0;z-index:9999}.App-nav-bar .App-center[data-v-5f07166d]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;overflow:auto}.App-nav-bar .App-center[data-v-5f07166d]::-webkit-scrollbar{display:none}.App-nav-bar .App-center-img[data-v-5f07166d],.App-nav-bar .App-left-img[data-v-5f07166d]{width:24px;margin-right:2px}.App-nav-bar .App-center-chat-status[data-v-5f07166d]{text-align:center;display:inline-block;width:7px;height:7px;border-radius:50%;background:radial-gradient(circle,#dfdfdf,#8a8a8a);margin-left:5px}.App-nav-bar .App-center-chat-status.on-line[data-v-5f07166d]{background:radial-gradient(circle,#26d189,#0ea04d)}.App-nav-bar[data-v-5f07166d] .van-nav-bar__title{font-weight:600;font-size:16px}.App-nav-bar__noBottomLine[data-v-5f07166d]:after{border-bottom-width:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -25807,19 +25807,19 @@ var update = add("72d28922", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 6446:
+/***/ 7434:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(2708);
+var content = __webpack_require__(4412);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("0354f751", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0b0f2cab", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -26960,14 +26960,14 @@ var AppFieldCell_component = normalizeComponent(
 )
 
 /* harmony default export */ var AppFieldCell = (AppFieldCell_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=template&id=e4d402b2&scoped=true
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=template&id=5f07166d&scoped=true
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var AppHeadervue_type_template_id_e4d402b2_scoped_true_render = function render() {
+var AppHeadervue_type_template_id_5f07166d_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.isLoaded && _vm.isShow ? _c('van-nav-bar', {
@@ -27074,7 +27074,7 @@ var AppHeadervue_type_template_id_e4d402b2_scoped_true_render = function render(
     }
   })], 1) : _vm._e()], 1);
 };
-var AppHeadervue_type_template_id_e4d402b2_scoped_true_staticRenderFns = [];
+var AppHeadervue_type_template_id_5f07166d_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=script&lang=js
 function AppHeadervue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return AppHeadervue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, AppHeadervue_type_script_lang_js_typeof(o); }
@@ -27158,10 +27158,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(window.wxCfg && navigator.userAgent.indexOf('Android') !== -1)) {
-                _context.next = 5;
+                _context.next = 4;
                 break;
               }
-              _this.setWxGobackFloatBtn();
               if (window.wxgobakMode === 'topbarBtn') {
                 window.layout = '';
                 mainTabbar = document.querySelector('.main-tabbar') || document.querySelector('.navbar_bottom'); //主界面底部导航栏
@@ -27173,25 +27172,29 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
                 } else {
                   window.layout = '';
                 }
+              } else {
+                _this.setWxGobackFloatBtn();
               }
               _context.next = 12;
               break;
-            case 5:
+            case 4:
               if (!((window.layout === 'H5' || window.flutter_inappwebview) && (_this.appPadding === 0 || _this.appPadding === 24))) {
                 _context.next = 12;
                 break;
               }
-              _context.next = 8;
+              _context.next = 7;
               return _this.$wv.getSystemStatusBarHeight();
-            case 8:
+            case 7:
               _context.t0 = _context.sent;
               if (_context.t0) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
               _context.t0 = 24;
-            case 11:
+            case 10:
               _this.appPadding = _context.t0;
+              //非安卓微信版本，不显示返回按钮
+              window.wxgobakMode = '';
             case 12:
               _this.handleHeaderLineConfig(val);
               _this.isLoaded = true;
@@ -27225,27 +27228,25 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
               //安卓微信版本，显示顶部导航栏，但是不需要预留顶部系统状态栏空间
               _this3.appPadding = 0;
             }
-            _context2.next = 12;
+            _context2.next = 11;
             break;
           case 4:
-            //非安卓微信版本，不显示返回按钮
-            window.wxgobakMode = '';
             if (!((window.layout === 'H5' || window.flutter_inappwebview) && (_this3.appPadding === 0 || _this3.appPadding === 24))) {
-              _context2.next = 12;
+              _context2.next = 11;
               break;
             }
-            _context2.next = 8;
+            _context2.next = 7;
             return _this3.$wv.getSystemStatusBarHeight();
-          case 8:
+          case 7:
             _context2.t0 = _context2.sent;
             if (_context2.t0) {
-              _context2.next = 11;
+              _context2.next = 10;
               break;
             }
             _context2.t0 = 24;
-          case 11:
+          case 10:
             _this3.appPadding = _context2.t0;
-          case 12:
+          case 11:
             _this3.$bus.on('setTitle', _this3.handleSetTitle);
             _this3.$bus.on('setCenterImage', _this3.handleSetCenterImage);
             _this3.$bus.on('setLeftText', _this3.handleSetLeftText);
@@ -27254,7 +27255,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
             _this3.$bus.on('setRightImage', _this3.handleSetRightImage);
             _this3.$bus.on('showBack', _this3.handleShowBack);
             _this3.$bus.on('basicformOpened', _this3.setWxGobackFloatBtn);
-          case 20:
+          case 19:
           case "end":
             return _context2.stop();
         }
@@ -27278,19 +27279,30 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
     setWxGobackFloatBtn: function setWxGobackFloatBtn() {
       var _this4 = this;
       if (window.wxCfg && navigator.userAgent.indexOf('Android') !== -1) {
-        if (window.wxgobakMode === 'floatBtn') {
-          this.showGobackBtn = false;
+        this.showGobackBtn = false;
+        console.log(window.wxgobakMode, location.href);
+        if (window.wxgobakMode === 'floatBtn' && location.href.indexOf('#/wflow?wfEngineUrl=') === -1) {
           setTimeout(function () {
             //当前页面无关闭按钮，显示浮动返回按钮
             var mainTabbar = document.querySelector('.main-tabbar') || document.querySelector('.navbar_bottom'); //主界面底部导航栏
+            var gobackBtn = document.querySelector('.goback-btn'); //列表页面关闭按钮
             var closeBtn = document.querySelector('#btn_close'); //表单页面关闭按钮
-
-            if (!mainTabbar && !closeBtn) {
+            if (!mainTabbar && !gobackBtn && !closeBtn) {
               _this4.showGobackBtn = true;
-            } else if (mainTabbar && location.href.indexOf('addressBook?STACK') !== -1) {
+            } else if (mainTabbar && (location.href.indexOf('#/addressBook?') !== -1 || location.href.indexOf('#/calendar?') !== -1 || location.href.indexOf('#/portalMessage?') !== -1)) {
               //显示通讯录人员列表
               _this4.showGobackBtn = true;
             }
+            if (_this4.showGobackBtn) {
+              _this4.$nextTick(function () {
+                var floatButtonGroup = document.querySelector('.floatbtn-group-container');
+                if (location.href.indexOf('#/addressBook?') !== -1) {
+                  floatButtonGroup.style.zIndex = 3001;
+                } else {
+                  floatButtonGroup.style.zIndex = 2001;
+                }
+              });
+            }
           }, 0);
         }
       }
@@ -27419,9 +27431,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=script&lang=js
  /* harmony default export */ var App_AppHeadervue_type_script_lang_js = (AppHeadervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=e4d402b2&prod&lang=scss&scoped=true
-var AppHeadervue_type_style_index_0_id_e4d402b2_prod_lang_scss_scoped_true = __webpack_require__(6446);
-;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=e4d402b2&prod&lang=scss&scoped=true
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=5f07166d&prod&lang=scss&scoped=true
+var AppHeadervue_type_style_index_0_id_5f07166d_prod_lang_scss_scoped_true = __webpack_require__(7434);
+;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=5f07166d&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue
 
@@ -27434,11 +27446,11 @@ var AppHeadervue_type_style_index_0_id_e4d402b2_prod_lang_scss_scoped_true = __w
 
 var AppHeader_component = normalizeComponent(
   App_AppHeadervue_type_script_lang_js,
-  AppHeadervue_type_template_id_e4d402b2_scoped_true_render,
-  AppHeadervue_type_template_id_e4d402b2_scoped_true_staticRenderFns,
+  AppHeadervue_type_template_id_5f07166d_scoped_true_render,
+  AppHeadervue_type_template_id_5f07166d_scoped_true_staticRenderFns,
   false,
   null,
-  "e4d402b2",
+  "5f07166d",
   null
   
 )

package/lib/ecmoabase.umd.js

@@ -994,7 +994,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".AppFieldCell[data-v-1049d23a]{padding
 
 /***/ }),
 
-/***/ 1380:
+/***/ 9436:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1008,7 +1008,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".App-nav-bar[data-v-e4d402b2]{position:fixed;top:0;left:0;right:0;z-index:9999}.App-nav-bar .App-center[data-v-e4d402b2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;overflow:auto}.App-nav-bar .App-center[data-v-e4d402b2]::-webkit-scrollbar{display:none}.App-nav-bar .App-center-img[data-v-e4d402b2],.App-nav-bar .App-left-img[data-v-e4d402b2]{width:24px;margin-right:2px}.App-nav-bar .App-center-chat-status[data-v-e4d402b2]{text-align:center;display:inline-block;width:7px;height:7px;border-radius:50%;background:radial-gradient(circle,#dfdfdf,#8a8a8a);margin-left:5px}.App-nav-bar .App-center-chat-status.on-line[data-v-e4d402b2]{background:radial-gradient(circle,#26d189,#0ea04d)}.App-nav-bar[data-v-e4d402b2] .van-nav-bar__title{font-weight:600;font-size:16px}.App-nav-bar__noBottomLine[data-v-e4d402b2]:after{border-bottom-width:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".App-nav-bar[data-v-5f07166d]{position:fixed;top:0;left:0;right:0;z-index:9999}.App-nav-bar .App-center[data-v-5f07166d]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;overflow:auto}.App-nav-bar .App-center[data-v-5f07166d]::-webkit-scrollbar{display:none}.App-nav-bar .App-center-img[data-v-5f07166d],.App-nav-bar .App-left-img[data-v-5f07166d]{width:24px;margin-right:2px}.App-nav-bar .App-center-chat-status[data-v-5f07166d]{text-align:center;display:inline-block;width:7px;height:7px;border-radius:50%;background:radial-gradient(circle,#dfdfdf,#8a8a8a);margin-left:5px}.App-nav-bar .App-center-chat-status.on-line[data-v-5f07166d]{background:radial-gradient(circle,#26d189,#0ea04d)}.App-nav-bar[data-v-5f07166d] .van-nav-bar__title{font-weight:600;font-size:16px}.App-nav-bar__noBottomLine[data-v-5f07166d]:after{border-bottom-width:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -11972,7 +11972,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 
 /***/ }),
 
-/***/ 1848:
+/***/ 9467:
 /***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
 
 //! moment.js locale configuration
@@ -18252,8 +18252,8 @@ var map = {
 	"./lv.js": 9532,
 	"./me": 8076,
 	"./me.js": 8076,
-	"./mi": 1848,
-	"./mi.js": 1848,
+	"./mi": 9467,
+	"./mi.js": 9467,
 	"./mk": 306,
 	"./mk.js": 306,
 	"./ml": 3739,
@@ -25817,19 +25817,19 @@ var update = add("3f2c2b22", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 7920:
+/***/ 1848:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(1380);
+var content = __webpack_require__(9436);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("17dfcd5e", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("086b62aa", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -26970,14 +26970,14 @@ var AppFieldCell_component = normalizeComponent(
 )
 
 /* harmony default export */ var AppFieldCell = (AppFieldCell_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=template&id=e4d402b2&scoped=true
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=template&id=5f07166d&scoped=true
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var AppHeadervue_type_template_id_e4d402b2_scoped_true_render = function render() {
+var AppHeadervue_type_template_id_5f07166d_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.isLoaded && _vm.isShow ? _c('van-nav-bar', {
@@ -27084,7 +27084,7 @@ var AppHeadervue_type_template_id_e4d402b2_scoped_true_render = function render(
     }
   })], 1) : _vm._e()], 1);
 };
-var AppHeadervue_type_template_id_e4d402b2_scoped_true_staticRenderFns = [];
+var AppHeadervue_type_template_id_5f07166d_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=script&lang=js
 function AppHeadervue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return AppHeadervue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, AppHeadervue_type_script_lang_js_typeof(o); }
@@ -27168,10 +27168,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(window.wxCfg && navigator.userAgent.indexOf('Android') !== -1)) {
-                _context.next = 5;
+                _context.next = 4;
                 break;
               }
-              _this.setWxGobackFloatBtn();
               if (window.wxgobakMode === 'topbarBtn') {
                 window.layout = '';
                 mainTabbar = document.querySelector('.main-tabbar') || document.querySelector('.navbar_bottom'); //主界面底部导航栏
@@ -27183,25 +27182,29 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
                 } else {
                   window.layout = '';
                 }
+              } else {
+                _this.setWxGobackFloatBtn();
               }
               _context.next = 12;
               break;
-            case 5:
+            case 4:
               if (!((window.layout === 'H5' || window.flutter_inappwebview) && (_this.appPadding === 0 || _this.appPadding === 24))) {
                 _context.next = 12;
                 break;
               }
-              _context.next = 8;
+              _context.next = 7;
               return _this.$wv.getSystemStatusBarHeight();
-            case 8:
+            case 7:
               _context.t0 = _context.sent;
               if (_context.t0) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
               _context.t0 = 24;
-            case 11:
+            case 10:
               _this.appPadding = _context.t0;
+              //非安卓微信版本，不显示返回按钮
+              window.wxgobakMode = '';
             case 12:
               _this.handleHeaderLineConfig(val);
               _this.isLoaded = true;
@@ -27235,27 +27238,25 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
               //安卓微信版本，显示顶部导航栏，但是不需要预留顶部系统状态栏空间
               _this3.appPadding = 0;
             }
-            _context2.next = 12;
+            _context2.next = 11;
             break;
           case 4:
-            //非安卓微信版本，不显示返回按钮
-            window.wxgobakMode = '';
             if (!((window.layout === 'H5' || window.flutter_inappwebview) && (_this3.appPadding === 0 || _this3.appPadding === 24))) {
-              _context2.next = 12;
+              _context2.next = 11;
               break;
             }
-            _context2.next = 8;
+            _context2.next = 7;
             return _this3.$wv.getSystemStatusBarHeight();
-          case 8:
+          case 7:
             _context2.t0 = _context2.sent;
             if (_context2.t0) {
-              _context2.next = 11;
+              _context2.next = 10;
               break;
             }
             _context2.t0 = 24;
-          case 11:
+          case 10:
             _this3.appPadding = _context2.t0;
-          case 12:
+          case 11:
             _this3.$bus.on('setTitle', _this3.handleSetTitle);
             _this3.$bus.on('setCenterImage', _this3.handleSetCenterImage);
             _this3.$bus.on('setLeftText', _this3.handleSetLeftText);
@@ -27264,7 +27265,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
             _this3.$bus.on('setRightImage', _this3.handleSetRightImage);
             _this3.$bus.on('showBack', _this3.handleShowBack);
             _this3.$bus.on('basicformOpened', _this3.setWxGobackFloatBtn);
-          case 20:
+          case 19:
           case "end":
             return _context2.stop();
         }
@@ -27288,19 +27289,30 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
     setWxGobackFloatBtn: function setWxGobackFloatBtn() {
       var _this4 = this;
       if (window.wxCfg && navigator.userAgent.indexOf('Android') !== -1) {
-        if (window.wxgobakMode === 'floatBtn') {
-          this.showGobackBtn = false;
+        this.showGobackBtn = false;
+        console.log(window.wxgobakMode, location.href);
+        if (window.wxgobakMode === 'floatBtn' && location.href.indexOf('#/wflow?wfEngineUrl=') === -1) {
           setTimeout(function () {
             //当前页面无关闭按钮，显示浮动返回按钮
             var mainTabbar = document.querySelector('.main-tabbar') || document.querySelector('.navbar_bottom'); //主界面底部导航栏
+            var gobackBtn = document.querySelector('.goback-btn'); //列表页面关闭按钮
             var closeBtn = document.querySelector('#btn_close'); //表单页面关闭按钮
-
-            if (!mainTabbar && !closeBtn) {
+            if (!mainTabbar && !gobackBtn && !closeBtn) {
               _this4.showGobackBtn = true;
-            } else if (mainTabbar && location.href.indexOf('addressBook?STACK') !== -1) {
+            } else if (mainTabbar && (location.href.indexOf('#/addressBook?') !== -1 || location.href.indexOf('#/calendar?') !== -1 || location.href.indexOf('#/portalMessage?') !== -1)) {
               //显示通讯录人员列表
               _this4.showGobackBtn = true;
             }
+            if (_this4.showGobackBtn) {
+              _this4.$nextTick(function () {
+                var floatButtonGroup = document.querySelector('.floatbtn-group-container');
+                if (location.href.indexOf('#/addressBook?') !== -1) {
+                  floatButtonGroup.style.zIndex = 3001;
+                } else {
+                  floatButtonGroup.style.zIndex = 2001;
+                }
+              });
+            }
           }, 0);
         }
       }
@@ -27429,9 +27441,9 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=script&lang=js
  /* harmony default export */ var App_AppHeadervue_type_script_lang_js = (AppHeadervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=e4d402b2&prod&lang=scss&scoped=true
-var AppHeadervue_type_style_index_0_id_e4d402b2_prod_lang_scss_scoped_true = __webpack_require__(7920);
-;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=e4d402b2&prod&lang=scss&scoped=true
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=5f07166d&prod&lang=scss&scoped=true
+var AppHeadervue_type_style_index_0_id_5f07166d_prod_lang_scss_scoped_true = __webpack_require__(1848);
+;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue?vue&type=style&index=0&id=5f07166d&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/App/AppHeader.vue
 
@@ -27444,11 +27456,11 @@ var AppHeadervue_type_style_index_0_id_e4d402b2_prod_lang_scss_scoped_true = __w
 
 var AppHeader_component = normalizeComponent(
   App_AppHeadervue_type_script_lang_js,
-  AppHeadervue_type_template_id_e4d402b2_scoped_true_render,
-  AppHeadervue_type_template_id_e4d402b2_scoped_true_staticRenderFns,
+  AppHeadervue_type_template_id_5f07166d_scoped_true_render,
+  AppHeadervue_type_template_id_5f07166d_scoped_true_staticRenderFns,
   false,
   null,
-  "e4d402b2",
+  "5f07166d",
   null
   
 )