Merge branch 'develop' into test

miniprogram/pages/index/index.js

@@ -95,68 +95,80 @@ Page({
         if (this.validateLoginData()) {
             var _a = this.data, account_1 = _a.account, pwd_1 = _a.pwd;
             console.log(account_1, pwd_1);
-            wx.login({
+            wx.requestSubscribeMessage({
+                tmplIds: ['WU2yMHKM_yNPLGHRsstggsDYnZhKoHIg4heM2fZkD5I'],
                 success: function (res) {
-                    if (res.code) {
-                        var code_2 = res.code;
-                        wx.showLoading({ title: '' });
-                        fetch_1.systemFetch({
-                            url: '/login/verifyCode',
-                        })
-                            .then(function (res) {
-                            console.log(res);
-                            return {
-                                verifyCode: res.data.verifyCode,
-                                cookie: res.header['Set-Cookie'],
-                            };
-                        })
-                            .then(function (_a) {
-                            var verifyCode = _a.verifyCode, cookie = _a.cookie;
-                            var mixpwd = md5(pwd_1);
-                            return fetch_1.systemFetch({
-                                url: '/boss/login',
-                                method: 'POST',
-                                header: {
-                                    cookie: cookie,
-                                },
-                                data: {
-                                    code: code_2,
-                                    account: account_1,
-                                    pwd: mixpwd,
-                                    varifyCode: verifyCode,
-                                },
-                            });
-                        })
-                            .then(function (res) {
-                            console.log(res);
-                            var token = res.token, _a = res.data, userInfo = _a.userInfo, userRoles = _a.userRoles;
-                            app.globalData.token = token;
-                            app.globalData.userInfo = userInfo;
-                            app.globalData.userRoles = userRoles;
-                            try {
-                                wx.setStorageSync('token', token);
+                    console.log('in success', res);
+                },
+                fail: function (res) {
+                    console.log('in fail', res);
+                },
+                complete: function (res) {
+                    console.log('in complete', res);
+                    wx.login({
+                        success: function (res) {
+                            if (res.code) {
+                                var code_2 = res.code;
+                                wx.showLoading({ title: '' });
+                                fetch_1.systemFetch({
+                                    url: '/login/verifyCode',
+                                })
+                                    .then(function (res) {
+                                    console.log(res);
+                                    return {
+                                        verifyCode: res.data.verifyCode,
+                                        cookie: res.header['Set-Cookie'],
+                                    };
+                                })
+                                    .then(function (_a) {
+                                    var verifyCode = _a.verifyCode, cookie = _a.cookie;
+                                    var mixpwd = md5(pwd_1);
+                                    return fetch_1.systemFetch({
+                                        url: '/boss/login',
+                                        method: 'POST',
+                                        header: {
+                                            cookie: cookie,
+                                        },
+                                        data: {
+                                            code: code_2,
+                                            account: account_1,
+                                            pwd: mixpwd,
+                                            varifyCode: verifyCode,
+                                        },
+                                    });
+                                })
+                                    .then(function (res) {
+                                    console.log(res);
+                                    var token = res.token, _a = res.data, userInfo = _a.userInfo, userRoles = _a.userRoles;
+                                    app.globalData.token = token;
+                                    app.globalData.userInfo = userInfo;
+                                    app.globalData.userRoles = userRoles;
+                                    try {
+                                        wx.setStorageSync('token', token);
+                                    }
+                                    catch (error) { }
+                                    wx.hideLoading();
+                                    wx.redirectTo({
+                                        url: '/pages/homeAndReport/homeAndReport',
+                                    });
+                                })
+                                    .catch(function (err) {
+                                    console.log(err);
+                                    wx.hideLoading();
+                                    wx.showToast({
+                                        title: err.errMsg,
+                                        icon: 'none',
+                                    });
+                                });
                             }
-                            catch (error) { }
-                            wx.hideLoading();
-                            wx.redirectTo({
-                                url: '/pages/homeAndReport/homeAndReport',
-                            });
-                        })
-                            .catch(function (err) {
-                            console.log(err);
-                            wx.hideLoading();
-                            wx.showToast({
-                                title: err.errMsg,
-                                icon: 'none',
-                            });
-                        });
-                    }
-                    else {
-                        wx.showToast({
-                            title: '登录获取code失败',
-                            icon: 'none',
-                        });
-                    }
+                            else {
+                                wx.showToast({
+                                    title: '登录获取code失败',
+                                    icon: 'none',
+                                });
+                            }
+                        },
+                    });
                 },
             });
         }
@@ -221,4 +233,4 @@ Page({
         var _a;
     },
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["//index.js\nimport { systemFetch } from '../../api/fetch';\nconst md5 = require('blueimp-md5');\n//获取应用实例\nimport { IMyApp } from '../../app';\nconst app = getApp<IMyApp>();\n\nPage({\n  onLoad() {\n    if (app.globalData.token) {\n      this.tokenLoagin();\n    }\n  },\n  data: {\n    account: '',\n    pwd: '',\n    showPassword: false,\n  },\n  togglePassword() {\n    this.setData!({\n      showPassword: !this.data.showPassword,\n    });\n  },\n  validateLoginData() {\n    const { account, pwd } = this.data;\n    if (!account) {\n      wx.showToast({\n        title: '请输入账户',\n        icon: 'none',\n      });\n      return;\n    }\n    if (!pwd) {\n      wx.showToast({\n        title: '请输入密码',\n        icon: 'none',\n      });\n      return;\n    }\n    return true;\n  },\n  tokenLoagin() {\n    wx.login({\n      success: res => {\n        if (res.code) {\n          const code = res.code;\n\n          wx.showLoading({ title: '登陆中' });\n          systemFetch({\n            url: '/login/verifyCode',\n          })\n            .then((res: wx.RequestSuccessCallbackResult) => {\n              console.log(res);\n              return {\n                code: res.data.verifyCode,\n                cookie: res.header['Set-Cookie'],\n              };\n            })\n            .then(({ cookie }: { code: string; cookie: string }) =>\n              systemFetch({\n                url: '/boss/login',\n                method: 'POST',\n                header: {\n                  cookie: cookie,\n                },\n                data: {\n                  code,\n                  token: app.globalData.token,\n                },\n              }),\n            )\n            .then(res => {\n              console.log(res);\n              const {\n                token,\n                data: { userInfo, userRoles },\n              } = res;\n              app.globalData.token = token;\n              app.globalData.userInfo = userInfo;\n              app.globalData.userRoles = userRoles;\n              wx.hideLoading();\n              wx.redirectTo({\n                url: '/pages/homeAndReport/homeAndReport',\n              });\n            })\n            .catch(err => {\n              console.log(err);\n              wx.hideLoading();\n              wx.showToast({\n                title: err.errMsg,\n                icon: 'none',\n              });\n            });\n        }\n      },\n    });\n  },\n  loginHandle() {\n    console.log(app.globalData);\n    if (this.validateLoginData()) {\n      const { account, pwd } = this.data;\n      console.log(account, pwd);\n      wx.login({\n        success: res => {\n          if (res.code) {\n            const code = res.code;\n            wx.showLoading({ title: '' });\n            systemFetch({\n              url: '/login/verifyCode',\n            })\n              .then((res: wx.RequestSuccessCallbackResult) => {\n                console.log(res);\n                return {\n                  verifyCode: res.data.verifyCode,\n                  cookie: res.header['Set-Cookie'],\n                };\n              })\n              .then(\n                ({\n                  verifyCode,\n                  cookie,\n                }: {\n                  verifyCode: string;\n                  cookie: string;\n                }) => {\n                  let mixpwd = md5(pwd);\n                  return systemFetch({\n                    url: '/boss/login',\n                    method: 'POST',\n                    header: {\n                      cookie: cookie,\n                    },\n                    data: {\n                      code,\n                      account,\n                      pwd: mixpwd,\n                      varifyCode: verifyCode,\n                    },\n                  });\n                },\n              )\n              .then(res => {\n                console.log(res);\n                const {\n                  token,\n                  data: { userInfo, userRoles },\n                } = res;\n                app.globalData.token = token;\n                app.globalData.userInfo = userInfo;\n                app.globalData.userRoles = userRoles;\n                try {\n                  wx.setStorageSync('token', token);\n                } catch (error) {}\n                wx.hideLoading();\n                wx.redirectTo({\n                  url: '/pages/homeAndReport/homeAndReport',\n                });\n              })\n              .catch(err => {\n                console.log(err);\n                wx.hideLoading();\n                wx.showToast({\n                  title: err.errMsg,\n                  icon: 'none',\n                });\n              });\n          } else {\n            wx.showToast({\n              title: '登录获取code失败',\n              icon: 'none',\n            });\n          }\n        },\n      });\n    }\n    // fetch()\n    // wx.redirectTo({\n    //   url: '/pages/home/home'\n    // })\n  },\n  codeLogin() {\n    wx.login({\n      success: res => {\n        if (res.code) {\n          const code = res.code;\n          systemFetch({\n            url: '/boss/login',\n            method: 'POST',\n            data: {\n              code,\n            },\n          })\n            .then(res => {\n              console.log(res);\n              const {\n                token,\n                data: { userInfo, userRoles },\n              } = res;\n              app.globalData.token = token;\n              app.globalData.userInfo = userInfo;\n              app.globalData.userRoles = userRoles;\n              try {\n                wx.setStorageSync('token', token);\n              } catch (error) {}\n              wx.hideLoading();\n              wx.redirectTo({\n                url: '/pages/homeAndReport/homeAndReport',\n              });\n            })\n            .catch(err => {\n              console.log(err);\n              wx.hideLoading();\n              wx.showToast({\n                title: err.errMsg,\n                icon: 'none',\n              });\n            });\n        } else {\n          wx.showToast({\n            title: '登录获取code失败',\n            icon: 'none',\n          });\n        }\n      },\n    });\n  },\n  nameInputHandle(e) {\n    const value = e.detail.value;\n    this.updateInputValue('account', value);\n  },\n  passwardInoutHandle(e) {\n    const value = e.detail.value;\n    this.updateInputValue('pwd', value);\n  },\n  updateInputValue(key: string, value: string) {\n    this.setData!({\n      [key]: value,\n    });\n  },\n});\n"]}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["//index.js\nimport { systemFetch } from '../../api/fetch';\nconst md5 = require('blueimp-md5');\n//获取应用实例\nimport { IMyApp } from '../../app';\nconst app = getApp<IMyApp>();\n\nPage({\n  onLoad() {\n    if (app.globalData.token) {\n      this.tokenLoagin();\n    }\n  },\n  data: {\n    account: '',\n    pwd: '',\n    showPassword: false,\n  },\n  togglePassword() {\n    this.setData!({\n      showPassword: !this.data.showPassword,\n    });\n  },\n  validateLoginData() {\n    const { account, pwd } = this.data;\n    if (!account) {\n      wx.showToast({\n        title: '请输入账户',\n        icon: 'none',\n      });\n      return;\n    }\n    if (!pwd) {\n      wx.showToast({\n        title: '请输入密码',\n        icon: 'none',\n      });\n      return;\n    }\n    return true;\n  },\n  tokenLoagin() {\n    wx.login({\n      success: res => {\n        if (res.code) {\n          const code = res.code;\n\n          wx.showLoading({ title: '登陆中' });\n          systemFetch({\n            url: '/login/verifyCode',\n          })\n            .then((res: wx.RequestSuccessCallbackResult) => {\n              console.log(res);\n              return {\n                code: res.data.verifyCode,\n                cookie: res.header['Set-Cookie'],\n              };\n            })\n            .then(({ cookie }: { code: string; cookie: string }) =>\n              systemFetch({\n                url: '/boss/login',\n                method: 'POST',\n                header: {\n                  cookie: cookie,\n                },\n                data: {\n                  code,\n                  token: app.globalData.token,\n                },\n              }),\n            )\n            .then(res => {\n              console.log(res);\n              const {\n                token,\n                data: { userInfo, userRoles },\n              } = res;\n              app.globalData.token = token;\n              app.globalData.userInfo = userInfo;\n              app.globalData.userRoles = userRoles;\n              wx.hideLoading();\n              wx.redirectTo({\n                url: '/pages/homeAndReport/homeAndReport',\n              });\n            })\n            .catch(err => {\n              console.log(err);\n              wx.hideLoading();\n              wx.showToast({\n                title: err.errMsg,\n                icon: 'none',\n              });\n            });\n        }\n      },\n    });\n  },\n  loginHandle() {\n    console.log(app.globalData);\n    if (this.validateLoginData()) {\n      const { account, pwd } = this.data;\n      console.log(account, pwd);\n      wx.requestSubscribeMessage({\n        tmplIds: ['WU2yMHKM_yNPLGHRsstggsDYnZhKoHIg4heM2fZkD5I'],\n        success(res) {\n          console.log('in success', res);\n        },\n        fail(res) {\n          console.log('in fail', res);\n        },\n        complete(res) {\n          console.log('in complete', res);\n          wx.login({\n            success: res => {\n              if (res.code) {\n                const code = res.code;\n                wx.showLoading({ title: '' });\n                systemFetch({\n                  url: '/login/verifyCode',\n                })\n                  .then((res: wx.RequestSuccessCallbackResult) => {\n                    console.log(res);\n                    return {\n                      verifyCode: res.data.verifyCode,\n                      cookie: res.header['Set-Cookie'],\n                    };\n                  })\n                  .then(\n                    ({\n                      verifyCode,\n                      cookie,\n                    }: {\n                      verifyCode: string;\n                      cookie: string;\n                    }) => {\n                      let mixpwd = md5(pwd);\n                      return systemFetch({\n                        url: '/boss/login',\n                        method: 'POST',\n                        header: {\n                          cookie: cookie,\n                        },\n                        data: {\n                          code,\n                          account,\n                          pwd: mixpwd,\n                          varifyCode: verifyCode,\n                        },\n                      });\n                    },\n                  )\n                  .then(res => {\n                    console.log(res);\n                    const {\n                      token,\n                      data: { userInfo, userRoles },\n                    } = res;\n                    app.globalData.token = token;\n                    app.globalData.userInfo = userInfo;\n                    app.globalData.userRoles = userRoles;\n                    try {\n                      wx.setStorageSync('token', token);\n                    } catch (error) {}\n                    wx.hideLoading();\n                    wx.redirectTo({\n                      url: '/pages/homeAndReport/homeAndReport',\n                    });\n                  })\n                  .catch(err => {\n                    console.log(err);\n                    wx.hideLoading();\n                    wx.showToast({\n                      title: err.errMsg,\n                      icon: 'none',\n                    });\n                  });\n              } else {\n                wx.showToast({\n                  title: '登录获取code失败',\n                  icon: 'none',\n                });\n              }\n            },\n          });\n        },\n      });\n    }\n    // fetch()\n    // wx.redirectTo({\n    //   url: '/pages/home/home'\n    // })\n  },\n  codeLogin() {\n    wx.login({\n      success: res => {\n        if (res.code) {\n          const code = res.code;\n          systemFetch({\n            url: '/boss/login',\n            method: 'POST',\n            data: {\n              code,\n            },\n          })\n            .then(res => {\n              console.log(res);\n              const {\n                token,\n                data: { userInfo, userRoles },\n              } = res;\n              app.globalData.token = token;\n              app.globalData.userInfo = userInfo;\n              app.globalData.userRoles = userRoles;\n              try {\n                wx.setStorageSync('token', token);\n              } catch (error) {}\n              wx.hideLoading();\n              wx.redirectTo({\n                url: '/pages/homeAndReport/homeAndReport',\n              });\n            })\n            .catch(err => {\n              console.log(err);\n              wx.hideLoading();\n              wx.showToast({\n                title: err.errMsg,\n                icon: 'none',\n              });\n            });\n        } else {\n          wx.showToast({\n            title: '登录获取code失败',\n            icon: 'none',\n          });\n        }\n      },\n    });\n  },\n  nameInputHandle(e) {\n    const value = e.detail.value;\n    this.updateInputValue('account', value);\n  },\n  passwardInoutHandle(e) {\n    const value = e.detail.value;\n    this.updateInputValue('pwd', value);\n  },\n  updateInputValue(key: string, value: string) {\n    this.setData!({\n      [key]: value,\n    });\n  },\n});\n"]}
\ No newline at end of file

miniprogram/pages/index/index.ts

@@ -100,76 +100,88 @@ Page({
     if (this.validateLoginData()) {
       const { account, pwd } = this.data;
       console.log(account, pwd);
-      wx.login({
-        success: res => {
-          if (res.code) {
-            const code = res.code;
-            wx.showLoading({ title: '' });
-            systemFetch({
-              url: '/login/verifyCode',
-            })
-              .then((res: wx.RequestSuccessCallbackResult) => {
-                console.log(res);
-                return {
-                  verifyCode: res.data.verifyCode,
-                  cookie: res.header['Set-Cookie'],
-                };
-              })
-              .then(
-                ({
-                  verifyCode,
-                  cookie,
-                }: {
-                  verifyCode: string;
-                  cookie: string;
-                }) => {
-                  let mixpwd = md5(pwd);
-                  return systemFetch({
-                    url: '/boss/login',
-                    method: 'POST',
-                    header: {
-                      cookie: cookie,
-                    },
-                    data: {
-                      code,
-                      account,
-                      pwd: mixpwd,
-                      varifyCode: verifyCode,
+      wx.requestSubscribeMessage({
+        tmplIds: ['WU2yMHKM_yNPLGHRsstggsDYnZhKoHIg4heM2fZkD5I'],
+        success(res) {
+          console.log('in success', res);
+        },
+        fail(res) {
+          console.log('in fail', res);
+        },
+        complete(res) {
+          console.log('in complete', res);
+          wx.login({
+            success: res => {
+              if (res.code) {
+                const code = res.code;
+                wx.showLoading({ title: '' });
+                systemFetch({
+                  url: '/login/verifyCode',
+                })
+                  .then((res: wx.RequestSuccessCallbackResult) => {
+                    console.log(res);
+                    return {
+                      verifyCode: res.data.verifyCode,
+                      cookie: res.header['Set-Cookie'],
+                    };
+                  })
+                  .then(
+                    ({
+                      verifyCode,
+                      cookie,
+                    }: {
+                      verifyCode: string;
+                      cookie: string;
+                    }) => {
+                      let mixpwd = md5(pwd);
+                      return systemFetch({
+                        url: '/boss/login',
+                        method: 'POST',
+                        header: {
+                          cookie: cookie,
+                        },
+                        data: {
+                          code,
+                          account,
+                          pwd: mixpwd,
+                          varifyCode: verifyCode,
+                        },
+                      });
                     },
+                  )
+                  .then(res => {
+                    console.log(res);
+                    const {
+                      token,
+                      data: { userInfo, userRoles },
+                    } = res;
+                    app.globalData.token = token;
+                    app.globalData.userInfo = userInfo;
+                    app.globalData.userRoles = userRoles;
+                    try {
+                      wx.setStorageSync('token', token);
+                    } catch (error) {}
+                    wx.hideLoading();
+                    wx.redirectTo({
+                      url: '/pages/homeAndReport/homeAndReport',
+                    });
+                  })
+                  .catch(err => {
+                    console.log(err);
+                    wx.hideLoading();
+                    wx.showToast({
+                      title: err.errMsg,
+                      icon: 'none',
+                    });
                   });
-                },
-              )
-              .then(res => {
-                console.log(res);
-                const {
-                  token,
-                  data: { userInfo, userRoles },
-                } = res;
-                app.globalData.token = token;
-                app.globalData.userInfo = userInfo;
-                app.globalData.userRoles = userRoles;
-                try {
-                  wx.setStorageSync('token', token);
-                } catch (error) {}
-                wx.hideLoading();
-                wx.redirectTo({
-                  url: '/pages/homeAndReport/homeAndReport',
-                });
-              })
-              .catch(err => {
-                console.log(err);
-                wx.hideLoading();
+              } else {
                 wx.showToast({
-                  title: err.errMsg,
+                  title: '登录获取code失败',
                   icon: 'none',
                 });
-              });
-          } else {
-            wx.showToast({
-              title: '登录获取code失败',
-              icon: 'none',
-            });
-          }
+              }
+            },
+          });
         },
       });
     }