From 642295e23d041c331ccc2cc5815d252e7151fbf8 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Thu, 16 Jan 2025 17:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/apply.png | Bin 1349 -> 2777 bytes assets/images/apply1.png | Bin 428 -> 2523 bytes pages/IDCardWithNFC/index.wxml | 2 +- pages/billDetail/index.js | 5 ++-- pages/billDetail/index.wxml | 21 ++++++++------- pages/detail/index.json | 4 +-- pages/detail/index.wxml | 59 ++++++++++++++++++++++++++--------------- pages/detail/index.wxss | 10 ++++--- pages/detail_old/index.wxss | 3 --- pages/firstBill/index.json | 4 +-- pages/firstBill/index.wxml | 53 ++++++++++++++++++------------------ pages/firstBill/index.wxss | 2 +- pages/message/index.json | 4 +-- pages/message/index.wxml | 4 +-- pages/messageDetail/index.wxml | 6 ++--- pages/mine/index.json | 4 +-- pages/myBill/index.wxss | 4 +-- pages/setting/index.wxml | 2 +- pages/versionPage/index.wxml | 2 +- 19 files changed, 104 insertions(+), 85 deletions(-) diff --git a/assets/images/apply.png b/assets/images/apply.png index 9cb5781e5648df1a3843f4bae266a803dec17e9a..bc45b17bd86c7ddb79af460d76a039394e3d1e4a 100644 GIT binary patch literal 2777 zcmeHJYfw{377p3VczK#ALIfNx$>4y1L?eQ(0&yaVFbYNyiGYJ)gMw@b0fRs!1cC5I zAwYP~Vg`J{AR@?f1+j1zM1m_DCJ$hE41y6NMT`jS9jo@&{@>ZE-5=ej>&cr>oER zos;2vf^4L3u8%+$1si7k{&-@~VS87BdnhbN52}w6BUv3;eb{l{<-~-#F_;X@1oU zyrM~uI392u#c^jc@N z4Is2r;{#OZ!jZGam1S~?1w^?tDJ%9y5Tl>7>h+MIgf!?N`gawG?o;-m7+CdBdJc-d zM6nZq7QAg+Jzz}^y#>g)ODk@CS$!4mlO;g({5XD>ZY}W8Cjt~A4#b*dLC9OxXaJpg z6s1Fb3G%@{tN>wm5g=Z_fF|)w_VJ-3jUd)T-<*j0{w#oobaNnquLB><=X;_^wx<6Z zZtgqw#~eKDTsElM(=@`kQjCwj-v4)@P&jX4VKEx9I|V|nmBRm5JGhY0Q*sj5ZYTCJ z?pTHX#C&&HzipER*7T;s!~KCaHX6ZdrTN z04MNhe+ZulCbTwGh&b0kF!C&-G?SYLDc-5oE(C^z5VF*Mp{l_v_>POeMtl)Ho7cL0b|7} z1v?1|o|uLV%4n?n-0J$8xcDe4InIb^ zN)PIYTXJssv;1S5XxpmKZC*`GD1&jHt#K;u`mnf>;yR)P{w%-KtARVvJ z)L(EfbD?wR&M_;7X1m?piV~+UelD#0U0gPN;~Qwq_lgk4sPH!7z>MRg{W zWwYAVJr*nfgV=1QYZ{kNjgQ8pwY)0n_yNj`4blkBz1g$TXo_7BCM|?Ue-qAkD2mn8 z4lF3lv)Ho|RNR<+=vC>XJ8)VC?rlmB*BMuw+}gUJ+B{nRV;gKNcWELIE_9XRTNCyH z^&)8t+%Bw;YEV-);Qajj-LHKr4;`)=@{dTFSXciR?0Sxc%ld=P&cme~SF#O7>(z=z zwtUTl4q2mGjdXyCB_4vmXy^guA(TXQE9(v#?gc2r_e5mG@1%~qA72pQya~Z(aIcCu NcJu_P{>XRye*%3mYd-)0 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 diff --git a/assets/images/apply1.png b/assets/images/apply1.png index 2358b2b4e560a05ea1badc8a05b9952ccf66296d..a99c6ed0b8cd8f8b98ad4217e03f1976a93587b3 100644 GIT binary patch literal 2523 zcmeHJ>sOL{7JjkU#N%ifn%PY(F4JYCG%7C@a4f-5C@*O%)Edo>W|l!#l&Gj#T7sx~ zM8T0>ampij%L|QKO{O_s63e`#Wtm1<7;^L&UgmB34`!V;^JPB#p8aM2_OsT$JbPa| z!0<5tVbu=+0GQKh?mn<>{q~ScVJr(&NMVCu`*=_RMdum~0GQ^`-6?(-f_Sht|k5m?C+f3y3>T9Z} zk5cfDmyrX6b(n+MPu0|*ilV6|p7Dlef!Ntaj(r5>6lk2am$*{8xcvPkp4Kq;`5y;X z_@YBl3HSGzu8hI}iRoxEYR_6!9f$x&-XdUd0utSfE}J}g``C{FqM$69vy%YekH&=F zK^q~}^zMQ@4}hYp+xFZP0cxP1I@>oSU@pG=`9m_m=lEM$h!!lu!7aT5)@g;NE>T+GeU}5Zro#6)7Rq*$u^-o_&f_z1c%@Kw|V1y1k*K*f z@&H47kR}>-R17*9qs4JtRc1!3zIf6ELn})2BDCavBI>zQU5qh}Ll$q<0t(#ddr%}j zVljQiQCYkAfwLiwD%U1AfpGM&BixxWd&BYiCwd;)9|u-WA(JMV4{;OnJzjS5HNap3S^`SUYzg@(56GMWAMDPb1Kew8zFtNb{y`2M}BNm z=!h7W3;d}{F)Roj{*ND$OffX?fiMy*7vj?EDJPech2rWbkr@Dgdw{Lk3v2?06p{6O z4FZf%IId98;rUSGOPyhjVIAMX$^!V$Zb=}!!)nt!Mv6i6S^hDnnwU48uP@^I@d@^{ z6uxLdW?d$5N?#0(#(LXmvIf*wyp*M6LM+I)(vE9l%Jb7otdMZ+eMQk*CONLm^|XG) zA!v1%MXWr^Gw;Prdyn}MbcLo}kKozu1M>Ra0! zto&_~Bdv+=8%|8ijFF)rmd$t7_!Mv0VIVn+51q=Do}NySIAma4aTmVKV&h-|W47V4 z<7XefVi?})=oB>kYa9LR@Y!-f?w|j-s0))eo>aHA5sbab!pdfB&v>qrf!m+$sD#^t zeN%teQMpsMiJwi})Zm%*Zuhi7N6#f5({-a?aw@69U;HzUB9X66Ns5psEh{WKewfKmKrDqsK<+0I8i1&DfNy?3M= z?gsspzOEdAU-yRK=7IpP4WkV8%gLyKxnvJQ0;YTQU-kwVA>X7GPQHh?1oy{@aZlj? zq~Fq;Cero;sn&0sX|uBTLqF+K z(e$(fKg!NoQu4}Eb$9x~D2e|1OHBEo+m7?-Fh}N$SZ^)3^&~2tENZMeeSe>8_5vR~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(D 跳过 - 欢迎来到伯才伯才 + 欢迎来到伯才 为了更准确地为您推荐职位,请选择 身份信息录入方式 diff --git a/pages/billDetail/index.js b/pages/billDetail/index.js index f95bc38..9bec074 100644 --- a/pages/billDetail/index.js +++ b/pages/billDetail/index.js @@ -543,8 +543,9 @@ Page({ }); console.log(data.serveRecords); let userinfo = data.applyOrder; - if (app.isNotEmptyCheck(userinfo.agencyReturnFeeType) || userinfo.agencyReturnFeeType == "0" || userinfo.agencyReturnFee == "0") { - userinfo.fuWuFei = commonUtil.getReturnFeeTypeName1ById(userinfo.agencyReturnFeeType, userinfo.agencyReturnFee / 100) + console.log('userinfo.orderType',userinfo); + if (app.isNotEmptyCheck(userinfo.agencyReturnFeeType) || userinfo.agencyReturnFeeType == "0" || userinfo.agencyReturnFee == "0" || app.isNotEmptyCheck(userinfo.returnFee)) { + userinfo.fuWuFei = userinfo.orderType != 3 ? commonUtil.getReturnFeeTypeName1ById(userinfo.agencyReturnFeeType, userinfo.agencyReturnFee / 100) : commonUtil.getReturnFeeTypeName1ById(userinfo.returnFeeType, userinfo.returnFee / 100) } else { diff --git a/pages/billDetail/index.wxml b/pages/billDetail/index.wxml index 2259f3c..7cca00d 100644 --- a/pages/billDetail/index.wxml +++ b/pages/billDetail/index.wxml @@ -19,7 +19,7 @@ - + 参与统计 @@ -199,12 +199,12 @@ 服务费 - {{userinfo.fuWuFei ? userinfo.fuWuFei:'-'}} + {{userinfo.fuWuFei || '-'}} 服务费详情 - - {{userinfo.agencyReturnFeeDesp ? userinfo.agencyReturnFeeDesp:'-'}} + + {{userinfo.orderType != 3 ? userinfo.agencyReturnFeeDesp : userinfo.returnFeeDesp}} @@ -212,10 +212,9 @@ 政策模式 {{userinfo.zhengceTextShow ? userinfo.zhengceTextShow:'-'}} --> - + 政策模式 - {{userinfo.zhengceTextShow ||'请选择政策'}} @@ -238,11 +237,11 @@ {{userinfo.storeJobName?userinfo.storeJobName:'-'}} - + 报名企业 {{userinfo.storeName?userinfo.storeName:'-'}} - + 项目方 {{userinfo.upAgencyName?userinfo.upAgencyName:'-'}} @@ -287,7 +286,8 @@ - 驻场信息 + + 驻场信息 复制 @@ -349,7 +349,8 @@ - {{item.desp}}详情 + {{item.desp}} + 详情 diff --git a/pages/detail/index.json b/pages/detail/index.json index 4f25b71..3528ba6 100644 --- a/pages/detail/index.json +++ b/pages/detail/index.json @@ -2,8 +2,8 @@ "usingComponents": { "bottom-drawer": "../../components/bottom-drawer/index" }, - "navigationBarBackgroundColor":"#1890ff", - "navigationBarTextStyle" :"white", + "navigationBarBackgroundColor":"#fff", + "navigationBarTextStyle" :"black", "navigationBarTitleText": "", "backgroundColor": "#fff" diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 4a502f7..29252c3 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -3,7 +3,7 @@ - @@ -355,7 +355,7 @@ 复制 - {{jobDetail.record.jobDesp1}} + {{jobDetail.record.jobDesp1}} - + - + + + + + + + 收藏 @@ -409,24 +415,33 @@ 客服 --> - + - - - - - - - - - + --> + + + + + + 客服 + - + + + + + + + + + + + + + + + + @@ -509,7 +524,7 @@ - + diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss index 752521a..4a23bfc 100644 --- a/pages/detail/index.wxss +++ b/pages/detail/index.wxss @@ -176,10 +176,13 @@ button::after { margin-left: 0px; } .bottomBtn .flex-1 { - width: 55px; + flex: 1; +} +.bottomBtn .flex-2 { + flex: 2; } .bottomBtn .flex-3 { - flex: 1; + flex: 3; } button.detailBtn { width: 100% !important; @@ -194,7 +197,7 @@ button.detailBtn { border-radius: 21px; } .detailBtn1 { - width: 93% !important; + /* width: 93% !important; */ padding: 6px 0; font-size: 16px; font-weight: bold !important; @@ -206,6 +209,7 @@ button.detailBtn { background: #fff; border: 1px solid var(--color-ysd); border-radius: 21px; + box-sizing: border-box; } .bottomBox { padding-bottom: 32px; diff --git a/pages/detail_old/index.wxss b/pages/detail_old/index.wxss index 2a67112..16a3b31 100644 --- a/pages/detail_old/index.wxss +++ b/pages/detail_old/index.wxss @@ -309,9 +309,6 @@ button.collectBtn { line-height: 16px; margin-top: 2px; } -.flex-3 { - flex: 3; -} .noShow { position: absolute; top: -9999px; diff --git a/pages/firstBill/index.json b/pages/firstBill/index.json index 5adde71..68e3859 100644 --- a/pages/firstBill/index.json +++ b/pages/firstBill/index.json @@ -6,7 +6,7 @@ "job-sub": "../../components/job-sub/index" }, "navigationBarTitleText": "伯才供应链", - "navigationBarBackgroundColor": "#1890ff", - "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#fff", + "navigationBarTextStyle": "black", "backgroundColor": "#f5f5f5" } \ No newline at end of file diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml index 749629d..9741c77 100644 --- a/pages/firstBill/index.wxml +++ b/pages/firstBill/index.wxml @@ -4,7 +4,32 @@ --> - + + + + + {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}} + + + + + + + + + {{item}} + + + + + + + 搜索 + + + + + - - - {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}} - - - - - - - - - {{item}} - - - - - - - 搜索 - - - - - @@ -176,7 +177,7 @@ 附近 - 最近更新 + 最新 diff --git a/pages/messageDetail/index.wxml b/pages/messageDetail/index.wxml index 6ec3565..92bc685 100644 --- a/pages/messageDetail/index.wxml +++ b/pages/messageDetail/index.wxml @@ -1,7 +1,7 @@ - 伯才伯才欢迎您 + 伯才欢迎您 - 伯才伯才(以下简称“伯才”),让天下没有难做的劳务。 + 伯才(以下简称“伯才”),让天下没有难做的劳务。 伯才秉承“资源共享、伙伴共赢”的理念,为合作伙伴提供海量项目内容分发及流量分佣。在伯才,您可以享受项目查看、老乡报名、面试跟踪、财务结算等一站式服务,省时、省心、省力。 如果您还现在不是伯才的合作代理,您可以在此 @@ -11,7 +11,7 @@ 感谢您的支持与合作! - 伯才伯才运营中心 + 伯才运营中心 2023年6月16日 diff --git a/pages/mine/index.json b/pages/mine/index.json index c63875d..7a109c9 100644 --- a/pages/mine/index.json +++ b/pages/mine/index.json @@ -3,7 +3,7 @@ "bottom-drawer": "../../components/bottom-drawer/index" }, "navigationBarTitleText": "我的", - "navigationBarBackgroundColor": "#1890ff", - "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#fff", + "navigationBarTextStyle": "black", "backgroundColor": "#f5f5f5" } \ No newline at end of file diff --git a/pages/myBill/index.wxss b/pages/myBill/index.wxss index 462aa33..5bb6be4 100644 --- a/pages/myBill/index.wxss +++ b/pages/myBill/index.wxss @@ -159,7 +159,7 @@ page { z-index: 999; } .weui-tabs-bar__item { - margin: 0 8px; + margin: 0 ; } .weui-tabs { @@ -192,7 +192,7 @@ page { } .weui-tabs-bar__title { - margin: 0px 10px; + margin: 0px 8px; } .tab-bar-title__selected { diff --git a/pages/setting/index.wxml b/pages/setting/index.wxml index 59420ed..1b9c0f8 100644 --- a/pages/setting/index.wxml +++ b/pages/setting/index.wxml @@ -28,7 +28,7 @@ - 关于伯才伯才 + 关于伯才 版本{{version}} diff --git a/pages/versionPage/index.wxml b/pages/versionPage/index.wxml index 1ef46dd..2ecf59a 100644 --- a/pages/versionPage/index.wxml +++ b/pages/versionPage/index.wxml @@ -1,6 +1,6 @@ - +

伯才

Version {{version}}