浏览代码

提交个人中心页面

YunaiV 3 年之前
父节点
当前提交
d12912080e
共有 4 个文件被更改,包括 46 次插入120 次删除
  1. 5 5
      yudao-vue-ui/common/css/icon.css
  2. 2 2
      yudao-vue-ui/pages.json
  3. 10 46
      yudao-vue-ui/pages/tabbar/user.vue
  4. 29 67
      yudao-vue-ui/uni.scss

+ 5 - 5
yudao-vue-ui/common/css/icon.css

@@ -2,7 +2,7 @@
 	font-family: "mix-icon";
 	font-weight: normal;
 	font-style: normal;
-	src: url('https://at.alicdn.com/t/font_1913318_2ui3nitf38x.ttf') format('truetype');
+	src: url('https://at.alicdn.com/t/font_1913318_2ui3nitf38x.ttf') format('truetype'); // TODO 芋艿: icon 怎么搞?
 }
 
 .mix-icon {
@@ -105,9 +105,9 @@
   content: "\e60c";
 }
 
-.icon-bangzhu1:before {
-  content: "\e63d";
-}
+/* .icon-bangzhu1:before {
+  content: "\e63d"; // 帮助
+} */
 
 .icon-xingxing:before {
   content: "\e70b";
@@ -154,7 +154,7 @@
 }
 
 .icon-bianji:before {
-  content: "\e60d";
+  content: "\e60d"; // 编辑
 }
 
 .icon-yanzhengma1:before {

+ 2 - 2
yudao-vue-ui/pages.json

@@ -8,8 +8,8 @@
 		}, {
 			"path": "pages/tabbar/user",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom"
 			}
 		}
 	],

+ 10 - 46
yudao-vue-ui/pages/tabbar/user.vue

@@ -53,12 +53,14 @@
 		
 		<!-- 功能入口 -->
 		<view class="option-wrap">
-			<mix-list-cell icon="icon-iconfontweixin" iconColor="#fa436a" title="我的钱包" @onClick="navTo('/pages/wallet/index', {login: true})"></mix-list-cell>
-			<mix-list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @onClick="navTo('/pages/address/list', {login: true})"></mix-list-cell>
+			<!-- <mix-list-cell icon="icon-iconfontweixin" iconColor="#fa436a" title="我的钱包" @onClick="navTo('/pages/wallet/index', {login: true})"></mix-list-cell> -->
+			<!-- <mix-list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @onClick="navTo('/pages/address/list', {login: true})"></mix-list-cell> -->
 			<!-- <mix-list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="呼朋唤友赢好礼"></mix-list-cell> -->
-			<mix-list-cell icon="icon-shoucang_xuanzhongzhuangtai" iconColor="#54b4ef" title="我的收藏" @onClick="navTo('/pages/favorite/favorite', {login: true})"></mix-list-cell>
-			<mix-list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="意见反馈" @onClick="navTo('/pages/feedback/feedback', {login: true})"></mix-list-cell>
-			<mix-list-cell icon="icon-shezhi1" iconColor="#37b0fb" title="设置" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell>
+			<!-- <mix-list-cell icon="icon-shoucang_xuanzhongzhuangtai" iconColor="#54b4ef" title="我的收藏" @onClick="navTo('/pages/favorite/favorite', {login: true})"></mix-list-cell> -->
+			<!-- <mix-list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="意见反馈" @onClick="navTo('/pages/feedback/feedback', {login: true})"></mix-list-cell> -->
+			<!-- <mix-list-cell icon="icon-shezhi1" iconColor="#37b0fb" title="设置" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell> -->
+			<mix-list-cell icon="icon-bianji" iconColor="#5fcda2" title="个人信息" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell>
+			<mix-list-cell icon="icon-shezhi1" iconColor="#37b0fb" title="账号安全" border="" @onClick="navTo('/pages/set/set', {login: true})"></mix-list-cell>
 		</view>
 	</view>
 </template>
@@ -152,7 +154,7 @@
 		margin: 20rpx auto 0;
 		background: #fff;
 		border-radius: 10rpx;
