页面修改

src/assets/utils/tripUtils.js

@@ -796,6 +796,17 @@ var tripUtils = {
       );
     }
   },
+  //获取B2B连接
+  GetB2BUrl(B2BDomain, ConfigId, tcid) {
+    var url = "";
+    if (B2BDomain) {
+      url = "http://" + B2BDomain + "/#/detailTwo/" +
+        encodeURIComponent(ConfigId) +
+        "/" +
+        tcid;
+    }
+    return url;
+  },
   //跳转到B2C页面
   GotoB2CPage(B2BDomain, ConfigId, tcid) {
     if (B2BDomain) {

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

@@ -147,7 +147,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item>
-                  <el-button type="primary" size="small" @click="isShowTripDailog=true,clickIndex=index">选择行程</el-button>
+                  <el-button type="primary" size="small" @click="isShowTripDailog=true,clickIndex=index">选择行程
+                  </el-button>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -190,6 +191,7 @@
             if (item.ImgCover && item.ImgCover.length > 0) {
               imgUrl = item.ImgCover[0].Url;
             }
+            var LinkUrl = this.$tripUtils.GetB2BUrl(this.getLocalStorage().B2BDomain, item.ConfigId, item.TCID);
             var obj = {
               StartDate: item.StartDate,
               imgUrl: imgUrl,
@@ -198,6 +200,7 @@
               Title: item.Title,
               DayNum: item.DayNum,
               Price: item.B2BPrice,
+              LinkUrl: LinkUrl,
             };
             this.plugData.Details[this.clickIndex].TripImageUrl = obj.imgUrl;
             this.plugData.Details[this.clickIndex].Price = obj.Price;
@@ -208,8 +211,7 @@
         }
       },
     },
-    mounted() {
-    },
+    mounted() {},
   };
 
 </script>

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

@@ -90,6 +90,7 @@
             if (item.ImgCover && item.ImgCover.length > 0) {
               imgUrl = item.ImgCover[0].Url;
             }
+            var LinkUrl = this.$tripUtils.GetB2BUrl(this.getLocalStorage().B2BDomain, item.ConfigId, item.TCID);
             var obj = {
               StartDate: item.StartDate,
               imgUrl: imgUrl,
@@ -98,6 +99,7 @@
               Title: item.Title,
               DayNum: item.DayNum,
               Price: item.B2BPrice,
+              LinkUrl: LinkUrl,
             };
             this.plugData.TripImage = obj.imgUrl;
             this.plugData.TripTitle = obj.Title;
@@ -107,8 +109,7 @@
       },
 
     },
-    mounted() {
-    },
+    mounted() {},
   };
 
 </script>

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

@@ -107,10 +107,10 @@
             </el-col>
             <el-col :span="12">
                 <el-form-item :label="'標題'+' '+(index+1)">
-                    <el-input type="text" v-model="plugData.LinkTitle"></el-input>
+                    <el-input type="text" v-model="item.LinkTitle"></el-input>
                 </el-form-item>
                 <el-form-item label="連結網址" v-if="plugData.Type==2">
-                    <el-input type="text" v-model="plugData.LinkUrl"></el-input>
+                    <el-input type="text" v-model="item.LinkUrl"></el-input>
                 </el-form-item>
             </el-col>
         </el-row>

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

@@ -31,7 +31,8 @@
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
-                  <el-button type="danger" style="padding:6px;" icon="el-icon-delete" circle @click="deleteData(scope.$index)"></el-button>
+                  <el-button type="danger" style="padding:6px;" icon="el-icon-delete" circle
+                    @click="deleteData(scope.$index)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -81,6 +82,11 @@
             if (item.SurplusYSeat) {
               totalSeat += item.SurplusYSeat;
             }
+            var flightStatus = false;
+            if (item.flightList && item.flightList.length > 0) {
+              flightStatus = item.flightList[0].FlightState == 1;
+            }
+            var LinkUrl = this.$tripUtils.GetB2BUrl(this.getLocalStorage().B2BDomain, item.ConfigId, item.TCID);
             var obj = {
               StartDate: item.StartDate,
               TCNUM: item.TCNUM,
@@ -88,7 +94,10 @@
               Title: item.Title,
               DayNum: item.DayNum,
               Price: item.B2BPrice,
-              Seat: totalSeat
+              Seat: totalSeat,
+              LinkUrl: LinkUrl,
+              Substitute: item.IsSubstitution > 0,
+              FlightStatus: flightStatus,
             };
             this.plugData.GroupSelfItems.push(obj);
           });

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

