Authored by lea guo

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

... ... @@ -76,8 +76,8 @@
</div>
<div class="bottomContainer">
<OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
<div>
<Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button>
<div class="btn-wrapper">
<YohoButton class="submit-btn" :txt="submitText" :disable="!isAgreeTerms" @click="submitClick"></YohoButton>
</div>
</div>
</LayoutApp>
... ... @@ -109,7 +109,8 @@ export default {
inputPrice: '',
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',
agreeDesc: '有货买家协议'
agreeDesc: '有货买家协议',
submitText: '提交',
};
},
... ... @@ -498,7 +499,7 @@ export default {
.wordText {
margin-left: 10*2px;
font-family: "DIN Alternate";
font-size: 28*2px;
font-size: 20*2px;
height: 100%;
line-height: 100%;
color: #000;
... ... @@ -606,4 +607,14 @@ export default {
line-height: 60px;
}
.submit-btn {
height: 80px;
line-height: 80px;
font-size: 28px;
}
.btn-wrapper {
padding: 0 40px 40px;
background-color: white;
}
</style>
... ...
... ... @@ -16,8 +16,8 @@
</div>
<div class="footer">
<OrderAgree :value="isAgreeTerms" @input="isAgreeTerms = !isAgreeTerms" class="agree-wrapper" :desc="agreeDesc" :url="url"></OrderAgree>
<div>
<Button :disabled="!isAgreeTerms" type="submit" @click="submitClick">提交</Button>
<div class="btn-wrapper">
<YohoButton :txt="submitText"class="submit-btn" :disable="!isAgreeTerms" @click="submitClick"></YohoButton>
</div>
</div>
</LayoutApp>
... ... @@ -63,6 +63,7 @@ export default {
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=卖家协议\"}}',
isEntry: false,
submitText: '提交',
};
},
... ... @@ -256,7 +257,7 @@ export default {
.wordText {
margin-left: 10*2px;
font-family: "DIN Alternate";
font-size: 28*2px;
font-size: 20*2px;
height: 50*2px;
line-height: 50*2px;
color: #000;
... ... @@ -281,4 +282,14 @@ export default {
border-top: 1px solid #eee;
}
.submit-btn {
height: 80px;
line-height: 80px;
font-size: 28px;
}
.btn-wrapper {
padding: 0 40px 40px;
background-color: white;
}
</style>
... ...