Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/busManagement/BookAcar/components/orderList.vue

@@ -447,7 +447,7 @@
             <template v-if="!scope.row.OrderSource && scope.row.CustomerId > 0"
               >B2B</template
             >
-            <template v-if="scope.row.OrderSource == 1">B2C</template>
+            <template v-if="scope.row.OrderSource == 1||scope.row.OrderSource == 2">B2C</template>
           </span>
         </div>
         <div class="row c9e fz12">
@@ -863,7 +863,7 @@
               scope.row.IncomeList.length == 0 &&
               scope.row.RefundList.length == 0 &&
               scope.row.CostList.length == 0 &&
-              scope.row.OrderSource != 1
+              (scope.row.OrderSource != 1&&scope.row.OrderSource != 2)
             "
             class="row-c cursor-pointer radius5 cancel py5"
             @click="clickRightButtom(scope.row, 0)"
@@ -875,7 +875,7 @@
             v-if="
               scope.row.OrderStatus == 1 &&
               pagesTitle != '销售' &&
-              scope.row.OrderSource != 1
+               (scope.row.OrderSource != 1&&scope.row.OrderSource != 2)
             "
             class="row-c cursor-pointer radius5 confirm py5"
             @click="clickRightButtom(scope.row, 1)"