修改订单金额显示

src/components/order/orderDetial.vue

@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="金额" >
-                  <el-input v-model="form.amount" disabled/>
+                  <el-input v-model="form.paidAmount" disabled/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -85,8 +85,8 @@
                 </template>
               </el-table-column>
               <el-table-column label="商品分类" align="center" prop="categoryName" />
-              <el-table-column label="原售价" align="center" prop="amount" />
-              <el-table-column label="折扣价" align="center" prop="realAmount" />
+              <el-table-column label="原售价" align="center" prop="oriAmount" />
+              <el-table-column label="折扣价" align="center" prop="amountShould" />
               <el-table-column label="实付" align="center" prop="realAmount" />
               <el-table-column label="数量" align="center" prop="num" />
               <el-table-column type="selection"  width="55" :selectable="checkSelectable" v-if="selectionTag"/>                
@@ -315,7 +315,7 @@ export default {
             let list=response.data.orderDetails;
             for(let i=0;i<list.length;i++){
              this.goodsList.push({"id":list[i].id,"refundId":list[i].refundId,"goodsName":list[i].goods.name,"pics":list[i].goods.pics,
-             "categoryName":list[i].goods.categoryName,"price":list[i].goods.price,"discount":list[i].goods.discount,
+             "categoryName":list[i].goods.categoryName,"oriAmount":list[i].oriAmount,"amountShould":list[i].amountShould,
              "realAmount":list[i].realAmount,"num":list[i].num,"amount":list[i].amount});
             }
           }

src/components/order/refundDetial.vue

@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="金额" >
-                  <el-input v-model="form.amount" disabled/>
+                  <el-input v-model="form.paidAmount" disabled/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -85,8 +85,8 @@
                 </template>
               </el-table-column>
               <el-table-column label="商品分类" align="center" prop="categoryName" />
-              <el-table-column label="原售价" align="center" prop="amount" />
-              <el-table-column label="折扣价" align="center" prop="realAmount" />
+              <el-table-column label="原售价" align="center" prop="oriAmount" />
+              <el-table-column label="折扣价" align="center" prop="amountShould" />
               <el-table-column label="实付" align="center" prop="realAmount" />
               <el-table-column label="数量" align="center" prop="num" />              
             </el-table> 
@@ -264,7 +264,7 @@ export default {
             let list=response.data.order.orderDetails;
             for(let i=0;i<list.length;i++){
              this.goodsList.push({"goodsName":list[i].goods.name,"pics":list[i].goods.pics,
-             "categoryName":list[i].goods.categoryName,"price":list[i].goods.price,"discount":list[i].goods.discount,
+             "categoryName":list[i].goods.categoryName,"oriAmount":list[i].oriAmount,"amountShould":list[i].amountShould,
              "realAmount":list[i].realAmount,"num":list[i].num})
             }
           }

src/views/order/order/index.vue

@@ -44,7 +44,9 @@
       </el-table-column>
       <el-table-column label="顺序号" align="center" prop="orderNum" />
       <el-table-column label="商品数量" align="center" prop="goodsNum" />
-      <el-table-column label="金额" align="center" prop="amount" />
+      <el-table-column label="金额" align="center" prop="paidAmount" />
+      <el-table-column label="应付金额" align="center" prop="amount" />
+      <el-table-column label="优惠金额" align="center" prop="couponAmount" />
       <el-table-column label="城市" align="center" >
         <template slot-scope="scope">
           {{getProvince(scope.row.shop.city)}}

src/views/order/refund/index.vue

@@ -41,7 +41,9 @@
       </el-table-column>
       <el-table-column label="订单编号" align="center" prop="orderNo"/>
       <el-table-column label="商品数量" align="center" prop="order.goodsNum" />
-      <el-table-column label="金额" align="center" prop="refundAmount" />
+      <el-table-column label="金额" align="center" prop="order.paidAmount" />
+      <el-table-column label="应付金额" align="center" prop="order.amount" />
+      <el-table-column label="优惠金额" align="center" prop="order.couponAmount" />
       <el-table-column label="店铺" align="center" prop="order.shop.name" />      
       <el-table-column label="用户名称" align="center" prop="order.userName" />
       <el-table-column label="付款时间" align="center" prop="order.payTime"/>