From b7ebc03a91f8d2e89b58ad054ae742d7e5565534 Mon Sep 17 00:00:00 2001
From: wjcuij <wjcuij@qq.com>
Date: Thu, 12 Jul 2018 16:25:26 +0800
Subject: [PATCH 1/2] si

---
 src/pages/category/components/lease.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/category/components/lease.vue b/src/pages/category/components/lease.vue
index eafdeec..47f2859 100755
--- a/src/pages/category/components/lease.vue
+++ b/src/pages/category/components/lease.vue
@@ -109,7 +109,7 @@
                       <p style="color: #747474;">实收：
                         <span>{{ e.shishou }}</span>&nbsp;元</p>
                     </div>
-                    <p style="padding:14px 0;">该盘已认购，2018年9月到期，现预约接盘可额外享
+                    <p style="padding:14px 0;" class="sim">该盘已认购，2018年9月到期，现预约接盘可额外享
                       <span class="text-gold discounts" style="font-weight:900">98%</span>折。</p>
                     <mu-raised-button class="bookingBtn yuyue" @click="look(i)">预约接盘</mu-raised-button>
                   </mu-flexbox-item>
-- 
Gitee


From 86e3dd1cb17cc5cdc933c32b7600cf2148a0fe43 Mon Sep 17 00:00:00 2001
From: wjcuij <wjcuij@qq.com>
Date: Thu, 12 Jul 2018 17:27:21 +0800
Subject: [PATCH 2/2] dasd

---
 src/pages/category/components/lease.vue     | 25 +++++++------
 src/pages/category/components/residence.vue | 41 +++++++++++----------
 src/pages/components/flowerTimer.vue        |  2 +-
 src/pages/components/topNav.vue             | 16 ++++----
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/pages/category/components/lease.vue b/src/pages/category/components/lease.vue
index 47f2859..df0a84c 100755
--- a/src/pages/category/components/lease.vue
+++ b/src/pages/category/components/lease.vue
@@ -27,27 +27,27 @@
         <mu-flexbox justify="center" align="center" class="header_footer main-container">
           <mu-flexbox grow='2' justify="center" align="center">
             <img src="@/assets/img/header_icon.png" alt="">
-            <div class="header-footer-nav">写字楼办公租赁</div>
+            <div class="header-footer-nav sim">写字楼办公租赁</div>
           </mu-flexbox>
           <mu-flexbox style="width:24px" justify="center" align="center">
             <img src="@/assets/imgs/category/header_text_ partition.png"/>
           </mu-flexbox>
           <mu-flexbox grow='2' justify="center" align="center">
             <img src="@/assets/img/header_icon.png" alt="">
-            <div class="header-footer-nav">盈富永泰商务中心</div>
+            <div class="header-footer-nav sim">盈富永泰商务中心</div>
           </mu-flexbox>
           <mu-flexbox style="width:24px" justify="center" align="center">
             <img src="@/assets/imgs/category/header_text_ partition.png"/>
           </mu-flexbox>
           <mu-flexbox grow='2' justify="center" align="center">
             <img src="@/assets/img/header_icon.png" alt="">
-            <div class="header-footer-nav">写字楼市场资讯</div>
+            <div class="header-footer-nav sim">写字楼市场资讯</div>
           </mu-flexbox>
         </mu-flexbox>
       </template>
     </com-header>
     <main style="padding-top:52px;">
-      <div class="content">
+      <div class="content sim">
         <p class="tit">盈富永泰提供广州珠江新城最便捷最中心的写字楼办公，
           <span class="gradual">满足你全方位的需求</span><br> 写字楼办公租赁外，盈富永泰商务中心将为您随时随地，灵活多变，<span class="gradual">提供全面智能服务</span>。
         </p>
@@ -66,14 +66,14 @@
     </main>
     <div class="details_big main-container">
       <div class="details" v-if="tabsIndex === 0">
