Merge branch 'develop' into test

miniprogram/pages/index/index.ts

@@ -100,6 +100,16 @@ Page({
     if (this.validateLoginData()) {
       const { account, pwd } = this.data;
       console.log(account, pwd);
+      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) {
@@ -172,6 +182,8 @@ Page({
               }
             },
           });
+        },
+      });
     }
     // fetch()
     // wx.redirectTo({