页面修改

src/components/commonPage/carousel.vue

 <template>
-	<div class="zj_carouselCont">
-		<ul ref='ul' @mouseenter="play" @mouseleave="pause">
-			<li v-for="(item,index) in imgArr">
-				<img :src="item.Url" />
-			</li>
-		</ul>
-		<!--'+?x-oss-process=image/resize,m_lfit,h_120,w_160'-->
-	</div>
+  <div class="zj_carouselCont">
+    <ul ref='ul' @mouseenter="play" @mouseleave="pause">
+      <li v-for="(item,index) in imgArr" :key="index">
+        <img :src="item.Url" />
+      </li>
+    </ul>
+  </div>
 </template>
 
 <script>
-export default {
-  props: ["imgArr"],
-  data() {
-    return {
-    	i:0,
-    	isPlay:false,
-    	timer:null
-    };
-  },
-  mounted() {
- 	this.$refs.ul.style.width=this.imgArr.length*160+'px';
-  },
-  computed: {},
-  methods: {
-  	play(){
-  		this.isPlay=true,
-  		this.timer=setInterval(()=>{
-  			if(this.isPlay==true){
-	  			if(this.i<this.imgArr.length-1){
-	  				this.i++
-	  			}else{
-	  				this.i=0
-	  			}
-	  			this.$refs.ul.style.left=-160*this.i+'px'
-  			}
-  		},3000)
-  	},
-  	pause(){
-  		this.isPlay=false
-  		clearInterval(this.timer)
-  	}
-  },
-  created() {}
-};
+  export default {
+    props: ["imgArr"],
+    data() {
+      return {
+        i: 0,
+        isPlay: false,
+        timer: null
+      };
+    },
+    mounted() {
+      this.$refs.ul.style.width = this.imgArr.length * 160 + 'px';
+    },
+    computed: {},
+    methods: {
+      play() {
+        this.isPlay = true,
+          this.timer = setInterval(() => {
+            if (this.isPlay == true) {
+              if (this.i < this.imgArr.length - 1) {
+                this.i++
+              } else {
+                this.i = 0
+              }
+              this.$refs.ul.style.left = -160 * this.i + 'px'
+            }
+          }, 3000)
+      },
+      pause() {
+        this.isPlay = false
+        clearInterval(this.timer)
+      }
+    },
+    created() {}
+  };
+
 </script>
 
 <style>
-	.zj_carouselCont{width: 160px; height: 120px; overflow: hidden; position: relative;}
-	.zj_carouselCont ul{width: auto; height: 120px; position: absolute; left:0; transition: left .2s;}
-	.zj_carouselCont ul li{float: left; width: 160px; height: 120px; border: none; overflow: hidden;}
-	.zj_carouselCont ul li>img{width: 160px; height: 120px;}
-</style>
\ No newline at end of file
+  .zj_carouselCont {
+    width: 160px;
+    height: 120px;
+    overflow: hidden;
+    position: relative;
+  }
+
+  .zj_carouselCont ul {
+    width: auto;
+    height: 120px;
+    position: absolute;
+    left: 0;
+    transition: left .2s;
+  }
+
+  .zj_carouselCont ul li {
+    float: left;
+    width: 160px;
+    height: 120px;
+    border: none;
+    overflow: hidden;
+  }
+
+  .zj_carouselCont ul li>img {
+    width: 160px;
+    height: 120px;
+  }
+
+</style>

src/components/orderCommon/order-form2.vue

@@ -54,10 +54,11 @@
   }
 
 </style>
+<!--下单表单-->
 <template>
   <div class="commonOrderForm" :style="{ height: ScreenHeight }">
     <p class="title">
-      {{ $t("salesModule.SignImdi") }} 
+      {{ $t("salesModule.SignImdi") }}   <span style="color:red;font-weight:bold;">联运信息请填下面【联运备注】</span>
       <span v-if="crmOrderObj">
         <span style="color: red">引流人：{{ crmOrderObj.LureEmpNmae }} </span>
         <span style="color: #2aaef2">/客人：{{ crmOrderObj.CRMGuestName }}</span>