-        <mu-flexbox class="filter_box sim">
-          <mu-flexbox-item align="center">
+        <mu-flexbox class="filter_box">
+          <mu-flexbox-item align="center" class="sim">
             环球都会广场所在楼层可选 :
           </mu-flexbox-item>
           <mu-flexbox-item grow="3">
             <mu-flexbox align="flex-start" justify="space-between">
               <div v-for="(e,i) in floorList" :key="i" style="margin:10px;">
-                <mu-raised-button v-if="i == floorSelect" :label="e.label||e.value+'楼'" primary>
+                <mu-raised-button v-if="i == floorSelect" :label="e.label||e.value+'楼'" primary class="sim">
                 </mu-raised-button>
                 <mu-raised-button style="min-width:4em;background-color: #eee;box-shadow: none;" v-else
                                   :label="e.label||e.value+'楼'"
@@ -99,7 +99,7 @@
                 <mu-flexbox style="align-items: flex-start">
                   <mu-flexbox-item grow="3" class="left-text">
                     <!-- 单元标签 -->
-                    <div class="biaoqian" style="padding:1em 0;margin-bottom:0;">
+                    <div class="biaoqian sim" style="padding:1em 0;margin-bottom:0;">
                       <span v-for="(f,j) in e.label" :key="j">{{ f }}</span>
                     </div>
                     <!-- 面积,价钱 -->
@@ -111,10 +111,10 @@
                     </div>
                     <p style="padding:14px 0;" class="sim">该盘已认购，2018年9月到期，现预约接盘可额外享
                       <span class="text-gold discounts" style="font-weight:900">98%</span>折。</p>
-                    <mu-raised-button class="bookingBtn yuyue" @click="look(i)">预约接盘</mu-raised-button>
+                    <mu-raised-button class="bookingBtn yuyue sim" @click="look(i)">预约接盘</mu-raised-button>
                   </mu-flexbox-item>
                   <mu-flexbox-item style="padding-top:28px;line-height: 2em;text-align: center;">
-                    <div class="broker">
+                    <div class="broker sim">
                       <!-- 经纪人 -->
                       <div class="agent">
                         <img src="@/assets/imgs/category/lease/saler_thumb.png" alt="经纪人头像">
@@ -227,7 +227,7 @@
               },
               {lc: '天河区 珠江新城中 花城大道68号', title: '楼盘位置：'}
             ],
