Commit d12912080e095d1a20c18fd4918b2630d690b400
1 parent
6c4908e7
提交个人中心页面
Showing
4 changed files
with
46 additions
and
120 deletions
yudao-vue-ui/common/css/icon.css
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | font-family: "mix-icon"; | 2 | font-family: "mix-icon"; |
| 3 | font-weight: normal; | 3 | font-weight: normal; |
| 4 | font-style: normal; | 4 | font-style: normal; |
| 5 | - src: url('https://at.alicdn.com/t/font_1913318_2ui3nitf38x.ttf') format('truetype'); | 5 | + src: url('https://at.alicdn.com/t/font_1913318_2ui3nitf38x.ttf') format('truetype'); // TODO 芋艿: icon 怎么搞？ |
| 6 | } | 6 | } |
| 7 | 7 | ||
| 8 | .mix-icon { | 8 | .mix-icon { |
| @@ -105,9 +105,9 @@ | @@ -105,9 +105,9 @@ | ||
| 105 | content: "\e60c"; | 105 | content: "\e60c"; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | -.icon-bangzhu1:before { | ||
| 109 | - content: "\e63d"; | ||
| 110 | -} | 108 | +/* .icon-bangzhu1:before { |
| 109 | + content: "\e63d"; // 帮助 | ||
| 110 | +} */ | ||
| 111 | 111 | ||
| 112 | .icon-xingxing:before { | 112 | .icon-xingxing:before { |
| 113 | content: "\e70b"; | 113 | content: "\e70b"; |
| @@ -154,7 +154,7 @@ | @@ -154,7 +154,7 @@ | ||
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | .icon-bianji:before { | 156 | .icon-bianji:before { |
| 157 | - content: "\e60d"; | 157 | + content: "\e60d"; // 编辑 |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | .icon-yanzhengma1:before { | 160 | .icon-yanzhengma1:before { |
yudao-vue-ui/pages.json
| @@ -8,8 +8,8 @@ | @@ -8,8 +8,8 @@ | ||
| 8 | }, { | 8 | }, { |
| 9 | "path": "pages/tabbar/user", | 9 | "path": "pages/tabbar/user", |
| 10 | "style": { | 10 | "style": { |
| 11 | - "navigationBarTitleText": "", | ||
| 12 | - "enablePullDownRefresh": false | 11 | + "navigationBarTitleText": "我的", |
| 12 | + "navigationStyle": "custom" | ||
| 13 | } | 13 | } |
| 14 | } | 14 | } |
| 15 | ], | 15 | ], |
yudao-vue-ui/pages/tabbar/user.vue
| @@ -53,12 +53,14 @@ | @@ -53,12 +53,14 @@ | ||
| 53 | 53 | ||
| 54 | <!-- 功能入口 --> | 54 | <!-- 功能入口 --> |
| 55 | <view class="option-wrap"> | 55 | <view class="option-wrap"> |
| 56 | - <mix-list-cell icon="icon-iconfontweixin" iconColor="#fa436a" title="我的钱包" @onClick="navTo('/pages/wallet/index', {login: true})"></mix-list-cell> | ||
| 57 | - <mix-list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @onClick="navTo('/pages/address/list', {login: true})"></mix-list-cell> | 56 | + <!-- <mix-list-cell icon="icon-iconfontweixin" iconColor="#fa436a" title="我的钱包" @onClick="navTo('/pages/wallet/index', {login: true})"></mix-list-cell> --> |
| 57 | + <!-- <mix-list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @onClick="navTo('/pages/address/list', {login: true})"></mix-list-cell> --> | ||
| 58 | <!-- <mix-list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="呼朋唤友赢好礼"></mix-list-cell> --> | 58 | <!-- <mix-list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="呼朋唤友赢好礼"></mix-list-cell> --> |
| 59 | - <mix-list-cell icon="icon-shoucang_xuanzhongzhuangtai" iconColor="#54b4ef" title="我的收藏" @onClick="navTo('/pages/favorite/favorite', {login: true})"></mix-list-cell> | ||
| 60 | - <mix-list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="意见反馈" @onClick="navTo('/pages/feedback/feedback', {login: true})"></mix-list-cell> | ||
| 61 | - <mix-list-cell icon="icon-shezhi1" iconColor="#37b0fb" title="设置" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell> | 59 | + <!-- <mix-list-cell icon="icon-shoucang_xuanzhongzhuangtai" iconColor="#54b4ef" title="我的收藏" @onClick="navTo('/pages/favorite/favorite', {login: true})"></mix-list-cell> --> |
| 60 | + <!-- <mix-list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="意见反馈" @onClick="navTo('/pages/feedback/feedback', {login: true})"></mix-list-cell> --> | ||
| 61 | + <!-- <mix-list-cell icon="icon-shezhi1" iconColor="#37b0fb" title="设置" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell> --> | ||
| 62 | + <mix-list-cell icon="icon-bianji" iconColor="#5fcda2" title="个人信息" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell> | ||
| 63 | + <mix-list-cell icon="icon-shezhi1" iconColor="#37b0fb" title="账号安全" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell> | ||
| 62 | </view> | 64 | </view> |
| 63 | </view> | 65 | </view> |
| 64 | </template> | 66 | </template> |
| @@ -152,7 +154,7 @@ | @@ -152,7 +154,7 @@ | ||
| 152 | margin: 20rpx auto 0; | 154 | margin: 20rpx auto 0; |
| 153 | background: #fff; | 155 | background: #fff; |
| 154 | border-radius: 10rpx; | 156 | border-radius: 10rpx; |
| 155 | - .order-header{ | 157 | + .order-header { |
| 156 | padding: 28rpx 20rpx 6rpx 26rpx; | 158 | padding: 28rpx 20rpx 6rpx 26rpx; |
| 157 | .title { | 159 | .title { |
| 158 | flex: 1; | 160 | flex: 1; |
| @@ -209,49 +211,11 @@ | @@ -209,49 +211,11 @@ | ||
| 209 | } | 211 | } |
| 210 | } | 212 | } |
| 211 | 213 | ||
| 212 | - .option-wrap{ | 214 | + .option-wrap { |
| 213 | width: 700rpx; | 215 | width: 700rpx; |
| 214 | margin: 20rpx auto 0; | 216 | margin: 20rpx auto 0; |
| 215 | margin-top: 20rpx; | 217 | margin-top: 20rpx; |
| 216 | background: #fff; | 218 | background: #fff; |
| 217 | - border-radius:10rpx; | ||
| 218 | - | ||
| 219 | - .sec-header{ | ||
| 220 | - padding: 26rpx 14rpx 0 24rpx; | ||
| 221 | - font-size: 28rpx; | ||
| 222 | - color: #333; | ||
| 223 | - | ||
| 224 | - .icon-lishijilu{ | ||
| 225 | - font-size: 46rpx; | ||
| 226 | - color: #50bf8b; | ||
| 227 | - margin-right: 16rpx; | ||
| 228 | - line-height: 40rpx; | ||
| 229 | - } | ||
| 230 | - .icon-lajitong{ | ||
| 231 | - padding: 4rpx 10rpx; | ||
| 232 | - font-size: 36rpx; | ||
| 233 | - color: #999; | ||
| 234 | - } | ||
| 235 | - } | ||
| 236 | - .pro-list{ | ||
| 237 | - flex-wrap: nowrap; | ||
| 238 | - padding: 20rpx 0 12rpx; | ||
| 239 | - | ||
| 240 | - &:before, &:after{ | ||
| 241 | - content: ''; | ||
| 242 | - min-width: 30rpx; | ||
| 243 | - height: 30rpx; | ||
| 244 | - } | ||
| 245 | - &:after{ | ||
| 246 | - min-width: 20rpx; | ||
| 247 | - } | ||
| 248 | - image{ | ||
| 249 | - flex-shrink: 0; | ||
| 250 | - width: 144rpx; | ||
| 251 | - height: 144rpx; | ||
| 252 | - margin-right: 16rpx; | ||
| 253 | - border-radius: 8rpx; | ||
| 254 | - } | ||
| 255 | - } | 219 | + border-radius: 10rpx; |
| 256 | } | 220 | } |
| 257 | </style> | 221 | </style> |
yudao-vue-ui/uni.scss
| 1 | -/** | ||
| 2 | - * 这里是uni-app内置的常用样式变量 | ||
| 3 | - * | ||
| 4 | - * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量 | ||
| 5 | - * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App | ||
| 6 | - * | ||
| 7 | - */ | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 | ||
| 11 | - * | ||
| 12 | - * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件 | ||
| 13 | - */ | ||
| 14 | - | ||
| 15 | -/* 颜色变量 */ | ||
| 16 | - | ||
| 17 | -/* 行为相关颜色 */ | ||
| 18 | -$uni-color-primary: #007aff; | ||
| 19 | -$uni-color-success: #4cd964; | ||
| 20 | -$uni-color-warning: #f0ad4e; | ||
| 21 | -$uni-color-error: #dd524d; | ||
| 22 | - | ||
| 23 | -/* 文字基本颜色 */ | ||
| 24 | -$uni-text-color:#333;//基本色 | ||
| 25 | -$uni-text-color-inverse:#fff;//反色 | ||
| 26 | -$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息 | ||
| 27 | -$uni-text-color-placeholder: #808080; | ||
| 28 | -$uni-text-color-disable:#c0c0c0; | 1 | +$base-color: #ff536f; |
| 29 | 2 | ||
| 30 | -/* 背景颜色 */ | ||
| 31 | -$uni-bg-color:#ffffff; | ||
| 32 | -$uni-bg-color-grey:#f8f8f8; | ||
| 33 | -$uni-bg-color-hover:#f1f1f1;//点击状态颜色 | ||
| 34 | -$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色 | ||
| 35 | 3 | ||
| 36 | -/* 边框颜色 */ | ||
| 37 | -$uni-border-color:#c8c7cc; | 4 | +$main:#07c160; //主背景色 |
| 5 | +$lightMain: rgba($main,0.1); //淡主色 | ||
| 6 | +$mainInverse:#fff; //与主色搭配的反色 | ||
| 7 | +$mainGradual:linear-gradient(to top right,$main,rgba($main,0.2));//渐变主色 | ||
| 8 | +$mainGradualInverse:#fff;//与渐变主色搭配的反色 | ||
| 38 | 9 | ||
| 39 | -/* 尺寸变量 */ | 10 | +/* 配色 */ |
| 11 | +$red:#e1251b; //红色 | ||
| 12 | +$lightRed:rgba(225, 37, 27, 0.08);//淡淡的红色 | ||
| 40 | 13 | ||
| 41 | -/* 文字尺寸 */ | ||
| 42 | -$uni-font-size-sm:12px; | ||
| 43 | -$uni-font-size-base:14px; | ||
| 44 | -$uni-font-size-lg:16; | 14 | +$black: #000; |
| 15 | +$lightBlack:#e6e6e6; | ||
| 45 | 16 | ||
| 46 | -/* 图片尺寸 */ | ||
| 47 | -$uni-img-size-sm:20px; | ||
| 48 | -$uni-img-size-base:26px; | ||
| 49 | -$uni-img-size-lg:40px; | 17 | +$yellow:#f69c00; |
| 18 | +$lightYellow:#fef3d1; | ||
| 50 | 19 | ||
| 51 | -/* Border Radius */ | ||
| 52 | -$uni-border-radius-sm: 2px; | ||
| 53 | -$uni-border-radius-base: 3px; | ||
| 54 | -$uni-border-radius-lg: 6px; | ||
| 55 | -$base-color: #ff536f; | 20 | +$green:#07c160; |
| 21 | +$lightGreen:#dff5e2; | ||
| 56 | 22 | ||
| 57 | -$uni-border-radius-circle: 50%; | 23 | +$orange: #F74F0E; |
| 24 | +$lightOrange: #fedfd3; | ||
| 58 | 25 | ||
| 59 | -/* 水平间距 */ | ||
| 60 | -$uni-spacing-row-sm: 5px; | ||
| 61 | -$uni-spacing-row-base: 10px; | ||
| 62 | -$uni-spacing-row-lg: 15px; | 26 | +$blue:#0081ff; |
| 27 | +$lightBlue:#e6f2ff; | ||
| 63 | 28 | ||
| 64 | -/* 垂直间距 */ | ||
| 65 | -$uni-spacing-col-sm: 4px; | ||
| 66 | -$uni-spacing-col-base: 8px; | ||
| 67 | -$uni-spacing-col-lg: 12px; | 29 | +$brown: #8B4513; |
| 30 | +$lightBrown:#ffdbc1; | ||
| 68 | 31 | ||
| 69 | -/* 透明度 */ | ||
| 70 | -$uni-opacity-disabled: 0.3; // 组件禁用态的透明度 | 32 | +$purple:#6739b6; |
| 33 | +$lightPurple:#e7dff5; | ||
| 71 | 34 | ||
| 72 | -/* 文章场景相关 */ | ||
| 73 | -$uni-color-title: #2C405A; // 文章标题颜色 | ||
| 74 | -$uni-font-size-title:20px; | ||
| 75 | -$uni-color-subtitle: #555555; // 二级标题颜色 | ||
| 76 | -$uni-font-size-subtitle:26px; | ||
| 77 | -$uni-color-paragraph: #3F536E; // 文章段落颜色 | ||
| 78 | -$uni-font-size-paragraph:15px; | 35 | +$white : #fff ; |
| 36 | +$black : #000 ; | ||
| 37 | +$gray : #777 ; | ||
| 38 | +$grey : #82939c ; | ||
| 39 | + | ||
| 40 | +$borderColor:#e0e0e0; | ||
| 79 | \ No newline at end of file | 41 | \ No newline at end of file |