diff --git a/common/locales/en.js b/common/locales/en.js
index 28ec83f..f9d3fe6 100644
--- a/common/locales/en.js
+++ b/common/locales/en.js
@@ -2,6 +2,7 @@ export default {
// 可以以页面为单位来写,比如首页的内容,写在index字段,个人中心写在center,共同部分写在common部分
tabbar: {
home: 'home',
+ highseas: 'HighSeas',
customer: 'customer',
mine: 'mine'
},
@@ -9,6 +10,8 @@ export default {
customerinfo:'Customer Information',
addfollowup:'Add follow-up',
userList:'Customer Management',
+ tagselect:'Tag filtering',
+ highseas:'Customer High Seas',
persondata:'Personal Data',
businesscard:'Business card'
@@ -94,7 +97,10 @@ export default {
recyclebin:'Recycle bin',
restore:'Restore',
position:'Position',
- positioninput:'Please fill in the position'
+ positioninput:'Please fill in the position',
+ QRcode:'QR code',
+ WeChat:'WeChat',
+ UploadQRcode:'Upload QR code'
},
call:'Call',
delete:'Delete',
@@ -109,6 +115,7 @@ export default {
confirm:'confirm',
prompt:'prompt',
deletemsg:'Are you sure you want to delete this customer?',
+ receivemsg:'Are you sure you want to claim this customer?',
submit:'Submit',
gender:'Gender',
gender0:'unknown',
@@ -184,5 +191,7 @@ export default {
remarks:'Remarks',
channel:'Channel',
Nodata:'No data available at the moment!',
- versionmsg:'It is already the latest version!'
+ versionmsg:'It is already the latest version!',
+ receiveOrder:'Collect Order',
+ loading:'loading'
}
\ No newline at end of file
diff --git a/common/locales/zh.js b/common/locales/zh.js
index a9d1444..8319c51 100644
--- a/common/locales/zh.js
+++ b/common/locales/zh.js
@@ -2,13 +2,16 @@ export default {
// 可以以页面为单位来写,比如首页的内容,写在index字段,个人中心写在center,共同部分写在common部分
tabbar: {
home: '首页',
+ highseas: '公海',
customer: '客户',
mine: '我的'
},
navbar:{
customerinfo:'客户资料',
addfollowup:'添加跟进',
+ highseas:'客户公海',
userList:'客户管理',
+ tagselect:'标签筛选',
persondata:'个人资料',
businesscard:'我的名片'
},
@@ -94,6 +97,9 @@ export default {
restore:'恢复客户',
position:'职位',
positioninput:'请填写职位',
+ QRcode:'二维码',
+ WeChat:'微信',
+ UploadQRcode:'上传二维码'
},
call:'呼叫',
delete:'删除',
@@ -108,6 +114,7 @@ export default {
confirm:'确定',
prompt:'提示',
deletemsg:'确定要删除此客户吗?',
+ receivemsg:'确定要领取此客户吗?',
submit:'提交',
gender:'性别',
gender0:'未知',
@@ -183,6 +190,8 @@ export default {
remarks:'备注',
channel:'渠道',
Nodata:'暂无数据!',
- versionmsg:'已是最新版本!'
+ versionmsg:'已是最新版本!',
+ receiveOrder:'领单',
+ loading:'加载中'
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6c91f48..0447de8 100644
--- a/pages.json
+++ b/pages.json
@@ -86,6 +86,15 @@
"enablePullDownRefresh": false,
"navigationStyle":"custom"// 去掉微信小程序顶部导航
}
+ },
+ {
+ "path" : "pages/index/highseas",//客户公海
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
+ }
}
],
"subPackages":[
@@ -154,6 +163,15 @@
"enablePullDownRefresh": false,
"navigationStyle":"custom"// 去掉微信小程序顶部导航
}
+ },
+ {
+ "path" : "tagcustomer",//标签筛选
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
+ }
}
]
},{
@@ -262,6 +280,12 @@
"selectedIconPath": "/static/image/home-s.png",
"text": "首页"
},
+ {
+ "pagePath": "pages/index/highseas",
+ "iconPath": "/static/image/highseas.png",
+ "selectedIconPath": "/static/image/highseas-s.png",
+ "text": "公海"
+ },
{
"pagePath": "pages/index/customer",
"iconPath": "/static/image/user.png",
diff --git a/pages/customer/detile.vue b/pages/customer/detile.vue
index ce0568a..29a1e8d 100644
--- a/pages/customer/detile.vue
+++ b/pages/customer/detile.vue
@@ -37,7 +37,7 @@
- {{item.name}}
+ {{item.name}}
@@ -332,6 +332,11 @@
}
})
},
+ tagselects(item){ //标签筛选
+ uni.navigateTo({
+ url: '/pages/customer/tagcustomer?tag_id='+item.id+'&name='+item.name
+ });
+ },
isActive(parentId, childId) {
return this.activeMap[parentId] === childId;
},
diff --git a/pages/customer/tagcustomer.vue b/pages/customer/tagcustomer.vue
new file mode 100644
index 0000000..715ee98
--- /dev/null
+++ b/pages/customer/tagcustomer.vue
@@ -0,0 +1,202 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.created_at}}
+
+ {{item.magnitude_txt}}
+ {{item.follow==0?$t('followup'):item.follow==1?$t('deal'):$t('lost')}}
+
+
+
+
+
+ {{item.contacts}}{{item.phone}}
+ {{item.grade_txt}}
+
+ {{item.sex_txt}} | {{item.country_name}}{{item.car_type_name}}
+
+
+ # {{tag_name}}
+
+
+
+
+ {{$t('call')}}
+ {{$t('customer.addfollow')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index a167df2..f5d264b 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -152,10 +152,14 @@
})
uni.setTabBarItem({
index: 1,
- text: this.$t('tabbar.customer')
+ text: this.$t('tabbar.highseas')
})
uni.setTabBarItem({
index: 2,
+ text: this.$t('tabbar.customer')
+ })
+ uni.setTabBarItem({
+ index: 3,
text: this.$t('tabbar.mine')
})
},
diff --git a/pages/index/highseas.vue b/pages/index/highseas.vue
new file mode 100644
index 0000000..71bf350
--- /dev/null
+++ b/pages/index/highseas.vue
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.magnitude_txt}}
+
+
+
+
+
+
+
+ {{item.contacts}}
+ {{item.country_name}}
+
+
+ {{$t('details')}}
+ {{$t('receiveOrder')}}
+
+
+
+
+
+
+
+
+ {{$t('cancel')}}
+ {{$t('confirm')}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1392d8e..2e09fa6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -151,10 +151,14 @@
})
uni.setTabBarItem({
index: 1,
- text: this.$t('tabbar.customer')
+ text: this.$t('tabbar.highseas')
})
uni.setTabBarItem({
index: 2,
+ text: this.$t('tabbar.customer')
+ })
+ uni.setTabBarItem({
+ index: 3,
text: this.$t('tabbar.mine')
})
this.getstatistics()
@@ -226,10 +230,14 @@
})
uni.setTabBarItem({
index: 1,
- text: this.$t('tabbar.customer')
+ text: this.$t('tabbar.highseas')
})
uni.setTabBarItem({
index: 2,
+ text: this.$t('tabbar.customer')
+ })
+ uni.setTabBarItem({
+ index: 3,
text: this.$t('tabbar.mine')
})
var language = e.value[0].id
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 9171886..5ec9a8b 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -18,7 +18,7 @@
ID:{{userinfo.sn}}
-
+ {{$t('navbar.businesscard')}}
@@ -113,10 +113,14 @@
})
uni.setTabBarItem({
index: 1,
- text: this.$t('tabbar.customer')
+ text: this.$t('tabbar.highseas')
})
uni.setTabBarItem({
index: 2,
+ text: this.$t('tabbar.customer')
+ })
+ uni.setTabBarItem({
+ index: 3,
text: this.$t('tabbar.mine')
})
this.getuserinfo()
diff --git a/pages/mine/changinfo.vue b/pages/mine/changinfo.vue
index 089c172..133cfc8 100644
--- a/pages/mine/changinfo.vue
+++ b/pages/mine/changinfo.vue
@@ -62,6 +62,24 @@
+
+
+ {{$t('mine.QRcode')}}
+
+
+ {{$t('mine.WeChat')}}
+ WhatsApp
+
+
+
+
+ 上传二维码
+
+
+
+
+
+