Merge branch 'develop' into test

miniprogram/pages/index/index.ts

@@ -107,8 +107,22 @@ Page({
     if (this.validateLoginData()) {
       const { account, pwd } = this.data;
       console.log(account, pwd);
+      systemFetch({
+        url: '/boss/login/init/data',
+        method: 'GET',
+      })
+        .then(res => {
+          console.log(res);
+          return res.templates;
+        })
+        .catch(err => {
+          return;
+        })
+        .then(ids => {
+          let tmplIds =
+            ids && ids.length ? ids.map(item => item.templateId) : [];
           wx.requestSubscribeMessage({
-        tmplIds: ['WU2yMHKM_yNPLGHRsstggnnGIgcRgDEIaJQiWWNJ9ss'],
+            tmplIds: tmplIds,
             success(res) {
               console.log('in success', res);
             },
@@ -193,6 +207,10 @@ Page({
               });
             },
           });
+        })
+        .catch(err => {
+          console.log(err);
+        });
     }
     // fetch()
     // wx.redirectTo({