0521

public/index.html

@@ -11,7 +11,7 @@
     <meta property="og:title" content="四维时代">
     <meta property="og:description" content="四维时代">
     <meta property="og:image:type" content="image/jpg">
-    <link rel="icon" type="image/png" sizes="32x32" href="<%= VUE_APP_STATIC_DIR %>images/icons/favicon.ico" class="keep">
+    <link rel="icon" type="image/png" sizes="32x32" href="<%= VUE_APP_STATIC_DIR %>/images/icons/favicon.ico" class="keep">
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/oldVer/main0.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/main.css?v=2.25"/>
     <script>

src/components/popupLayout/Broadcast.vue

@@ -68,6 +68,7 @@ export default {
         width: 100%;
         height: 100%;
         z-index: -1;
+        min-height: 80vh;
       }
       .close{
         position: absolute;
@@ -80,9 +81,11 @@ export default {
     iframe,video{
       width: 100%;
       min-height: 550px;
+      max-height: 60vh;
     }
     img{
       width: 100%;
+      max-height: 60vh;
       height: auto;
     }
   }

src/components/svg.vue

@@ -202,6 +202,11 @@ export default {
   watch:{
     showPull(newVal){
       this.$bus.$emit("onShowPull",newVal)
+    },
+    tourStatus(newVal){
+      if (!newVal) {
+        this.active = ''
+      }
     }
   }
 };

src/pages/Home.vue

@@ -65,6 +65,7 @@
             </div>
             <div class="search-con">
                 <input @keyup.enter="isShow=true" v-model="key" placeholder="搜索文物" type="text">
+                <img class="shugang" :src="require('@/assets/images/icon/shugeng.png')" alt="">
                 <img @click="isShow=true" :src="require('@/assets/images/search_w.png')" alt="">
             </div>
         </div>
@@ -228,11 +229,15 @@ export default {
             border:none;
             text-align: center;
             width: calc(100% - 20px);
-            border-right: 1px dotted #fff;
             &::placeholder{
                 color: rgba(255, 255, 255, 0.55);
             }
         }
+        .shugang{
+          width: 1px;
+          height: 100%;
+          cursor: auto;
+        }
         >img{
             width: 20px;
             margin-left: 10px;

src/utils/http.js

@@ -4,7 +4,7 @@ import axios from 'axios'
 var isProduction = process.env.NODE_ENV === 'production'
 // 配置请求域名
 
-const serverName = isProduction ? '' : 'http://192.168.0.135:8009'
+const serverName = isProduction ? '' : 'http://8.135.106.227:8009'
 
 const serverLocation = isProduction ? '' : 'http://8.135.106.227:8009/'
 

src/views/collection/pc.vue

@@ -5,11 +5,13 @@
     <div class="bar1">
       <div class="search-con">
           <input v-model="key" @keyup.enter="getCollection" placeholder="搜索文物" type="text">
+          <img class="shugang" :src="require('@/assets/images/icon/shugeng.png')" alt="">
           <img @click="getCollection" :src="require('@/assets/images/search_w.png')" alt="">
       </div>
     </div>
 
     <ul class="typelist">
+      <li  :class="{active:typeActive==''}"  @click="typeActive=''">全部</li>
       <li :class="{active:item.id==typeActive.id}" @click="typeActive=item" :key="i" v-for="(item,i) in typeLi">{{item.name}}</li>
     </ul>
     <collection :data="list" @toggle="handleToggle"/>
@@ -87,8 +89,8 @@ export default {
     },
     paging:{
       deep:true,
-      handler:function (newVal) {
-        console.log(newVal);
+      handler:function () {
+        this.getCollection()
       }
     }
   },
@@ -102,7 +104,6 @@ export default {
         return alert('获取展区列表失败')
       }
       this.typeLi = result.data
-      this.typeActive = this.typeLi[0]
       this.getCollection()
     },
     async getCollection() {
@@ -110,7 +111,7 @@ export default {
           pageNum:this.paging.current,
           pageSize: this.paging.pageSize,
           searchKey: this.key,
-          zoneId:this.typeActive.id
+          zoneId:this.typeActive&&this.typeActive.id
       }
 
       let result = await this.$http({
@@ -123,13 +124,13 @@ export default {
       }
       this.list = result.data.list
       this.paging.total = result.data.total
-      this.paging.pageNum = result.data.pageNum
     },
     handleToggle(data){
       this.isShow = data
     },
     pageChange(val){
-      this.paging.pageNum = val
+      console.log(val);
+      this.paging.current = val
     }
   },
   mounted(){
@@ -188,11 +189,15 @@ export default {
             border:none;
             text-align: center;
             width: calc(100% - 20px);
-            border-right: 1px dotted #fff;
             &::placeholder{
                 color: rgba(255, 255, 255, 0.55);
             }
         }
+        .shugang{
+          width: 1px;
+          height: 100%;
+          cursor: auto;
+        }
         >img{
             width: 20px;
             margin-left: 10px;