Merge remote-tracking branch 'origin/bww-v1' into wxl-develop

1726dcba · wangxuelai · 7f0d65be · 6ea51561 · 1726dcba · 1726dcba
Commit 1726dcba authored Dec 30, 2019 by wangxuelai
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 4 deletions

index.html index.html +1 -1

login.js src/models/login.js +6 -0

webapp.js src/models/webapp.js +9 -0

index.js src/pages/institutions/rolemanage/index.js +3 -3

No files found.
--- a/index.html
+++ b/index.html
@@ -18,6 +18,6 @@
 </head>
 <body>
  <div id="root"></div>
-  <script src="dist/main.js?1577691544208" charset="utf-8"></script>
+  <script src="dist/main.js?1577694105431" charset="utf-8"></script>
 </body>
 </html>
\ No newline at end of file
--- a/src/models/login.js
+++ b/src/models/login.js
@@ -165,6 +165,12 @@ export default {
      }
      const data = yield call(login.newLogin, params);
      if (data.code === 200) {
+        yield put({
+          type: 'updateState',
+          payload: {
+            qxLoading: false,
+          },
+        });
        if (data.data && data.data.token) {
          LocalStorage.setItem('user', {
            expiresIn: data.data.expiresIn,

--- a/src/models/webapp.js
+++ b/src/models/webapp.js
@@ -135,12 +135,21 @@ export default {
          dispatch({
            type: 'judgeexpire',
          });
+          dispatch({
+            type: 'login/pageInit',
+          });
        }
        if (pathname === '/register') {
          console.log('/register');
+          dispatch({
+            type: 'login/pageInit',
+          });
        }
        if (pathname === '/resetpsd') {
          console.log('/resetpsd');
+          dispatch({
+            type: 'login/pageInit',
+          });
        }
        if (pathname === '/sjd/registerinfo') {
          dispatch({

--- a/src/pages/institutions/rolemanage/index.js
+++ b/src/pages/institutions/rolemanage/index.js
@@ -96,7 +96,7 @@ class RoleManageForm extends React.Component {
        width: 200,
      },
      {
-        title: '用户列表',
+        title: '成员列表',
        dataIndex: 'users',
        key: 'users',
        render: (text, record) => {
@@ -110,7 +110,7 @@ class RoleManageForm extends React.Component {
        },
      },
      {
-        title: '操作',
+        title: '管理操作',
        dataIndex: 'call',
        key: 'call',
        width: 100,
@@ -118,7 +118,7 @@ class RoleManageForm extends React.Component {
          return (
            <div>
              <BtnPermission btnId="70005">
-                <span className="hreflink" onClick={() => this.lookDetail(record)}>查看</span>
+                <span className="hreflink" onClick={() => this.lookDetail(record)}>修改权限</span>
              </BtnPermission>
            </div>
          );