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

package.json

@@ -8,6 +8,7 @@
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     "lint": "eslint --ext .js,.vue src",
+    "serve" : "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
     "build": "node --max-old-space-size=4096 build/build.js"
   },
   "dependencies": {

src/components/FinancialModule/RecPayQueryTeam.vue

@@ -263,9 +263,9 @@
                                 <tr  v-for=" ( son , sIndex ) in item.OrderList ">
                                     <td> <span class="_link_hover" @click="jumpPage('RegistrationList', son.OrderId, 2, item.TCID)"> {{ son.OrderId }} </span> </td>
                                     <td> {{ son.ContactName }} </td>
-                                    <td> {{ son.EmName }} </td>
+                                    <td> {{ son.EmName }}<br/>{{son.CreateDate}} </td>
                                     <td> {{ son.PreferPrice }} </td>
-                                    <td> <span :class="son.DaiShou > 0 ? '_color_red':''"> {{ son.Income }} </span> </td>
+                                    <td> <span :class="son.DaiShou != 0 ? '_color_red':''"> {{ son.Income }} </span> </td>
                                     <td>{{ son.DaiShou}} </td>
                                     <td> {{ son.Refund }} </td>
                                     <td> {{ son.PlatformTax }} </td>
@@ -275,12 +275,8 @@
                         </table>
                     </td>
                 </tr>
-                <tr>
-                    <td>合计</td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
+                <tr class="_color_red">
+                    <td colspan="5">合计</td>
                     <td>{{Statistics.PreferPrice}}</td>
                     <td>{{Statistics.Income}}</td>
                     <td>{{Statistics.DueinMoney}}</td>

src/components/FinancialModule/addCapitalAllocation.vue

@@ -80,7 +80,7 @@
 }
 .page_addCapitalAllocation ._conten ul li._inList textarea,.page_addCapitalAllocation ._conten ul li._outList textarea{
   border: none;
-  border-bottom: 1px solid #666666;
+  /* border-bottom: 1px solid #666666; */
   min-height: 300px;
 }
 .page_addCapitalAllocation ._conten ul li._inList ._uoload,.page_addCapitalAllocation ._conten ul li._outList ._uoload{

src/components/Hotel/HotelInfo.vue

@@ -286,7 +286,7 @@ export default {
       inActive: 1, //已选中
       notInActive: 0, //未选中
       SupplierList: "",
-      imgBeforeFile: this.domainManager().AliUrl,
+      imgBeforeFile: this.domainManager().ViittoFileUrl,
       isBook: true,
       isDinner: false,
       dinerList: "",
@@ -622,8 +622,7 @@ export default {
                 obj.PicID = imgItem.PicID;
                 obj.ShowPath =
                   _self.imgBeforeFile +
-                  imgItem.Path +
-                  "?x-oss-process=image/resize,l_140";
+                  imgItem.Path;
                 this.HotelImageArray.push(obj);
               });
             }

src/components/Hotel/HotelManagement.vue

@@ -284,7 +284,7 @@
       <div class="resourceList" v-for="(item,index) in tableData" :key="index">
         <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
-          <img v-else :src="item.PicPath">
+          <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
           <div class="RemainingInventory">{{item.RemainingInventory}}</div>
           <div class="resTypeList">
             <span v-for="(items,index) in item.OpenPlatformList" :key="index" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}">{{items.Name}}</span>
@@ -356,6 +356,7 @@
             label: "删除"
           }
         ],
+        defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
         loading: true,
         msg: {
           pageIndex: 1,

src/components/Restaurant/restaurantList.vue

@@ -301,7 +301,7 @@
       <div class="resourceList" v-for="(item,index) in tableData" :key="index">
         <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
-          <img v-else :src="item.PicPath" :onerror="defaultImg">
+          <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
           <div class="resTypeList">
             <span v-for="(items,index) in item.OpenPlatformList" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
               :key="index">{{items.Name}}</span>

src/components/SalesModule/planeTicketInquiry.vue

@@ -474,7 +474,7 @@
   padding-left: 15px !important;
   padding-right: 15px !important;
 }
-._add_btn {
+.PlaneTicket ._add_btn {
   float: right;
   display: inline-block;
   color: #b7ddf2;

src/components/Ticketing/TicketManager.vue

@@ -563,7 +563,7 @@
     padding-right: 15px !important;
   }
 
-  ._add_btn {
+  .PlaneTicket ._add_btn {
     float: right;
     display: inline-block;
     color: #b7ddf2;

src/components/TravelManager/TravelQuotationCenter/DirectQuotation.vue

@@ -826,7 +826,7 @@
             FileSize: fileSize
           });
           this.uploadList.push({
-            Url: this.domainManager().AliUrl + x.name,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
             Name: file.file.name
           });
         });

