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

package.json

@@ -27,6 +27,7 @@
     "js-md5": "^0.7.3",
     "jspdf": "^1.4.1",
     "lrz": "^4.9.40",
+    "moment": "^2.24.0",
     "node-sass": "^4.11.0",
     "pdfjs-dist": "^2.0.489",
     "pinyin": "^2.8.3",

src/components/Ticketing/individualTicket.vue

@@ -25,7 +25,8 @@
   .individualTicket ._ol_color li {
     float: left;
     padding: 0 15px;
-    display: flex;
+    display: flex; 
+    
     align-items: center;
   }
 

src/components/TravelManager/TravelList/GroupAdvertising.vue

@@ -160,11 +160,12 @@ export default {
                 var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
                 obj.Path = x.data.FilePath;
                 obj.ShowPath = imgUrl;
-                imgArr.push(obj.ShowPath);
+                imgArr.push(obj.Path);
                 let msg = {
                     TCID:this.msg.TCID,
                     AdvertisingPicUrlList:imgArr
                 }
+
                 this.apipost("travel_post_AddPriceLocalAdvert", msg, res => {
                     if(res.data.resultCode==1){
                         this.Success(res.data.message);