Merge pull request 'gdpao' (#109) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/109
This commit is contained in:
		
						commit
						2f1b89c6a6
					
				@ -19,8 +19,8 @@
 | 
			
		||||
			<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
 | 
			
		||||
			<view class="info">
 | 
			
		||||
				<view class="num">共{{info.count_number}}件商品</view>
 | 
			
		||||
				<view class="price">实付<span>¥{{info.order_amount}}</span></view>
 | 
			
		||||
                <view class="time">{{ info.payment_time.slice(5,16) }}</view>
 | 
			
		||||
				<view class="price">{{ info.view_type==10 ? "待支付" : "实付" }}<span>¥{{info.order_amount}}</span></view>
 | 
			
		||||
                <view class="time">{{ info.view_type==10 ? info.add_time.slice(5,16) : info.payment_time.slice(5,16) }}</view>
 | 
			
		||||
			</view>
 | 
			
		||||
		</view>
 | 
			
		||||
	</view>
 | 
			
		||||
 | 
			
		||||
@ -848,8 +848,8 @@ export default {
 | 
			
		||||
    .pain-box {
 | 
			
		||||
        .info-container {
 | 
			
		||||
            padding: 0 30rpx;
 | 
			
		||||
            background-color: #ffffff;
 | 
			
		||||
            margin-bottom: 20rpx;
 | 
			
		||||
            background-color: #ffffff;
 | 
			
		||||
            .remark {
 | 
			
		||||
                padding: 10rpx 0;
 | 
			
		||||
                height: 100%;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user