@@ -146,6 +147,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
+           
           </el-col>
           <el-col :span="4">
             <!--出发是否联运-->
@@ -188,6 +190,7 @@
               <el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2"
                 @change="getUnionTravelPrice(priceObj, 2)"></el-switch>
             </el-form-item>
+          
           </el-col>
           <el-col :span="4">
             <!--返程联运时间-->
@@ -629,10 +632,11 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20" v-if="addMsg.IsIntermodal == 1 || addMsg.IsReturnIntermodal == 1">
+      <!--v-if="addMsg.IsIntermodal == 1 || addMsg.IsReturnIntermodal == 1"-->
+      <el-row :gutter="20" >
         <el-col :span="24">
           <el-form-item label="联运备注" prop="UnionRemark">
-            <el-input v-model="addMsg.UnionRemark" type="textarea" maxlength="500" placeholder=""></el-input>
+            <el-input v-model="addMsg.UnionRemark" type="textarea" maxlength="500" placeholder="去程 成都到北京，提前一天，需要住宿;回程 北京到成都 晚一天，需要住宿"></el-input>
           </el-form-item>
         </el-col>
       </el-row>

src/components/orderCommon/productOrderList.vue

@@ -608,11 +608,7 @@
               <span class="TCL-greenType">{{ item.SaleClearOrderHour
                   }}{{ $t("salesModule.Hour") }}</span>
             </p>
-            <p v-if="
-                  item.LineID == 14 &&
-                  item.HotelOrderListReports &&
-                  item.HotelOrderListReports.length > 0
-                ">
+            <p v-if="item.LineID == 14 && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
               <el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
                 <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj">
                 </commonHotelInfo>
@@ -625,12 +621,7 @@
             <p>
               <i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
             </p>
-            <p style="
-                  color: #47bf8c;
-                  font-size: 16px;
-                  font-weight: bold;
-                  margin: 5px 0;
-                ">
+            <p style="color:#47bf8c;font-size:16px;font-weight:bold;margin: 5px 0;">
               {{ $t("Operation.Op_tradePrice") }}:￥{{
                   item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
                 }}<br />
@@ -844,12 +835,14 @@
             <p v-if="item.VisaFileList.length !== 0">
               <span>{{ $t("visa.v_visaInformation") }}</span>
             </p>
-            <p v-if="item.VisaFileList.length !== 0" v-for="(item2, index2) in item.VisaFileList" :key="index2">
-              <span style="cursor: pointer; text-decoration: underline"
-                @click="downloadFile(item2)">{{ item2.Name }}</span>
-            </p>
+            <template v-if="item.VisaFileList&& item.VisaFileList.length >0">
+              <p v-for="(item2, index2) in item.VisaFileList" :key="index2">
+                <span style="cursor: pointer; text-decoration: underline"
+                  @click="downloadFile(item2)">{{ item2.Name }}</span>
+              </p>
+            </template>
             <p>
-              <span>{{ $t("salesModule.TicketStatus") }}：</span>
+              <span>{{ $t("salesModule.TicketStatus")}}：</span>
               <span class="fz16 fbold">
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.AllTk')" placement="top">
                   <span style="color: #4bca81" v-if="item.MakeInvoice == 1">√</span>
@@ -950,7 +943,6 @@
             </el-button-group>
           </div>
         </div>
-
         <div class="d6">
           <el-popover placement="right" width="500" trigger="click" :content="item.ProductRecommend">
             <span style="
@@ -991,7 +983,6 @@
 <script>
   import commonTeamInfo from "../commonPage/commonTeamInfo.vue";
   import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
-  import carousel from "../commonPage/carousel.vue";
   import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
   import orderForm from "./order-form2.vue";
   export default {
@@ -1030,7 +1021,6 @@
       orderForm,
       commonTeamInfo,
       tripDownLoadCommon,
-      carousel,
       commonHotelInfo,
     },
     filters: {