From 7fd2e63c9de0cbae77b3467a1b7a3fbb9e14132e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= Date: Tue, 1 Apr 2025 17:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=85=AC=E6=B5=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/locales/en.js | 13 +- common/locales/zh.js | 11 +- pages.json | 24 +++ pages/customer/detile.vue | 7 +- pages/customer/tagcustomer.vue | 202 ++++++++++++++++++++++ pages/index/customer.vue | 6 +- pages/index/highseas.vue | 306 +++++++++++++++++++++++++++++++++ pages/index/index.vue | 12 +- pages/index/mine.vue | 8 +- pages/mine/changinfo.vue | 42 ++++- static/image/highseas-s.png | Bin 0 -> 1535 bytes static/image/highseas.png | Bin 0 -> 1623 bytes static/image/mine/erwm.png | Bin 0 -> 1712 bytes 13 files changed, 618 insertions(+), 13 deletions(-) create mode 100644 pages/customer/tagcustomer.vue create mode 100644 pages/index/highseas.vue create mode 100644 static/image/highseas-s.png create mode 100644 static/image/highseas.png create mode 100644 static/image/mine/erwm.png 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 @@ + + + + + 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 @@ + + + + + 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 + + + + + 上传二维码 + + + + + + @@ -214,7 +232,7 @@ this.company_name = val.value[0].name this.showcomp = false }, - uploadfn(imgUrl){ + uploadfn(imgUrl,name,name1){ var that = this; uni.uploadFile({ url: 'http://219.157.255.213:9007/upload/uploadImage', @@ -229,8 +247,8 @@ icon: 'none' }); }else{ - that.userinfo.avatar = path.data.image_url - that.userinfo.avatar_url = path.data.path + that.userinfo[name] = path.data.image_url + that.userinfo[name1] = path.data.path console.log(that.form) } } @@ -248,7 +266,12 @@ select(e){ const tempFilePaths = e.tempFilePaths; const imgUrl=tempFilePaths[0] - this.uploadfn(imgUrl) + this.uploadfn(imgUrl,'avatar','avatar_url') + }, + selectewm(e){ + const tempFilePaths = e.tempFilePaths; + const imgUrl=tempFilePaths[0] + this.uploadfn(imgUrl,'socialize_pic','socialize_pic_url') }, leftClick(){ uni.navigateBack({}) @@ -267,6 +290,9 @@ position:this.userinfo.position, country_id:this.userinfo.country_id, sign:this.userinfo.sign, + socialize:this.userinfo.socialize, + socialize_pic:this.userinfo.socialize_pic, + socialize_pic_url:this.userinfo.socialize_pic_url, } }).then(res => { uni.showToast({ @@ -306,6 +332,7 @@ } .content{ background: #FFFFFF; + padding-bottom: 100px; .topimg{ text-align: center; position: relative; @@ -334,6 +361,13 @@ width: 90px; } } + .cell{ + padding: 18px 20px; + font-weight: 500; + .item{ + width: 90px; + } + } .right{ text-align: right; } diff --git a/static/image/highseas-s.png b/static/image/highseas-s.png new file mode 100644 index 0000000000000000000000000000000000000000..3295a66e8c3e76b528d307a30e4cb580ca3ac725 GIT binary patch literal 1535 zcmVPx)xk*GpR9M5!nQ3ekWf;dRco45(?S1WbcDLKzZM#=XptceZO4X+A2W-_QJ&;yf zdhANn81#cxQ3!&OsG#vf(_lQ}fzco}CP;{104s6`8b~FA(n6#cZRzp&f7;pQ?Xb(v zwjFenCo`FOXWrjD=li@H5ixhan-}62@qhZIq@-9=Q&TrelJq-{7a{*ZEB+LCM6{;!nIczR)8EzPEO9&91ai_3?;*{W}XW+7C;7!`C0gwUvPQ8rhx2I z!h~;~bZKG8Bb>V%2*gz;ey2)=k)OaFU1 z9P=uCaX^0Vyk>p~4K@paAFF*1u8@WCJ`MJ0Y2rcw@QhkbU~HrC+>e?8#>U3p#%0Wx z{{URBrs81iVIhj2)w+so5gfjUYjKG2?+V)Mg&)Uj3Yd_P5QT}lL`Y1!64!4H;CEjM zNu4XsGuLYc!}+jJ(9C3XLR))q{1S2;GNh=}?V7;2o5j2!L2+>lF4=j4(GO_ZRBnmAhpr$s5wIR z+EY!}SiYso5nloD$8nw?Fre_VZ>Ht9hVx{|SSo032_`$L8jQtK@H(Z!4Wu-CH){{2 z(2S!FYr}g1^AgTaa1s{+$ybrMxBiY{MGgKczC1nOdqs0;c5>Erg$2iAauzH7_OjfP zstu@Nd`!la20hg4d$GOp07=I5sX?d?S>+vJ!%e=Y`Vbk?b3#S*AcS`$Iw1RS?N6cS z8S%HNBA_|X8$Z6y7!u*B$W5b$}}n zeelFoO6h|3EVA~@C|{j3hg)-ztdDG?tctxSeH%+rQBil`c!S)hBmlG$(h8_IA)9$Q z2Dpc#qoZ$EM)7WbDMzVKd#3D1XQjQg#ntkMrj2r|$r@uI9G_=%Ds!X4^k)IudR3Y+ zIg9**GD>&M60jy%*;89_Sc-i$SnphYZo;4Uj8<~4K07=AYwQE$s>$dL79h~(0ceW% zaGG%Lg}j6FlkzIOm)ljp7Hto0ZSy^Bv=`0_&JXFK4=@>TB)!OH<`w`z??W2U5*UNz z?|A^r2dsX2YiQ1X(g(=qnJt{7>fji1=yAZjtaN%_D*|>E7(SE}Hb?khko}NNs3t|+ z4Jy0;91I-wnK-lT>&c4ZYPb-V@RE#cu)&(wEjCuX;|lqd%_{aYLCnt$*1pKd$UBt{ z_Fi$dBAGI$>TwvtWzkmp(H4Nb=IiKG1jAr}O;3U*%amIbM()UFv)+@JQ*Cnh$19jW zL{J%slXoYl9LQ44Yl7J=I4_a&;b}RUFATKN!wGczq)$l3OVG-M3e8POJXVtWE&e!-J lkBN(mi)O)d3+B2{`WLAr*H{&c_EP`=002ovPDHLkV1gDG>p%bi literal 0 HcmV?d00001 diff --git a/static/image/highseas.png b/static/image/highseas.png new file mode 100644 index 0000000000000000000000000000000000000000..96e4d3f4135550f549bc19709837278864234979 GIT binary patch literal 1623 zcmZXVdo+}J7{{j}mqDSiAqN>zXa}hYxrD~3F)>TU*f=V=R6B_zIw5m1ja+8TjA74C zZf%VXXKYB?nrt;;mDH~2MjNeZDeZ_|mwnn_=RHpQobx{K_xpLi&+mQzm^m*ugb`>! zFel(}ID;Ts02A)3KVCW-(63t4qT#ma2s6+RSJ!Rv2M&in7eWu)0uU-ID=R!aTqcu& zkVquZ`FuWfsZ^3F9$0S2!Mcw zDR8h5M!RrMX=y2NAV@<1G(fPR(P*KC10et$1)w7f8I%VC1r`zL5GX4v`wx7A5P&cm zVFFGD4F!4Vn1vWv)X@k!+C>>G@R>!2py|TXK%;dCKw;|(H3mT}EVR3jpqBxH)=>aG z4j?Ab6kEi?AkYd%&=!`&?7|qf_1P4A-2XX7FacpG%whs@G{PVf)IIZS;RpIGg~|8| zw+OGHp}AN~TSteWr*E)isiC2f@iL;x7t5EMnOj&`S+BGqk!)Al*{^YM`jYJI;=0al z{RRqUqq~RaCNFPqKYuEXwv`^tU~FfG?bx|1B9gT`IyxqH@4mSG35f>|9%3I(PDxEY znszMxct+-l?3|oaxw)LvdE7I+{DQ(FzCb7vOUf&%s?T4P$!agv)i=oHKQ=Wtw_Is$ zy?X814aLo$Z+CQdc6I&I-F@$V&x78+$B+95o;-c};>F<5%imuO508wz9#yH{{5dxM z_T9w$_kXF?lOH}zO-=v(&&`*$72X}#DvW?|$?5Et`> z%B=xMn_Rc;8xNL$(AgJPpECK~N|Q>Pu?~|o#@y_)`XOrCSZnb}_BsxE&cE=I`{*|{ zBXJvY11G#ZBHJu9m$s3Mh(2zQY}KT}XS&Q*%N2c1^HhV2D!sHJ+flK?>9x^xfEHyp zKO?lNQ4~vv(xZe75O%PX`Yj^gI7M7bjCT}^HpU5V5Jm50Cs?KvH&o=TVjm<<@7Ai_ zJE0Yo#N3+Tny8dAoj5Bz@A54h`nD&Qu-nPvnN77WS@(O5Yi_X}+wzIga)wuLG5wVG zwP?M_*JTB{*9pqS36hT%7ciSE+2)k1AuOGW?kf^Fzb)Brv z4lX5k;r9%kr(Vt#&O6Gj_2&=F36?#-^z#1Ydna`_SNvqWnCCW;WccQZ%`}S?udcPH z+ob+ruAOm$7auA)5~1$)_1{P@5ZDi1cv^Pn)@bFnBObW71lD@IoxxS{O)l2ZsqD;K~>~GckE$O59W%U;r&SyyXDn)q%D>8Ab_gkfh&b<3|(k0nc zT^oBV;G~b|S+>;4{p1^lN;s&PNw6RWI8xDzh7w_Z|LHcknHS4Y>++ge_lX|n$k;B<%F2cD)m2p5`wlc K0_yx?a{dKVsW+Mc literal 0 HcmV?d00001 diff --git a/static/image/mine/erwm.png b/static/image/mine/erwm.png new file mode 100644 index 0000000000000000000000000000000000000000..dff4b0ed1383ebc21ec2262fdfa28820e4d5d6db GIT binary patch literal 1712 zcmai!dpOg39LLwu7#%7}r5kE4rR3xmIk_ygqO*)s$2`)~NE4CUmRwF^t5lxKC6|h6 zl(AvCRCJeHLX6T-YT9OIY}#z!^Xqs{k3Y_N&incO-rx84_5FN5e|&%6=SRWp+oi2# zpap}$w9&g!UeL(?{vy;MciWt53k~xky>_|6811V@q5K)+;k^@r001tR3;C>gJl;PM zh{fWGi3w;bkw_;0mP{s_o}Pv{i3Mhk@w%l+% z5@}+FM(@Q0;KRaCMnuQN#*#?!35kEEq^40XWZf#hLoc~|kIjDg`0?wmx4j%rU;p6H zr_X$WXnb5e0bPt4rE1J@ODGIBe;FF(;vL&B9QcOqa@Nxr|56q^w27*bc6%63HT54% zO1pjSU|Ct283z7al`lNWn0*uJYp@`VttgPYRineIv!|TC#3zJQ3R{Cd5Hkh>gY*r} zTkO`@_jDLzXtW`Y>SBxG@#|xy%Yq|Gy%`sH-yF-ex@%cSTFG%D9j?X&_b=={W7|m@nHjkCdjP&WPoJT)-(J&%y!dGu7Sb4weWrFu!?bGn`rD} z7;#xLzLw8p@?limC=+-7miHnLb3tL#2aR23tV@k(s$fYt#kgK`{;MrF`dSILmDz1X z!q$I}j)z|O4>T|WTiZ0k9t9k2XrO&+dbrTO@5udYxwR5aq@pCl^tBZ$_1c3K?oDT| z7AO&G6?W86e60(f>1kotWWkObQO|yETmIg#np1pjWs&~7st91?=&)MzI2^euJADt~ z<)ifDCV?|J4--e*TiI7BStw}{!PjJjS$J5&8KPTDs|fgF8gpHW*RFzXtMV_2UoSo; za8)$X-S+D}w=xhRJ2@%(ia%z0K2j3aJ!QY_(;*TQMCVguLfQ2T4^7G|D}{7U>HPtF ztz)v%l7{hTIDcb&s@$*Ssp)}3W-rYt$xg%V)?<;EifWvq6)goJKNAZ!N@CxRw5SRa zUazSltPH|wh*|MH0*Tt)g&Q3Qn{CQZ!oyi^WA7zaF$iS6C3pM8CU^E%Yu&Xnh0j|q z;Ka6;7zdKI8{1o@l%I0GDHNpA%A_A% z7o4AgvP^s^_dIG=dlVrNp5wLU@h}_W26K3(ZX6B9tFE)AYG-_=7H)Uh;c4h#Ug!Yt z`KjG6#I#dG$9t^^6Q5Ol?2(1?8AbkvRt*1ThnY@rO`k8_vTU&ZzLB=0qY$|}^+21F z>`|Ues(VLdv&Zr;l;>8kfLUvMUPX3DoMrhs0&8T`(k)SkUldtOV{%#oo?VR-m>XU4 zJVnV&i{DBsI6JbLz66zNsp9|dbpr*&jFm6_l1Wqn$$rn3cs(6VV6XFvozdp^jOiyf zsZ()5Z|6BLb&5v9^lbKH?Ur77x6KD(v;hVS7>o1$8W}l!;|_y~@xt}Y^p~=8b?ZI2 z%WHDd`z!LSS{bz4jJ&+612TPGoB^&GYv+E5tll6Oe4W%D2>RXc#l=St;!FaYZx3BXaGw9 literal 0 HcmV?d00001