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

src/components/Hotel/GnHotelInfo.vue

@@ -23,16 +23,18 @@
 
   .Gnhotel_Right {
     float: left;
+    width:600px;
   }
 
   .InnerHotelDiv {
     display: flex;
+    flex-wrap: wrap;
   }
 
   .InnerHoImgDiv {
     width: 100px;
     height: 100px;
-    margin-right: 5px;
+    margin:0 5px 5px 0;
   }
 
   .InnerHoImgDiv img {
@@ -54,7 +56,7 @@
         <div class="Ghotel_baseinfo">
           <template v-if="activeName==1">
             <div>
-              <div style="float:left;width:600px;">
+              <div style="float:left;width:550px;">
                 <el-form-item :label="$t('ground.jiudianmingzi')">
                   <el-input type="text" v-model="addMsg.HotelRealName" maxlength="100" class="w300"
                     placeholder="请填写酒店名称:xx酒店"></el-input>
@@ -138,7 +140,7 @@
                       :label="subItem.Label==''?'默认':subItem.Label">
                       <div class="InnerHotelDiv">
                         <div class="InnerHoImgDiv" v-for="(sItem,sIndex) in subItem.ImgList" :key="sIndex">
-                          <img :src="getIconLink(sItem.Path)" @click="showImg(sItem.AllPath)" />
+                          <img :src="getIconLink(sItem.Path)" @click="showImg(sItem.Path)" />
                         </div>
                       </div>
                     </el-tab-pane>

src/plug/index.js

@@ -118,6 +118,7 @@ export default {
         let locationName = window.location.hostname;
         // domainUrl = "http://127.0.0.1";
         domainUrl="http://192.168.20.17:8015";
+        domainUrl = "http://192.168.20.24";
         let javaUrldo = "";
         javaUrldo = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
         //商城API
@@ -847,6 +848,18 @@ export default {
           });
         }
       },
+      //公用判断图片地址 判断是否包含http
+      Vue.prototype.getIconLink = function (url) {
+        let str = ''
+        if (url && url != '') {
+          if (url.indexOf('http') != -1) {
+            str = url
+          } else {
+            str = this.domainManager().ViittoFileUrl + url;
+          }
+          return str;
+        }
+      },
       //上传文件到本地服务器
       Vue.prototype.UploadSelfFileT = function (path, files, successCall, ocr) {
         if (files && files.length > 0) {