diff --git a/api/apiT.js b/api/apiT.js
index 891ffd5..11fa7b3 100644
--- a/api/apiT.js
+++ b/api/apiT.js
@@ -1,7 +1,7 @@
- const baseUrl = "http://219.157.255.213:9006/"; //这里放置url域名32044
+ // const baseUrl = "http://219.157.255.213:9006/"; //这里放置url域名32044
// const baseUrl = "http://api.crm.hnxinyouhe.com/"; //这里放置url域名32044
- // const baseUrl = "http://192.168.50.9:8787/"; //这里放置url域名32044
+ const baseUrl = "http://219.157.255.213:25329/"; //这里放置url域名32044
// const baseUrl = "https://api.fcrm.hnxinyouhe.com/"; //这里放置url域名32044
// const baseUrl = "https://crm-server.smt.hnxinyouhe.com/"; //这里放置url域名32044
// const baseUrl = "/api/"; //这里放置url域名32044
@@ -11,12 +11,20 @@ export function request(options){//封装的requset
uni.showLoading({
title: ''
});
-
+ var lang = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale()
+ if(lang=='zh-Hans'){
+ lang='zh_CN'
+ }
+ console.log(lang)
return new Promise((resolve,rejext)=>{
uni.request({//这里是uniapp网络请求的api
url: baseUrl + url, //仅为示例，并非真实接口地址。
data,
- header:{'content-type': 'application/x-www-form-urlencoded','Authorization': 'Bearer ' + uni.getStorageSync('token')},
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded',
+ 'Authorization': 'Bearer ' + uni.getStorageSync('token'),
+ 'fdesk-language':lang
+ },
method:method||"GET",//默认请求方式是get
success: (res) => {
if(res.data.code==401){
diff --git a/common/locales/en.js b/common/locales/en.js
index 97668cf..645ab61 100644
--- a/common/locales/en.js
+++ b/common/locales/en.js
@@ -204,4 +204,5 @@ export default {
downmp:'Download business card',
downmpmsg:'Are you sure to download the current business card image?',
callmsg:'Are you sure you want to make the call?',
+ transfer:"Transfer"
}
\ No newline at end of file
diff --git a/common/locales/ru.js b/common/locales/ru.js
index 635f98c..f4d73ae 100644
--- a/common/locales/ru.js
+++ b/common/locales/ru.js
@@ -203,4 +203,5 @@ export default {
downmp:'Скачать визитку',
downmpmsg:'Вы уверены в загрузке текущей карты?',
callmsg:'Вы уверены, что хотите совершить звонок?',
+ transfer:"Перевести"
}
\ No newline at end of file
diff --git a/common/locales/zh.js b/common/locales/zh.js
index 464c7a5..8b48d75 100644
--- a/common/locales/zh.js
+++ b/common/locales/zh.js
@@ -203,4 +203,5 @@ export default {
downmp:'下载名片',
downmpmsg:'确定下载当前名片图吗?',
callmsg:'确定拨打电话吗?',
+ transfer:"转移"
}
\ No newline at end of file
diff --git a/pages/customer/add.vue b/pages/customer/add.vue
index 2aa8e73..4b66055 100644
--- a/pages/customer/add.vue
+++ b/pages/customer/add.vue
@@ -58,15 +58,14 @@
-
+
-
+ -->
{{$t('customer.Cstomerfj')}}
@@ -188,7 +187,7 @@
describe: '',
grade:'',
country_id:'',
- car_type_id:'',
+ // car_type_id:'',
channel_id:'',
magnitude:'',
address:'',
@@ -204,7 +203,7 @@
this.getChannel()
this.getMagnitude()
this.getGrade()
- this.carType()
+ // this.carType()
this.area()
},
onShow() {
diff --git a/pages/customer/editdetile.vue b/pages/customer/editdetile.vue
index 055a8cc..533440a 100644
--- a/pages/customer/editdetile.vue
+++ b/pages/customer/editdetile.vue
@@ -59,14 +59,13 @@
-
+
{{car_type_name || $t('customer.Customerphinput')}}
-
+ -->
{{$t('customer.Country')}}
@@ -180,7 +179,7 @@
describe: '',
grade:'',
country_id:'',
- car_type_id:'',
+ // car_type_id:'',
channel_id:'',
magnitude:'',
address:'',
@@ -196,7 +195,7 @@
var that = this
this.getChannel()
this.getMagnitude()
- this.carType()
+ // this.carType()
this.area()
this.customerdetailfn()
@@ -234,12 +233,12 @@
that.defaultIndexqd=[index]
}
})
- that.carTypeList1.forEach((item,index) => {
- if(item.id == that.form.car_type_id){
- that.car_type_name = item.name
- that.defaultIndexph=[index]
- }
- })
+ // that.carTypeList1.forEach((item,index) => {
+ // if(item.id == that.form.car_type_id){
+ // that.car_type_name = item.name
+ // that.defaultIndexph=[index]
+ // }
+ // })
that.magnitudeList1.forEach((item,index) => {
if(item.id == that.form.magnitude){
that.magnitude_name = item.name
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 5b0058c..6279cdc 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -8,13 +8,16 @@
+
+ {{country_name || $t('customer.Country')}}
+
-
+
@@ -51,6 +54,7 @@
+ {{$t('transfer')}}
{{$t('call')}}
{{$t('customer.addfollow')}}
@@ -60,7 +64,8 @@
-
+
+
+
+
+ {{$t('cancel')}}
+ {{$t('confirm')}}
+
+
+
+
+
+
+ {{$t('cancel')}}
+ {{$t('confirm')}}
+
+
+
+
@@ -306,6 +491,9 @@
uni-page-body {
background-color: #F6F6F6 !important;
}
+ ::v-deep .u-search__content{
+ padding: 0 56px 0px 70px;
+ }
::v-deep .u-search__content__input{
font-size: 24rpx !important;
}
@@ -338,18 +526,42 @@
padding: 10px 15px 5px;
.left {
position: relative;
- width: 88%;
+ flex: 1;
}
.right {
- flex: 1;
text-align: right;
+ margin-left: 5px;
image{
width: 24px;
height: 20px;
margin-top: 5px;
}
}
+ .searchl{
+ background: linear-gradient(to right, #3471FF, #6776FF);
+ color: white;
+ border-radius: 20px;
+ padding: 4px 12px;
+ text-align: center;
+ position: absolute;
+ /* #ifdef APP-PLUS */
+ top: 3px;
+ /* #endif */
+ top: 2px;
+ left:5px;
+ font-size: 12px;
+ width: 46px; /* 你可以根据需要调整宽度 */
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ display: inline-block;
+ image{
+ width: 16px;
+ height: 16px;
+
+ }
+ }
.search{
background: linear-gradient(to right, #3471FF, #6776FF);
color: white;
@@ -440,15 +652,20 @@
color: #3471FF;
display: flex;
justify-content: flex-end;
+ align-items: center;
view{
margin-left:15px;
}
image{
width: 14px;
height: 14px;
- // vertical-align: sub;
+ vertical-align: sub;
margin-right: 5px;
}
+ .userzy image{
+ width: 18px;
+ height: 18px;
+ }
}
}
.popupcontent{
@@ -490,5 +707,72 @@
line-height: 40px;
}
}
+ .actives{
+ background-color: #dfdfdf;
+ }
+ .text{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ line-height: 30px;
+ padding: 10px 15px 0px;
+ .qd{
+ color: #3471FF;
+ }
+ }
+ .popup-content {
+ padding: 20px;
+ background-color: #fff;
+ }
+ .option-list {
+ max-height: 400rpx;
+ margin-top: 20rpx;
+ }
+
+ .option-item {
+ padding: 20rpx;
+ border-bottom: 1rpx solid #eee;
+ }
+
+ .option-item:last-child {
+ border-bottom: none;
+ }
+
+ .no-data {
+ text-align: center;
+ padding: 20rpx;
+ color: #999;
+ }
+ //标签
+ .tag-list{
+ max-height: 900rpx;
+ margin-top: 20rpx;
+
+ }
+ .tags{
+ margin-top: 10px;
+ }
+ .name{
+ margin: 10px 0px;
+ }
+ .tagitem{
+ background: #ECF2FF;
+ border-radius: 8px;
+ color: #3471FF;
+ text-align: center;
+ padding: 5px 13px;
+ }
+ .row{
+ width: 100%;
+ }
+ .col4{
+ display: inline-block;
+ margin: 4px 3px;
+ // width: 30%;
+ }
+ .tagactive{
+ background: #3471FF !important;
+ color: #fff !important;
+ }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3798a30..e08135e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -252,22 +252,22 @@
index: 3,
text: this.$t('tabbar.mine')
})
- var language = e.value[0].id
- if(e.value[0].id=='zh-Hans'){
- language= 'zh_CN'
- }
- request({
- url:'user/language',
- method:'POST',
- data:{
- language: language,
- }
- }).then(res => {
- uni.showToast({
- title: res.data.message,
- icon: 'none'
- });
- })
+ // var language = e.value[0].id
+ // if(e.value[0].id=='zh-Hans'){
+ // language= 'zh_CN'
+ // }
+ // request({
+ // url:'user/language',
+ // method:'POST',
+ // data:{
+ // language: language,
+ // }
+ // }).then(res => {
+ // uni.showToast({
+ // title: res.data.message,
+ // icon: 'none'
+ // });
+ // })
},
//日期选择组件
confirm(e) {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 7a4a2b3..783151b 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -193,6 +193,7 @@
email: this.email,
password: this.password,
language: this.language,
+ abbr:'hesu'
}
}).then(res => {
uni.setStorageSync('i18locale',this.language);
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 1f1e759..268bd10 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -122,6 +122,7 @@
email: this.email,
password: this.password,
code: this.code,
+ abbr:'hesu'
}
}).then(res => {
// console.log(res.data.data)
diff --git a/static/image/customer/zhuany.png b/static/image/customer/zhuany.png
new file mode 100644
index 0000000..f91a4f1
Binary files /dev/null and b/static/image/customer/zhuany.png differ