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

src/App.vue

@@ -172,7 +172,6 @@ export default {
       this.showCareer=false
     })
     this.MsgBus.$on("changeTheme",t=>{
-      console.log('theme type:'+t)
       this.isRed=t==1;
     })
   }

src/components/WebSet/WebSiteSearch.vue

@@ -309,15 +309,11 @@ export default {
       this.chosenStep=0
     },
     changeMapping(d){
-      console.log('in.....',d)
       if(d){
         let t=d.split('_')
-        // this.agentChosenArea[t[1]].targetId=t[0]
         this.agentChosenArea[t[1]].targetId=d
-        console.log(this.agentChosenArea[t[1]].targetId)
         this.$forceUpdate()
       }
-      //this.agentChosenArea[i].targetId=id
     },
     sureAgentArea(){
       if(this.chosenStep==0 && this.agentChosenArea.length>0){
@@ -395,7 +391,6 @@ export default {
             this.agentChosenArea.forEach((x,i)=>{
               x.targetId= x.targetId+"_"+i
             })
-            console.log(this.agentChosenArea)
           }
         } catch (error) {}
       }

src/components/WebSet/plug-in/choose_trip.vue

@@ -122,7 +122,8 @@
         </el-col>
         <el-col :span="5">
           <el-form-item>
-            <input type="button" class="hollowFixedBtn" @click="resetPageIndex(),GetList()" :value="$t('pub.searchBtn')" />
+            <input type="button" class="hollowFixedBtn" @click="resetPageIndex(),GetList()"
+              :value="$t('pub.searchBtn')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -166,7 +167,7 @@
             {{item.B2BPrice}}
           </td>
           <td>
-            {{(item.SurplusFSeat+item.SurplusCSeat+item.SurplusYSeat)}}
+            {{(item.FSeat+item.CSeat+item.YSeat)- (item.SurplusFSeat+item.SurplusCSeat+item.SurplusYSeat)}}
           </td>
         </tr>
         <tr>

src/components/WebSet/plug-in/group_dialog.vue

@@ -72,15 +72,24 @@
         if (tempArray && tempArray.length > 0) {
           tempArray.forEach(item => {
             var totalSeat = 0;
+            if (item.FSeat) {
+              totalSeat += item.FSeat;
+            }
+            if (item.CSeat) {
+              totalSeat += item.CSeat;
+            }
+            if (item.YSeat) {
+              totalSeat += item.YSeat;
+            }
             if (item.SurplusFSeat) {
-              totalSeat += item.SurplusFSeat;
+              totalSeat -= item.SurplusFSeat;
             }
             if (item.SurplusCSeat) {
-              totalSeat += item.SurplusCSeat;
+              totalSeat -= item.SurplusCSeat;
             }
 
             if (item.SurplusYSeat) {
-              totalSeat += item.SurplusYSeat;
+              totalSeat -= item.SurplusYSeat;
             }
             var flightStatus = false;
             if (item.flightList && item.flightList.length > 0) {

src/components/commonPage/oneday.vue

@@ -117,7 +117,6 @@
     showTime: {
       handler: function (v, ov) {
         this.isshowtime = v;
-        console.log(v)
       },
       deep: true,
     },