Browse Source

学院列表、合约止盈、币币滑块、ele组件样式

master
luyisha 2 years ago
parent
commit
dda3a14d1b
  1. BIN
      src/assets/img/bg/college_bg.png
  2. 19
      src/components/CommonFooter.vue
  3. 33
      src/views/college/index.vue
  4. 111
      src/views/college/list.vue
  5. 44
      src/views/components/inner-transfer.vue
  6. 6
      src/views/contract/account.vue
  7. 56
      src/views/contract/exchange-store.vue
  8. 12
      src/views/contract/handicap.vue
  9. 2
      src/views/exchange/index.vue
  10. 37
      src/views/exchange/make-deal.vue
  11. 2
      src/views/exchange/order-list.vue
  12. 1
      src/views/signIn/index.vue
  13. 3
      src/views/signUp/index.vue
  14. 8
      src/views/wallet/exchange-assets.vue
  15. 4
      src/views/wallet/funding.vue
  16. 2
      src/views/wallet/transfer.vue

BIN
src/assets/img/bg/college_bg.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 797 KiB

19
src/components/CommonFooter.vue

@ -19,7 +19,7 @@
<div class="footer-upper-section-lang">
<button class="lang_now" @click="toggleMenu">{{ nativeLang }}</button>
<div class="lang_menu" :class="showMenu?'show':'hide'">
<div class="item" v-for="(item1, index1) in langList" :key="index1">
<div class="item" v-for="(item1, index1) in langList" :key="index1" @click.prevent="chooseNative(item1.value)">
{{ item1.label }}
</div>
</div>
@ -245,7 +245,7 @@
</div>
<div class="footer-right">
<div style="font-size: 20px;">{{ $t("homeNewText.cc1") }}</div>
<div class="jump_btn">{{ $t("homeNewText.cc2") }}</div>
<router-link class="jump_btn" to="/exchange">{{ $t("homeNewText.cc2") }}</router-link>
<img src="" alt="" style="width: 120px;height: 120px;">
<div style="font-size: 16px; color: #9c9c9c;margin-top: 12px;">{{ $t("homeNewText.cc3") }}</div>
</div>
@ -361,6 +361,14 @@ export default {
e.stopPropagation();
this.showMenu = !this.showMenu;
},
chooseNative(native) {
//
localStorage.setItem("lang", native);
//
this.$router.go(0);
},
getCollegeLinks() {
College.getCategoryList()
.then((list) => {
@ -477,7 +485,12 @@ export default {
&::-webkit-scrollbar-thumb { background-color: transparent;}
.item{
padding: 5px 10px;
padding: 10px;
cursor: pointer;
text-align: center;
}
.item:hover{
background-color: #f8f9fa;
}
&.show{

33
src/views/college/index.vue

@ -1,7 +1,7 @@
<template>
<div class="course-page">
<div class="topcontent">
<img src="" alt="" style="height: 447px;width: 650px;margin-right:134px;">
<img src="../../assets/img/bg/college_bg.png" alt="" style="height: 447px;width: 650px;margin-right:134px;">
<div>
<div style="font-size: 60px;width: 540px;">{{$t('college.text1')}}</div>
<div style="font-size: 36px;width: 540px;">{{$t('college.text2')}}</div>
@ -63,7 +63,7 @@
</div>
</div>
<!-- 列表 -->
<div class="container course-list" style="width: 1300px !important;max-width:none;">
<div class="container course-list" style="width: 1320px !important;max-width:none;padding: 0px;">
<div class="row mt-3" v-for="(item, index) in categoryList" :key="index">
<div class="col-12">
<div class="title h3 my-4 d-flex justify-content-between align-items-center mb-5">
@ -83,6 +83,8 @@
<div class="txt">
{{article.title}}
</div>
<div class="txt2" v-html="article.body"></div>
<div class="txt2">{{article.updated_at}}</div>
</router-link>
</div>
</div>
@ -195,4 +197,31 @@ export default {
.course-page .banner .right .video{
height: 100%;
}
.course-page .course-list .item .banner{
width: 310px;
height: 164px;
border-radius: 10px;
margin-bottom: 35px;
}
.course-page .course-list .item .txt{
padding: 0px 45px 0px 25px;
font-size: 22px;
color: #fff;
margin-bottom: 18px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
height: 66px;
}
.course-page .course-list .item .txt2{
padding: 0px 45px 0px 25px;
font-size: 16px;
color: #929292;
margin-bottom: 18px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
</style>

111
src/views/college/list.vue

@ -1,15 +1,23 @@
<template>
<div>
<secondary-nav />
<!-- 导航公用的样式不要乱改 -->
<div style="background-color: #121212;">
<!-- <secondary-nav /> -->
<!-- 二级导航公用的样式不要乱改 -->
<!-- 列表 -->
<div class="container course-list">
<div class="row mt-3">
<div class="container course-list" style="width: 1320px !important;max-width:none;padding: 10px 0px;">
<div class="row">
<div class="col-12">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/college' }">{{$t('college.college')}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: `/college/list/${cid}`}">{{title}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/college' }" class="fn-18">{{$t('college.college')}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: `/college/list/${cid}`}" class="fn-18" style="color: #fff;">{{title}}</el-breadcrumb-item>
</el-breadcrumb>
<!-- 新二级导航 -->
<ul class="SecondaryNavUl">
<li class="SecondaryNavList" v-for="(item,index) in itemList" :key="index">
<router-link :to="item.url" active-class="SecondaryNavActive">{{item.label}}</router-link>
</li>
</ul>
<div class="title h3 my-4">{{title}}</div>
<div class="row justify-content-between">
<router-link :to="`/college/detail/${cid}/${item.id}`" class="item col-lg-3 col-md-6 mb-4 col-xs-12" v-for="(item,index) in articleList" :key="index">
@ -20,6 +28,8 @@
<div class="txt">
{{item.title}}
</div>
<div class="txt2" v-html="item.body"></div>
<div class="txt2">{{item.updated_at}}</div>
</router-link>
</div>
</div>
@ -36,11 +46,13 @@ export default {
return {
cid: this.$route.params.cid,
articleList: [],
itemList: [],//
}
},
computed: {
title() {
let key = this.cid;
console.log(this.cid, 'this.cid')
switch (key) {
case 'novice':
return this.$t('college.noviceTutorial')
@ -54,6 +66,14 @@ export default {
return this.$t('college.media')
case 'OkChain':
return 'OkChain'
case '18':
return this.$t('common.noviceTutorial')
case '21':
return this.$t('college.TradingStrategy')
case '22':
return this.$t('college.industryResearch')
case '32':
return this.$t('home.news')
}
}
},
@ -63,7 +83,18 @@ export default {
this.articleList = data;
}).catch();
}
},
getCollegeLinks() {
College.getCategoryList().then(list => {
list.forEach(item => {
this.itemList.push({
url : `/college/list/${item.id}`,
label : item.name
})
})
}).catch(err => {});
},
},
watch: {
$route() {
@ -72,10 +103,72 @@ export default {
}
},
created() {
this.getCollegeLinks();
this.getArticleList();
},
};
</script>
<style>
<style scoped>
.course-list .item .banner{
width: 310px;
height: 164px;
border-radius: 10px;
margin-bottom: 35px;
overflow: hidden;
}
.course-list .item .banner img{
width: 310px;
height: 164px;
}
.course-list .item .txt{
padding: 0px 45px 0px 25px;
font-size: 22px;
color: #fff;
margin-bottom: 18px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
height: 66px;
}
.course-list .item .txt2{
padding: 0px 45px 0px 25px;
font-size: 16px;
color: #929292;
margin-bottom: 18px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.SecondaryNavUl{
display: flex;
height: 72px;
}
.SecondaryNavUl .SecondaryNavList{
display: flex;
justify-content: center;
align-items: center;
margin-right: 60px;
height: 100%;
}
.SecondaryNavUl .SecondaryNavList a{
color: #929292;
font-size: 24px;
}
.SecondaryNavUl .SecondaryNavList .SecondaryNavActive {
color: #fff !important;
}
.el-breadcrumb__item:last-child::v-deep .el-breadcrumb__inner::v-deep{
color: #fff !important;
/* 写不进去,无效代码 */
}
/deep/ .el-breadcrumb__item:last-child .el-breadcrumb__inner{
color: #fff !important;
/* 写进去,有效代码 */
}
</style>

44
src/views/components/inner-transfer.vue

@ -84,9 +84,10 @@
step="0.000001"
min="0"
:placeholder="$t('wallet.strokes')"
style="border-radius:5px;"
/>
<div class="input-group-append">
<span class="input-group-text fn-12">
<span class="input-group-text fn-12" style="border:none;background-color:transparent;color: #999;">
{{ $t("wallet.balance") }}
<span class="fn-14">{{
activeCoin.usable_balance | omitTo(4)
@ -408,49 +409,20 @@ export default {
background-image: none;
}
</style>
<style scoped>
/**
scss 里面使用::v-deep修改无效
*/
.settings.wallet-page input,
.el-select .el-input__inner,
input,
.form-control{
color: #101010 !important;
background-color: #fff !important;
}
.el-select{
border: 5px solid #F00;
}
.el-select .el-input__inner{
color: #101010 !important;
background-color: #fff !important;
border: 5px solid #F00;
}
.el-input__inner{
color: #101010 !important;
background-color: #fff !important;
border: 5px solid #Ff0;
}
.el-input__inner::v-deep{
color: #101010 !important;
background-color: #fff !important;
}
.el-select::v-deep .el-input__inner{
color: #101010 !important;
background-color: #fff !important;
}
.el-select::v-deep .el-input__inner::v-deep{
/deep/ .el-input__inner{
color: #101010 !important;
background-color: #fff !important;
}
el-select::v-deep .el-input__inner{
color: #101010 !important;
background-color: #fff !important;
}
.el-cascader{
border: 5px solid #F00;
}
*/
</style>
</style>

6
src/views/contract/account.vue

@ -1,17 +1,17 @@
<template>
<div class="account">
<div class="markets-pair-list">
<div class="nav justify-content-between">
<div class="nav justify-content-between" style="border-bottom: 1px solid #2e2e2e;">
<div class="nav-item">
<a class="nav-link">{{$t('contract.a0')}}</a>
</div>
<div class="d-flex justify-content-between align-items-center">
<router-link to="/wallet/assets/exchange" class="border border-primary rounded text-primary p-1" >
<router-link to="/wallet/assets/exchange" class="border-primary rounded text-primary p-1" >
{{$t('contract.a1')}}
</router-link>
</div>
</div>
<div class="">
<div class="py-2">
<div class="d-flex p-3 justify-content-between">
<div>{{$t('contract.a2')}}USDT</div>
<div>{{ accountInfo.account_equity || "--" }}</div>

56
src/views/contract/exchange-store.vue

@ -154,6 +154,30 @@
<input type="checkbox" name="" id="" v-model="checkboxBuy">
<div>{{ $t("contact.Profit&Loss") }}</div>
</div>
<template v-if="checkboxBuy">
<div class="input-group mb-4 input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text">{{ $t("contract.j3") }}</span>
</div>
<input
type="number"
class="form-control"
v-model="buyform.pri1"
:placeholder="tips"
/>
</div>
<div class="input-group mb-4 input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text">{{ $t("contract.j4") }}</span>
</div>
<input
type="number"
class="form-control"
v-model="buyform.pri2"
:placeholder="tips"
/>
</div>
</template>
</div>
<!-- 卖出表单 -->
<div style="width: 50%;" class="px-3">
@ -240,6 +264,30 @@
<input type="checkbox" name="" id="" v-model="checkboxSell">
<div>{{ $t("contact.Profit&Loss") }}</div>
</div>
<template v-if="checkboxSell">
<div class="input-group mb-4 input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text">{{ $t("contract.j3") }}</span>
</div>
<input
type="number"
class="form-control"
v-model="sellform.pri1"
:placeholder="tips"
/>
</div>
<div class="input-group mb-4 input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text">{{ $t("contract.j4") }}</span>
</div>
<input
type="number"
class="form-control"
v-model="sellform.pri2"
:placeholder="tips"
/>
</div>
</template>
</div>
<div class="exchange_button" v-if="tab == 1" style="width: 100%;">
<div class="px-3 flex-fill mb-4">
@ -309,11 +357,15 @@ export default {
},
buyform: {
entrust_price: undefined,
amount:""
amount:"",
pri1: "",//
pri2: ""//
},
sellform: {
entrust_price: undefined,
amount:""
amount:"",
pri1: "",//
pri2: ""//
},
//
maxNum: 0,

12
src/views/contract/handicap.vue

@ -64,7 +64,7 @@
</template>
</div>
<div
class="current-nav d-flex align-items-center my-2" style="background-color: #2e2e2e;"
class="current-nav d-flex align-items-center my-2 py-2" style="background-color: #2e2e2e;"
>
<div class="w-10/24 d-flex align-items-center">
<div class="name fn-12 px-3">{{ $t("contract.g3") }}</div>
@ -320,5 +320,13 @@ export default {
transform: translateX(-50%);
margin-left: 0px;
}
.contract-page .page-top .handicap .handicap-body .sell,
.contract-page .page-top .handicap .handicap-body .buy{
height: 430px;
overflow: auto;
}
.contract-page .page-top .handicap .handicap-body .sell .item,
.contract-page .page-top .handicap .handicap-body .buy .item{
line-height: 40px;
}
</style>

2
src/views/exchange/index.vue

@ -554,7 +554,7 @@ export default {
});
},
changeCoinLogo(e){
console.log(e, 'this.currentIcon = market.icon')
// console.log(e, 'this.currentIcon = market.icon')
this.currentIcon = e.coin_icon;
}
},

37
src/views/exchange/make-deal.vue

@ -170,8 +170,8 @@
</ul>
<div class="px-2">
<el-slider
:value="activeStepBuy"
@input="sliderChangeBuy"
v-model="activeStepBuy"
@change="sliderChangeBuy"
:format-tooltip="tooltip"
:marks="marks"
:step="25"
@ -263,8 +263,8 @@
</ul>
<div class="px-2">
<el-slider
:value="activeStepSell"
@input="sliderChangeSell"
v-model="activeStepSell"
@change="sliderChangeSell"
:format-tooltip="tooltip"
:marks="marks"
:step="25"
@ -369,6 +369,8 @@ export default {
//
buyPercentIndex: null,
sellPercentIndex: null,
activeStepBuy: 0,
activeStepSell: 0
}
},
@ -389,6 +391,7 @@ export default {
buyTotal: {
get() {
// console.log(333)
if (!this.isMarket) {
return Math.multiple(this.buyorder.entrust_price, this.buyorder.amount);
} else {
@ -396,6 +399,7 @@ export default {
}
},
set(val) {
// console.log(444)
//
if (!this.isMarket) {
this.buyorder.amount = Math.division(val, this.buyorder.entrust_price);
@ -410,7 +414,7 @@ export default {
return Math.multiple(this.sellorder.entrust_price, this.sellorder.amount);
}
},
activeStepBuy(){
// activeStepBuy(){
// console.log(this.buyorder.amount, this.buyTotal, '000000')
// let num = 0;
// if(this.isMarket){
@ -419,12 +423,12 @@ export default {
// num = this.buyorder.amount / (this.fromBalance * 100);
// }
// return num;
},
activeStepSell(){
// },
// activeStepSell(){
// console.log(1111)
// let num = this.sellorder.amount / (this.toBalance * 100);
// return num;
},
// },
//
lang() {
@ -502,8 +506,15 @@ export default {
// console.info(this.buyTotal, '------------')
},
sliderChangeBuy($ev){
// console.log($ev, 22222);
this.buyTotal = Math.multiple(this.fromBalance, $ev/100);
console.log($ev, 22222);
if (!this.buyorder.entrust_price) {
this.visibles.buy.limitPrice = true;
this.msgList.buy[1] = this.$t('nav.set');
this.clearAll();
return;
}
this.buyorder.amount = Math.multiple(this.fromBalance, $ev/100);
// this.buyTotal = Math.multiple(this.fromBalance, $ev/100);
},
renderSellAmount(val, index) {
@ -517,6 +528,12 @@ export default {
this.sellorder.amount = Math.multiple(this.toBalance, val);
},
sliderChangeSell($ev){
if (!this.sellorder.entrust_price) {
this.visibles.sell.limitPrice = true;
this.msgList.sell[1] = this.$t('nav.set');
this.clearAll();
return;
}
this.sellorder.amount = Math.multiple(this.toBalance, $ev/100);
},

2
src/views/exchange/order-list.vue

@ -1,5 +1,5 @@
<template>
<div class="" style="width: 100%;">
<div class="" style="width: 100%;margin-bottom: 8px;">
<div class="exchange-history order-history market-order mt-2" style="border:none;background-color: #121212;">
<ul class="nav nav-pills" role="tablist" style="background-color: transparent;border-bottom: 1px solid #2e2e2e;">
<li class="nav-item" @click="toggle('opens')">

1
src/views/signIn/index.vue

@ -687,6 +687,7 @@ form.login-body {
background-color: #fff;
border-color: #dfdfdf;
height: 60px !important;
color: #101010;
}
.btn-primary {
color: #fff;

3
src/views/signUp/index.vue

@ -7,7 +7,7 @@
<div class="fn-18 bg">{{ $t('login.text3') }}</div>
</div>
</div>
<div class="vh-100" style="width: 53%;background-color: #fff;">
<div class="" style="width: 53%;height:1024px;background-color: #fff;">
<div class="form-access">
<form class="register-body">
<div class="mb-4 h3" style="font-size: 40px;color: #101010;">
@ -752,6 +752,7 @@ div.verify-code {
background-color: #fff;
border-color: #dfdfdf;
height: 60px !important;
color: #101010;
}
.btn-primary {
color: #fff;

8
src/views/wallet/exchange-assets.vue

@ -1,5 +1,5 @@
<template>
<div class="settings wallet-page">
<div class="settings wallet-page" style="padding-bottom:20px;">
<secondary-nav></secondary-nav>
<!-- 个人信息 -->
<div class="user">
@ -865,7 +865,7 @@ created() {
@include flexible(row, space-between);
}
.active{
border-bottom: 1px solid;
// border-bottom: 1px solid;
}
.upload-demo {
::v-deep .el-upload-dragger {
@ -909,4 +909,8 @@ created() {
border-color: #fff;
color: #fff;
}
.form-control{
color: #101010 !important;
background-color: #fff !important;
}
</style>

4
src/views/wallet/funding.vue

@ -281,4 +281,8 @@ export default {
color: #101010 !important;
background-color: #fff !important;
}
/deep/ .el-input__inner{
color: #101010 !important;
background-color: #fff !important;
}
</style>

2
src/views/wallet/transfer.vue

@ -1,5 +1,5 @@
<template>
<div class="wallet-page">
<div class="wallet-page" style="padding-bottom:20px;">
<secondary-nav></secondary-nav>
<div class="container">
<div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4">

Loading…
Cancel
Save