Merge pull request 'fixing bug' (#272) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/272
This commit was merged in pull request #272.
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
<view class="mine">
|
||||
<view class="mine-top">
|
||||
<view class="top">
|
||||
<u-avatar @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
|
||||
<u-avatar @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar" :size="110"></u-avatar>
|
||||
<view class="user-info">
|
||||
<view class="info-top">
|
||||
<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
|
||||
@@ -58,35 +58,6 @@
|
||||
<text>{{ item.number }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view @click="toOtherPage('/order/Index?current=1')">
|
||||
<image src="/static/image/mine/6.png"></image>
|
||||
<view>待支付</view>
|
||||
<view class="order-num">{{ 99 }}</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=2')">
|
||||
<image src="/static/image/mine/35.png"></image>
|
||||
<view>待发货</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=3')">
|
||||
<image src="/static/image/mine/2.png"></image>
|
||||
<view>待收货</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=4')">
|
||||
<image src="/static/image/mine/1.png"></image>
|
||||
<view>试穿试送</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=5')">
|
||||
<image src="/static/image/mine/37.png"></image>
|
||||
<view>拼团中</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=6')">
|
||||
<image src="/static/image/mine/3.png"></image>
|
||||
<view>待评价</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=7')">
|
||||
<image src="/static/image/mine/9.png"></image>
|
||||
<view>售后</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="tool">
|
||||
@@ -181,7 +152,7 @@ export default {
|
||||
{
|
||||
name: 'wait_evaluation',
|
||||
title: '待评价',
|
||||
img: '/static/image/mine/40.png',
|
||||
img: '/static/image/mine/3.png',
|
||||
link: '/order/Index?current=6',
|
||||
number: '',
|
||||
},
|
||||
@@ -415,8 +386,7 @@ export default {
|
||||
.order-num{
|
||||
position: absolute;
|
||||
top: -12rpx;
|
||||
right: -38rpx;
|
||||
width: 50rpx;
|
||||
left: 40rpx;
|
||||
}
|
||||
.order-num > text {
|
||||
z-index: 9;
|
||||
@@ -447,7 +417,7 @@ export default {
|
||||
@include image-size($image-width: 35rpx, $image-height: 35rpx);
|
||||
}
|
||||
> view:nth-child(5){
|
||||
@include image-size($image-width: 43rpx, $image-height: 35rpx);
|
||||
@include image-size($image-width: 35rpx, $image-height: 35rpx);
|
||||
}
|
||||
> view:nth-child(6){
|
||||
@include image-size($image-width: 33rpx, $image-height: 35rpx);
|
||||
|
||||
Reference in New Issue
Block a user