周立森 5 anni fa
parent
commit
9cc01999ec
7 ha cambiato i file con 86 aggiunte e 67 eliminazioni
  1. 3
    6
      src/App.vue
  2. 6
    6
      src/components/Share.vue
  3. 2
    2
      src/views/About.vue
  4. 7
    5
      src/views/Case.vue
  5. 1
    1
      src/views/Details.vue
  6. 58
    39
      src/views/Dynamic.vue
  7. 9
    8
      src/views/Home.vue

+ 3
- 6
src/App.vue Vedi File

@@ -127,9 +127,7 @@ export default {
127 127
       direction: 'rtl',
128 128
     }
129 129
   },
130
-  components: {
131 130
 
132
-  },
133 131
   methods: {
134 132
     enter1 () {
135 133
 
@@ -167,8 +165,7 @@ export default {
167 165
     }
168 166
 
169 167
   },
170
-  created () {
171
-  },
168
+ 
172 169
   mounted () {
173 170
     window.addEventListener('scroll', () => {
174 171
       this.scrolled = (document.documentElement.scrollTop || document.body.scrollTop) > 200
@@ -265,10 +262,10 @@ p {
265 262
     padding: 0;
266 263
   }
267 264
   .logo {
268
-    margin-top: 16.5px;
265
+    margin-top: 15px;
269 266
     margin-left: 20px;
270 267
     width: 150px;
271
-    height: 25px;
268
+    height: 30px;
272 269
     background-size: 100% 100% !important;
273 270
     background: url("./assets/logo1.png");
274 271
   }

+ 6
- 6
src/components/Share.vue Vedi File

@@ -19,10 +19,10 @@ export default {
19 19
     return {
20 20
       defautlOpt: {
21 21
         url: '', // 网址,默认使用 window.location.href
22
-        source: '', // 来源(QQ空间会用到), 默认读取head标签:<meta name="site" content="http://overtrue" />
22
+        // source: '', // 来源(QQ空间会用到), 默认读取head标签:<meta name="site" content="http://overtrue" />
23 23
         title: '', // 标题,默认读取 document.title 或者 <meta name="title" content="share.js" />
24
-        origin: '', // 分享 @ 相关 twitter 账号
25
-        description: '', // 描述, 默认读取head标签:<meta name="description" content="PHP弱类型的实现原理分析" />
24
+        // origin: '', // 分享 @ 相关 twitter 账号
25
+        // description: '', // 描述, 默认读取head标签:<meta name="description" content="PHP弱类型的实现原理分析" />
26 26
         image: '', // 图片, 默认取网页中第一个img标签
27 27
         sites: ['weibo', 'wechat'], // 启用的站点
28 28
         // disabled            : ['qzone', 'qq', 'douban', 'google', 'facebook', 'twitter'], // 禁用的站点
@@ -51,9 +51,9 @@ export default {
51 51
         ...config,
52 52
       }
53 53
 
54
-      window.console.log(options)
55
-
56
-      window.socialShare(this.$el, options)
54
+      if (this.$el && options.title) {
55
+        window.socialShare(this.$el, options)
56
+      }
57 57
     }
58 58
   }
59 59
 }

+ 2
- 2
src/views/About.vue Vedi File

@@ -278,8 +278,8 @@
278 278
   .about-1 {
279 279
     padding: 20px 30px;
280 280
     div {
281
-      .about-1-img {
282
-      }
281
+      // .about-1-img {
282
+      // }
283 283
       .caption {
284 284
         h2 {
285 285
           font-size: 1.2rem;

+ 7
- 5
src/views/Case.vue Vedi File

@@ -26,7 +26,7 @@
26 26
       <div>
27 27
         <el-row style="text-align: center;">
28 28
           <el-col :span="24">
29
-            <button type="button" @click="addall()" class="btn-link" style="color:black;font-size: 24px;">全部案例</button>
29
+            <button type="button" @click="() => filterCase()"  class="btn-link" style="color:black;font-size: 24px;">全部案例</button>
30 30
           </el-col>
31 31
           <el-col :span="24" v-for="cas in casetype" :key="cas.id"> 
32 32
             <!-- @click="() => filterCase(cas)" -->
@@ -42,7 +42,7 @@
42 42
     <div class="contanier center-block dyn-main">
43 43
       <div class="row">
44 44
         <div class="col-md-6 col-xs-6" v-for="(item,index) in caselist" :key="index" :class="{ marginTP: index > 1 }">
45
-          <router-link :to="{ name: 'details', params: { id: item.id }}">
45
+          <router-link :to="{ name: 'details', params: { id: item.id }}" class="routelink">
46 46
             <case-card :thumb="item.caseCoverImg" :title="item.caseTitle" :caption="item.caseSummary" class="casecard"></case-card>
47 47
           </router-link>
48 48
         </div>
@@ -161,9 +161,7 @@ export default {
161 161
 
162 162
 <style scoped>
163 163
 
164
-
165
-.btn-link{
166
-  outline: none;
164
+.routelink{
167 165
   text-decoration: none;
168 166
 }
169 167
 
@@ -284,4 +282,8 @@ color: #e03723;
284 282
     padding: 10px;
285 283
   }
286 284
 }
285
+.btn-link{
286
+  outline: none;
287
+  text-decoration: none
288
+}
287 289
 </style>

+ 1
- 1
src/views/Details.vue Vedi File

@@ -102,7 +102,7 @@ export default {
102 102
       return {
103 103
         url: window.location.href,
104 104
         title: this.current.caseTitle,
105
-        description: this.current.caseSummary
105
+        description: this.current.caseSummary,
106 106
       }
107 107
     },
108 108
     cover () {

+ 58
- 39
src/views/Dynamic.vue Vedi File

@@ -1,4 +1,3 @@
1
-
2 1
 <template>
3 2
   <div class="dynamic">
4 3
     <div>
@@ -23,17 +22,17 @@
23 22
         <el-button class="btn-link mobbtn" @click="drawer = true" type="button" style="margin-left: 16px;">全部动态</el-button>
24 23
       </div>
25 24
     </div>
26
-    <el-drawer :visible.sync="drawer" :direction="direction" :before-close="handleClose" :show-close="true" size="80%">
25
+    <el-drawer :visible.sync="drawer" :direction="direction" :show-close="true" size="80%">
27 26
       <div>
28
-        <el-row>
27
+        <el-row  style="text-align: center;">
29 28
           <el-col :span="24">
30
-            <button type="button" class="btn-link" style="color:black;font-size: 24px;">全部动态</button>
29
+            <button type="button" class="btn-link"  @click="() => filterCase()" style="color:black;font-size: 24px;">全部动态</button>
31 30
           </el-col>
32
-          <el-col :span="24" v-for="cas in casetype" :key="cas" @click="classification(cas.typeName)">
33
-            <button type="button" class="btn-link" style="color:black;font-size: 24px">{{cas.typeName}}</button>
31
+          <el-col :span="24" v-for="cas in casetype" :key="cas.id" >
32
+            <button type="button" class="btn-link" @click="() => filterCase(cas)" style="color:black;font-size: 24px">{{cas.typeName}}</button>
34 33
           </el-col>
35 34
           <el-col :span="24">
36
-            <button type="button" class="btn btn-default" @click="drawer = flase" style="color:black;font-size: 24px;position:fixed;bottom:100px;">返回</button>
35
+            <button type="button" class="btn btn-default" @click="drawer = flase" style="color:black;font-size: 24px;padding:auto 40px; margin-top:30px">返回</button>
37 36
           </el-col>
38 37
         </el-row>
39 38
       </div>
@@ -42,7 +41,7 @@
42 41
     <div class="contanier center-block dyn-main">
43 42
       <div class="row">
44 43
         <div class="col-md-6 col-xs-6" v-for="(item,index) in caselist" :key="index" :class="{ marginTP: index > 1 }">
45
-          <router-link :to="{ name: 'details', params: { id: item.id }}">
44
+          <router-link :to="{ name: 'details', params: { id: item.id }}" class="routelink">
46 45
             <case-card :thumb="item.caseCoverImg" :title="item.caseTitle" :caption="item.caseSummary"></case-card>
47 46
           </router-link>
48 47
         </div>
@@ -79,6 +78,9 @@ export default {
79 78
       },
80 79
 
81 80
       allLoaded: false,//数据全部加载
81
+      drawer: false,
82
+      navdrawer: false,
83
+      direction: 'rtl',
82 84
     }
83 85
   },
84 86
   components: {
@@ -161,25 +163,48 @@ export default {
161 163
 
162 164
 <style scoped>
163 165
 
164
-.btn-link{
165
-  outline: none;
166
+.routelink{
166 167
   text-decoration: none;
167 168
 }
168 169
 
170
+.casecard{
171
+ 
172
+  width: 100%;
173
+
174
+  padding-bottom: 100%;
175
+  background-size: 100% 100% !important;
176
+  /* position: relative; */
177
+
178
+  margin: 0;
179
+
180
+}
181
+
169 182
 .border-bottom {
170 183
   /* display: none; */
171 184
   border-bottom: 1px solid #bfbfbf;
172
-  margin-top: 10px !important;
173
-}
174
-.btn1 {
175
-  font-size: 24px !important;
176
-  color: black !important;
177
-  border: none !important;
185
+      margin-top: 10px !important;
178 186
 }
179
-.btn1:hover {
180
-  color: red !important;
181
-  text-decoration: none;
187
+ .btn1 {
188
+    font-size: 24px !important;
189
+    color: black !important;
190
+    border: none !important;
191
+  }
192
+  .btn1:hover {
193
+    color: red !important;
194
+    text-decoration: none;
195
+  }
196
+.mobbtn{
197
+color: #e03723;
198
+   
199
+  padding:12px 40px;
200
+
201
+    border-radius: 0px;
202
+
203
+    background-color: rgb(252, 151, 252);
204
+    border: 2px solid #bfbfbf;
205
+  
182 206
 }
207
+
183 208
 .text-left {
184 209
   color: #000;
185 210
 }
@@ -194,7 +219,7 @@ export default {
194 219
 }
195 220
 
196 221
 @media (max-width: 992px) {
197
-  .dynamic {
222
+  .case{
198 223
     margin-top: 58px;
199 224
   }
200 225
   .comtype {
@@ -206,8 +231,8 @@ export default {
206 231
   }
207 232
 }
208 233
 .row {
209
-  margin: 0;
210
-}
234
+    margin: 0;
235
+  }
211 236
 .marginTP {
212 237
   margin-top: 3rem;
213 238
 }
@@ -221,17 +246,18 @@ export default {
221 246
     /* flex-flow: <flex-direction> <flex-wrap>; */ /*简写*/
222 247
     justify-content: center;
223 248
   }
224
-  .dynamic {
225
-    margin-top: 116px;
226
-    margin-bottom: -116px;
227
-    padding-bottom: 116px;
228
-    background-color: #fafafa;
229
-  }
230
-
249
+  .case {
250
+  margin-top: 116px;
251
+  margin-bottom: -116px;
252
+  padding-bottom: 116px; 
253
+  background-color: #fafafa;
254
+}
255
+  
231 256
   .mobtype {
232 257
     display: none;
233 258
   }
234 259
 
260
+  
235 261
   .btn {
236 262
     font-size: 24px;
237 263
     margin-top: 88px;
@@ -258,15 +284,8 @@ export default {
258 284
     padding: 10px;
259 285
   }
260 286
 }
261
-
262
-.mobbtn {
263
-  color: #e03723;
264
-
265
-  padding: 12px 40px;
266
-
267
-  border-radius: 0px;
268
-
269
-  background-color: rgb(252, 151, 252);
270
-  border: 2px solid #bfbfbf;
287
+.btn-link{
288
+  outline: none;
289
+  text-decoration: none
271 290
 }
272 291
 </style>

+ 9
- 8
src/views/Home.vue Vedi File

@@ -161,7 +161,7 @@
161 161
         <div class="contanier st top-news">
162 162
           <div class="row">
163 163
             <div class="col-xs-6 col-md-6 home-news-hover home-news" v-for="(item,index) in dynamiclist" :key="index">
164
-              <router-link :to="{ name: 'details', params: { id: item.id }}">
164
+              <router-link :to="{ name: 'details', params: { id: item.id }}" class="routelink">
165 165
                 <div :style="{background: `url(${item.caseCoverImg})`}" class="home-dynamic"></div>
166 166
                 <h3 class="text-left" style>{{item.caseTitle}}</h3>
167 167
               </router-link>
@@ -176,10 +176,7 @@
176 176
 </template>
177 177
 
178 178
 <script>
179
-// @ is an alias to /src
180
-//  import Swiper from "swiper";
181 179
 
182
-// const times = x => '*'.repeat(x - 1).split('*')
183 180
 
184 181
 import { scrollIntoView } from 'scroll-js'
185 182
 import Wheelplanting from "@/components/Wheelplanting.vue";
@@ -220,9 +217,7 @@ export default {
220 217
 
221 218
 
222 219
   },
223
-  watch () {
224
-
225
-  },
220
+ 
226 221
   methods: {
227 222
     arrow () {
228 223
 
@@ -274,6 +269,8 @@ export default {
274 269
 </script>
275 270
 
276 271
 <style scoped>
272
+
273
+
277 274
 @media (max-width: 992px) {
278 275
   .business-text {
279 276
     display: none;
@@ -557,6 +554,9 @@ export default {
557 554
 
558 555
 
559 556
 <style lang="less" scoped>
557
+.routelink{
558
+  text-decoration: none;
559
+}
560 560
 @media (max-width: 992px) {
561 561
   .navbar {
562 562
     display: none;
@@ -575,6 +575,7 @@ export default {
575 575
     display: none;
576 576
   }
577 577
   .navbar {
578
+    height: 116px;
578 579
     z-index: 70;
579 580
     padding: 30px 0;
580 581
     background-color: transparent;
@@ -591,7 +592,7 @@ export default {
591 592
     .nav {
592 593
       font-size: 2.6rem;
593 594
       li {
594
-        margin-left: 2.1vw;
595
+        margin-left: 2vw;
595 596
         a {
596 597
           color: #fff;
597 598