页面修改

src/components/PersonalInfoSet.vue

@@ -1351,7 +1351,7 @@
         newArr.push(blob);
         var fileName = `${that.uuid(10,10)}.png`;
         var path = `/Upload/Temporary`;
-        that.uploadSelfBlob(path, newArr, x => {
+        that.uploadSelfBlob(path, newArr,'', x => {
           let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
           this.postImg(allPath)
         })

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

@@ -1498,7 +1498,7 @@
             newArr.push(blob);
             var fileName = `${that.uuid(10, 10)}.png`;
             var path = `/newFeature`;
-            that.uploadSelfBlob(path, newArr, x => {
+            that.uploadSelfBlob(path, newArr,'', x => {
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
               let i = e.target.id.split("_")[2];
               that.imgUrlChange(allPath);

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

@@ -9,29 +9,28 @@
           </FeatureControls>
         </div>
       </div>
+   
       <div class="UpgradedVersionDetails-box column" v-for="(item,i) in FeatureData.dataObj.SubList">
         <div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
           <div class="UpgradedVersionDetails-img relative">
             <div class="UpgradedVersionDetails1 absolute z-index3">
-              <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" isImg="1" :isUploadImg="true"
-                :isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
-                @toDeleteImg="DeleteImg(i)" :x="312" :y="312" />
-                <input type="file" style="display:none" :id="'GouDetaFile_'+(FeatureData * 2 + 1)+'_'+i+'_'+index" @change="uploadpic">
+              <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'"
+                isImg="1" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(i)"
+                @toSelectImg="SelectImg(i)" @toAddImg="AddImg" @toDeleteImg="DeleteImg(i)" :x="312" :y="312" />
+              <input type="file" style="display:none" :id="'GouDetaFile_'+(FeatureData * 2 + 1)+'_'+i+'_'+index"
+                @change="uploadpic">
             </div>
             <div class="UpgradedVersionDetails-imgOne relative bjE6"
-            :id="'viewSpotBox_' + (FeatureData * 4) +'_deta_'+i+index">
-              <VueDraggableResizable v-if="item.ImgList&&item.ImgList.length>0"
-                :w="312" :h="312"
-                :ref="'viewSpotVds_' + FeatureData * 4 + '_deta_'+i+index"
-                tabindex="0" :resizable="false" :active="false" :parent="false" axis="x"
-                @activated="onActivated(FeatureData * 4, i)" :x="item.ImgList[0].x"
-                :y="item.ImgList[0].y" :z="2" @dragstop="onViewSpotDragstopX">
+              :id="'viewSpotBox_' + (FeatureData * 4) +'_deta_'+i+index">
+              <VueDraggableResizable v-if="item.ImgList&&item.ImgList.length>0" :w="312" :h="312"
+                :ref="'viewSpotVds_' + FeatureData * 4 + '_deta_'+i+index" tabindex="0" :resizable="false"
+                :active="false" :parent="false" axis="x" @activated="onActivated(FeatureData * 4, i)"
+                :x="item.ImgList[0].x" :y="item.ImgList[0].y" :z="2" @dragstop="onViewSpotDragstopX">
                 <img v-if="item.ImgList[0].url" :src="item.ImgList[0].url"
-                :id="'viewSpotImg_' + FeatureData * 4 + '_deta_'+i+index"/>
-                  <!-- <img :src="item.ImgList[0].url" :id="'viewSpotImg_' + FeatureData * 4 + 'deta_'+i+index"/> -->
+                  :id="'viewSpotImg_' + FeatureData * 4 + '_deta_'+i+index" />
               </VueDraggableResizable>
               <template v-else>
-                <img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png"/>
+                <img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png" />
               </template>
             </div>
             <div class="UpgradedVersionDetails-detailsTop absolute"></div>
@@ -112,19 +111,19 @@
         },
         isShowScenicImg: false,
         MasterMapIndex: null, //主图下标
-        imgIndex:null
+        imgIndex: null
       };
     },
     methods: {
       onActivated(i, j) {
         this.imgIndex = j;
       },
-      onViewSpotDragstopX(x,y) {
+      onViewSpotDragstopX(x, y) {
         let imgWidth = document.querySelector(
-          "#viewSpotImg_" + (this.FeatureItem * 4) + "_deta_"+this.imgIndex + this.index
+          "#viewSpotImg_" + (this.FeatureItem * 4) + "_deta_" + this.imgIndex + this.index
         ).width;
         let boxWidth = document.querySelector(
-          "#viewSpotBox_" + (this.FeatureItem * 4) + "_deta_"+this.imgIndex + this.index
+          "#viewSpotBox_" + (this.FeatureItem * 4) + "_deta_" + this.imgIndex + this.index
         ).offsetWidth;
         let cha = boxWidth - imgWidth;
         if (cha <= 0) {
@@ -141,14 +140,14 @@
           }
         }
         this.FeatureData.dataObj.SubList[this.imgIndex].x = x;
-        this.$refs["viewSpotVds_" + (this.FeatureData * 4) + "_deta_"+this.imgIndex + this.index][0]._data.left = x;
+        this.$refs["viewSpotVds_" + (this.FeatureData * 4) + "_deta_" + this.imgIndex + this.index][0]._data.left = x;
       },
       onViewSpotDragstop(x, y) {
         let imgHeight = document.querySelector(
-          "#viewSpotImg_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
+          "#viewSpotImg_" + (this.FeatureData * 4) + "_deta_" + this.imgIndex + this.index
         ).height;
         let boxHeight = document.querySelector(
-          "#viewSpotBox_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
+          "#viewSpotBox_" + (this.FeatureData * 4) + "_deta_" + this.imgIndex + this.index
         ).offsetHeight;
         let cha = boxHeight - imgHeight;
         if (cha <= 0) {
@@ -166,7 +165,7 @@
         }
         this.FeatureData.dataObj.SubList[this.imgIndex].y = y;
         this.$refs[
-          "viewSpotVds_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
+          "viewSpotVds_" + (this.FeatureData * 4) + "_deta_" + this.imgIndex + this.index
         ][0]._data.top = y;
       },
 
@@ -186,7 +185,7 @@
             newArr.push(blob);
             var fileName = `${that.uuid(10, 10)}.png`;
             var path = `/newFeature`;
-            that.uploadSelfBlob(path, newArr, x => {
+            that.uploadSelfBlob(path, newArr, '', x => {
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
               let i = e.target.id.split("_")[2];
               that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].url = allPath
@@ -256,4 +255,5 @@
 
 <style>
   @import url("../../../../assets/css/UpgradedVersion.css");
+
 </style>

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

@@ -17,8 +17,7 @@
       <div class="featureHome-vToolBar-one absolute z-index3">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
           :isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
-          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"
-          :x="697" :y="930"></FeatureControls>
+          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="697" :y="930"></FeatureControls>
         <input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
       </div>
       <div class="featureHome-vToolBar-two absolute z-index3">
@@ -28,14 +27,13 @@
         </FeatureControls>
 
       </div>
-      <div class="featureHome-left-one bjF6 absolute z-index2" :id="'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index">
-        <VueDraggableResizable  v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"
-          :w="697" :h="930"
-          :ref="'viewSpotVds_' + (FeatureItem * 4 + 1) + '_'+index" tabindex="0" :resizable="false" :active="false"
-          :parent="false" axis="x" @activated="onActivated(FeatureItem * 4 + 1, index)"
+      <div class="featureHome-left-one bjF6 absolute z-index2"
+        :id="'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index">
+        <VueDraggableResizable v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0" :w="697"
+          :h="930" :ref="'viewSpotVds_' + (FeatureItem * 4 + 1) + '_'+index" tabindex="0" :resizable="false"
+          :active="false" :parent="false" axis="x" @activated="onActivated(FeatureItem * 4 + 1, index)"
           :x="FeatureItem.dataObj.ImgList[0].x" :y="0" :z="2" @dragstop="onViewSpotDragstopY">
-          <img :src="FeatureItem.dataObj.ImgList[0].url"
-          :id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index"/>
+          <img :src="FeatureItem.dataObj.ImgList[0].url" :id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index" />
         </VueDraggableResizable>
       </div>
       <div class="featureHome-left-two absolute z-index1" :style="{'background':TripColor}">
@@ -160,7 +158,7 @@
             newArr.push(blob);
             var fileName = `${that.uuid(10, 10)}.png`;
             var path = `/newFeature`;
-            that.uploadSelfBlob(path, newArr, x => {
+            that.uploadSelfBlob(path, newArr, '', x => {
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
               let i = e.target.id.split("_")[2];
               that.FeatureItem.dataObj.ImgList[0].url = allPath
@@ -211,8 +209,10 @@
 
     }
   };
+
 </script>
 
 <style>
   @import url("../../../../assets/css/UpgradedVersion.css");
+
 </style>

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

@@ -112,7 +112,7 @@
             newArr.push(blob);
             var fileName = `${that.uuid(10, 10)}.png`;
             var path = `/newFeature`;
-            that.uploadSelfBlob(path, newArr, x => {
+            that.uploadSelfBlob(path, newArr,'', x => {
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
               let i = e.target.id.split("_")[2];
               if (that.StencilDrawing) {

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -337,7 +337,7 @@
             newArr.push(blob);
             var fileName = `${that.uuid(10, 10)}.png`;
             var path = `/newFeature`;
-            that.uploadSelfBlob(path, newArr, x => {
+            that.uploadSelfBlob(path, newArr,'', x => {
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
               let i = e.target.id.split("_")[2];
               if(that.ScenicArrayList.length>0){

src/plug/index.js

@@ -119,10 +119,10 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-        let ocrUrl="http://192.168.10.68:8888";
+        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://192.168.10.128"; //奎哥
         // domainUrl = "http://reborn.oytour.com";
 
         let crmLocalFileStreamDownLoadUrl = "";
@@ -139,18 +139,18 @@ export default {
           mallUrl = "https://mallapi.oytour.com";
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://testcrm.oytour.com";
-          ocrUrl="http://ocr.oytour.com";
+          ocrUrl = "http://ocr.oytour.com";
         } 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";
+          ocrUrl = "http://ocr.oytour.com";
         }
         var obj = {
           //主地址
           DomainUrl: domainUrl,
-          ocrUrl:ocrUrl,//行程下载地址
+          ocrUrl: ocrUrl, //行程下载地址
           //常用提交数据URL
           PostUrl: domainUrl + "/api/common/post",
           //上传文件URL
@@ -287,8 +287,7 @@ export default {
           this.$router.push({
             path: '/signname'
           })
-        }
-        else if (this.$route.path == "/clientConfirm") {
+        } else if (this.$route.path == "/clientConfirm") {
           let TCID = this.$route.query.TCID;
           let orderID = this.$route.query.orderID;
           let guestId = this.$route.query.guestId;
@@ -300,8 +299,7 @@ export default {
               guestId: guestId,
             }
           })
-        }
-        else if (this.$route.path == "/clientConfirmRB") {
+        } else if (this.$route.path == "/clientConfirmRB") {
           let TCID = this.$route.query.TCID;
           let orderID = this.$route.query.orderID;
           let guestId = this.$route.query.guestId;
@@ -313,8 +311,7 @@ export default {
               guestId: guestId,
             }
           })
-        }
-        else if (this.$route.path == "/TravelContractConfirm") {
+        } else if (this.$route.path == "/TravelContractConfirm") {
           let ContractId = this.$route.query.ContractId;
           this.$router.push({
             name: "TravelContractConfirm",
@@ -1061,10 +1058,14 @@ export default {
         }, faildCall)
       },
       //Blob文件上传
-      Vue.prototype.uploadSelfBlob = function (path, files, successCall) {
+      Vue.prototype.uploadSelfBlob = function (path, files, paramsObj, successCall) {
+        console.log("paramsObj", paramsObj);
         let that = this;
         var uploadUrl = that.domainManager().UploadUrl + "/Upload/UploadBlob?fileType=1&fileLimit=5&&filePath=" + path;
         var formData = new FormData();
+        if (paramsObj && paramsObj != '') {
+          formData.append("paramsObj", JSON.stringify(paramsObj));
+        }
         formData.append("myfile", files[0]);
         that.$http.post(uploadUrl, formData, {
             'Content-Type': 'multipart/form-data'
@@ -1073,6 +1074,7 @@ export default {
             successCall(res);
           })
       },
+
       //path  请按照"/模块名称/用户ID/自定义文件夹/" /谁搞错一次5块红包
       //files 文件数组
       //p    进度回调函数
@@ -1722,20 +1724,20 @@ export default {
     // 多位小数点四舍五入
     Vue.prototype.RoundItUp = function (Money) {
       let FractionalPart = String(Money).split('.')
-      if(FractionalPart&&FractionalPart[1]&&FractionalPart[1].length>2){
+      if (FractionalPart && FractionalPart[1] && FractionalPart[1].length > 2) {
         return Money = (parseFloat(Money)).toFixed(2) //(parseFloat(Money.toFixed(3))+0.001).toFixed(2)
-      }else{
+      } else {
         return Money = Math.round(Money * 100) / 100
       }
     }
     // 颜色转换rgb
     Vue.prototype.hexToRgb = function (hexValue, opc) {
       var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
-      var hex = hexValue.replace(rgx, function(m, r, g, b) {
+      var hex = hexValue.replace(rgx, function (m, r, g, b) {
         return r + r + g + g + b + b;
       });
       var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-      if(!rgb){
+      if (!rgb) {
         return hexValue;
       }
       var r = parseInt(rgb[1], 16);