theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpao' (#109) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/109
This commit is contained in:
gyh 2020-09-20 18:20:36 +08:00
commit 2f1b89c6a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/order-item/index.vue
View File

@ -19,8 +19,8 @@
<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view> <view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
<view class="info"> <view class="info">
<view class="num">共{{info.count_number}}件商品</view> <view class="num">共{{info.count_number}}件商品</view>
<view class="price">实付<span>￥{{info.order_amount}}</span></view> <view class="price">{{ info.view_type==10 ? "待支付" : "实付" }}<span>￥{{info.order_amount}}</span></view>
<view class="time">{{ info.payment_time.slice(5,16) }}</view> <view class="time">{{ info.view_type==10 ? info.add_time.slice(5,16) : info.payment_time.slice(5,16) }}</view>
</view> </view>
</view> </view>
</view> </view>

2
pages/index/details.vue
View File

@ -848,8 +848,8 @@ export default {
.pain-box { .pain-box {
.info-container { .info-container {
padding: 0 30rpx; padding: 0 30rpx;
background-color: #ffffff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
background-color: #ffffff;
.remark { .remark {
padding: 10rpx 0; padding: 10rpx 0;
height: 100%; height: 100%;