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

src/components/confirmationOrderDownLoad.vue

@@ -32,7 +32,7 @@
         <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
       </el-col>
       <el-col :span="10">
-        <span>行程补充说明</span>
+        <span style="font-size:14px">行程补充说明:</span>
         <el-select filterable size="small" v-model="Typevalue" placeholder="请选择">
           <el-option label="日本寻秋意赏枫季" :value="-1"></el-option>
           <el-option label="仲夏花火夜" :value="-2"></el-option>