卷妹说改版

src/assets/css/common.css

@@ -31,6 +31,11 @@
 .commonF .w1200{
     width: 1200px;
 }
+.commonF .w1000{
+    width: 1000px;
+    margin: 0 auto;
+
+}
 .commonF .basefix:after {
     clear: both;
     content: '.';
@@ -52,6 +57,13 @@
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
 }
+.commonF .text3{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+}
 .commonF .cee{
     color: #EE4454
 }

src/components/taskPage/Fire.vue

@@ -229,7 +229,6 @@ export default {
         let oWidth2 = window.screen.width;
         this.height3=(5451/750)*oWidth2+'px';
         this.topDiv=(1350/750)*oWidth2+'px';
-        // this.zoomph= Math.round((Height/1080) * 100) / 100;
         this.phoneWidth=(310/375)*oWidth2+'px';
         let aa=(310/375)*oWidth2;
         this.phoneHeight=(290/310)*aa+'px';

src/components/taskPage/FoodImg.vue

@@ -193,8 +193,8 @@ export default {
 
   },
   created() {
-      this.cityId=localStorage.cityId;
-      this.companyId=parseInt(localStorage.site);
+      this.cityId=localStorage.cityId?localStorage.cityId:0;
+      this.companyId=localStorage.site?parseInt(localStorage.site):0;
       this.Cztm();
       let oWidth = window.screen.width;
       this.height2=(6363/1920)*oWidth+500+'px';

src/components/taskPage/JuanDetails.vue

+<style>
+.juan .carousel img{
+    width: 100%;
+    height: 100%;
+    transition: all 0.6s;
+}
+
+
+
+.juan .partnerIcon{
+  display: inline-block;
+  width: 25%;
+  text-align: center;
+}
+.textDiv{
+    width:420px;
+    background:rgba(0,0,0,0.2);
+    margin: 0 auto;
+    padding:10px;
+    box-sizing: border-box
+}
+.textDiv div{
+    border:1px solid rgba(255, 255, 255, 0.5);
+    color:#fff;
+    text-align: center;
+    padding:10px 0;
+    
+}
+.DetailDiv{
+    padding:30px;
+    box-sizing: border-box;
+    background: #fff;
+    margin-top:20px;
+    border-radius:4px;
+}
+.DetailDiv .content .wp-caption{
+    max-width: 100%!important;
+}
+.DetailDiv .content img{
+    max-width: 100%!important;
+}
+</style>
+<template>
+<div class="juan commonF" style="background:#f5f5f5">
+    <!-- 图片 -->
+    <div class="w1200">
+        <div style="position:relative;padding-top:20px">
+            <img src="../../assets/img/juan/detailsbanner.png" alt />
+            <div style="width:100%;position:absolute;top:42px">
+                <div class="textDiv">
+                    <div class="f30 pfR">全世界最棒的旅游体验</div>
+                </div>
+            </div>
+        </div>
+        <div class="DetailDiv">
+            <p class="f22 pfR">{{datainfo.title}}</p>
+            <p class="f14 c88" style="margin-top:10px">
+                <img src="../../assets/img/juan/icon1.png" alt="">
+                {{datainfo.pubDate | YMD}}
+            </p>
+            <p class="f14 c88" style="margin-top:10px">
+                <img src="../../assets/img/juan/icon2.png" alt="">
+                <span v-html="datainfo.label"></span>
+            </p>
+            <div class="content w1000 f14 c33" style="margin-top:20px">
+                <div v-html="datainfo.descriptions"></div>
+                <div style="margin-top:20px" v-html="datainfo.content"></div>
+            </div>
+        </div>
+    </div>
+    
+    <div class="w1200" STYLE="padding:90px 0">
+      <p class="f30" style="text-align:center">合作<span style="color:#EE4454">. 伙伴</span></p>
+      <p class="f20" style="color:#999999;text-align:center">COOPERATIVE PARTNER</p>
+      <div style="margin-top:60px">
+        <div class="partnerIcon">
+            <img src="../../assets/img/juan/c1.png" alt="">
+        </div>
+        <div class="partnerIcon">
+            <img src="../../assets/img/juan/c2.png" alt="">
+        </div>
+        <div class="partnerIcon">
+            <img src="../../assets/img/juan/c3.png" alt="">
+        </div>
+        <div class="partnerIcon">
+            <img src="../../assets/img/juan/c4.png" alt="">
+        </div>
+      </div>
+    </div>
+      
+</div>
+</template>
+<script>
+
+export default {
+  components: {
+    
+  },
+  data(){
+    return{
+      zoom: 1,
+      Calculation: false,
+      height: 0,
+      width: 0,
+      datainfo:{},
+      id:0,
+    }
+  },
+  methods:{
+    getList(){
+      this.apiJavaPost('/api/rssarticle/getArticleDetail',{Id:this.id},res=>{
+          if(res.data.resultCode==1){
+            this.datainfo=res.data.data;
+            // console.log("res",this.datainfo)
+          }else{
+              this.Error(res.data.message);
+          }
+      },null)
+    },
+    
+  },mounted(){
+    
+    
+  },created(){
+    
+    if(this.$route.query.id){
+      this.id=this.$route.query.id;
+    }
+    this.getList();
+  }
+}
+</script>

src/router.js

@@ -4,7 +4,7 @@ import index from "./views/index";
 import login from "./views/login";
 import newLogin from "./views/newLogin";
 import IceCreamTask from "./components/taskPage/IceCream/IceCreamTask";
-import JuanSaid from "./components/taskPage/JuanSaid";
+// import JuanSaid from "./components/taskPage/JuanSaid";
 import FoodImg from "./components/taskPage/FoodImg";
 import FoodImg2 from "./components/taskPage/FoodImg2";
 import xiazaiAPP from "./components/taskPage/xiazaiAPP";
@@ -635,6 +635,33 @@ export default new Router({
             headerShow: true,
           },
         },
+        {
+          path: "/JuanSaid",
+          name: "JuanSaid",
+          component: resolve =>
+            require(["@/components/taskPage/JuanSaid.vue"], resolve),
+          meta: {
+            title: "卷妹说"
+          }
+        },
+        {
+          path: "/JuanList",
+          name: "JuanList",
+          component: resolve =>
+            require(["@/components/taskPage/JuanList.vue"], resolve),
+          meta: {
+            title: "卷妹说-热门目的地"
+          }
+        },
+        {
+          path: "/JuanDetails",
+          name: "JuanDetails",
+          component: resolve =>
+            require(["@/components/taskPage/JuanDetails.vue"], resolve),
+          meta: {
+            title: "卷妹说-热门目的地详情"
+          }
+        },
       ]
     },
     {
@@ -646,15 +673,15 @@ export default new Router({
         headerShow: true,
       },
     },
-    {
-      path: "/JuanSaid",
-      name: "JuanSaid",
-      component: JuanSaid,
-      meta: {
-        title: "卷妹说",
-        headerShow: true,
-      },
-    },
+    // {
+    //   path: "/JuanSaid",
+    //   name: "JuanSaid",
+    //   component: JuanSaid,
+    //   meta: {
+    //     title: "卷妹说",
+    //     headerShow: true,
+    //   },
+    // },
     {
       path: "/FoodImg",
       name: "FoodImg",