Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/App.vue

@@ -48,6 +48,8 @@
 
 <script>
 import navFooter from "@/components/common/nav_footer";
+import Cookies from "js-cookie";
+
 export default {
   name: "App",
   components: { navFooter },
@@ -65,7 +67,7 @@ export default {
       let toName = to.name;
       // 判断当前页面的路由
       if (toName&&toName.indexOf('CJ')>-1) {
-        this.isCq = true;
+        this.isCq = Cookies.get('isCq')?Cookies.get('isCq'):false;
       }
     },
   },
@@ -77,16 +79,18 @@ export default {
 
 :root{
   --transform: scale(1.15);
-  --fontSize: 0.35rem;
+  --fontSize: 2.2vh;
   /*--color:#e8041f;*/
 }
 .nsgk-global-main {
   min-height: 100vh;
   padding-bottom: 110px;
 }
-p,span,.van-cell__title,.van-col{
-  /*transform: var(--transform)!important;*/
-  font-size: var(--fontSize)!important;
+.isCq{
+  p,span,.van-cell__title,.van-col{
+    /*transform: var(--transform)!important;*/
+    font-size: var(--fontSize)!important;
+  }
 }
 // .fade-last-enter-active {
 //   animation: bounce-in 0.6s;

src/views/index.vue

@@ -53,7 +53,7 @@
         @load="getList()"
       >
 <!--        @load="newList"-->
-        <van-cell v-for="item in newList" :key="item.id" :label="item.newsTime" :to="{name:'newDetail', query: {id:item.id}}">
+        <van-cell v-for="item in newList" :key="item.id" :label="item.newsTime" :to="{name:'newDetailCJ', query: {id:item.id}}">
           <!-- 使用 right-icon 插槽来自定义右侧图标 -->
           <template #title>
             <p class="newContent">{{item.title}}</p>

src/views/news/newDetail.vue

@@ -45,6 +45,9 @@ export default {
 <style scoped lang="scss">
 .app-container {
   padding: 0.5rem 5%;
+}
+iframe{
+  width: 100%;
 }
   .title{
     text-align: center;

src/views/user/index.vue

@@ -169,11 +169,13 @@ export default {
     },
 
     openBig(){
-      document.documentElement.style.setProperty('--fontSize', '2.2vh');
+      this.$parent.isCq = true;
+      Cookies.set('isCq',true)
     },
 
     openSmall(){
-      document.documentElement.style.setProperty('--fontSize', '0.4rem');
+      this.$parent.isCq = false;
+      Cookies.remove('isCq')
     }
   },
 };
@@ -211,7 +213,7 @@ export default {
   border-radius: 5px;
   margin-left: 10px;
   cursor: pointer;
-  font-size: 16px;
+  font-size: 14Px;
 }
   .header{
     background-color: #007E72;