src/components/commonPage/DMCchooseImg.vue

@@ -143,7 +143,7 @@
             <div class="addimgContent test-1">
                 <div class="addimgDiv" v-for="(item,index) in imglistArry" :key="item.subCode" v-if="item.isShowImgDiv&&item.Path!=null">
                     <div class="itemImgdiv" @click="selectImg(index)">
-                        <img :src="item.Path" @error="imgError(item)"/>
+                        <img :src='compressImg(item.Path, "filt", 160, "")' @error="imgError(item)"/>
                         <div class="imgseclet" v-show="item.isShow"><i class="iconfont icon-dagouyouquan"></i></div>
                     </div>
                     <div class="imgDescription">{{item.Name}}</div>

src/components/commonPage/fiveday.vue

@@ -18,8 +18,8 @@
             <div class="five-box day_table">
                             <div class="left">
                                 <div class="image">
-                                    <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                    <img  v-else :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                    <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' />
+                                    <img  v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
                                 </div>
                                 <table class="day_table">
                                     <tr>
@@ -52,8 +52,8 @@
                                         <div class="item item5">
                                                 <div class="upFour">
                                                     <!-- <img  :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> -->
-                                                    <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                                    <img  v-else :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                                    <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")' />
+                                                    <img  v-else :src='compressImg(item.img, "filt", 663, "")' />
 
                                                 </div>
                                                 <div class="down">

src/components/commonPage/fourday.vue

@@ -21,8 +21,8 @@
                     <td>
                         <div class="item big">
                             <div class="left">
-                                <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                <img  v-else :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[0].img, "filt", 663, "")' />
+                                <img  v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
                             </div>
                             <div class="right">
                                 <div class="details">
@@ -54,8 +54,8 @@
                                 <div class="item">
                                         <div class="upFour">
                                             <!-- <img  :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> -->
-                                            <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                            <img  v-else :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                            <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")' />
+                                            <img  v-else :src='compressImg(item.img, "filt", 663, "")' />
                                         </div>
                                         <div class="down">
                                           <h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>

src/components/commonPage/oneday.vue

@@ -21,7 +21,7 @@
                     <td>
                         <div class="item big" style='margin-bottom:20px;'>
                             <div class="left">
-                                <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[0].img, "filt", 663, "")'/>
                                 <img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
                                 <img  v-else-if="day.dayNum==1 && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
                                 <img  v-else-if="day.islast && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />

src/components/commonPage/threeday.vue

@@ -20,8 +20,9 @@
                     <td>
                         <div class="item big">
                             <div class="left">
-                                <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                <img  v-else :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                <img  v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" 
+                                :src='compressImg(day.details[0].img, "filt", 663, "")' />
+                                <img  v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
                             </div>
                             <div class="right">
                                 <div class="details">
@@ -72,8 +73,9 @@
                             <div>
                                 <div class="item hor-box">
                                     <div class="image">
-                                        <img  v-if="day.details[1].img!='' && day.details[1].scenicJson" :style="{'top':day.details[1].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[1].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                        <img  v-else :src="$commonUtils.replaceHttps(day.details[1].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                        <img  v-if="day.details[1].img!='' && day.details[1].scenicJson" :style="{'top':day.details[1].scenicJson.y+'px'}" 
+                                        :src='compressImg(day.details[1].img, "filt", 663, "")'/>
+                                        <img  v-else :src='compressImg(day.details[1].img, "filt", 663, "")' />
                                     </div>
                                 </div>
                             </div>
@@ -88,8 +90,8 @@
                             <div>
                                 <div class="item hor-box">
                                     <div class="image">
-                                        <img  v-if="day.details[2].img!='' && day.details[2].scenicJson" :style="{'top':day.details[2].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[2].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
-                                        <img  v-else :src="$commonUtils.replaceHttps(day.details[2].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
+                                        <img  v-if="day.details[2].img!='' && day.details[2].scenicJson" :style="{'top':day.details[2].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' />
+                                        <img  v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
                                     </div>
                                 </div>
                             </div>

src/components/commonPage/twoday.vue

@@ -22,8 +22,8 @@
                         <div class="twoday_item" v-for="item in day.details" :key="item.dayNum">
                             <div class="item">
                                 <div class="up">
-                                    <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_325'" />
-                                    <img  v-else :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_325'" />
+                                    <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, 325)'/>
+                                    <img  v-else :src='compressImg(item.img, "filt", 663, 325)' />
                                 </div>
                                 <div class="down" style='padding:22px 0;'>
                                   <h4 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>

