Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -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 {

@@ -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;

@@ -4,8 +4,8 @@
       <div class="filter">
         <div class="filter-tab">
           <div class="tab-item" :class="selectedType === 2 && 'selected-tab'" @click="pressType(2)">人气</div>
-          <div class="tab-item middle" :class="selectedType === 1 && 'selected-tab'" @click="pressType(1)">
-            <span>价格</span>
+          <div class="tab-item middle" @click="pressType(1)">
+            <span :class="selectedType === 1 && 'selected-tab'">价格</span>
             <div :class="arrowImage"></div>
           </div>
           <div class="tab-item" :class="selectedType === 3 && 'selected-tab'" @click="pressType(3)">新品</div>

@@ -214,7 +214,8 @@ export default {
       // if (this.originProductData.least_price && this.originProductData.skup && this.originProductData.least_price <= this.inputPrice) {
       //   this.showBuyDialog();
       // } else {
-        this.computePrice();
+      this.computePrice();
+
       // }
     }, 500, {leading: false, trailing: true}),
 
@@ -333,19 +334,6 @@ export default {
     payOrder() {
       let vm = this;
 
-      this.$store.dispatch('reportYas', {
-        params: {
-          appop: 'UFO_WTBUY_ORD',
-          param: {
-            ORDER_NUM: get(this.publishresult, 'orderCode', ''),
-            PRD_STORAGEID: this.storageId,
-            PRD_SIZE: get(this.originProductData, 'sizeName', ''),
-            PRICE: this.inputPrice,
-            FORNT_AMOUNT: get(this.publishresult, 'depositAmount', '')
-          }
-        }
-      });
-
       this.$createOrderPayType({
         price: get(this.publishresult, 'depositAmount', ''),
         desc: '定金',
@@ -372,6 +360,20 @@ export default {
           vm.onClose(get(vm.publishresult, 'orderCode', ''));
         }
       }).show();
+
+      this.$store.dispatch('reportYas', {
+        params: {
+          appop: 'UFO_WTBUY_ORD',
+          param: {
+            ORDER_NUM: get(this.publishresult, 'orderCode', ''),
+            PRD_STORAGEID: this.storageId,
+            PRD_SIZE: get(this.originProductData, 'sizeName', ''),
+            PRICE: this.inputPrice,
+            FORNT_AMOUNT: get(this.publishresult, 'depositAmount', '')
+          }
+        }
+      });
+
     },
     showPicker() {
 

@@ -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);

@@ -69,6 +69,7 @@ export default {
       }
     },
     hide() {
+      this.$emit('hide');
       this.isVisible = false;
     },
     maskClick() {

 <template>
-  <action-sheet @hidden="onHidden" ref="popup">
+  <action-sheet @hidden="onHidden" @hide="onHide" ref="popup">
     <div class="activity-sheet">
       <h3>活动详情</h3>
       <div class="list" >
         <cube-scroll ref="activityListScroll" :data="list">
           <ul>
             <li v-for="(item, idx) in list" :key="idx">
-              <div class="activityName"><span>{{item.promotionTypeStr}}</span> {{item.activityName}}</div>
+              <div class="activity-name"><span>{{item.promotionTypeStr}}</span> {{item.activityName}}</div>
               <div class="sub">{{item.startTimeStr}}-{{item.endTimeStr}}</div>
             </li>
           </ul>
@@ -41,6 +41,9 @@ export default {
     onHidden() {
       this.$emit('hidden');
     },
+    onHide() {
+      this.$emit('hide');
+    },
   }
 };
 </script>
@@ -89,7 +92,7 @@ export default {
       border-bottom: 1px solid #ccc;
     }
 
