Authored by baoss

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

<!--买家求购确认页-->
<template>
<LayoutApp :show-back="true" title="出价求购">
<cube-scroll :options="options">
<div class="body" ref="body">
<div class="topContainer">
... ... @@ -77,7 +76,6 @@
</div>
</div>
</cube-scroll>
<div class="bottomContainer">
<OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
<div class="btn-wrapper">
... ...
<!--卖家求购变现-->
<template>
<LayoutApp :show-back="true" title="变现">
<cube-scroll :options="options">
<div class="body">
<!--<TitleComp txt="变现"></TitleComp>-->
... ... @@ -17,7 +16,6 @@
<AddressInfo :data="addressInfo" class="order-item"></AddressInfo>
</div>
</cube-scroll>
<div class="footer">
<OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
<div class="btn-wrapper">
... ...
... ... @@ -71,6 +71,7 @@ export default {
size_id: info.size_id,
name: name[0],
subName: name[1],
size_name: info.size_name,
price,
storage_id: info.storage_id,
available: info.storage_num > 0 && price !== '-',
... ... @@ -124,7 +125,7 @@ export default {
this.$store.commit('order/buyerAskOrder/BUYER_ASK_SET_PRODUCTINFO', {
bid_moster_price: get(product, 'bid_moster_price', ''),
least_price: get(product, 'least_price', ''),
sizeName: product.name,
sizeName: product.size_name,
sizeId: get(data, 'sizeId', ''),
colorName: get(this.productDetail, 'goods_list[0].color_name', ''),
product_name: this.goodsName,
... ...