Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -144,13 +144,13 @@
       <el-table-column label="预约方式" align="center" prop="reservationMethod" show-overflow-tooltip />
       <el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice">
         <template slot-scope="scope">
-          <span>{{ scope.row.orderPrice == null? scope.row.orderPrice+"元" : "-" }}</span>
+          <span>{{ scope.row.orderPrice +"元" || "-" }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="设备服务费" align="center" prop="servicePrice">
         <template slot-scope="scope">
-          <span>{{ scope.row.servicePrice == null? scope.row.servicePrice+"元" : "-" }}</span>
+          <span>{{ scope.row.servicePrice +"元"|| "-" }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建日期" align="center" prop="createTime" show-overflow-tooltip>