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

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -652,7 +652,7 @@
           //团期全选
           checkGroupALL: false,
           //销售平台全选
-          checkPlatForm: false,
+          checkPlatForm: true,
           //团队状态全选
           checkTCStateAll: false,
           //是否显示弹出框
@@ -718,8 +718,8 @@
           DayNum: '',
           OnlyShowOverTeam: false,
           TCState: [3], //去掉默认显示
-          GroupState: [],
-          SalePlat: [],
+          GroupState: [1],
+          SalePlat: [1,2,3,4,5],
           UnionCityId: 0,
           SaleBranchId: [],
           total: 0,
@@ -734,7 +734,7 @@
           RateOnDay: '-1',
           RateOn: '-1',
           TeamType: 2, //一日游的团
-          IsShowUnion: -1,
+          IsShowUnion: 0,
           TCID: '',
         },
         remarkMsg: {
@@ -1489,9 +1489,8 @@
     },
     created () {
       this.GetLookAllTeamAuth();
-      this.checkAllTeam();
       //默认显示联运
-      this.queryMsg.IsShowUnion = -1;
+      this.queryMsg.IsShowUnion = 0;
       let userInfo = this.getLocalStorage()
       this.CurrentUserInfo = userInfo
 

src/components/newConfimationOrder.vue

@@ -476,6 +476,7 @@
       </div>
 
       <div v-if="(showType>=4)&&loadNone==false&&vshowC" class="newFeature" v-html="feature.featureHtml"></div>
+      <div v-if="vshowD">
         <div class="newtripList" v-for="(item,index) in tripList" :key="index">
           <template  v-if="item.dayNum<10">
           <div class="newTripFly" style="margin-bottom:10px;">
@@ -551,6 +552,7 @@
           </div>
         </div>
       </div>
+    </div>
     <div class="newTripFeiyong">
       <div id="pdf_4">
         <div v-if='vshowE' class="newTripFeiyongtitle">

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -140,7 +140,7 @@
       newFeature2,
       // newFeature3,
     },
-    props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType","CurrentUserInfo"],
+    props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
     inject: ['loadConfigInfo'],
     data() {
       return {
@@ -228,6 +228,8 @@
         //折叠展开
         isFold: "",
         FeatureDataFlag: false,
+        //当前登录用户信息
+        CurrentUserInfo: {}
       };
     },
     created: function () {},
@@ -534,6 +536,8 @@
       }
     },
     mounted() {
+      let userInfo = this.getLocalStorage()
+      this.CurrentUserInfo = userInfo
       this.MsgBus.$on('FeatureDataFlag', () => {
         this.FeatureDataFlag = true
       });