修改登出后跳转逻辑

miniprogram/pages/index/index.js

@@ -4,10 +4,13 @@ var fetch_1 = require("../../api/fetch");
 var md5 = require('blueimp-md5');
 var app = getApp();
 Page({
-    onLoad: function () {
+    onLoad: function (option) {
+        console.log(option);
         if (app.globalData.token) {
             this.tokenLoagin();
         }
+        else if (option.logout) {
+        }
         else {
             this.codeLogin();
         }
@@ -236,4 +239,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    } else {\n      this.codeLogin();\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
+//# 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(option) {\n    console.log(option);\n    if (app.globalData.token) {\n      this.tokenLoagin();\n    } else if (option.logout) {\n      // this.codeLogin();\n    } else {\n      this.codeLogin();\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

@@ -6,9 +6,12 @@ import { IMyApp } from '../../app';
 const app = getApp<IMyApp>();
 
 Page({
-  onLoad() {
+  onLoad(option) {
+    console.log(option);
     if (app.globalData.token) {
       this.tokenLoagin();
+    } else if (option.logout) {
+      // this.codeLogin();
     } else {
       this.codeLogin();
     }

miniprogram/pages/report/report.js

@@ -36,7 +36,7 @@ Component({
             {
                 name: '退出登录',
                 icon: '../../../images/btn_Sign_out@2x.png',
-                url: '/pages/index/index',
+                url: '/pages/index/index?logout=true',
                 reLaunch: true,
             },
             {},
@@ -67,4 +67,4 @@ Component({
         },
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EseUNBQWdEO0FBR2hELElBQU0sR0FBRyxHQUFHLE1BQU0sRUFBVSxDQUFDO0FBQzdCLFNBQVMsQ0FBQztJQUNSLFNBQVMsRUFBRTtRQUNULFFBQVE7WUFDTixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDckMsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixRQUFRLEVBQUUsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRO2FBQ2xDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQzFCLENBQUM7S0FDRjtJQUlELElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7UUFDakMsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsSUFBSSxFQUFFLGtDQUFrQztnQkFDeEMsR0FBRyxFQUFFLG9DQUFvQztnQkFDekMsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFPRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixJQUFJLEVBQUUsbUNBQW1DO2dCQUN6QyxHQUFHLEVBQUUsMEJBQTBCO2dCQUMvQixRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxPQUFPO2dCQUNiLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSxnQ0FBZ0M7Z0JBQ3JDLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBT0Q7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLHFDQUFxQztnQkFDM0MsR0FBRyxFQUFFLG9CQUFvQjtnQkFDekIsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELEVBQUU7WUFDRixFQUFFO1NBQ0g7UUFDRCxPQUFPLEVBQUUsQ0FBQztRQUNWLFdBQVcsRUFBRSxNQUFNO0tBQ3BCO0lBQ0QsT0FBTyxFQUFFO1FBQ1AsZ0JBQWdCO1lBQWhCLGlCQWFDO1lBWkMscUJBQWEsQ0FBQztnQkFDWixHQUFHLEVBQUUsNkJBQTZCO2FBQ25DLENBQUM7aUJBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztnQkFDUCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNqQixLQUFJLENBQUMsT0FBTyxDQUFDO29CQUNYLFdBQVcsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTTtpQkFDckQsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDO2lCQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7Z0JBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNuQixDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7UUFDRCxrQkFBa0I7WUFDaEIsSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLGVBQWUsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBQ3JELE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQzVCLENBQUM7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElNeUFwcCB9IGZyb20gJy4uLy4uL2FwcCc7XG5pbXBvcnQgeyBvcGVyYXRvckZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvcmVwb3J0L3JlcG9ydC5qc1xuY29uc3QgYXBwID0gZ2V0QXBwPElNeUFwcD4oKTtcbkNvbXBvbmVudCh7XG4gIGxpZmV0aW1lczoge1xuICAgIGF0dGFjaGVkKCkge1xuICAgICAgY29uc29sZS5sb2coYXBwLmdsb2JhbERhdGEudXNlckluZm8pO1xuICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICAgIH0pO1xuICAgICAgdGhpcy5mZXRjaFBsYXRmb3JtRmVlKCk7XG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICBpdGVtTGlzdDogW1xuICAgICAge1xuICAgICAgICBuYW1lOiAn5pyI5bqm6L+Q6JCl5YiG5p6QJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5feXVlZHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICAvLyB7XG4gICAgICAvLyAgIG5hbWU6ICfnlKjmiLflop7plb/liIbmnpAnLFxuICAgICAgLy8gICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95b25naHVAMngucG5nJyxcbiAgICAgIC8vICAgdXJsOiAnL3BhZ2VzL3VzZXJHcm93dGgvdXNlckdyb3d0aCcsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfkvJrlkZjlj43ppognLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9mc25rdWlAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgbmFtZTogJ+acjeWKoei0ueaYjue7hicsXG4gICAgICAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2ppYW9uYUAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvcGxhdGZvcm1GZWUvcGxhdGZvcm1GZWUnLFxuICAgICAgICByZUxhdW5jaDogZmFsc2UsXG4gICAgICB9LFxuICAgICAgLy8ge1xuICAgICAgLy8gICBuYW1lOiAn6LSm5oi35o+Q546wJyxcbiAgICAgIC8vICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5fdGl4aWFuQDJ4LnBuZycsXG4gICAgICAvLyAgIHVybDogJycsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfpgIDlh7rnmbvlvZUnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9TaWduX291dEAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvaW5kZXgvaW5kZXgnLFxuICAgICAgICByZUxhdW5jaDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICB7fSxcbiAgICAgIHt9LFxuICAgIF0sXG4gICAgYWNjb3VudDogMCxcbiAgICBwbGF0Zm9ybUZlZTogJzAuMDAnLFxuICB9LFxuICBtZXRob2RzOiB7XG4gICAgZmV0Y2hQbGF0Zm9ybUZlZSgpIHtcbiAgICAgIG9wZXJhdG9yRmV0Y2goe1xuICAgICAgICB1cmw6ICcvb3BlcmF0ZUJhbGFuY2UvdW5wYWlkTW9uZXknLFxuICAgICAgfSlcbiAgICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgICBjb25zb2xlLmxvZyhyZXMpO1xuICAgICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgICBwbGF0Zm9ybUZlZTogcmVzLmRhdGEgPyByZXMuZGF0YS50b0ZpeGVkKDIpIDogJzAuMDAnLFxuICAgICAgICAgIH0pO1xuICAgICAgICB9KVxuICAgICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgICBjb25zb2xlLmxvZyhlcnIpO1xuICAgICAgICB9KTtcbiAgICB9LFxuICAgIHNob3dSZWNoYXJnZURpYWxvZygpIHtcbiAgICAgIGxldCBkaWFsb2cgPSB0aGlzLnNlbGVjdENvbXBvbmVudCgnI3BsYXRmb3JtRGlhbG9nJyk7XG4gICAgICBkaWFsb2cuZmV0Y2hQbGF0Zm9ybUZlZSgpO1xuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EseUNBQWdEO0FBR2hELElBQU0sR0FBRyxHQUFHLE1BQU0sRUFBVSxDQUFDO0FBQzdCLFNBQVMsQ0FBQztJQUNSLFNBQVMsRUFBRTtRQUNULFFBQVE7WUFDTixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDckMsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixRQUFRLEVBQUUsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRO2FBQ2xDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQzFCLENBQUM7S0FDRjtJQUlELElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7UUFDakMsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsSUFBSSxFQUFFLGtDQUFrQztnQkFDeEMsR0FBRyxFQUFFLG9DQUFvQztnQkFDekMsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFPRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixJQUFJLEVBQUUsbUNBQW1DO2dCQUN6QyxHQUFHLEVBQUUsMEJBQTBCO2dCQUMvQixRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxPQUFPO2dCQUNiLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSxnQ0FBZ0M7Z0JBQ3JDLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBT0Q7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLHFDQUFxQztnQkFDM0MsR0FBRyxFQUFFLGdDQUFnQztnQkFDckMsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELEVBQUU7WUFDRixFQUFFO1NBQ0g7UUFDRCxPQUFPLEVBQUUsQ0FBQztRQUNWLFdBQVcsRUFBRSxNQUFNO0tBQ3BCO0lBQ0QsT0FBTyxFQUFFO1FBQ1AsZ0JBQWdCO1lBQWhCLGlCQWFDO1lBWkMscUJBQWEsQ0FBQztnQkFDWixHQUFHLEVBQUUsNkJBQTZCO2FBQ25DLENBQUM7aUJBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztnQkFDUCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNqQixLQUFJLENBQUMsT0FBTyxDQUFDO29CQUNYLFdBQVcsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTTtpQkFDckQsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDO2lCQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7Z0JBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNuQixDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7UUFDRCxrQkFBa0I7WUFDaEIsSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLGVBQWUsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBQ3JELE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQzVCLENBQUM7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElNeUFwcCB9IGZyb20gJy4uLy4uL2FwcCc7XG5pbXBvcnQgeyBvcGVyYXRvckZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvcmVwb3J0L3JlcG9ydC5qc1xuY29uc3QgYXBwID0gZ2V0QXBwPElNeUFwcD4oKTtcbkNvbXBvbmVudCh7XG4gIGxpZmV0aW1lczoge1xuICAgIGF0dGFjaGVkKCkge1xuICAgICAgY29uc29sZS5sb2coYXBwLmdsb2JhbERhdGEudXNlckluZm8pO1xuICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICAgIH0pO1xuICAgICAgdGhpcy5mZXRjaFBsYXRmb3JtRmVlKCk7XG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICBpdGVtTGlzdDogW1xuICAgICAge1xuICAgICAgICBuYW1lOiAn5pyI5bqm6L+Q6JCl5YiG5p6QJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5feXVlZHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICAvLyB7XG4gICAgICAvLyAgIG5hbWU6ICfnlKjmiLflop7plb/liIbmnpAnLFxuICAgICAgLy8gICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95b25naHVAMngucG5nJyxcbiAgICAgIC8vICAgdXJsOiAnL3BhZ2VzL3VzZXJHcm93dGgvdXNlckdyb3d0aCcsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfkvJrlkZjlj43ppognLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9mc25rdWlAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgbmFtZTogJ+acjeWKoei0ueaYjue7hicsXG4gICAgICAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2ppYW9uYUAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvcGxhdGZvcm1GZWUvcGxhdGZvcm1GZWUnLFxuICAgICAgICByZUxhdW5jaDogZmFsc2UsXG4gICAgICB9LFxuICAgICAgLy8ge1xuICAgICAgLy8gICBuYW1lOiAn6LSm5oi35o+Q546wJyxcbiAgICAgIC8vICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5fdGl4aWFuQDJ4LnBuZycsXG4gICAgICAvLyAgIHVybDogJycsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfpgIDlh7rnmbvlvZUnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9TaWduX291dEAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvaW5kZXgvaW5kZXg/bG9nb3V0PXRydWUnLFxuICAgICAgICByZUxhdW5jaDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICB7fSxcbiAgICAgIHt9LFxuICAgIF0sXG4gICAgYWNjb3VudDogMCxcbiAgICBwbGF0Zm9ybUZlZTogJzAuMDAnLFxuICB9LFxuICBtZXRob2RzOiB7XG4gICAgZmV0Y2hQbGF0Zm9ybUZlZSgpIHtcbiAgICAgIG9wZXJhdG9yRmV0Y2goe1xuICAgICAgICB1cmw6ICcvb3BlcmF0ZUJhbGFuY2UvdW5wYWlkTW9uZXknLFxuICAgICAgfSlcbiAgICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgICBjb25zb2xlLmxvZyhyZXMpO1xuICAgICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgICBwbGF0Zm9ybUZlZTogcmVzLmRhdGEgPyByZXMuZGF0YS50b0ZpeGVkKDIpIDogJzAuMDAnLFxuICAgICAgICAgIH0pO1xuICAgICAgICB9KVxuICAgICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgICBjb25zb2xlLmxvZyhlcnIpO1xuICAgICAgICB9KTtcbiAgICB9LFxuICAgIHNob3dSZWNoYXJnZURpYWxvZygpIHtcbiAgICAgIGxldCBkaWFsb2cgPSB0aGlzLnNlbGVjdENvbXBvbmVudCgnI3BsYXRmb3JtRGlhbG9nJyk7XG4gICAgICBkaWFsb2cuZmV0Y2hQbGF0Zm9ybUZlZSgpO1xuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file

miniprogram/pages/report/report.ts

@@ -52,7 +52,7 @@ Component({
       {
         name: '退出登录',
         icon: '../../../images/btn_Sign_out@2x.png',
-        url: '/pages/index/index',
+        url: '/pages/index/index?logout=true',
         reLaunch: true,
       },
       {},