1

src/App.vue

@@ -9,8 +9,9 @@
       <!-- 抽奖券 -->
       <raffleTickets v-if="raffleTicketsShow" :raffleTicketsData="raffleTicketsData" @closeMyWindow="closeMyWindow" name='raffleTickets'/>
     </el-scrollbar>
-    <transition name="el-zoom-in-top">
-      <div class="page-component-up" v-show="top>100" @click="goTop">
+    <transition name="el-zoom-in-top" v-if="!isPhone">
+      <div class="page-component-up" v-show="top>10" @click="goTop">
+        <img src='http://imgfile.oytour.com/New/Upload/Cloud/2019-08/20190801015414093.png'>
         <i class="el-icon-arrow-up"></i>
       </div>
     </transition>
@@ -28,9 +29,18 @@ export default {
       top:0,
       raffleTicketsShow: false,
       raffleTicketsData: {},
+      isPhone: false
     }
   },
   mounted() {
+    var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
+      if (ua.match(/MicroMessenger/i) == "micromessenger") {
+        //在微信中打开
+        this.isPhone=true; 
+      } else {
+      //否则就是PC浏览器打开
+        this.isPhone=false;
+      }
     if(!localStorage.g || localStorage.g == "" || localStorage.g=='undefined'){
       let msg={
         GroupId:0,
@@ -110,13 +120,20 @@ body,html{
   width: 100%;
   height: 100%;
 }
-.page-component-up {
+.page-component-up{
+  position: fixed;
+  right: calc(8.3% - 60px);
+  bottom: 150px;
+  width: 40px;
+  height: 90px;
+}
+.page-component-up img{
+  width: 38px;
+  height: 38px;
+}
+.page-component-up i{
     background-color: #fff;
-    position: fixed;
-    right: calc(8.3% - 60px);
-    bottom: 150px;
-    width: 40px;
-    height: 40px;
+    
     cursor: pointer;
     transition: .3s;
     /* box-shadow: 0 0 6px rgba(0,0,0,.12); */
@@ -125,9 +142,10 @@ body,html{
     box-sizing: border-box;
     line-height: 40px;
     text-align: center;
+    display: inline-block;
 }
 .page-component-up i{font-size: 36px;color: #bbb;}
-.page-component-up:hover{
+.page-component-up i:hover{
   background-color: #EF4455;
   border:1px solid #ec3346;
 }

src/components/Home.vue

@@ -14,6 +14,9 @@
                 <el-carousel-item> 
                     <img src='../assets/img/ticket/banner07.jpg'>
                 </el-carousel-item>
+                <el-carousel-item> 
+                    <img src='../assets/img/juan/qiufenghuodong.jpg'>
+                </el-carousel-item>
         </el-carousel>
         <div style="position:absolute;width:100%;bottom:20px;z-index:100">
             <div style="width:1200px;margin:0 auto">
@@ -343,6 +346,13 @@
                     </el-tab-pane>
                 </el-tabs>
           </div>
+           <img
+            @click="FootgoUrl('xiazaiAPP')"
+            class="huodong_img"
+            style="width: 1160px;cursor: pointer;"
+            src="../assets/img/juan/appguangao.jpg"
+            alt
+          > 
           <!-- 跟团游 -->
           <div class="Grouptour">
               <div class="tour_left">

src/components/taskPage/JuanSaid.vue

@@ -32,6 +32,9 @@
             <el-carousel-item>
                 <img @click="goUrl('Fire')" src="../../assets/img/juan/bg2.jpg" alt="">
             </el-carousel-item>
+            <el-carousel-item>
+                <img @click="goUrl('FoodImg2')" src="../../assets/img/juan/bg3.jpg" alt="">
+            </el-carousel-item>
     </el-carousel>
     </div>
 </div>

src/router.js

@@ -6,6 +6,8 @@ import newLogin from "./views/newLogin";
 import IceCreamTask from "./components/taskPage/IceCream/IceCreamTask";
 import JuanSaid from "./components/taskPage/JuanSaid";
 import FoodImg from "./components/taskPage/FoodImg";
+import FoodImg2 from "./components/taskPage/FoodImg2";
+import xiazaiAPP from "./components/taskPage/xiazaiAPP";
 import Fire from "./components/taskPage/Fire";
 
 Vue.use(Router);
@@ -624,7 +626,15 @@ export default new Router({
             title: "当地美食详情"
           }
         },
-        
+        {
+          path: "/xiazaiAPP",
+          name: "xiazaiAPP",
+          component: xiazaiAPP,
+          meta: {
+            title: "印象同业app 上线啦~",
+            headerShow: true,
+          },
+        },
       ]
     },
     {
@@ -654,6 +664,16 @@ export default new Router({
         headerShow: true,
       },
     },
+    {
+      path: "/FoodImg2",
+      name: "FoodImg2",
+      component: FoodImg2,
+      meta: {
+        title: "卷妹说",
+        headerShow: true,
+      },
+    },
+    
     {
       path: "/Fire",
       name: "Fire",