潘超林 4 months ago
parent
commit
1f9d7a1ac1
3 changed files with 5 additions and 5 deletions
  1. 1 1
      src/views/manage/afterSaleOrder.vue
  2. 2 2
      src/views/manage/order.vue
  3. 2 2
      vue.config.js

+ 1 - 1
src/views/manage/afterSaleOrder.vue

@@ -456,7 +456,7 @@
           {{ detailInfo ? detailInfo.freightFee : "" }}</el-descriptions-item
         >
         <el-descriptions-item label="实付款(元)">
-          {{ detailInfo ? detailInfo.totalPrice : "" }}
+          {{ detailInfo ? detailInfo.paymentAmount : "" }}
         </el-descriptions-item>
       </el-descriptions>
       <el-descriptions title="物流信息" column="3">

+ 2 - 2
src/views/manage/order.vue

@@ -6,7 +6,7 @@
           <el-card shadow="always">
             <div class="item">
               <div style="padding: 10px">
-                <span>全部订单</span>
+                <span>今日新增订单</span>
               </div>
               <div class="count">
                 {{ orderStatistics ? orderStatistics.AllOrder : 0 }} 个
@@ -494,7 +494,7 @@
           {{ detailInfo ? detailInfo.freightFee : "" }}</el-descriptions-item
         >
         <el-descriptions-item label="实付款(元)">
-          {{ detailInfo ? detailInfo.totalPrice : "" }}
+          {{ detailInfo ? detailInfo.paymentAmount : "" }}
         </el-descriptions-item>
       </el-descriptions>
       <el-descriptions title="物流信息" column="3">

+ 2 - 2
vue.config.js

@@ -32,11 +32,11 @@ module.exports = {
   devServer: {
     host: '0.0.0.0',
     port: port,
-    open: true,
+    open: false,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.69:30023/admin`,
+        target: `http://192.168.1.69:30023/merchant`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''