hwq 3 years ago
parent
commit
3e62532b09
3 changed files with 10 additions and 10 deletions
  1. 2 2
      pages/order/order.vue
  2. 6 6
      pages/user/user.vue
  3. 2 2
      uni.scss

+ 2 - 2
pages/order/order.vue

@@ -298,7 +298,7 @@ export default {
 		//订单状态文字和颜色
 		orderStateExp(state) {
 			let stateTip = '',
-				stateTipColor = '#fa436a';
+				stateTipColor = '#438BED';
 			switch (+state) {
 				case 0:
 					stateTip = '待付款';
@@ -520,7 +520,7 @@ page,
 		text-align: center;
 		line-height: 60rpx;
 		font-size: $font-sm + 2rpx;
-		color: $font-color-dark;
+		color: $font-color-base;
 		background: #fff;
 		border-radius: 100px;
 		&:after {

+ 6 - 6
pages/user/user.vue

@@ -8,8 +8,8 @@
 					<view class="detail flex" @click="navTo('/pages/set/userinfo')">
 						<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
 						<view class="info-box">
-							<view class="username">{{ userInfo.nickname || '游客' }}111111</view>
-							<view class="phone">18952592739</view>
+							<view class="username">{{ userInfo.nickname || '游客' }}</view>
+							<view class="phone">{{ userInfo.phone }}</view>
 						</view>
 					</view>
 					<view class="config iconfont">
@@ -25,25 +25,25 @@
 				</view>
 				<view class="order1">
 					<view class="order-content1">
-						<view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item1" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon1"><image class="icon-img1" src="/static/user/user01.png" mode="aspectFit"></image></view>
 							<text>待付款</text>
 						</view>
 					</view>
 					<view class="order-content1">
-						<view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item1" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon1"><image class="icon-img1" src="/static/user/user02.png" mode="aspectFit"></image></view>
 							<text>待发货</text>
 						</view>
 					</view>
 					<view class="order-content1">
-						<view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item1" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon1"><image class="icon-img1" src="/static/user/user03.png" mode="aspectFit"></image></view>
 							<text>待收货</text>
 						</view>
 					</view>
 					<view class="order-content1">
-						<view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item1" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon1"><image class="icon-img1" src="/static/user/user04.png" mode="aspectFit"></image></view>
 							<text>已完成</text>
 						</view>

+ 2 - 2
uni.scss

@@ -4,7 +4,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8;//页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #5dbc7c;//项目颜色
+$base-color: #438BED;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色
@@ -17,7 +17,7 @@ $font-base: 28rpx;
 $font-lg: 32rpx;
 /*文字颜色*/
 $font-color-dark: #303133;//黑
-$font-color-base: #606266;//基础
+$font-color-base: #438BED;//基础
 $font-color-white:#ffffff;//白色
 $font-color-light: #909399;//灰色
 $font-color-disabled: #c0c4cc;//禁用