fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by lea guo
Commit aec3b56da059ea458a0cb6b1c4891827012c62f0 2 parents 062ff967 18f8cac4

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

Inline Side-by-side
Showing 2 changed files with 29 additions and 7 deletions
@@ -76,8 +76,8 @@ @@ -76,8 +76,8 @@
76 </div> 76 </div>
77 <div class="bottomContainer"> 77 <div class="bottomContainer">
78 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree> 78 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
79 - <div>  
80 - <Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button> 79 + <div class="btn-wrapper">
  80 + <YohoButton class="submit-btn" :txt="submitText" :disable="!isAgreeTerms" @click="submitClick"></YohoButton>
81 </div> 81 </div>
82 </div> 82 </div>
83 </LayoutApp> 83 </LayoutApp>
@@ -109,7 +109,8 @@ export default { @@ -109,7 +109,8 @@ export default {
109 inputPrice: '', 109 inputPrice: '',
110 isAgreeTerms: false, 110 isAgreeTerms: false,
111 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', 111 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',
112 - agreeDesc: '有货买家协议' 112 + agreeDesc: '有货买家协议',
  113 + submitText: '提交',
113 }; 114 };
114 }, 115 },
115 116
@@ -498,7 +499,7 @@ export default { @@ -498,7 +499,7 @@ export default {
498 .wordText { 499 .wordText {
499 margin-left: 10*2px; 500 margin-left: 10*2px;
500 font-family: "DIN Alternate"; 501 font-family: "DIN Alternate";
501 - font-size: 28*2px; 502 + font-size: 20*2px;
502 height: 100%; 503 height: 100%;
503 line-height: 100%; 504 line-height: 100%;
504 color: #000; 505 color: #000;
@@ -606,4 +607,14 @@ export default { @@ -606,4 +607,14 @@ export default {
606 line-height: 60px; 607 line-height: 60px;
607 } 608 }
608 609
  610 + .submit-btn {
  611 + height: 80px;
  612 + line-height: 80px;
  613 + font-size: 28px;
  614 + }
  615 +
  616 + .btn-wrapper {
  617 + padding: 0 40px 40px;
  618 + background-color: white;
  619 + }
609 </style> 620 </style>
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 </div> 16 </div>
17 <div class="footer"> 17 <div class="footer">
18 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree> 18 <OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
19 - <div>  
20 - <Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button> 19 + <div class="btn-wrapper">
  20 + <YohoButton :txt="submitText"class="submit-btn" :disable="!isAgreeTerms" @click="submitClick"></YohoButton>
21 </div> 21 </div>
22 </div> 22 </div>
23 </LayoutApp> 23 </LayoutApp>
@@ -63,6 +63,7 @@ export default { @@ -63,6 +63,7 @@ export default {
63 agreeDesc: '有货卖家协议', 63 agreeDesc: '有货卖家协议',
64 url: 'http://m.yohobuy.com/activity/student/detail/renzhen?openby:yohobuy={\"action\":\"go.h5\",\"params\":{\"url\":\"https://activity.yoho.cn/feature/3187.html?title=卖家协议\"}}', 64 url: 'http://m.yohobuy.com/activity/student/detail/renzhen?openby:yohobuy={\"action\":\"go.h5\",\"params\":{\"url\":\"https://activity.yoho.cn/feature/3187.html?title=卖家协议\"}}',
65 isEntry: false, 65 isEntry: false,
  66 + submitText: '提交',
66 }; 67 };
67 }, 68 },
68 69
@@ -256,7 +257,7 @@ export default { @@ -256,7 +257,7 @@ export default {
256 .wordText { 257 .wordText {
257 margin-left: 10*2px; 258 margin-left: 10*2px;
258 font-family: "DIN Alternate"; 259 font-family: "DIN Alternate";
259 - font-size: 28*2px; 260 + font-size: 20*2px;
260 height: 50*2px; 261 height: 50*2px;
261 line-height: 50*2px; 262 line-height: 50*2px;
262 color: #000; 263 color: #000;
@@ -281,4 +282,14 @@ export default { @@ -281,4 +282,14 @@ export default {
281 border-top: 1px solid #eee; 282 border-top: 1px solid #eee;
282 } 283 }
283 284
  285 + .submit-btn {
  286 + height: 80px;
  287 + line-height: 80px;
  288 + font-size: 28px;
  289 + }
  290 +
  291 + .btn-wrapper {
  292 + padding: 0 40px 40px;
  293 + background-color: white;
  294 + }
284 </style> 295 </style>