bug修改等

右箭头

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

@@ -9,7 +9,7 @@
       <p class="mt-10 lh-25"><span class="fbig6 cg2">找药工具</span></p>
       <p class="mt-5">开了 <span class="cg2 b">{{anualData.orderNum}}</span> 笔订单</p>
       <p class="mt-5">服务了 <span class="cg2 b">{{anualData.orderOfferPatientNum}}</span> 位居民</p>
-      <p class="mt-5">增加了 <span class="cg2 b">{{anualData.orderTotalAmountY | yLocalString}}</span> 元收入</p>
+      <p class="mt-5">增加了 <span class="cg2 b">{{anualData.orderTotalAmountY | yLocalString(true)}}</span> 元收入</p>
     </section>    
   </div>
 </template>

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

@@ -2,14 +2,18 @@
   <div class="card-6-wrapper">
     <Logo imgType="2"></Logo>
     <div class="bgi-wrapper">
-      <img class="bg" src="~@/images/annual/share-back.png" alt />
+      <img class="bg ani"
+      swiper-animate-effect="fadeInUp"
+      swiper-animate-duration="0.5s"
+      swiper-animate-delay="0"
+      src="~@/images/annual/share-back.png" alt />
       <!-- <img class="" src="~@/images/annual/qr-code.png" alt="" /> -->
     </div>
     <section
       class="ani detail"
       swiper-animate-effect="fadeInUp"
-      swiper-animate-duration="1.5s"
-      swiper-animate-delay="0"
+      swiper-animate-duration="1s"
+      swiper-animate-delay="0.5"
     >
       <p class="title">2020年度学习报告</p>
       <p v-if="anualData.doctorName">
@@ -76,13 +80,11 @@ export default {
   },
   data() {
     return {
-      openPath: ""
       // isHide: true,
     };
   },
 
   created() {
-    this.openPath = getWebPageUrl(`annualsummary/#/as-index`);
   },
 
   methods: {

src/utils/filter.js

@@ -16,7 +16,7 @@ const vueFilter = {
   },
 
   // 将数字转换成带千分位数字
-  yLocalString: function (value) {
+  yLocalString: function (value, needDot = false) {
     var a = (value + "").split('.');
     var c = a[1] ? a[1] : '00';
     var b = parseInt(a[0]).toString();
@@ -25,7 +25,11 @@ const vueFilter = {
     if (len <= 3) { return b + '.' + c; }
     var r = len % 3;
     var pre =  r > 0 ? b.slice(0, r) + "," + b.slice(r, len).match(/\d{3}/g).join(",") : b.slice(r, len).match(/\d{3}/g).join(",");
-    return pre + '.' + c;
+    if(needDot) {
+      return pre + '.' + c;
+    } else {
+      return pre;
+    }
   },
 
   // 将字符串截短至指定长度，并用在最后追加特定字符串（例如：...）

src/views/annual-summary/detail.vue

@@ -73,6 +73,7 @@ export default {
       showLoading: false,
       isHide: true,
       activeIndex: 0,
+      appVersion: '',
       anualData: {
         orderNum: 0,
         learnTime4Show: 0
@@ -97,6 +98,7 @@ export default {
     window.__screenCaptureEvent = function() {
       console.log("in screenCaptureEvent");
       _this.$sendBuriedData({
+        action: "ACTION_SCREEN_SHOT",
         component_tag: "559#559003"
       });
     };
@@ -137,7 +139,7 @@ export default {
     // 获取数据
     initData() {
       let param = {
-        token: this.token || "6B591FE87AE0486CBDCB5C0EC46E871F",
+        token: this.token || "AF5DB93C479A4D408DBB4A4960545A35",
         yearType: "2020",
         setEntry: true
       };
@@ -176,8 +178,8 @@ export default {
 
       loginTotalTime = anualData.loginTotalTime || 0;
       if (loginTotalTime) {
-        loginTotalTimeM = Math.floor(loginTotalTime / 1000);
-        loginTotalTimeH = Math.floor(loginTotalTime / 1000 / 60);
+        loginTotalTimeM = Math.floor(loginTotalTime / 60);
+        loginTotalTimeH = Math.floor(loginTotalTime / 60 / 60);
       }
       anualData.loginTotalTimeM = loginTotalTimeM;
       anualData.loginTotalTimeH = loginTotalTimeH;
@@ -291,10 +293,10 @@ export default {
     display: flex;
     flex-direction: row;
     position: fixed;
-    width: 50px;
+    width: 40px;
     height: 36.5px;
     top: 50%;
-    right: 10px;
+    right: 6px;
     z-index: 4;
     margin-top: -18px;
     animation: right-arrow 1.5s infinite;
@@ -304,7 +306,7 @@ export default {
       width: 24px;
       height: 100%;
       &.r1 {
-        margin-right: -6px;
+        margin-right: -12px;
       }
     }
   }

src/views/annual-summary/index.vue

@@ -70,6 +70,7 @@ export default {
     window.__screenCaptureEvent = function() {
       console.log('in screenCaptureEvent');
         _this.$sendBuriedData({
+          action: "ACTION_SCREEN_SHOT",
           component_tag: '559#559003'
         });
     }

src/views/annual-summary/share.vue

@@ -23,7 +23,8 @@
           <span class="cg2 b">{{anualData.creditNum | yLocalString}}</span> 个云鹊豆
         </p>
         <p v-if="anualData.learnMoreCourseLabelName">
-          最关注的知识类型是：<span class="cg2 b">{{anualData.learnMoreCourseLabelName}}</span>
+          最关注的知识类型是：
+          <span class="cg2 b">{{anualData.learnMoreCourseLabelName}}</span>
         </p>
         <p class="mt-20">{{anualData.yearType}}年极不平凡，回顾这一年也极为难得，这一年感谢有你。</p>
         <p>希望你的2021年也有云鹊医的陪伴，因为云鹊医的参与，生活变得平凡也珍贵。</p>
@@ -35,16 +36,17 @@
       <div class="qr-wrapper">
         <img src="~@/images/annual/qr-code.png" alt />
       </div>
-      <section class="bottom">
-        <WxOpenCommon :url="shareUrl" :uuid="uuid"></WxOpenCommon>
-      </section>
     </div>
+    <section class="bottom">
+      <WxOpenCommon :url="callAppUrl" :uuid="uuid"></WxOpenCommon>
+    </section>
+
     <Loading v-show="showLoading" />
   </div>
 </template>
 <script>
 import Loading from "@/components/common/common-loading";
-import WxOpenCommon from '@/components/wx-open';
+import WxOpenCommon from "@/components/wx-open";
 import { getWebPageUrl } from "@/utils";
 import { Progress, Toast } from "vant";
 export default {
@@ -56,6 +58,7 @@ export default {
     return {
       uuid: "",
       shareUrl: "",
+      callAppUrl: "",
       showLoading: false,
       anualData: {}
     };
@@ -69,8 +72,11 @@ export default {
       this.uuid = "74ad500d5edf11eba76d000c29f14581"; // 测试用
     }
     this.shareUrl = location.href;
+    this.callAppUrl = getWebPageUrl(`annualsummary/#/as-index`);
     if (href.indexOf("singlemessage") >= 0 || href.indexOf("wx_code") >= 0) {
-      this.shareUrl = getWebPageUrl(`annualsummary/#/as-share?uuid=${this.uuid}`);
+      this.shareUrl = getWebPageUrl(
+        `annualsummary/#/as-share?uuid=${this.uuid}`
+      );
       location.replace(this.shareUrl);
     }
     this.initData();
@@ -84,11 +90,12 @@ export default {
     });
 
     window.__screenCaptureEvent = function() {
-      console.log('in screenCaptureEvent');
-        _this.$sendBuriedData({
-          component_tag: '559#559003'
-        });
-    }
+      console.log("in screenCaptureEvent");
+      _this.$sendBuriedData({
+        action: "ACTION_SCREEN_SHOT",
+        component_tag: "559#559003"
+      });
+    };
   },
 
   methods: {
@@ -219,30 +226,29 @@ export default {
         height: 70px;
       }
     }
-    .bottom {
-      width: 100%;
-      position: fixed;
-      bottom: 25px;
-      left: 0;
-      z-index: 3;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: center;
-      img {
-        display: inline-block;
-        margin: 10px;
-        width: 143px;
-        height: 39px;
-      }
-      .btn-l {
-        margin: 5px 0;
-        width: 340px;
-        height: 50px;
-      }
+  }
+  .bottom {
+    width: 100%;
+    position: absolute;
+    bottom: 25px;
+    left: 0;
+    z-index: 3;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    img {
+      display: inline-block;
+      margin: 10px;
+      width: 143px;
+      height: 39px;
+    }
+    .btn-l {
+      margin: 5px 0;
+      width: 340px;
+      height: 50px;
     }
   }
-
   .bottom-1 {
     display: flex;
     width: 100%;