Merge branch 'develop' into test

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',
-            });
-          }
+              }
+            },
+          });
         },
       });
     }