-            content: '<div data-v-51b02c3e="" class="mu-flexbox postBox mu-flex-row" style="align-items: flex-start; height: 360px;"><div data-v-51b02c3e="" class="mu-flexbox-item" style="margin-left: 8px; flex: 1 1 auto; order: 0; justify-content: center; align-items: center; background-image: url(&quot;/static/img/list_thumb_1.26cc238.png&quot;); height: 100%;"></div> <div data-v-51b02c3e="" class="mu-flexbox-item postList" style="margin-left: 8px; flex: 1 1 auto; order: 0;"><p data-v-51b02c3e="" class="title">天河珠江新城环球都会广场带装修多个间隔</p> <span data-v-51b02c3e="" class="position">广州天河</span> <div data-v-51b02c3e="" class="mu-flexbox mu-flex-row"><div data-v-51b02c3e="" class="mu-flexbox-item" style="margin-left: 8px; flex: 2 1 auto; order: 0;"><div data-v-51b02c3e="" class="biaoqian" style="padding: 1em 0px; margin-bottom: 0px;"><span data-v-51b02c3e="">带装修</span><span data-v-51b02c3e="">东南朝向</span><span data-v-51b02c3e="">花城汇</span><span data-v-51b02c3e="">望江</span><span data-v-51b02c3e="">望广州塔</span></div> <div data-v-51b02c3e="" class="mianji"><p data-v-51b02c3e="">单元面积：\n' +
+            content: '<div data-v-51b02c3e="" class="mu-flexbox postBox mu-flex-row" style="align-items: flex-start; height: 360px;"><div data-v-51b02c3e="" class="mu-flexbox-item" style="margin-left: 8px; flex: 1 1 auto; order: 0; justify-content: center; align-items: center; background-image: url(&quot;/static/img/list_thumb_1.26cc238.png&quot;); height: 100%;"></div> <div data-v-51b02c3e="" class="mu-flexbox-item postList" style="margin-left: 8px; flex: 1 1 auto; order: 0;"><p data-v-51b02c3e="" class="title sim">天河珠江新城环球都会广场带装修多个间隔</p> <span data-v-51b02c3e="" class="position">广州天河</span> <div data-v-51b02c3e="" class="mu-flexbox mu-flex-row"><div data-v-51b02c3e="" class="mu-flexbox-item" style="margin-left: 8px; flex: 2 1 auto; order: 0;"><div data-v-51b02c3e="" class="biaoqian sim" style="padding: 1em 0px; margin-bottom: 0px;"><span data-v-51b02c3e="">带装修</span><span data-v-51b02c3e="">东南朝向</span><span data-v-51b02c3e="">花城汇</span><span data-v-51b02c3e="">望江</span><span data-v-51b02c3e="">望广州塔</span></div> <div data-v-51b02c3e="" class="mianji"><p data-v-51b02c3e="">单元面积：\n' +
             '                        <span data-v-51b02c3e="">380.0</span>平方米</p> <p data-v-51b02c3e="">实收：\n' +
             '                        <span data-v-51b02c3e="">215</span>元</p></div> <p data-v-51b02c3e="" style="padding: 14px 0px;">该盘已认购，2018年9月到期，现预约接盘可额外享\n' +
             '                      <span data-v-51b02c3e="" class="text-gold" style="font-weight: 900;">98%</span>折。</p> <button data-v-51b02c3e="" class="mu-raised-button bookingBtn no-label" type="button" tabindex="0" style="user-select: none; outline: none; cursor: pointer; -webkit-appearance: none;"><div class="mu-raised-button-wrapper"><div class="mu-ripple-wrapper"></div> <!----> <!----> 预约接盘 <!----></div></button></div> <div data-v-51b02c3e="" class="mu-flexbox-item text-center" style="margin-left: 8px; flex: 1 1 auto; order: 0; padding-top: 28px;"><div data-v-51b02c3e="" class="agent"><img data-v-51b02c3e="" src="/static/img/saler_thumb.9ef714f.png" alt="经纪人头像"></div> <p data-v-51b02c3e="">金牌经纪人</p> <p data-v-51b02c3e="" class="text-gold">何先生</p></div></div> <hr data-v-51b02c3e="" class="mu-divider shallow-inset" style="margin: 1em 0px; width: 90%;"> <div data-v-51b02c3e="" class="weizhi clearfloat"><div data-v-51b02c3e="" class="mu-flexbox mu-flex-row"><b data-v-51b02c3e="">楼层：</b>高层／63楼\n' +