src/components/confirmationOrderDownLoad.vue

@@ -652,8 +652,8 @@
         if (this.showType >= 4) { //  判断是否为行程特色
           var apiurl = this.domainManager().UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid;
           this.$http.post(apiurl).then(res => {
-            let msg = res
-            if (msg.ResultCode) { // 已经存在文件 直接调用下载
+            let msg = res.data
+            if (msg.ResultCode === 1 && _this.vshowC) { // 已经存在文件 直接调用下载
               _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
                 '日游', isPc)
             } else if (document.querySelector("#gernalCanvas")) { // 不存在图片保存图片后下载
@@ -662,14 +662,6 @@
                   '日游', isPc)
                 return
               }
-              document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
-                let src = x.src
-                src = src.replace('https:', 'http:')
-                if (src.indexOf('http') != -1) {
-                  x.setAttribute('crossOrigin', 'anonymous')
-                }
-                x.src = src
-              });
               let cName = ''
               if (_this.showType == 4) {
                 cName = '.feature-box'
@@ -1042,6 +1034,12 @@
             for (let i = 0; i < imgs.length; i++) {
               document.getElementsByTagName('img')[i].removeAttribute('crossOrigin')
             }
+            // let imgList = document.getElementById("gernalCanvas").getElementsByTagName("img")
+            // for (let i = 0; i < imgList.length; i++) {
+            //   if (imgList[i].src.indexOf('http') !== -1 && imgList[i].src.indexOf('icon') === -1 && imgList[i].src.indexOf('_bg_') === -1 && imgList[i].src.indexOf('_top_') === -1 && imgList[i].src.indexOf('_title') === -1) {
+            //     imgList[i].src = this.compressImg(imgList[i].src, "filt", imgList[i].clientWidth, '')
+            //   }
+            // }
           })
         }, err => {})
       },

src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue

@@ -151,7 +151,7 @@
             <div class="Travel_ImgList clearfix">
               <div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode">
                 <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
-                <img v-else :src=" item.Url">
+                <img v-else :src='compressImg(item.Url, "filt", 170, "")'>
                 <div class="TFIMGzhe">
                   <div class="TFreupload" @click="updateTFimg(index)">
                     <el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true"

src/components/newTravelmanager/TravelTripPreview/fivedayList.vue

@@ -5,7 +5,7 @@
       <div class="TC-ImgTop" :id='"boxs_"+DayNum+"_"+0'>
         <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+0' tabindex="0" :w="318" :h="525" :resizable='false' :x="scenicArray[0].ScenicJson.x" 
         :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
-            <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' />
+            <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 318, "")' :id='"bodys_"+DayNum+"_"+0' />
         </VueDraggableResizable>
         <div class="TC_uploadDiv">
           <el-form-item>
@@ -48,7 +48,7 @@
         <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+1'>
           <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+1' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[1].ScenicJson.x" 
           :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
-              <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' />
+              <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+1' />
           </VueDraggableResizable>
 
           <div class="TC_uploadDiv">
@@ -91,7 +91,7 @@
         <div class="TC-fiveTopImg"  :id='"boxs_"+DayNum+"_"+2'>
           <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+2' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[2].ScenicJson.x" 
           :y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)">
-              <img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+2' />
+              <img :src='compressImg(scenicArray[2].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+2' />
           </VueDraggableResizable>
 
           <div class="TC_uploadDiv">
@@ -134,7 +134,7 @@
         <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+3'>
           <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+3' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[3].ScenicJson.x" 
           :y="scenicArray[3].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(3)">
-              <img :src='scenicArray[3].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+3' />
+              <img :src='compressImg(scenicArray[3].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+3' />
           </VueDraggableResizable>
           <div class="TC_uploadDiv">
             <el-form-item>
@@ -177,7 +177,7 @@
         <div class="TC-fiveTopImg" :id='"boxs_"+DayNum+"_"+4'>
           <VueDraggableResizable axis="y" :ref='"fiveDay_"+DayNum+"_"+4' tabindex="0" :w="323" :h="246" :resizable='false' :x="scenicArray[4].ScenicJson.x" 
           :y="scenicArray[4].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(4)">
-              <img :src='scenicArray[4].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+4' />
+              <img :src='compressImg(scenicArray[4].NewImaArray[0].Url, "filt", 323, "")' :id='"bodys_"+DayNum+"_"+4' />
           </VueDraggableResizable>
 
           <div class="TC_uploadDiv">

src/components/newTravelmanager/TravelTripPreview/fourdayList.vue

