Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0

pages/account/index/order/detail/module/GoodsInfo.vue

@@ -13,7 +13,7 @@
 					<th>商品信息</th>
 					<th width="96">单价</th>
 					<th width="96">数量</th>
-					<th width="163">实付款</th>
+					<th width="163" v-if="orderInfo.orderStatus > 2">实付款</th>
 					<th width="135">操作</th>
 				</tr>
 			</thead>
@@ -24,7 +24,7 @@
 						<UiMoney :money="i.realAmount" float/>
 					</td>
 					<td class="not-border">{{i.quantity}}</td>
-					<td>
+					<td v-if="orderInfo.orderStatus > 2">
 						<UiMoney :money="i.realAmount" float/>
 					</td>
 					<td>