Merge branch 'feature/1.1.4开发' into develop

zhaojs

2023-07-20 fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff

 uniapp/pages/login/wxlogin.vue

@@ -215,6 +215,8 @@
                     url: './setPass'
                  })
               } */ else {
                  //更新pushcid
                  getApp().updatePushCid();
                  uni.switchTab({
                     url: '../index/index'
                  })