@@ -22,7 +22,7 @@
       <div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'>
         <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x" 
         :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
-            <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' />
+            <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 660, "")' :id='"bodys_"+DayNum+"_"+0' />
         </VueDraggableResizable>
         <div class="TC_uploadDiv">
           <el-form-item>
@@ -65,7 +65,7 @@
         <div class="image" :id='"boxs_"+DayNum+"_"+1'>
           <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+1' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[1].ScenicJson.x" 
           :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
-              <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' />
+              <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 321, "")' :id='"bodys_"+DayNum+"_"+1' />
           </VueDraggableResizable>
 
           <div class="TC_uploadDiv">
@@ -108,7 +108,7 @@
         <div class="image" :id='"boxs_"+DayNum+"_"+2'>
           <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+2' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[2].ScenicJson.x" 
           :y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)">
-              <img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+2' />
+              <img :src='compressImg(scenicArray[2].NewImaArray[0].Url, "filt", 321, "")' :id='"bodys_"+DayNum+"_"+2' />
           </VueDraggableResizable>
 
           <!-- <img v-if="scenicArray[2].NewImaArray.length>0&&scenicArray[2].NewImaArray[0].Url" :src="scenicArray[2].NewImaArray[0].Url" alt="" />
@@ -153,7 +153,7 @@
         <div class="image" :id='"boxs_"+DayNum+"_"+3'>
           <VueDraggableResizable axis="y" :ref='"fourDay_"+DayNum+"_"+3' tabindex="0" :w="321" :h="246" :resizable='false' :x="scenicArray[3].ScenicJson.x" 
           :y="scenicArray[3].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(3)">
-              <img :src='scenicArray[3].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+3' />
+              <img :src='compressImg(scenicArray[3].NewImaArray[0].Url, "filt", 321, "")' :id='"bodys_"+DayNum+"_"+3' />
           </VueDraggableResizable>
           <div class="TC_uploadDiv">
             <el-form-item>

src/components/newTravelmanager/TravelTripPreview/onedayList.vue

@@ -26,7 +26,7 @@
     <div class="TC-OneDayImg" :id='"boxs_"+DayNum+"_"+0'>
       <VueDraggableResizable axis="y" :ref='"oneDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x" 
       :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
-          <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' />
+          <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 600, "")' :id='"bodys_"+DayNum+"_"+0' />
       </VueDraggableResizable>
       <!-- <img v-if="scenicArray[0].NewImaArray.length>0&&scenicArray[0].NewImaArray[0].Url" :src="scenicArray[0].NewImaArray[0].Url" alt>
       <div v-else class="_noData_img" src=""></div> -->

src/components/newTravelmanager/TravelTripPreview/threedayList.vue

@@ -21,7 +21,7 @@
       <div class="TC-threeOneImg" :id='"boxs_"+DayNum+"_"+0'>
        <VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+0' tabindex="0" :w="660" :h="449" :resizable='false' :x="scenicArray[0].ScenicJson.x" 
         :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
-            <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' />
+            <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 660, "")' :id='"bodys_"+DayNum+"_"+0' />
         </VueDraggableResizable>
         <div class="TC_uploadDiv">
           <el-form-item>
@@ -88,7 +88,7 @@
       <div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+1'>
         <VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+1' tabindex="0" :w="665" :resizable='false' :x="scenicArray[1].ScenicJson.x" 
         :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
-            <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' />
+            <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 665, "")' :id='"bodys_"+DayNum+"_"+1' />
         </VueDraggableResizable>
         <div class="TC_uploadDiv">
           <el-form-item>
@@ -109,7 +109,7 @@
       <div class="TC-ThreeDetail" :id='"boxs_"+DayNum+"_"+2'>         
        <VueDraggableResizable axis="y" :ref='"threeDay_"+DayNum+"_"+2' tabindex="0" :w="665" :resizable='false' :x="scenicArray[2].ScenicJson.x" 
         :y="scenicArray[2].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(2)">
-            <img :src='scenicArray[2].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+2' />
+            <img :src='compressImg(scenicArray[2].NewImaArray[0].Url, "filt", 486, "")' :id='"bodys_"+DayNum+"_"+2' />
         </VueDraggableResizable>
         <div class="TC_uploadDiv">
           <el-form-item>

src/components/newTravelmanager/TravelTripPreview/twodayList.vue

@@ -10,7 +10,7 @@
       <div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+0'>
         <VueDraggableResizable axis="y" :ref='"twoDay_"+DayNum+"_"+0' tabindex="0" :w="486" :resizable='false' :x="scenicArray[0].ScenicJson.x" 
         :y="scenicArray[0].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(0)">
