|
|
@@ -1,8 +1,5 @@
|
|
|
<template>
|
|
|
<view class="content">
|
|
|
-<<<<<<< HEAD
|
|
|
- <foot-tabs></foot-tabs>
|
|
|
-=======
|
|
|
<div class="self-inf">
|
|
|
<div class="img-name-box">
|
|
|
<img src="/static/logo.png" alt="" class="heade-img" />
|
|
|
@@ -27,7 +24,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
->>>>>>> 081ec479ad7ee3fb7af49a140e84750670f16fdd
|
|
|
+ <foot-tabs></foot-tabs>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -36,15 +33,12 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
message: "我的",
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
list: [
|
|
|
{ icoin: "/static/logo.png", name: "我的建议" },
|
|
|
{ icoin: "/static/logo.png", name: "我的报名" },
|
|
|
{ icoin: "/static/logo.png", name: "我的收藏" },
|
|
|
{ icoin: "/static/logo.png", name: "退出登录" },
|
|
|
],
|
|
|
->>>>>>> 081ec479ad7ee3fb7af49a140e84750670f16fdd
|
|
|
};
|
|
|
},
|
|
|
onLoad() {},
|
|
|
@@ -52,33 +46,6 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
-<style>
|
|
|
-.content {
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- align-items: center;
|
|
|
- justify-content: center;
|
|
|
-}
|
|
|
-
|
|
|
-.logo {
|
|
|
- height: 200rpx;
|
|
|
- width: 200rpx;
|
|
|
- margin-top: 200rpx;
|
|
|
- margin-left: auto;
|
|
|
- margin-right: auto;
|
|
|
- margin-bottom: 50rpx;
|
|
|
-}
|
|
|
-
|
|
|
-.text-area {
|
|
|
- display: flex;
|
|
|
- justify-content: center;
|
|
|
-}
|
|
|
-
|
|
|
-.title {
|
|
|
- font-size: 36rpx;
|
|
|
- color: #8f8f94;
|
|
|
-=======
|
|
|
<style lang="scss" scoped>
|
|
|
.content {
|
|
|
display: flex;
|
|
|
@@ -151,6 +118,5 @@ export default {
|
|
|
}
|
|
|
.fontGrey {
|
|
|
color: $uni-text-color-grey;
|
|
|
->>>>>>> 081ec479ad7ee3fb7af49a140e84750670f16fdd
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
