easy3wmui 0.0.42-beta2 → 0.0.42-beta21

package/lib/Easy3wMLogin/index.js

@@ -56,6 +56,12 @@ var Easy3wMLogin = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
+    _this.onChange = function (key) {
+      _this.setState({
+        activeKey: key // 标签页的key
+      });
+    };
+
     _this.checkCaptcha = function (rule, value, callback) {
       var captcharesult = _this.state.captcharesult;
 
@@ -75,6 +81,52 @@ var Easy3wMLogin = function (_Component) {
       });
     };
 
+    _this.touchSetPassword = function () {
+      var visible = _this.state.visible;
+
+      _this.setState({
+        visible: !visible // 密码显示隐藏
+      });
+    };
+
+    _this.toPage = function (operationType) {
+      var toPage = _this.props.toPage;
+
+      if (toPage && typeof toPage === 'function') {
+        toPage(operationType);
+      }
+    };
+
+    _this.showModal = function (operationType) {
+      var showModal = _this.props.showModal;
+
+      if (showModal && typeof showModal === 'function') {
+        showModal(operationType);
+      }
+    };
+
+    _this.touchSendCode = function () {
+      var touchSendCode = _this.props.touchSendCode;
+
+      if (touchSendCode && typeof touchSendCode === 'function') {
+        touchSendCode(function (countProps) {
+          var count = countProps || 59;
+          _this.setState({
+            count: count // 验证码时间
+          });
+          _this.interval = setInterval(function () {
+            count -= 1;
+            _this.setState({
+              count: count // 验证码时间
+            });
+            if (count === 0) {
+              clearInterval(_this.interval);
+            }
+          }, 1000);
+        });
+      }
+    };
+
     _this.submitAccountLogin = function (values) {
       var handleOk = _this.props.handleOk;
       // this.props.form.validateFields().then((values) => {
@@ -85,17 +137,15 @@ var Easy3wMLogin = function (_Component) {
       // });
     };
 
-    _this.touchSetPassword = function () {
-      var visible = _this.state.visible;
-
-      _this.setState({
-        visible: !visible // 密码显示隐藏
-      });
-    };
+    var activeKey = _this.props.activeKey;
 
     _this.state = {
+      activeKey: activeKey || 'account', // 标签页的key
+      // 账号密码登录
       captcharesult: '', // 验证码--state
-      visible: false // 密码显示隐藏
+      visible: false, // 密码显示隐藏
+      // 账号密码登录
+      count: 0 // 手机验证码登录
     };
     return _this;
   }
