shaogen1995 il y a 3 ans
Parent
commit
ed342c796a

+ 1 - 1
src/common/http.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 
 var isProduction = process.env.NODE_ENV === 'production'
 
-// const serverName = isProduction ? 'http://192.168.0.135:8001/' : 'http://192.168.0.135:8001/'
+// const serverName = isProduction ? 'http://8.135.106.227:8001/' : 'http://8.135.106.227:8001/'
 const serverName = isProduction ? 'http://8.135.106.227:8001/' : 'http://8.135.106.227:8001/'
 
 axios.defaults.baseURL = serverName

+ 2 - 3
src/pages/collection/collection-detail.vue

@@ -49,11 +49,10 @@
                   <el-image
                     v-if="detail.type === 'img'"
                     style="width: 100px; height: 100px"
-                    :src="$cdnUrl + detail.thumb"
+                    :src="$cdnUrl + detail.filePath"
                     :preview-src-list="bigImgUrl"
                   >
                   </el-image>
-                  <!-- <img :src="$cdnUrl + detail.thumb" alt="" /> -->
                   <iframe
                     v-if="detail.type === 'model'"
                     :src="detail.modelUrl"
@@ -108,7 +107,7 @@ export default {
     // console.log(77777, this.$route.query)
     this.detail = this.$route.query
     // console.log(999,this.detail);
-    this.bigImgUrl[0] = this.$cdnUrl + this.detail.thumb
+    this.bigImgUrl[0] = this.$cdnUrl + this.detail.filePath
     this.collectionType = this.detail.navType
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)

+ 7 - 7
src/pages/collection/collection-type.vue

@@ -474,12 +474,12 @@ export default {
             > li {
               display: flex;
               align-items: flex-start;
-              justify-content: flex-start;
+              justify-content: space-around;
               flex-direction: column;
               margin-bottom: 2%;
               margin-right: 2%;
-              width: 362px;
-              height: 360px;
+              width: 275px;
+              height: 330px;
               background: #fff;
               border-radius: 3px;
               cursor: pointer;
@@ -487,13 +487,13 @@ export default {
               box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.1);
               padding-top: 12px;
 
-              &:nth-of-type(3n) {
+              &:nth-of-type(4n) {
                 margin-right: 0;
               }
               .pic {
                 position: relative;
-                width: 341px;
-                height: 271px;
+                width: 250px;
+                height: 250px;
                 font-size: 0; // 消除img自带间距
                 margin: 0 auto;
                 background-size: cover;
@@ -533,7 +533,7 @@ export default {
                 padding-left: 11px;
                 margin-top: 17px;
                 .txt-name {
-                width: 350px;
+                width: 268px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;

+ 1 - 1
src/pages/service/service-detail.vue

@@ -28,7 +28,7 @@
                     :class="{ cur: serviceType === 'message' }"
                     @click="switchType('message')"
                   >
-                    <a>旅客留言</a>
+                    <a>观众留言</a>
 
                   </li>
                 </ul>

+ 9 - 9
src/pages/service/service.vue

@@ -12,10 +12,10 @@
          <p class="Etit">VISITOR GUIDE</p>
         </div>
         <div :class="['item2','item',{'cur':cur==1}]" @mouseover="open(1)" @mouseout="close()" @click="toType('message')">
-          <p class="Ztit">旅 客 留 言</p>
+          <p class="Ztit">观 众 留 言</p>
          <p class="Etit">PASSENGER MESSAGE</p>
         </div>
-        
+
       </div>
     </div>
   </div>
@@ -32,7 +32,7 @@ export default {
   data () {
     // 这里存放数据
     return {
-      cur:-1,
+      cur: -1,
       select: '',
       guideHover: false,
       messageHover: false
@@ -44,11 +44,11 @@ export default {
   watch: {},
   // 方法集合
   methods: {
-    open(num) {
-      this.cur = num;
+    open (num) {
+      this.cur = num
     },
-    close() {
-      this.cur = -1;
+    close () {
+      this.cur = -1
     },
     toType (type) {
       this.$router.push({ path: '/service-detail', query: { navType: type } })
@@ -136,7 +136,7 @@ export default {
           height:36px;
           background:url(../../assets/images/icon-tit-right.png)center/100% no-repeat;
           margin-left:20px;
-        }       
+        }
       }
     }
     .list {
@@ -157,7 +157,7 @@ export default {
         &.item2 {
           background:url(../../assets/images/17.png)center center/644px no-repeat;
         }
-        
+
         &.cur {
           width:644px;
           &:after {