diff --git a/common/locales/en.js b/common/locales/en.js index 9a40d3b..db38101 100644 --- a/common/locales/en.js +++ b/common/locales/en.js @@ -56,6 +56,8 @@ export default { Countryinput:'Please select a country', Company:'Company', Companyinput:'Go locate it', + CustomerScreening:'Customer Screening', + }, mine: { desc: 'This is template page', @@ -88,6 +90,9 @@ export default { call:'Call', delete:'Delete', all:'All', + tday:'the same day', + threeday:'In the past three days', + sevenday:'In the past seven days', followup:'Follow up', deal:'Deal', lost:'Lost', diff --git a/common/locales/zh.js b/common/locales/zh.js index 9206d26..a43c365 100644 --- a/common/locales/zh.js +++ b/common/locales/zh.js @@ -10,7 +10,6 @@ export default { addfollowup:'添加跟进', userList:'客户管理', persondata:'个人资料', - }, home: { desc: '首页', @@ -56,6 +55,7 @@ export default { Countryinput:'请选择国家', Company:'公司', Companyinput:'去定位', + CustomerScreening:'客户筛选' }, mine: { @@ -89,6 +89,9 @@ export default { call:'呼叫', delete:'删除', all:'全部', + tday:'当天', + threeday:'近三天', + sevenday:'近七天', followup:'跟进中', deal:'已成交', lost:'已丢失', diff --git a/pages/index/customer.vue b/pages/index/customer.vue index eaea4ac..44df236 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -46,7 +46,7 @@ - + {{$t('prompt')}} @@ -83,16 +83,16 @@ del_id:'', columns:[ [{ - label: '全部', + label: this.$t('all'), id:'' },{ - label: '当天跟进客户', + label:this.$t('tday'), id: 0 }, { - label: '近三天跟进客户', + label: this.$t('threeday'), id: 1 }, { - label: '近七天跟进客户', + label: this.$t('sevenday'), id: 2 }] ], diff --git a/pages/index/mine.vue b/pages/index/mine.vue index 5a6a5a9..e66b1ed 100644 --- a/pages/index/mine.vue +++ b/pages/index/mine.vue @@ -22,39 +22,41 @@ {{$t('mine.msg')}} - - + + 9 + + {{$t('mine.cpassword')}} - + {{$t('mine.contact')}} - + {{$t('mine.feedback')}} - + {{$t('mine.about')}} - + {{$t('mine.logoff')}} - + {{$t('mine.logout')}} - + @@ -125,9 +127,14 @@ uni-page-body { background-color: #F6F6F6 !important; } - .u-badge--not-dot{ - padding: 5px 8px; - margin-right: 20px; + .badge{ + padding: 5px 10px; + margin-right: 30px; + display: inline-block; + text-align: center; + background-color: #ff3d40; + color: white; + border-radius: 50%; } .contents{ background-image: url("/static/image/mine/bg.png"); @@ -202,16 +209,6 @@ font-size: 36rpx; border-bottom: 2rpx solid #F3F3F3; } - .sonContent1{ - background: #FFFFFF; - border-radius: 22rpx; - text-align: center; - font-size: 28rpx; - font-weight: 400; - padding: 32rpx 28rpx; - color: #515151; - margin-bottom: 10px; - } .sonContent { background: #FFFFFF; border-radius: 22rpx; @@ -226,6 +223,12 @@ padding: 32rpx 28rpx; color: #000; margin-bottom: 10px; + position: relative; + .icon{ + position: absolute; + right: -15px; + top: 32%; + } .son-img-bg { width: 24px; height: 24px; diff --git a/pages/mine/about.vue b/pages/mine/about.vue index 3cfce10..37b0bf7 100644 --- a/pages/mine/about.vue +++ b/pages/mine/about.vue @@ -1,7 +1,7 @@