Merge remote-tracking branch 'origin/master' into test

fuliqi

2024-10-28 81e16742530ddcd86b368678bad74fc8eb471c63

 src/views/profile/index.vue

@@ -4,17 +4,17 @@
      <el-row :gutter="20">

        <el-col :span="6" :xs="24">
          <user-card  :userInfo="userInfo" />
          <user-card  :user-info="userInfo" />
        </el-col>

        <el-col :span="18" :xs="24">
          <el-card>
            <el-tabs active-name="timeline">
              <el-tab-pane label="时间线" name="timeline">
                <timeline :userInfo="userInfo" />
                <timeline :user-info="userInfo" />
              </el-tab-pane>
              <el-tab-pane label="账号" name="account">
                <account :userInfo="userInfo"  />
                <account :user-info="userInfo"  />
              </el-tab-pane>
            </el-tabs>
          </el-card>
@@ -49,7 +49,7 @@
  created () {
    let _this = this
    userApi.getCurrentUser().then(re => {
      _this.userInfo = re.response
      _this.userInfo = re.data
    })
  }
}