From e55bed7407a515ed756f5f1ad3ba27f669cad8cd Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Thu, 16 Jan 2025 10:13:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 14 ++- assets/images/apply.png | Bin 0 -> 1349 bytes assets/images/apply1.png | Bin 0 -> 428 bytes assets/images/xx.png | Bin 2035 -> 887 bytes assets/images/xx1_lao.png | Bin 0 -> 313 bytes custom-tab-bar/index.js | 187 ++++++++++++++++++---------------- custom-tab-bar/index.wxml | 8 +- pages/billDetail/enroll/index.wxss | 4 +- pages/collect/index.wxss | 4 +- pages/collect/index1.wxss | 4 +- pages/detail/index.js | 2 +- pages/detail/index.wxml | 4 +- pages/filterPage/index.wxss | 4 +- pages/firstBill/filtercss.wxss | 2 +- pages/firstBill/index.js | 7 +- pages/firstBill/index.json | 3 +- pages/firstBill/index.wxml | 58 ++++++----- pages/firstBill/index.wxss | 18 ++-- pages/hotList/index.wxss | 4 +- pages/jobSelectPage/index.wxss | 4 +- pages/listSharePage/index.wxss | 4 +- pages/message/index.js | 5 +- pages/message/index.wxml | 2 +- pages/messageDetail/index.wxml | 2 +- pages/mine/index.js | 2 +- pages/mine/index.wxml | 4 +- pages/mine/index.wxss | 2 +- pages/myBill/index.js | 6 ++ pages/myBill/index.json | 2 +- pages/newEnroll/enroll/index.js | 12 +-- pages/newEnroll/enroll/index.wxss | 4 +- pages/newEnroll/enrollEdit/index.wxss | 4 +- pages/newEnroll/enroll_old/index.wxss | 4 +- pages/newEnroll/index.wxss | 4 +- 34 files changed, 215 insertions(+), 169 deletions(-) create mode 100644 assets/images/apply.png create mode 100644 assets/images/apply1.png create mode 100644 assets/images/xx1_lao.png diff --git a/app.json b/app.json index e8ca96b..e310b33 100644 --- a/app.json +++ b/app.json @@ -128,11 +128,23 @@ "selectedColor": "#1890ff", "list": [ { - "iconPath": "./assets/images/ysd.png", + "iconPath": "./assets/images/home.png", "selectedIconPath": "./assets/images/home1.png", "pagePath": "pages/firstBill/index", "text": "首页" }, + { + "iconPath": "./assets/images/xx.png", + "selectedIconPath": "./assets/images/xx1_lao.png", + "pagePath": "pages/myBill/index", + "text": "工单" + }, + { + "iconPath": "./assets/images/xx.png", + "selectedIconPath": "./assets/images/xx1_lao.png", + "pagePath": "pages/message/index", + "text": "消息" + }, { "iconPath": "./assets/images/wd.png", "selectedIconPath": "./assets/images/wd1.png", diff --git a/assets/images/apply.png b/assets/images/apply.png new file mode 100644 index 0000000000000000000000000000000000000000..9cb5781e5648df1a3843f4bae266a803dec17e9a GIT binary patch literal 1349 zcmeAS@N?(olHy`uVBq!ia0vp^V9db=WF6OOo(-fJi-X*q7}lMWc?smWq(*qA`T8rk6I?cE0W*RPQaE3x{{;gB%X&{2$B+uf zw{v{6g&if1&kpA{b@{-$wwCd%;|h^WCdw{T3pi{; z_jqY*Z1bJ%;eF7V$0J%-Cv-s;QK{;^eLL2k$=zXq40^B_&<%dOywK+m|ma(b3WO9UnG`F4fC2 z-nnmIU1DP5!VIy=*ViXphH9}cwmFAvwTxnF9u_)#H8^DVCR z*Q>2&`lM|&s=c>f{Ke^l7aehJpVZgna57i+a;*Ms#PT*Oab?IWujQBTZ!vmRV#^o$E4cY+SplUTASRYm2cN9G+85}@@~HoLwV3^ zgH!9brY`?0+Pio7=n`f7R@3FF0{(@sc(7H@yvia9a7M zpV8Z?O>^eW``0+JfR#`8l!fb^vcMk-HHz1w7yG@G(bPG6=1h%;icq?_x%v9!d0mes zcSxsSK08TDUzM97{FvM6@Hvy~_Wyr*<;oR(Pti+fr#6eog)&v@yp0tu4XDaA7i^c^ zeM+Ic=fi#`wv!5-90DsJ3KC0uvRs<@*W=;q4<9z{pm@+Ru5714md+ zw|?JLIlqQC;ZlvJPfyhrFg>Zx-l&zk^bY&eVwDefoUM9HT1o^?o=oOFc5FfmzZd^g z1;dm7-B`@EJTnb;ue{UgU2Xoj_>5VziqlyINfkjxCDT*l(ht+~^Yfz(BzhiK%eaT< z)}(I<(-E6oTwKhm6jypxgT2%Ji1CJhV*V0uD?--1?&#vWk;BQtbo#?XrFU|6t2YE* zeR)JiQ|^4$zu&8~?kwE=Bk6`{f5&kdrfVm9isYyCd&I=)OS`@ZxXXRDY|8nGz!b%~ zZPTZSj5Y&zt6eu9^zUe6P3Mu{y)Ub3f>MK*!l~v!-qjQ9o=z`Qew?=|d4fy5FNxu9 zc(?yZ|DnGJ=gqqpqkga1<^p$Y(7P+g6(wGz{@V2N_6iS`A_W<~=NAnZyx-%0N_uCE z-jtImQitxCUHMX=#dYlKr`ixX^Ja~R8BKq#pLo5uck`$6!-uZPS#!;}=JIA4FylSC zZu4>9Q=2VkXJ?i8H&+U7zNtSm?6B!v<<-1LBmcCNEez;*v@}Tml49=M=uZvbg*C5U uyEbjxugf>{I_Ex4VDf3;G-$N-d!WC(U5Kr2|4n635$5UY=d#Wzp$P!u4qLha literal 0 HcmV?d00001 diff --git a/assets/images/apply1.png b/assets/images/apply1.png new file mode 100644 index 0000000000000000000000000000000000000000..2358b2b4e560a05ea1badc8a05b9952ccf66296d GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^V9db`WPSKlyb?$;76-XIG2T3>QxD{D7I;J!Gca%q zgD@k*tT_@uL8kzp5LX~AG2#E(7w3Nd{r&&{{|Wc^9C>%AoxaJddYr#iCMK|`DE!1jR@Jj1mDAJL zd#XO1@JB1ML%YsL;q>GR|D$|rtD7~XjBhV`QnP--Q#Mucd(DIP)Px&F-b&0RCr$P-EB_9AP@%NdNTD!+(7pR+(eA()9f-L=F@d`jv{JmcWLWB$rLaptl_3932j2VF z-cjj2Zz||f5{3D(RYOWW z!Kq=MkyAm1XU6$=RX{79QO8_~ss);h&S{ttYIvz6xi_GZ`f$)fbgHFU?XISp6n3GAbPsK4uk^^2SDl*(3Z9z?O3<+w$ZRNc4((+n=q|@aX?K8?cLXJ9@1(S! z$2xS(@88)3CFmakmQB3@!Lo^EQye=in+7sTbt9a0DC^MP*km0#CYL#zbtssXpmRVs z)XUwFMXB)S+N%`yupOsi(ADo$mIiR;J@~`*=n!ZH(_D0(_?oEQpjXAzM(qNZozkoyFP>9Hpbv(54z_45AZR^DL{Ummg4PAVN2o?<%V*QU{aN3fy=RGIR3Otpfl6 N002ovPDHLkV1lrpn<@YR literal 2035 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91P@n?<1ONa40RR91Pyhe`05RZ9PXGW1T}ebiRCodHn|)}NRUF56@2*>8 znXr+hn3B#>TAKyE!(v%RP$N+TbuZ3h5NSnV^he;L7osQx{bzqTSJMqtNX6ce-qfO) z!qm}=6GSqrwKd1))H!$ioa=oq_n!OQXV3d{=gtG?KF|4`-#O>|`<~x?LuZEgKl^7^G4_NyYR z^{igK`u&lSkyFuV^c%vd>gwuytd`-2epV7#TU&eg*x1+x2#Cf>D7t#}>KlF#VzrK} zByeEG6*8^$QSX*13Jl`h7T!{pqt^hDcV*J2+ zckI}4L`t_EJ$m%$<*u%-edXolLlp8jL3WIMWQ!{*Dn9P$=oqnGkxs@;1F?>(IT2lV z1>~(mTM(9f38M}a6cjwfzaz`RpJy3MrzP`TC zK_uQ~Q@jA9PC(uh&CSh&ju4NN`S|hUzn7Jjou(0&p{jYk$R(Z^E?Ttc2s+(D;Kt>u z2X=RNuLXG8qyc$7fPLC)@-#y5#5U@Dm$+y|ttZ49lx?xMz?jmwT0T2>*9u}FpTc@i zY=9=e)5bi2ZuJ;OeQgJz-8_OMmQi1FUm}+Qo)zHPEz9l1UGqR@!D@*-fk!mZr+$+c zt2h(_PE@@4h;^mrg(4{j`J1r^7k*qLkS?P)>yGd?@R|!aZ51JwE#PV*b4pKxzy<7j zm)R;*%H#@xqWc1>QYstlp%xafrzE+rQE)YaW0*=)ypUb*r`!PI3W3AJ!w&=IMi~%e zO}i}fJB}CjQm1$eN%2DB*+U>RTiQSkz<+qRJ;*)qi-z1Sfe_w!Ki#-kl3R|t;(^q9 zyIeEfW-sf)F&Q)s`Iu(jC$WWZX#uEF0i+Jgq_T%HRnU@4pZ+ zO(ui!#WSmA$+ulc(hTAGe$6ff`xpNV#l?I`Yw~05Blna?WCZ?pDi8vJ`pOLtxg4tdI$-7$g1#l>n2%t)_F7?%Ot zTT$!-3h#~d^z?}Rz^uRY-b7g1gyZ{}IoxfX+OoVKwsPgldf0lMFqe?A0RSgXNM*%G zC2)vKe7l}<(PVwg);v&Y_-C@|&8a`Mzv=s9=)& zD}EZw2|P=AEiGd#m29BQ*}N*o><?B=ecvwhAah%P!%d@e_$b!<+(oLlQXryB! zZKGFzpD@A_NEa4>YHDhx(>*)Hy2}XQIBBALGxmpCd3&fGN7s|&Ks-=bg17XrB&x#r z{0|l%`Q?y!kf_<-5F?sAQ5xVqJ}E4*yAj|9 z+h#$#QCG$?ARx@26UAQ=*3qTsW>mbEAPD>(0yola1@VDiSwW!20OW~3$1EnkjOTff zbQ|{~;^M5~8REzAx=(^W`LE$scg28WKrx^gPz)#r6a$I@#eiZ!F%S#`{{!>EVgc7Z R-pc?0002ovPDHLkV1l{)z3%`3 diff --git a/assets/images/xx1_lao.png b/assets/images/xx1_lao.png new file mode 100644 index 0000000000000000000000000000000000000000..d42bcbd6685f79bfe7c559fb76ee736cec55f5fe GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^At21i3?$W-HZ=h$#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99Gz6XFV_O)9>b+6I6OU@8gn3ugEqJyB^Zkhjm%#WAE}&fCe3d`$)d zuFsi0Z$9MxpjKi0G_68-52GH>gcVzjWmhih*ikk~P2bn*@5|XuP7l@JU21%6CwXJb zMV)lsG|Tm;@6Oeg4L`Nxl4_ut>`f2L^_@Q$iUS4Tn$O#w_kP2-oV$Hdfb*;nv z`SP`v?Z0MqYn^%fn8*L)l|QqCe*|Y7j*p(@{+g{isy0-u=FwE3PZ&I1{an^LB{Ts5 D{DOGH literal 0 HcmV?d00001 diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 0bbb4d2..1093027 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -1,97 +1,114 @@ const app = getApp(); Component({ - data: { - isShow: false, - toTop: false, - selected: 0, - color: "#444", - selectedColor: "#1890ff", - list: [ - { - iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/home.png", - selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/home1.png", - pagePath: "/pages/firstBill/index", - text: "首页", - index: 0, - }, - { - iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/ksbm.svg", - selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/ksbm.svg", - pagePath: "/pages/newEnroll/enroll/index", - // text: "消息", - index: 1, - }, - { - iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/wd.png", - selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/wd1.png", - pagePath: "/pages/mine/index", - text: "我的", - index: 2, - }, - ], - }, - lifetimes: { - show: function () { - // 页面被展示 - console.log("tabbar show"); - }, - attached: function () { - // 在组件实例进入页面节点树时执行 - console.log("tabbar attached"); - }, - detached: function () { - // 在组件实例被从页面节点树移除时执行 - }, - }, - methods: { - switchTab(e) { - const data = e.currentTarget.dataset; - const url = data.path; - wx.vibrateShort({ - type: "heavy", - success: function (e) { - console.log(e); - }, - }); + data: { + isShow: false, + toTop: false, + selected: 0, + color: "#444", + selectedColor: "#1890ff", + list: [ + { + iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/home.png", + selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/home1.png", + pagePath: "/pages/firstBill/index", + text: "首页", + index: 0, + }, + // { + // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/ksbm.svg", + // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/ksbm.svg", + // pagePath: "/pages/newEnroll/enroll/index", + // text: "消息", + // index: 1, + // }, + { + "iconPath": "../assets/images/apply.png", + "selectedIconPath": "../assets/images/apply1.png", + "pagePath": "/pages/myBill/index", + "text": "工单", + index: 1, + }, + { + "iconPath": "../assets/images/xx.png", + "selectedIconPath": "../assets/images/xx1_lao.png", + "pagePath": "/pages/message/index", + "text": "消息", + index: 2, + }, + + + { + iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/wd.png", + selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/wd1.png", + pagePath: "/pages/mine/index", + text: "我的", + index: 3, + }, + ], + }, + lifetimes: { + show: function () { + // 页面被展示 + console.log("tabbar show"); + }, + attached: function () { + // 在组件实例进入页面节点树时执行 + console.log("tabbar attached"); + }, + detached: function () { + // 在组件实例被从页面节点树移除时执行 + }, + }, + methods: { + switchTab (e) { + const data = e.currentTarget.dataset; + const url = data.path; + wx.vibrateShort({ + type: "heavy", + success: function (e) { + console.log(e); + }, + }); - if (data.index == 0 && this.data.selected == 0) { - if(this.data.toTop){ + if (data.index == 0 && this.data.selected == 0) { + if (this.data.toTop) { app.globalData.toTop = 1; } else { app.globalData.refresh = 1 } - } + } - if (!app.globalData.isLogin) { - if (data.index == 1) { - wx.navigateTo({ - url: "/pages/login/index", - }); - return; - } - } else { - if (data.index == 1) { - if (app.globalData.loginUserInfo.agencyStatus != 1) { - wx.navigateTo({ - url: "/pages/tobeAgency/index", - }); - } else { - wx.navigateTo({ - url, - }); - // wx.redirectTo({}); - } - return; - } - } - // this.setData({ - // selected: data.index, - // }); - wx.switchTab({ url }); - }, - touchMove(){ + // if (!app.globalData.isLogin) { + // if (data.index == 1) { + // wx.navigateTo({ + // url: "/pages/login/index", + // }); + // return; + // } + // } + // else { + // if (data.index == 1) { + // if (app.globalData.loginUserInfo.agencyStatus != 1) { + // wx.navigateTo({ + // url: "/pages/tobeAgency/index", + // }); + // } else { + // wx.navigateTo({ + // url, + // }); + // // wx.redirectTo({}); + // } + // return; + // } + // } + // this.setData({ + // selected: data.index, + // }); + wx.switchTab({ url }); + }, + touchMove () { return false } - }, + }, }); diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index 4e8d395..148a28f 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -1,12 +1,12 @@ - + + - + {{item.text}} diff --git a/pages/billDetail/enroll/index.wxss b/pages/billDetail/enroll/index.wxss index 660651e..48f5051 100644 --- a/pages/billDetail/enroll/index.wxss +++ b/pages/billDetail/enroll/index.wxss @@ -88,8 +88,8 @@ button[disabled]:not([type]) { } .topViewN { height: 66px; - background: #fff4f1; - border: 1px solid #ff8255; + background-color: #cee7ff; + border: 1px solid #1890ff; border-radius: 6px; display: flex; padding: 0 16px; diff --git a/pages/collect/index.wxss b/pages/collect/index.wxss index 3fe2161..8cc38f7 100644 --- a/pages/collect/index.wxss +++ b/pages/collect/index.wxss @@ -833,8 +833,8 @@ button.collect icon::before { .filterTag .specialTag > view { height: 24px; line-height: 24px; - background-color: #ffefe9; - border: 0.5px solid #ff8255; + background-color: #cee7ff; + border: 0.5px solid #1890ff; border-radius: 999px; margin-right: 8px; font-size: 12px; diff --git a/pages/collect/index1.wxss b/pages/collect/index1.wxss index 2421cc2..f21b7b0 100644 --- a/pages/collect/index1.wxss +++ b/pages/collect/index1.wxss @@ -833,8 +833,8 @@ button.collect icon::before { .filterTag .specialTag > view { height: 24px; line-height: 24px; - background-color: #ffefe9; - border: 0.5px solid #ff8255; + background-color: #cee7ff; + border: 0.5px solid #1890ff; border-radius: 999px; margin-right: 8px; font-size: 12px; diff --git a/pages/detail/index.js b/pages/detail/index.js index ee4acfa..f7860a2 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1000,7 +1000,7 @@ Page({ that.data.jobDetail = result that.showSexAge(); - result.record["jobDesp1"] = `\n${result.record.jobName}\n\n一、薪资明细\n${result.record.salaryDetail}\n\n二、招聘要求\n${(that.data.showSexAgeText + result.record.workContent) || '-'}\n\n三、其他说明\n${ result.record.otherDesp}\n\n四、注意事项\n${result.record.notes}` + result.record["jobDesp1"] = `\n${result.record.jobName}\n\n一、薪资明细\n${result.record.salaryDetail}\n\n二、招聘要求\n${(that.data.showSexAgeText + '\n' + result.record.workContent) || '-'}\n\n三、其他说明\n${ result.record.otherDesp}\n\n四、注意事项\n${result.record.notes}` that.setData({ jobDetail: result, isMaskShow: !(result.record.recruitment == "1"), diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 9b9ceef..4a502f7 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -434,7 +434,7 @@ - 加伯才客服微信 + 加客户经理微信 @@ -482,7 +482,7 @@ 申请加入伯才 - 请联系伯才客服 + 请联系客户经理 diff --git a/pages/filterPage/index.wxss b/pages/filterPage/index.wxss index a7df8ff..a172651 100644 --- a/pages/filterPage/index.wxss +++ b/pages/filterPage/index.wxss @@ -33,10 +33,10 @@ border: 1px solid transparent; } .sub .content > span.active { - background-color: #ffeee9; + background-color: #cee7ff; color: #1890ff; border-color: #1890ff; -} +}#cbe4fd .sub .content > span:not(:nth-child(3n)) { margin-right: 2%; } diff --git a/pages/firstBill/filtercss.wxss b/pages/firstBill/filtercss.wxss index 495b855..4717f8b 100644 --- a/pages/firstBill/filtercss.wxss +++ b/pages/firstBill/filtercss.wxss @@ -36,7 +36,7 @@ border: 1px solid transparent; } .sub .content > span.active { - background-color: #ffeee9; + background-color: #cee7ff; color: #1890ff; border-color: #1890ff; } diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js index bf49524..d2030e1 100644 --- a/pages/firstBill/index.js +++ b/pages/firstBill/index.js @@ -1254,7 +1254,7 @@ Page({ that.getJobList(); that.getBannerList(); that.getchannelList(); - that.searchAnimate(); + // that.searchAnimate(); }, onReady () { @@ -4732,6 +4732,11 @@ Page({ onUnload () { console.log("destory"); }, + toEnroll () { + wx.navigateTo({ + url: "/pages/newEnroll/enroll/index", + }); + }, goList () { wx.navigateTo({ url: "/pages/filterPage/index", diff --git a/pages/firstBill/index.json b/pages/firstBill/index.json index f4ef5e1..5adde71 100644 --- a/pages/firstBill/index.json +++ b/pages/firstBill/index.json @@ -5,8 +5,7 @@ "bottom-drawer": "../../components/bottom-drawer/index", "job-sub": "../../components/job-sub/index" }, - "navigationStyle": "custom", - "navigationBarTitleText": "首页", + "navigationBarTitleText": "伯才供应链", "navigationBarBackgroundColor": "#1890ff", "navigationBarTextStyle": "white", "backgroundColor": "#f5f5f5" diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml index 75d67d5..749629d 100644 --- a/pages/firstBill/index.wxml +++ b/pages/firstBill/index.wxml @@ -1,32 +1,12 @@ - + - - 搜索 - - - + --> + - + -