easy3wmui 0.0.42-beta20 → 0.0.42-beta22

package/assets/index.css

@@ -134,11 +134,6 @@
 #Easy3wMGlobalFooter {
   text-align: center;
 }
-#Easy3wMGlobalFooter.bottomFixed {
-  width: 100%;
-  position: fixed;
-  bottom: 0;
-}
 #Easy3wMInsideLayout {
   overflow: hidden;
 }
@@ -344,7 +339,13 @@
   border-left: 0;
   background-color: transparent;
 }
-#Easy3wMLogin .forgotPassword {
+#Easy3wMLogin .funArea {
   text-align: right;
   margin-bottom: 24px;
 }
+#Easy3wMLogin .funArea > a {
+  padding-right: 12px;
+}
+#Easy3wMLogin .funArea > a:last-child {
+  padding-right: 0;
+}

package/assets/mGlobalFooter.css

@@ -1,8 +1,3 @@
 #Easy3wMGlobalFooter {
   text-align: center;
 }
-#Easy3wMGlobalFooter.bottomFixed {
-  width: 100%;
-  position: fixed;
-  bottom: 0;
-}

package/assets/mLogin.css

@@ -46,7 +46,13 @@
   border-left: 0;
   background-color: transparent;
 }
-#Easy3wMLogin .forgotPassword {
+#Easy3wMLogin .funArea {
   text-align: right;
   margin-bottom: 24px;
 }
+#Easy3wMLogin .funArea > a {
+  padding-right: 12px;
+}
+#Easy3wMLogin .funArea > a:last-child {
+  padding-right: 0;
+}

package/lib/Easy3wMGlobalFooter/index.js

@@ -36,15 +36,13 @@ var Easy3wMGlobalFooter = function (_Component) {
 
   Easy3wMGlobalFooter.prototype.render = function render() {
     var _props = this.props,
-        bottomFixed = _props.bottomFixed,
         className = _props.className,
         links = _props.links,
         copyright = _props.copyright;
 
-    var clsString = (0, _classnames2['default'])(className, { bottomFixed: bottomFixed });
     return _react2['default'].createElement(
       'div',
-      { id: 'Easy3wMGlobalFooter', className: clsString },
+      { id: 'Easy3wMGlobalFooter', className: (0, _classnames2['default'])(className) },
       links && _react2['default'].createElement(
         'div',
         null,

package/lib/Easy3wMLogin/index.js

@@ -89,11 +89,19 @@ var Easy3wMLogin = function (_Component) {
       });
     };
 
-    _this.toPageForgot = function () {
-      var toPageForgot = _this.props.toPageForgot;
+    _this.toPage = function (operationType) {
+      var toPage = _this.props.toPage;
 
-      if (toPageForgot && typeof toPageForgot === 'function') {
-        toPageForgot();
+      if (toPage && typeof toPage === 'function') {
+        toPage(operationType);
+      }
+    };
+
+    _this.showModal = function (operationType) {
+      var showModal = _this.props.showModal;
+
+      if (showModal && typeof showModal === 'function') {
+        showModal(operationType);
       }
     };
 
@@ -156,6 +164,8 @@ var Easy3wMLogin = function (_Component) {
 
   // 跳转忘记密码
 
+  // 显示联系客服弹窗
+
   // --------------------------------------- 账号密码登录 end -----------------------------------------
   // --------------------------------------- 手机验证码登录 start ---------------------------------------
   // 发送验证码
@@ -165,6 +175,8 @@ var Easy3wMLogin = function (_Component) {
 
 
   Easy3wMLogin.prototype.render = function render() {
+    var _this2 = this;
+
     var _state = this.state,
         visible = _state.visible,
         activeKey = _state.activeKey,
@@ -203,11 +215,20 @@ var Easy3wMLogin = function (_Component) {
                 null,
                 _react2['default'].createElement(
                   'div',
-                  { className: 'forgotPassword' },
+                  { className: 'funArea' },
                   _react2['default'].createElement(
                     'a',
-                    { onClick: this.toPageForgot },
+                    { onClick: function onClick() {
+                        return _this2.toPage('forgotPassword');
+                      } },
                     '\u5FD8\u8BB0\u5BC6\u7801'
+                  ),
+                  _react2['default'].createElement(
+                    'a',
+                    { onClick: function onClick() {
+                        return _this2.showModal('customerService');
+                      } },
+                    '\u8054\u7CFB\u5BA2\u670D'
                   )
                 ),
                 _react2['default'].createElement(

package/lib/Easy3wMUserLayout/index.less

@@ -1,11 +1,15 @@
 #Easy3wMUserLayout {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
   .Easy3wMUserLayoutContent { // 内容
     background-color: #f0f2f5;
     width: 100%;
-    min-height: 100%;
+    // min-height: 100%;
     background-repeat: no-repeat;
     background-position: center;
     background-size: 100%;
     padding: 40px 0 0 0;
+    flex-grow: 1;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wmui",
-  "version": "0.0.42-beta20",
+  "version": "0.0.42-beta22",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",