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

src/assets/css/tripIndexNew2.css

@@ -495,7 +495,9 @@ html, body{
   .travelDaysdetails-text.right0{
     margin-right: 0;
   }
-  .travelDaysdetails-text0-r>p:first-child{
+  .travelDaysdetails-text0-r>p:first-child,
+  .travelDaysdetails-text0-r>span:first-child,
+  .travelDaysdetails-text0-r>a:first-child{
     text-indent: 101px;
   }
     .travelDaysdetails-text1{

src/components/LeaveGroupDownload/ItineraryFeatures.vue

@@ -11,8 +11,8 @@
       <div v-if="showType>=4" id="gernalCanvas" class="slider" style="margin:auto;width:100%">
         <template v-for="(i,index) in feature.tripImageList">
           <img :key="index" :src="feature.headerImage" style="width:100%;display: block;">
-          <img :key="index" :src="i" style="width:100%;display: block;">
-          <img :key="index" class="MT19" :src="feature.footerImage" style="width:100%;display: block;">
+          <img :key="index+100000" :src="i" style="width:100%;display: block;">
+          <img :key="index+200000" class="MT19" :src="feature.footerImage" style="width:100%;display: block;">
         </template>
       </div>
     </div>

src/components/LeaveGroupDownload/travelDays.vue

@@ -3,8 +3,8 @@
     <div style="width: 1123px;">
       <template v-for="(i,index) in feature.detailsImageList">
         <img :key="index" :src="feature.headerImage" style="width:100%;display: block;">
-        <img :key="index" :src="i" style="width:100%;display: block;">
-        <img :key="index" class="MT19" :src="feature.footerImage" style="width:100%;display: block;">
+        <img :key="index+100000" :src="i" style="width:100%;display: block;">
+        <img :key="index+200000" class="MT19" :src="feature.footerImage" style="width:100%;display: block;">
       </template>
     </div>
     <div style="display: none;" class="UpgradedVersion-boxHeight height UpgradedVersion-homebj relative" v-for="(item,index) in tripList">

src/components/confirmationOrderDownLoadNew.vue

@@ -532,11 +532,33 @@
       },
       // 生成pdf
       toPDF_2023: function (title) {
-        this.pdfLoading = true
+        this.pdfLoading = true;
         let urlObj = this.domainManager();
         let msg = this.getPostMsg();
-        //DownLoadPdf2023
-        //DownLoadPdf2023Url
+        var fileName = title + "_2023.pdf";
+        if (this.orderId && this.orderId > 0) {
+          //出团通知书下载
+          this.pdfDownLoad(fileName, msg);
+        } else if (urlObj.IsOnline == 0) {
+          //本地行程下载
+          this.pdfDownLoad(fileName, msg);
+        } else {
+          //阿里云行程下载
+          var objFileKey = "TripDownLoad"
+          objFileKey += "/" + msg.configId + "_" + msg.tcid;
+          objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
+          this.downloadChengDuFileRename(objFileKey, fileName, res => {
+            console.log("ali_doanload", res)
+            if (res.resultCode == 0) {
+              this.pdfDownLoad(fileName, msg);
+            } else {
+              this.pdfLoading = false;
+            }
+          })
+        }
+      },
+      pdfDownLoad: function (fileName, msg) {
+        let urlObj = this.domainManager();
         this.$http({
           headers: {
             'Content-Type': 'application/json'
@@ -550,14 +572,11 @@
           if (res.data.resultCode === 1 && res.data.data) {
             let path = res.data.data;
             this.pdfLoading = false;
-            var fileName = title + "_2023.pdf";
             this.pdfLoading = true;
             let urlObj = this.domainManager();
             var ocrUrl = "";
-            //urlObj.ocrUrl + "/Home/DownloadFileForPdf?url=" + encodeURIComponent(path);
             ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdf?configId=" + msg.configId + "&url=" +
               encodeURIComponent(path);
-            //ocrUrl="http://192.168.10.128:8300"+"/api/Home/DownloadFileForPdf?configId="+msg.configId+"&url=" + encodeURIComponent(path);
             this.$http({
               headers: {
                 'Content-Type': 'application/json'
@@ -770,7 +789,6 @@
               dinner: '敬请自理'
             }
           x.dayArray.forEach((y, index) => {
-
             if (y.type == 7 && y.childItem.title != '') {
               let obj = {
                 title: y.childItem.title,

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -320,7 +320,7 @@
           newObj.MainName = "星空九寨";
           newObj.SubName = '『星空九寨』高端定制的九寨之旅';
           newObj.MainDesc =
-            "我们坚持以高端旅游服务广大客户群体！坚信旅游是美好的体验！带您体验九寨的四季之美，赏山.赏水.赏云并且享受藏式餐饮，宿悬崖酒店，遨游九寨的秀丽山海美景！星空九寨不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择星空九寨，会是你前往九寨之旅最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！”旅游“不是舟车劳顿的代名词~提供高档旅游产品，我们有着独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的旅游产品，相信星空九寨是对你最棒的选择！最后并祝各位有个愉快的旅游假期！"
+            "我们坚持以高端旅游服务广大客户群体！坚信旅游是美好的体验！带您体验九寨的四季之美，赏山.赏水.赏云并且享受藏式餐饮，宿悬崖酒店，遨游九寨的秀丽山海美景！星空九寨不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择星空九寨，会是你前往九寨之旅最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅游”不是舟车劳顿的代名词~提供高档旅游产品，我们有着独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的旅游产品，相信星空九寨是对你最棒的选择！最后并祝各位有个愉快的旅游假期！"
         } else if (this.FeatureData && this.FeatureData.LineShortName && this.FeatureData.LineShortName.indexOf('韩国') >
           -1) {
           imgObj.url = this.homeBghg;

src/plug/index.js

@@ -119,11 +119,11 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
+        let isOnline=0;//0-本地测试，1-线上
         let ocrUrl = "http://192.168.10.68:8888";
         // domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
         //  domainUrl = "http://192.168.10.226"; //春姐
-        domainUrl = "http://192.168.10.128"; //奎哥
-        // domainUrl = "http://reborn.oytour.com";
+        domainUrl = "http://192.168.10.68"; //奎哥
 
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
@@ -132,7 +132,6 @@ export default {
         //商城API
         mallUrl = "http://192.168.20.13:8088";
         lxymallUrl = "http://192.168.20.13:8088";
-        // crmUrl = "http://192.168.10.36:8098"
         crmUrl = "http://crm.oytour.com"
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";
@@ -140,14 +139,17 @@ export default {
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://testcrm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
+          isOnline=1;
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
           mallUrl = "https://mallapi.oytour.com";
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://crm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
+          isOnline=1;
         }
         var obj = {
+          IsOnline:isOnline,//0-本地，1-线上
           //主地址
           DomainUrl: domainUrl,
           ocrUrl: ocrUrl, //行程下载地址
@@ -1079,7 +1081,6 @@ export default {
       //files 文件数组
       //p    进度回调函数
       Vue.prototype.uploadFile = function (path, files, successCall) {
-
         if (files && files.length > 0) {
           let nameList = new Array()
           for (let index = 0; index < files.length; index++) {
@@ -1097,7 +1098,6 @@ export default {
           co(function* () {
             for (let index = 0; index < files.length; index++) {
               let fileName = nameList[index]
-
               fileName = "/New" + path + fileName + "." + files[index].name.split('.').pop()
               var result = yield oss.multipartUpload(fileName, files[index], {
                 progress: function* (p) {},
@@ -1110,6 +1110,61 @@ export default {
           });
         }
       },
+      //阿里云成都文件下载
+      Vue.prototype.downloadChengDuFileRename = function (objectKey, filename, callBack) {
+        var co = require('co');
+        var OSS = require('ali-oss');
+        var oss = new OSS({
+          region: 'oss-cn-chengdu',
+          accessKeyId: 'LTAIwE7l9dImZSa3',
+          accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
+          bucket: 'vt-im-bucket'
+        })
+        var resultJson = {
+          data: "",
+          message: "",
+          resultCode: 0,
+        };
+        try {
+          let url = oss.signatureUrl(objectKey);
+          let getBlob = new Promise(resolve => {
+            const xhr = new XMLHttpRequest();
+            xhr.open('GET', url, true);
+            xhr.responseType = 'blob';
+            xhr.onload = () => {
+              if (xhr.status === 200) {
+                resolve(xhr.response);
+              }
+            };
+            xhr.send();
+          });
+          getBlob.then(blob => {
+            if (window.navigator.msSaveOrOpenBlob) {
+              navigator.msSaveBlob(blob, filename);
+            } else {
+              const link = document.createElement('a');
+              const body = document.querySelector('body');
+              link.href = window.URL.createObjectURL(blob);
+              link.download = filename;
+              link.style.display = 'none';
+              body.appendChild(link);
+              link.click();
+              body.removeChild(link);
+              window.URL.revokeObjectURL(link.href);
+              resultJson.resultCode = 1;
+              if (callBack) {
+                callBack(resultJson)
+              }
+            }
+          });
+        } catch (err) {
+          resultJson.resultCode = 0;
+          console.log("downloadChengDuFileRename", err);
+          if (callBack) {
+            callBack(resultJson)
+          }
+        }
+      },
       //公用判断图片地址 判断是否包含http
       Vue.prototype.getIconLink = function (url) {
         let str = ''