Merge remote-tracking branch 'origin/master'

src/views/order/index.vue

@@ -118,6 +118,7 @@
             <span v-if="scope.row.status === 8">支付中</span>
             <img v-if="scope.row.status === 9" src="../../assets/image/order/dingdan_icon_zhifuchenggong@2x.png" style="width: 20px;height: 20px">
             <img v-if="scope.row.status === 10" src="../../assets/image/order/dingdan_icon_guanbi@2x.png" style="width: 20px;height: 20px">
+            <span v-if="scope.row.status === 11">已核销</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150">
@@ -144,7 +145,7 @@
               @click="paymentconfirmation(scope.row)"
             >支付确认</el-button>
             <el-button
-              v-if="scope.row.status === 9 && scope.row.payPrice > 0"
+              v-if="(scope.row.status === 9 && scope.row.payPrice > 0) || (scope.row.status === 11 && scope.row.payPrice > 0)"
               v-hasPermi="['sys:dict:edit']"
               size="mini"
               type="text"