Skip to content

H
hls-xcmg-vue-app
Commit 9f0f2a61 authored by 李晓兵's avatar 李晓兵
Browse files
Options

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents 10a95101 86410f0d
Hide whitespace changes
Inline Side-by-side
Showing with 277 additions and 4 deletions
src/pages/distributorSign/financ-details.vue
View file @ 9f0f2a61
...@@ -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-27 18:07:12 * @Date: 2019-09-27 18:07:12
* @LastEditTime: 2019-09-30 14:34:43 * @LastEditTime: 2019-10-10 11:55:05
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -158,6 +158,7 @@ export default { ...@@ -158,6 +158,7 @@ export default {
font-size: 12px; font-size: 12px;
height: 12px; height: 12px;
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
margin-right: 40px;
} }
.line::before { .line::before {
content: ""; content: "";
......
src/pages/home.vue
View file @ 9f0f2a61
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-09-24 12:34:06
* @LastEditors: your name
-->
<template> <template>
<h-view id="home" class="public-style" title="车租易"> <h-view id="home" class="public-style" title="车租易">
<h-content :cal-content="false" class="content scroll-content"> <h-content :cal-content="false" class="content scroll-content">
......
src/pages/home/home-page.vue 0 → 100644
View file @ 9f0f2a61
<!--
* @Descrip""/>User Settings Edit
* @Author: your name
* @Date: 2019-10-10 14:25:15
* @LastEditTime: 2019-10-10 17:30:37
* @LastEditors: Please set LastEditors
-->
<template>
<h-view id="homePage" class="public-style" title="徐工租赁">
<h-header class="bar-custom">
<div slot="left" class="h-header-btn">
<!-- <i class="ion-ios-arrow-back" /> -->
<span>徐州</span>
</div>
<div slot="center">徐工租赁</div>
</h-header>
<h-content>
<swipe :interval="5000" class="hls-swipe">
<swipe-item class="hls-swipe">
<img src="@/assets/homePage/banner1.png" alt="">
</swipe-item>
<swipe-item class="hls-swipe">
<img src="@/assets/homePage/banner2.png" alt="">
</swipe-item>
</swipe>
<div class="function">
<function-item
v-for="(item,index) in functionList" :key="index" :functionIcon="item.functionIcon"
:functionName="item.functionName"
:data="item" class="function-item vue-1px" @clickFunction="goFunctionHome"/>
</div>
<div class="center-pic">
<div class="left-pic">
<img src="@/assets/homePage/1 copy@2x.png" alt="">
</div>
<div class="right-pic">
<img src="@/assets/homePage/2 copy@2x.png" alt="">
<img src="@/assets/homePage/3 copy@2x.png" alt="">
</div>
</div>
<div class="guessing">
猜你喜欢
</div>
<list-item :item-height="110">
<item>
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
</div>
<div slot="content" class="item-content">
<div class="top">***起重机 <span class="hot">热门</span></div>
<div class="center">经销商 <span class="seconds">xxx代理商</span></div>
<div class="center">参数项 <span class="seconds">GTZ226</span></div>
<div class="center">地址 <span class="seconds">江苏省徐州市云龙区</span></div>
</div>
</item>
<item>
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG3 Copy@2x.png" alt="">
</div>
<div slot="content" class="item-content">
<div class="top">***起重机 <span class="hot">热门</span></div>
<div class="center">经销商 <span class="seconds">xxx代理商</span></div>
<div class="center">参数项 <span class="seconds">GTZ226</span></div>
<div class="center">地址 <span class="seconds">江苏省徐州市云龙区</span></div>
</div>
</item>
</list-item>
</h-content>
</h-view>
</template>
<script>
export default {
name: 'HomePage',
data () {
return {
functionList: [
{
functionIcon: require('@/assets/userBind/np.png'),
functionName: '用户绑定',
functionState: 'UserBind',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '绑定查询',
functionState: 'NaturePersonReadOnly',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '进件审批',
functionState: 'IntoList',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '经销商签约',
functionState: 'ContractList',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '合同签约',
functionState: 'ContractSigning',
},
],
}
},
computed: {},
watch: {},
methods:
{
goFunctionHome (data) {
if (data.functionState === 'NaturePersonReadOnly') {
if (this.user_bp_status === 'APPROVED' && this.user_bp_class === 'NP') {
this.$router.push({
name: 'NaturePersonReadOnly',
params: {
'bp_id': this.bp_id,
},
})
} else if (this.user_bp_status === 'APPROVED' && this.user_bp_class === 'ORG') {
this.$router.push({
name: 'EnterpriseReadOnly',
params: {
'bp_id': this.bp_id,
},
})
} else {
this.hlsPopup.showLongCenter('您的绑定申请还在流程中')
}
} else {
this.$router.push({
name: data.functionState,
})
}
},
},
}
</script>
<style lang='less' scoped>
#homePage {
.hls-swipe {
height: 208px;
width: 100vw;
// overflow: hidden;
img {
width: 100vw;
height: 100%;
}
}
.function{
display: flex;
flex-wrap: wrap;
.function-item {
width: 25%;
height: 89px;
font-size: 12px;
// border: 1px solid rgba(169,169,169,0.1); /*no*/
/deep/ img {
height: 30px;
width: 30px;
margin: 23px 28px 9px 33px;
}
// &:before {
// .setBottomLine();
// }
// &:after {
// .setRightLine();
// }
}
}
.center-pic {
width: 100%;
height: 228px;
display: flex;
flex-direction: row;
.left-pic {
width: 41.6%;
margin-left: 4px;
img {
width: 100%;
}
}
.right-pic {
width: 55.2%;
display: flex;
flex-direction: column;
margin-left: 4px;
img {
width: 100%;
}
img:nth-of-type(2) {
margin-top: 4px;
}
}
}
.guessing {
// width: 67px;
height: 22px;
font-family: PingFangSC-Semibold;
font-size: 16px;
color: #00469C;
font-weight: 600;
letter-spacing: 0.57px;
padding: 8px 0 8px 12px;
background: #fff;
box-sizing:content-box
}
.item-pic {
width: 110px;
height: 110px;
img {
width: 100%;
height: 100%;
}
}
.item-content {
width: 90%;
height: 110px;
// border: 1px solid #ccc;
.top {
font-family: PingFangSC-Semibold;
font-size: 16px;
color: #00469C;
letter-spacing: 0.57px;
font-weight: 600;
margin-top: 10px;
.hot {
border: 1px solid #FF8214;
border-radius: 2px;
font-family: PingFangSC-Semibold;
font-size: 11px;
color: #FF8214;
letter-spacing: 0.46px;
}
}
.center {
margin-top: 6px;
font-family: PingFangSC-Semibold;
font-size: 13px;
color: rgba(56,63,69,0.60);
letter-spacing: 0.5px;
.seconds {
margin-left: 16px;
font-weight: 600;
font-family: PingFangSC-Semibold;
font-size: 13px;
color: #383F45;
letter-spacing: 0.5px;
}
// .seconds:nth-of-type(3) {
// margin-left: 24px;
// }
}
}
}
</style>
src/pages/userBind/org/enterprise.vue
View file @ 9f0f2a61
...@@ -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-10-09 13:00:51 * @LastEditTime: 2019-10-10 13:53:36
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -341,7 +341,7 @@ export default { ...@@ -341,7 +341,7 @@ export default {
if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') { if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
vm.type = '请输入业务经办员工代码' vm.type = '请输入业务经办员工代码'
vm.typeName = '业务经办人' vm.typeName = '业务经办人'
vm.baseInfo.agent_username = 'BP003020' vm.baseInfo.agent_username = ''
} else if ( } else if (
vm.baseInfo.bp_type === 'AGENT' || vm.baseInfo.bp_type === 'AGENT' ||
vm.baseInfo.bp_type === 'OFFICE' || vm.baseInfo.bp_type === 'OFFICE' ||
......
src/router/index.js
View file @ 9f0f2a61
...@@ -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-24 12:34:06 * @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-09-30 09:05:12 * @LastEditTime: 2019-10-10 14:35:58
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
*/ */
import Vue from 'vue' import Vue from 'vue'
...@@ -15,6 +15,7 @@ import PwdForgot from '@/pages/pwd-forgotten' ...@@ -15,6 +15,7 @@ import PwdForgot from '@/pages/pwd-forgotten'
import FingerLogin from '@/pages/finger-login' import FingerLogin from '@/pages/finger-login'
import Home from '@/pages/home' import Home from '@/pages/home'
import Tab from '@/pages/tab' import Tab from '@/pages/tab'
import HomePage from '@/pages/home/home-page'
// 我的 // 我的
import MyInfo from '@/pages/myInfo/my-info' import MyInfo from '@/pages/myInfo/my-info'
...@@ -79,6 +80,13 @@ export default new Router({ ...@@ -79,6 +80,13 @@ export default new Router({
], ],
}, },
{
path: '/home-page',
component: HomePage,
name: 'HomePage',
meta: {keepAlive: true},
},
{ {
path: '/guide', path: '/guide',
component: Guide, component: Guide,
......
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