diff --git a/assets/iconfont-weapp/iconfont-weapp-icon.wxss b/assets/iconfont-weapp/iconfont-weapp-icon.wxss index bdaa10b..cb5e054 100644 --- a/assets/iconfont-weapp/iconfont-weapp-icon.wxss +++ b/assets/iconfont-weapp/iconfont-weapp-icon.wxss @@ -10,11 +10,23 @@ -.t-icon-wodedaili { +.t-icon-zanwu { + background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-zanwu%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M258.403756%20334.122066L1.201878%20639.399061h1010.779343L754.779343%20334.122066z%22%20fill%3D%22%23B1B8C1%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M210.328638%200h606.948357c28.84507%200%2042.065728%2014.422535%2042.065728%2043.267606v734.347417c0%2028.84507-14.422535%2043.267606-42.065728%2043.267606H210.328638c-28.84507%200-42.065728-14.422535-42.065727-43.267606V43.267606C167.061033%2014.422535%20181.483568%200%20210.328638%200z%22%20fill%3D%22%23F5F5F7%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M721.126761%20679.061033c0%2033.652582-27.643192%2061.295775-62.497653%2061.295775H354.553991c-34.85446%200-62.497653-27.643192-62.497653-61.295775%200-21.633803-18.028169-39.661972-39.661972-39.661972H1.201878v306.478873c0%2038.460094%2031.248826%2069.70892%2070.910798%2069.70892h868.957747c19.230047%200%2037.258216-7.211268%2050.478873-20.431924s20.431925-31.248826%2020.431925-49.276996V639.399061H760.788732c-22.835681%201.201878-39.661972%2018.028169-39.661971%2039.661972zM287.248826%2069.70892h450.704226c15.624413%200%2024.037559%208.413146%2024.037558%2024.037559v230.760563c0%2015.624413-8.413146%2024.037559-24.037558%2024.037559H287.248826c-15.624413%200-24.037559-8.413146-24.037558-24.037559V92.544601c1.201878-15.624413%208.413146-22.835681%2024.037558-22.835681zM284.84507%20459.117371h456.713615c13.220657%200%2020.431925%207.211268%2020.431925%2020.431925%200%2014.422535-7.211268%2020.431925-20.431925%2020.431925h-456.713615c-13.220657%200-20.431925-7.211268-20.431924-20.431925s7.211268-20.431925%2020.431924-20.431925zM284.84507%20556.469484h456.713615c13.220657%200%2020.431925%207.211268%2020.431925%2020.431924%200%2014.422535-7.211268%2020.431925-20.431925%2020.431925h-456.713615c-13.220657%200-20.431925-7.211268-20.431924-20.431925s7.211268-20.431925%2020.431924-20.431924z%22%20fill%3D%22%23DEE0E4%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); +} + +.t-icon-zhuyi { + background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-zhuyi%22%20viewBox%3D%220%200%201173%201024%22%3E%3Cpath%20d%3D%22M585.205619%200.000039c57.785105%200%20110.591996%2029.987445%20140.729103%2079.50572L1145.699875%20768.291456c31.231999%2051.345721%2032.913722%20115.711996%204.387446%20168.593717A165.009717%20165.009717%200%200%201%201004.89988%201024H165.365635c-60.632613%200-116.223996-33.646276-145.041717-87.039997a169.617717%20169.617717%200%200%201%204.387446-168.668547L444.405625%2079.505759A164.277163%20164.277163%200%200%201%20585.205619%200.000039z%22%20fill%3D%22%23FFD112%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M592.519342%20699.246289c-48.490337%200-87.768612%2040.959998-87.768612%2091.427443%200%2050.467444%2039.278275%2091.427443%2087.768612%2091.427443%2048.494275%200%2087.77255-40.959998%2087.772551-91.427443%200-50.467444-39.278275-91.427443-87.772551-91.427443zM592.519342%20234.058861c-36.351999%200-65.827444%2030.719999-65.827443%2068.533167v259.58399c0%2037.813168%2029.475445%2068.533167%2065.827443%2068.533166%2036.351999%200%2065.831382-30.719999%2065.831382-68.533166V302.592028c0-37.813168-29.479383-68.533167-65.831382-68.533167z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); +} + +.t-icon-hongbao { + background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-hongbao%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M151.6544%200h716.8c51.2%200%2076.8%2025.6%2076.8%2076.8v870.4c0%2051.2-25.6%2076.8-76.8%2076.8h-716.8c-51.2%200-76.8-25.6-76.8-76.8v-870.4c0-51.2%2025.6-76.8%2076.8-76.8z%22%20fill%3D%22%23D73C1E%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M868.4544%200c42.417231%200%2076.8%2034.382769%2076.8%2076.8l0.027569%20275.8144c-122.289231%2051.968-272.64%2082.5856-435.2%2082.5856C347.4944%20435.2%20197.12%20404.558769%2074.830769%20352.6144L74.8544%2076.8C74.8544%2034.382769%20109.241108%200%20151.6544%200h716.8z%22%20fill%3D%22%23F14C2E%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M382.058338%20409.6c0%2084.834462%2068.765538%20153.6%20153.6%20153.6%2084.830523%200%20153.6-68.765538%20153.6-153.6a153.6%20153.6%200%200%200-307.2%200z%22%20fill%3D%22%23F7D49A%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M546.7136%20512h-21.909662v-51.2H459.035569v-20.48h65.764431V409.6H459.039508v-20.48h53.504l-53.681231-70.8096L477.672369%20307.2l54.3232%2071.68h12.469169l48.561231-67.84%2018.2272%2011.393969L563.483569%20389.12h48.970831v20.48h-63.6416l-2.095262%202.945969v27.774031h65.736862v20.48h-65.7408z%22%20fill%3D%22%23E98337%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); +} + +.t-icon-wodedaili1 { background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-wodedaili1%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M353.004571%20696.947649a43.057162%2043.057162%200%200%200-57.40955%2063.728885l34.435019%2031.275351H62.904262a43.057162%2043.057162%200%201%200%200%2086.060771h274.56974l-43.914021%2044.18179a43.057162%2043.057162%200%200%200%2060.836986%2060.836985l116.800585-117.068354a42.73584%2042.73584%200%200%200-1.445949-61.961613l-116.747032-107.053815z%22%20fill%3D%22%2300BC5D%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M910.016443%20207.359866H719.044004V123.173474c0-67.906072-52.214842-123.012813-116.747032-123.173474h-185.295748C352.522588%200.160661%20300.254192%2055.213849%20300.039977%20123.173474v84.186392H113.512494A106.411171%20106.411171%200%200%200%2036.234527%20240.830919%20118.03232%20118.03232%200%200%200%204.102317%20321.964751v359.934313c0.107107%2022.064118%2017.137179%2039.897495%2038.023116%2039.897495%2020.993044%200%2038.023116-17.833377%2038.130223-39.897495v-80.116312c10.924952%203.962973%2022.438994%205.998013%2034.00659%206.10512h794.468908c11.781811-0.267768%2023.456514-2.677684%2034.488573-6.961979v307.880132c0%2019.011558-14.620156%2034.435019-32.667748%2034.435019H526.143633c-20.885937%200.160661-37.755348%2018.101145-37.755348%2040.11171%200%2021.957011%2016.869411%2039.897495%2037.755348%2040.058155h383.819256c28.91899%200.053554%2056.713352-11.942472%2077.224413-33.471052%2020.511061-21.475027%2032.132211-50.661785%2032.13221-81.133832V320.893677c-0.696198-63.032687-49.483604-113.694472-109.356623-113.533811zM376.943068%20123.173474c0-23.724282%2018.31536-43.003609%2040.915015-43.003608h185.295748c22.438994%200.160661%2040.593693%2019.33288%2040.593693%2043.003608v84.186392H376.193316L376.943068%20123.173474z%20m533.073375%20403.794781H114.744229a33.149731%2033.149731%200%200%201-24.366927-10.335861%2036.791381%2036.791381%200%200%201-10.1752-25.491554V324.642435c0-19.76131%2015.2628-35.773861%2034.060144-35.773861h794.468908a33.149731%2033.149731%200%200%201%2024.366926%2010.282307c6.479996%206.747764%2010.1752%2015.905444%2010.175201%2025.491554v167.837247c-0.696198%2019.439987-16.066105%2034.809895-34.542127%2034.435019h1.285289z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); } -.t-icon-wodebaoming { +.t-icon-wodebaoming3 { background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-wodebaoming3%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M985.097673%20802.554394h-121.129919v-119.481553a30.170091%2030.170091%200%200%200-30.269992-29.870389%2030.170091%2030.170091%200%200%200-30.269992%2029.870389v119.481553h-121.129919a30.170091%2030.170091%200%200%200-30.269992%2029.820437c0%2016.383758%2013.636482%2029.820438%2030.269992%2029.820438h120.980068v119.481553c0%2016.383758%2013.636482%2029.870388%2030.269992%2029.870388%2016.63351%200%2030.269992-13.48663%2030.269992-29.870388v-119.481553h121.27977c16.58356%200%2030.220042-13.43668%2030.220042-29.820438a30.170091%2030.170091%200%200%200-30.220042-29.820437z%22%20fill%3D%22%2300BC5D%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M509.369283%20532.971642c-150.600703%200-278.024383-113.887099-278.024383-260.242011C237.139156%20126.374719%20358.76858%2012.48762%20509.369283%2012.48762c150.600703%200%20278.024383%20113.887099%20278.024382%20260.242011%200%20140.96026-121.629424%20260.242011-278.024382%20260.242011z%20m0-460.843146c-115.885118%200-214.287568%2092.158639-214.287568%20200.601135%200%20108.392546%2098.402449%20200.601136%20214.287568%20200.601136%20115.885118%200%20214.287568-92.158639%20214.287568-200.601136%200-108.442496-92.658144-200.601136-214.287568-200.601135z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M41.732871%201011.49726c-15.334798%200-25.574647-9.540542-25.574647-23.976232%200-253.798399%20230.271722-459.794186%20516.887587-459.794186%20122.828235%200%20164.636789%2023.776429%20240.261819%2064.486072%2010.239849%209.590493%2024.325885%2025.075142%2014.086035%2039.460881-9.390691%2013.236878-26.92331%2013.236878-52.547907%200-59.491024-34.16613-126.774323-51.249194-201.799947-51.249195-255.896319%200-460.593394%20182.019556-460.593394%20407.096428-5.094949%2014.435689-15.334798%2023.976231-30.719546%2023.976232z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); } @@ -22,6 +34,6 @@ background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-wodeshoucang%22%20viewBox%3D%220%200%201068%201024%22%3E%3Cpath%20d%3D%22M390.050566%20601.303068a41.700582%2041.700582%200%200%201-41.649727-41.649728c0-17.239631%202.135883-35.191223%206.458505-51.668038a202.552949%20202.552949%200%200%201%20139.290114-142.900775%20216.487046%20216.487046%200%200%201%2056.702621-7.882427%2041.700582%2041.700582%200%200%201%200%2083.299455c-11.493087%200-22.986174%201.423922-33.716446%204.983728a121.135105%20121.135105%200%200%200-82.587494%2084.723378%20110.70996%20110.70996%200%200%200-4.271767%2030.919456%2039.666407%2039.666407%200%200%201-40.225806%2040.174951z%22%20fill%3D%22%2300BC5D%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M817.176406%201023.496033a75.773009%2075.773009%200%200%201-28.732718-5.59398l-244.812929-99.928834a24.410097%2024.410097%200%200%200-18.714408%200l-244.812929%2099.928834a75.823863%2075.823863%200%200%201-73.687979-8.746952c-21.867378-15.612291-33.055339-41.192038-31.224583-67.432892l19.32466-263.527336a22.833611%2022.833611%200%200%200-5.59398-17.493903L18.457697%20458.351438a75.773009%2075.773009%200%200%201-14.391786-73.026872c8.136699-25.630602%2028.732718-44.345009%2054.36332-50.600097l256.661997-63.059417a24.003262%2024.003262%200%200%200%2015.002038-10.628563L469.332527%2036.260182A75.773009%2075.773009%200%200%201%20534.273555%200.001017a75.773009%2075.773009%200%200%201%2064.941028%2036.20831l139.290115%20224.827162a21.867378%2021.867378%200%200%200%2014.951184%2010.628563l256.661997%2063.059417a76.48497%2076.48497%200%200%201%2039.971533%20123.626969L879.574716%20660.090717a22.833611%2022.833611%200%200%200-5.593981%2017.493903l19.32466%20263.527337a76.434116%2076.434116%200%200%201-31.224582%2067.432892c-13.730679%209.967456-29.342971%2014.951184-44.955262%2014.951184zM534.273555%20844.285239c12.510175%200%2024.969495%202.542718%2036.20831%207.526447l244.812929%2099.877979c0.610252%200%202.491864%201.271359%204.373476-0.610252%201.830757-1.220505%201.830757-3.763223%201.830757-4.373476l-19.32466-263.527336a96.063902%2096.063902%200%200%201%2022.477631-69.314504l170.463842-201.688425c0.610252-0.610252%201.881612-1.881612%200.610253-4.373476-0.610252-2.491864-2.491864-3.102116-3.051262-3.102116l-256.712852-63.059417a95.504504%2095.504504%200%200%201-58.685941-43.124504l-139.23926-224.776308c-0.661107-0.661107-1.271359-2.542718-3.763223-2.542718-2.491864%200-3.763223%201.881612-3.763223%202.542718L391.271071%20298.516159c-13.120427%2021.867378-34.326699%2036.818563-58.685941%2043.07365l-256.661997%2063.059417c-0.610252%200-2.542718%200.661107-3.15297%203.15297-0.610252%202.491864%200.661107%203.712369%200.661106%204.373476L243.895112%20613.813242c16.324252%2019.222951%2024.410097%2044.141592%2022.477631%2069.314504l-19.32466%20263.527337c0%200.610252%200%202.542718%201.830757%204.373475%201.881612%201.220505%203.763223%200.610252%204.373476%200.610253l244.812929-99.928834c11.187961-5.593981%2023.74899-7.475592%2036.20831-7.475592z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); } -.t-icon-shezhi { +.t-icon-shezhi4 { background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-shezhi4%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M684.085863%204.715797c58.87975%2022.647661%20113.238303%2054.353343%20163.054822%2099.643456%2013.589638%2013.589638%2022.647661%2031.705683%2018.121253%2054.353343l-9.063231%2063.411366c-4.531616%2049.821728%2022.647661%2099.643456%2063.411366%20117.759501l54.353344%2027.179276c20.381853%208.151699%2033.424572%2023.642532%2039.133365%2043.164941l1.63034%206.656787c4.531616%2031.705683%209.063231%2063.411366%209.063231%2095.11184%200%2031.710892-4.531616%2063.416575-9.063231%2095.122258-4.531616%2022.647661-18.116045%2040.763705-36.23209%2049.821727l-54.353343%2027.174068c-45.295321%2022.647661-72.469388%2067.942982-63.411366%20117.764709l9.063231%2063.411366c0%2022.647661-4.531616%2040.763705-18.126462%2054.353344-45.290112%2045.290112-99.643456%2076.995795-158.523207%2099.643455-18.116045%209.063231-40.763705%204.531616-54.353343-9.063231l-54.348135-40.758497c-36.237299-27.179276-90.590642-27.179276-126.822732%200l-63.411365%2040.763706c-13.589638%209.058022-22.647661%2013.589638-36.23209%2013.589638-4.531616%200-13.594847%200-18.121254-4.531616-58.87975-22.647661-113.233094-54.353343-163.054822-99.643455-13.589638-13.594847-22.647661-31.705683-18.116044-54.353344l4.531615-67.942981c4.526407-49.821728-22.652869-99.643456-63.416575-117.759501l-54.348134-27.179276c-18.121254-4.531616-31.705683-22.642452-36.237299-45.290112C4.6873%20575.412882%200.155685%20543.707199%200.155685%20512.001516s4.531616-63.411366%209.063231-95.11184c4.526407-22.652869%2018.110836-40.768914%2036.23209-49.826937l54.348134-27.179276c45.295321-22.642452%2067.942982-67.937773%2063.411366-117.759501l-4.531615-63.411366c0-22.647661%204.531616-40.763705%2018.121253-54.353343C222.095465%2059.069141%20276.4436%2027.363458%20335.328559%204.715797c22.647661-9.063231%2040.763705-4.531616%2058.879751%209.058023l54.353343%2040.763705c36.23209%2027.174067%2090.585433%2027.174067%20126.822732%200l54.348135-40.763705c18.121254-13.589638%2036.237299-18.116045%2054.353343-9.063232z%20m-18.116045%2072.469389l-49.821728%2036.232089c-36.237299%2027.179276-81.53262%2040.763705-131.354347%2036.237299-27.174067%200-58.87975-13.589638-86.053818-36.237299l-45.295321-31.705683c-45.295321%2018.121254-86.059026%2045.295321-122.291116%2077.001004l9.058022%2054.353344c9.058022%2086.053818-36.237299%20163.054822-108.706687%20199.286911l-49.821727%2022.647661c-4.531616%2027.179276-4.531616%2054.353343-4.531616%2077.001004%200%2022.647661%200%2049.821728%204.531616%2076.995795l49.821727%2022.64766c72.469388%2036.237299%20117.764709%20113.238303%20108.706687%20199.292121l-4.531615%2058.87975c36.237299%2031.705683%2077.001004%2058.884959%20122.296325%2077.001004l49.821728-36.237299c27.174067-27.174067%2063.411366-40.763705%20104.175071-40.763705h22.642452c31.705683%204.531616%2063.411366%2018.121254%2090.590642%2040.763705l45.290112%2031.705683c45.295321-18.116045%2086.059026-45.290112%20122.296325-76.995795l-9.063231-54.353343c-9.058022-86.059026%2036.237299-163.054822%20108.706687-199.286912l49.821728-22.652869c4.531616-27.174067%204.531616-49.821728%204.531615-76.995795%200-22.647661%200-49.821728-4.531615-77.001004l-49.821728-22.647661c-72.469388-36.23209-117.764709-113.233094-108.706687-199.286911l4.531615-58.884959c-36.23209-31.705683-77.001004-58.87975-122.291116-76.995795z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M511.96781%20724.878065c-113.227885%200-208.350143-95.11184-208.350142-208.350142%200-113.233094%2095.122258-208.350143%20208.350142-208.350143%20113.238303%200%20208.350143%2095.117049%20208.350143%20208.350143%200%20113.238303-95.11184%20208.350143-208.350143%20208.350142z%20m0-335.167665c-67.937773%200-126.817523%2058.87975-126.817523%20126.817523%200%2067.942982%2058.87975%20126.822732%20126.822732%20126.822731%2067.937773%200%20126.817523-58.87975%20126.817523-126.822731%200-67.937773-58.87975-126.817523-126.817523-126.817523z%22%20fill%3D%22%2300B666%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); } diff --git a/assets/iconfont/iconfont.wxss b/assets/iconfont/iconfont.wxss index 3ad282c..7bf4fc9 100644 --- a/assets/iconfont/iconfont.wxss +++ b/assets/iconfont/iconfont.wxss @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4374774 */ - src: url('//at.alicdn.com/t/c/font_4374774_b0kukqdv6v8.woff2?t=1703562167991') format('woff2'), - url('//at.alicdn.com/t/c/font_4374774_b0kukqdv6v8.woff?t=1703562167991') format('woff'), - url('//at.alicdn.com/t/c/font_4374774_b0kukqdv6v8.ttf?t=1703562167991') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4374774_rxfy5vyoct9.woff2?t=1703661775751') format('woff2'), + url('//at.alicdn.com/t/c/font_4374774_rxfy5vyoct9.woff?t=1703661775751') format('woff'), + url('//at.alicdn.com/t/c/font_4374774_rxfy5vyoct9.ttf?t=1703661775751') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zanwu:before { + content: "\e6ec"; +} + .icon-qingchu1:before { content: "\e723"; } diff --git a/pages/collect/index.js b/pages/collect/index.js index 9216595..dc46fc2 100644 --- a/pages/collect/index.js +++ b/pages/collect/index.js @@ -35,18 +35,6 @@ Page({ storeJobListSearchForm: { pageNum: 1, pageSize: 20, - classify: 1, - sex: -1, - workTypeStr: "", - lat: "", - lng: "", - jobClassify: "", - sortTag: 0, - jobSpecialLabelIds: "", - cityName: "", - brandIds: "", - jobCategoryLabelIds: "", - ucj: 1, }, loading: true, topJobList: [], @@ -750,28 +738,16 @@ Page({ pageShow: false, }); return new Promise(function (resolve, reject) { - if (that.data.storeJobListSearchForm.sortTag == 2) { - //如果按照距离排序，拼接上坐标 - that.data.storeJobListSearchForm.lng = app.globalData.lng; - that.data.storeJobListSearchForm.lat = app.globalData.lat; - } - - console.log(that.data.inputVal); - that.data.storeJobListSearchForm.cityName = that.data.searchCityParamStorage.name; - if (app.isEmptyCheck(that.data.searchCityParamStorage.name)) { - that.data.storeJobListSearchForm.cityName = "全国"; - } - that.data.storeJobListSearchForm.keys = that.data.inputVal == "搜索工作" ? "" : that.data.inputVal; - // debugger; + wx.showLoading({ title: "加载中...", }); console.log(that.data.storeJobListSearchForm); let url = ''; if(that.data.from == 'shoucang'){ - url = '/overall/store/job/list' + url = '/assistant/job/collect/list' }else if(that.data.from == 'baoming'){ - url = '/yishoudan/user/apply/order/mine' + url = '/assistant/mine/info' } @@ -784,11 +760,11 @@ Page({ console.log("职位列表↓↓↓↓"); console.log(res); if(that.data.from == 'baoming'){ - res.data.data.recordList = res.data.data.list + res.data.data.recordList = res.data.data.pageBean.recordList } that.setData({ - totalPage: res.data.data.pageCount, - currPage: res.data.data.currentPage, + totalPage: res.data.data.pageBean.pageCount, + currPage: res.data.data.pageBean.currentPage, }); setTimeout(function () { @@ -796,8 +772,8 @@ Page({ triggered: false, }); }, 1000); - if (res.data.data.recordList == null || res.data.data.recordList.length == 0 || res.data.data.recordList.length < that.data.storeJobListSearchForm.pageSize) { - var jobListTemp = commonUtil.disposeJobListData(res.data.data.recordList); + if (res.data.data.pageBean.recordList == null || res.data.data.pageBean.recordList.length == 0 || res.data.data.pageBean.recordList.length < that.data.storeJobListSearchForm.pageSize) { + var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); that.data.recordList = that.data.recordList.concat(jobListTemp); that.setData({ @@ -806,7 +782,7 @@ Page({ isTrigger: false, }); } else { - var jobListTemp = commonUtil.disposeJobListData(res.data.data.recordList); + var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); that.data.recordList = that.data.recordList.concat(jobListTemp); that.setData({ @@ -826,25 +802,6 @@ Page({ }); resolve(); - that.data.recordList.forEach((item, index) => { - // console.log(item); - if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") { - item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(item.returnFeeType, item.returnFee); - } else { - item["fuWuFei"] = ""; - } - // 简版弹窗通告显示 - if (item.id == that.data.currentJobDrawer.id) { - item["jobDesp"] = item.jobDesp.replace(/\*\*\*\*\*/g, "").split("————————")[0]; - // 展示用字段 - item["jobDesp1"] = item.jobDesp.replace("⚠", ""); - item["jobDesp1"] = item.jobDesp1.replace("[红包]", ""); - that.data.currentJobDrawer = { - ...item, - index: that.data.currentJobDrawer.index ? that.data.currentJobDrawer.index : null, - }; - } - }); that.setData({ recordList: that.data.recordList, currentJobDrawer: that.data.currentJobDrawer, @@ -873,7 +830,7 @@ Page({ var that = this; if (this.data.isLogin) { wx.navigateTo({ - url: "../detail/index?storeJobId=" + e.currentTarget.dataset.id + "&wxCode=" + that.data.wxCode+ "&fromShoucangOrBaoming="+that.data.from, + url: "../detail/index?storeJobId=" + e.currentTarget.dataset.id, }); } else { wx.navigateTo({ diff --git a/pages/collect/index.wxml b/pages/collect/index.wxml index b9cb445..11bdcdc 100644 --- a/pages/collect/index.wxml +++ b/pages/collect/index.wxml @@ -34,24 +34,12 @@ - - 郑州一才工作 + + {{item.agencyName}} - 1分钟前 + {{item.updateTime}} - - - - - diff --git a/pages/detail/index.js b/pages/detail/index.js index 7f9fc6b..fd05374 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1,43 +1,12 @@ const app = getApp(); const commonUtil = require("../../utils/commonUtil"); +const dateUtil = require("../../utils/dateUtil"); const { wxml, style } = require("./demo.js"); var QQMapWX = require("../../utils/qqmap-wx-jssdk.min.js"); var qqmapsdk; Page({ data: { - text:`【郑州港区富士康ID小时工】 - - 🔥短期高价小时工 - 🔥紧跟市场最高价 - 🔥恒温车间、工时稳定 - - 🚻男女 18-48，简单识字，会写自己名字，认识26个字母，需要身份证原件，纹身烟疤需提前确认 - - 💰薪资待遇： - 【制造部门－关键工站】 - 23元/H(含税) - 【制造部门-一般工站】 - 22.5元/H(含税) - 【非制造部门】 - 22元/H(含税) - 差价补贴至2024/2/29，自2024/3/1起，仅享有同工同酬，次月25号在职享有上月差价，28号发放(发放时无需在职)，每月7号发同工同酬（发放上月1-30日薪资），次月25号在职享有上月差价，28号发放(发放时无需在职），无押金 - - 📣生产苹果手机，岗位有打螺丝、小零件的组装、质检岗位等 - ⏰早晚8:00-8：00，两班倒，一个月倒一次班，有站有坐，随机分配，需要过安检，恒温车间，静电衣 - ❇️缴纳商保68元/月，面试通过后，厂区统一体检50元 - - 🍱厂区餐厅，吃饭自费，可刷卡吃饭，刷多少扣多少 - 🏠住宿150元/月，6-8人间，空调、热水俱全 - - 注意： - 1. 面试不要穿奇装异服 - 2. 申请报名: 身份证正反面+个人实名手机号 - 3. 员工工作不满七天无工资 - - ———————— - 服务费：费用待定，入职后出利润名单，含税5% - `, isLogin: false, statusBarHeight: wx.getStorageSync("statusBarHeight"), // 状态栏高度 @@ -52,8 +21,6 @@ Page({ //职位ID searchForm: { storeJobId: "", - lng: "", - lat: "", }, fullScreen: false, bclr: "", @@ -197,98 +164,7 @@ Page({ }, onLoad (query) { var that = this; - - - // let systemInfo = wx.getSystemInfoSync(); - // let rect = wx.getMenuButtonBoundingClientRect ? wx.getMenuButtonBoundingClientRect() : null; //胶囊按钮位置信息 - // wx.getMenuButtonBoundingClientRect(); - // let navBarHeight = (function() { //导航栏高度 - // let gap = rect.top - systemInfo.statusBarHeight; //动态计算每台手机状态栏到胶囊按钮间距 - // return 2 * gap + rect.height; - // })(); - - console.log((wx.getMenuButtonBoundingClientRect().top - wx.getWindowInfo().statusBarHeight) * 2 + wx.getMenuButtonBoundingClientRect().height + wx.getWindowInfo().statusBarHeight); - - console.log(wx.getWindowInfo().screenTop) - - - - - - - - - console.log(app.globalData.loginUserInfo); - qqmapsdk = new QQMapWX({ - key: "5PTBZ-YI7C6-MZGS3-ES7QN-4T5O2-EJFVR", - }); - - that.setData({ - isAgency: app.globalData.loginUserInfo.agencyStatus == 1 ? true : false, - corpUserFlag: app.globalData.loginUserInfo.corpUserFlag, - managerRoleClassify: app.globalData.loginUserInfo.managerRoleClassify, - userInfo: app.globalData.loginUserInfo, - }); - that.widget = that.selectComponent(".widget"); - wx.getSystemInfo({ - success: (res) => { - console.log("手机信息res" + res.model); - let modelmes = res.model; - console.log(modelmes.search("iPhone X")); - if (modelmes.search("iPhone 12 Pro") != -1 || modelmes.search("iPhone X") != -1 || modelmes.search("iPhone XR") != -1 || modelmes.search("iPhone XS max") != -1 || modelmes.search("iPhone 11") != -1) { - that.setData({ - pbtm: 40, - }); - } else { - } - }, - }); - console.log(query); - if (app.isNotEmptyCheck(query.fromShoucangOrBaoming)) { - that.setData({ - fromShoucangOrBaoming: query.fromShoucangOrBaoming - }) - } - console.log("HHHHHHHHHHHHH" + query.storeJobId); - if (app.isNotEmptyCheck(query.storeJobId)) { - console.log("HHHHHHHHHHHHH"); - this.data.searchForm.storeJobId = query.storeJobId; - } else if (app.isNotEmptyCheck(query.scene)) { - console.log("XXXXXXXXXXXX") - //扫小程序码携带参数 - var sceneStr = decodeURIComponent(query.scene); - var sceneJson = commonUtil.sceneToJson(sceneStr); - console.log("sceneJson===", sceneJson); - let arr = sceneJson.i.split('_') - if (arr[0] > 0) { - wx.setStorageSync("applyUserId", arr[0]); - } - if (arr[1] > 0) { - wx.setStorageSync("agencyId", arr[1]); - app.globalData.agencyId = arr[1] - } - if (arr[2] > 0) { - this.data.searchForm.storeJobId = arr[2]; - } - - // wx.setStorageSync("agencyId", sceneJson.agencyId); - - that.setData({ - fromScene: true - }) - - } - if (app.isNotEmptyCheck(query.from)) { - that.setData({ - fromScene: true - }) - } - - - - - // this.data.wxCode = query.wxCode; - // this.getLocation(); + this.data.searchForm.storeJobId = query.storeJobId; this.getStoreJobDetailById(); // that.setData({ // wxCode: that.data.wxCode @@ -298,12 +174,7 @@ Page({ data: query.storeJobId, }); - let agencyUserId = query.agencyUserId; - if (agencyUserId) { - wx.setStorageSync("storageSyncAgencyUserId", agencyUserId); - console.log("agencyUserId", agencyUserId); - app.globalData.isCommission = 1; - } + }, backIndex () { wx.switchTab({ @@ -729,7 +600,7 @@ Page({ roundRect1(ctx, 24 * 2, baseTop - 100, 1104, roundRectHeight, 32, "#fff"); console.log(that.data.jobDetail.store); - that.data.jobDetail.storeJob.jobSpecialLabelNames.forEach((item1, index) => { + that.data.jobDetail.jobSpecialLabelNames.forEach((item1, index) => { // console.log(item1); // console.log(ctx.measureText(item1).width); if (index <= 2) { @@ -743,10 +614,10 @@ Page({ fillTextLineBreak(ctx, that.data.jobDetail.store.aliasName, logoLeft, baseTop, 500 * 2, 20, "#333", titleSize, "600"); // 岗位标题 console.log(630); - fillTextLineBreak(ctx, that.data.jobDetail.storeJob.hourlyPay, salaryClassifyValueLeft, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", titleSize, "600"); // 时薪 - fillTextLineBreak(ctx, that.data.jobDetail.storeJob.monthlyPay, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.storeJob.monthlyPay).width, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", monthlyPaySize, "400"); // 月工资 + fillTextLineBreak(ctx, that.data.jobDetail.hourlyPay, salaryClassifyValueLeft, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", titleSize, "600"); // 时薪 + fillTextLineBreak(ctx, that.data.jobDetail.monthlyPay, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.monthlyPay).width, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", monthlyPaySize, "400"); // 月工资 fillTextLineBreak(ctx, that.data.jobDetail.store.districtStr + "丨", salaryClassifyValueLeft, baseTop + ageTop, 300 * 2, 20, "#333", monthlyPaySize); // 省市年龄 - fillTextLineBreak(ctx, that.data.jobDetail.storeJob.age, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.store.districtStr + "丨").width, baseTop + ageTop, 300 * 2, 20, "#333", monthlyPaySize); // 省市年龄 + fillTextLineBreak(ctx, that.data.jobDetail.age, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.store.districtStr + "丨").width, baseTop + ageTop, 300 * 2, 20, "#333", monthlyPaySize); // 省市年龄 // let src // src = that.data.jobDetail.store.logo.indexOf("https") > -1 ? that.data.jobDetail.store.logo : that.data.jobDetail.store.logo.replace("http", "https") console.log(that.data.jobDetail.store.logo); @@ -867,125 +738,61 @@ Page({ }); wx.request({ // url: app.globalData.ip + "/store/job/getStoreJobDetailById?storeJobId=" + that.data.searchForm.storeJobId, - url: app.globalData.ip + "/overall/store/job/getStoreJobDetailById?storeJobId=" + that.data.searchForm.storeJobId, - method: "POST", + url: app.globalData.ip + "/assistant/job/get/" + that.data.searchForm.storeJobId, + method: "get", header: app.globalData.headers, data: that.data.searchForm, success: function (res) { console.log(res); if (res.data.status == 200) { var result = res.data.data; - var title = result.storeJob.jobName; - // var title1 = result.store.aliasName; - // that.data.logo2 - // wx.setStorageSync({ - // key: "onSiteRemark", - // data: result.storeJob.onSiteRemark, - // }) + var title = result.job.jobName; + console.log(title) that.setData({ shareTitle: title, - onSiteRemark: result.storeJob.onSiteRemark, + onSiteRemark: result.job.onSiteRemark, }); let regs = /\.(jpg|jpeg|png)(\?.*)?$/; - res.data.data.storeImage.forEach((item) => { - item.isImg = regs.test(item.url.toLowerCase()); - }); - result.storeJob.genderRestrict = commonUtil.getGenderByMinAge(result.storeJob); - if (app.isNotEmptyCheck(title)) { - title = result.storeJob.jobName; - } else { - title = result.store.aliasName; - } - - // wx.setNavigationBarTitle({ - // title, + // res.data.data.storeImage.forEach((item) => { + // item.isImg = regs.test(item.url.toLowerCase()); // }); + result.job.genderRestrict = commonUtil.getGenderByMinAge(result.job); + result.job.updateTime = dateUtil.timeShowXXX(result.job.updateTime) + // if (app.isNotEmptyCheck(title)) { + // title = result.storeJob.jobName; + // } else { + // title = result.store.aliasName; + // } - result.storeJob.workType = commonUtil.getWorkTypeById(result.storeJob.workTypeMulti); - - if (app.isNotEmptyCheck(result.storeJob.calculationSalaryType)) { - result.storeJob.calculationSalaryType = result.storeJob.calculationSalaryType.split("#")[0]; - } - if (app.isNotEmptyCheck(result.storeJob.jobDesp)) { - result.storeJob.jobDesp = result.storeJob.jobDesp.replaceAll("*****", "").split("————————")[0]; - result.storeJob["jobDesp1"] = result.storeJob.jobDesp.replace("⚠", ""); - result.storeJob["jobDesp1"] = result.storeJob.jobDesp1.replace("[红包]", ""); - } - - if (app.isNotEmptyCheck(result.storeJob.paymentSalaryType)) { - result.storeJob.paymentSalaryType = result.storeJob.paymentSalaryType.split("，"); - } - - if (app.isNotEmptyCheck(result.storeJob.salaryDesp)) { - result.storeJob.salaryDesp = result.storeJob.salaryDesp.split("；"); - } - - if (app.isNotEmptyCheck(result.storeJob.workDurationDesp)) { - result.storeJob.workDurationDesp = result.storeJob.workDurationDesp.split("；"); - } - - if (app.isNotEmptyCheck(result.storeJob.probationDesp)) { - result.storeJob.probationDesp = result.storeJob.probationDesp.split("；"); - } - - if (app.isNotEmptyCheck(result.storeJob.workingLunchDesp)) { - result.storeJob.workingLunchDesp = result.storeJob.workingLunchDesp.split("；"); - } - - if (app.isNotEmptyCheck(result.storeJob.dormitoryDesp)) { - result.storeJob.dormitoryDesp = result.storeJob.dormitoryDesp.split("；"); - } - - if (app.isNotEmptyCheck(result.storeJob.foregift)) { - result.storeJob.foregift = result.storeJob.foregift.split("；"); - var arrTemp = []; - result.storeJob.foregift.forEach((item) => { - var arr = item.split("，"); + // // wx.setNavigationBarTitle({ + // // title, + // // }); - if (app.length > 0) { - arrTemp.push({ - item0: arr[0].split("#")[0], - item1: arr[1].split("#")[0], - }); - } - }); - result.storeJob.foregift = arrTemp; - } else { - result.storeJob.foregift = "无押金"; - } + // result.storeJob.workType = commonUtil.getWorkTypeById(result.storeJob.workTypeMulti); - result.store.distance = commonUtil.getDistanceName(result.store.distance); - if (app.isNotEmptyCheck(result.store.distance)) { - result.store.distance = "丨" + result.store.distance; + // if (app.isNotEmptyCheck(result.storeJob.calculationSalaryType)) { + // result.storeJob.calculationSalaryType = result.storeJob.calculationSalaryType.split("#")[0]; + // } + if (app.isNotEmptyCheck(result.job.jobDesp)) { + result.job.jobDesp = result.job.jobDesp.replaceAll("*****", "").split("————————")[0].replace("⚠", "").replace("[红包]", ""); + } - /*if (app.isNotEmptyCheck(result.store.district)) { - var tempArr = result.store.district.split(","); - - if (tempArr.length == 1) { - result.store.district = tempArr[0]; - } else if (tempArr.length == 2) { - result.store.district = tempArr[0] + "" + tempArr[1]; - } else if (tempArr.length > 2) { - result.store.district = tempArr[1] + "" + tempArr[2]; - } - }*/ - // getStoreAddress - - that.disposeJobListData(result); - if (app.isNotEmptyCheck(result.store.logo)) { - result["logo2"] = result.store.logo.replace("http:", "https:"); - result.store.logo.indexOf("https") > -1 ? result.store.logo : result.store.logo.replace("http", "https") - } else { - result["logo2"] = ""; - } + // console.log(result.job) + that.disposeJobListData(result.job); + // if (app.isNotEmptyCheck(result.job.logo)) { + // result.job["logo2"] = result.job.logo.replace("http:", "https:"); + // result.job.logo.indexOf("https") > -1 ? result.job.logo : result.logo.replace("http", "https") + // } else { + // result.job["logo2"] = ""; + // } // console.log(commonUtil.getReturnFeeTypeName1ById(result.storeJob.returnFeeType, result.storeJob.returnFee)); console.log("isout"); - if (app.isNotEmptyCheck(result.storeJob.returnFeeType) || result.storeJob.returnFeeType == "0" || result.storeJob.returnFee == "0") { + if (app.isNotEmptyCheck(result.job.returnFeeType) || result.job.returnFeeType == "0" || result.job.returnFee == "0") { that.setData({ - fuWuFei: commonUtil.getReturnFeeTypeName1ById(result.storeJob.returnFeeType, result.storeJob.returnFee), + fuWuFei: commonUtil.getReturnFeeTypeName1ById(result.job.returnFeeType, result.job.returnFee), }); } // else if (result.storeJob.returnFeeType == 7) { @@ -999,35 +806,19 @@ Page({ }); } - console.log(result); + console.log(res.data.data.collected); console.log(commonUtil); - let citys = commonUtil.setJobInfoPosition(result.store.district); - // city = city.replace(/,/g, " | ") - result.storeImage.splice(0, 1) - - + result.job['collected'] = result.collected ? 1 : 2 that.setData({ - jobDetail: result, - isMaskShow: !(result.storeJob.recruitment == "1"), - citys: citys || "-", - addressNew: result.store.district.replace(/,/g, "") + result.store.detailPosition, + jobDetail: result.job, + // isMaskShow: !(result.storeJob.recruitment == "1"), + // citys: citys || "-", + // addressNew: result.store.district.replace(/,/g, "") + result.store.detailPosition, }); - that.data.jobDetail.storeJob["storeName"] = that.data.jobDetail.store.storeName; - + that.showSexAge(); - // that.getAgencyInfo(res.data.data.storeJob); - - if (app.isEmptyCheck(res.data.data.storeJob.handoverInfo)) { - that.setData({ - djxx: "暂无对接信息", - }); - } else { - that.setData({ - djxx: res.data.data.storeJob.handoverInfo, - }); - } console.log(that.data.jobDetail); } wx.hideLoading(); @@ -1040,25 +831,25 @@ Page({ var manStr = ""; var womanStr = ""; - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeMan) || app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeMan)) { + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeMan) || app.isNotEmptyCheck(that.data.jobDetail.maxAgeMan)) { manStr = "男 "; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeMan)) { - manStr = manStr + that.data.jobDetail.storeJob.minAgeMan; + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeMan)) { + manStr = manStr + that.data.jobDetail.minAgeMan; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeMan)) { - manStr = manStr + "-" + that.data.jobDetail.storeJob.maxAgeMan; + if (app.isNotEmptyCheck(that.data.jobDetail.maxAgeMan)) { + manStr = manStr + "-" + that.data.jobDetail.maxAgeMan; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeWoman) || app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeWoman)) { + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeWoman) || app.isNotEmptyCheck(that.data.jobDetail.maxAgeWoman)) { womanStr = "女 "; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeWoman)) { - womanStr = womanStr + that.data.jobDetail.storeJob.minAgeWoman; + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeWoman)) { + womanStr = womanStr + that.data.jobDetail.minAgeWoman; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeWoman)) { - womanStr = womanStr + "-" + that.data.jobDetail.storeJob.maxAgeWoman; + if (app.isNotEmptyCheck(that.data.jobDetail.maxAgeWoman)) { + womanStr = womanStr + "-" + that.data.jobDetail.maxAgeWoman; } if (womanStr != "") { @@ -1086,79 +877,79 @@ Page({ // } //年龄 var ageStr = ""; - if (app.isNotEmptyCheck(jobDetail.storeJob.minAge) && app.isNotEmptyCheck(jobDetail.storeJob.maxAge)) { - ageStr = jobDetail.storeJob.minAge + "-" + jobDetail.storeJob.maxAge + "岁"; - } else if (app.isNotEmptyCheck(jobDetail.storeJob.minAge)) { - ageStr = jobDetail.storeJob.minAge + "岁以上"; - } else if (app.isNotEmptyCheck(jobDetail.storeJob.maxAge)) { - ageStr = jobDetail.storeJob.maxAge + "岁以下"; + if (app.isNotEmptyCheck(jobDetail.minAge) && app.isNotEmptyCheck(jobDetail.maxAge)) { + ageStr = jobDetail.minAge + "-" + jobDetail.maxAge + "岁"; + } else if (app.isNotEmptyCheck(jobDetail.minAge)) { + ageStr = jobDetail.minAge + "岁以上"; + } else if (app.isNotEmptyCheck(jobDetail.maxAge)) { + ageStr = jobDetail.maxAge + "岁以下"; } - jobDetail.storeJob["age"] = ageStr; + jobDetail["age"] = ageStr; //时薪 // var hourlyPayStr = ""; var hasHourlyPay = true; - console.log(jobDetail.storeJob); - // if (app.isNotEmptyCheck(jobDetail.storeJob.hourlyPay)) { - // hourlyPayStr = jobDetail.storeJob.hourlyPay + "元/小时"; + console.log(jobDetail); + // if (app.isNotEmptyCheck(jobDetail.hourlyPay)) { + // hourlyPayStr = jobDetail.hourlyPay + "元/小时"; // hasHourlyPay = true; - // } else if (app.isNotEmptyCheck(jobDetail.storeJob.dayPay)) { - // hourlyPayStr = jobDetail.storeJob.dayPay + "元/日"; + // } else if (app.isNotEmptyCheck(jobDetail.dayPay)) { + // hourlyPayStr = jobDetail.dayPay + "元/日"; // hasHourlyPay = true; // } else { - // if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - // if (jobDetail.storeJob.minMonthlyPay == jobDetail.storeJob.maxMonthlyPay) { - // hourlyPayStr = jobDetail.storeJob.minMonthlyPay; + // if (app.isNotEmptyCheck(jobDetail.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + // if (jobDetail.minMonthlyPay == jobDetail.maxMonthlyPay) { + // hourlyPayStr = jobDetail.minMonthlyPay; // } else { - // hourlyPayStr = jobDetail.storeJob.minMonthlyPay + "-" + jobDetail.storeJob.maxMonthlyPay; + // hourlyPayStr = jobDetail.minMonthlyPay + "-" + jobDetail.maxMonthlyPay; // } - // } else if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay)) { - // hourlyPayStr = jobDetail.storeJob.minMonthlyPay; - // } else if (app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - // hourlyPayStr = jobDetail.storeJob.maxMonthlyPay; + // } else if (app.isNotEmptyCheck(jobDetail.minMonthlyPay)) { + // hourlyPayStr = jobDetail.minMonthlyPay; + // } else if (app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + // hourlyPayStr = jobDetail.maxMonthlyPay; // } // } - // if (app.isNotEmptyCheck(jobDetail.storeJob.dayPay)){ + // if (app.isNotEmptyCheck(jobDetail.dayPay)){ // } - // if (app.isNotEmptyCheck(jobDetail.storeJob.salaryClassify) && app.isNotEmptyCheck(jobDetail.storeJob.salaryClassifyValue)) { + // if (app.isNotEmptyCheck(jobDetail.salaryClassify) && app.isNotEmptyCheck(jobDetail.salaryClassifyValue)) { - jobDetail.storeJob["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.storeJob.salaryClassify, jobDetail.storeJob.salaryClassifyValue); + jobDetail["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue); // } //月薪 var monthlyPayStr = ""; if (hasHourlyPay) { - if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - if (jobDetail.storeJob.minMonthlyPay == jobDetail.storeJob.maxMonthlyPay) { - monthlyPayStr = jobDetail.storeJob.minMonthlyPay; + if (app.isNotEmptyCheck(jobDetail.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + if (jobDetail.minMonthlyPay == jobDetail.maxMonthlyPay) { + monthlyPayStr = jobDetail.minMonthlyPay/100; } else { - monthlyPayStr = jobDetail.storeJob.minMonthlyPay + "-" + jobDetail.storeJob.maxMonthlyPay; + monthlyPayStr = jobDetail.minMonthlyPay/100 + "-" + jobDetail.maxMonthlyPay/100; } - } else if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay)) { - monthlyPayStr = jobDetail.storeJob.minMonthlyPay; - } else if (app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - monthlyPayStr = jobDetail.storeJob.maxMonthlyPay; + } else if (app.isNotEmptyCheck(jobDetail.minMonthlyPay)) { + monthlyPayStr = jobDetail.minMonthlyPay/100; + } else if (app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + monthlyPayStr = jobDetail.maxMonthlyPay/100; } } - jobDetail.storeJob["monthlyPay"] = monthlyPayStr; + jobDetail["monthlyPay"] = monthlyPayStr; //地址深圳丨龙岗区丨 - var districtStr = ""; - if (app.isNotEmptyCheck(jobDetail.store.district)) { - var districtArr = jobDetail.store.district.split(","); - if (districtArr.length < 3) { - districtStr = districtArr[districtArr.length - 1]; - } else { - districtStr = districtArr[1] + "丨" + districtArr[2]; - } - //districtStr = districtArr[1] + '丨' + districtArr[2]; - } - jobDetail.store["districtStr"] = districtStr; - jobDetail.storeJob["districtDetail"] = commonUtil.getStoreAddress(jobDetail.storeJob.district, jobDetail.storeJob.detailPosition); - //职位特色 - if (app.isNotEmptyCheck(jobDetail.storeJob.jobSpecialLabelNames)) { - jobDetail.storeJob["jobSpecialLabelNames"] = that.getJobSpecialLabelNamesArray(jobDetail.storeJob.jobSpecialLabelNames); + // var districtStr = ""; + // if (app.isNotEmptyCheck(jobDetail.store.district)) { + // var districtArr = jobDetail.store.district.split(","); + // if (districtArr.length < 3) { + // districtStr = districtArr[districtArr.length - 1]; + // } else { + // districtStr = districtArr[1] + "丨" + districtArr[2]; + // } + // //districtStr = districtArr[1] + '丨' + districtArr[2]; + // } + // jobDetail.store["districtStr"] = districtStr; + // jobDetail["districtDetail"] = commonUtil.getStoreAddress(jobDetail.district, jobDetail.detailPosition); + // //职位特色 + if (app.isNotEmptyCheck(jobDetail.jobSpecialLabelNames)) { + jobDetail["jobSpecialLabelNames"] = that.getJobSpecialLabelNamesArray(jobDetail.jobSpecialLabelNames); } - // if (app.isNotEmptyCheck(jobDetail.storeJob.jobRequestLabelNames)) { - // jobDetail.storeJob['jobRequestLabelNames'] = that.getJobRequestLabelNamesArray(jobDetail.storeJob.jobRequestLabelNames); + // if (app.isNotEmptyCheck(jobDetail.jobRequestLabelNames)) { + // jobDetail['jobRequestLabelNames'] = that.getJobRequestLabelNamesArray(jobDetail.jobRequestLabelNames); // } }, getJobSpecialLabelNamesArray (jobSpecialLabelNames) { @@ -1178,10 +969,10 @@ Page({ var that = this; console.log(that.data.jobDetail); - console.log(that.data.jobDetail.storeJob.jobLabelId); + console.log(that.data.jobDetail.jobLabelId); wx.navigateTo({ - url: "../similar/index?brandId=" + that.data.jobDetail.store.brandId + "&jobLabelId=" + that.data.jobDetail.storeJob.jobLabelId + "&classify=99", + url: "../similar/index?brandId=" + that.data.jobDetail.store.brandId + "&jobLabelId=" + that.data.jobDetail.jobLabelId + "&classify=99", }); }, @@ -1288,7 +1079,7 @@ Page({ console.log(this.data.recordBillShow); return let argument; - argument = JSON.stringify(that.data.jobDetail.storeJob).replace(/\=|\&/g, "3D"); + argument = JSON.stringify(that.data.jobDetail).replace(/\=|\&/g, "3D"); if (!app.globalData.isLogin) { wx.setStorageSync("comeFromPage", "detailBaoming"); @@ -1325,12 +1116,12 @@ Page({ var that = this; console.log(e); console.log(e.detail.errMsg); - console.log(that.data.jobDetail.storeJob); + console.log(that.data.jobDetail); /*wx.setStorageSync({ key: "jobDetailStorage", - data: that.data.jobDetail.storeJob, + data: that.data.jobDetail, });*/ - wx.setStorageSync("jobDetailStorage", that.data.jobDetail.storeJob); + wx.setStorageSync("jobDetailStorage", that.data.jobDetail); // console.log(e); // console.log(e.detail.errMsg) console.log(e.detail.iv); @@ -1371,7 +1162,7 @@ Page({ });*/ promise.then((res) => { let argument; - argument = JSON.stringify(that.data.jobDetail.storeJob).replace(/\=|\&/g, "3D"); + argument = JSON.stringify(that.data.jobDetail).replace(/\=|\&/g, "3D"); wx.navigateTo({ url: `../newEnroll/enroll/index?applyType=1&info=${argument}`, }); @@ -1424,7 +1215,7 @@ Page({ } else { promise.then((res) => { let argument; - argument = JSON.stringify(that.data.jobDetail.storeJob).replace(/\=|\&/g, "3D"); + argument = JSON.stringify(that.data.jobDetail).replace(/\=|\&/g, "3D"); wx.navigateTo({ url: `../newEnroll/enroll/index?applyType=1&info=${argument}`, }); @@ -1531,28 +1322,23 @@ Page({ }, doCollected (collected, storeJobId) { var that = this; - var url = "/user/collect/job/add"; - if (collected - 1 == 0) { - url = "/user/collect/job/remove"; - } - // console.log(app.globalData.headers); + var url = "/assistant/job/collect/"+storeJobId; //发起网络请求 wx.request({ url: app.globalData.ip + url, - data: { - storeJobId: storeJobId, - }, header: app.globalData.headers, method: "GET", success: function (res) { + console.log(res) + var txt; if (collected - 1 == 0) { //取消收藏 - that.data.jobDetail.storeJob.collected = 2; + that.data.jobDetail.collected = 2; txt = "取消收藏"; } else { //收藏 - that.data.jobDetail.storeJob.collected = 1; + that.data.jobDetail.collected = 1; txt = "收藏成功"; } diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 1d71124..693d544 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -1,7 +1,7 @@ - {{citys}}{{jobDetail.store.distance}} - - {{jobDetail.storeJob.genderRestrict}} - 丨{{jobDetail.storeJob.age}} + {{citys}}{{jobDetail.store.distance}} + + {{jobDetail.genderRestrict}} + 丨{{jobDetail.age}} @@ -51,46 +51,43 @@ - + 郑州一才工作 - 1分钟前发布 + {{jobDetail.updateTime}} - - + 职位详情 - {{text}} + + - - - - - + 设置 diff --git a/pages/mineAgency/index.js b/pages/mineAgency/index.js index beb55eb..b9fb7bf 100644 --- a/pages/mineAgency/index.js +++ b/pages/mineAgency/index.js @@ -1,29 +1,18 @@ // pages/mineAgency/index.js +const app = getApp(); Page({ /** * 页面的初始数据 */ data: { - list: [ - { - title: '郑州一才工作', - logo: 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/yicaigongzuo.png' - }, - { - title: '郑州一才工作', - logo: 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/yicaigongzuo.png' - }, - { - title: '郑州一才工作', - logo: 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/yicaigongzuo.png' - }, - { - title: '郑州一才工作', - logo: 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/yicaigongzuo.png' - } - ], - deleteAgencyShow: false + list: [], + deleteAgencyShow: false, + storeJobListSearchForm: { + pageNum: 1, + pageSize: 20, + keys:'' + }, }, /** @@ -44,8 +33,72 @@ Page({ * 生命周期函数--监听页面显示 */ onShow () { - + this.getList(); + }, + getList(){ + let that = this; + wx.request({ + url: app.globalData.ip + "/assistant/mine/getAgency", + header: app.globalData.headers, + method: "POST", + data: this.data.storeJobListSearchForm, + success: function (res) { + console.log(res); + if (res.data.status == 200) { + that.setData({ + list: res.data.data.list, + }); + } + }, + }); + + + }, + inputTyping: function (e) { + this.setData({ + inputVal: e.detail.value, + }); + if (this.data.inputVal == "") { + this.setData({ + list: [], + }); + this.data.storeJobListSearchForm.pageNum = 1; + this.data.storeJobListSearchForm.keys = ""; + this.getList(); + } }, + clearInput: function () { + this.setData({ + inputVal: "", + chaShowed: false, + inputShowed: false, + list: [], + + }); + this.data.storeJobListSearchForm.pageNum = 1; + this.data.storeJobListSearchForm.keys = ""; + this.getList(); + }, + searchKey: function (e) { + console.log(e); + + if (this.data.inputVal == "" && this.data.placeholderText == "请输入关键词") { + wx.showToast({ + title: "请输入内容", + icon: "none", + }); + } else { + this.setData({ + list: [], + }); + this.data.storeJobListSearchForm.pageNum = 1; + this.data.storeJobListSearchForm.keys = this.data.inputVal || this.data.placeholderText; + this.setData({ + inputVal: this.data.inputVal, + }); + this.getList(); + } + }, sureDelete () { let that = this wx.showModal({ diff --git a/pages/mineAgency/index.wxml b/pages/mineAgency/index.wxml index e954fc2..5955e68 100644 --- a/pages/mineAgency/index.wxml +++ b/pages/mineAgency/index.wxml @@ -1,13 +1,19 @@ - + - 搜索 + 搜索 + + + + 暂无记录 + + diff --git a/utils/commonUtil.js b/utils/commonUtil.js index e07e288..440d3ee 100644 --- a/utils/commonUtil.js +++ b/utils/commonUtil.js @@ -1237,7 +1237,9 @@ export function disposeJobListData(recordList) { item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue); //代理名称 - item['agencyName'] = item.agencyName.split(item.agencyCode).join('') + if(item['agencyName'] && item.agencyCode){ + item['agencyName'] = item.agencyName.split(item.agencyCode).join('') + } item.updateTime = dateUtil.timeShowXXX(item.updateTime) //月薪