Merge branch 'develop' into test

miniprogram/pages/index/index.ts

@@ -26,12 +26,14 @@ Page({
     if (!account) {
       wx.showToast({
         title: '请输入账户',
+        icon: 'none',
       });
       return;
     }
     if (!pwd) {
       wx.showToast({
         title: '请输入密码',
+        icon: 'none',
       });
       return;
     }