-            <img :src='scenicArray[0].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+0' />
+            <img :src='compressImg(scenicArray[0].NewImaArray[0].Url, "filt", 486, "")' :id='"bodys_"+DayNum+"_"+0' />
         </VueDraggableResizable>
         <div class="TC_uploadDiv">
           <el-form-item>
@@ -54,7 +54,7 @@
       <div class="TC-twoimage" :id='"boxs_"+DayNum+"_"+1'>
         <VueDraggableResizable axis="y" :ref='"twoDay_"+DayNum+"_"+1' tabindex="0" :w="486" :resizable='false' :x="scenicArray[1].ScenicJson.x" 
         :y="scenicArray[1].ScenicJson.y" :z="2" :active="false" :parent="false" @dragstop="onDragImagestop" @activated="onActivated(1)">
-            <img :src='scenicArray[1].NewImaArray[0].Url' :id='"bodys_"+DayNum+"_"+1' />
+            <img :src='compressImg(scenicArray[1].NewImaArray[0].Url, "filt", 486, "")' :id='"bodys_"+DayNum+"_"+1' />
         </VueDraggableResizable>
         <div class="TC_uploadDiv">
           <el-form-item>

src/components/platformModule/appMenuManagement.vue

@@ -11,7 +11,7 @@
     border-color: #409EFF;
   }
 
-  .avatar-uploader-icon {
+  .appmenumanage .avatar-uploader-icon {
     font-size: 28px;
     color: #8c939d;
     width: 50px;
@@ -27,7 +27,7 @@
   }
 </style>
 <template>
-  <div class="flexOne">
+  <div class="flexOne appmenumanage">
     <div class="query-box">
       <ul>
         <li>

src/components/scenicSpot/admissionStatistics.vue

@@ -285,7 +285,7 @@ export default {
 .admissionStatisticsTalbe tr td .pHouseStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px;}
 .admissionStatisticsTalbe tr td .pHouseStyle:last-child{border-bottom: none;}
 .admissionStatisticsTalbe tr td .pDateStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px; margin-top: 0;}
-.admissionStatisticsTalbe tr td .pMsgStyle{; padding: 0 10px; line-height: 20px;}
+.admissionStatisticsTalbe tr td .pMsgStyle{padding: 0 10px; line-height: 20px;}
 .admissionStatisticsTalbe tr td .link p:hover{text-decoration: underline; cursor: pointer;}
 .admissionStatisticsTalbe tr td .phoverStype:hover{text-decoration: underline; cursor: pointer;}
 .admissionStatistics_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}

src/components/scenicSpot/scenicSpotList.vue

@@ -312,7 +312,7 @@
       <div class="resourceList" v-for="item in tableData" :key="item.subCode">
         <div class="reTopInfo" :class="{'comCursorUrl':item.Url}" @click="OpenNewUrl(item.Url)">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
-          <img v-else :src="item.PicPath" :onerror="defaultImg">
+          <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
           <div class="resTypeList">
             <span
               v-for="(items,index) in item.OpenPlatformList"

src/components/systemManagement/pictureResourceManagement.vue

@@ -50,7 +50,7 @@
       <tr v-for="(item,index) in DataList">
         <td class="picturMG">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
-          <img v-else :src="item.PicPath" :onerror='defaultImg'>
+          <img v-else :src='compressImg(item.PicPath, "filt", 213, "")'  :onerror='defaultImg'>
         </td>
         <td>{{item.TypeName}}</td>
         <td>{{item.Name}}</td>
@@ -210,7 +210,7 @@
         }
         this.apipost('Pictureresource_get_Get', msg, res => {
           this.addMsg = res.data.data
-          this.imageUrl = this.addMsg.PicPath
+          this.imageUrl = this.domainManager().ViittoFileUrl + this.addMsg.PicPath
         }, err => {})
       },
       submitForm(addMsg) { //提交创建、修改表单

src/router/config.js

@@ -2235,7 +2235,16 @@ export default {
               meta: {
                 title: '应收团款查询'
               },
-            }, { //财务 财务单据 出纳工作台
+            },
+            { //财务 财务单据 应付团款查询
+              path: '/RecPayQueryTeamV2',
+              name: '/RecPayQueryTeamV2',
+              component: resolve => require(['@/components/FinancialModule/RecPayQueryTeamV2'], resolve),
+              meta: {
+                title: '应付团款查询'
+              },
+            },
+             { //财务 财务单据 出纳工作台
               path: '/CashierWork',
               name: 'CashierWork',
               component: resolve => require(['@/components/FinancialModule/CashierWork'], resolve),