Merge branch 'master' of http://47.102.110.240:3000/yuxiangpei/jzmall_vue

src/views/order/order.vue

@@ -178,7 +178,7 @@
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
-            >编辑</el-button
+            >修改支付金额</el-button
           >
           <el-button
             v-permission="['POST /admin/order/delete']"

src/views/order/serviceorder.vue

@@ -177,11 +177,13 @@
       <el-table :data="orderDetail" style="margin-top: 20px" border fit>
         <el-table-column align="center" label="id" prop="id" />
         <el-table-column align="center" label="服务订单编号" prop="orderId" />
-        <el-table-column align="center" label="预约日期" prop="bookDate" />
-        <el-table-column label="预约时间" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.bookStartTime + "-" + scope.row.bookEndTime }}
-          </template>
+        <!-- <el-table-column align="center" label="预约日期" prop="bookDate" /> -->
+        <el-table-column label="预约时间" width="180" prop="bookTime" align="center">
+          <!-- <template slot-scope="scope">
+            {{ scope.row.bookStartTime==null?"":scope.row.bookStartTime 
+            + "-" + 
+            scope.row.bookEndTime==null?"":scope.row.bookEndTime }}
+          </template> -->
         </el-table-column>
 
         <el-table-column align="center" label="服务者姓名" prop="servantName" />
@@ -203,7 +205,7 @@
               type="primary"
               size="mini"
               @click="handleReassign(scope.row)"
-              v-if="scope.row.status == 1"
+              v-if="scope.row.status == 1||scope.row.status == 0"
               >改派</el-button
             >
             <el-button
@@ -295,7 +297,7 @@ const statusMap = {
   2: "服务中",
   3: "服务已提供",
   4: "服务已完成",
-  5: "取消-未付款",
+  5: "取消",//取消-未付款
   6: "退款"
 };