Merge branch 'master' into develop

src/layout/components/Navbar.vue

@@ -182,9 +182,15 @@
           </el-table-column>
           <el-table-column align="center" label="内容" prop="orderTrackStatus" min-width="160" show-overflow-tooltip />
           <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 />
-          <el-table-column align="center" label="收货客户" prop="receivingName" min-width="160" show-overflow-tooltip />
-          <el-table-column align="center" label="" min-width="160" show-overflow-tooltip fixed="right">
+          <el-table-column align="center" label="收货地址" prop="address" min-width="160" show-overflow-tooltip >
+              <template slot-scope="scope">
+                  {{ 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>
+          </el-table-column>
+          <el-table-column align="center" label="" min-width="80" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
               <el-button type="text" class="textColor" @click="handLogistics(scope.row)">查看</el-button>
             </template>

src/views/dashboard/index.vue

@@ -177,9 +177,15 @@
           </el-table-column>
           <el-table-column align="center" label="内容" prop="orderTrackStatus" min-width="160" show-overflow-tooltip />
           <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 />
-          <el-table-column align="center" label="收货客户" prop="receivingName" min-width="160" show-overflow-tooltip />
-          <el-table-column align="center" label="" min-width="160" show-overflow-tooltip fixed="right">
+          <el-table-column align="center" label="收货地址" prop="address" min-width="160" show-overflow-tooltip >
+              <template slot-scope="scope">
+                  {{ 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>
+          </el-table-column>
+          <el-table-column align="center" label="" min-width="80" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
               <el-button type="text" class="textColor" @click="handLogistics(scope.row)">查看</el-button>
 
@@ -320,7 +326,7 @@ export default {
       inDialog: false,
       detailData: [],
       rebateList: [],
-      isCustomer: JSON.parse(localStorage.getItem('supply_user')).isCustomer,
+      // isCustomer: JSON.parse(localStorage.getItem('supply_user')).isCustomer,
       menuList: [],
       dialogVisible: false,
       checkList: [],