diff --git a/assets/css/style.less b/assets/css/style.less
index 058cf0c..79d1604 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -2463,16 +2463,11 @@ page {
}
.user .wrapper .myOrder .orderState .item .pictrue {
- width: 0.49*100rpx;
- height: 0.42*100rpx;
+ width: 52rpx;
+ height: 52rpx;
margin: 0 auto 0.18*100rpx auto;
}
-.user .wrapper .myOrder .orderState .item .pictrue image {
- width: 100%;
- height: 100%;
-}
-
.user .wrapper .myService {
background-color: #fff;
margin-top: 0.15*100rpx;
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 8793a27..4bd4a9d 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -1,141 +1,61 @@
-
-
+
-
-
-
- 店铺主页
+
+
-
-
-
-
-
-
+
+
+ 地标文化特产
+
+
+
+
+ {{ userInfo.nickname }}
-
-
-
- {{ userInfo.nickname }}
-
-
-
- {{ userInfo.vipName }}
-
-
-
-
-
-
- {{ userInfo.levelName }}
-
-
-
- {{ protocolCheckState(userLevelInfo.checkState) }}
-
-
+
+
+ 会员码
-
-
-
- 会员码
+
+
-
-
-
-
- 扫一扫
-
-
-
-
- 收藏
-
-
-
-
- 消息
-
-
-
-
-
- 设置
-
-
-
-
-
-
-
- 我的账户
-
-
-
-
-
-
-
-
-
- 余额
-
- {{ userInfo.nowMoney ? force2Decimal(userInfo.nowMoney) : 0.00 }}
-
-
-
-
-
- 提现
- 账户明细
-
+
+
+
+ {{ userInfo.nowMoney ? force2Decimal(userInfo.nowMoney) : 0.00 }}
-
-
-
-
-
-
-
-
- 恭喜你成为了{{ userInfo.levelName }}
-
-
- 当前等级:{{ userInfo.level }}
-
-
-
-
- 权益说明
-
+
+
+ 余额
+
+
+
+
+ {{ userInfo.integral || 0 }}
+
+
+
+ 积分
+
+
+
+
+
+ 官方客服
+
@@ -154,62 +74,81 @@
-
+
{{ orderStatusNum.unpaidCount }}
+ v-if="orderStatusNum.unpaidCount > 0"
+ class="order-status-num"
+ >
+ {{ orderStatusNum.unpaidCount }}
待付款
-
+
{{ orderStatusNum.unshippedCount }}
+ v-if="orderStatusNum.unshippedCount > 0"
+ class="order-status-num"
+ >
+ {{ orderStatusNum.unshippedCount }}
待发货
-
+
{{ orderStatusNum.receivedCount }}
+ v-if="orderStatusNum.receivedCount > 0"
+ class="order-status-num"
+ >
+ {{ orderStatusNum.receivedCount }}
待收货/核销
-
+
{{ orderStatusNum.evaluatedCount }}
+ v-if="orderStatusNum.evaluatedCount > 0"
+ class="order-status-num"
+ >
+ {{ orderStatusNum.evaluatedCount }}
待评价
-
+
{{ orderStatusNum.refundCount }}
+ v-if="orderStatusNum.refundCount > 0"
+ class="order-status-num"
+ >
+ {{ orderStatusNum.refundCount }}
售后/退款
-
@@ -221,6 +160,10 @@
@@ -242,18 +185,30 @@
-
-
-
+
+
+
-
+
{{ userInfo.nickname }}
-
+
-
@@ -261,13 +216,10 @@