Merge branch 'dev-annual-summary-0125-N' into release

* dev-annual-summary-0125-N:
  样式问题
  样式等待等
  第一屏渲染问题
  没有数据等
  优化等问题
  样式及控制台
  代码优化
  样式问题
  代码优化
  代码优化
  样式优化
  loading的问题

src/components/annual-summary/card-1-no.vue

@@ -2,7 +2,7 @@
   <div class="card-1-no-wrapper">
     <Logo></Logo>
     <div class="bgi-wrapper">
-      <img src="~@/images/annual/page-7-back.png" alt />
+      <img src="https://file.yunqueyi.com/h5/images/asimg/page-7-back.png" alt />
     </div>
     <section class="detail">
       <p v-if="anualData.doctorName" class="title">

src/components/annual-summary/card-1.vue

@@ -4,7 +4,7 @@
     <div class="bgi-wrapper">
       <img src="https://file.yunqueyi.com/h5/images/asimg/page-1-back.png" alt />
     </div>
-    <section class="detail">
+    <section v-show="anualData.haveFlag" class="detail">
       <p v-if="anualData.doctorName" class="title">
         尊敬的
         <span

src/components/annual-summary/card-5.vue

@@ -76,6 +76,7 @@ export default {
     }
     .num {
       color: #FF8054;
+      font-weight: 700;
     }
   }
 }

src/components/annual-summary/card-6.vue

@@ -2,7 +2,10 @@
   <div class="card-6-wrapper">
     <Logo imgType="2"></Logo>
     <div class="bgi-wrapper">
-      <img class="bg"
+      <img class="ani bg"
+        swiper-animate-effect=""
+        swiper-animate-duration="1s"
+        swiper-animate-delay="3s"      
       src="https://file.yunqueyi.com/h5/images/asimg/env-back.png" alt />
     </div>
     <section
@@ -30,9 +33,9 @@
         最关注的知识类型是：
         <span class="cg2 b">{{anualData.learnMoreCourseLabelName}}</span>
       </p>
-      <p class="mt-20">{{anualData.yearType}}年极不平凡，回顾这一年也极为难得，这一年感谢有您。</p>
+      <p class="mt-18">{{anualData.yearType}}年极不平凡，回顾这一年也极为难得，这一年感谢有您。</p>
       <p>希望您的2021年也有云鹊医的陪伴，因为云鹊医的参与，生活变得平凡也珍贵。</p>
-      <p class="mt-20">
+      <p class="mt-18">
         ——已陪伴您
         <span class="cg2 b">{{anualData.registerDays}}</span> 天的云鹊医
       </p>