@@ -274,7 +274,7 @@
       }
     },
     mounted() {
-
+      this.exChangeFun(this.exchange = !this.exchange)
     },
     methods: {
       //  点击传入post内容
@@ -282,6 +282,7 @@
         this.post.title = this.detailsList[i].title;
         this.post.content = this.detailsList[i].content || this.detailsList[i].title;
         this.post.isShow = true
+        
       },
       changerFloorSelect: function (i) {
         //  @todo 后续增加ajax请求数据更新
diff --git a/src/pages/category/components/residence.vue b/src/pages/category/components/residence.vue
index 0091612..d52d3f4 100755
--- a/src/pages/category/components/residence.vue
+++ b/src/pages/category/components/residence.vue
@@ -3,7 +3,7 @@
     <com-post-dialog :title="post.title" v-bind:isshow="post.isShow" v-on:isshow="post.isShow = false">
       <template slot="content">
         <div v-html="post.content"></div>
-        <mu-raised-button primary>
+        <mu-raised-button primary class="sim">
           预约看房
         </mu-raised-button>
       </template>
@@ -19,7 +19,7 @@
             <mu-raised-button style="margin-top:36px;width: 490px;" @click="sceenScorll" class="seek_house">开始找房
             </mu-raised-button>
           </div>
-          <com-dynamic-string class="slogan fadeInDown animated flex flex-between" style="margin-top:71px;">
+          <com-dynamic-string class="slogan sim fadeInDown animated flex flex-between" style="margin-top:71px;">
             <slot slot="body">用心为您打造第二个"家"</slot>
           </com-dynamic-string>
         </div>
@@ -33,21 +33,21 @@
         <mu-flexbox justify="center" align="center" class="header_footer main-container" style="height: 102px;">
           <mu-flexbox grow='2' justify="center" align="center">
             <img src="@/assets/img/header_icon.png" alt="">
-            <div class="header-footer-nav">地图找房</div>
+            <div class="header-footer-nav sim">地图找房</div>
           </mu-flexbox>
           <mu-flexbox style="width:24px" justify="center" align="center">
             <img src="@/assets/imgs/category/header_text_ partition.png"/>
           </mu-flexbox>
           <mu-flexbox grow='2' justify="center" align="center">
             <img src="@/assets/img/header_icon.png" alt="">
-            <div class="header-footer-nav">VR实景看房</div>
+            <div class="header-footer-nav sim">VR实景看房</div>
           </mu-flexbox>
           <mu-flexbox style="width:24px" justify="center" align="center">
             <img src="@/assets/imgs/category/header_text_ partition.png"/>
           </mu-flexbox>
           <mu-flexbox grow='2' justify="center" align="center">
             <img src="@/assets/img/header_icon.png" alt="">
-            <div class="header-footer-nav">公寓增值服务</div>
+            <div class="header-footer-nav sim">公寓增值服务</div>
           </mu-flexbox>
         </mu-flexbox>
       </template>
@@ -55,14 +55,14 @@
     </com-header>
     <main style="padding-bottom:1.6em;">
       <div class="content" style="padding-top:9px">
-        <p class="tit">寓+为您寻找属于自己的Fun，
+        <p class="tit sim">寓+为您寻找属于自己的Fun，
           <span>享受人生臻至年华</span><br> 打造高品质精致都市生活，让您度过的每一寸光阴都是最精彩的
         </p>
       </div>
     </main>
     <div class="main-container">
       <mu-flexbox class="filter_box">
-        <mu-flexbox-item align="center" class="title">
+        <mu-flexbox-item align="center" class="title sim">
           珠光新城御景二期:
         </mu-flexbox-item>
         <mu-flexbox-item grow="4">
@@ -71,7 +71,7 @@
               <mu-raised-button v-if="i == floorSelect" :label="e.label||e.value+'楼'" primary activeClass>
               </mu-raised-button>
               <mu-raised-button style="min-width:4em;background-color: #eee;box-shadow: none;" v-else
-                                :label="e.label||e.value+'楼'" @click="changerFloorSelect(i)"></mu-raised-button>
+                                :label="e.label||e.value+'楼'" @click="changerFloorSelect(i)" class="sim"></mu-raised-button>
             </div>
             <mu-flexbox-item></mu-flexbox-item>
           </mu-flexbox>
@@ -81,10 +81,10 @@
         <mu-flexbox>
           <mu-flexbox-item>
             <img src="@/assets/imgs/category/residence/yujia_title.png" class="yujia_title" alt=""/>
-            <p style="padding:1em 0;">YU+公寓用心为您精选 YU+会越来越懂你</p>
+            <p style="padding:1em 0;" class="sim">YU+公寓用心为您精选 YU+会越来越懂你</p>
           </mu-flexbox-item>
           <mu-flexbox-item style="text-align:right">
-            <a style="color:#383838;" href="#">更多YU+房源</a>
+            <a style="color:#383838;" href="#" class="sim">更多YU+房源</a>
           </mu-flexbox-item>
         </mu-flexbox>
       </div>
@@ -93,15 +93,15 @@
           <img class="thumb" :src="e.photo" alt="封面图片"/>
           <div class="zhezhao">
             <div class="box">
-              <span class="position">天河</span>
-              <p class="title">
+              <span class="position sim">天河</span>
+              <p class="title sim">
                 {{e.name}}
               </p>
-              <p class="summary">
+              <p class="summary sim">
                 {{e.area}}
               </p>
               <div style="padding:40px;text-align: center">
-                <mu-raised-button @click="look(i)" style="width:180px;height:48px;font-size:18px" primary>预约看房
+                <mu-raised-button @click="look(i)" style="width:180px;height:48px;font-size:18px" class="sim" primary>预约看房
                 </mu-raised-button>
               </div>
             </div>
@@ -112,10 +112,10 @@
         <mu-flexbox>
           <mu-flexbox-item>
             <img src="@/assets/imgs/category/residence/yujia_title2.png" alt=""/>
-            <p style="padding:1em 0;font-size:16px;">真实信息准确同步 YU+公寓预租先人一步</p>
+            <p style="padding:1em 0;font-size:16px;" class="sim">真实信息准确同步 YU+公寓预租先人一步</p>
           </mu-flexbox-item>
           <mu-flexbox-item style="text-align:right">
-            <p style="padding:1em 0;" href="#">更多YU+房源</p>
+            <p style="padding:1em 0;" href="#" class="sim">更多YU+房源</p>
           </mu-flexbox-item>
         </mu-flexbox>
       </div>
@@ -124,15 +124,15 @@
           <img class="thumb" :src="e.photo" alt="封面图片"/>
           <div class="zhezhao">
             <div class="box">
-              <span class="position">天河</span>
-              <p class="title">
+              <span class="position sim">天河</span>
+              <p class="title sim">
                 {{e.name}}
               </p>
-              <p class="summary">
+              <p class="summary sim">
                 {{e.area}}
               </p>
               <div style="padding:40px;text-align: center">
-                <mu-raised-button style="width:180px;height:48px;font-size:18px" primary>预约看房</mu-raised-button>
+                <mu-raised-button style="width:180px;height:48px;font-size:18px" primary >预约看房</mu-raised-button>
               </div>
             </div>
           </div>
@@ -270,6 +270,7 @@
     },
     mounted() {
       // window.addEventListener('scroll', this.handleScroll)
+      this.exChangeFun(this.exchange = !this.exchange)//改为繁体
     }
   };
 </script>
