diff --git a/app.js b/app.js index db8eb50..b225e88 100644 --- a/app.js +++ b/app.js @@ -569,4 +569,22 @@ App({ }, }); }, + vibrateShort () { + wx.vibrateShort({ + type: "heavy", + success: function (e) { + console.log(e); + }, + }); + }, + sharePageImage (path = "/pages/firstBill/index", image = "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/fenxiang2025.png", title = "伯才供应链") { + let params = { + path: path, + // imageUrl: this.store().localBaseImg + 'share.png', // image ? image : + imageUrl: image, + title: title + }; + console.log('分享数据:', params) + return params; + } }); diff --git a/app.wxss b/app.wxss index f21c3f2..24b4148 100644 --- a/app.wxss +++ b/app.wxss @@ -1955,7 +1955,7 @@ page { justify-content: center; width: 148px; height: 34px; - background: #fff5f1; + background: #f4faff; border-radius: 17px; } .weui-dialog__hd { diff --git a/assets/iconfont-weapp/iconfont-weapp-icon.wxss b/assets/iconfont-weapp/iconfont-weapp-icon.wxss index 58ab045..cce0f7d 100644 --- a/assets/iconfont-weapp/iconfont-weapp-icon.wxss +++ b/assets/iconfont-weapp/iconfont-weapp-icon.wxss @@ -51,11 +51,11 @@ } .t-icon-shenfenzheng2 { - 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-shenfenzheng2%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M512%20512m-512%200a512%20512%200%201%200%201024%200%20512%20512%200%201%200-1024%200Z%22%20fill%3D%22%23FFF5F1%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M729.234286%20316.306286c26.514286%200%2048.018286%2021.504%2048.018285%2047.981714v295.424c0%2026.477714-21.504%2047.981714-47.981714%2047.981714H294.765714A48.054857%2048.054857%200%200%201%20246.857143%20659.748571V364.251429c0-26.477714%2021.504-47.981714%2047.981714-47.981715h434.468572m0-42.020571H294.765714A90.002286%2090.002286%200%200%200%20204.8%20364.288v295.424A90.002286%2090.002286%200%200%200%20294.802286%20749.714286h434.468571a90.002286%2090.002286%200%200%200%2090.002286-90.002286V364.251429A90.002286%2090.002286%200%200%200%20729.270857%20274.285714z%22%20fill%3D%22%23FF4400%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M634.148571%20409.307429c25.819429%200%2046.848%2021.028571%2046.848%2046.848%200%2025.856-21.028571%2046.848-46.811428%2046.848a46.921143%2046.921143%200%200%201-46.884572-46.811429c0-25.856%2021.028571-46.884571%2046.848-46.884571m0-41.984a88.868571%2088.868571%200%201%200%200%20177.700571%2088.868571%2088.868571%200%200%200%200-177.737143z%22%20fill%3D%22%23FF4400%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M723.017143%20631.954286a20.992%2020.992%200%200%201-21.028572-20.992%2067.913143%2067.913143%200%200%200-67.84-67.84%2067.913143%2067.913143%200%200%200-67.84%2067.84%2020.992%2020.992%200%201%201-42.020571%200%20109.970286%20109.970286%200%200%201%20109.860571-109.860572%20109.970286%20109.970286%200%200%201%20109.860572%20109.860572%2020.992%2020.992%200%200%201-20.992%2020.992z%20m-243.675429-188.342857h-187.245714a20.992%2020.992%200%201%201%200-41.984h187.245714a20.992%2020.992%200%201%201%200%2042.020571z%20m0%2090.331428h-187.245714a20.992%2020.992%200%201%201%200-41.984h187.245714a20.992%2020.992%200%201%201%200%2041.984z%20m-55.808%2090.331429H292.096a20.992%2020.992%200%201%201%200-42.020572h131.437714a20.992%2020.992%200%201%201%200%2042.020572z%22%20fill%3D%22%23FF4400%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); + 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-shenfenzheng2%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M512%20512m-512%200a512%20512%200%201%200%201024%200%20512%20512%200%201%200-1024%200Z%22%20fill%3D%22%23f4faff%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M729.234286%20316.306286c26.514286%200%2048.018286%2021.504%2048.018285%2047.981714v295.424c0%2026.477714-21.504%2047.981714-47.981714%2047.981714H294.765714A48.054857%2048.054857%200%200%201%20246.857143%20659.748571V364.251429c0-26.477714%2021.504-47.981714%2047.981714-47.981715h434.468572m0-42.020571H294.765714A90.002286%2090.002286%200%200%200%20204.8%20364.288v295.424A90.002286%2090.002286%200%200%200%20294.802286%20749.714286h434.468571a90.002286%2090.002286%200%200%200%2090.002286-90.002286V364.251429A90.002286%2090.002286%200%200%200%20729.270857%20274.285714z%22%20fill%3D%22%231890ff%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M634.148571%20409.307429c25.819429%200%2046.848%2021.028571%2046.848%2046.848%200%2025.856-21.028571%2046.848-46.811428%2046.848a46.921143%2046.921143%200%200%201-46.884572-46.811429c0-25.856%2021.028571-46.884571%2046.848-46.884571m0-41.984a88.868571%2088.868571%200%201%200%200%20177.700571%2088.868571%2088.868571%200%200%200%200-177.737143z%22%20fill%3D%22%231890ff%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M723.017143%20631.954286a20.992%2020.992%200%200%201-21.028572-20.992%2067.913143%2067.913143%200%200%200-67.84-67.84%2067.913143%2067.913143%200%200%200-67.84%2067.84%2020.992%2020.992%200%201%201-42.020571%200%20109.970286%20109.970286%200%200%201%20109.860571-109.860572%20109.970286%20109.970286%200%200%201%20109.860572%20109.860572%2020.992%2020.992%200%200%201-20.992%2020.992z%20m-243.675429-188.342857h-187.245714a20.992%2020.992%200%201%201%200-41.984h187.245714a20.992%2020.992%200%201%201%200%2042.020571z%20m0%2090.331428h-187.245714a20.992%2020.992%200%201%201%200-41.984h187.245714a20.992%2020.992%200%201%201%200%2041.984z%20m-55.808%2090.331429H292.096a20.992%2020.992%200%201%201%200-42.020572h131.437714a20.992%2020.992%200%201%201%200%2042.020572z%22%20fill%3D%22%231890ff%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); } .t-icon-dianhua6 { - 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-dianhua6%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M512%20512m-512%200a512%20512%200%201%200%201024%200%20512%20512%200%201%200-1024%200Z%22%20fill%3D%22%23FFF5F1%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M574.171429%20574.171429c-7.314286%207.314286-14.628571%2018.285714-21.942858%2029.257142-25.6-14.628571-51.2-36.571429-73.142857-54.857142s-40.228571-47.542857-54.857143-73.142858c10.971429-3.657143%2021.942857-10.971429%2029.257143-21.942857%2043.885714-43.885714%2043.885714-117.028571%200-160.914285S336.457143%20248.685714%20292.571429%20292.571429c-21.942857%2018.285714-36.571429%2043.885714-36.571429%2076.8%200%2095.085714%2040.228571%20182.857143%20128%20270.628571%2087.771429%2087.771429%20175.542857%20128%20266.971429%20128h3.657142c29.257143%200%2058.514286-10.971429%2076.8-32.914286%2043.885714-43.885714%2043.885714-117.028571%200-160.914285-40.228571-43.885714-113.371429-43.885714-157.257142%200z%20m146.285714%20146.285714c-18.285714%2018.285714-40.228571%2025.6-62.171429%2025.6h-3.657143c-87.771429%200-168.228571-40.228571-248.685714-124.342857-84.114286-84.114286-124.342857-168.228571-124.342857-256%200-25.6%2010.971429-47.542857%2025.6-62.171429%2014.628571-18.285714%2036.571429-29.257143%2062.171429-29.257143s47.542857%2010.971429%2065.828571%2025.6c36.571429%2036.571429%2036.571429%2095.085714%200%20131.657143-10.971429%2010.971429-21.942857%2014.628571-32.914286%2021.942857v7.314286c18.285714%2032.914286%2040.228571%2062.171429%2065.828572%2087.771429s58.514286%2047.542857%2087.771428%2065.828571h7.314286l3.657143-3.657143c3.657143-10.971429%2010.971429-25.6%2021.942857-32.914286%2036.571429-36.571429%2095.085714-36.571429%20131.657143%200%2036.571429%2047.542857%2036.571429%20106.057143%200%20142.628572z%22%20fill%3D%22%23FF4400%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M650.971429%20778.971429c-95.085714%200-186.514286-43.885714-274.285715-131.657143-91.428571-91.428571-135.314286-182.857143-131.657143-277.942857%200-32.914286%2014.628571-62.171429%2036.571429-84.114286%2021.942857-21.942857%2054.857143-36.571429%2087.771429-36.571429s65.828571%2014.628571%2087.771428%2036.571429c47.542857%2047.542857%2047.542857%20128%200%20179.2-7.314286%207.314286-14.628571%2014.628571-21.942857%2018.285714%2014.628571%2021.942857%2029.257143%2043.885714%2047.542857%2062.171429s36.571429%2032.914286%2062.171429%2047.542857c3.657143-7.314286%2010.971429-14.628571%2018.285714-21.942857%2047.542857-47.542857%20128-47.542857%20175.542857%200%2021.942857%2021.942857%2036.571429%2054.857143%2036.571429%2087.771428%200%2032.914286-14.628571%2065.828571-36.571429%2087.771429-21.942857%2021.942857-51.2%2036.571429-84.114286%2036.571428h-3.657142z%20m-281.6-512c-29.257143%200-54.857143%2010.971429-73.142858%2029.257142s-29.257143%2043.885714-29.257142%2069.485715c0%2087.771429%2040.228571%20175.542857%20124.342857%20263.314285%2054.857143%2054.857143%20109.714286%2091.428571%20168.228571%20109.714286-54.857143-18.285714-109.714286-54.857143-164.571428-109.714286-87.771429-87.771429-128-171.885714-124.342858-263.314285%200-25.6%2010.971429-51.2%2029.257143-69.485715%2014.628571-18.285714%2043.885714-29.257143%2069.485715-29.257142s54.857143%2010.971429%2073.142857%2029.257142%2025.6%2036.571429%2029.257143%2058.514286c-3.657143-21.942857-14.628571-43.885714-29.257143-58.514286-18.285714-18.285714-43.885714-29.257143-73.142857-29.257142z%20m0%2021.942857c-21.942857%200-40.228571%2010.971429-51.2%2025.6-18.285714%2014.628571-25.6%2032.914286-25.6%2054.857143%200%2084.114286%2036.571429%20164.571429%20120.685714%20248.685714%2080.457143%2080.457143%20160.914286%20120.685714%20241.371428%20120.685714h3.657143c18.285714%200%2040.228571-7.314286%2054.857143-25.6%2032.914286-32.914286%2029.257143-84.114286%200-117.028571-32.914286-32.914286-84.114286-32.914286-117.028571%200-7.314286%207.314286-14.628571%2014.628571-18.285715%2029.257143l-3.657142%203.657142-7.314286%207.314286H544.914286c-36.571429-18.285714-65.828571-43.885714-91.428572-65.828571-25.6-25.6-47.542857-54.857143-65.828571-91.428572v-21.942857h7.314286l7.314285-7.314286c10.971429-3.657143%2021.942857-10.971429%2029.257143-18.285714%2014.628571-14.628571%2025.6-36.571429%2025.6-58.514286s-14.628571-43.885714-29.257143-58.514285c-14.628571-18.285714-36.571429-25.6-58.514285-25.6z%20m332.8%20274.285714c7.314286%203.657143%2018.285714%2010.971429%2025.6%2018.285714%2018.285714%2018.285714%2029.257143%2043.885714%2029.257142%2069.485715%200-25.6-10.971429-51.2-29.257142-73.142858-7.314286-7.314286-18.285714-10.971429-25.6-14.628571z%20m-292.571429-98.742857l7.314286-3.657143c7.314286-3.657143%2014.628571-10.971429%2025.6-18.285714%2014.628571-14.628571%2025.6-36.571429%2029.257143-58.514286-3.657143%2021.942857-14.628571%2043.885714-29.257143%2058.514286-7.314286%2010.971429-18.285714%2018.285714-32.914286%2021.942857z%22%20fill%3D%22%23FF4400%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); + 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-dianhua6%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M512%20512m-512%200a512%20512%200%201%200%201024%200%20512%20512%200%201%200-1024%200Z%22%20fill%3D%22%23f4faff%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M574.171429%20574.171429c-7.314286%207.314286-14.628571%2018.285714-21.942858%2029.257142-25.6-14.628571-51.2-36.571429-73.142857-54.857142s-40.228571-47.542857-54.857143-73.142858c10.971429-3.657143%2021.942857-10.971429%2029.257143-21.942857%2043.885714-43.885714%2043.885714-117.028571%200-160.914285S336.457143%20248.685714%20292.571429%20292.571429c-21.942857%2018.285714-36.571429%2043.885714-36.571429%2076.8%200%2095.085714%2040.228571%20182.857143%20128%20270.628571%2087.771429%2087.771429%20175.542857%20128%20266.971429%20128h3.657142c29.257143%200%2058.514286-10.971429%2076.8-32.914286%2043.885714-43.885714%2043.885714-117.028571%200-160.914285-40.228571-43.885714-113.371429-43.885714-157.257142%200z%20m146.285714%20146.285714c-18.285714%2018.285714-40.228571%2025.6-62.171429%2025.6h-3.657143c-87.771429%200-168.228571-40.228571-248.685714-124.342857-84.114286-84.114286-124.342857-168.228571-124.342857-256%200-25.6%2010.971429-47.542857%2025.6-62.171429%2014.628571-18.285714%2036.571429-29.257143%2062.171429-29.257143s47.542857%2010.971429%2065.828571%2025.6c36.571429%2036.571429%2036.571429%2095.085714%200%20131.657143-10.971429%2010.971429-21.942857%2014.628571-32.914286%2021.942857v7.314286c18.285714%2032.914286%2040.228571%2062.171429%2065.828572%2087.771429s58.514286%2047.542857%2087.771428%2065.828571h7.314286l3.657143-3.657143c3.657143-10.971429%2010.971429-25.6%2021.942857-32.914286%2036.571429-36.571429%2095.085714-36.571429%20131.657143%200%2036.571429%2047.542857%2036.571429%20106.057143%200%20142.628572z%22%20fill%3D%22%231890ff%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M650.971429%20778.971429c-95.085714%200-186.514286-43.885714-274.285715-131.657143-91.428571-91.428571-135.314286-182.857143-131.657143-277.942857%200-32.914286%2014.628571-62.171429%2036.571429-84.114286%2021.942857-21.942857%2054.857143-36.571429%2087.771429-36.571429s65.828571%2014.628571%2087.771428%2036.571429c47.542857%2047.542857%2047.542857%20128%200%20179.2-7.314286%207.314286-14.628571%2014.628571-21.942857%2018.285714%2014.628571%2021.942857%2029.257143%2043.885714%2047.542857%2062.171429s36.571429%2032.914286%2062.171429%2047.542857c3.657143-7.314286%2010.971429-14.628571%2018.285714-21.942857%2047.542857-47.542857%20128-47.542857%20175.542857%200%2021.942857%2021.942857%2036.571429%2054.857143%2036.571429%2087.771428%200%2032.914286-14.628571%2065.828571-36.571429%2087.771429-21.942857%2021.942857-51.2%2036.571429-84.114286%2036.571428h-3.657142z%20m-281.6-512c-29.257143%200-54.857143%2010.971429-73.142858%2029.257142s-29.257143%2043.885714-29.257142%2069.485715c0%2087.771429%2040.228571%20175.542857%20124.342857%20263.314285%2054.857143%2054.857143%20109.714286%2091.428571%20168.228571%20109.714286-54.857143-18.285714-109.714286-54.857143-164.571428-109.714286-87.771429-87.771429-128-171.885714-124.342858-263.314285%200-25.6%2010.971429-51.2%2029.257143-69.485715%2014.628571-18.285714%2043.885714-29.257143%2069.485715-29.257142s54.857143%2010.971429%2073.142857%2029.257142%2025.6%2036.571429%2029.257143%2058.514286c-3.657143-21.942857-14.628571-43.885714-29.257143-58.514286-18.285714-18.285714-43.885714-29.257143-73.142857-29.257142z%20m0%2021.942857c-21.942857%200-40.228571%2010.971429-51.2%2025.6-18.285714%2014.628571-25.6%2032.914286-25.6%2054.857143%200%2084.114286%2036.571429%20164.571429%20120.685714%20248.685714%2080.457143%2080.457143%20160.914286%20120.685714%20241.371428%20120.685714h3.657143c18.285714%200%2040.228571-7.314286%2054.857143-25.6%2032.914286-32.914286%2029.257143-84.114286%200-117.028571-32.914286-32.914286-84.114286-32.914286-117.028571%200-7.314286%207.314286-14.628571%2014.628571-18.285715%2029.257143l-3.657142%203.657142-7.314286%207.314286H544.914286c-36.571429-18.285714-65.828571-43.885714-91.428572-65.828571-25.6-25.6-47.542857-54.857143-65.828571-91.428572v-21.942857h7.314286l7.314285-7.314286c10.971429-3.657143%2021.942857-10.971429%2029.257143-18.285714%2014.628571-14.628571%2025.6-36.571429%2025.6-58.514286s-14.628571-43.885714-29.257143-58.514285c-14.628571-18.285714-36.571429-25.6-58.514285-25.6z%20m332.8%20274.285714c7.314286%203.657143%2018.285714%2010.971429%2025.6%2018.285714%2018.285714%2018.285714%2029.257143%2043.885714%2029.257142%2069.485715%200-25.6-10.971429-51.2-29.257142-73.142858-7.314286-7.314286-18.285714-10.971429-25.6-14.628571z%20m-292.571429-98.742857l7.314286-3.657143c7.314286-3.657143%2014.628571-10.971429%2025.6-18.285714%2014.628571-14.628571%2025.6-36.571429%2029.257143-58.514286-3.657143%2021.942857-14.628571%2043.885714-29.257143%2058.514286-7.314286%2010.971429-18.285714%2018.285714-32.914286%2021.942857z%22%20fill%3D%22%231890ff%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); } .t-icon-dianhua8 { @@ -131,5 +131,5 @@ } .t-icon-qiehuantuandui { - 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-qiehuantuandui%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M682.666667%20934.4H132.266667c-21.333333%200-46.933333-8.533333-59.733334-25.6-17.066667-17.066667-25.6-38.4-21.333333-64%204.266667-51.2%2025.6-89.6%2055.466667-110.933333%2021.333333-17.066667%2042.666667-25.6%2068.266666-29.866667%208.533333%200%2012.8-4.266667%2017.066667-4.266667%204.266667%200%208.533333%200%2012.8-4.266666%2042.666667-8.533333%2076.8-21.333333%20102.4-55.466667%200-4.266667-4.266667-25.6-25.6-51.2-25.6-29.866667-38.4-72.533333-46.933333-128-4.266667-42.666667-4.266667-85.333333%204.266666-132.266667%208.533333-42.666667%2029.866667-81.066667%2064-106.666666%2055.466667-51.2%20153.6-51.2%20221.866667%200%2034.133333%2029.866667%2055.466667%2064%2064%20110.933333%208.533333%2046.933333%208.533333%2089.6%204.266667%20132.266667-8.533333%2051.2-21.333333%2093.866667-46.933334%20128-25.6%2034.133333-25.6%2051.2-25.6%2055.466666%2021.333333%2034.133333%2055.466667%2042.666667%2098.133334%2051.2%204.266667%200%208.533333%204.266667%2017.066666%204.266667%204.266667%200%208.533333%200%2012.8%204.266667%2021.333333%204.266667%2046.933333%2012.8%2068.266667%2029.866666%2029.866667%2021.333333%2046.933333%2059.733333%2055.466667%20102.4%204.266667%2025.6-4.266667%2046.933333-21.333334%2068.266667-21.333333%2017.066667-42.666667%2025.6-68.266666%2025.6zM358.4%20682.666667c-42.666667%2059.733333-98.133333%2072.533333-140.8%2085.333333h-8.533333c-4.266667%200-12.8%204.266667-17.066667%204.266667-12.8%204.266667-29.866667%208.533333-38.4%2017.066666-17.066667%2012.8-25.6%2042.666667-29.866667%2059.733334%200%204.266667%200%204.266667%204.266667%208.533333%200%200%204.266667%204.266667%208.533333%204.266667H682.666667c4.266667%200%208.533333-4.266667%208.533333-4.266667s4.266667-4.266667%204.266667-8.533333c-4.266667-17.066667-8.533333-42.666667-25.6-55.466667-12.8-8.533333-29.866667-12.8-42.666667-17.066667%200%200-8.533333%200-12.8-4.266666-4.266667%200-8.533333%200-12.8-4.266667-42.666667-8.533333-102.4-21.333333-145.066667-85.333333l-4.266666-8.533334c-12.8-21.333333-17.066667-68.266667%2029.866666-128%2017.066667-21.333333%2029.866667-55.466667%2034.133334-93.866666%204.266667-29.866667%204.266667-68.266667-4.266667-106.666667-4.266667-25.6-17.066667-51.2-34.133333-68.266667-38.4-29.866667-98.133333-29.866667-136.533334%200-21.333333%2017.066667-34.133333%2042.666667-38.4%2064-4.266667%2029.866667-8.533333%2068.266667-4.266666%20110.933334%204.266667%2038.4%2017.066667%2072.533333%2034.133333%2093.866666%2059.733333%2076.8%2038.4%20123.733333%2025.6%20136.533334z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M896%20814.933333h-51.2c-21.333333%200-34.133333-17.066667-34.133333-34.133333s17.066667-34.133333%2034.133333-34.133333H896s4.266667%200%204.266667-4.266667v-4.266667c-4.266667-17.066667-8.533333-38.4-21.333334-46.933333-8.533333-8.533333-25.6-12.8-34.133333-17.066667%200%200-4.266667%200-12.8-4.266666-4.266667%200-4.266667%200-8.533333-4.266667-38.4-8.533333-93.866667-21.333333-132.266667-76.8%200-4.266667-4.266667-4.266667-4.266667-8.533333-12.8-21.333333-17.066667-59.733333%2029.866667-119.466667%2012.8-21.333333%2025.6-46.933333%2029.866667-81.066667%204.266667-38.4%200-72.533333-4.266667-98.133333-4.266667-21.333333-17.066667-42.666667-34.133333-55.466667-29.866667-25.6-72.533333-29.866667-106.666667-8.533333-17.066667%208.533333-38.4%204.266667-51.2-12.8-8.533333-17.066667-4.266667-38.4%2012.8-51.2%2059.733333-29.866667%20136.533333-25.6%20192%2017.066667%2029.866667%2025.6%2051.2%2059.733333%2055.466667%2098.133333%208.533333%2042.666667%208.533333%2081.066667%204.266666%20119.466667-4.266667%2046.933333-21.333333%2085.333333-42.666666%20115.2-25.6%2034.133333-21.333333%2046.933333-21.333334%2046.933333%2021.333333%2029.866667%2046.933333%2034.133333%2085.333334%2042.666667%204.266667%200%208.533333%200%2012.8%204.266666%204.266667%200%204.266667%200%208.533333%204.266667%2021.333333%208.533333%2042.666667%2012.8%2064%2029.866667%2025.6%2021.333333%2042.666667%2051.2%2051.2%2093.866666%204.266667%2021.333333-4.266667%2046.933333-17.066667%2064-17.066667%2017.066667-38.4%2025.6-59.733333%2025.6z%22%20fill%3D%22%23FF4400%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); + 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-qiehuantuandui%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M682.666667%20934.4H132.266667c-21.333333%200-46.933333-8.533333-59.733334-25.6-17.066667-17.066667-25.6-38.4-21.333333-64%204.266667-51.2%2025.6-89.6%2055.466667-110.933333%2021.333333-17.066667%2042.666667-25.6%2068.266666-29.866667%208.533333%200%2012.8-4.266667%2017.066667-4.266667%204.266667%200%208.533333%200%2012.8-4.266666%2042.666667-8.533333%2076.8-21.333333%20102.4-55.466667%200-4.266667-4.266667-25.6-25.6-51.2-25.6-29.866667-38.4-72.533333-46.933333-128-4.266667-42.666667-4.266667-85.333333%204.266666-132.266667%208.533333-42.666667%2029.866667-81.066667%2064-106.666666%2055.466667-51.2%20153.6-51.2%20221.866667%200%2034.133333%2029.866667%2055.466667%2064%2064%20110.933333%208.533333%2046.933333%208.533333%2089.6%204.266667%20132.266667-8.533333%2051.2-21.333333%2093.866667-46.933334%20128-25.6%2034.133333-25.6%2051.2-25.6%2055.466666%2021.333333%2034.133333%2055.466667%2042.666667%2098.133334%2051.2%204.266667%200%208.533333%204.266667%2017.066666%204.266667%204.266667%200%208.533333%200%2012.8%204.266667%2021.333333%204.266667%2046.933333%2012.8%2068.266667%2029.866666%2029.866667%2021.333333%2046.933333%2059.733333%2055.466667%20102.4%204.266667%2025.6-4.266667%2046.933333-21.333334%2068.266667-21.333333%2017.066667-42.666667%2025.6-68.266666%2025.6zM358.4%20682.666667c-42.666667%2059.733333-98.133333%2072.533333-140.8%2085.333333h-8.533333c-4.266667%200-12.8%204.266667-17.066667%204.266667-12.8%204.266667-29.866667%208.533333-38.4%2017.066666-17.066667%2012.8-25.6%2042.666667-29.866667%2059.733334%200%204.266667%200%204.266667%204.266667%208.533333%200%200%204.266667%204.266667%208.533333%204.266667H682.666667c4.266667%200%208.533333-4.266667%208.533333-4.266667s4.266667-4.266667%204.266667-8.533333c-4.266667-17.066667-8.533333-42.666667-25.6-55.466667-12.8-8.533333-29.866667-12.8-42.666667-17.066667%200%200-8.533333%200-12.8-4.266666-4.266667%200-8.533333%200-12.8-4.266667-42.666667-8.533333-102.4-21.333333-145.066667-85.333333l-4.266666-8.533334c-12.8-21.333333-17.066667-68.266667%2029.866666-128%2017.066667-21.333333%2029.866667-55.466667%2034.133334-93.866666%204.266667-29.866667%204.266667-68.266667-4.266667-106.666667-4.266667-25.6-17.066667-51.2-34.133333-68.266667-38.4-29.866667-98.133333-29.866667-136.533334%200-21.333333%2017.066667-34.133333%2042.666667-38.4%2064-4.266667%2029.866667-8.533333%2068.266667-4.266666%20110.933334%204.266667%2038.4%2017.066667%2072.533333%2034.133333%2093.866666%2059.733333%2076.8%2038.4%20123.733333%2025.6%20136.533334z%22%20fill%3D%22%23333333%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M896%20814.933333h-51.2c-21.333333%200-34.133333-17.066667-34.133333-34.133333s17.066667-34.133333%2034.133333-34.133333H896s4.266667%200%204.266667-4.266667v-4.266667c-4.266667-17.066667-8.533333-38.4-21.333334-46.933333-8.533333-8.533333-25.6-12.8-34.133333-17.066667%200%200-4.266667%200-12.8-4.266666-4.266667%200-4.266667%200-8.533333-4.266667-38.4-8.533333-93.866667-21.333333-132.266667-76.8%200-4.266667-4.266667-4.266667-4.266667-8.533333-12.8-21.333333-17.066667-59.733333%2029.866667-119.466667%2012.8-21.333333%2025.6-46.933333%2029.866667-81.066667%204.266667-38.4%200-72.533333-4.266667-98.133333-4.266667-21.333333-17.066667-42.666667-34.133333-55.466667-29.866667-25.6-72.533333-29.866667-106.666667-8.533333-17.066667%208.533333-38.4%204.266667-51.2-12.8-8.533333-17.066667-4.266667-38.4%2012.8-51.2%2059.733333-29.866667%20136.533333-25.6%20192%2017.066667%2029.866667%2025.6%2051.2%2059.733333%2055.466667%2098.133333%208.533333%2042.666667%208.533333%2081.066667%204.266666%20119.466667-4.266667%2046.933333-21.333333%2085.333333-42.666666%20115.2-25.6%2034.133333-21.333333%2046.933333-21.333334%2046.933333%2021.333333%2029.866667%2046.933333%2034.133333%2085.333334%2042.666667%204.266667%200%208.533333%200%2012.8%204.266666%204.266667%200%204.266667%200%208.533333%204.266667%2021.333333%208.533333%2042.666667%2012.8%2064%2029.866667%2025.6%2021.333333%2042.666667%2051.2%2051.2%2093.866666%204.266667%2021.333333-4.266667%2046.933333-17.066667%2064-17.066667%2017.066667-38.4%2025.6-59.733333%2025.6z%22%20fill%3D%22%231890ff%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E); } diff --git a/assets/images/slider_img.png b/assets/images/slider_img.png index 9aa2398..2d23727 100644 Binary files a/assets/images/slider_img.png and b/assets/images/slider_img.png differ diff --git a/components/job-sub -old/index.wxss b/components/job-sub -old/index.wxss index a0db51d..f520834 100644 --- a/components/job-sub -old/index.wxss +++ b/components/job-sub -old/index.wxss @@ -6,7 +6,7 @@ line-height: 1; padding: 0; border-radius: 8px; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } .jobIn { padding: 10px 10px; diff --git a/components/job-sub/index.wxss b/components/job-sub/index.wxss index 23af93f..3c01198 100644 --- a/components/job-sub/index.wxss +++ b/components/job-sub/index.wxss @@ -6,7 +6,7 @@ line-height: 1; padding: 0; border-radius: 8px; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } .jobIn { padding: 10px 10px; diff --git a/components/range/range-slider.wxss b/components/range/range-slider.wxss index 292924e..e5b4097 100644 --- a/components/range/range-slider.wxss +++ b/components/range/range-slider.wxss @@ -34,7 +34,7 @@ top: 50%; border-radius: 50%; transform: translate(0, -50%); - background-image: url('https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/slider_img.png'); + background-image: url('https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/slider_img_active.png'); background-repeat: no-repeat; background-size: 100% 100%; /* background-color: var(--color-ysd); */ diff --git a/components/slider-component/index.wxss b/components/slider-component/index.wxss index 2553217..dc7ac3c 100644 --- a/components/slider-component/index.wxss +++ b/components/slider-component/index.wxss @@ -36,7 +36,7 @@ top: 50%; transform: translate(0, -50%); height: 4px; - background: #f40; + background: #1890ff; border-bottom-left-radius: 8rpx; border-top-left-radius: 8rpx; } diff --git a/pages/activity/index.js b/pages/activity/index.js index d2d1935..acf45df 100644 --- a/pages/activity/index.js +++ b/pages/activity/index.js @@ -28,7 +28,7 @@ Page({ ol: "margin-top: 0; margin-bottom: 1em;", ul: "margin-top: 0; margin-bottom: 1em;", li: "line-height: 1.8", - hr: "box-sizing: content-box;height:1rpx;overflow: visible;background-color: #ddd;border:0;", + hr: "box-sizing: content-box;height:1px;overflow: visible;background-color: #ddd;border:0;", table: "border-collapse: collapse;border: 1px solid #d9d9d9;margin: 18px 0 16px 0;line-height: 1.8", td: "border: 1px solid #d9d9d9;vertical-align: top;padding: 4px 8px;line-height: 1.8", }, @@ -229,5 +229,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/activity/index.wxss b/pages/activity/index.wxss index a5bb81a..72d25b5 100644 --- a/pages/activity/index.wxss +++ b/pages/activity/index.wxss @@ -6,7 +6,7 @@ /* margin-top: 10px; */ padding: 0 10px; line-height: 1; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } page{ diff --git a/pages/addCard/index.js b/pages/addCard/index.js index 5130721..8004db0 100644 --- a/pages/addCard/index.js +++ b/pages/addCard/index.js @@ -131,7 +131,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/pages/addOrEditMember/index.js b/pages/addOrEditMember/index.js index 16de773..532ae20 100644 --- a/pages/addOrEditMember/index.js +++ b/pages/addOrEditMember/index.js @@ -438,7 +438,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, /** * 角色选择 * diff --git a/pages/addressPage/index.js b/pages/addressPage/index.js index 96ec771..613cfe7 100644 --- a/pages/addressPage/index.js +++ b/pages/addressPage/index.js @@ -402,5 +402,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/addressPage/index.wxss b/pages/addressPage/index.wxss index 9414f6e..5befd0d 100644 --- a/pages/addressPage/index.wxss +++ b/pages/addressPage/index.wxss @@ -33,7 +33,7 @@ page { right: 0px; font-size: 12px; line-height: 14px; - border:1rpx solid #ccc; + border:1px solid #ccc; padding: 2px 4px; color: #666; border-radius: 2px; diff --git a/pages/balanceDetail/index.js b/pages/balanceDetail/index.js index e408327..5df7544 100644 --- a/pages/balanceDetail/index.js +++ b/pages/balanceDetail/index.js @@ -60,7 +60,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/pages/billDetail/enroll/index.js b/pages/billDetail/enroll/index.js index 18431ca..2e8b478 100644 --- a/pages/billDetail/enroll/index.js +++ b/pages/billDetail/enroll/index.js @@ -944,5 +944,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/billDetail/enroll/index.wxss b/pages/billDetail/enroll/index.wxss index 48f5051..c0b08e4 100644 --- a/pages/billDetail/enroll/index.wxss +++ b/pages/billDetail/enroll/index.wxss @@ -211,7 +211,7 @@ z-index: 9999; line-height: 36px; } .resetBtn{ - border:1rpx solid var(--color-be); + border:1px solid var(--color-be); /* background-color: var(--color-be); */ color: var(--color-be); } @@ -232,7 +232,7 @@ button.loginOut.behover{ height: 44px; opacity: 1; background: #fff; - border: 1rpx solid var(--color-be); + border: 1px solid var(--color-be); border-radius: 25px; font-size: 18px; font-weight: 601; diff --git a/pages/billDetail/enrollJob/index.js b/pages/billDetail/enrollJob/index.js index 2e68983..707e9a6 100644 --- a/pages/billDetail/enrollJob/index.js +++ b/pages/billDetail/enrollJob/index.js @@ -722,5 +722,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/billDetail/index.wxml b/pages/billDetail/index.wxml index 7cca00d..f5b171f 100644 --- a/pages/billDetail/index.wxml +++ b/pages/billDetail/index.wxml @@ -37,7 +37,7 @@ 代理编号 {{userinfo.agencyCode}} --> - + 报名时间 @@ -288,7 +288,7 @@ 驻场信息 - 复制 + 复制 {{userinfo.totalZC || '-'}} diff --git a/pages/billDetail/index.wxss b/pages/billDetail/index.wxss index d2cc5a7..4f760f1 100644 --- a/pages/billDetail/index.wxss +++ b/pages/billDetail/index.wxss @@ -250,7 +250,7 @@ font-size: 13px; font-weight: normal; text-align: center; - line-height: 41rpx; + line-height: 41px; border-radius: 50%; background: #cccccc; color: #ffffff; diff --git a/pages/billDetail/index1.wxml b/pages/billDetail/index1.wxml index 3460bbe..8512f8f 100644 --- a/pages/billDetail/index1.wxml +++ b/pages/billDetail/index1.wxml @@ -35,7 +35,7 @@ 代理编号 {{userinfo.agencyCode}} --> - + 报名时间 diff --git a/pages/bindBankCard/index.js b/pages/bindBankCard/index.js index eb75520..3fe729e 100644 --- a/pages/bindBankCard/index.js +++ b/pages/bindBankCard/index.js @@ -424,5 +424,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/bindBankCard/index.wxml b/pages/bindBankCard/index.wxml index dd9ff4c..abc4e0b 100644 --- a/pages/bindBankCard/index.wxml +++ b/pages/bindBankCard/index.wxml @@ -90,7 +90,7 @@ - + 我已阅读并同意 《服务协议》 diff --git a/pages/bindBankCardSuccess/index.js b/pages/bindBankCardSuccess/index.js index 1cb1915..ec5f7fe 100644 --- a/pages/bindBankCardSuccess/index.js +++ b/pages/bindBankCardSuccess/index.js @@ -64,7 +64,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/pages/bindBankCardSuccess/index.wxss b/pages/bindBankCardSuccess/index.wxss index 9d14714..8e57fb9 100644 --- a/pages/bindBankCardSuccess/index.wxss +++ b/pages/bindBankCardSuccess/index.wxss @@ -1,5 +1,5 @@ .icon-tijiaochenggong { - color: #f40; + color: #1890ff; font-size: 70px; } diff --git a/pages/bocaiTV/index.js b/pages/bocaiTV/index.js index 91f317f..79a33b0 100644 --- a/pages/bocaiTV/index.js +++ b/pages/bocaiTV/index.js @@ -187,7 +187,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, // radioChange(e) { // console.log(e); // }, diff --git a/pages/cardDetail/index.js b/pages/cardDetail/index.js index 4136c8d..1bf168a 100644 --- a/pages/cardDetail/index.js +++ b/pages/cardDetail/index.js @@ -149,7 +149,7 @@ customRequest('/user/bank/deleteUserBank',{header:'headers', method: 'POST', dat /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/pages/changeGender/index.js b/pages/changeGender/index.js index f8792a3..e397c0e 100644 --- a/pages/changeGender/index.js +++ b/pages/changeGender/index.js @@ -68,7 +68,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, radioChange (e) { console.log(e); this.data.items.forEach((item) => { diff --git a/pages/changePsw/index.js b/pages/changePsw/index.js index a8cfb1d..ffef7c2 100644 --- a/pages/changePsw/index.js +++ b/pages/changePsw/index.js @@ -368,5 +368,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/collect/index.wxss b/pages/collect/index.wxss index 8cc38f7..755ac07 100644 --- a/pages/collect/index.wxss +++ b/pages/collect/index.wxss @@ -308,7 +308,7 @@ height: 746rpx; width: 52px; height: 52px; max-width: 100%; - /* border: 1rpx solid #ddd; */ + /* border: 1px solid #ddd; */ margin-bottom: 8px; border-radius: 4px; } @@ -378,7 +378,7 @@ height: 746rpx; margin-bottom: 0px; position: relative; top: 1px; - /* border: 1rpx solid transparent; */ + /* border: 1px solid transparent; */ } .tagsLi.spli { @@ -474,7 +474,7 @@ button.collect icon::before { /* margin-top: 10px; */ padding: 0 10px; line-height: 1; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } .jobIn { @@ -484,7 +484,7 @@ button.collect icon::before { /* border-radius: 4px; */ } /* .jobOne:nth-of-type(1) .jobIn { - border-top: 1rpx solid #f00; + border-top: 1px solid #f00; } */ /* .jobOne:nth-child(1) .jobIn { border-top: 0; @@ -549,11 +549,11 @@ button.collect icon::before { } */ .collect.collectred { /* opacity: 0.5; */ - /* border: 1rpx solid var(--color-ysd); + /* border: 1px solid var(--color-ysd); color: var(--color-ysd); */ background: rgba(255, 68, 0, 0.2); color: #1890ff; - border: 1rpx solid rgba(255, 68, 0, 0.2); + border: 1px solid rgba(255, 68, 0, 0.2); } .opacityBtn { position: absolute; @@ -702,7 +702,7 @@ button.collect icon::before { flex: 23% 0 0; height: 32px; background: #fff; - border: 1rpx solid transparent; + border: 1px solid transparent; border-radius: 999px; font-size: 12px; color: #333; @@ -777,7 +777,7 @@ button.collect icon::before { top: 103px; z-index: 999; background-color: #fff; - border-bottom: 1rpx solid #f3f3f3; + border-bottom: 1px solid #f3f3f3; border-top-left-radius: 16px; border-top-right-radius: 16px; /* border-radius: 8px; */ @@ -933,12 +933,12 @@ button.collect icon::before { .tabTable > view.active { background-color: #fff; border-radius: 12px 12px 0px 0px; - color: #f40; + color: #1890ff; /* font-weight: 600; */ } .tabTable > view.active .iconfont { /* font-weight: 600; */ - color: #f40; + color: #1890ff; } .tabTable > view .iconfont { /* font-size: 18px; */ diff --git a/pages/collect/index1.wxss b/pages/collect/index1.wxss index f21b7b0..1f3f125 100644 --- a/pages/collect/index1.wxss +++ b/pages/collect/index1.wxss @@ -308,7 +308,7 @@ height: 746rpx; width: 52px; height: 52px; max-width: 100%; - /* border: 1rpx solid #ddd; */ + /* border: 1px solid #ddd; */ margin-bottom: 8px; border-radius: 4px; } @@ -378,7 +378,7 @@ height: 746rpx; margin-bottom: 0px; position: relative; top: 1px; - /* border: 1rpx solid transparent; */ + /* border: 1px solid transparent; */ } .tagsLi.spli { @@ -474,7 +474,7 @@ button.collect icon::before { /* margin-top: 10px; */ padding: 0 10px; line-height: 1; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } .jobIn { @@ -484,7 +484,7 @@ button.collect icon::before { /* border-radius: 4px; */ } /* .jobOne:nth-of-type(1) .jobIn { - border-top: 1rpx solid #f00; + border-top: 1px solid #f00; } */ /* .jobOne:nth-child(1) .jobIn { border-top: 0; @@ -549,11 +549,11 @@ button.collect icon::before { } */ .collect.collectred { /* opacity: 0.5; */ - /* border: 1rpx solid var(--color-ysd); + /* border: 1px solid var(--color-ysd); color: var(--color-ysd); */ background: rgba(255, 68, 0, 0.2); color: #1890ff; - border: 1rpx solid rgba(255, 68, 0, 0.2); + border: 1px solid rgba(255, 68, 0, 0.2); } .opacityBtn { position: absolute; @@ -702,7 +702,7 @@ button.collect icon::before { flex: 23% 0 0; height: 32px; background: #fff; - border: 1rpx solid transparent; + border: 1px solid transparent; border-radius: 999px; font-size: 12px; color: #333; @@ -777,7 +777,7 @@ button.collect icon::before { top: 103px; z-index: 999; background-color: #fff; - border-bottom: 1rpx solid #f3f3f3; + border-bottom: 1px solid #f3f3f3; border-top-left-radius: 16px; border-top-right-radius: 16px; /* border-radius: 8px; */ @@ -933,12 +933,12 @@ button.collect icon::before { .tabTable > view.active { background-color: #fff; border-radius: 12px 12px 0px 0px; - color: #f40; + color: #1890ff; /* font-weight: 600; */ } .tabTable > view.active .iconfont { /* font-weight: 600; */ - color: #f40; + color: #1890ff; } .tabTable > view .iconfont { /* font-size: 18px; */ diff --git a/pages/configAnnunciate/index.js b/pages/configAnnunciate/index.js index fe6ab0c..a064f30 100644 --- a/pages/configAnnunciate/index.js +++ b/pages/configAnnunciate/index.js @@ -60,7 +60,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, /** * 通告信息修改 * diff --git a/pages/configAnnunciate/index.wxss b/pages/configAnnunciate/index.wxss index b94a74a..5e556b9 100644 --- a/pages/configAnnunciate/index.wxss +++ b/pages/configAnnunciate/index.wxss @@ -66,6 +66,6 @@ line-height: 56px; padding:0px ; margin-top: 120px; - color: #f40; + color: #1890ff; background-color: #fff; } \ No newline at end of file diff --git a/pages/configAnnunciateAddContact/index.js b/pages/configAnnunciateAddContact/index.js index 713a4df..e197445 100644 --- a/pages/configAnnunciateAddContact/index.js +++ b/pages/configAnnunciateAddContact/index.js @@ -67,7 +67,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, deleteContact () { let that = this; wx.showModal({ diff --git a/pages/connectUs/index.wxss b/pages/connectUs/index.wxss index 8216066..ddec160 100644 --- a/pages/connectUs/index.wxss +++ b/pages/connectUs/index.wxss @@ -20,7 +20,7 @@ page { height: 40px; line-height: 40px; border-radius: 50%; - background-color: #fff1ec; + background-color: #f4faff; } .telBox i { font-size: 24px; diff --git a/pages/dataDetail/index.js b/pages/dataDetail/index.js index b59061c..1e38996 100644 --- a/pages/dataDetail/index.js +++ b/pages/dataDetail/index.js @@ -137,7 +137,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, getBillNum () { let that = this; customRequest("/yishoudan/user/apply/order/listStatisticsNum", { diff --git a/pages/detail/index.js b/pages/detail/index.js index 6bae5ae..5184de6 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -141,6 +141,7 @@ Page({ kefu (e) { console.log(e); console.log('jobDetail', this.data.jobDetail); + app.vibrateShort() if (this.data.fromBocai) { if (this.data.jobDetail.customServiceUsers.length > 0) { this.setData({ @@ -323,19 +324,19 @@ Page({ }); that.widget = that.selectComponent(".widget"); - wx.getSystemInfo({ - success: (res) => { - console.log(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 { } - }, - }); + // wx.getSystemInfo({ + // success: (res) => { + // console.log(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); console.log("HHHHHHHHHHHHH" + query.storeJobId); @@ -473,6 +474,36 @@ Page({ // return agencyStr + '\n' + objAgency.returnFeeDesp; } }, + chooseMap (e) { + var that = this; + let address = e.currentTarget.dataset.address.record + let name, + content, + lat, + lng + if (e.currentTarget.dataset.type == 'interview') { + name = address.interviewAddr; + content = address.interviewAddr; + lat = address.interviewLat - 0; + lng = address.interviewLng - 0; + } else { + name = address.storeAddr; + content = address.storeAddr; + lat = address.storeLat - 0; + lng = address.storeLng - 0; + } + console.log('address', address); + setTimeout(() => { + + wx.openLocation({ + latitude: lat, + longitude: lng, + name: name, + address: content, + scale: 15, + }); + }, 200); + }, toMapChoice (e) { var that = this; console.log(e); @@ -572,35 +603,22 @@ Page({ // }, // }) }, - onShareAppMessage1: function () { - var path = commonUtil.getCurrentPageUrlWithArgs(); - if (app.globalData.isLogin && app.globalData.agencyStatus - 0 != 0) { - //当前用户是代理人 - path += "&agencyUserId=" + app.globalData.loginUserInfo.id; - } - var that = this; - // const promise = new Promise(resolve => { - // that.widget.renderToCanvas({ wxml:wxml(that.data.jobDetail), style }).then(res1 => { - // const p2 = that.widget.canvasToTempFilePath() - // p2.then(res => { - // console.log(res); - // resolve({ - // title:that.data.shareTitle, - // imageUrl: res.tempFilePath, - // }) - - // }) - - // }); + onShareAppMessage () { + return app.sharePageImage() + // var path = commonUtil.getCurrentPageUrlWithArgs(); + // if (app.globalData.isLogin && app.globalData.agencyStatus - 0 != 0) { + // //当前用户是代理人 + // path += "&agencyUserId=" + app.globalData.loginUserInfo.id; + // } + // var that = this; + // return this.getCanvas().then(() => { + // return { + // title: that.data.shareTitle, + // // imageUrl: that.data.canvasImg, + // path: path, + // // promise + // }; // }); - return this.getCanvas().then(() => { - return { - title: that.data.shareTitle, - // imageUrl: that.data.canvasImg, - path: path, - // promise - }; - }); }, // onShareTimeline: function () { @@ -1006,7 +1024,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 + '\n' + 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"), @@ -1293,6 +1311,7 @@ Page({ goNewEnroll (e) { let that = this; let argument; + app.vibrateShort() argument = JSON.stringify({ ...that.data.jobDetail.record, jobClassify: this.data.searchForm.jobClassify, @@ -1743,10 +1762,11 @@ Page({ }, showFee () { let that = this + if (!this.data.isAgency) return false console.log('that.data.bclr', that.data.bclr); wx.showModal({ - title: '佣金: ' + that.data.fuWuFei, - content: that.data.jobDetail.record.returnFeeDesp, + title: that.data.isAgency ? '佣金: ' + that.data.fuWuFei : '', + content: that.data.isAgency ? that.data.jobDetail.record.returnFeeDesp : '抱歉，成为伯才代理才能查看佣金', // content: that.data.bclr, contentColor: "#ccc", confirmColor: "#1890ff", diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index c73c3e0..cda6cde 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -24,12 +24,12 @@ - {{fuWuFei || '--'}} + {{fuWuFei || '--'}} *** - + @@ -91,7 +91,7 @@ 暂无特色 - + @@ -135,7 +135,7 @@ - + @@ -172,7 +172,7 @@ - + 基本信息 @@ -236,18 +236,11 @@ 对接信息 - - - 面试地点 - {{jobDetail.record.interviewAddr}} - + 面试地点 + + {{jobDetail.record.interviewAddr}} + - @@ -373,20 +366,20 @@ - + 复制 - {{jobDetail.record.jobDesp1}} - + {{jobDetail.record.jobInfoWithoutReturnFee}} + - - + - - + + - + 客服 + + + 客服 + - + - + - - - + + + diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss index 3e0fac1..adf5947 100644 --- a/pages/detail/index.wxss +++ b/pages/detail/index.wxss @@ -50,7 +50,7 @@ page{ left: 0; bottom: 0; background-color: #fff; - border-top: 1rpx solid rgba(0, 0, 0, 0.1); + border-top: 1px solid rgba(0, 0, 0, 0.1); } .bottomBtn > view { justify-content: start; @@ -64,7 +64,7 @@ page{ width: 45px; } .servicePrice { - border: 1rpx solid var(--color-f40); + border: 1px solid var(--color-f40); background-color: var(--color-f40-f); justify-content: space-between; border-right-color: transparent; @@ -395,7 +395,7 @@ button.collectBtn { border-bottom: 0; } .sbb1 { - border-bottom: 1rpx solid #eee !important; + border-bottom: 1px solid #eee !important; } .tabBox .display-flex { flex-wrap: wrap; diff --git a/pages/detail_old/index.wxml b/pages/detail_old/index.wxml index 905ef68..c519502 100644 --- a/pages/detail_old/index.wxml +++ b/pages/detail_old/index.wxml @@ -549,7 +549,7 @@ --> - - - - - - {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}} - - - - - - - + + + + - - - - - - 搜索 - - - + --> + + + + + 搜索 - - - - - - - - - - - - - - - - - - - - - - - - {{item.title}} - - - - + + + + + + + + 最新 + - - - - - - - - - - - - - 最新 - - - - 工价 - - - 佣金 - - - + + --> + + + + + {{firstMenu}} + + + + + 工价优先 + 距离优先 + 佣金优先 + + - - - - {{firstMenu}} - - - - - 工价优先 - 距离优先 - 佣金优先 - - + + {{ secondMenu }} + + + + + 男女不限 + 男 + 女 - - {{ secondMenu }} - - - - - 男女不限 - 男 - 女 + + + + 分类 + + + {{selectBrandList.length}} + + + + + {{item.name}} + + + + + - + + + + - - 分类 - - - {{selectBrandList.length}} - - - - - {{item.name}} - - - - - - - - - + + + + 筛选 + + + {{selectJobList.length + selectBrandList.length }} + + + + + 年龄（岁） + + + + {{minAge + '-'}} + {{maxAge == 60 ? maxAge + '+' : maxAge }} + - + + + 性别 + + + {{item.name}} + + + + 分类 + + {{item.name}} + + + + 薪资福利 + + {{item.name}} + + + + 宿舍保障 + + {{item.name}} + + + + 班制休息 + + {{item.name}} + + + + 面试特色 + + {{item.name}} + + + + 其他特色 + + {{item.name}} + + + + + + - - 筛选 - - - {{selectJobList.length + selectBrandList.length }} - - - - - 年龄（岁） - - - - {{minAge + '-'}} - {{maxAge == 60 ? maxAge + '+' : maxAge }} - - - - - - 性别 - - - {{item.name}} - - - - 分类 - - {{item.name}} - - - - 薪资福利 - - {{item.name}} - - - - 宿舍保障 - - {{item.name}} - - - - 班制休息 - - {{item.name}} - - - - 面试特色 - - {{item.name}} - - - - 其他特色 - - {{item.name}} - - - - - - + + + + 薪资福利 + + + {{item.name}} + - - - - 薪资福利 - - - {{item.name}} - - - 食宿保障 - - - {{item.name}} - - - 班制特色 - - - {{item.name}} - - - 其它特色 - - - {{item.name}} - - - - - - - - - - - + 食宿保障 + + + {{item.name}} + + + 班制特色 + + + {{item.name}} + + + 其它特色 + + + {{item.name}} + + + + + + + + + - + - - - - + + + - + - - - - + + + + - - - - {{maxAge == minAge ? maxAge + '岁' : storeJobListSearchForm.ageRangeStr + (maxAge == 60 ? '+' : '')}} - - - - - {{secondMenu}} - - - - - - - {{item.name}} - - - - - - - - {{item.name}} - - - - + --> + + + + {{maxAge == minAge ? maxAge + '岁' : storeJobListSearchForm.ageRangeStr + (maxAge == 60 ? '+' : '')}} - - - 清除 + + + + {{secondMenu}} + - - + + + + + + + + + + + + + + + + + + + + + + + + {{item.title}} + + + + + + + + + + + + + {{'近48小时更新' + jobNum + '条信息'}} @@ -610,9 +580,11 @@ --> - - - 没有符合条件的职位 + + + + 没有符合条件的职位 + diff --git a/pages/firstBill/index.wxss b/pages/firstBill/index.wxss index df0be1f..c481345 100644 --- a/pages/firstBill/index.wxss +++ b/pages/firstBill/index.wxss @@ -386,7 +386,7 @@ height: 746rpx; width: 72px; height: 72px; max-width: 100%; - /* border: 1rpx solid #ddd; */ + /* border: 1px solid #ddd; */ margin-bottom: 8px; border-radius: 4px; } @@ -468,7 +468,7 @@ height: 746rpx; margin-bottom: 0px; position: relative; top: 1px; - /* border: 1rpx solid transparent; */ + /* border: 1px solid transparent; */ } .tagsLi.spli { @@ -562,17 +562,17 @@ button.collect icon::before { /* margin-top: 10px; */ padding: 0 10px; line-height: 1; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } .jobIn { - border-bottom: 1rpx solid #eee; + border-bottom: 1px solid #eee; padding: 16px 0px; /* background-color: #fff; */ /* border-radius: 4px; */ } /* .jobOne:nth-of-type(1) .jobIn { - border-top: 1rpx solid #f00; + border-top: 1px solid #f00; } */ /* .jobOne:nth-child(1) .jobIn { border-top: 0; @@ -645,11 +645,11 @@ button.collect icon::before { } */ .collect.collectred { /* opacity: 0.5; */ - /* border: 1rpx solid var(--color-ysd); + /* border: 1px solid var(--color-ysd); color: var(--color-ysd); */ background: #FFEFEA; color: #FF5D22; - /* border: 1rpx solid rgba(255, 68, 0, 0.2); */ + /* border: 1px solid rgba(255, 68, 0, 0.2); */ } .opacityBtn { position: absolute; @@ -1147,13 +1147,13 @@ button.collect icon::before { .tabTable > view.active { background-color: #fff; border-radius: 12px 12px 0px 0px; - color: #f40; + color: #1890ff; /* font-weight: 600; */ } .tabTable > view.active .iconfont { /* font-weight: 600; */ - color: #f40; + color: #1890ff; } .tabTable > view .iconfont { @@ -1455,6 +1455,7 @@ button.collect icon::before { display: flex; justify-content: space-between; padding: 8px 10px 0 10px; + align-items: center; /* top: 10px; */ box-sizing: border-box; /* position: absolute; */ diff --git a/pages/friendHelper/index.js b/pages/friendHelper/index.js index 99f334a..f126770 100644 --- a/pages/friendHelper/index.js +++ b/pages/friendHelper/index.js @@ -69,7 +69,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, checkTab (e) { let val = e.target.dataset; if (e.target.dataset.index && e.target.dataset.index != this.data.currentTab) { diff --git a/pages/hotList/index.wxss b/pages/hotList/index.wxss index 8d1f231..8504573 100644 --- a/pages/hotList/index.wxss +++ b/pages/hotList/index.wxss @@ -372,7 +372,7 @@ height: 746rpx; width: 52px; height: 52px; max-width: 100%; - /* border: 1rpx solid #ddd; */ + /* border: 1px solid #ddd; */ margin-bottom: 8px; border-radius: 4px; } @@ -453,7 +453,7 @@ height: 746rpx; margin-bottom: 0px; position: relative; top: 1px; - /* border: 1rpx solid transparent; */ + /* border: 1px solid transparent; */ } .tagsLi.spli { @@ -546,7 +546,7 @@ button.collect icon::before { /* margin-top: 10px; */ padding: 0 10px; line-height: 1; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } .jobIn { @@ -556,7 +556,7 @@ button.collect icon::before { /* border-radius: 4px; */ } /* .jobOne:nth-of-type(1) .jobIn { - border-top: 1rpx solid #f00; + border-top: 1px solid #f00; } */ /* .jobOne:nth-child(1) .jobIn { border-top: 0; @@ -633,11 +633,11 @@ button.collect icon::before { } */ .collect.collectred { /* opacity: 0.5; */ - /* border: 1rpx solid var(--color-ysd); + /* border: 1px solid var(--color-ysd); color: var(--color-ysd); */ background: rgba(255, 68, 0, 0.2); color: #1890ff; - border: 1rpx solid rgba(255, 68, 0, 0.2); + border: 1px solid rgba(255, 68, 0, 0.2); } .opacityBtn { position: absolute; @@ -1128,12 +1128,12 @@ button.collect icon::before { .tabTable > view.active { background-color: #fff; border-radius: 12px 12px 0px 0px; - color: #f40; + color: #1890ff; /* font-weight: 600; */ } .tabTable > view.active .iconfont { /* font-weight: 600; */ - color: #f40; + color: #1890ff; } .tabTable > view .iconfont { /* font-size: 18px; */ diff --git a/pages/inputIDInfo/index.wxml b/pages/inputIDInfo/index.wxml index e2c543e..3b31477 100644 --- a/pages/inputIDInfo/index.wxml +++ b/pages/inputIDInfo/index.wxml @@ -13,7 +13,7 @@ - + 我已阅读并同意 diff --git a/pages/jobSelectPage/index.wxss b/pages/jobSelectPage/index.wxss index a07ffec..0144430 100644 --- a/pages/jobSelectPage/index.wxss +++ b/pages/jobSelectPage/index.wxss @@ -170,7 +170,7 @@ height: 746rpx; width: 52px; height: 52px; max-width: 100%; - /* border: 1rpx solid #ddd; */ + /* border: 1px solid #ddd; */ margin-bottom: 8px; border-radius: 4px; } @@ -240,7 +240,7 @@ height: 746rpx; margin-bottom: 0px; position: relative; top: 1px; - /* border: 1rpx solid transparent; */ + /* border: 1px solid transparent; */ } .tagsLi.spli { @@ -337,7 +337,7 @@ button.collect icon::before { /* margin-top: 10px; */ padding: 0 10px; line-height: 1; - /* margin-top: -1rpx; */ + /* margin-top: -1px; */ } .storeName { width: 150px; @@ -352,7 +352,7 @@ button.collect icon::before { /* border-radius: 4px; */ } /* .jobOne:nth-of-type(1) .jobIn { - border-top: 1rpx solid #f00; + border-top: 1px solid #f00; } */ /* .jobOne:nth-child(1) .jobIn { border-top: 0; @@ -415,7 +415,7 @@ button.collect icon::before { } */ .collect.collectred { /* opacity: 0.5; */ - /* border: 1rpx solid var(--color-ysd); */ + /* border: 1px solid var(--color-ysd); */ color: var(--color-ysd); } .opacityBtn { @@ -565,7 +565,7 @@ button.collect icon::before { flex: 23% 0 0; height: 32px; background: #fff; - border: 1rpx solid transparent; + border: 1px solid transparent; border-radius: 999px; font-size: 12px; color: #333; @@ -640,7 +640,7 @@ button.collect icon::before { top: 0; z-index: 999; background-color: #fff; - border-bottom: 1rpx solid #f3f3f3; + border-bottom: 1px solid #f3f3f3; /* border-radius: 8px; */ } .login_now { @@ -794,12 +794,12 @@ button.collect icon::before { .tabTable > view.active { background-color: #fff; border-radius: 12px 12px 0px 0px; - color: #f40; + color: #1890ff; /* font-weight: 600; */ } .tabTable > view.active .iconfont { /* font-weight: 600; */ - color: #f40; + color: #1890ff; } .tabTable > view .iconfont { /* font-size: 18px; */ diff --git a/pages/listSharePage/index.wxss b/pages/listSharePage/index.wxss index 2ef5c7e..254fc5e 100644 --- a/pages/listSharePage/index.wxss +++ b/pages/listSharePage/index.wxss @@ -1102,12 +1102,12 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { .tabTable > view.active { background-color: #fff; border-radius: 12px 12px 0px 0px; - color: #f40; + color: #1890ff; /* font-weight: 600; */ } .tabTable > view.active .iconfont { /* font-weight: 600; */ - color: #f40; + color: #1890ff; } .tabTable > view .iconfont { /* font-size: 18px; */ diff --git a/pages/login/index.wxml b/pages/login/index.wxml index ae15aef..2108b63 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,6 +1,6 @@ - diff --git a/pages/merchantManagement/index.js b/pages/merchantManagement/index.js index 97b907e..8a09ec1 100644 --- a/pages/merchantManagement/index.js +++ b/pages/merchantManagement/index.js @@ -100,5 +100,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/message/index.js b/pages/message/index.js index dc4a72c..42f8df4 100644 --- a/pages/message/index.js +++ b/pages/message/index.js @@ -79,7 +79,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, makePhoneCall () { console.log(1); diff --git a/pages/messageDetail/index.js b/pages/messageDetail/index.js index f16ecaa..f54baff 100644 --- a/pages/messageDetail/index.js +++ b/pages/messageDetail/index.js @@ -26,7 +26,7 @@ Page({ ol: "margin-top: 0; margin-bottom: 1em;", ul: "margin-top: 0; margin-bottom: 1em;", li: "line-height: 1.8", - hr: "box-sizing: content-box;height:1rpx;overflow: visible;background-color: #ddd;border:0;", + hr: "box-sizing: content-box;height:1px;overflow: visible;background-color: #ddd;border:0;", table: "border-collapse: collapse;border: 1px solid #d9d9d9;margin: 18px 0 16px 0;line-height: 1.8", td: "border: 1px solid #d9d9d9;vertical-align: top;padding: 4px 8px;line-height: 1.8", }, @@ -118,7 +118,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, requestInfo () { let that = this; wx.showLoading({ diff --git a/pages/mine/index.js b/pages/mine/index.js index 8736980..90fe702 100644 --- a/pages/mine/index.js +++ b/pages/mine/index.js @@ -15,6 +15,7 @@ Page({ // user:app.globalData.user, serviceInfo: {}, map: { num10: "0", num20: "0", num25: "0", num30: "0", num40: "0", num999: "0", user999: "0", user40: "0", user48: "0", user50: "0", billStatus10Salary: "0", billStatus30Salary: "0" }, + townsMnaNum:{}, // 老乡数量 motto: "Hello World", userInfo: {}, hasUserInfo: false, @@ -127,6 +128,7 @@ Page({ corpUserFlag: app.globalData.loginUserInfo.corpUserFlag, }); that.getDataNum(); + that.getTownsmanDataNum(); } else { // 由于 userLogin 是网络请求，可能会在 Page.onLoad 之后才返回 // 所以此处加入 callback 以防止这种情况 @@ -285,7 +287,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, showbalance (e) { this.setData({ isopen: e.mark.open, @@ -378,11 +382,28 @@ Page({ url: "/pages/login/index", }); } else { - wx.navigateTo({ + wx.switchTab({ url: "../myBill/index?status=0", }); } }, + + /** + * 获取老乡状态数量 + * + * + */ + getTownsmanDataNum () { + let that = this; + customRequest("/yishoudan/agency/user/listStatistics", { header: 'headers', method: 'GET', data: {} }).then((res) => { + if (res.data.status == 200) { + that.setData({ + townsMnaNum: res.data.data, + }); + console.log('getDataNum',res.data.data); + } + }) + }, /** * 获取各个数量 * @@ -395,6 +416,7 @@ Page({ that.setData({ map: res.data.data, }); + console.log('getDataNum',res.data.data); } }) // wx.request({ diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index d9c8a12..94ff007 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -75,33 +75,7 @@ --> - - - - - 申请加入 - - - - - - - - - - - 切换团队 - - - - {{userInfo.agencyName || '-'}} - - - - + @@ -117,32 +91,13 @@ 新增职位 - - - - 今日数据 - - - - - {{map.agencyData.signUps || '0'}} - 报名 - - - {{map.agencyData.arrived || '0'}} - 到面 - - - {{map.agencyData.passed || '0'}} - 通过 - - - {{map.agencyData.entry || '0'}} - 入职 - - - {{map.agencyData.obJob || '0'}} - 在职 + + + + + 申请加入 + + @@ -172,36 +127,64 @@ + + + 今日数据 + + + + + {{map.agencyData.signUps || '0'}} + 报名 + + + {{map.agencyData.arrived || '0'}} + 到面 + + + {{map.agencyData.passed || '0'}} + 通过 + + + {{map.agencyData.entry || '0'}} + 入职 + + + {{map.agencyData.obJob || '0'}} + 在职 + + + - 我的报名 + 报名工单 全部 - - + + {{map.num10 || '0'}} 审核中 - + {{map.num20 || '0'}} 待接待 - + {{map.num25 || '0'}} 待面试 - + {{map.num30 || '0'}} 待入职 - - + + {{map.num40 || '0'}} 在职中 @@ -215,7 +198,7 @@ - + 我的老乡 全部 @@ -224,18 +207,30 @@ - - {{map.userBinded0 + map.userBinded1 || '0'}} + + {{townsMnaNum.num0 || '0'}} 全部 - + + {{townsMnaNum.num3 || '0'}} + 在职中 + + + + {{townsMnaNum.num0 || '0'}} + 已离职 + + + + + + + + + + + {{userInfo.agencyName || '-'}} + + + + + + + + @@ -450,7 +470,7 @@ - + 切换团队 diff --git a/pages/mine/index.wxss b/pages/mine/index.wxss index 9400ce6..411039d 100644 --- a/pages/mine/index.wxss +++ b/pages/mine/index.wxss @@ -328,7 +328,7 @@ page { line-height: 1; } .myBill .weui-grids { - border-top: 1rpx solid #f5f5f5; + border-top: 1px solid #f5f5f5; } .myBill .weui-grids::before, .myTownsman .weui-grids::before { @@ -348,9 +348,6 @@ page { display: none; } -.bb1 { - border-bottom: 1rpx solid #f5f5f5; -} .mark { position: absolute; left: 50%; diff --git a/pages/mineJob/index.js b/pages/mineJob/index.js index f129d82..705c14b 100644 --- a/pages/mineJob/index.js +++ b/pages/mineJob/index.js @@ -181,7 +181,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, goEdit (e) { console.log(e.currentTarget.dataset.item); let item = JSON.stringify(e.currentTarget.dataset.item) diff --git a/pages/myBill/index.js b/pages/myBill/index.js index e97d286..3e4c71c 100644 --- a/pages/myBill/index.js +++ b/pages/myBill/index.js @@ -167,7 +167,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, getBillNum () { let that = this; customRequest("/yishoudan/user/apply/order/listStatisticsNum", { diff --git a/pages/myBill/index.wxml b/pages/myBill/index.wxml index 0f5bbba..fa692dd 100644 --- a/pages/myBill/index.wxml +++ b/pages/myBill/index.wxml @@ -1,7 +1,7 @@
- + + --> - + - + - --> + --> @@ -390,15 +390,12 @@ - 姓名： + 姓名： {{userInfo.name}} - - /{{(userInfo.sex == '1' || userInfo.sex == '男') ? '男' : - '女'}} - + {{(userInfo.sex == '1' || userInfo.sex == '男') ? '/男' : '/女'}} /{{userInfo.age}}岁 @@ -409,42 +406,36 @@ - 电话： - - {{userInfo.tel == '' || userInfo.tel == null || userInfo.tel == 'undefined' ? '-' : - userInfo.tel}} - + 电话： + {{userInfo.tel == '' || userInfo.tel == null || userInfo.tel == 'undefined' ? '-' : userInfo.tel}} - 身份证号： + 身份证号： {{userInfo.num == '' || userInfo.num == null || userInfo.num == 'undefined' ? '-' : userInfo.num}} - 家庭住址： - - {{userInfo.address == '' || userInfo.address == null || userInfo.address == 'undefined' ? '-' : - userInfo.address}} - + 家庭住址： + {{userInfo.address == '' || userInfo.address == null || userInfo.address == 'undefined' ? '-' : userInfo.address}} - 报名职位： + 报名职位： {{jobInfo.jobName || '-'}} - 面试时间： + 面试时间： {{currentTime}} - 接待时间： + 接待时间： {{currentTime2}} - 政策： - {{policyList[policyStr].policy || '-'}} + 政策： + {{policy || '-'}} diff --git a/pages/newEnroll/enrollEdit/index.js b/pages/newEnroll/enrollEdit/index.js index 47ecfbf..549d86b 100644 --- a/pages/newEnroll/enrollEdit/index.js +++ b/pages/newEnroll/enrollEdit/index.js @@ -1064,5 +1064,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/newEnroll/enrollJob/index.js b/pages/newEnroll/enrollJob/index.js index 53dbf8e..07f4e12 100644 --- a/pages/newEnroll/enrollJob/index.js +++ b/pages/newEnroll/enrollJob/index.js @@ -556,5 +556,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/newEnroll/enroll_old/index.js b/pages/newEnroll/enroll_old/index.js index 218acea..e8ac910 100644 --- a/pages/newEnroll/enroll_old/index.js +++ b/pages/newEnroll/enroll_old/index.js @@ -1771,5 +1771,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/newEnroll/index.js b/pages/newEnroll/index.js index 3f18c24..03da0be 100644 --- a/pages/newEnroll/index.js +++ b/pages/newEnroll/index.js @@ -658,5 +658,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/newEnroll/index.wxml b/pages/newEnroll/index.wxml index f0c8ccc..c52a537 100644 --- a/pages/newEnroll/index.wxml +++ b/pages/newEnroll/index.wxml @@ -40,7 +40,7 @@ - + 报名岗位 {{jobName}} @@ -109,7 +109,7 @@ - + 我已阅读并同意 《用户服务协议》 diff --git a/pages/realName1/index.js b/pages/realName1/index.js index f25fd2c..3cc23e9 100644 --- a/pages/realName1/index.js +++ b/pages/realName1/index.js @@ -124,7 +124,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, getId (e) { console.log(e); let user = "user.IDCard"; diff --git a/pages/recordChoice copy/index.js b/pages/recordChoice copy/index.js index e689c34..9e48cc3 100644 --- a/pages/recordChoice copy/index.js +++ b/pages/recordChoice copy/index.js @@ -454,5 +454,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/recordChoice copy/index.wxml b/pages/recordChoice copy/index.wxml index 1db5b4b..b51ba1d 100644 --- a/pages/recordChoice copy/index.wxml +++ b/pages/recordChoice copy/index.wxml @@ -72,7 +72,7 @@ - + {{item.aliasName}} diff --git a/pages/recordChoice copy/index.wxss b/pages/recordChoice copy/index.wxss index a096dae..f17b054 100644 --- a/pages/recordChoice copy/index.wxss +++ b/pages/recordChoice copy/index.wxss @@ -64,7 +64,7 @@ content:''; position: absolute; width: 95%; - height: 1rpx; + height: 1px; bottom: 0; left: 50%; transform: translateX(-50%); diff --git a/pages/recordChoice/index.wxml b/pages/recordChoice/index.wxml index 1db5b4b..b51ba1d 100644 --- a/pages/recordChoice/index.wxml +++ b/pages/recordChoice/index.wxml @@ -72,7 +72,7 @@ - + {{item.aliasName}} diff --git a/pages/recordChoice/index.wxss b/pages/recordChoice/index.wxss index a096dae..f17b054 100644 --- a/pages/recordChoice/index.wxss +++ b/pages/recordChoice/index.wxss @@ -64,7 +64,7 @@ content:''; position: absolute; width: 95%; - height: 1rpx; + height: 1px; bottom: 0; left: 50%; transform: translateX(-50%); diff --git a/pages/search/index.js b/pages/search/index.js index 0ea8f36..147f34f 100644 --- a/pages/search/index.js +++ b/pages/search/index.js @@ -463,5 +463,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/secret/index.js b/pages/secret/index.js index 0587f42..bcde4f5 100644 --- a/pages/secret/index.js +++ b/pages/secret/index.js @@ -60,7 +60,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/pages/seeIdCard/index.js b/pages/seeIdCard/index.js index 31e77d4..f4d3eaf 100644 --- a/pages/seeIdCard/index.js +++ b/pages/seeIdCard/index.js @@ -93,7 +93,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/pages/seeIdCard/index.wxml b/pages/seeIdCard/index.wxml index 600c114..ceaf124 100644 --- a/pages/seeIdCard/index.wxml +++ b/pages/seeIdCard/index.wxml @@ -11,7 +11,7 @@ - + 我已阅读并同意 《用户服务协议》 diff --git a/pages/sendCreatorCode/index.wxss b/pages/sendCreatorCode/index.wxss index 92344c8..46836f1 100644 --- a/pages/sendCreatorCode/index.wxss +++ b/pages/sendCreatorCode/index.wxss @@ -39,7 +39,7 @@ page { height: 60px; text-align: center; line-height: 60px; - border: 1rpx solid #eee; + border: 1px solid #eee; border-radius: 10rpx; } .code-item:not(:nth-child(4)) { @@ -63,7 +63,7 @@ page { .phone-input { width: calc(100% - 240rpx); padding: 16rpx; - border-bottom: 1rpx solid #eee; + border-bottom: 1px solid #eee; } .focusLine { position: absolute; diff --git a/pages/serviceTerm/index.js b/pages/serviceTerm/index.js index c1226c8..53739e8 100644 --- a/pages/serviceTerm/index.js +++ b/pages/serviceTerm/index.js @@ -60,7 +60,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/pages/tobeAgency/index.js b/pages/tobeAgency/index.js index b7ba9af..34edf3d 100644 --- a/pages/tobeAgency/index.js +++ b/pages/tobeAgency/index.js @@ -291,5 +291,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/townsMan/index.js b/pages/townsMan/index.js index c6ed1bc..458c846 100644 --- a/pages/townsMan/index.js +++ b/pages/townsMan/index.js @@ -167,8 +167,8 @@ Page({ //this.getLocation(); console.log(options.state); this.setData({ - // currIndex: options.state, - toped: options.state, + currIndex: options.state, + // toped: options.state, }); that.getList(); @@ -511,5 +511,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/pages/townsMan/index.json b/pages/townsMan/index.json index 3c46e20..05b3b8a 100644 --- a/pages/townsMan/index.json +++ b/pages/townsMan/index.json @@ -1,6 +1,5 @@ { "usingComponents": {}, - "navigationStyle": "custom", "navigationBarTitleText": "我的老乡", "navigationBarBackgroundColor": "#fff", "navigationBarTextStyle": "black", diff --git a/pages/townsMan/index.wxml b/pages/townsMan/index.wxml index 3f25c60..b3b2b6d 100644 --- a/pages/townsMan/index.wxml +++ b/pages/townsMan/index.wxml @@ -1,5 +1,5 @@ - +
@@ -66,12 +66,12 @@ - + 最近离职 @@ -79,7 +79,7 @@ - + - + - + @@ -108,7 +108,7 @@ {{item.userName == '' || item.userName == null ?'暂无姓名':item.userName }}/{{item.sex == 1?'男':'女'}}{{item.age ?'/'+item.age :''}}{{item.nation ?'/'+item.nation :''}} - 我的 + {{tools.timeago(item.updateTime)}} diff --git a/pages/townsMan/index.wxss b/pages/townsMan/index.wxss index 3b623b6..0b425fd 100644 --- a/pages/townsMan/index.wxss +++ b/pages/townsMan/index.wxss @@ -3,7 +3,7 @@ width: 40px; height: 40px; border-radius: 50%; - background-color: #fff5f1; + background-color: #f4faff; margin-right: 12px; /* margin-top: -10px; */ } diff --git a/pages/townsmanDetail/index.js b/pages/townsmanDetail/index.js index bfdecdc..c7674c1 100644 --- a/pages/townsmanDetail/index.js +++ b/pages/townsmanDetail/index.js @@ -1310,5 +1310,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/pages/townsmanDetail/index.wxml b/pages/townsmanDetail/index.wxml index 88d71f2..adf38e7 100644 --- a/pages/townsmanDetail/index.wxml +++ b/pages/townsmanDetail/index.wxml @@ -11,7 +11,7 @@ /{{record.age}}岁 /{{record.nation}} - 我的 + diff --git a/pages/townsmanDetail/index.wxss b/pages/townsmanDetail/index.wxss index ef203e6..1385b7d 100644 --- a/pages/townsmanDetail/index.wxss +++ b/pages/townsmanDetail/index.wxss @@ -44,7 +44,7 @@ height: 43px; line-height: 43px; padding: 0 12px; - border-bottom: 1rpx solid #e5e5e5; + border-bottom: 1px solid #e5e5e5; } .qxt { font-size: 15px; diff --git a/pages/userName/index.js b/pages/userName/index.js index 731fd72..2a9cc6e 100644 --- a/pages/userName/index.js +++ b/pages/userName/index.js @@ -120,7 +120,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, // toRole() { // let res = { // data:{ diff --git a/pages/withdraw/index.js b/pages/withdraw/index.js index 7572b30..89cebfa 100644 --- a/pages/withdraw/index.js +++ b/pages/withdraw/index.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - iosDialog:false + iosDialog: false }, /** @@ -60,19 +60,19 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - + onShareAppMessage () { + return app.sharePageImage() }, - surewithdraw(){ + surewithdraw () { console.log(this.data.iosDialog); - this.setData({ - iosDialog :true - }) + this.setData({ + iosDialog: true + }) }, - closeDialog(){ + closeDialog () { // this.data.iosDialog = false this.setData({ - iosDialog :false + iosDialog: false }) } }) \ No newline at end of file diff --git a/pages/wodeBill/index.js b/pages/wodeBill/index.js index 446b4d7..144cbfb 100644 --- a/pages/wodeBill/index.js +++ b/pages/wodeBill/index.js @@ -89,7 +89,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, /* 跳转搜索页面 */ diff --git a/pages/wodeBill/index.wxml b/pages/wodeBill/index.wxml index e611d28..fb58a16 100644 --- a/pages/wodeBill/index.wxml +++ b/pages/wodeBill/index.wxml @@ -51,7 +51,7 @@ {{key}} {{(recordObj[key][0]['money'] || '') + '元'}} - + {{item.title}} diff --git a/pages/wodeBill/index2.js b/pages/wodeBill/index2.js index 01032fa..bbecb87 100644 --- a/pages/wodeBill/index2.js +++ b/pages/wodeBill/index2.js @@ -82,7 +82,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, /* 跳转搜索页面 */ diff --git a/pages/wodeBill/index2.wxml b/pages/wodeBill/index2.wxml index 2333800..e900c17 100644 --- a/pages/wodeBill/index2.wxml +++ b/pages/wodeBill/index2.wxml @@ -47,7 +47,7 @@ - + {{item.title}} {{item.agencyName}} diff --git a/pages/wodeBillDetail/index.js b/pages/wodeBillDetail/index.js index 755de6f..b102272 100644 --- a/pages/wodeBillDetail/index.js +++ b/pages/wodeBillDetail/index.js @@ -180,7 +180,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { + onShareAppMessage () { let that = this; return this.getCanvas().then(() => { // console.log(this.data.base64); diff --git a/pages/wodeBillDetail/index.wxml b/pages/wodeBillDetail/index.wxml index 6e3e4f1..80933e1 100644 --- a/pages/wodeBillDetail/index.wxml +++ b/pages/wodeBillDetail/index.wxml @@ -83,7 +83,7 @@ - + {{item.userName || '-'}} {{item.workInfo + ' | ' + "服务费" + ((item.settlePrice == '' && item.settleUnit == '') ? '-' : ((item.settlePrice || '-') + (item.settleUnit || '-'))) }} @@ -118,7 +118,7 @@ - + diff --git a/pages/wodeBillDetail/index.wxss b/pages/wodeBillDetail/index.wxss index 274973c..f5910a8 100644 --- a/pages/wodeBillDetail/index.wxss +++ b/pages/wodeBillDetail/index.wxss @@ -24,7 +24,7 @@ page { min-height: 161px; padding: 20px 16px 0px 20px; box-sizing: border-box; - background-color: #fff1ec; + background-color: #f4faff; border-radius: 8px; } .totalPriceInfo .share{ diff --git a/pages/wodeBillDetail/index1.wxml b/pages/wodeBillDetail/index1.wxml index 12bff47..9277631 100644 --- a/pages/wodeBillDetail/index1.wxml +++ b/pages/wodeBillDetail/index1.wxml @@ -69,7 +69,7 @@ - + {{item.userName || '-'}} {{item.workInfo + ' | ' + "服务费" + ((item.settlePrice == '' && item.settleUnit == '') ? '-' : ((item.settlePrice || '-') + (item.settleUnit || '-'))) }} @@ -97,7 +97,7 @@ - + diff --git a/pages/wodeBillSharePage/index.js b/pages/wodeBillSharePage/index.js index dc5966e..52dbf0a 100644 --- a/pages/wodeBillSharePage/index.js +++ b/pages/wodeBillSharePage/index.js @@ -92,7 +92,9 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, onScrollToLower: function () { this.data.searchParam.pageNum = this.data.searchParam.pageNum + 1; this.getList(); diff --git a/pages/wodeBillSharePage/index.wxml b/pages/wodeBillSharePage/index.wxml index aae147a..5a1e3d8 100644 --- a/pages/wodeBillSharePage/index.wxml +++ b/pages/wodeBillSharePage/index.wxml @@ -27,7 +27,7 @@ - + {{item.userName || '-'}} {{item.workInfo + ' | ' + "服务费" + ((item.settlePrice == '' && item.settleUnit == '') ? '-' : ((item.settlePrice || '-') + (item.settleUnit || '-'))) }} diff --git a/pages/wodeBillSharePage/index.wxss b/pages/wodeBillSharePage/index.wxss index a02c60f..cf50679 100644 --- a/pages/wodeBillSharePage/index.wxss +++ b/pages/wodeBillSharePage/index.wxss @@ -26,7 +26,7 @@ page { min-height: 198px; padding: 20px 16px 10px 20px; box-sizing: border-box; - background-color: #fff1ec; + background-color: #f4faff; border-radius: 8px; } diff --git a/pages/workBench/index.wxml b/pages/workBench/index.wxml index 8e7802e..3a69c4f 100644 --- a/pages/workBench/index.wxml +++ b/pages/workBench/index.wxml @@ -201,7 +201,7 @@ {{map.num30 || '0'}} 待入职 - + {{map.num40 || '0'}} 在职中 diff --git a/subPage/addAddress/index.js b/subPage/addAddress/index.js index 3bea575..fcaca99 100644 --- a/subPage/addAddress/index.js +++ b/subPage/addAddress/index.js @@ -508,5 +508,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { }, + onShareAppMessage() { + return app.sharePageImage() + }, }); diff --git a/subPage/addAddress/index.wxss b/subPage/addAddress/index.wxss index ca2b330..d5a4263 100644 --- a/subPage/addAddress/index.wxss +++ b/subPage/addAddress/index.wxss @@ -27,7 +27,7 @@ page { .adTag { width: 56px; height: 28px; - border: 1rpx solid #e2e2e2; + border: 1px solid #e2e2e2; border-radius: 25px; text-align: center; font-size: 14px; @@ -37,9 +37,9 @@ page { margin-left: 8px; } .adTag.active { - background: #f40; + background: #1890ff; color: #fff; - border: 1rpx solid #f40; + border: 1px solid #1890ff; } .normalBtn { width: 260px !important; diff --git a/subPage/addressBook/index.js b/subPage/addressBook/index.js index 53f490f..611a115 100644 --- a/subPage/addressBook/index.js +++ b/subPage/addressBook/index.js @@ -175,7 +175,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1: function () { - - } + onShareAppMessage() { + return app.sharePageImage() +}, }) \ No newline at end of file diff --git a/subPage/addressBook/index.wxml b/subPage/addressBook/index.wxml index 03908b2..443af90 100644 --- a/subPage/addressBook/index.wxml +++ b/subPage/addressBook/index.wxml @@ -30,9 +30,9 @@ 其他 - + - + {{item.defaultFlag == 1 ? '默认' : '设为默认'}} 编辑 diff --git a/subPage/todayData/index.js b/subPage/todayData/index.js index 7b3b429..f989a9e 100644 --- a/subPage/todayData/index.js +++ b/subPage/todayData/index.js @@ -603,5 +603,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage1 () { }, +onShareAppMessage() { + return app.sharePageImage() +}, }); diff --git a/subPage/todayData/index.wxml b/subPage/todayData/index.wxml index f42227c..f689943 100644 --- a/subPage/todayData/index.wxml +++ b/subPage/todayData/index.wxml @@ -104,7 +104,7 @@ - 总计 + 总计 {{totalObj.signUps}} {{totalObj.arrived}} {{totalObj.passed}} diff --git a/subPage/vocationalDetail/index.wxss b/subPage/vocationalDetail/index.wxss index f1d9f89..d20554d 100644 --- a/subPage/vocationalDetail/index.wxss +++ b/subPage/vocationalDetail/index.wxss @@ -47,7 +47,7 @@ page, } .servicePrice { - border: 1rpx solid var(--color-ysd); + border: 1px solid var(--color-ysd); background-color: rgba(24,144,255,0.2); justify-content: space-between; border-right-color: transparent; @@ -125,7 +125,7 @@ button.detailBtn { left: 0; bottom: 0; background-color: #fff; - border-top: 1rpx solid rgba(0, 0, 0, 0.1); + border-top: 1px solid rgba(0, 0, 0, 0.1); } .bottomBtn > view { justify-content: start; diff --git a/utils/dateUtil.js b/utils/dateUtil.js index f684336..471f673 100644 --- a/utils/dateUtil.js +++ b/utils/dateUtil.js @@ -801,7 +801,7 @@ function timeShowXXX2(val) { } else if (minutes > 0) { return `${minutes}分钟前`; } else { - return `${seconds}秒前`; + return `刚刚`; } } else { return `${days}天前`;