feat:更新官网

mobile/src/components/browse/index.vue

@@ -110,6 +110,7 @@ export default {
 }
 .swiper-pagination-bullet {
   background: #ebebeb;
+  opacity: 1;
 }
 .video-bg {
   width: 100%;

mobile/src/pages/about/index.vue

@@ -16,7 +16,16 @@
     <div class="plate03">
       <div class="e-node">
         <h2 class="common-title">{{langAbout.events.title}}</h2>
-        <img src="@/assets/images/refactor/about/img2.png" />
+        <div>
+          <swiper class="swiper-wrapper swiper-wrapper-n" :options="swiperOption">
+            <swiper-slide class="swiper-slide" v-for="(item,index) in imgs" :key="index">
+              <div class="s-item" >
+                <img class="main-img" :src="item.img">
+              </div>
+            </swiper-slide>
+            <!-- <div class="swiper-pagination" slot="pagination"></div> -->
+          </swiper>
+        </div>
         <ul>
           <li v-for="(item,idx) in langAbout.events.nodes" :key="idx">
             <h3>{{item.year}}</h3>
@@ -31,6 +40,7 @@
 <script>
 import {mapState} from 'vuex'
 
+let _cdn = 'https://4dscene.4dage.com/new4dkk/'
 export default {
   computed: {
     ...mapState({
@@ -38,8 +48,39 @@ export default {
     })
   },
   data () {
+    const imgs = [
+      {
+        img: _cdn + 'images/event.png'
+      },
+      {
+        img: _cdn + 'images/about1.jpg'
+      },
+      {
+        img: _cdn + 'images/about2.jpg'
+      },
+      {
+        img: _cdn + 'images/about3.jpg'
+      },
+      {
+        img: _cdn + 'images/about4.jpg'
+      },
+      {
+        img: _cdn + 'images/about5.jpg'
+      }
+    ]
     return {
-
+      imgs,
+      swiperOption: {
+        slidesPerView: 'auto',
+        autoplay: false,
+        centeredSlides: true,
+        watchSlidesProgress: true,
+        pagination: {
+          el: '.swiper-pagination'
+        },
+        loop: true,
+        paginationClickable: true
+      }
     }
   }
 }
@@ -59,4 +100,17 @@ export default {
   margin: 0 auto;
   display: block;
 }
+.swiper-pagination-bullet-active{
+  background: #1fe4dc!important;
+}
+.swiper-pagination-bullet {
+  background: #ebebeb;
+}
+.video-bg {
+  width: 100%;
+  height: 100%;
+  background: #202020;
+  display: flex;
+  align-items: center;
+}
 </style>

mobile/src/pages/conduct/house/index.vue

@@ -7,7 +7,12 @@
     <ul class="desc-video">
       <li v-for="item in list" :key="item.name">
         <h1 class="common-title" v-html="item.name"></h1>
-        <img :src="item.img">
+        <img v-if="!Array.isArray(item.img)" :src="item.img" />
+          <h-row v-else :gutter="0">
+            <h-col :span="24 / item.img.length" v-for="(img, index) in item.img" :key="index" :offset="53">
+              <img style="width: 100%" :src="img" alt="">
+            </h-col>
+          </h-row>
       </li>
     </ul>
   </div>
@@ -15,6 +20,7 @@
 
 <script>
 import { i18n } from '@/lang'
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
@@ -37,6 +43,19 @@ export default {
         }
       ]
     }
+  },
+  computed: {
+    ...mapState({
+      language: state => state.language.current
+    })
+  },
+  mounted () {
+    const ISZH = this.language === 'zh'
+    this.$set(this.list, 2, {
+      name: this.$t('conduct.conductHouse.itemTitle3'),
+      img: ISZH ? require('@/assets/images/refactor/conduct/house/item3.png') : require('@/assets/images/refactor/conduct/house/item3-en.png'),
+      runAnimation: true
+    })
   }
 }
 </script>

mobile/src/pages/coreProduct/index.vue

@@ -73,7 +73,7 @@ export default {
     ...mapState({
       language: state => state.language.current
     })
-  },
+  }
 }
 </script>
 

mobile/src/pages/home/components/plate3.vue

