fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by baoss
Commit 3ae8989ff5dcb1258169f3af3100b8e3e6275115 2 parents 0b82c3d7 ff2de488

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

Inline Side-by-side
Showing 3 changed files with 2 additions and 5 deletions
1 <!--买家求购确认页--> 1 <!--买家求购确认页-->
2 <template> 2 <template>
3 <LayoutApp :show-back="true" title="出价求购"> 3 <LayoutApp :show-back="true" title="出价求购">
4 - <cube-scroll :options="options">  
5 <div class="body" ref="body"> 4 <div class="body" ref="body">
6 5
7 <div class="topContainer"> 6 <div class="topContainer">
@@ -77,7 +76,6 @@ @@ -77,7 +76,6 @@
77 </div> 76 </div>
78 77
79 </div> 78 </div>
80 - </cube-scroll>  
81 <div class="bottomContainer"> 79 <div class="bottomContainer">
82 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree> 80 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
83 <div class="btn-wrapper"> 81 <div class="btn-wrapper">
1 <!--卖家求购变现--> 1 <!--卖家求购变现-->
2 <template> 2 <template>
3 <LayoutApp :show-back="true" title="变现"> 3 <LayoutApp :show-back="true" title="变现">
4 - <cube-scroll :options="options">  
5 <div class="body"> 4 <div class="body">
6 <!--<TitleComp txt="变现"></TitleComp>--> 5 <!--<TitleComp txt="变现"></TitleComp>-->
7 6
@@ -17,7 +16,6 @@ @@ -17,7 +16,6 @@
17 <AddressInfo :data="addressInfo" class="order-item"></AddressInfo> 16 <AddressInfo :data="addressInfo" class="order-item"></AddressInfo>
18 17
19 </div> 18 </div>
20 - </cube-scroll>  
21 <div class="footer"> 19 <div class="footer">
22 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree> 20 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
23 <div class="btn-wrapper"> 21 <div class="btn-wrapper">
@@ -71,6 +71,7 @@ export default { @@ -71,6 +71,7 @@ export default {
71 size_id: info.size_id, 71 size_id: info.size_id,
72 name: name[0], 72 name: name[0],
73 subName: name[1], 73 subName: name[1],
  74 + size_name: info.size_name,
74 price, 75 price,
75 storage_id: info.storage_id, 76 storage_id: info.storage_id,
76 available: info.storage_num > 0 && price !== '-', 77 available: info.storage_num > 0 && price !== '-',
@@ -124,7 +125,7 @@ export default { @@ -124,7 +125,7 @@ export default {
124 this.$store.commit('order/buyerAskOrder/BUYER_ASK_SET_PRODUCTINFO', { 125 this.$store.commit('order/buyerAskOrder/BUYER_ASK_SET_PRODUCTINFO', {
125 bid_moster_price: get(product, 'bid_moster_price', ''), 126 bid_moster_price: get(product, 'bid_moster_price', ''),
126 least_price: get(product, 'least_price', ''), 127 least_price: get(product, 'least_price', ''),
127 - sizeName: product.name, 128 + sizeName: product.size_name,
128 sizeId: get(data, 'sizeId', ''), 129 sizeId: get(data, 'sizeId', ''),
129 colorName: get(this.productDetail, 'goods_list[0].color_name', ''), 130 colorName: get(this.productDetail, 'goods_list[0].color_name', ''),
130 product_name: this.goodsName, 131 product_name: this.goodsName,