Merge branch 'master' of http://47.92.161.104:10080/shuzhan/smart-bus-portal

src/views/base/orderInfo-list.vue

@@ -118,8 +118,8 @@
       ></el-table-column>
       <el-table-column  prop="ticketType"  label="购票类型"  width="130">
         <template  slot-scope="{ row }">
-          <span v-if="row.ticketType=='1'">成人票</span>
-          <span v-else-if="row.ticketType=='2'">儿童票</span>
+          <span v-if="row.ticketType=='2'">成人票</span>
+          <span v-else-if="row.ticketType=='1'">儿童票</span>
         </template>
       </el-table-column>
             <el-table-column