@@ -178,6 +178,7 @@
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.DownLoadList[this.checkIndex].LinkUrl = imgUrl;
+          this.plugData.DownLoadList[this.checkIndex].LinkTitle=fileName;
         });
       },
       //上传图片

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

@@ -134,14 +134,14 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="行程名稱">
-                  <el-input type="text" v-model="item.TripTitle2"></el-input>
+                  <el-input type="text" v-model="item.TripTitle"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item label="連結網址">
-                  <el-input type="text" v-model="item.LinkUrl2" maxlength="200"></el-input>
+                  <el-input type="text" v-model="item.LinkUrl" maxlength="200"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -168,19 +168,19 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="'行程名稱'+' '+(index+1)">
-                  <el-input type="text" v-model="item.TripTitle2"></el-input>
+                  <el-input type="text" v-model="item.TripTitle"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
                 <el-form-item label="價格">
-                  <el-input type="text" v-model="item.Price2"></el-input>
+                  <el-input type="text" v-model="item.Price"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="連結網址">
-                  <el-input type="text" v-model="item.LinkUrl2" maxlength="200"></el-input>
+                  <el-input type="text" v-model="item.LinkUrl" maxlength="200"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -191,9 +191,7 @@
         <el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
           <el-col :span="8">
             <div class="webSliderDiv webImg_radius">
-
               <img v-if="item.ImageUrl" :src="item.ImageUrl" style="width:auto;" class="web_imgUrl" alt="" />
-
             </div>
           </el-col>
           <el-col :span="16">
@@ -209,12 +207,12 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item :label="'行程名稱'+' '+(index+1)">
-                  <el-input type="text" v-model="item.TripTitle2"></el-input>
+                  <el-input type="text" v-model="item.TripTitle"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="連結網址">
-                  <el-input type="text" v-model="item.LinkUrl2" maxlength="200"></el-input>
+                  <el-input type="text" v-model="item.LinkUrl" maxlength="200"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -253,13 +251,14 @@
       //获取选择行程数据
       getChooseTripData() {
         var tempArray = this.$refs.chooseTrip.getChooseData();
-        this.isShowTripDailog = false;
+        this.isShowTripDailog = false; 
         if (tempArray && tempArray.length > 0) {
           tempArray.forEach(item => {
             var imgUrl = ""
             if (item.ImgCover && item.ImgCover.length > 0) {
               imgUrl = item.ImgCover[0].Url;
             }
+            var LinkUrl=this.$tripUtils.GetB2BUrl(this.getLocalStorage().B2BDomain,item.ConfigId,item.TCID);
             var obj = {
               StartDate: item.StartDate,
               imgUrl: imgUrl,
@@ -268,20 +267,20 @@
               Title: item.Title,
               DayNum: item.DayNum,
               Price: item.B2BPrice,
+              LinkUrl:LinkUrl,
             };
-            console.log("plugData.Type", this.plugData.Type);
-            console.log("obj", obj);
-            console.log("this.plugData.Details[this.checkIndex]", this.plugData.Details[this.checkIndex]);
-            if (this.plugData.Type == 1 || this.plugData.Type == 2 || this.plugData.Type == 3) {
+            if (this.plugData.Type == 1 || this.plugData.Type == 2 || this.plugData.Type == 3|| this.plugData.Type == 4|| this.plugData.Type == 5|| this.plugData.Type == 6) {
               this.plugData.Details[this.checkIndex].ImageUrl = obj.imgUrl;
               this.plugData.Details[this.checkIndex].Price = obj.Price;
               this.plugData.Details[this.checkIndex].TripTitle = obj.Title;
               this.plugData.Details[this.checkIndex].DayNum = obj.DayNum;
+              this.plugData.Details[this.checkIndex].LinkUrl=obj.LinkUrl;
             } else {
               this.plugData.Details[this.checkIndex].ImageUrl = obj.imgUrl;
               this.plugData.Details[this.checkIndex].Price2 = obj.Price;
               this.plugData.Details[this.checkIndex].TripTitle2 = obj.Title;
               this.plugData.Details[this.checkIndex].DayNum2 = obj.DayNum;
+              this.plugData.Details[this.checkIndex].LinkUrl=obj.LinkUrl;
             }
             this.$refs.chooseTrip.clearData();
           });