@@ -34,7 +34,7 @@ export default {
         {
           text: '华发依山郡',
           bgImg: require('@/assets/images/refactor/home/4case_03@2x.png'),
-          link: 'https://www.4dkankan.com/spc.html?m=JBx2hetpp'
+          link: 'https://www.4dkankan.com/spc.html?m=t-VJjZMUl'
         },
         {
           text: '万豪酒店',

mobile/src/pages/purchase/index.vue

@@ -326,7 +326,7 @@ export default {
         font-size: 14px;
         color: rgba(0, 0, 0, 0.7);
         line-height: 18px;
-        font-weight: 600;
+        font-weight: bold;
       }
     }
     .main-layout{
@@ -384,7 +384,7 @@ export default {
           font-size: 12px;
           color: #202020;
           line-height: 18px;
-          font-weight: 600;
+          font-weight: bold;
           margin: 12px 0 8px;
         }
         .box{
@@ -409,7 +409,7 @@ export default {
           padding: 0;
           font-size: 14px;
           color: #202020;
-          font-weight: 600;
+          font-weight: bold;
         }
         .service{
           width: 100%;
@@ -418,7 +418,7 @@ export default {
           .icon-yuandian{
             font-size: 14px;
             color: rgba(0, 0, 0, 0.7);
-            font-weight: 600;
+            font-weight: bold;
             display: flex;
             a {
               color: #486ACE !important;

mobile/src/pages/purchase/style.scss

@@ -145,7 +145,9 @@
       text-align: left;
       margin-top: 10px;
       >div{
+        border-bottom: 1px solid #ebebeb;
         &:last-of-type{
+          border-bottom: none;
           .detail{
             margin-bottom: 0;
           }

mobile/src/pages/purchasetwo/style.scss

@@ -12,7 +12,7 @@
         font-size: 14px;
         color: rgba(0, 0, 0, 0.7);
         line-height: 18px;
-        font-weight: 600;
+        font-weight: bold;
       }
     }
     .main-layout{
@@ -64,7 +64,7 @@
           font-size: 14px;
           color: #202020;
           line-height: 18px;
-          font-weight: 600;
+          font-weight: bold;
           margin: 12px 0 10px;
         }
         .box{
@@ -89,7 +89,7 @@
           padding: 0;
           font-size: 14px;
           color: #202020;
-          font-weight: 600;
+          font-weight: bold;
         }
         .service{
           width: 100%;
@@ -98,7 +98,7 @@
           .icon-yuandian{
             font-size: 14px;
             color: rgba(0, 0, 0, 0.7);
-            font-weight: 600;
+            font-weight: bold;
           }
           ul{
             padding: 13px 10px 0 15px;

mobile/src/pages/purchasezhijia/style.scss

@@ -11,7 +11,7 @@
         font-size: 14px;
         color: rgba(0, 0, 0, 0.7);
         line-height: 18px;
-        font-weight: 600;
+        font-weight: bold;
       }
     }
     .main-layout{
@@ -63,7 +63,7 @@
           font-size: 14px;
           color: rgba(0,0,0,.7);
           line-height: 18px;
-          font-weight: 600;
+          font-weight: bold;
           margin: 12px 0 10px;
         }
         .box{
@@ -88,7 +88,7 @@
           padding: 0;
           font-size: 14px;
           color: rgba(0,0,0,.7);
-          font-weight: 600;
+          font-weight: bold;
           span{
             color: #1fe4dc;
             font-weight: bold;
@@ -103,7 +103,7 @@
           .icon-yuandian{
             font-size: 14px;
             color: rgba(0, 0, 0, 0.7);
-            font-weight: 600;
+            font-weight: bold;
           }
           ul{
             padding: 0 10px 0 15px;

mobile/src/pages/service/useimg.vue

@@ -36,7 +36,6 @@ export default {
             return img
           }
         }
-        
         if (item.sub) {
           for (let j = 0; j < item.sub.length; j++) {
             let sub = item.sub[j]

pc/src/page/conduct/conductHouse/index.vue

@@ -41,8 +41,8 @@ export default {
         {
           name: this.$t('conduct.conductHouse.itemTitle3'),
           img: [
-            require('@/assets/images/online/house/item-3_1.jpg'),
-            require('@/assets/images/online/house/item-3_2.jpg')
+            require('@/assets/images/online/house/item-3_1.png'),
+            require('@/assets/images/online/house/item-3_2.png')
           ],
           runAnimation: true
         },
@@ -68,9 +68,18 @@ export default {
     sequence
   },
   mounted () {
+    const ISZH = this.language === 'zh'
+    this.$set(this.sequenceArr, 2, {
+      name: this.$t('conduct.conductHouse.itemTitle3'),
+      img: [
+        ISZH ? require('@/assets/images/online/house/item-3_1.png') : require('@/assets/images/online/house/item-3_1-en.png'),
+        ISZH ? require('@/assets/images/online/house/item-3_2.png') : require('@/assets/images/online/house/item-3_2-en.png')
+      ],
+      runAnimation: true
+    })
     this.$set(this.sequenceArr, 3, {
       name: this.$t('conduct.conductHouse.itemTitle4'),
-      img: this.language === 'zh' ? require('@/assets/images/online/house/item-3.jpg') : require('@/assets/images/online/house/item-3-en.png'),
+      img: ISZH ? require('@/assets/images/online/house/item-3.jpg') : require('@/assets/images/online/house/item-3-en.png'),
       runAnimation: true
     })
   },

pc/src/page/home2/index.vue

@@ -164,7 +164,7 @@ export default {
         {
           text: '华发依山郡',
           bgImg: require('@/assets/images/home/4case_03@2x.png'),
-          link: 'https://www.4dkankan.com/spc.html?m=JBx2hetpp'
+          link: 'https://www.4dkankan.com/spc.html?m=t-VJjZMUl'
         },
         {
           text: '万豪酒店',

pc/src/page/login/components/login.vue

@@ -169,6 +169,7 @@ export default {
     font-size: 30px;
     line-height: 60px;
     cursor: pointer;
+    top: 0;
   }
 }
 .password {