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

@@ -115,6 +115,17 @@ export default {
         toast.hide();
         toast.hide();
         this.onError(result);
         this.onError(result);
       });
       });
+
+      //数据埋点
+      this.$store.dispatch('reportYas', {
+        params: {
+          appop: 'XY_UFO_SC_PAY',
+          param: {
+            ORD_NUM: this.orderCode,
+            PAY_TYPE: 1
+          },
+        },
+      });
     },
     },
     onError(result) {
     onError(result) {
       this.$emit('payError');
       this.$emit('payError');
@@ -123,11 +134,39 @@ export default {
         time: 1500,
         time: 1500,
         type: 'txt'
         type: 'txt'
       }).show();
       }).show();
+
+      //数据埋点
+      this.$store.dispatch('reportYas', {
+        params: {
+          appop: 'XY_UFO_SC_PAY_RES',
+          param: {
+            ORD_NUM: this.orderCode,
+            PAY_TYPE: 1,   //1支付宝支付，2微信支付
+            PAY_RES: 0,   //0支付失败，1支付成功
+            ORDER_AMOUNT: this.price
+          },
+        },
+      });
+
     },
     },
     onSuccess(result) {
     onSuccess(result) {
       this.hide();
       this.hide();
       this.$emit('paySuccess');
       this.$emit('paySuccess');
 
 
+      //数据埋点
+      this.$store.dispatch('reportYas', {
+        params: {
+          appop: 'XY_UFO_SC_PAY',
+          param: {
+            ORD_NUM: this.orderCode,
+            PAY_TYPE: 1,
+            PAY_RES: 1,
+            ORDER_AMOUNT: this.price
+          },
+        },
+      });
+
+
       this.$router.replace({
       this.$router.replace({
         name: 'OrderPay',
         name: 'OrderPay',
         query: {
         query: {

@@ -207,11 +207,12 @@ export default {
     .category-left-item-select {
     .category-left-item-select {
       font-size: 44px;
       font-size: 44px;
       color: #000000;
       color: #000000;
+      font-weight: bold;
     }
     }
 
 
     .category-left-item-select-flag:before {
     .category-left-item-select-flag:before {
       content: "";
       content: "";
-      width: 6px;
+      width: 4px;
       height: 48px;
       height: 48px;
       position: absolute;
       position: absolute;
       left: 0;
       left: 0;
@@ -269,6 +270,7 @@ export default {
 
 
       .item-title {
       .item-title {
         display: none;
         display: none;
+        font-family: SFProText-Regular;
       }
       }
 
 
       &:after {
       &:after {

@@ -92,7 +92,6 @@
 
 
 import {Input, Button, Scroll} from 'cube-ui';
 import {Input, Button, Scroll} from 'cube-ui';
 import OrderAddress from './components/confirm/address';
 import OrderAddress from './components/confirm/address';
-import DayChoose from './components/askorder/day-choose';
 import OrderAgree from './components/confirm/agree';
 import OrderAgree from './components/confirm/agree';
 import { createNamespacedHelpers } from 'vuex';
 import { createNamespacedHelpers } from 'vuex';
 import {debounce, get} from 'lodash';
 import {debounce, get} from 'lodash';
@@ -102,11 +101,11 @@ const {mapState, mapActions, mapMutations, mapGetters} = createNamespacedHelpers
 
 
 export default {
 export default {
   name: 'BuyerAskOrder',
   name: 'BuyerAskOrder',
-  components: {Button, Input, DayChoose, OrderAddress, OrderAgree},
   props: ['lazy', 'storageId'],
   props: ['lazy', 'storageId'],
-  component: {
+  components: {
     Input,
     Input,
     OrderAddress,
     OrderAddress,
+    OrderAgree,
     Button,
     Button,
     'cube-scroll': Scroll,
     'cube-scroll': Scroll,
   },
   },
@@ -114,7 +113,7 @@ export default {
     return {
     return {
       inputPrice: '',
       inputPrice: '',
       isAgreeTerms: false,
       isAgreeTerms: false,
-      url: 'https://activity.yoho.cn/feature/6775.html?share_id=9481&title=%E9%97%B2%E9%B1%BC%E4%B9%B0%E5%AE%B6%E5%8D%8F%E8%AE%AE',
+      url: 'https://activity.yoho.cn/feature/6775.html?nodownload=1',
       agreeDesc: '有货买家协议',
       agreeDesc: '有货买家协议',
       submitText: '提交',
       submitText: '提交',
       options: {pullDownRefresh: false}
       options: {pullDownRefresh: false}
@@ -312,8 +311,11 @@ export default {
 
 
     publishProduct() {
     publishProduct() {
 
 
-      this.buyerPublish({price: this.inputPrice, storage_id: this.storageId, address_id: this.addressInfo.address_id, time_limit_id: this.chooseDayId}).then(() => {
-        this.payOrder();
+      this.buyerPublish({price: this.inputPrice, storage_id: this.storageId, address_id: this.addressInfo.address_id, time_limit_id: this.chooseDayId}).then((res) => {
+        if (res && res.code == 200) {
+          this.payOrder();
+        }
+
       });
       });
     },
     },
 
 

@@ -246,6 +246,21 @@ export default {
           vm.onClose(result.data.orderCode);
           vm.onClose(result.data.orderCode);
         },
         },
       }).show();
       }).show();
+
+      //数据埋点
+      this.$store.dispatch('reportYas', {
+        params: {
+          appop: 'XY_UFO_SC_ORD',
+          param: {
+            ORD_NUM: result.data.orderCode,
+            PRD_ID: this.productId,
+            PRD_SKU: this.productDetail.skup,
+            PRD_SIZE: this.productDetail.sizeName,
+            ORD_AMOUNT: this.orderDetail.amount,
+            PRD_PRICE: this.productDetail.goodPrice,
+          },
+        },
+      });
     },
     },
     onClose(orderCode) {
     onClose(orderCode) {
       this.$router.replace({
       this.$router.replace({

@@ -64,7 +64,7 @@ export default {
       isAgreeTerms: false,
       isAgreeTerms: false,
       hiddenIcon: true,
       hiddenIcon: true,
       agreeDesc: '有货卖家协议',
       agreeDesc: '有货卖家协议',
-      url: 'http://m.yohobuy.com/activity/student/detail/renzhen?openby:yohobuy={\"action\":\"go.h5\",\"params\":{\"url\":\"https://activity.yoho.cn/feature/3187.html?title=卖家协议\"}}',
+      url: 'https://activity.yoho.cn/feature/6773.html?nodownload=1',
       isEntry: false,
       isEntry: false,
       submitText: '提交',
       submitText: '提交',
       options: {pullDownRefresh: false},
       options: {pullDownRefresh: false},

@@ -170,6 +170,7 @@ export default {
         return;
         return;
       }
       }
       this.$emit('select', {
       this.$emit('select', {
+        size_name: this.selectedSize.size_name,
         productId: this.product.product_id,
         productId: this.product.product_id,
         storageId: this.selectedSize.storage_id,
         storageId: this.selectedSize.storage_id,
         skup: this.selectedSize.skup,
         skup: this.selectedSize.skup,

@@ -319,6 +319,18 @@ export default {
     },
     },
     async onSelectTradeProduct(tradeProduct) {
     async onSelectTradeProduct(tradeProduct) {
       if (this.selectSizeConfig.type === 'buy') {
       if (this.selectSizeConfig.type === 'buy') {
+        //数据埋点
+        this.$store.dispatch('reportYas', {
+          params: {
+            appop: 'XY_UFO_PRD_DT_BUY_SEL_C',
+            param: {
+              PRD_ID: tradeProduct.productId,
+              PRD_SKU: tradeProduct.skup,
+              PRD_SIZE: tradeProduct.size_name,
+            },
+          }
+        });
+
         try {
         try {
           const info = await this.payment({
           const info = await this.payment({
             skup: tradeProduct.skup,
             skup: tradeProduct.skup,

@@ -402,9 +402,11 @@ export default function() {
           } else {
           } else {
             commit(BUYER_ASK_PUBLISH_FAILURE, result.message);
             commit(BUYER_ASK_PUBLISH_FAILURE, result.message);
           }
           }
+          return result;
         }, error => {
         }, error => {
           console.log(error);
           console.log(error);
           commit(BUYER_ASK_PUBLISH_FAILURE, TIP);
           commit(BUYER_ASK_PUBLISH_FAILURE, TIP);
+          return null;
         });
         });
       }
       }
     }
     }