Skip to content

M
mcep-h5
提交 281cb1d5 编写于 作者: donghuawangliang0612's avatar donghuawangliang0612
浏览文件
操作

Merge branch 'master' of http://zyys.donghuajinyun.com/gitlib/jiangzaicheng/mcep-h5 

 Conflicts:
	src/views/login/ForgetPassView.vue
	src/views/login/Register.vue
上级 5bf3939c 975f42bf
master
无相关合并请求
隐藏空白字符变更
内嵌 并排
正在显示 包含 55 行增加 和 30 行删除
src/assets/images/hljnx.png 0 → 100644
浏览文件 @ 281cb1d5
src/assets/images/hljnx.png

25.9 KB

src/components/common/ProductDetail.vue
浏览文件 @ 281cb1d5
......@@ -20,7 +20,7 @@
</div>
</div> -->
<div class="d-flex flex-column loop" >
<div class="p-2 " ><van-icon name="arrow-left" /></div>
<div class="p-2 " ><van-icon name="arrow-left" @click="exit"/></div>
<div class="productName " style="width:100%;height:70%; ">{{" "+ productName}}</div>
</div>
......@@ -39,6 +39,11 @@ export default class ProductDetail extends Vue {
@Prop({ default: "" }) productName: string | undefined;
imagenAME: any=require('@/assets/images/background-card.png');
exit(){
this.$router.back();
}
}
</script>
<style scoped lang="scss">
......
src/components/common/Tatle.vue
浏览文件 @ 281cb1d5
......@@ -24,7 +24,7 @@
</template>
<script lang="ts">
import { Component, Vue, Prop, Watch } from "vue-property-decorator";
import { Component, Vue, Prop, Watch,Emit } from "vue-property-decorator";
/*
* title
*/
......@@ -34,9 +34,11 @@ import { Component, Vue, Prop, Watch } from "vue-property-decorator";
export default class Tatle extends Vue {
@Prop({ default: "" }) tatle: string | undefined
@Prop({ default: true}) tatleflag : boolean|undefined
retyen(){
this.$router.back();
}
@Emit("retyen")
retyen(){}
// retyen(){
// this.$router.back();
// }
}
</script>
<style scoped lang="scss">
......@@ -53,6 +55,6 @@ export default class Tatle extends Vue {
.d-tatle{
height: 50PX;
background: linear-gradient(90deg, rgba(118, 190, 250, 1) 0%, rgba(54, 114, 241, 1) 99%);
background: #0B54E0
}
</style>
src/views/authentication/LoginView.vue
浏览文件 @ 281cb1d5
......@@ -9,7 +9,7 @@
<template>
<div class="loginform">
<div class="rarle">
<tatle-bar :tatle="tatleName"></tatle-bar>
<tatle-bar :tatle="tatleName" style="background: #0B54E0"></tatle-bar>
</div>
<div class="login">
<!-- <van-row class="" style="padding: 10% 0%;">-->
......@@ -20,10 +20,15 @@
<!--}">请使用手机号或身份证号登录</span></van-col>-->
<!-- </van-row>-->
<van-row type="flex" justify="center" style=" margin-top: 60px;">
<div class="logindiv" style="margin-top: 30%">
<van-col span="24">
<div><img style=" width: 96%;" src="../../assets/images/hljnx.png" alt="" /></div>
</van-col>
</van-row>
<div class="logindiv" style="margin-top: 20%">
<span class="sopan">账号</span>
<van-field @input="noChange" v-model="loginNo" :border="true" placeholder="请输入手机号或身份证号"
/>
......@@ -74,7 +79,7 @@
</div>
<div style="margin: 16px;">
<van-button square block type="info" native-type="submit" @click="loginSystem()">登录</van-button>
<van-button square block type="info" style="background-color: #3672F1;border-radius: 5px;" native-type="submit" @click="loginSystem()">登录</van-button>
</div>
<!-- </van-form>-->
<!-- <div>
......
src/views/login/ForgetPassView.vue
浏览文件 @ 281cb1d5
......@@ -9,7 +9,7 @@
<template>
<div class="loginform">
<div class="rarle">
<tatle-bar :tatle="tatleName"></tatle-bar>
<tatle-bar :tatle="tatleName" style="background: #0B54E0"></tatle-bar>
</div>
<div class="login">
......
src/views/login/Register.vue
浏览文件 @ 281cb1d5
......@@ -8,21 +8,31 @@
-->
<template>
<div class="loginform">
<div class="rarle">
<tatle-bar :tatle="tatleName"></tatle-bar>
<div class="rarle" >
<tatle-bar :tatle="tatleName" style="background: #0B54E0"></tatle-bar>
</div>
<div class="login">
<!-- <van-row style="padding: 10% 0%;">-->
<!-- <van-col span="24">-->
<!-- <p class="polog"><span class="font-size-18-dhc" style="padding: 2% 0%;font-weight: 600;">注册</span> </p>-->
<!-- </van-col>-->
<!-- <van-col span="24"><span class="font-size-12-dhc" style="font-weight: 400; font-family: 'Arial Normal', 'Arial';-->
<!--}">请使用机号码或身份证号码进行注册</span></van-col>-->
<!-- </van-row>-->
<!-- <van-row style="padding: 10% 0%;">
<van-col span="24">
<p class="polog"><span class="font-size-18-dhc" style="padding: 2% 0%;font-weight: 600; ">注册</span> </p>
</van-col>
<van-col span="24"><span class="font-size-12-dhc" style="font-weight: 400; font-family: 'Arial Normal', 'Arial';
}">请使用机号码或身份证号码进行注册</span></van-col>
</van-row> -->
<van-row type="flex" justify="center" style=" margin-top: 60px;">
<van-col span="24">
<div><img style=" width: 96%;" src="../../assets/images/hljnx.png" alt="" /></div>
</van-col>
</van-row>
<van-form>
<div class="logindiv" style="margin-top: 20%">
<span class="sopan">账号</span>
<div class="logindiv" style="margin-top :20%; ">
<span class="sopan" style="padding: 10% 0%;">账号</span>
<van-field @input="noChange" v-model="phone" :border="true" placeholder="请输入手机号码/身份证号码"
/>
<van-divider :style="{ margin: 0 }"></van-divider>
......@@ -85,7 +95,7 @@
<div style="margin: 16px;">
<van-button square block type="info" native-type="submit" @click="registSystem()">注册</van-button>
<van-button square block type="info" style="background-color: #3672F1;border-radius: 5px;" native-type="submit" @click="registSystem()">注册</van-button>
</div>
</van-form>
<!-- <van-radio name="1" shape="square" v-model ="radio" @click="returen()">
......@@ -93,7 +103,7 @@
</van-radio> -->
<div>
<van-checkbox v-model="checked" shape="square" style="padding:0% 4%;">
<span>本人已阅读<a href="#">《线上金融服务平台注册服务协议》</a></span>
<span >本人已阅读<a style="color: #3672F1;" href="#">《线上金融服务平台注册服务协议》</a></span>
</van-checkbox>
</div>
</div>
......
src/views/main/Main.vue
浏览文件 @ 281cb1d5
......@@ -8,7 +8,7 @@
-->
<template>
<div class="d-page d-flex flex-column" style="background-color: linear-gradient(to bottom, #0B54E0 50px , #ffffff); padding-bottom:20px;">
<div class="d-page d-flex flex-column" style="background-color: linear-gradient(to bottom, #0B54E0 , #ffffff); padding-bottom:20px;">
<div class="rarle">
<tools-bar :title="tatleName" style="width: 100%; height: calc(25vh)">
</tools-bar>
......
src/views/main/MainView.vue
浏览文件 @ 281cb1d5
......@@ -7,7 +7,7 @@
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="d-page d-flex flex-column" style=" background-color: #ebedf0 ">
<div class="d-page d-flex flex-column" style=" background-color: #ebedf0; ">
<Main v-if="showFlag"></Main>
<MyPage v-if="!showFlag"></MyPage>
<div >
......
src/views/workbench/PersonLod.vue
浏览文件 @ 281cb1d5
......@@ -11,7 +11,7 @@
<div>
<div class="rarle">
<tatle-bar :tatle="tatleName"></tatle-bar>
<tatle-bar :tatle="tatleName" style="background: #0B54E0"></tatle-bar>
</div>
<van-row type="flex" class="iconImg">
<van-col span="24">
......@@ -119,6 +119,9 @@ export default class PersonLod extends Vue {
},
})
}
retyen(){
this.$router.back();
}
modifyPassword(){
this.$router.push({
......
src/views/workbench/modifyInfo.vue
浏览文件 @ 281cb1d5
......@@ -11,7 +11,7 @@
<div>
<div class="rarle">
<tatle-bar :tatle="tatleName"></tatle-bar>
<tatle-bar :tatle="tatleName" style="background: #0B54E0"></tatle-bar>
</div>
<van-row type="flex" class="iconImg">
<van-col span="24">
......
src/views/workbench/modifyPassword.vue
浏览文件 @ 281cb1d5
......@@ -11,7 +11,7 @@
<div>
<div class="rarle">
<tatle-bar :tatle="tatleName"></tatle-bar>
<tatle-bar :tatle="tatleName" style="background: #0B54E0"></tatle-bar>
</div>
<van-row type="flex" class="iconImg">
<van-col span="24">
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或