|
@@ -1,16 +1,16 @@
|
|
|
// app.ts
|
|
|
-import { api_login, api_queryUserInfo } from './api/login';
|
|
|
+import { api_login, api_queryUserInfo } from "./api/login";
|
|
|
const config = require("./config");
|
|
|
|
|
|
App<IAppOption>({
|
|
|
globalData: {
|
|
|
// 在客服页面使用
|
|
|
- top: 0, // 初始的上偏移
|
|
|
+ top: 0, // 初始的上偏移
|
|
|
baseUrl: config?.baseUrl,
|
|
|
- appId: '',
|
|
|
- deviceNum: '', // 设备信息
|
|
|
+ appId: "",
|
|
|
+ deviceNum: "", // 设备信息
|
|
|
isLogin: false, // 是否登录
|
|
|
- userInfo: {} as any
|
|
|
+ userInfo: {} as any,
|
|
|
},
|
|
|
onLaunch() {
|
|
|
// 展示本地存储能力
|
|
@@ -23,9 +23,9 @@ App<IAppOption>({
|
|
|
// 登录
|
|
|
wx.login({
|
|
|
success: async (res) => {
|
|
|
- this.onLogin(res.code)
|
|
|
+ this.onLogin(res.code);
|
|
|
},
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
setAppId() {
|
|
|
//获取当前小程序appId
|
|
@@ -35,13 +35,20 @@ App<IAppOption>({
|
|
|
//先设置appid再引入接口文件,防止appid未更新问题
|
|
|
// require("./utils/request/api.js");
|
|
|
// 获取设备信息
|
|
|
- const deviceInfo = wx.getDeviceInfo()
|
|
|
- // 品牌 设备型号 操作系统及版本 客户端平台
|
|
|
- const deviceNum = deviceInfo.brand + '-' + deviceInfo.model + '-' + deviceInfo.platform + '-' + deviceInfo.system
|
|
|
- this.globalData.deviceNum = deviceNum
|
|
|
+ const deviceInfo = wx.getDeviceInfo();
|
|
|
+ // 品牌 设备型号 操作系统及版本 客户端平台
|
|
|
+ const deviceNum =
|
|
|
+ deviceInfo.brand +
|
|
|
+ "-" +
|
|
|
+ deviceInfo.model +
|
|
|
+ "-" +
|
|
|
+ deviceInfo.platform +
|
|
|
+ "-" +
|
|
|
+ deviceInfo.system;
|
|
|
+ this.globalData.deviceNum = deviceNum;
|
|
|
// 设置客服初始位置
|
|
|
const systemInfo = wx.getWindowInfo();
|
|
|
- this.globalData.top = systemInfo.windowHeight - 180
|
|
|
+ this.globalData.top = systemInfo.windowHeight - 180;
|
|
|
},
|
|
|
// userInfoReadyCallback(result) {
|
|
|
// console.log(result, 'result')
|
|
@@ -56,33 +63,35 @@ App<IAppOption>({
|
|
|
// 开始登录
|
|
|
const { data } = await api_login({
|
|
|
autoRegister: false,
|
|
|
- client_id: 'cooleshow-student-wxlite',
|
|
|
- client_secret: 'cooleshow-student-wxlite',
|
|
|
+ client_id: "cooleshow-student-wxlite",
|
|
|
+ client_secret: "cooleshow-student-wxlite",
|
|
|
deviceNum: this.globalData.deviceNum,
|
|
|
- extra: '',
|
|
|
- grant_type: 'password',
|
|
|
- loginType: 'WECHAT_MA',
|
|
|
+ extra: "",
|
|
|
+ grant_type: "password",
|
|
|
+ loginType: "WECHAT_MA",
|
|
|
multiUser: false,
|
|
|
username: this.globalData.appId,
|
|
|
- password: code
|
|
|
- })
|
|
|
+ password: code,
|
|
|
+ });
|
|
|
|
|
|
- if(data.code === 200) {
|
|
|
+ if (data.code === 200) {
|
|
|
const userToken = data.data.token_type + " " + data.data.access_token;
|
|
|
wx.setStorageSync("token", userToken);
|
|
|
this.globalData.isLogin = true;
|
|
|
- const users = await api_queryUserInfo({ wxAppId: this.globalData.appId })
|
|
|
- if(users.data.code === 200) {
|
|
|
- this.globalData.userInfo = users.data.data
|
|
|
+ const users = await api_queryUserInfo({
|
|
|
+ wxAppId: this.globalData.appId,
|
|
|
+ });
|
|
|
+ if (users.data.code === 200) {
|
|
|
+ this.globalData.userInfo = users.data.data;
|
|
|
} else {
|
|
|
wx.removeStorageSync("token");
|
|
|
- this.globalData.isLogin = false
|
|
|
+ this.globalData.isLogin = false;
|
|
|
}
|
|
|
- console.log(users)
|
|
|
+ console.log(users);
|
|
|
} else {
|
|
|
this.globalData.isLogin = false;
|
|
|
}
|
|
|
} catch {}
|
|
|
- wx.hideLoading()
|
|
|
- }
|
|
|
-})
|
|
|
+ wx.hideLoading();
|
|
|
+ },
|
|
|
+});
|