浏览代码

Merge branch 'master' into develop

zh 2 年之前
父节点
当前提交
2e4b99e69f
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      src/layout/components/Navbar.vue
  2. 2 2
      src/views/dashboard/index.vue

+ 2 - 2
src/layout/components/Navbar.vue

@@ -184,11 +184,11 @@
           <el-table-column align="center" label="时间" prop="orderTrackTime" min-width="160" show-overflow-tooltip />
           <el-table-column align="center" label="收货地址" prop="address" min-width="160" show-overflow-tooltip >
               <template slot-scope="scope">
-                  {{ scope.row.address?scope.row.address:'---------' }}
+                  {{ scope.row.address?scope.row.address:'——' }}
               </template>
           </el-table-column>
           <el-table-column align="center" label="收货客户" prop="receivingName" min-width="160" show-overflow-tooltip >
-            <template slot-scope="scope">{{ scope.row.receivingName?scope.row.receivingName:'---------' }}</template>
+            <template slot-scope="scope">{{ scope.row.receivingName?scope.row.receivingName:'——' }}</template>
           </el-table-column>
           <el-table-column align="center" label="" min-width="80" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">

+ 2 - 2
src/views/dashboard/index.vue

@@ -179,11 +179,11 @@
           <el-table-column align="center" label="时间" prop="orderTrackTime" min-width="160" show-overflow-tooltip />
           <el-table-column align="center" label="收货地址" prop="address" min-width="160" show-overflow-tooltip >
               <template slot-scope="scope">
-                  {{ scope.row.address?scope.row.address:'---------' }}
+                  {{ scope.row.address?scope.row.address:'——' }}
               </template>
           </el-table-column>
           <el-table-column align="center" label="收货客户" prop="receivingName" min-width="160" show-overflow-tooltip >
-            <template slot-scope="scope">{{ scope.row.receivingName?scope.row.receivingName:'---------' }}</template>
+            <template slot-scope="scope">{{ scope.row.receivingName?scope.row.receivingName:'——' }}</template>
           </el-table-column>
           <el-table-column align="center" label="" min-width="80" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">