From e89ca3dd33c28dfa1906b5899a2f0b2e0f9a5df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= Date: Thu, 24 Jul 2025 17:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=90=9C=E7=B4=A2=E7=AD=89=20=E5=8F=8A=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=B3=A8=E5=86=8C=E4=BC=A0=E5=8F=82=20=E5=8F=8A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E7=A7=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/apiT.js | 16 +- common/locales/en.js | 1 + common/locales/ru.js | 1 + common/locales/zh.js | 1 + pages/customer/add.vue | 9 +- pages/customer/editdetile.vue | 21 +- pages/index/customer.vue | 336 ++++++++++++++++++++++++++++--- pages/index/index.vue | 32 +-- pages/login/index.vue | 1 + pages/login/register.vue | 1 + static/image/customer/zhuany.png | Bin 0 -> 1858 bytes 11 files changed, 357 insertions(+), 62 deletions(-) create mode 100644 static/image/customer/zhuany.png 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('prompt')}} @@ -80,7 +85,70 @@ + + + {{$t('cancel')}} + {{$t('confirm')}} + + + + + + + + + {{ item.name }} + + + {{$t('noresults')}} + + + + + + + + {{$t('cancel')}} + {{$t('confirm')}} + + + + {{$t('customer.CustomerScreening')}} + + + {{ items.label }} + + + + + + {{ item.name }} + + + {{ item1.name }} + + + + + + + + @@ -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 0000000000000000000000000000000000000000..f91a4f13c6de2e90323e419899298d0b3661dd07 GIT binary patch literal 1858 zcmV-I2fg@-P)~6=+X^R1cfIk-C1_*uu;LHpS+X=yP3Z6-NMM%~swhYm16xtPwH=R{~Rch_Z^M(?t!Z z1{6ztgv50&gk|8k&c(p!%m6>&xe%<$Alylcemf+QoNY_y&VZ0l1NfD#pgeebm~1;w zaAJVp#ZyqhmOSDe)`-p#jwAM(!trkjee z#9gT(S!T-NrUwMv0>LS!BCK$NZdI0BO*z~c5b|pPLrq0k;RKJVvRrG*VQoO)od11O z0oFL;c@@iLrablrbh5}Q-ZB+njU!%Bv0PxvV{O3LF8*Lx1v^az*y03uvNw`xraaaL z=)#4N9|~~1sR%2aAXa4wO*vc{uv~!2rXp-`1ZE|X7|%hR7*Gs(6M;oG4Kc-%7@fqj z-4yS}fSXyQ_ni!cD^w)EG;O@bIWa&J`5`v~m}ny=FV?pEJ2jvfa2f@F$=e8v{C^Jx z#%+k?OA8KnJ)o}_tORh8jiAg};&v6w?=t5PlIZLa(EO)|JgW-4+JcTA=mu+hf&f!qyjp?&`$0kkONJ10 zY)AaG5-l@e(p(@EB zUlKuVh2U)n*2BYkb-%ou18(932k2y74!+fc!F&%?H%L$G~)xBM@!aGihde2&<;1M46t=->4=dbNT(k_GZn zRz52O3MHN=#1a4}q!lFaA0bwY;N_8f@#HE86PNyVYNt)A*xFG0V|utN=@G4~X&4(& z3^}E5|39tBe*rAo11#PgNh^1X^+#CxJ4CQlmF22t4j38W2fQ1Cc`4)-0T!`}#p?I+ zuV%$vTtB_U)2ggZzxA1;#`sJG(|XIIuctPGV*f*S{W{8c-;) zBt%a`LszOuF0pBRe{Ah^NsB`~yx&`vk8_Oy<2(7&jtbs{)E#o%#9=r;xmWbN{(Bz> z?E!v?3qa^;?t!p;?hiG`1~s7A$+KCl4Sf59z+aO{rXFgIu+cN90e-;eAhqxK{UILC z>Ftr%Z3;GG3ngA5Rh;aSa}chz!-pYh{P0RO;MBQ1diYnh)1F5hXuaJ*gfvlpz>6R- zevRffjks0C(p~>Vr?5;Y@luai(Qs*^ip1$TfL1P^rkay-m?E_Y_$A&8;+B3S8&o7& z&iUuMDSp7~A$TYk$Rasy)|zfW$jtx_97s;-Iu<(WpiQR3&ej6;r+eBq`TzsY2zlHd z;FJC;tHhX1vHa6jqZ@f9-pn6WJm|soq?8&Th~T!~vgrRka2^8;D0K32sp6S_gWtQV zET=lJoI>aaoCm?(X|*VLA}Pz&u5}DFAYe(PZtDBAisaX>3lGLu2zh}%_mjH7L0qh2 zS>;m800aDx3jzG5Uy%n?B=xgFmkLt2`W}h<8c&~+n3Ke!^*M_)16}~I|3jzm`Mbwi z#T-P%fL#=5BlME*HWD+ENLJ^dXqq~}fMSVTNsRdxX|v$bw0eew@v}LqqXQ@J`WosV zi^chIytE#mPh9NZ&?Io7Yu7WhyKN~02f_MPn$PzVC%qHPj