-    .activityName {
+    .activity-name {
       font-size: 28px;
       font-weight: bold;
     }

 <template>
   <action-sheet position="right" ref="popup"
                 @hidden="onHidden"
+                @hide="onHide"
                 @shown="onShown"
                 :panelStyle="{background: 'transparent', paddingLeft: '20%'}"
                 :hasBorderRadius="false"
@@ -99,6 +100,9 @@ export default {
     onHidden() {
       this.$emit('hidden');
     },
+    onHide() {
+      this.$emit('hide');
+    },
     onShown() {
       // refresh list
       if (this.$refs.scroll) {

 <template>
-  <action-sheet @hidden="onHidden" @shown="onShown" position="right" ref="popup" :full="true">
+  <action-sheet @hidden="onHidden" @hide="onHide" @shown="onShown" position="right" ref="popup" :full="true">
       <div class="buy-sheet">
         <div class="header">
           <div class="back-wrapper flex" @touchend="onBack">
@@ -77,6 +77,9 @@ export default {
     onHidden() {
       this.$emit('hidden');
     },
+    onHide() {
+      this.$emit('hide');
+    },
     onShown() {
       if (this.$refs.sizeList) {
         this.$refs.sizeList.refreshScroll();

 <template>
-  <action-sheet @hidden="onHidden" @shown="onShown" ref="popup">
+  <action-sheet @hidden="onHidden" @hide="onHide" @shown="onShown" ref="popup">
     <div class="size-select-sheet">
       <div class="select-size">
         <div class="title" @click="hide">{{config.title}}<i class="cubeic-close"></i></div>
@@ -148,6 +148,9 @@ export default {
     onHidden() {
       this.$emit('hidden');
     },
+    onHide() {
+      this.$emit('hide');
+    },
     onShown() {
       if (this.$refs.sizeList) {
         this.$refs.sizeList.refreshScroll();
@@ -218,6 +221,7 @@ export default {
 
 <style lang="scss" scoped>
   @import "../product-detail";
+  @import "../../../statics/scss/variable";
 
   .title {
     font-size: 40px;
@@ -257,6 +261,7 @@ export default {
         padding-top: 30px;
         font-size: 32px;
         color: #000;
+        @include num
       }
     }
   }
@@ -355,6 +360,7 @@ export default {
       i {
         font-size: 20px;
         font-style: normal;
+        @include num
       }
     }
   }

@@ -2,7 +2,7 @@
   <div class="layout">
     <LayoutHeader class="layout-header" :show-back="true" :title="'\u200E'"></LayoutHeader>
     <div class="layout-context fixscroll">
-      <cube-scroll :data="imageList" ref="pageScroll">
+      <div class="cube-scroll-wrapper" ref="pageScroll">
         <div class="slide">
           <cube-slide ref="slide" :data="imageList">
             <cube-slide-item v-for="(item, index) in imageList" :key="index">
@@ -12,7 +12,7 @@
             </cube-slide-item>
             <template slot="dots" slot-scope="props">
               <div class="dot-wrap">
-                <span class="dot" :class="{active: props.current === index}" v-for="(item, index) in props.dots">&bull;</span>
+                <span class="cube-dot" :class="{active: props.current === index}" v-for="(item, index) in props.dots">&bull;</span>
               </div>
             </template>
           </cube-slide>
@@ -31,14 +31,14 @@
         </a>
         <div class="info">
           <transition-group name="info-list" tag="div" class="info-list">
-            <div class="info-list-item" transtion="fade" v-if="activity && activity.length !== 0" @click="showActivity" key="promotion">
+            <div class="info-list-item" transtion="fade" v-if="activity && activity.length !== 0" @click="showActivity" key="促销">
               <div class="info-list-name">促销</div>
               <div class="info-list-value info-promote">
                 <span>{{activity[0].promotionTypeStr}}</span>
                 <i class="cubeic-arrow"></i>
               </div>
             </div>
-            <div class="info-list-item" v-for="(desc, index) in productDec" :key="index">
+            <div class="info-list-item" v-for="desc in productDec" :key="desc.text">
               <div class="info-list-name">{{desc.text}}</div>
               <div class="info-list-value">{{desc.value}}</div>
             </div>
@@ -52,7 +52,7 @@
         <div class="recommend" v-if="recommend"><h2>相关推荐</h2>
           <product-list :list="recommend" priceKey="price"/>
         </div>
-      </cube-scroll>
+      </div>
       <div class="footer">
         <div class="heart">
           <div class="icon-fav" v-if="isFav" @click="_toggleFav(false)">
@@ -80,23 +80,23 @@
         <cube-button class="sell" @click="sell">出售</cube-button>
         <cube-button class="buy active" @click="buy">购买</cube-button>
       </div>
-      <buy-sheet v-if="showBidSheet" @hidden="onBidSheet" :productId="productId"/>
-      <size-request-sheet v-if="showSizeRequestSheet" @hidden="onSizeRequestHidden" :productId="productId"/>
+      <buy-sheet v-if="showBidSheet" @hide="onBidSheetHide" :productId="productId"/>
+      <size-request-sheet v-if="showSizeRequestSheet" @hide="onSizeRequestHide" :productId="productId"/>
     </div>
-    <activity-list-sheet v-if="showActivitySheet" :list="activity" @hidden="onActivitySheetHidden"/>
+    <activity-list-sheet v-if="showActivitySheet" :list="activity" @hide="onActivitySheetHide"/>
     <size-select-sheet v-if="showSizeSelectSheet"
                        :list="sizeList"
                        :product="productDetail"
                        :image-list="imageList"
                        :config="selectSizeConfig"
-                       @hidden="onSizeSelectSheetHidden"
+                       @hide="onSizeSelectSheetHide"
                        @select="onSelectTradeProduct"
                        @add="onRequestSize"/>
   </div>
 </template>
 
 <script>
-import { Button, Slide, Scroll, Popup } from 'cube-ui';
+import { Button, Slide, Popup } from 'cube-ui';
 import { get } from 'lodash';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 
@@ -131,7 +131,6 @@ export default {
     'cube-button': Button,
     'cube-slide': Slide,
     'cube-slide-item': Slide.Item,
-    'cube-scroll': Scroll,
     'cube-popup': Popup,
   },
   props: {
@@ -194,15 +193,28 @@ export default {
 
     // 在action-sheet显示控制与对应关闭方法
     this.actionSheetCloseMap = {
-      showActivitySheet: 'onActivitySheetHidden',
-      showBidSheet: 'onBidSheet',
-      showSizeSelectSheet: 'onSizeSelectSheetHidden',
-      showSizeRequestSheet: 'onSizeRequestHidden',
+      showActivitySheet: 'onActivitySheetHide',
+      showBidSheet: 'onBidSheetHide',
+      showSizeSelectSheet: 'onSizeSelectSheetHide',
+      showSizeRequestSheet: 'onSizeRequestHide',
     };
   },
+  asyncData({store, router}) {
+    const productId = parseInt(router.params.productId, 10);
+
+    if (isNaN(productId)) {
+      throw new Error('无效的商品ID');
+    }
+
+    return store.dispatch('product/fetchProductInfo', {productId});
+  },
   activated() {
-    this.$refs.pageScroll && this.$refs.pageScroll.scrollTo(0, 0, 0);
+    if (this.$refs.pageScroll) {
+      this.$refs.pageScroll.scrollTop = 0;
+    }
+
     this.loadData(this.productId);
+    this.refresh();
   },
   beforeRouteUpdate(to, from ,next) {
     if (this.historyBackGuard() === false) {
@@ -231,7 +243,7 @@ export default {
       return true;
     },
     refresh() {
-      this.$refs.slide.refresh();
+      this.$refs.slide && this.$refs.slide.refresh && this.$refs.slide.refresh();
     },
     sizeImg(src, width = 360, height = 72) {
       if (src) {
@@ -240,20 +252,9 @@ export default {
     },
 
     // 加载商品详情数据
-    loadData(productId = this.productId, loading) {
-      loading && loading.show();
-
+    loadData(productId = this.productId) {
       this.fetchBrandTop({productId});
       this.fetchFav({productId});
-
-      return this.fetchProductInfo({productId}).then(() => {
-        loading && loading.hide();
-        setTimeout(() => {
-          this.refresh();
-        }, 200);
-      }).catch(() => {
-        loading && loading.hide();
-      });
     },
 
     /**
@@ -318,12 +319,12 @@ export default {
     },
 
     // 关闭活动列表
-    onActivitySheetHidden() {
+    onActivitySheetHide() {
       this.showActivitySheet = false;
     },
 
     // 选择尺寸
-    onSizeSelectSheetHidden() {
+    onSizeSelectSheetHide() {
       this.showSizeSelectSheet = false;
     },
 
@@ -430,7 +431,7 @@ export default {
     },
 
     // 添加尺寸关闭
-    onSizeRequestHidden() {
+    onSizeRequestHide() {
       this.showSizeRequestSheet = false;
     },
 
@@ -440,7 +441,7 @@ export default {
     },
 
     // 购买
-    onBidSheet() {
+    onBidSheetHide() {
       this.showBidSheet = false;
     },
   },
@@ -485,20 +486,17 @@ export default {
       padding-bottom: 10px;
     }
 
-    .dot {
+    .cube-dot {
       display: inline-block;
-      width: 8px;
-      height: 8px;
+      width: 6px;
+      height: 6px;
       margin: 0 10px;
-      background: radial-gradient(8px 8px at 50% 50%, rgba(0, 0, 0, 0.15) 50%, transparent 50%) no-repeat;
-
+      background: rgba(0, 0, 0, 0.15);
+      border-radius: 50%;
       &.active {
-        /*margin: 2px 10px 0;*/
-        /*width: 12px;*/
-        /*height: 12px;*/
         transform-origin: 50% 50%;
-        transform: scale(1.5);
-        background: radial-gradient(8px 8px at 50% 50%, rgba(0, 0, 0, 1) 50%, transparent 50%) no-repeat;
+        transform: scale(1.3333);
+        background: rgba(0, 0, 0, 1);
       }
     }
 
@@ -585,7 +583,7 @@ export default {
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      overflow: hidden;
+      overflow: Hide;
 
       div {
         font-size: 28px;
@@ -658,16 +656,8 @@ export default {
   }
 
   .cube-scroll-wrapper {
-    height: auto;
     flex: 1 0 0;
-
-    // 当前页面上面白色背景,底部recommend的f2f2f2, scroll的moment功能会使用cube-scroll-wrapper的顶部及底部做空内容填充
-    background: linear-gradient(to bottom, #fff 0, #f2f2f2 100%);
-
-    // 这里覆盖cube-scroll-wrapper渐变背景
-    /deep/ .cube-scroll-content {
-      background: #fff;
-    }
+    overflow: scroll;
   }
 
   .footer {

 $xianyu-theme-red: #d0021b;
+
+@mixin num {
+  font-family: "DINAlternate-Bold", "sans-serif-condensed", "sans-serif";
+}

@@ -44,7 +44,7 @@ export default function() {
                           let params = new URLSearchParams();
 
                           params.append('pagename', 'productList');
-                          params.append('title', item.linkType);
+                          params.append('title', item.name);
                           params.append(`${item.linkType}`, item.link);
 
                           item.isShow = false;
@@ -63,7 +63,7 @@ export default function() {
         let params = new URLSearchParams();
 
         params.append('pagename', 'productList');
-        params.append('title', item.linkType);
+        params.append('title', item.name);
         params.append(`${item.linkType}`, item.link);
 
         return `${hostUrl}?${params}`