@@ -103,22 +153,44 @@ var Easy3wMLogin = function (_Component) {
   Easy3wMLogin.prototype.componentWillUnmount = function componentWillUnmount() {};
   // 生成form实例
   // formRef = React.createRef()
+  // 切换标签页
+
+  // --------------------------------------- 账号密码登录 start ---------------------------------------
   // 校验验证码
 
   // 生成校验码
 
-  // 提交
-
   // 密码显示隐藏
 
+  // 跳转忘记密码
+
+  // 显示联系客服弹窗
+
+  // --------------------------------------- 账号密码登录 end -----------------------------------------
+  // --------------------------------------- 手机验证码登录 start ---------------------------------------
+  // 发送验证码
+
+  // --------------------------------------- 手机验证码登录 end -----------------------------------------
+  // 提交
+
 
   Easy3wMLogin.prototype.render = function render() {
+    var _this2 = this;
+
+    var _state = this.state,
+        visible = _state.visible,
+        activeKey = _state.activeKey,
+        count = _state.count;
     var _props = this.props,
         form = _props.form,
         status = _props.status,
         submitting = _props.submitting,
-        errorMsg = _props.errorMsg;
-    var visible = this.state.visible;
+        errorMsg = _props.errorMsg,
+        objLoginMethod = _props.objLoginMethod;
+
+    var _ref = objLoginMethod || {},
+        account = _ref.account,
+        phone = _ref.phone;
 
     var errorMsgReal = errorMsg || '账户或密码错误';
     return _react2['default'].createElement(
@@ -126,22 +198,39 @@ var Easy3wMLogin = function (_Component) {
       { id: 'Easy3wMLogin' },
       _react2['default'].createElement(
         _tabs2['default'],
-        { activeKey: 'account', onChange: this.onChange },
-        _react2['default'].createElement(
+        { activeKey: activeKey, onChange: this.onChange },
+        account ? _react2['default'].createElement(
           Tab,
-          { title: '\u7528\u6237\u767B\u5F55', key: 'account' },
+          { title: '\u8D26\u53F7\u5BC6\u7801\u767B\u5F55', key: 'account', destroyOnClose: true },
           _react2['default'].createElement(
             _form2['default'],
             {
-              // ref={this.formRef}
               onFinish: this.submitAccountLogin,
               form: form,
-              layout: 'horizontal' // 字段与
-              , name: 'login',
+              layout: 'horizontal' // 字段与字段值排列方式
+              , name: 'account',
               footer: // 表单尾部的内容，常常用来放置提交按钮
               _react2['default'].createElement(
                 'div',
                 null,
+                _react2['default'].createElement(
+                  'div',
+                  { className: 'funArea' },
+                  _react2['default'].createElement(
+                    'a',
+                    { 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(
                   _button2['default'],
                   { color: 'primary', fill: 'solid', block: true, type: 'primary', htmlType: 'submit' },
@@ -190,7 +279,61 @@ var Easy3wMLogin = function (_Component) {
               _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801 \u4E0D\u533A\u5206\u5927\u5C0F\u5199' })
             )
           )
-        )
+        ) : '',
+        phone ? _react2['default'].createElement(
+          Tab,
+          { title: '\u624B\u673A\u9A8C\u8BC1\u7801\u767B\u5F55', key: 'phone', destroyOnClose: true },
+          _react2['default'].createElement(
+            _form2['default'],
+            {
+              form: form,
+              layout: 'horizontal' // 字段与字段值排列方式
+              , name: 'phone',
+              onFinish: this.submitAccountLogin,
+              footer: // 表单尾部的内容，常常用来放置提交按钮
+              _react2['default'].createElement(
+                'div',
+                null,
+                _react2['default'].createElement(
+                  _button2['default'],
+                  { type: 'submit', color: 'primary', fill: 'solid', block: true },
+                  '\u767B\u5F55'
+                )
+              )
+            },
+            status === 'error' && submitting === false ? _react2['default'].createElement(
+              FormItem,
+              null,
+              _react2['default'].createElement(
+                'div',
+                { className: 'errorMsgReal' },
+                errorMsgReal
+              )
+            ) : '',
+            _react2['default'].createElement(
+              FormItem,
+              { name: 'phone', rules: [{ pattern: /^1\d{10}$/, required: true, message: '手机格式错误' }] },
+              _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u624B\u673A\u53F7' })
+            ),
+            _react2['default'].createElement(
+              FormItem,
+              {
+                name: 'piccaptcha',
+                extra: count ? _react2['default'].createElement(
+                  _button2['default'],
+                  { size: 'small', type: 'button' },
+                  count,
+                  's'
+                ) : _react2['default'].createElement(
+                  _button2['default'],
+                  { size: 'small', type: 'button', onClick: this.touchSendCode },
+                  '\u53D1\u9001\u9A8C\u8BC1\u7801'
+                )
+              },
+              _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801 \u4E0D\u533A\u5206\u5927\u5C0F\u5199' })
+            )
+          )
+        ) : ''
       )
     );
   };

package/lib/Easy3wMSpin/index.js

@@ -2,14 +2,6 @@
 
 exports.__esModule = true;
 
-var _spinLoading = require('antd-mobile/es/components/spin-loading');
-
-var _spinLoading2 = _interopRequireDefault(_spinLoading);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
 var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -51,7 +43,12 @@ var Easy3wMSpin = function (_Component) {
       return _react2['default'].createElement(
         'div',
         { id: 'Easy3wMSpin' },
-        _react2['default'].createElement(_spinLoading2['default'], (0, _extends3['default'])({ color: 'primary', className: 'spinLoading' }, this.props))
+        _react2['default'].createElement('img', { src: 'common/easy3wloading.gif', alt: 'logo', style: { height: '14px', width: '14px' } }),
+        _react2['default'].createElement(
+          'div',
+          null,
+          '\u540E\u53F0\u5904\u7406\u4E2D......'
+        )
       );
     } else {
       return '';

package/lib/Easy3wMSpin/index.less

@@ -1,15 +1,15 @@
 #Easy3wMSpin { // 锁屏加载
-	position: fixed;
-	background: rgba(255, 255, 255, 0);
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 9999;
-	.spinLoading { // 内容
-		position: relative;
-		left: 50%;
-		top: 50%;
-		--size: 48px;
-	}
+  position: fixed;
+  background: rgba(255, 255, 255, 0);
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+  .spinLoading { // 内容
+    position: relative;
+    left: 50%;
+    top: 50%;
+    --size: 48px;
+  }
 }

package/lib/Easy3wMUserLayout/index.js

@@ -78,6 +78,7 @@ var Easy3wMUserLayout = function (_PureComponent) {
         copyrightContent = _props.copyrightContent,
         headerElem = _props.headerElem,
         links = _props.links,
+        bottomFixed = _props.bottomFixed,
         rootRedirectPath = _props.rootRedirectPath,
         routeDataLayout = _props.routeDataLayout,
         backImg = _props.backImg,
@@ -123,6 +124,7 @@ var Easy3wMUserLayout = function (_PureComponent) {
           )
         ),
         copyRightFlag ? _react2['default'].createElement(_Easy3wMGlobalFooter2['default'], {
+          bottomFixed: bottomFixed,
           links: links,
           copyright: copyright
         }) : ''

package/lib/Easy3wMUserLayout/index.less

@@ -1,11 +1,13 @@
 #Easy3wMUserLayout {
-	.Easy3wMUserLayoutContent { // 内容
-		background-color: #f0f2f5;
-		width: 100%;
-		min-height: 100%;
-		background-repeat: no-repeat;
-		background-position: center;
-		background-size: 100%;
-		padding: 40px 0 0 0;
-	}
+  height: 100%;
+  .Easy3wMUserLayoutContent { // 内容
+    background-color: #f0f2f5;
+    width: 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-beta2",
+  "version": "0.0.42-beta21",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",