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

src/assets/utils/travelFeature2.js

@@ -56,7 +56,7 @@ let travelFeatureTwo = {
   DinnerInit: function (index, data) { // 餐初始化
     let list = [];
     for (let item of data[index].DinnerArray) {
-      if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上享用早餐' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上享用' || item.DinnerName == '酒店享用')) {
+      if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
         let obj = {
           name: '',
           MD5Sign: '',

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -625,6 +625,10 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
                       </el-dropdown-item>
+                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)" style="display:none">结团
+                      </el-dropdown-item>
+                      <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)" style="display:none">正常
+                      </el-dropdown-item>
                       <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)">
                         B2B预览
                       </el-dropdown-item>
@@ -1509,6 +1513,24 @@
           }
         })
       },
+      //结团/正常
+      OutGroup(TCID,Status)
+      {
+          let msg = {
+          TCID: TCID,
+          Status: Status,
+        }
+        this.apipost('travel_post_SetPriceStatus', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message)
+            this.getControlList()
+            this.queryCommonData.checkDialogAll = false
+            this.queryCommonData.ckedplat = []
+          } else {
+            this.Info(res.data.message)
+          }
+        })
+      },
     },
     filters: {
       formatStartDate(value) {

src/components/commonPage/payURL.vue

@@ -58,6 +58,7 @@
 				isDesc: false,
 				descMin: 0,
 				descSecond: 0,
+				descHour:0,
 				fylxList: [],
 				isShowId:-1,
 				checkValue: '',
@@ -176,7 +177,6 @@
 					OrderSource: 8
 				}, res => {
 					if(res.data.resultCode == 1) {
-						console.log(res.data.data)
 						if(Object.keys(res.data.data).length == 0) {
 							if(Type == 2) {
 								this.getCodeUrl(obj)
@@ -237,7 +237,7 @@
 				}
 				
 				this.apipost('OnlinePay_post_GetCodeUrl', msg, res => {
-					if(res.data.resultCode == 1) {						
+					if(res.data.resultCode == 1) {		
 						this.payPic = res.data.data.CodeURL
 						this.lastTime = new Date(res.data.data.ExpireDate)
 						this.nowDate=new Date(res.data.data.NowDate)
@@ -295,12 +295,16 @@
 				sec = sec > 9 ? sec : '0' + sec
 				// 控制台打印
 				if(this.chaTime>0){
-				this.descMin = min
-				this.descSecond = sec
+				if(hr>0){
+					this.descHour = hr;
+				}
+				this.descMin = min+this.descHour*60;
+				this.descSecond = sec;
 				}else{
 					this.isShowPic=false
 					this.descMin = 0
 					this.descSecond = 0
+					this.descHour = 0
 					clearInterval(this.timer)	
 				}
 				this.chaTime-=1000

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -1215,7 +1215,7 @@
           let restaurantObj = json.restaurantObj;
           let list = [];
           restaurantObj.list.forEach(item => {  // 餐饮筛选
-            if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上享用早餐' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上享用' || item.DinnerName == '酒店享用')) {
+            if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上享用早餐' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
               let obj = {
                 name: '',
                 MD5Sign: '',
@@ -1973,7 +1973,7 @@
           let restaurantObj = json.travelFeature2.restaurantObj;
           let list = [];
           restaurantObj.list.forEach(item=> {  // 餐饮筛选
-            if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName=="酒店内享用早餐" ||item.DinnerName == '酒店外享用早餐'   || item.DinnerName == '机上享用早餐' ||  item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上享用' || item.DinnerName == '酒店享用')) {
+            if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName=="酒店内享用早餐" ||item.DinnerName == '酒店外享用早餐'   || item.DinnerName == '机上简餐或自理' ||  item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
               let obj = {
                 name: '',
                 MD5Sign: '',

src/components/newTravelmanager/travelLineTrip/HotelTrip.vue

@@ -146,7 +146,7 @@
           },
           {
             Id: 4,
-            name: "机上享用早餐"
+            name: "机上简餐或自理"
           },
           {
             Id: 3,
@@ -159,7 +159,7 @@
         hotelArray: this.dayObj.HotelArray,
         otherDinner: [{
           ID: -1,
-          Name: "机上享用",
+          Name: "机上简餐或自理",
           City: 0,
           About: "",
           PicPath: ""

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -133,7 +133,7 @@
           <div class="TC-titlebox">
             <span class="TC-TitleSpan" v-if="!dayObj.isRead">
               <el-form-item>
-                <el-input class="w700" placeholder="请输入行程大点信息" v-model="dayObj.TitleObj.Title"></el-input>
+                <el-input type="textarea" :autosize="{minRows: 1, maxRows: 8 }" resize="none" class="w700" placeholder="请输入行程大点信息" v-model="dayObj.TitleObj.Title"></el-input>
               </el-form-item>
             </span>
             <span class="TC-spanTitle" v-if="dayObj.isRead">{{dayObj.TitleObj.Title}}</span>