fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by hongyong.zhao
Commit aec590620900ccdb09ffb1bde2f7c21ee5f48d06 1 parent 6b37f5ab

求购bug修复

Inline Side-by-side
Showing 6 changed files with 41 additions and 21 deletions
1 <!--买家求购确认页--> 1 <!--买家求购确认页-->
2 <template> 2 <template>
3 - <LayoutApp :show-back="true"> 3 + <LayoutApp :show-back="true" title="出价求购">
4 <div class="body" ref="body"> 4 <div class="body" ref="body">
5 <div class="topContainer"> 5 <div class="topContainer">
6 <div class="topView"> 6 <div class="topView">
@@ -58,15 +58,13 @@ @@ -58,15 +58,13 @@
58 <div class="space"></div> 58 <div class="space"></div>
59 <div class="line"></div> 59 <div class="line"></div>
60 60
61 - <div class="bottomContainer">  
62 - <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper"></OrderAgree>  
63 - <div>  
64 - <Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button>  
65 - </div>  
66 - </div>  
67 -  
68 </div> 61 </div>
69 - 62 + </div>
  63 + <div class="bottomContainer">
  64 + <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
  65 + <div>
  66 + <Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button>
  67 + </div>
70 </div> 68 </div>
71 </LayoutApp> 69 </LayoutApp>
72 </template> 70 </template>
@@ -99,6 +97,8 @@ export default { @@ -99,6 +97,8 @@ export default {
99 return { 97 return {
100 inputPrice: '', 98 inputPrice: '',
101 isAgreeTerms: false, 99 isAgreeTerms: false,
  100 + url: `http://m.yohobuy.com/activity/student/detail/renzhen?openby:yohobuy={\"action\":\"go.h5\",\"params\":{\"url\":\"https://activity.yoho.cn/feature/3189.html?title=买家协议&promiseV="}}`,
  101 + agreeDesc: '有货买家协议'
102 }; 102 };
103 }, 103 },
104 104
@@ -129,6 +129,7 @@ export default { @@ -129,6 +129,7 @@ export default {
129 }, 129 },
130 130
131 mounted() { 131 mounted() {
  132 + this.BUYER_ASK_RESET_DATA();
132 this.BUYER_ASK_SET_STORAGEID(this.storageId); 133 this.BUYER_ASK_SET_STORAGEID(this.storageId);
133 this.fetchBuyerOrderCount({ tabType: 'buy'}); 134 this.fetchBuyerOrderCount({ tabType: 'buy'});
134 this.fetchConfig(); 135 this.fetchConfig();
@@ -158,6 +159,7 @@ export default { @@ -158,6 +159,7 @@ export default {
158 'BUYER_ASK_SET_CHOOSEDAY', 159 'BUYER_ASK_SET_CHOOSEDAY',
159 'BUYER_ASK_SET_SHOWDIALOG', 160 'BUYER_ASK_SET_SHOWDIALOG',
160 'BUYER_ASK_SET_STORAGEID', 161 'BUYER_ASK_SET_STORAGEID',
  162 + 'BUYER_ASK_RESET_DATA',
161 ]), 163 ]),
162 ...mapActions([ 164 ...mapActions([
163 'fetchConfig', 165 'fetchConfig',
@@ -297,15 +299,16 @@ export default { @@ -297,15 +299,16 @@ export default {
297 <style lang="scss" scoped> 299 <style lang="scss" scoped>
298 .body { 300 .body {
299 height: 100%; 301 height: 100%;
300 -  
301 - position: relative; 302 + /*position: relative;*/
  303 + padding-bottom: 200px;
  304 + overflow-y: auto;
302 } 305 }
303 306
304 .topContainer { 307 .topContainer {
305 - height: calc(100% - 100*2px); 308 + /*height: calc(100% - 100*2px);*/
306 padding-left: 20*2px; 309 padding-left: 20*2px;
307 padding-right: 20*2px; 310 padding-right: 20*2px;
308 - margin-bottom: 200px; 311 + /*margin-bottom: 200px;*/
309 } 312 }
310 313
311 .topView { 314 .topView {
@@ -517,6 +520,7 @@ export default { @@ -517,6 +520,7 @@ export default {
517 /*height: 100px;*/ 520 /*height: 100px;*/
518 width: 100%; 521 width: 100%;
519 left: 0px; 522 left: 0px;
  523 + z-index: 1;
520 } 524 }
521 525
522 .agree-wrapper { 526 .agree-wrapper {
@@ -38,9 +38,11 @@ @@ -38,9 +38,11 @@
38 <template #content="{detail: {miniFaultConfirm} }"> 38 <template #content="{detail: {miniFaultConfirm} }">
39 <div class="judge-content-wrapper" v-if="miniFaultConfirm"> 39 <div class="judge-content-wrapper" v-if="miniFaultConfirm">
40 <p class="tip"> 40 <p class="tip">
41 - {{ miniFaultConfirm.text }},  
42 - <span>  
43 - 请在<count-down 41 + <span :class="
  42 + miniFaultConfirm.showBtn ? '' : 'tipTextGray'
  43 + ">{{ miniFaultConfirm.text }}</span>
  44 + <span v-if="miniFaultConfirm.showBtn">
  45 + ,请在<count-down
44 :leftTime="miniFaultConfirm.leftTime" 46 :leftTime="miniFaultConfirm.leftTime"
45 :isShowIcon="false" 47 :isShowIcon="false"
46 class="judge-count-down" 48 class="judge-count-down"
@@ -279,6 +281,10 @@ export default { @@ -279,6 +281,10 @@ export default {
279 margin-bottom: 10px; 281 margin-bottom: 10px;
280 } 282 }
281 283
  284 + .tipTextGray {
  285 + color: #999
  286 + }
  287 +
282 .judge-count-down { 288 .judge-count-down {
283 color: #d0021b; 289 color: #d0021b;
284 font-size: 12px; 290 font-size: 12px;
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <AddressInfo :data="addressInfo" class="order-item"></AddressInfo> 15 <AddressInfo :data="addressInfo" class="order-item"></AddressInfo>
16 </div> 16 </div>
17 <div class="footer"> 17 <div class="footer">
18 - <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper"></OrderAgree> 18 + <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
19 <div> 19 <div>
20 <Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button> 20 <Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button>
21 </div> 21 </div>
@@ -59,6 +59,8 @@ export default { @@ -59,6 +59,8 @@ export default {
59 data() { 59 data() {
60 return { 60 return {
61 isAgreeTerms: false, 61 isAgreeTerms: false,
  62 + agreeDesc: '有货卖家协议',
  63 + url: `http://m.yohobuy.com/activity/student/detail/renzhen?openby:yohobuy={\"action\":\"go.h5\",\"params\":{\"url\":\"https://activity.yoho.cn/feature/3187.html?title=卖家协议\"}}`,
62 }; 64 };
63 }, 65 },
64 66
@@ -72,6 +72,7 @@ export default { @@ -72,6 +72,7 @@ export default {
72 storage_id: info.storage_id, 72 storage_id: info.storage_id,
73 available: info.storage_num > 0 && price !== '-', 73 available: info.storage_num > 0 && price !== '-',
74 skup: info.skup, 74 skup: info.skup,
  75 + least_price: info.least_price,
75 }; 76 };
76 }); 77 });
77 }, 78 },
@@ -109,7 +110,7 @@ export default { @@ -109,7 +110,7 @@ export default {
109 * storageId: number 110 * storageId: number
110 */ 111 */
111 this.$store.commit('order/buyerAskOrder/BUYER_ASK_SET_PRODUCTINFO', { 112 this.$store.commit('order/buyerAskOrder/BUYER_ASK_SET_PRODUCTINFO', {
112 - least_price: this.productDetail.least_price, 113 + least_price: get(product, 'least_price', '-'),
113 sizeName: product.name, 114 sizeName: product.name,
114 sizeId: get(data, 'sizeId', ''), 115 sizeId: get(data, 'sizeId', ''),
115 colorName: get(this.productDetail, 'goods_list[0].color_name', ''), 116 colorName: get(this.productDetail, 'goods_list[0].color_name', ''),
@@ -33,6 +33,7 @@ const { @@ -33,6 +33,7 @@ const {
33 BUYER_ASK_SET_SHOWDIALOG, 33 BUYER_ASK_SET_SHOWDIALOG,
34 BUYER_ASK_SET_STORAGEID, 34 BUYER_ASK_SET_STORAGEID,
35 BUYER_ASK_SET_PRODUCTINFO, 35 BUYER_ASK_SET_PRODUCTINFO,
  36 + BUYER_ASK_RESET_DATA,
36 } = Types; 37 } = Types;
37 38
38 const TIP = '请求失败'; 39 const TIP = '请求失败';
@@ -42,15 +43,15 @@ const DEFAULT_COMPUTE_INFO = { @@ -42,15 +43,15 @@ const DEFAULT_COMPUTE_INFO = {
42 promotionFormulaList: [ 43 promotionFormulaList: [
43 { 44 {
44 promotion: '商品金额', 45 promotion: '商品金额',
45 - promotionAmount: '¥-' 46 + promotionAmount: '¥0'
46 }, 47 },
47 { 48 {
48 promotion: '运费', 49 promotion: '运费',
49 - promotionAmount: '¥-' 50 + promotionAmount: '¥0'
50 }, 51 },
51 { 52 {
52 promotion: '实付金额', 53 promotion: '实付金额',
53 - promotionAmount: '¥-' 54 + promotionAmount: '¥0'
54 } 55 }
55 ] 56 ]
56 }; 57 };
@@ -152,6 +153,11 @@ export default function() { @@ -152,6 +153,11 @@ export default function() {
152 153
153 mutations: { 154 mutations: {
154 155
  156 + [BUYER_ASK_RESET_DATA](state, payload) {
  157 + state.computeInfo = DEFAULT_COMPUTE_INFO;
  158 + state.configTip = DEFUALT_CONFIG_TIP;
  159 + },
  160 +
155 [BUYER_ASK_SET_PRODUCTINFO](state, payload) { 161 [BUYER_ASK_SET_PRODUCTINFO](state, payload) {
156 state.originProductData = payload 162 state.originProductData = payload
157 }, 163 },
@@ -28,6 +28,7 @@ export const Types = { @@ -28,6 +28,7 @@ export const Types = {
28 BUYER_ASK_SET_SHOWDIALOG: 'BUYER_ASK_SET_SHOWDIALOG', 28 BUYER_ASK_SET_SHOWDIALOG: 'BUYER_ASK_SET_SHOWDIALOG',
29 BUYER_ASK_SET_STORAGEID: 'BUYER_ASK_SET_STORAGEID', 29 BUYER_ASK_SET_STORAGEID: 'BUYER_ASK_SET_STORAGEID',
30 BUYER_ASK_SET_PRODUCTINFO: 'BUYER_ASK_SET_PRODUCTINFO', 30 BUYER_ASK_SET_PRODUCTINFO: 'BUYER_ASK_SET_PRODUCTINFO',
  31 + BUYER_ASK_RESET_DATA: 'BUYER_ASK_RESET_DATA',
31 32
32 SELLER_ORDERCOUNT_REQUEST: 'SELLER_ORDERCOUNT_REQUEST', 33 SELLER_ORDERCOUNT_REQUEST: 'SELLER_ORDERCOUNT_REQUEST',
33 SELLER_ORDERCOUNT_SUCCESS: 'SELLER_ORDERCOUNT_SUCCESS', 34 SELLER_ORDERCOUNT_SUCCESS: 'SELLER_ORDERCOUNT_SUCCESS',