-		.order-header{
+		.order-header {
 			padding: 28rpx 20rpx 6rpx 26rpx;
 			.title {
 				flex: 1;
@@ -209,49 +211,11 @@
 		}
 	}
 
-	.option-wrap{
+	.option-wrap {
 		width: 700rpx;
 		margin: 20rpx auto 0;
 		margin-top: 20rpx;
 		background: #fff;
-		border-radius:10rpx;
-		
-		.sec-header{
-			padding: 26rpx 14rpx 0 24rpx;
-			font-size: 28rpx;
-			color: #333;
-			
-			.icon-lishijilu{
-				font-size: 46rpx;
-				color: #50bf8b;
-				margin-right: 16rpx;
-				line-height: 40rpx;
-			}
-			.icon-lajitong{
-				padding: 4rpx 10rpx;
-				font-size: 36rpx;
-				color: #999;
-			}
-		}
-		.pro-list{
-			flex-wrap: nowrap;
-			padding: 20rpx 0 12rpx;
-			
-			&:before, &:after{
-				content: '';
-				min-width: 30rpx;
-				height: 30rpx;
-			}
-			&:after{
-				min-width: 20rpx;
-			}
-			image{
-				flex-shrink: 0;
-				width: 144rpx;
-				height: 144rpx;
-				margin-right: 16rpx;
-				border-radius: 8rpx;
-			}
-		}
+		border-radius: 10rpx;
 	}
 </style>

+ 29 - 67
yudao-vue-ui/uni.scss

@@ -1,78 +1,40 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-
-/* 颜色变量 */
-
-/* 行为相关颜色 */
-$uni-color-primary: #007aff;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$uni-text-color-grey:#999;//辅助灰色,如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
+$base-color: #ff536f;
 
-/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
 
-/* 边框颜色 */
-$uni-border-color:#c8c7cc;
+$main:#07c160; //主背景色
+$lightMain: rgba($main,0.1); //淡主色
+$mainInverse:#fff; //与主色搭配的反色
+$mainGradual:linear-gradient(to top right,$main,rgba($main,0.2));//渐变主色
+$mainGradualInverse:#fff;//与渐变主色搭配的反色
 
-/* 尺寸变量 */
+/* 配色 */
+$red:#e1251b; //红色
+$lightRed:rgba(225, 37, 27, 0.08);//淡淡的红色
 
-/* 文字尺寸 */
-$uni-font-size-sm:12px;
-$uni-font-size-base:14px;
-$uni-font-size-lg:16;
+$black: #000; 
+$lightBlack:#e6e6e6;
 
-/* 图片尺寸 */
-$uni-img-size-sm:20px;
-$uni-img-size-base:26px;
-$uni-img-size-lg:40px;
+$yellow:#f69c00;
+$lightYellow:#fef3d1;
 
-/* Border Radius */
-$uni-border-radius-sm: 2px;
-$uni-border-radius-base: 3px;
-$uni-border-radius-lg: 6px;
-$base-color: #ff536f;
+$green:#07c160;
+$lightGreen:#dff5e2;
 
-$uni-border-radius-circle: 50%;
+$orange: #F74F0E;
+$lightOrange: #fedfd3;
 
-/* 水平间距 */
-$uni-spacing-row-sm: 5px;
-$uni-spacing-row-base: 10px;
-$uni-spacing-row-lg: 15px;
+$blue:#0081ff;
+$lightBlue:#e6f2ff;
 
-/* 垂直间距 */
-$uni-spacing-col-sm: 4px;
-$uni-spacing-col-base: 8px;
-$uni-spacing-col-lg: 12px;
+$brown:	#8B4513;
+$lightBrown:#ffdbc1; 
 
-/* 透明度 */
-$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+$purple:#6739b6;
+$lightPurple:#e7dff5;
 
-/* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:20px;
-$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:26px;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:15px;
+$white : #fff ;
+$black : #000 ;
+$gray : #777 ;
+$grey : #82939c ;
+	
+$borderColor:#e0e0e0;