Skip to content

W
wx-boss
Commit a66ccfc6 by 姜雷
Options

Merge branch 'test'

parents 71155f2c 9180b695
Showing with 4 additions and 4 deletions
miniprogram/app.js
...@@ -29,7 +29,7 @@ App({ ...@@ -29,7 +29,7 @@ App({
}, },
globalData: { globalData: {
userInfo: initUserinfo(), userInfo: initUserinfo(),
token: 'system:login:token:a1d0c6e83f027327d8461063f4ac58a61572833345204', token: '',
userRoles: [], userRoles: [],
}, },
getToken: function () { getToken: function () {
...@@ -45,4 +45,4 @@ App({ ...@@ -45,4 +45,4 @@ App({
catch (error) { } catch (error) { }
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBYUEsSUFBTSxZQUFZLEdBQUcsY0FBTSxPQUFBLENBQUM7SUFDMUIsU0FBUyxFQUFFLEVBQUU7SUFDYixPQUFPLEVBQUUsRUFBRTtJQUNYLFFBQVEsRUFBRSxFQUFFO0lBQ1osRUFBRSxFQUFFLENBQUM7SUFDTCxhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsRUFBRTtJQUNqQixZQUFZLEVBQUUsRUFBRTtJQUNoQixVQUFVLEVBQUUsQ0FBQztJQUNiLElBQUksRUFBRSxFQUFFO0lBQ1IsU0FBUyxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRTtJQUNmLEtBQUssRUFBRSxFQUFFO0lBQ1QsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLEVBZnlCLENBZXpCLENBQUM7QUFDSCxHQUFHLENBQVM7SUFDVixRQUFRO1FBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQixJQUFJLENBQUM7WUFDSCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ1YsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1lBQ2hDLENBQUM7UUFDSCxDQUFDO1FBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUM7SUFDcEIsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRSxZQUFZLEVBQUU7UUFDeEIsS0FBSyxFQUFFLGtFQUFrRTtRQUN6RSxTQUFTLEVBQUUsRUFBRTtLQUNkO0lBQ0QsUUFBUTtRQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztJQUMvQixDQUFDO0lBQ0QsYUFBYTtRQUNYLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsR0FBRyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7UUFDL0IsSUFBSSxDQUFDO1lBQ0gsRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakMsQ0FBQztRQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFDO0lBQ3BCLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBVc2VyaW5mbywgVXNlclJvbGUgfSBmcm9tICcuL3N0b3JlL3VzZXInO1xuXG4vL2FwcC50c1xuZXhwb3J0IGludGVyZmFjZSBJTXlBcHAge1xuICByZXNldFVzZXJpbmZvOiAoKSA9PiB2b2lkO1xuICBnZXRUb2tlbjogKCkgPT4gc3RyaW5nO1xuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IFVzZXJpbmZvO1xuICAgIHRva2VuOiBzdHJpbmc7XG4gICAgdXNlclJvbGVzOiBVc2VyUm9sZVtdO1xuICB9O1xufVxuXG5jb25zdCBpbml0VXNlcmluZm8gPSAoKSA9PiAoe1xuICBjZWxscGhvbmU6ICcnLFxuICBjb21tZW50OiAnJyxcbiAgY3JlYXRlQXQ6ICcnLFxuICBpZDogMCxcbiAgaXNPcGVuT3BlckxvZzogMCxcbiAgaXNTZXRQYXNzd29yZDogMCxcbiAgbGFzdExvZ2luRGF0ZTogJycsXG4gIGxvZ2luQWNjb3VudDogJycsXG4gIGxvZ2luQ291bnQ6IDAsXG4gIG5hbWU6ICcnLFxuICBvcGVyYXRlSWQ6IDAsXG4gIG9wZXJhdGVOYW1lOiAnJyxcbiAgc3RhdGU6ICcnLFxuICB1cGRhdGVBdDogJycsXG59KTtcbkFwcDxJTXlBcHA+KHtcbiAgb25MYXVuY2goKSB7XG4gICAgY29uc29sZS5sb2coJ2luIG9uTGF1bmNoJyk7XG4gICAgdHJ5IHtcbiAgICAgIGxldCB0b2tlbiA9IHd4LmdldFN0b3JhZ2VTeW5jKCd0b2tlbicpO1xuICAgICAgaWYgKHRva2VuKSB7XG4gICAgICAgIHRoaXMuZ2xvYmFsRGF0YS50b2tlbiA9IHRva2VuO1xuICAgICAgfVxuICAgIH0gY2F0Y2ggKGVycm9yKSB7fVxuICB9LFxuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IGluaXRVc2VyaW5mbygpLFxuICAgIHRva2VuOiAnc3lzdGVtOmxvZ2luOnRva2VuOmExZDBjNmU4M2YwMjczMjdkODQ2MTA2M2Y0YWM1OGE2MTU3MjgzMzM0NTIwNCcsXG4gICAgdXNlclJvbGVzOiBbXSxcbiAgfSxcbiAgZ2V0VG9rZW4oKSB7XG4gICAgcmV0dXJuIHRoaXMuZ2xvYmFsRGF0YS50b2tlbjtcbiAgfSxcbiAgcmVzZXRVc2VyaW5mbygpIHtcbiAgICB0aGlzLmdsb2JhbERhdGEudG9rZW4gPSAnJztcbiAgICB0aGlzLmdsb2JhbERhdGEudXNlckluZm8gPSBpbml0VXNlcmluZm8oKTtcbiAgICB0aGlzLmdsb2JhbERhdGEudXNlclJvbGVzID0gW107XG4gICAgdHJ5IHtcbiAgICAgIHd4LnNldFN0b3JhZ2VTeW5jKCd0b2tlbicsICcnKTtcbiAgICB9IGNhdGNoIChlcnJvcikge31cbiAgfSxcbn0pO1xuIl19 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBYUEsSUFBTSxZQUFZLEdBQUcsY0FBTSxPQUFBLENBQUM7SUFDMUIsU0FBUyxFQUFFLEVBQUU7SUFDYixPQUFPLEVBQUUsRUFBRTtJQUNYLFFBQVEsRUFBRSxFQUFFO0lBQ1osRUFBRSxFQUFFLENBQUM7SUFDTCxhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsRUFBRTtJQUNqQixZQUFZLEVBQUUsRUFBRTtJQUNoQixVQUFVLEVBQUUsQ0FBQztJQUNiLElBQUksRUFBRSxFQUFFO0lBQ1IsU0FBUyxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRTtJQUNmLEtBQUssRUFBRSxFQUFFO0lBQ1QsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLEVBZnlCLENBZXpCLENBQUM7QUFDSCxHQUFHLENBQVM7SUFDVixRQUFRO1FBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQixJQUFJLENBQUM7WUFDSCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ1YsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1lBQ2hDLENBQUM7UUFDSCxDQUFDO1FBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUM7SUFDcEIsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRSxZQUFZLEVBQUU7UUFDeEIsS0FBSyxFQUFFLEVBQUU7UUFDVCxTQUFTLEVBQUUsRUFBRTtLQUNkO0lBQ0QsUUFBUTtRQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztJQUMvQixDQUFDO0lBQ0QsYUFBYTtRQUNYLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsR0FBRyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7UUFDL0IsSUFBSSxDQUFDO1lBQ0gsRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakMsQ0FBQztRQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFDO0lBQ3BCLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBVc2VyaW5mbywgVXNlclJvbGUgfSBmcm9tICcuL3N0b3JlL3VzZXInO1xuXG4vL2FwcC50c1xuZXhwb3J0IGludGVyZmFjZSBJTXlBcHAge1xuICByZXNldFVzZXJpbmZvOiAoKSA9PiB2b2lkO1xuICBnZXRUb2tlbjogKCkgPT4gc3RyaW5nO1xuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IFVzZXJpbmZvO1xuICAgIHRva2VuOiBzdHJpbmc7XG4gICAgdXNlclJvbGVzOiBVc2VyUm9sZVtdO1xuICB9O1xufVxuXG5jb25zdCBpbml0VXNlcmluZm8gPSAoKSA9PiAoe1xuICBjZWxscGhvbmU6ICcnLFxuICBjb21tZW50OiAnJyxcbiAgY3JlYXRlQXQ6ICcnLFxuICBpZDogMCxcbiAgaXNPcGVuT3BlckxvZzogMCxcbiAgaXNTZXRQYXNzd29yZDogMCxcbiAgbGFzdExvZ2luRGF0ZTogJycsXG4gIGxvZ2luQWNjb3VudDogJycsXG4gIGxvZ2luQ291bnQ6IDAsXG4gIG5hbWU6ICcnLFxuICBvcGVyYXRlSWQ6IDAsXG4gIG9wZXJhdGVOYW1lOiAnJyxcbiAgc3RhdGU6ICcnLFxuICB1cGRhdGVBdDogJycsXG59KTtcbkFwcDxJTXlBcHA+KHtcbiAgb25MYXVuY2goKSB7XG4gICAgY29uc29sZS5sb2coJ2luIG9uTGF1bmNoJyk7XG4gICAgdHJ5IHtcbiAgICAgIGxldCB0b2tlbiA9IHd4LmdldFN0b3JhZ2VTeW5jKCd0b2tlbicpO1xuICAgICAgaWYgKHRva2VuKSB7XG4gICAgICAgIHRoaXMuZ2xvYmFsRGF0YS50b2tlbiA9IHRva2VuO1xuICAgICAgfVxuICAgIH0gY2F0Y2ggKGVycm9yKSB7fVxuICB9LFxuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IGluaXRVc2VyaW5mbygpLFxuICAgIHRva2VuOiAnJyxcbiAgICB1c2VyUm9sZXM6IFtdLFxuICB9LFxuICBnZXRUb2tlbigpIHtcbiAgICByZXR1cm4gdGhpcy5nbG9iYWxEYXRhLnRva2VuO1xuICB9LFxuICByZXNldFVzZXJpbmZvKCkge1xuICAgIHRoaXMuZ2xvYmFsRGF0YS50b2tlbiA9ICcnO1xuICAgIHRoaXMuZ2xvYmFsRGF0YS51c2VySW5mbyA9IGluaXRVc2VyaW5mbygpO1xuICAgIHRoaXMuZ2xvYmFsRGF0YS51c2VyUm9sZXMgPSBbXTtcbiAgICB0cnkge1xuICAgICAgd3guc2V0U3RvcmFnZVN5bmMoJ3Rva2VuJywgJycpO1xuICAgIH0gY2F0Y2ggKGVycm9yKSB7fVxuICB9LFxufSk7XG4iXX0=
\ No newline at end of file \ No newline at end of file
miniprogram/app.ts
...@@ -39,7 +39,7 @@ App<IMyApp>({ ...@@ -39,7 +39,7 @@ App<IMyApp>({
}, },
globalData: { globalData: {
userInfo: initUserinfo(), userInfo: initUserinfo(),
token: 'system:login:token:a1d0c6e83f027327d8461063f4ac58a61572833345204', token: '',
userRoles: [], userRoles: [],
}, },
getToken() { getToken() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment