Merge remote-tracking branch 'origin/develop' into develop

 <template>
   <LayoutApp class="yohoufo-channel-page" :show-back="true" :hide-header="hideHeader" :title="title">
       <div class="fixed-nav scroll-nav-wrap" v-if="isShow && navList.length">
-        <ScrollNav :list="navList" :current="active" @transfer="getIndex"></ScrollNav>
+        <ScrollNav :list="navList" :current="active" @transfer="getIndex" style="background: #f2f2f2;"></ScrollNav>
       </div>
       <Scroll
         ref="scroll"
@@ -25,7 +25,7 @@
               <TwoBanner :list="item.data" :ref="index" :PAGE_URL="PAGE_URL" :key="index" v-if="item.template_name == 'twoPicture'"/>
             </template>
           </div>
-          <div ref="scrollNav" class="scroll-nav-wrap" v-if="navList.length">
+          <div ref="scrollNav" class="scroll-nav-wrap" v-if="!isShow && navList.length">
             <ScrollNav :list="navList" :current="active" @transfer="getIndex"></ScrollNav>
           </div>
           <div class="list-wrap" :style="{minHeight: total + 'px'}">
@@ -260,6 +260,8 @@ export default {
 
       if (this.navTop) {
         let scrollY = -y;
+        // console.log(parseInt(scrollY));
+        // console.log(this.navTop);
         if (scrollY >= this.navTop) {
           this.isShow = true;
         } else {

@@ -60,7 +60,7 @@ export default {
 
 <style lang="scss" scoped>
 .scroll-nav {
-  padding: 0 24px;
+  // padding: 0 24px;
 }
 
 /deep/ {

@@ -9,7 +9,7 @@
       <LayoutLink :href="list[1].url" class="img-link" :report="{PAGE_URL, ...list[1].reportParams}" reportEvent="XY_UFO_MAIN_EVENT">
         <ImageFormat :lazy="false" class="item-imge" :src="list[1].src" :width="380" :height="196"></ImageFormat>
       </LayoutLink>
-      <LayoutLink :href="list[2].url" class="img-link" :report="{PAGE_URL, ...list[2].reportParams}" reportEvent="XY_UFO_MAIN_EVENT">
+      <LayoutLink :href="list[2].url" class="img-link img-link2" :report="{PAGE_URL, ...list[2].reportParams}" reportEvent="XY_UFO_MAIN_EVENT">
         <ImageFormat :lazy="false" class="item-imge" :src="list[2].src" :width="380" :height="196"></ImageFormat>
       </LayoutLink>
     </div>
@@ -49,20 +49,20 @@ export default {
   height: 402px;
   margin-left: 8px;
   margin-right: 8px;
-
   .swiper-item {
     position: relative;
 
-    &:after {
-      content: "";
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      z-index: -2;
-      border-radius: 8px;
-      box-shadow: 0 0 30px #dcdcdc;
-      bottom: 0;
-    }
+    // &:after {
+    //   content: "";
+    //   position: absolute;
+    //   width: 100%;
+    //   height: 100%;
+    //   z-index: -2;
+    //   border-radius: 8px;
+    //   box-shadow: 0 0 30px #dcdcdc;
+    //   bottom: 0;
+    //   background-color: transparent;
+    // }
   }
 
   .swiper-item-left {
@@ -74,7 +74,19 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-
+    .img-link2 {
+      &:after {
+        content: "";
+        position: absolute;
+        width: 100%;
+        height: 45%;
+        z-index: -2;
+        border-radius: 8px;
+        box-shadow: 0 0 30px #dcdcdc;
+        bottom: 0;
+        background-color: transparent;
+      }
+    }
     .img-link {
       height: 196px;
     }

@@ -8,7 +8,7 @@
         <p class='assets-record-code-txt'>{{data.goodsName}}</p>
         <p class='assets-record-time-txt'>{{data.time}}</p>
       </div>
-    
+
     <div class='assets-record-right-view'>
       <p class='assets-record-income-txt'>{{data.tradeType === 5 ? '-': '+'}}{{data.amount}}</p>
     </div>
@@ -36,13 +36,14 @@ export default {
   },
   data() {
     return {
-     
+
     };
   },
 };
 </script>
 
 <style lang="scss" scoped>
+@import "../../../../statics/scss/variable";
   .assets-record-container {
     display: flex;
   margin: 0 40px;
@@ -93,10 +94,10 @@ export default {
   margin-top: 12px;
 }
 .assets-record-income-txt {
-  font-family: SFProText-Medium;
   font-weight: bold;
   font-size: 28px;
   color: black;
+  @include num
 }
 .assets-record-income-tip-txt {
   font-family: PingFang-SC-Regular;

@@ -43,6 +43,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../../../statics/scss/variable";
+
 .orders {
   display: flex;
   height: 100px;
@@ -70,9 +72,9 @@ export default {
 }
 
 .order-num {
-  font-family: "Alte DIN 1451 Mittelschrift";
   font-size: 32px;
   text-align: center;
+  @include num
 }
 
 .order-text {

@@ -87,6 +87,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../../../statics/scss/variable";
+
 .tab-item {
   display: flex;
   height: 120px;
@@ -125,10 +127,10 @@ export default {
 }
 
 .text {
-  font-family: "Alte DIN 1451 Mittelschrift";
   color: black;
   text-align: right;
   font-size: 32px;
+  @include num
 }
 
 .cubeic-arrow {

@@ -55,6 +55,7 @@ export default {
   // 画progress底部背景
   drawProgressbg: function (summary) {
     let c=document.getElementById("canvasProgressbg");
+    if(!c) return
     let ctx=c.getContext("2d");
     ctx.lineWidth= 30 ;
     let strokeStyle = '#E0E0E0'
@@ -72,6 +73,7 @@ export default {
   // 画progress进度
   drawCircle: function (step) {
     let c=document.getElementById("canvasProgress");
+    if(!c) return
     let context=c.getContext("2d");
     context.lineWidth=30;
     let strokeColor = '#002B47'

@@ -39,6 +39,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../../../statics/scss/variable";
 .income-header-wrapper {
   position: relative;
 }
@@ -50,6 +51,7 @@ export default {
   font-size: 40px;
   font-weight: bold;
   margin-bottom: 44px;
+  @include num
 }
 .income {
   margin-bottom: 20px;

@@ -36,6 +36,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../../../statics/scss/variable";
+
 .price-item {
   display: flex;
   font-size: 28px;
@@ -50,5 +52,6 @@ export default {
   font-size: 36px;
   color: #d0021b;
   font-weight: bold;
+  @include num
 }
 </style>

@@ -25,6 +25,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../../../statics/scss/variable";
+
 .product-wrapper {
   height: 180px;
 }
@@ -60,6 +62,7 @@ export default {
   font-size: 28px;
   margin-bottom: 12px;
   font-weight: bold;
+  @include num
 }
 
 </style>

@@ -67,6 +67,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../../statics/scss/variable";
+
 .count-down-wrapper {
   display: flex;
   font-size: 32px;
@@ -84,6 +86,7 @@ export default {
 
   & > span {
     padding: 0 9px;
+    @include num
   }
 }
-</style>
\ No newline at end of file
+</style>

@@ -323,6 +323,11 @@ export default {
       });
 
       if (result.code === 200 && result.data.orderCode) {
+        this.reportYas('XY_UFO_SALE_ORD', {
+          ORD_NUM: result.data.orderCode,
+          PRD_ID: result.data.productId,
+          PRD_SKU: result.data.skup
+        });
         console.log(result);
         this.$createOrderPayType({
           orderCode: result.data.orderCode,
@@ -330,6 +335,7 @@ export default {
           desc: '保证金',
           extra: JSON.stringify({
             type: 'sell',
+            reportType: 'sell',
             back: {
               name: 'InSaleOrderList'
             },
@@ -360,6 +366,14 @@ export default {
 
       // console.log(result);
     },
+    reportYas(name, params) {
+      this.$store.dispatch('reportYas', {
+        params: {
+          appop: name,
+          param: params
+        }
+      });
+    },
     clearData() {
       // 清空数据状态
       // console.log(this.$router);

@@ -221,6 +221,7 @@ export default {
 
 <style lang="scss" scoped>
   @import "../product-detail";
+  @import "../../../statics/scss/variable";
 
   .title {
     font-size: 40px;
@@ -260,6 +261,7 @@ export default {
         padding-top: 30px;
         font-size: 32px;
         color: #000;
+        @include num
       }
     }
   }
@@ -358,6 +360,7 @@ export default {
       i {
         font-size: 20px;
         font-style: normal;
+        @include num
       }
     }
   }