diff --git a/src/pages/components/flowerTimer.vue b/src/pages/components/flowerTimer.vue
index aa9b413..59dbed5 100755
--- a/src/pages/components/flowerTimer.vue
+++ b/src/pages/components/flowerTimer.vue
@@ -48,7 +48,7 @@
   .nav_right {
     position: fixed;
     right: 60px;
-    top: 7vh;
+    top: 10vh;
     width: 290px;
   }
 
diff --git a/src/pages/components/topNav.vue b/src/pages/components/topNav.vue
index 1579316..b03666b 100755
--- a/src/pages/components/topNav.vue
+++ b/src/pages/components/topNav.vue
@@ -302,11 +302,11 @@
 
     },
   mounted() {
-    if (this.$route.path === "/category/residence") {//判断logo显示
-      this.logoStyle = "residence";
-    } else {
-      this.logoStyle = "normal";
-    }
+    // if (this.$route.path === "/category/residence") {//判断logo显示
+    //   this.logoStyle = "residence";
+    // } else {
+    //   this.logoStyle = "normal";
+    // }
     this.navScroll();
     // this.push()
     // setTimeout(this.exChangeFun(this.exchange = !this.exchange),3000)
@@ -323,9 +323,9 @@
     watch: {
       "$route.path": function (v) {
         // v 就是路由的path
-        v === "/category/residence"
-          ? (this.logoStyle = "false")
-          : (this.logoStyle = "normal");
+        // v === "/category/residence"
+        //   ? (this.logoStyle = "false")
+        //   : (this.logoStyle = "normal");
       }
     }
   };
-- 
Gitee