Merge branch 'dev' into 'test'

订单列表文案修改

See merge request quanshu/mp-ui-pc!210

src/views/order/deliver/index.vue

@@ -144,7 +144,7 @@
           <div>{{ row.orderNum }}件</div>
         </template>
       </el-table-column>
-      <el-table-column label="支付金额(元)" min-width="85">
+      <el-table-column label="实付金额(元)" min-width="85">
         <template slot-scope="{ row }">
           <div>{{ $numberFormat(row.payAmt) }}</div>
         </template>

src/views/order/userTicket/index.vue

@@ -112,7 +112,7 @@
           <div>{{ $numberFormat(row.salePrice) }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="支付金额(元)" min-width="95">
+      <el-table-column label="实付金额(元)" min-width="95">
         <template slot-scope="{ row }">
           <div>{{ $numberFormat(row.payAmt) }}</div>
         </template>