Skip to content

H
hls-xcmg-vue-app
Commit 00fabd3c authored by linxin's avatar linxin
Browse files
Options

add

parents 3a25cd57 afae2c13
Expand all Show whitespace changes
Inline Side-by-side
Showing with 621 additions and 989 deletions
src/pages/distributorSign/contract-details.vue
View file @ 00fabd3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Description: 合同详情 * @Description: 合同详情
* @Author: your name * @Author: your name
* @Date: 2019-09-25 15:38:21 * @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-09-27 14:38:47 * @LastEditTime: 2019-09-29 10:47:02
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -83,51 +83,51 @@ ...@@ -83,51 +83,51 @@
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item> <item>
<div slot="name" class="font-color">商务政策</div> <div slot="name" class="font-color">商务政策</div>
<input slot="content" placeholder="零手续费产品" > <input slot="content" v-model="info.product_plan_id_n" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">设备总价</div> <div slot="name" class="font-color">设备总价</div>
<input slot="content" placeholder="150,000.00" > <input slot="content" v-model="info.equip_price" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">融资金额</div> <div slot="name" class="font-color">融资金额</div>
<input slot="content" placeholder="100,000.00" > <input slot="content" v-model="info.finance_amount" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">首付款</div> <div slot="name" class="font-color">首付款</div>
<input slot="content" placeholder="50,000.00" > <input slot="content" v-model="info.down_payment" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">保证金比例</div> <div slot="name" class="font-color">保证金比例</div>
<input slot="content" placeholder="10%" > <input slot="content" v-model="info.deposit_ratio" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">保证金</div> <div slot="name" class="font-color">保证金</div>
<input slot="content" placeholder="150,000.00" > <input slot="content" v-model="info.deposit" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">手续费比例</div> <div slot="name" class="font-color">手续费比例</div>
<input slot="content" placeholder="5%" > <input slot="content" v-model="info.lease_charge_ratio">
</item> </item>
<item> <item>
<div slot="name" class="font-color">手续费</div> <div slot="name" class="font-color">手续费</div>
<input slot="content" placeholder="7,500.00" > <input slot="content" v-model="info.lease_charge" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">预计付款日</div> <div slot="name" class="font-color">预计付款日</div>
<input slot="content" placeholder="2019-08-01" > <input slot="content" v-model="info.pre_pay_date" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">还款周期</div> <div slot="name" class="font-color">还款周期</div>
<input slot="content" placeholder="月" > <input slot="content" v-model="info.annual_pay_times" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">租赁期数</div> <div slot="name" class="font-color">租赁期数</div>
<input slot="content" placeholder="6" > <input slot="content" v-model="info.lease_times" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">年利率</div> <div slot="name" class="font-color">年利率</div>
<input slot="content" placeholder="6.5%" > <input slot="content" v-model="info.int_rate" >
</item> </item>
</list-item> </list-item>
<div class="repay-plan"> <div class="repay-plan">
...@@ -137,15 +137,15 @@ ...@@ -137,15 +137,15 @@
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item> <item>
<div slot="name" class="font-color">参数项</div> <div slot="name" class="font-color">参数项</div>
<input slot="content" placeholder="GTZ226" > <input slot="content" v-model="info.product_id" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">产品线</div> <div slot="name" class="font-color">产品线</div>
<input slot="content" placeholder="起重机" > <input slot="content" v-model="info.division" >
</item> </item>
<item> <item>
<div slot="name" class="font-color">产品数量</div> <div slot="name" class="font-color">产品数量</div>
<input slot="content" placeholder="10" > <input slot="content" v-model="info.product_num" >
</item> </item>
</list-item> </list-item>
...@@ -209,12 +209,29 @@ export default { ...@@ -209,12 +209,29 @@ export default {
}, },
data () { data () {
return { return {
info: {},
tabNum: 0, tabNum: 0,
bp_flag: false, bp_flag: false,
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {
tabNum () {
if (this.tabNum === 1) {
let vm = this
let url = $config.basePath + 'prj_lease_query'
let param = {
project_id: '503',
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('result', res)
if (res.result === 'S') {
vm.info = res.info
}
})
}
},
},
methods: methods:
{ {
getTabNum (i) { getTabNum (i) {
......
src/pages/distributorSign/contract-list.vue
View file @ 00fabd3c
...@@ -13,32 +13,32 @@ ...@@ -13,32 +13,32 @@
</div> </div>
</h-header> </h-header>
<Tab @getTabNum="getTabNum" /> <Tab @getTabNum="getTabNum" />
<h-content>
<div class="hinput"> <div class="hinput">
<div class="search-box"> <div class="search-box">
<input type="text" placeholder="请输入进件号/承租人名称"> <input type="text" placeholder="请输入进件号/承租人名称">
<img src="@/assets/distributorSign/search.png" alt=""> <img src="@/assets/distributorSign/search.png" alt="">
</div> </div>
</div> </div>
<div v-for="(item,index) in contractMsg" :key="index" class="contract-list"> <h-content>
<div v-for="(item,index) in lists" :key="index" class="contract-list">
<div class="item"> <div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt=""> <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p> <p class="incoming-num">进件号</p>
<p class="code">{{ item.code }}</p> <p class="code">{{ item.project_number }}</p>
</div> </div>
<div class="details" @click="goDetails(index)"> <div class="details" @click="goDetails(index)">
<div class="option"> <div class="option">
<p class="name">承租人</p> <p class="name">承租人</p>
<p class="full-name normal">{{ item.name }}</p> <p class="full-name normal">{{ item.bp_name }}</p>
</div> </div>
<div class="option"> <div class="option">
<p class="name">合同租金</p> <p class="name">合同租金</p>
<p class="normal money">{{ item.money }}</p> <p class="normal money">{{ item.finance_amount }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt="" @click="goDetails(index)"> <img src="@/assets/distributorSign/goDetails.png" alt="" @click="goDetails(item)">
</div> </div>
<div class="option"> <div class="option">
<p class="name">申请时间</p> <p class="name">申请时间</p>
<p class="normal">{{ item.date }}</p> <p class="normal">{{ item.confirm_start_date }}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -56,31 +56,20 @@ export default { ...@@ -56,31 +56,20 @@ export default {
data () { data () {
return { return {
tabNum: 0, tabNum: 0,
contractMsg: [ lists: [],
{name: '张三', money: 9000000, date: '2019-03-1', code: '201903022001'},
{name: '李四', money: 9000000, date: '2019-03-1', code: '201903022002'},
{name: '王五', money: 9000000, date: '2019-03-1', code: '201903022003'},
{name: '赵六', money: 9000000, date: '2019-03-1', code: '201903022004'},
{name: '张三', money: 9000000, date: '2019-03-1', code: '201903022001'},
{name: '李四', money: 9000000, date: '2019-03-1', code: '201903022002'},
{name: '王五', money: 9000000, date: '2019-03-1', code: '201903022003'},
{name: '赵六', money: 9000000, date: '2019-03-1', code: '201903022004'},
],
} }
}, },
created () { created () {
// let url = $config.basePath + 'bp_org_bind_save'
// let param = {
// 'master': vm.saveInfo,
// }
// vm.hlsHttp.post(url, param).then(function (res) {
let vm = this let vm = this
let url = $config.basePath + 'prj_confirm_list_query' let url = $config.basePath + 'prj_confirm_list_query'
let param = { let param = {
user_phone: '18945220871', user_phone: '18507155349',
} }
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
console.log(res.result) console.log(res.result)
if (res.result === 'S') {
vm.lists = res.lists
}
}) })
}, },
methods: { methods: {
...@@ -142,12 +131,15 @@ export default { ...@@ -142,12 +131,15 @@ export default {
} }
} }
} }
.content{
padding-bottom: 14px;
}
.contract-list { .contract-list {
width: 100%; width: 100%;
height: 120px; height: 120px;
// border: 1px solid #ccc; // border: 1px solid #ccc;
background: #fff; background: #fff;
margin-bottom: 8px; //margin-bottom: 8px;
.item { .item {
width: 100%; width: 100%;
height: 34px; height: 34px;
...@@ -182,8 +174,8 @@ export default { ...@@ -182,8 +174,8 @@ export default {
height: 86px; height: 86px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-evenly; justify-content: space-around;
padding: 6px 0;
.option { .option {
width: 100%; width: 100%;
height: 18px; height: 18px;
......
src/pages/intoApproval/intoList.vue
View file @ 00fabd3c
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
</div> </div>
</h-header> </h-header>
<Tab @getTabNum="getTabNum" /> <Tab @getTabNum="getTabNum" />
<h-content>
<div class="hinput"> <div class="hinput">
<div class="search-box"> <div class="search-box">
<input type="text" placeholder="请输入进件号/承租人名称"> <input type="text" placeholder="请输入进件号/承租人名称">
<img src="@/assets/distributorSign/search.png" alt=""> <img src="@/assets/distributorSign/search.png" alt="">
</div> </div>
</div> </div>
<div v-for="(item,index) in contractMsg" :key="index" class="contract-list" @click="goDetails(item)"> <h-content>
<div v-for="(item,index) in contractMsg" :key="index" class="contract-list">
<div class="item"> <div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt=""> <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p> <p class="incoming-num">进件号</p>
...@@ -135,6 +135,9 @@ export default { ...@@ -135,6 +135,9 @@ export default {
} }
} }
} }
.content{
padding-bottom: 14px;
}
.contract-list { .contract-list {
width: 100%; width: 100%;
height: 120px; height: 120px;
...@@ -175,13 +178,13 @@ export default { ...@@ -175,13 +178,13 @@ export default {
height: 86px; height: 86px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-evenly; justify-content: space-around;
padding: 6px 0;
.option { .option {
width: 100%; width: 100%;
height: 18px; height: 18px;
display: flex; display: flex;
flex-basis: row; flex-direction: row;
.name { .name {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 13px; font-size: 13px;
...@@ -189,7 +192,7 @@ export default { ...@@ -189,7 +192,7 @@ export default {
width: 80px; width: 80px;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
padding-left: 20px; text-align: right
} }
.normal { .normal {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
......
src/pages/login.vue
View file @ 00fabd3c
<template> <template>
<scroll id="login" ref="scroll" class="content"> <scroll id="login" ref="scroll" class="content">
<div> <div class="bird-icon"/>
<div class="bird-icon"><img src="../assets/image/login/bird-icon.png"></div> <div class="login-wrap">
<div class="pwd"> <div class="pwd">
<div class="pwd-icon"><img src="../assets/image/login/user.png"></div> <div class="pwd-icon"><img src="../assets/login/user.png"></div>
<div class="pwd-input"><input v-model="username" type="text" placeholder="请输入用户名/手机号"></div> <div class="pwd-input"><input v-model="username" type="text" placeholder="请输入用户名/手机号"></div>
<div v-if="username" class="delete" @click="clearAccount"><img src="../assets/image/login/delete.png"></div> <div v-if="username" class="delete" @click="clearAccount"><img src="../assets/login/delete.png"></div>
</div> </div>
<div class="pwd"> <div class="pwd">
<div class="pwd-icon"><img src="../assets/image/login/password.png"></div> <div class="pwd-icon"><img src="../assets/login/password.png"></div>
<div class="pwd-input"><input v-model="password" type="password" placeholder="请输入密码"></div> <div class="pwd-input"><input v-model="password" :type="pwdType" placeholder="请输入密码"></div>
<div v-if="password" class="delete" @click="clearPassword"><img src="../assets/image/login/delete.png"></div> <div v-if="password" class="delete" @click="changeType"><img :src="openEye"></div>
</div> </div>
<div class="button submit" @click="access">登录</div>
<div class="other-function"> <div class="other-function">
<div class="register" @click="registerNew">用户注册</div> <div class="register" @click="registerNew">注册</div>
<div class="pwd-forgotten" @click="pwdForgotten">忘记密码</div> <div class="pwd-forgotten" @click="pwdForgotten">忘记密码？</div>
</div> </div>
<div class="button submit" @click="access">登录</div>
</div> </div>
</scroll> </scroll>
</template> </template>
...@@ -26,6 +27,8 @@ var CryptoJS = require('crypto-js') ...@@ -26,6 +27,8 @@ var CryptoJS = require('crypto-js')
export default { export default {
data () { data () {
return { return {
pwdType: 'password', // 密码类型
openEye: require('@/assets/login/passNoShow.png'), // 图片地址
username: window.localStorage.username ? window.localStorage.username : '', username: window.localStorage.username ? window.localStorage.username : '',
password: '', password: '',
version: process.env.currentVersion, version: process.env.currentVersion,
...@@ -33,42 +36,41 @@ export default { ...@@ -33,42 +36,41 @@ export default {
} }
}, },
methods: { methods: {
changeType () {
this.pwdType = this.pwdType === 'password' ? 'text' : 'password'
this.openEye = this.pwdType === 'password' ? require('@/assets/login/passNoShow.png') : require('@/assets/login/passShow.png')
},
login: function () { login: function () {
let vm = this let vm = this
vm.$router.push('tab')
/* let vm = this
// debugger;
// vm.password = CryptoJS.MD5(vm.password).toString().toUpperCase(); // vm.password = CryptoJS.MD5(vm.password).toString().toUpperCase();
let md5passwprd = CryptoJS.MD5(vm.password).toString().toUpperCase() let md5passwprd = CryptoJS.MD5(vm.password).toString().toUpperCase()
let param = { let param = {
'user_name': vm.username, 'phone': vm.username,
'user_password': md5passwprd, 'password': md5passwprd,
'platform': 'C',
} }
vm.$post(process.env.basePath + 'tc_app_login', param) vm.$post(process.env.basePath + 'app_login', param)
.then(function (res) { .then(function (res) {
if (res.result === 'S') { if (res.result === 'S') {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
window.localStorage.setItem('username', vm.username.toUpperCase()) window.localStorage.setItem('user_phone', vm.username)
window.localStorage.setItem('password', md5passwprd) window.localStorage.setItem('password', md5passwprd)
window.localStorage.setItem('user_id', res.user_id) /* if (res.bp_id && res.bp_id !== 'undefined') {
if (res.bp_id && res.bp_id !== 'undefined') {
window.localStorage.setItem('bp_id', res.bp_id) window.localStorage.setItem('bp_id', res.bp_id)
} } */
// if (vm.routeName) { // if (vm.routeName) {
// vm.$router.push({name: vm.routeName}) // vm.$router.push({name: vm.routeName})
// } else { // } else {
vm.$router.push('tab') vm.$router.push('tab')
// } // }
let tagOption = { /* let tagOption = {
'username': vm.username.toUpperCase(), 'username': vm.username.toUpperCase(),
'user_id': res.user_id, 'user_id': res.user_id,
} }
vm.Jpush._jpush_config(tagOption) vm.Jpush._jpush_config(tagOption) */
} }
// 极光推送 // 极光推送
})*/ })
}, },
access: function () { access: function () {
let vm = this let vm = this
...@@ -105,77 +107,32 @@ export default { ...@@ -105,77 +107,32 @@ export default {
<style lang="less" scoped type="text/less"> <style lang="less" scoped type="text/less">
#login { #login {
background: url("../assets/image/login/bg@2x.png") no-repeat; background: url("../assets/login/bg@2x.png") no-repeat;
background-size: cover; background-size: cover;
background-position-x: 0px; background-position-x: 0px;
color: #FFFFFF; color: #FFFFFF;
width: 100%; width: 100%;
height: 100%; height: 100%;
margin: 0 auto; margin: 0 auto;
.bird-icon { .scrollContent{
padding-top: 25%;
width: 100%;
display: flex; display: flex;
display: -webkit-flex;
justify-content: center; justify-content: center;
-webkit-justify-content: center;
img {
width: 138px;
height: 48px;
}
}
.login {
border-bottom: 1px solid #5D98F6;
display: flex;
display: -webkit-flex;
margin: 15% auto 0;
width: 250px;
justify-content: center;
.person-icon {
margin-bottom: 9px;
margin-right: 15px;
margin-left: 3px;
img {
width: 18px;
height: 20px;
}
}
.admin-input {
//width: 380px;
height: 25px;
display: flex;
display: -webkit-flex;
align-items: center; align-items: center;
-webkit-align-items: center;
input {
width: 100%;
height: 100%;
font-size: 16px;
color: #9e9e9e;
margin-bottom: 5px;
line-height: 22px;
}
input::-webkit-input-placeholder {
font-size: 16px;
color: #CDD1D3;
}
}
.delete {
img {
margin-top: 5px;
width: 12px;
height: 12px;
} }
.bird-icon{
padding-top: 25%;
} }
.login-wrap{
width: 100%;
margin-top: 60%;
} }
.pwd { .pwd {
border-bottom: 1px solid #5D98F6; border-bottom: 1px solid #5D98F6;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
margin: 15% auto 0; margin: 5% 0 5% 14%;
width: 250px;
.pwd-icon { .pwd-icon {
margin-bottom: 9px; margin-bottom: 6px;
margin-right: 15px; margin-right: 15px;
margin-left: 3px; margin-left: 3px;
img { img {
...@@ -184,19 +141,21 @@ export default { ...@@ -184,19 +141,21 @@ export default {
} }
} }
.pwd-input { .pwd-input {
//width: 380px; margin-left: 4%;
height: 25px; width: 100%;
margin-bottom: 10px;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
align-items: center; align-items: center;
-webkit-align-items: center; -webkit-align-items: center;
// background-color: #0057C3 !important;
input { input {
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 16px; font-size: 16px;
color: #9e9e9e; color: #fff;
line-height: 22px; line-height: 22px;
margin-bottom: 5px; background-color: rgba(0,87,195,0) !important;
} }
input::-webkit-input-placeholder { input::-webkit-input-placeholder {
font-size: 16px; font-size: 16px;
...@@ -205,19 +164,20 @@ export default { ...@@ -205,19 +164,20 @@ export default {
} }
.delete { .delete {
img { img {
margin-right: 20px;
margin-top: 5px; margin-top: 5px;
width: 12px; width: 14px;
height: 12px; height: 14px;
} }
} }
} }
.other-function { .other-function {
width: 250px; width: 64%;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
justify-content: space-between; justify-content: space-between;
-webkit-justify-content: space-between; -webkit-justify-content: space-between;
margin: 8% auto 0; margin: 0 0 0 23%;
.register { .register {
color: #5D98F6; color: #5D98F6;
font-size: 15px; font-size: 15px;
...@@ -228,14 +188,14 @@ export default { ...@@ -228,14 +188,14 @@ export default {
} }
} }
.submit { .submit {
width: 250px;
opacity: 1; opacity: 1;
background-color: #5D98F6; background: #FDFDFD;
border-radius: 4px; border-radius: 8px 0 0 8px;
height: 40px; height: 50px;
margin: 22% auto 0; margin: 10% 0 6% 14%;
font-size:16px; font-size:16px;
color: #FEFEFE; color: #000000;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
justify-content: center; justify-content: center;
......
src/pages/pwd-forgotten.vue
View file @ 00fabd3c
This diff is collapsed.
src/pages/regiester.vue
View file @ 00fabd3c
This diff is collapsed.
src/pages/userBind/org/enterprise.vue
View file @ 00fabd3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @Author: your name * @Author: your name
* @Date: 2019-09-19 09:31:19 * @Date: 2019-09-19 09:31:19
* @LastEditTime: 2019-09-29 09:25:38 * @LastEditTime: 2019-09-29 11:38:23
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -494,9 +494,9 @@ export default { ...@@ -494,9 +494,9 @@ export default {
// } // }
// 校验基本信息 // 校验基本信息
if (this.bpClass_flag) { if (this.bpClass_flag) {
delete this.lastInfo.business_license_num delete this.baseInfo.business_license_num
for (var key in vm.lastInfo) { for (var key in vm.baseInfo) {
if (!vm.lastInfo[key]) { if (!vm.baseInfo[key]) {
console.log('key', key, vm.bpClass) console.log('key', key, vm.bpClass)
switch (key) { switch (key) {
case 'bp_type': case 'bp_type':
...@@ -558,11 +558,11 @@ export default { ...@@ -558,11 +558,11 @@ export default {
vm.msg_flag = true vm.msg_flag = true
} }
} }
this.lastInfo.business_license_num = '' this.baseInfo.business_license_num = ''
} else { } else {
delete this.lastInfo.agent_username delete this.baseInfo.agent_username
for (var key1 in vm.lastInfo) { for (var key1 in vm.baseInfo) {
if (!vm.lastInfo[key1]) { if (!vm.baseInfo[key1]) {
console.log('key', key1) console.log('key', key1)
switch (key1) { switch (key1) {
case 'bp_type': case 'bp_type':
...@@ -624,7 +624,7 @@ export default { ...@@ -624,7 +624,7 @@ export default {
vm.msg_flag = true vm.msg_flag = true
} }
} }
this.lastInfo.agent_username = '' this.baseInfo.agent_username = ''
} }
// if (!vm.bp_type_flag) { // if (!vm.bp_type_flag) {
......
src/pages/userBind/org/invoiceInfo.vue
View file @ 00fabd3c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @Author: your name * @Author: your name
* @Date: 2019-09-20 09:35:11 * @Date: 2019-09-20 09:35:11
* @LastEditTime: 2019-09-29 09:25:50 * @LastEditTime: 2019-09-29 11:25:28
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<div slot="name" class="font-color">纳税人识别号</div> <div slot="name" class="font-color">纳税人识别号</div>
<input <input
slot="content" slot="content"
v-model="invoiceInfo.organization_code" :placeholder="orgCode" type="text" v-model="invoiceInfo.organization_code" :placeholder="orgCode" type="text" readonly
> >
</item> </item>
<!-- <p>{{ organization_code }}</p> --> <!-- <p>{{ organization_code }}</p> -->
......
src/router/index.js
View file @ 00fabd3c
...@@ -49,7 +49,8 @@ export default new Router({ ...@@ -49,7 +49,8 @@ export default new Router({
{ {
path: '/', path: '/',
redirect: to => { redirect: to => {
if (!window.localStorage.needGuid || window.localStorage.needGuid === 'true') { return {name: 'Login'}
/* if (!window.localStorage.needGuid || window.localStorage.needGuid === 'true') {
return {name: 'Guide'} return {name: 'Guide'}
} else { } else {
if (window.localStorage.isOpenFingerLogin) { if (window.localStorage.isOpenFingerLogin) {
...@@ -58,7 +59,7 @@ export default new Router({ ...@@ -58,7 +59,7 @@ export default new Router({
// if none of the above states are matched, use this as the fallback // if none of the above states are matched, use this as the fallback
return {name: 'Login'} return {name: 'Login'}
} }
} } */
}, },
}, },
{ {
...@@ -110,7 +111,7 @@ export default new Router({ ...@@ -110,7 +111,7 @@ export default new Router({
{path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}}, {path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},
{path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}}, {path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}},
// 经销商签约 // 经销商签约
{path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}}, {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}},
{path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}}, {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
{path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}}, {path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}},
// 合同签约 // 合同签约
......
src/styles/mixin.less
View file @ 00fabd3c
...@@ -24,10 +24,6 @@ ...@@ -24,10 +24,6 @@
font-size: @size; font-size: @size;
color: @color; color: @color;
} }
//字体大小、行高、字体
.font(@size, @line-height, @family: 'Microsoft YaHei') {
font: #{@size}/#{@line-height} @family;
}
//字体大小，颜色 //字体大小，颜色
.sc(@size, @color){ .sc(@size, @color){
font-size: @size; font-size: @size;
...@@ -43,6 +39,9 @@ ...@@ -43,6 +39,9 @@
.border-right{ .border-right{
border-right: 1px solid rgba(1, 17, 27, 0.1); border-right: 1px solid rgba(1, 17, 27, 0.1);
} }
.border-left{
border-left: 1px solid rgba(1, 17, 27, 0.1);
}
.border{ .border{
border: 1px solid rgba(1, 17, 27, 0.1); border: 1px solid rgba(1, 17, 27, 0.1);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment