forked from angelo/web-retail-h5
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
070f0e61cd
File diff suppressed because it is too large
Load Diff
|
@ -420,7 +420,7 @@
|
||||||
<div style="white-space: nowrap">{{ '收货地址' }}</div>
|
<div style="white-space: nowrap">{{ '收货地址' }}</div>
|
||||||
<div>
|
<div>
|
||||||
{{ orderData.recProvince }}{{ orderData.recCity
|
{{ orderData.recProvince }}{{ orderData.recCity
|
||||||
}}{{ orderData.recAddress }}
|
}}{{ orderData.recCounty }}{{ orderData.recAddress }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -456,7 +456,7 @@
|
||||||
<div style="white-space: nowrap">{{ '收货地址' }}</div>
|
<div style="white-space: nowrap">{{ '收货地址' }}</div>
|
||||||
<div>
|
<div>
|
||||||
{{ orderData.recProvince }}{{ orderData.recCity
|
{{ orderData.recProvince }}{{ orderData.recCity
|
||||||
}}{{ orderData.recAddress }}
|
}}{{ orderData.recCounty }}{{ orderData.recAddress }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -492,7 +492,7 @@
|
||||||
<div style="white-space: nowrap">{{ '收货地址' }}</div>
|
<div style="white-space: nowrap">{{ '收货地址' }}</div>
|
||||||
<div>
|
<div>
|
||||||
{{ orderData.recProvince }}{{ orderData.recCity
|
{{ orderData.recProvince }}{{ orderData.recCity
|
||||||
}}{{ orderData.recAddress }}
|
}}{{ orderData.recCounty }}{{ orderData.recAddress }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3,7 +3,10 @@
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="index-view tops" @click="updateImg">
|
<view class="index-view tops" @click="updateImg">
|
||||||
<view class="user-name">{{ '头像' }}</view>
|
<view class="user-name">{{ '头像' }}</view>
|
||||||
<view class="user-right rights">
|
<view
|
||||||
|
class="user-right rights"
|
||||||
|
style="display: flex; align-items: center"
|
||||||
|
>
|
||||||
<view class="avatar">
|
<view class="avatar">
|
||||||
<image :src="userInfo.headPath" />
|
<image :src="userInfo.headPath" />
|
||||||
</view>
|
</view>
|
||||||
|
@ -344,7 +347,10 @@ page {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.avatar {
|
.avatar {
|
||||||
margin-top: 10rpx;
|
// margin-top: 10rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
image {
|
image {
|
||||||
width: 89rpx;
|
width: 89rpx;
|
||||||
height: 89rpx;
|
height: 89rpx;
|
||||||
|
|
Loading…
Reference in New Issue