@@ -118,7 +121,7 @@ export default {
   background: #88cb9d;
   .bgi-wrapper {
     position: absolute;
-    top: 356px;
+    top: 366px;
     left: 0;
     z-index: 8;
     img {
@@ -144,13 +147,13 @@ export default {
       color: #121212;
     }
     p {
-      line-height: 1.45;
+      line-height: 1.44;
     }
   }
   .qr-wrapper {
     width: 100%;
     position: absolute;
-    top: 420px;
+    top: 428px;
     left: 0;
     z-index: 10;
     text-align: center;

src/components/annual-summary/logo.vue

@@ -37,9 +37,10 @@ export default {
         this.$sendBuriedData({
           component_tag: `560#560001${this.backBDText}`
         });
-        setTimeout( () => {
-          this.$router.back(-1);
-        }, 100);
+        rocNative.goBack();
+        // setTimeout( () => {
+        //   this.$router.back(-1);
+        // }, 100);
       } else {
         this.$sendBuriedData({
           component_tag: '559#559001'

src/components/common/common-loading.vue

@@ -37,7 +37,7 @@
     }
 
     svg path, svg rect{
-        // fill: #fff;
-        fill: #449284;
+        fill: #fff;
+        // fill: #449284;
     }
 </style>

src/main.js

@@ -19,7 +19,7 @@ Vue.prototype.$callApp = callApp;
 
 // Vue.prototype.clipboard = clipboard;
 
-const envList = ['dev', 'test', 'uat'];
+const envList = ['dev', 'test'];
 const { BUILD_ENV } = process.env;
 if (envList.indexOf(BUILD_ENV) != -1) {
   const VConsole = require('vconsole');

src/style/as-common.less

@@ -53,6 +53,9 @@
 .mt-20 {
   margin-top: 20px;
 }
+.mt-18 {
+  margin-top: 20px;
+}
 .mt-40 {
   margin-top: 40px;
 }

src/views/annual-summary/detail.vue

@@ -5,7 +5,7 @@
       <img src="~@/images/annual/right-2.png" alt />
     </div>
     <div class="swiper-wrapper">
-      <div v-if="!anualData.haveFlag" class="swiper-slide">
+      <div v-if="!anualData.haveFlag && !showLoading" class="swiper-slide">
         <Card1No :anualData="anualData"></Card1No>
       </div>
       <div v-if="anualData.haveFlag" class="swiper-slide">
@@ -71,7 +71,7 @@ export default {
       token: "",
       isWeb: window.__isWeb,
       isInfresh: false,
-      showLoading: false,
+      showLoading: true,
       isHide: true,
       activeIndex: 0,
       slideNum: 1,
@@ -180,6 +180,30 @@ export default {
   methods: {
     ...mapActions(["setUserInfo", "setBackBDText"]),
     
+    // 获取数据
+    initData() {
+      let param = {
+        token: this.token || "46377F8580DA48C4AD3A4DFDEF33C3D0",
+        yearType: "2020",
+        setEntry: true
+      };
+      this.showLoading = true;
+      this.GET(`stats/year/end/report/app`, param).then(res => {
+        if (res.code == "000000") {
+          this.handlerDate(res.data || {});
+          this.handle4DBText();
+          this.$forceUpdate();
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.showLoading = false;
+              this.initSwiper();
+            }, 100);
+          });
+        } else {
+          Toast(res.message);
+        }
+      });
+    },
     // 先构造埋点的基础数据
     handle4DBText() {
       let anualData = this.anualData;
@@ -236,31 +260,6 @@ export default {
       }
     },
 
-    // 获取数据
-    initData() {
-      let param = {
-        token: this.token || "1C6B1E90B51248AEA7F28C118828074B",
-        yearType: "2020",
-        setEntry: true
-      };
-      this.showLoading = true;
-      this.GET(`stats/year/end/report/app`, param).then(res => {
-        if (res.code == "000000") {
-          this.handlerDate(res.data || {});
-          this.handle4DBText();
-          this.$forceUpdate();
-          this.$nextTick(() => {
-            setTimeout(() => {
-              this.showLoading = false;
-              this.initSwiper();
-            }, 100);
-          });
-        } else {
-          Toast(res.message);
-        }
-      });
-    },
-
     // 对数据进行处理
     handlerDate(anualData) {
       let learnTime4Show = 0,
@@ -335,8 +334,8 @@ export default {
         if (res.code !== "000000") {
           console.log("跳登录", this.isInfresh);
           if (this.isInfresh) {
-            // rocNative.goBack();
-            this.$router.back(-1);
+            rocNative.goBack();
+            // this.$router.back(-1);
           } else {
             rocNative.gotoLogin();
           }

src/views/annual-summary/index.vue

@@ -32,7 +32,6 @@
         </p>
       </section>
     </div>
-    <!-- <button @click="savePage2Picture">保存图片</button> -->
     <section class="bottom">
       <div class="prot-wrapper" @click="selectProt">
         <div class="img-w">
@@ -49,6 +48,7 @@
 </template>
 <script>
 import { Progress, Toast } from "vant";
+import { getWebPageUrl } from "@/utils";
 import Logo from "@/components/annual-summary/logo";
 let _this = null;
 
@@ -68,6 +68,11 @@ export default {
     _this = this;
     const { from } = this.$route.query;
     this.from = from || 'app';
+
+    window.__refresh = function() {
+      _this.isSelect = false;
+    };
+    
     // 截屏时通知前端
     window.__screenCaptureEvent = function() {
       console.log('in screenCaptureEvent');
@@ -77,12 +82,6 @@ export default {
       });
     }
 
-    // 保存图片的回调
-    window.__savePage2Picture = function(param) {
-      this.isHide = true;
-      console.log("__savePage2Picture", param);
-    }
-
     // 先调用存储权限（只有安卓手机需要）
     this.isAndroid && rocNative.openExternalStoragePermission();
 
@@ -99,17 +98,6 @@ export default {
       this.isSelect = !this.isSelect;
     },
 
-    // 保存图片
-    savePage2Picture() {
-      this.isHide = false;
-      this.$forceUpdate()
-      this.$nextTick( () => {
-        rocNative.savePage2Picture({
-          __funcName: "__savePage2Picture"       
-        });
-      })
-    },
-
     // 跳转到详情页面
     gotoDetail() {
       this.$sendBuriedData({
@@ -117,7 +105,23 @@ export default {
       });
 
       if(this.isSelect) {
-        this.$router.push('/as-detail');
+        // this.$router.push('/as-detail');
+        let pageUrl = getWebPageUrl(
+          `annualsummary/#/as-detail`
+        );        
+        let paramList = [
+          {
+            key: "pageUrl",
+            value: pageUrl,
+            type: 4,
+            seqNo: 1
+          }
+        ];
+        rocNative.dispatchEventByModuleCode({
+          modeCode: "M300",
+          jsonString: paramList
+        });
+
       } else {
         Toast("请勾选我同意后查看");
       }

src/views/annual-summary/share.vue

@@ -3,7 +3,7 @@
     <div class="card-wrapper">
       <!-- <Logo imgType="2"></Logo> -->
       <div class="bgi-wrapper">
-        <img class="bg" src="~@/images/annual/share-back.png" alt />
+        <img class="bg" src="https://file.yunqueyi.com/h5/images/asimg/share-back.png" alt />
       </div>
       <section class="detail">
         <p class="title">2020年度学习报告</p>